Skip to content

Commit

Permalink
Updated supported node version range in rush (#311)
Browse files Browse the repository at this point in the history
* bump up supported node version in rush, update rush version to support

* bump up webpack to address high security vuln

* added resolve plugins relative path to lint command in desktop viewer
  • Loading branch information
hl662 authored Feb 23, 2024
1 parent a004fc7 commit b4d784d
Show file tree
Hide file tree
Showing 11 changed files with 440 additions and 1,441 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down
1,732 changes: 330 additions & 1,402 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/scripts/install-run-rush-pnpm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion common/scripts/install-run-rush.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/scripts/install-run-rushx.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

123 changes: 97 additions & 26 deletions common/scripts/install-run.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions packages/apps/desktop-viewer-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"copy:enUS": "cpx \"./build/locales/en/*\" ./build/locales/en-US/",
"electron": "electron lib/backend/main.js",
"electron:debug": "cross-env NODE_ENV=development electron lib/backend/main.js",
"lint": "eslint --config package.json --no-eslintrc \"./src/**/*.{ts,tsx}\" 1>&2",
"lint": "eslint --config package.json --resolve-plugins-relative-to ../../../common/scripts/ --no-eslintrc \"./src/**/*.{ts,tsx}\" 1>&2",
"lint:fix": "npm run -s lint -- --fix",
"start": "npm run build:backend && run-p \"start:frontend\" \"electron:debug\"",
"start:frontend": "react-scripts start",
Expand Down Expand Up @@ -92,12 +92,11 @@
"cpx2": "4.2.0",
"cross-env": "^5.2.1",
"electron-devtools-installer": "^2.2.4",
"eslint": "^7.32.0",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
"sass": "^1.64.2",
"typescript": "~5.0.4",
"webpack": "4.42.0"
"webpack": "^5.1.2"
},
"eslintConfig": {
"extends": [
Expand Down
6 changes: 3 additions & 3 deletions rush.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
"rushVersion": "5.100.1",
"pnpmVersion": "6.24.4",
"rushVersion": "5.112.2",
"pnpmVersion": "7.32.2",
"pnpmOptions": {
"useWorkspaces": true
},
"nodeSupportedVersionRange": ">=12.17.0 <19.0.0",
"nodeSupportedVersionRange": "^18.12.0 || ^20.9.0",
"projectFolderMinDepth": 2,
"projectFolderMaxDepth": 3,
"repository": {
Expand Down

0 comments on commit b4d784d

Please sign in to comment.