Skip to content

Commit 0c75b58

Browse files
TheLarkInnCopilot
andcommitted
Merge main (ES2022 target, Node 26 support, runner persistence); regenerate lockfiles
Resolved pnpm-lock.yaml / repo-state.json conflicts via rush update against main's versions. Post-merge capture recorded 3 new rush-lib suppressions (OperationGraph.closeRunnersAsync from the runner-persistence change). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
2 parents 0eb02b8 + 02a5f0a commit 0c75b58

214 files changed

Lines changed: 1523 additions & 145 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ jobs:
2424
- NodeVersion: 24.11.x
2525
NodeVersionDisplayName: 24
2626
OS: windows-latest
27+
- NodeVersion: 26.7.x
28+
NodeVersionDisplayName: 26
29+
OS: ubuntu-latest
30+
- NodeVersion: 26.7.x
31+
NodeVersionDisplayName: 26
32+
OS: windows-latest
2733
name: Node.js v${{ matrix.NodeVersionDisplayName }} (${{ matrix.OS }})
2834
runs-on: ${{ matrix.OS }}
2935
env:
@@ -73,6 +79,8 @@ jobs:
7379
- name: Rush retest (install-run-rush)
7480
run: node common/scripts/install-run-rush.js retest --verbose --production
7581
working-directory: repo-a
82+
env:
83+
NODE_OPTIONS: ${{ matrix.NodeVersionDisplayName == 26 && '--no-experimental-webstorage' || '' }}
7684

7785
- name: Run package manager integration tests
7886
run: npm run test
@@ -109,7 +117,11 @@ jobs:
109117
- name: Rush test (rush-lib)
110118
run: node ${{ github.workspace }}/repo-a/apps/rush/lib-commonjs/start-dev.js test --verbose --production --timeline
111119
working-directory: repo-b
120+
env:
121+
NODE_OPTIONS: ${{ matrix.NodeVersionDisplayName == 26 && '--no-experimental-webstorage' || '' }}
112122

113123
- name: Rush test (rush-lib) again to verify build cache hits
114124
run: node ${{ github.workspace }}/repo-a/apps/rush/lib-commonjs/start-dev.js test --verbose --production --timeline
115125
working-directory: repo-b
126+
env:
127+
NODE_OPTIONS: ${{ matrix.NodeVersionDisplayName == 26 && '--no-experimental-webstorage' || '' }}

apps/api-documenter/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
"url": "https://github.com/microsoft/rushstack.git",
88
"directory": "apps/api-documenter"
99
},
10+
"engines": {
11+
"node": ">=20.9.0"
12+
},
1013
"homepage": "https://api-extractor.com/",
1114
"license": "MIT",
1215
"scripts": {

apps/api-documenter/src/plugin/MarkdownDocumenterFeature.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const uuidMarkdownDocumenterFeature: string = '34196154-9eb3-4de0-a8c8-7e9539dfe
7575
*/
7676
export class MarkdownDocumenterFeature extends PluginFeature {
7777
/** {@inheritdoc PluginFeature.context} */
78-
public override context!: MarkdownDocumenterFeatureContext;
78+
public declare context: MarkdownDocumenterFeatureContext;
7979

8080
/**
8181
* This event occurs before each markdown file is written. It provides an opportunity to customize the

apps/api-extractor/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
"url": "https://github.com/microsoft/rushstack.git",
2525
"directory": "apps/api-extractor"
2626
},
27+
"engines": {
28+
"node": ">=20.9.0"
29+
},
2730
"homepage": "https://api-extractor.com",
2831
"main": "./lib-commonjs/index.js",
2932
"module": "./lib-esm/index.js",

apps/cpu-profile-summarizer/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
"url": "https://github.com/microsoft/rushstack.git",
88
"directory": "apps/cpu-profile-summarizer"
99
},
10+
"engines": {
11+
"node": ">=20.9.0"
12+
},
1013
"bin": {
1114
"cpu-profile-summarizer": "./bin/cpu-profile-summarizer"
1215
},

apps/heft/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"directory": "apps/heft"
1919
},
2020
"engines": {
21-
"node": ">=10.13.0"
21+
"node": ">=20.9.0"
2222
},
2323
"homepage": "https://rushstack.io/pages/heft/overview/",
2424
"main": "./lib-commonjs/index.js",

apps/lockfile-explorer/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
"url": "https://github.com/microsoft/rushstack.git",
2323
"directory": "apps/lockfile-explorer"
2424
},
25+
"engines": {
26+
"node": ">=20.9.0"
27+
},
2528
"homepage": "https://lfx.rushstack.io/",
2629
"license": "MIT",
2730
"bin": {

apps/playwright-browser-tunnel/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535
},
3636
"engines": {
37-
"node": ">=20.0.0"
37+
"node": ">=20.9.0"
3838
},
3939
"engineStrict": true,
4040
"homepage": "https://rushstack.io",
@@ -49,20 +49,20 @@
4949
"@rushstack/ts-command-line": "workspace:*",
5050
"string-argv": "~0.3.1",
5151
"ws": "~8.21.0",
52-
"playwright": "1.56.1"
52+
"playwright": "1.62.1"
5353
},
5454
"devDependencies": {
5555
"@rushstack/heft": "workspace:*",
5656
"eslint": "~9.37.0",
5757
"local-node-rig": "workspace:*",
5858
"@types/semver": "7.7.1",
5959
"@types/ws": "8.18.1",
60-
"playwright-core": "~1.56.1",
61-
"@playwright/test": "~1.56.1",
60+
"playwright-core": "~1.62.1",
61+
"@playwright/test": "~1.62.1",
6262
"@types/node": "20.17.19"
6363
},
6464
"peerDependencies": {
65-
"playwright-core": "~1.56.1"
65+
"playwright-core": ">=1.56.1 <2.0.0"
6666
},
6767
"sideEffects": false
6868
}

apps/rundown/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"directory": "apps/rundown"
99
},
1010
"engines": {
11-
"node": ">=10.0.0"
11+
"node": ">=20.9.0"
1212
},
1313
"engineStrict": true,
1414
"homepage": "https://rushstack.io",

apps/rush-mcp-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"directory": "apps/rush-mcp-server"
4242
},
4343
"engines": {
44-
"node": ">=10.0.0"
44+
"node": ">=20.9.0"
4545
},
4646
"engineStrict": true,
4747
"homepage": "https://rushstack.io",

0 commit comments

Comments
 (0)