From 134ee1541071c9151f19108207887b6c79e4ae3f Mon Sep 17 00:00:00 2001 From: Rido Date: Wed, 18 Sep 2024 08:38:05 -0700 Subject: [PATCH] Update Node and Package Dependencies (#2464) * add ci (#3) * add ci * rename lerna task * openssl-legacy-provider * new action setup node * build client with options * config node_options in job * fix paths * skip windows pack * upload * do not audit * audit * update actions * add pack * fix pack * fix dispatch * rename pack * upd babel to 20 * upd overrides * upd react * upd @babel/core * baseUrl * botbuilder * webpack-dev-server * fix webpack plugins * fix pack (#5) * fix pack * add fail fast * upd bot builder * fix matrix * fix pack win * more webapck * eslint * rm copied actions * fix webpack plugin * ms-rest * babel runtime * luis apis * lscache * appinsights * bf-schema * webchat * webchat 4.15.9 * webchat 4.15.6 * upd node-version --- .babelrc | 2 +- .github/ci.yaml | 41 ------- .github/pack.yaml | 102 ------------------ .node-version | 2 +- package.json | 34 +++--- packages/app/client/package.json | 14 +-- packages/app/main/.babelrc | 2 +- packages/app/main/package.json | 14 +-- packages/app/shared/package.json | 6 +- packages/extensions/json/package.json | 12 +-- packages/extensions/luis/client/package.json | 20 ++-- .../extensions/qnamaker/client/package.json | 12 +-- packages/sdk/client/package.json | 6 +- packages/sdk/shared/package.json | 6 +- packages/sdk/ui-react/package.json | 8 +- packages/tools/package.json | 4 +- 16 files changed, 73 insertions(+), 212 deletions(-) delete mode 100644 .github/ci.yaml delete mode 100644 .github/pack.yaml diff --git a/.babelrc b/.babelrc index 089247b10..fe28d665a 100644 --- a/.babelrc +++ b/.babelrc @@ -4,7 +4,7 @@ "@babel/preset-env", { "targets": { - "node": "14" + "node": "20" } } ], diff --git a/.github/ci.yaml b/.github/ci.yaml deleted file mode 100644 index 3e6a145fd..000000000 --- a/.github/ci.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: electron-ci - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up Node.js 20.17.0 - uses: actions/setup-node@v4 - with: - node-version: '20.17.0' - - - name: Install lerna 6.1.0 - run: npm install -g lerna@6.1.0 - - - name: Bootstrap - run: npm run bootstrap - - - name: Lint - run: npm run lint - - - name: Build - run: npm run build - env: - NODE_OPTIONS: --openssl-legacy-provider - - - name: Check for vulnerabilities - run: npm audit - continue-on-error: true - \ No newline at end of file diff --git a/.github/pack.yaml b/.github/pack.yaml deleted file mode 100644 index 17f3687a2..000000000 --- a/.github/pack.yaml +++ /dev/null @@ -1,102 +0,0 @@ -name: Pack Electron App - -on: - workflow_dispatch: - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up Node.js 20.17.0 - uses: actions/setup-node@v4 - with: - node-version: '20.17.0' - - - name: Install lerna 6.1.0 - run: npm install -g lerna@6.1.0 - - - name: Bootstrap - run: npm run bootstrap - - - name: Lint - run: npm run lint - - - name: Build - run: npm run build - env: - NODE_OPTIONS: --openssl-legacy-provider - - - name: Check for vulnerabilities - run: npm audit - continue-on-error: true - - - name: Get Electron - working-directory: packages/app/main - run: node scripts/downloadAndExtractElectron.js - - - name: Pack Linux - if: matrix.os == 'ubuntu-latest' - working-directory: packages/app/main - run: npm run pack -- --linux --x64 - env: - NODE_ENV: production - - - name: Dist Linux - if: matrix.os == 'ubuntu-latest' - working-directory: packages/app/main - run: npm run dist -- --linux --prepackaged ./dist/linux-unpacked - env: - NODE_ENV: production - - - name: Upload Linux - if: matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v4 - with: - name: BF-Emulator-Linux.AppImage - path: packages/app/main/dist/*.AppImage - - - name: Pack Windows - if: matrix.os == 'windows-latest' - working-directory: packages/app/main - run: npm run pack -- --win --x64 - env: - NODE_ENV: production - - - name: Dist Windows - if: matrix.os == 'windows-latest' - working-directory: packages/app/main - run: npm run dist -- --win --prepackaged ./dist/win-unpacked - - - name: Upload Windows - if: matrix.os == 'windows-latest' - uses: actions/upload-artifact@v4 - with: - name: BF-Emulator-Windows.setup.exe - path: packages/app/main/dist/*.exe - - - name: Pack Mac - if: matrix.os == 'macos-latest' - working-directory: packages/app/main - run: npm run pack -- --mac --x64 - env: - NODE_ENV: production - - - name: Dist Mac - if: matrix.os == 'macos-latest' - working-directory: packages/app/main - run: npm run dist -- --mac --prepackaged ./dist/mac - - - name: Upload Mac - if: matrix.os == 'macos-latest' - uses: actions/upload-artifact@v4 - with: - name: BF-Emulator-mac.dmg - path: packages/app/main/dist/*.dmg \ No newline at end of file diff --git a/.node-version b/.node-version index 53a42214a..016e34baf 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v16.13.2 +v20.17.0 diff --git a/package.json b/package.json index f67fd610c..78ddfa2f9 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "uploadcoverage": "cat ./coverage/lcov.info | coveralls" }, "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -85,21 +85,25 @@ "keytar": "7.9.0" }, "overrides": { - "minimist@<1.2.6": ">=1.2.6", - "follow-redirects@<1.14.8": ">=1.14.8", + "minimist": ">=1.2.8", + "follow-redirects": ">=1.15.9", "serialize-javascript@<6.0.2": ">=6.0.2", - "postcss@<7.0.36": ">=7.0.36", + "postcss@<7.0.36": ">=8.4.45", "trim-newlines@<3.0.1": ">=3.0.1", - "parse-path@<5.0.0": ">=5.0.0", - "glob-parent@<5.1.2": ">=5.1.2", - "browserslist@>=4.0.0 <4.16.5": ">=4.16.5", - "ejs@<3.1.7": ">=3.1.7", - "jsdom@<=16.4.0": ">=16.5.0", - "axios@<0.21.2": ">=0.21.2", - "parse-url@<8.1.0": ">=8.1.0", - "minimatch@<3.0.5": ">=3.0.5", - "shell-quote@<=1.7.2": ">=1.7.3", - "got@<11.8.5": ">=11.8.5", - "ajv@<6.12.3": ">=6.12.3" + "parse-path@<5.0.0": ">=7.0.0", + "glob-parent@<5.1.2": ">=6.0.2", + "browserslist@>=4.0.0 <4.16.5": ">=4.23.3", + "ejs@<3.1.7": ">=3.1.10", + "jsdom@<=16.4.0": ">=25.0.0", + "axios@<0.21.2": ">=1.7.7", + "parse-url@<8.1.0": ">=9.2.2", + "minimatch@<3.0.5": ">=10.0.1", + "shell-quote@<=1.7.2": ">=1.8.1", + "got@<11.8.5": ">=14.4.2", + "ajv@<6.12.3": ">=6.12.3", + "braces@<3.0.2" : ">=3.0.3", + "ip@<2.0.0" : ">=2.0.1", + "path-to-regexp@<1.0.0" : ">=1.9.0", + "body-parser@<1.20.1" : ">=1.20.3" } } diff --git a/packages/app/client/package.json b/packages/app/client/package.json index 59799e583..ef32727bf 100644 --- a/packages/app/client/package.json +++ b/packages/app/client/package.json @@ -48,7 +48,7 @@ ] }, "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -74,7 +74,7 @@ "css-loader": "^1.0.1", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.1.1", - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-prettier": "^3.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-notice": "^0.7.7", @@ -96,7 +96,7 @@ "url-loader": "^1.0.1", "webpack": "^4.32.2", "webpack-cli": "^4.0.0", - "webpack-dev-server": "^4.11.1" + "webpack-dev-server": "^4.15.2" }, "dependencies": { "@bfemulator/app-shared": "^1.0.0", @@ -107,9 +107,9 @@ "@uifabric/icons": "^5.6.0", "@uifabric/merge-styles": "^6.2.0", "@uifabric/styling": "^5.20.0", - "base64url": "3.0.0", + "base64url": "3.0.1", "botframework-config": "^4.4.0", - "botframework-schema": "^4.17.0", + "botframework-schema": "^4.23.0", "botframework-webchat": "^4.15.6", "botframework-webchat-core": "^4.15.6", "core-js": "^3.6.5", @@ -118,8 +118,8 @@ "markdown-it": "^12.3.0", "monaco-editor": "^0.21.2", "monaco-editor-webpack-plugin": "^2.0.0", - "react": "16.8.6", - "react-dom": "16.8.6", + "react": "16.14.0", + "react-dom": "16.14.0", "react-html-parser": "^2.0.2", "react-redux": "^5.0.7", "react-router-dom": "^4.2.2", diff --git a/packages/app/main/.babelrc b/packages/app/main/.babelrc index 089247b10..fe28d665a 100644 --- a/packages/app/main/.babelrc +++ b/packages/app/main/.babelrc @@ -4,7 +4,7 @@ "@babel/preset-env", { "targets": { - "node": "14" + "node": "20" } } ], diff --git a/packages/app/main/package.json b/packages/app/main/package.json index 71596d05b..24be6b4d9 100644 --- a/packages/app/main/package.json +++ b/packages/app/main/package.json @@ -80,7 +80,7 @@ }, "license": "MIT", "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -105,7 +105,7 @@ "@typescript-eslint/parser": "^4.14.2", "asar-integrity": "^0.2.4", "babel-jest": "^29.3.1", - "botbuilder": "^4.5.1", + "botbuilder": "^4.23.0", "chalk": "^2.4.1", "concurrently": "^3.5.1", "cross-env": "^5.1.3", @@ -113,7 +113,7 @@ "electron": "26.2.4", "electron-builder": "23.6.0", "@electron/rebuild": "^3.3.0", - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-prettier": "^3.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-notice": "^0.7.7", @@ -132,7 +132,7 @@ "vinyl-source-stream": "^2.0.0" }, "dependencies": { - "@babel/runtime": "^7.1.5", + "@babel/runtime": "^7.25.6", "@bfemulator/app-shared": "^1.0.0", "@bfemulator/client": "^1.0.0", "@bfemulator/extension-json": "^1.0.0", @@ -141,11 +141,11 @@ "@bfemulator/extension-qnamaker-client": "^0.1.0", "@bfemulator/sdk-shared": "^1.0.0", "@electron/remote": "^2.0.11", - "@microsoft/bf-chatdown": "4.7.0", - "applicationinsights": "^1.0.8", + "@microsoft/bf-chatdown": "4.15.0", + "applicationinsights": "^1.8.10", "base64url": "3.0.1", "botframework-config": "^4.4.0", - "botframework-schema": "^4.17.0", + "botframework-schema": "^4.23.0", "chokidar": "^2.0.2", "command-line-args": "^5.0.2", "electron-updater": "4.3.5", diff --git a/packages/app/shared/package.json b/packages/app/shared/package.json index eab668d84..452fde261 100644 --- a/packages/app/shared/package.json +++ b/packages/app/shared/package.json @@ -18,7 +18,7 @@ "author": "", "license": "ISC", "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -30,7 +30,7 @@ "@typescript-eslint/eslint-plugin": "^4.14.2", "@typescript-eslint/parser": "^4.14.2", "babel-jest": "^29.3.1", - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-prettier": "^3.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-notice": "^0.7.7", @@ -43,7 +43,7 @@ "@babel/runtime": "^7.1.5", "@bfemulator/sdk-shared": "^1.0.0", "botframework-config": "^4.4.0", - "botframework-schema": "^4.17.0", + "botframework-schema": "^4.23.0", "eslint-plugin-security": "^1.4.0", "tslib": "^1.9.0" }, diff --git a/packages/extensions/json/package.json b/packages/extensions/json/package.json index cee7d51a0..d9b388131 100644 --- a/packages/extensions/json/package.json +++ b/packages/extensions/json/package.json @@ -11,11 +11,11 @@ "@bfemulator/sdk-client": "^1.0.0", "@bfemulator/sdk-shared": "^1.0.0", "@bfemulator/ui-react": "^1.0.0", - "botframework-schema": "^4.17.0", + "botframework-schema": "^4.23.0", "deep-diff": "^1.0.2", "eslint-plugin-security": "^1.4.0", - "react": "16.8.6", - "react-dom": "16.8.6", + "react": "16.14.0", + "react-dom": "16.14.0", "react-json-tree": "^0.17.0" }, "scripts": { @@ -26,7 +26,7 @@ "test": "jest" }, "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -49,7 +49,7 @@ "copy-webpack-plugin": "^6.4.1", "css-loader": "^1.0.1", "enzyme": "^3.3.0", - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-prettier": "^3.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-notice": "^0.7.7", @@ -63,7 +63,7 @@ "@teamsupercell/typings-for-css-modules-loader": "^2.5.2", "webpack": "^4.32.2", "webpack-cli": "^4.0.0", - "webpack-dev-server": "^4.11.1" + "webpack-dev-server": "^4.15.2" }, "jest": { "setupFilesAfterEnv": ["../../../../testSetup.js"], diff --git a/packages/extensions/luis/client/package.json b/packages/extensions/luis/client/package.json index 5469acbce..612743425 100644 --- a/packages/extensions/luis/client/package.json +++ b/packages/extensions/luis/client/package.json @@ -5,18 +5,18 @@ "homepage": "./", "main": "./public/index.html", "dependencies": { - "@azure/ms-rest-js": "1.7.0", - "@babel/runtime": "^7.1.5", + "@azure/ms-rest-js": "2.7.0", + "@babel/runtime": "^7.25.6", "@bfemulator/sdk-client": "^1.0.0", "@bfemulator/sdk-shared": "^1.0.0", "@bfemulator/ui-react": "^1.0.0", "botframework-config": "^4.4.0", - "botframework-schema": "^4.17.0", + "botframework-schema": "^4.23.0", "eslint-plugin-security": "^1.4.0", - "lscache": "^1.1.0", - "luis-apis": "2.5.1", - "react": "16.8.6", - "react-dom": "16.8.6" + "lscache": "^1.3.2", + "luis-apis": "2.6.2", + "react": "16.14.0", + "react-dom": "16.14.0" }, "scripts": { "start": "webpack-dev-server --hot --mode development --content-base ./public", @@ -26,7 +26,7 @@ "test": "" }, "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -45,7 +45,7 @@ "babel-loader": "^8.0.6", "copy-webpack-plugin": "^6.4.1", "css-loader": "^1.0.1", - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-prettier": "^3.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-notice": "^0.7.7", @@ -58,6 +58,6 @@ "@teamsupercell/typings-for-css-modules-loader": "^2.5.2", "webpack": "^4.32.2", "webpack-cli": "^4.0.0", - "webpack-dev-server": "^4.11.1" + "webpack-dev-server": "^4.15.2" } } diff --git a/packages/extensions/qnamaker/client/package.json b/packages/extensions/qnamaker/client/package.json index 1eac389b9..f804a9d09 100644 --- a/packages/extensions/qnamaker/client/package.json +++ b/packages/extensions/qnamaker/client/package.json @@ -10,11 +10,11 @@ "@bfemulator/ui-react": "^1.0.0", "@uifabric/merge-styles": "^6.2.0", "botframework-config": "^4.4.0", - "botframework-schema": "^4.17.0", + "botframework-schema": "^4.23.0", "eslint-plugin-security": "^1.4.0", "qnamaker": "^1.3.0", - "react": "16.8.6", - "react-dom": "16.8.6" + "react": "16.14.0", + "react-dom": "16.14.0" }, "sideEffects": false, "scripts": { @@ -25,7 +25,7 @@ "test": "" }, "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -44,7 +44,7 @@ "babel-jest": "^29.3.1", "cross-env": "^5.1.3", "css-loader": "^1.0.1", - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-prettier": "^3.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-notice": "^0.7.7", @@ -59,6 +59,6 @@ "@teamsupercell/typings-for-css-modules-loader": "^2.5.2", "webpack": "^4.32.2", "webpack-cli": "^4.0.0", - "webpack-dev-server": "^4.11.1" + "webpack-dev-server": "^4.15.2" } } diff --git a/packages/sdk/client/package.json b/packages/sdk/client/package.json index 6828b3b57..4922867c8 100644 --- a/packages/sdk/client/package.json +++ b/packages/sdk/client/package.json @@ -16,7 +16,7 @@ "author": "", "license": "ISC", "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -28,7 +28,7 @@ "@typescript-eslint/eslint-plugin": "^4.14.2", "@typescript-eslint/parser": "^4.14.2", "babel-jest": "^29.3.1", - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-prettier": "^3.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-notice": "^0.7.7", @@ -43,7 +43,7 @@ "@babel/runtime": "^7.1.5", "@bfemulator/sdk-shared": "^1.0.0", "botframework-config": "^4.4.0", - "botframework-schema": "^4.17.0", + "botframework-schema": "^4.23.0", "eslint-plugin-security": "^1.4.0", "tslib": "^1.9.0" } diff --git a/packages/sdk/shared/package.json b/packages/sdk/shared/package.json index 50aba5e93..270b78a6f 100644 --- a/packages/sdk/shared/package.json +++ b/packages/sdk/shared/package.json @@ -17,7 +17,7 @@ "author": "", "license": "ISC", "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -29,7 +29,7 @@ "@typescript-eslint/eslint-plugin": "^4.14.2", "@typescript-eslint/parser": "^4.14.2", "babel-jest": "^29.3.1", - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-prettier": "^3.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-notice": "^0.7.7", @@ -43,7 +43,7 @@ "dependencies": { "@babel/runtime": "^7.1.5", "botframework-config": "^4.4.0", - "botframework-schema": "^4.17.0", + "botframework-schema": "^4.23.0", "eslint-plugin-security": "^1.4.0", "tslib": "^1.9.0", "uuid": "^3.3.2" diff --git a/packages/sdk/ui-react/package.json b/packages/sdk/ui-react/package.json index 97dd0e948..4042863dd 100644 --- a/packages/sdk/ui-react/package.json +++ b/packages/sdk/ui-react/package.json @@ -17,7 +17,7 @@ "author": "", "license": "ISC", "devDependencies": { - "@babel/core": "^7.20.2", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-object-rest-spread": "^7.20.7", @@ -33,7 +33,7 @@ "babel-jest": "^29.3.1", "babel-loader": "^8.0.6", "enzyme": "^3.3.0", - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-prettier": "^3.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-notice": "^0.7.7", @@ -58,8 +58,8 @@ "@babel/runtime": "^7.1.5", "@bfemulator/app-shared": "^1.0.0", "eslint-plugin-security": "^1.4.0", - "react": "16.8.6", - "react-dom": "16.8.6" + "react": "16.14.0", + "react-dom": "16.14.0" }, "jest": { "setupFilesAfterEnv": ["../../../../testSetup.js"], diff --git a/packages/tools/package.json b/packages/tools/package.json index 1b334cbd2..bbe5b7ac7 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -9,13 +9,13 @@ "author": "", "license": "ISC", "dependencies": { - "botbuilder": "^4.5.1", + "botbuilder": "^4.23.0", "dotenv": "8.0.0", "eslint-plugin-security": "^1.4.0", "restify": "^11.1.0" }, "devDependencies": { - "eslint": "^7.19.0", + "eslint": "^7.32.0", "eslint-config-standard": "13.0.1", "eslint-plugin-import": "2.26.0", "eslint-plugin-node": "9.1.0",