From 1eabee8db0e55ad542098e6624590469ed5dc4dd Mon Sep 17 00:00:00 2001 From: illiakovalenko Date: Fri, 1 Dec 2023 15:49:24 +0200 Subject: [PATCH 1/3] Updated to node.js 20.10.0 --- packages/create-sitecore-jss/package.json | 2 +- packages/sitecore-jss-angular/package.json | 2 +- packages/sitecore-jss-angular/src/test.ts | 1 + packages/sitecore-jss-cli/package.json | 2 +- packages/sitecore-jss-dev-tools/package.json | 2 +- .../src/templating/react/generate-component-builder.ts | 7 ++++--- packages/sitecore-jss-forms/package.json | 2 +- packages/sitecore-jss-nextjs/package.json | 2 +- .../src/editing/editing-render-middleware.ts | 2 +- packages/sitecore-jss-proxy/package.json | 2 +- packages/sitecore-jss-react-forms/package.json | 2 +- packages/sitecore-jss-react-native/package.json | 2 +- packages/sitecore-jss-react/package.json | 2 +- packages/sitecore-jss-rendering-host/package.json | 2 +- packages/sitecore-jss-vue/package.json | 2 +- packages/sitecore-jss/package.json | 2 +- 16 files changed, 19 insertions(+), 17 deletions(-) diff --git a/packages/create-sitecore-jss/package.json b/packages/create-sitecore-jss/package.json index e7ba4d7553..62adf300ee 100644 --- a/packages/create-sitecore-jss/package.json +++ b/packages/create-sitecore-jss/package.json @@ -6,7 +6,7 @@ "scripts": { "build": "npm run clean && tsc && ts-node ./scripts/build-templates.ts", "clean": "del-cli dist types", - "lint": "eslint --no-eslintrc -c .eslintrc ./src/**/*.ts", + "lint": "eslint \"./src/**/*.ts\"", "watch": "ts-node ./scripts/watch-templates.ts", "test": "mocha --require ts-node/register \"./src/**/*.test.ts\"", "coverage": "nyc npm test" diff --git a/packages/sitecore-jss-angular/package.json b/packages/sitecore-jss-angular/package.json index 4061258b6c..8b0b3b27d1 100644 --- a/packages/sitecore-jss-angular/package.json +++ b/packages/sitecore-jss-angular/package.json @@ -4,7 +4,7 @@ "description": "", "scripts": { "build": "ng-packagr -p ng-package.json", - "lint": "eslint ./src/**/*.ts", + "lint": "eslint \"./src/**/*.ts\"", "test": "ng test", "test:watch": "ng test --no-single-run --browsers Chrome", "coverage": "ng test --code-coverage", diff --git a/packages/sitecore-jss-angular/src/test.ts b/packages/sitecore-jss-angular/src/test.ts index 2dd3dde899..d29426444c 100644 --- a/packages/sitecore-jss-angular/src/test.ts +++ b/packages/sitecore-jss-angular/src/test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ // This file is required by karma.conf.js and loads recursively all the .spec and framework files import 'zone.js'; import 'zone.js/testing'; diff --git a/packages/sitecore-jss-cli/package.json b/packages/sitecore-jss-cli/package.json index fcdd6219b2..fc1cfd33f2 100644 --- a/packages/sitecore-jss-cli/package.json +++ b/packages/sitecore-jss-cli/package.json @@ -9,7 +9,7 @@ "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "watch": "npm run build -- --watch", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.ts", + "lint": "eslint \"./src/**/*.ts\"", "prepublishOnly": "npm run build", "jss": "node ./dist/cjs/bin/jss.js", "test": "mocha --require ts-node/register/transpile-only \"./src/**/*.test.ts\"", diff --git a/packages/sitecore-jss-dev-tools/package.json b/packages/sitecore-jss-dev-tools/package.json index 569c006ffa..db286a9bbd 100644 --- a/packages/sitecore-jss-dev-tools/package.json +++ b/packages/sitecore-jss-dev-tools/package.json @@ -9,7 +9,7 @@ "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "watch": "npm run build -- --watch", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.ts", + "lint": "eslint \"./src/**/*.ts\"", "test": "mocha --require ts-node/register -r tsconfig-paths/register \"./src/**/*.test.ts\"", "prepublishOnly": "npm run build", "coverage": "nyc npm test", diff --git a/packages/sitecore-jss-dev-tools/src/templating/react/generate-component-builder.ts b/packages/sitecore-jss-dev-tools/src/templating/react/generate-component-builder.ts index 1fefbb1a29..93a1717ee0 100644 --- a/packages/sitecore-jss-dev-tools/src/templating/react/generate-component-builder.ts +++ b/packages/sitecore-jss-dev-tools/src/templating/react/generate-component-builder.ts @@ -36,9 +36,10 @@ export function generateComponentBuilder({ /** * Watch for changes to component builder sources - * @param {string} componentRootPath root path to components - * @param {PackageDefinition[]} packages packages to include in component builder - * @param {ComponentFile[]} components components to include in component builder + * @param {object} config configuration for component builder watcher + * @param {string} config.componentRootPath root path to components + * @param {PackageDefinition[]} config.packages packages to include in component builder + * @param {ComponentFile[]} config.components components to include in component builder */ export function watchComponentBuilder({ componentRootPath, diff --git a/packages/sitecore-jss-forms/package.json b/packages/sitecore-jss-forms/package.json index c171a3383e..cf6c4b624a 100644 --- a/packages/sitecore-jss-forms/package.json +++ b/packages/sitecore-jss-forms/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.ts", + "lint": "eslint \"./src/**/*.ts\"", "test": "mocha --require ts-node/register \"./src/**/*.test.ts\"", "prepublishOnly": "npm run build", "coverage": "nyc npm test", diff --git a/packages/sitecore-jss-nextjs/package.json b/packages/sitecore-jss-nextjs/package.json index be1d465cad..a4e7fa1b7a 100644 --- a/packages/sitecore-jss-nextjs/package.json +++ b/packages/sitecore-jss-nextjs/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.tsx ./src/**/*.ts", + "lint": "eslint \"./src/**/*.tsx\" \"./src/**/*.ts\"", "test": "mocha --require ./test/setup.js \"./src/**/*.test.ts\" \"./src/**/*.test.tsx\" --exit", "prepublishOnly": "npm run build", "coverage": "nyc npm test", diff --git a/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.ts b/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.ts index 022b1d0fc3..d3d3bf5f93 100644 --- a/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.ts +++ b/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.ts @@ -78,7 +78,7 @@ export class EditingRenderMiddleware { /** * Gets query parameters that should be passed along to subsequent requests - * @param query Object of query parameters from incoming URL + * @param {Object} query Object of query parameters from incoming URL * @returns Object of approved query parameters */ protected getQueryParamsForPropagation = ( diff --git a/packages/sitecore-jss-proxy/package.json b/packages/sitecore-jss-proxy/package.json index 05dfb6a6b8..aaee435720 100644 --- a/packages/sitecore-jss-proxy/package.json +++ b/packages/sitecore-jss-proxy/package.json @@ -8,7 +8,7 @@ "scripts": { "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.ts", + "lint": "eslint \"./src/**/*.ts\"", "test": "mocha --require ts-node/register \"./src/**/*.test.ts\"", "prepublishOnly": "npm run build", "coverage": "nyc npm test", diff --git a/packages/sitecore-jss-react-forms/package.json b/packages/sitecore-jss-react-forms/package.json index 58f52cf49b..2f8c5d990d 100644 --- a/packages/sitecore-jss-react-forms/package.json +++ b/packages/sitecore-jss-react-forms/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.tsx ./src/**/*.ts", + "lint": "eslint \"./src/**/*.tsx\" \"./src/**/*.ts\"", "test": "mocha --require ts-node/register/transpile-only --require ./src/tests/shim.ts ./src/tests/jsdom-setup.ts ./src/tests/enzyme-setup.ts \"./src/**/*.test.tsx\" --exit", "prepublishOnly": "npm run build", "coverage": "nyc npm test", diff --git a/packages/sitecore-jss-react-native/package.json b/packages/sitecore-jss-react-native/package.json index 5525c8357b..37ebd44fb5 100644 --- a/packages/sitecore-jss-react-native/package.json +++ b/packages/sitecore-jss-react-native/package.json @@ -8,7 +8,7 @@ "clean": "del-cli dist types", "typecheck": "tsc", "fixcrlf": "eslint --rule 'linebreak-style: [\"error\", \"unix\"]' --ext .ts --no-eslintrc --fix ./dist", - "lint": "eslint ./src/**/*.tsx ./src/**/*.ts", + "lint": "eslint \"./src/**/*.tsx\" \"./src/**/*.ts\"", "test": "jest", "prepublishOnly": "npm test && npm run build", "coverage": "jest --config ./jest.config.coverage.js", diff --git a/packages/sitecore-jss-react/package.json b/packages/sitecore-jss-react/package.json index a6cc49e63a..9ade9a78e4 100644 --- a/packages/sitecore-jss-react/package.json +++ b/packages/sitecore-jss-react/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.tsx ./src/**/*.ts", + "lint": "eslint \"./src/**/*.tsx\" \"./src/**/*.ts\"", "test": "mocha --require ts-node/register/transpile-only --require ./src/tests/shim.ts ./src/tests/jsdom-setup.ts ./src/tests/enzyme-setup.ts \"./src/**/*.test.ts\" \"./src/**/*.test.tsx\" --exit", "prepublishOnly": "npm run build", "coverage": "nyc npm test", diff --git a/packages/sitecore-jss-rendering-host/package.json b/packages/sitecore-jss-rendering-host/package.json index ef1a03977b..dcbd067a50 100644 --- a/packages/sitecore-jss-rendering-host/package.json +++ b/packages/sitecore-jss-rendering-host/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.ts", + "lint": "eslint \"./src/**/*.ts\"", "test": "mocha --require ts-node/register/transpile-only \"./src/**/*.test.ts\"", "prepublishOnly": "npm run build", "coverage": "nyc npm test", diff --git a/packages/sitecore-jss-vue/package.json b/packages/sitecore-jss-vue/package.json index ad08a3c82d..48f96c6571 100644 --- a/packages/sitecore-jss-vue/package.json +++ b/packages/sitecore-jss-vue/package.json @@ -8,7 +8,7 @@ "scripts": { "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.ts", + "lint": "eslint \"./src/**/*.ts\"", "test": "jest", "prepublishOnly": "npm run build", "coverage": "jest --config ./jest.config.coverage.js", diff --git a/packages/sitecore-jss/package.json b/packages/sitecore-jss/package.json index ee1766bf1b..619bf978d0 100644 --- a/packages/sitecore-jss/package.json +++ b/packages/sitecore-jss/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-esm.json", "clean": "del-cli dist types", - "lint": "eslint ./src/**/*.ts", + "lint": "eslint \"./src/**/*.ts\"", "test": "mocha --require ts-node/register \"./src/**/*.test.ts\"", "prepublishOnly": "npm run build", "coverage": "nyc npm test", From 7bf524270d59ac289220352a0f0b5047191896b3 Mon Sep 17 00:00:00 2001 From: illiakovalenko Date: Fri, 1 Dec 2023 15:56:10 +0200 Subject: [PATCH 2/3] Updated azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 731a711b58..4ee46639dc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -43,7 +43,7 @@ variables: steps: - task: NodeTool@0 inputs: - versionSpec: '16.x' + versionSpec: '20.x' - script: | yarn cache clean --all && yarn install --immutable displayName: 'yarn install - initial' From 140ac80e675c22e639786bbe6de6a110d5831818 Mon Sep 17 00:00:00 2001 From: illiakovalenko Date: Mon, 4 Dec 2023 10:20:52 +0200 Subject: [PATCH 3/3] Updated CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bd430f694..b84e2672df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ Our versioning strategy is as follows: * `[sitecore-jss]` `[templates/nextjs-xmcloud]` Load the content styles for the RichText component [#1670](https://github.com/Sitecore/jss/pull/1670) +### ๐Ÿงน Chores + +* Upgrade to Node.js 20.x ([#1679](https://github.com/Sitecore/jss/pull/1679)) + ### ๐Ÿ› Bug Fixes * `[templates/node-headless-ssr-proxy]` `[node-headless-ssr-proxy]` Add sc_site qs parameter to Layout Service requests by default ([#1660](https://github.com/Sitecore/jss/pull/1660))