From 59aecae9370b4eb084a14d85f4ebed06f4c50eb7 Mon Sep 17 00:00:00 2001 From: Radhika Vissamsetty Date: Thu, 5 Dec 2024 17:02:01 +0530 Subject: [PATCH 1/2] Node version upgrade --- .github/workflows/build.yml | 6 ++-- .../__tests__/DataFormatter.test.ts | 2 +- package.json | 28 +++++++++---------- pom.xml | 4 +-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 670219c801c..623669f96dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,11 +40,11 @@ jobs: with: submodules: recursive - # installing node 16.16 - - name: Use Node.js 16.16 + # installing node 22.12 + - name: Use Node.js 22.12 uses: actions/setup-node@v3.6.0 with: - node-version: 16.16 + node-version: 22.12 - uses: actions/cache@v3.3.0 with: diff --git a/app/cdap/services/DataFormatter/__tests__/DataFormatter.test.ts b/app/cdap/services/DataFormatter/__tests__/DataFormatter.test.ts index 3733db2c642..6eca0d910cc 100644 --- a/app/cdap/services/DataFormatter/__tests__/DataFormatter.test.ts +++ b/app/cdap/services/DataFormatter/__tests__/DataFormatter.test.ts @@ -109,7 +109,7 @@ describe('DataFormatter', () => { minute: 'numeric', second: 'numeric', }) - ).toBe('Thursday, September 16, 2021, 10:33:30 AM'); + ).toBe('Thursday, September 16, 2021 at 10:33:30 AM'); }); }); }); diff --git a/package.json b/package.json index 68a3990c3e5..6bf34a51bec 100644 --- a/package.json +++ b/package.json @@ -5,24 +5,24 @@ "license": "Apache-2.0", "scripts": { "dev": "concurrently \"yarn start\" \"gulp watch\" \"yarn cdap-dev-build-w\" \"yarn build-dev-common-w\"", - "start": "yarn run build-server && NODE_ENV=development node ./packaged/server_dist/index.js", - "cdap-prod-build": "NODE_ENV=production parallel-webpack", - "cdap-dev-build": "NODE_ENV=development parallel-webpack --config=webpack.config.js -d", - "cdap-dev-build-w": "NODE_ENV=development parallel-webpack --watch -d ", - "reload-dev-w": "NODE_ENV=reload node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js", - "hmr-dev-w": "NODE_ENV=hmr node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js", - "cdap-full-build": "run-p cdap-prod-build distribute", - "cdap-full-build-more-memory": "NODE_OPTIONS=\"--max_old_space_size=8192\" run-p cdap-prod-build distribute", - "cdap-non-optimized-full-build": "NODE_ENV=non-optimized-production webpack --config=webpack.config.js", + "start": "NODE_OPTIONS=\"--openssl-legacy-provider\" yarn run build-server && NODE_ENV=development node ./packaged/server_dist/index.js", + "cdap-prod-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack", + "cdap-dev-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.js -d", + "cdap-dev-build-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --watch -d ", + "reload-dev-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=reload node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js", + "hmr-dev-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=hmr node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js", + "cdap-full-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" run-p cdap-prod-build distribute", + "cdap-full-build-more-memory": "NODE_OPTIONS=\"--openssl-legacy-provider --max_old_space_size=8192\" run-p cdap-prod-build distribute", + "cdap-non-optimized-full-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=non-optimized-production webpack --config=webpack.config.js", "clean-node-modules": "modclean -P -r --patterns=\"default:safe\" --additional-patterns=\"*.xls?x,*.ppt?x,*.rtf,*.png,*.jpg,*.jpeg,*.txt\" --ignore=\"validate-npm-license,readme*\"", "distribute": "node ./node_modules/gulp/bin/gulp.js distribute", "build": "node ./node_modules/gulp/bin/gulp.js build", "build-w": "node ./node_modules/gulp/bin/gulp.js watch", - "build-prod-common": "NODE_ENV=production parallel-webpack --config=webpack.config.common.js", - "build-dev-common": "NODE_ENV=development parallel-webpack --config=webpack.config.common.js", - "build-dev-common-w": "NODE_ENV=development parallel-webpack --config=webpack.config.common.js -d --watch", - "build-prod-dlls": "NODE_ENV=production parallel-webpack --config=webpack.config.dlls.js", - "build-dev-dlls": "NODE_ENV=development parallel-webpack --config=webpack.config.dlls.js", + "build-prod-common": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack --config=webpack.config.common.js", + "build-dev-common": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.common.js", + "build-dev-common-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.common.js -d --watch", + "build-prod-dlls": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack --config=webpack.config.dlls.js", + "build-dev-dlls": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.dlls.js", "build-server": "webpack --config=webpack.config.server.js", "jest": "jest --coverage", "jest-w": "jest --watch", diff --git a/pom.xml b/pom.xml index bc7ca7a4be4..0a043cbc255 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ install-node-and-yarn - v16.20.0 + v22.12.0 v1.22.19 @@ -370,7 +370,7 @@ install-node-and-yarn - v16.16.0 + v22.12.0 v1.7.0 From 650471090a933279be7c3c1f084d51dd37c43c57 Mon Sep 17 00:00:00 2001 From: itsankit-google Date: Sat, 7 Dec 2024 05:35:37 +0000 Subject: [PATCH 2/2] fix yarn build server with node v22 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6bf34a51bec..4b1b7a6763c 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "build-dev-common-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.common.js -d --watch", "build-prod-dlls": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack --config=webpack.config.dlls.js", "build-dev-dlls": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.dlls.js", - "build-server": "webpack --config=webpack.config.server.js", + "build-server": "NODE_OPTIONS=\"--openssl-legacy-provider\" webpack --config=webpack.config.server.js", "jest": "jest --coverage", "jest-w": "jest --watch", "karma-test": "node ./node_modules/karma/bin/karma start test/karma-conf.js",