Skip to content

Commit bb5099a

Browse files
iclantoniclanton
authored
[heft-jest-plugin, repo] Fix issues with punycode in jest-environment-jsdom and add Node 22 to the repo test matrix. (#5038)
* Run publish with Node 20. * Build with node 22. * Inject punycode into the require cache in Node >= 22. * fixup! Inject punycode into the require cache in Node >= 22. * Set outdir for the 'Attach' launch.json action. * fixup! Build with node 22. * fixup! Set outdir for the 'Attach' launch.json action. * fixup! Build with node 22. * Update cyclic dependencies. * Fix a LockFile test on Windows.
1 parent 18d7e5c commit bb5099a

File tree

50 files changed

+444
-210
lines changed

Some content is hidden

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

50 files changed

+444
-210
lines changed

‎.github/workflows/ci.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,22 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
include:
15-
- NodeVersion: 18.18.x
15+
- NodeVersion: 18.20.x
1616
NodeVersionDisplayName: 18
1717
OS: ubuntu-latest
18-
- NodeVersion: 20.9.x
18+
- NodeVersion: 20.18.x
1919
NodeVersionDisplayName: 20
2020
OS: ubuntu-latest
21+
- NodeVersion: 22.12.x
22+
NodeVersionDisplayName: 22
23+
OS: ubuntu-latest
24+
# TODO: Remove
2125
- NodeVersion: 18.18.x
2226
NodeVersionDisplayName: 18
2327
OS: windows-latest
28+
- NodeVersion: 22.12.x
29+
NodeVersionDisplayName: 22
30+
OS: windows-latest
2431
name: Node.js v${{ matrix.NodeVersionDisplayName }} (${{ matrix.OS }})
2532
runs-on: ${{ matrix.OS }}
2633
steps:

‎.vscode/launch.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@
6868
"name": "Attach",
6969
"type": "node",
7070
"request": "attach",
71-
"port": 9229
71+
"port": 9229,
72+
"outFiles": [],
7273
},
7374
{
7475
"name": "Launch Rush Extension",

‎apps/api-extractor/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"typescript": "5.4.2"
5353
},
5454
"devDependencies": {
55-
"@rushstack/heft-node-rig": "2.6.43",
56-
"@rushstack/heft": "0.68.9",
55+
"@rushstack/heft-node-rig": "2.6.44",
56+
"@rushstack/heft": "0.68.10",
5757
"@types/heft-jest": "1.0.1",
5858
"@types/lodash": "4.14.116",
5959
"@types/minimatch": "3.0.5",

‎apps/heft/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
"devDependencies": {
5151
"@microsoft/api-extractor": "workspace:*",
5252
"local-eslint-config": "workspace:*",
53-
"@rushstack/heft": "0.68.9",
54-
"@rushstack/heft-node-rig": "2.6.43",
53+
"@rushstack/heft": "0.68.10",
54+
"@rushstack/heft-node-rig": "2.6.44",
5555
"@types/heft-jest": "1.0.1",
5656
"@types/node": "18.17.15",
5757
"@types/watchpack": "2.4.0",

‎common/changes/@microsoft/api-extractor-model/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/api-extractor-model",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/api-extractor-model"
10+
}

‎common/changes/@microsoft/api-extractor/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/api-extractor",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/api-extractor"
10+
}

‎common/changes/@rushstack/eslint-patch/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/eslint-patch",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/eslint-patch"
10+
}

‎common/changes/@rushstack/eslint-plugin-packlets/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/eslint-plugin-packlets",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/eslint-plugin-packlets"
10+
}

‎common/changes/@rushstack/eslint-plugin-security/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/eslint-plugin-security",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/eslint-plugin-security"
10+
}

‎common/changes/@rushstack/eslint-plugin/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/eslint-plugin",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/eslint-plugin"
10+
}

‎common/changes/@rushstack/heft-api-extractor-plugin/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/heft-api-extractor-plugin",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/heft-api-extractor-plugin"
10+
}

‎common/changes/@rushstack/heft-config-file/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/heft-config-file",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/heft-config-file"
10+
}

‎common/changes/@rushstack/heft-jest-plugin/heft-jest-punycode_2024-12-10-01-46.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/heft-jest-plugin",
5+
"comment": "Inject `punycode` into the NodeJS module cache in Node versions 22 and above to work around a deprecation warning.",
6+
"type": "minor"
7+
}
8+
],
9+
"packageName": "@rushstack/heft-jest-plugin"
10+
}

‎common/changes/@rushstack/heft-lint-plugin/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/heft-lint-plugin",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/heft-lint-plugin"
10+
}

‎common/changes/@rushstack/heft-typescript-plugin/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/heft-typescript-plugin",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/heft-typescript-plugin"
10+
}

‎common/changes/@rushstack/heft/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/heft",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/heft"
10+
}

‎common/changes/@rushstack/node-core-library/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/node-core-library",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/node-core-library"
10+
}

‎common/changes/@rushstack/operation-graph/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/operation-graph",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/operation-graph"
10+
}

‎common/changes/@rushstack/rig-package/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/rig-package",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/rig-package"
10+
}

‎common/changes/@rushstack/terminal/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/terminal",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/terminal"
10+
}

‎common/changes/@rushstack/tree-pattern/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/tree-pattern",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/tree-pattern"
10+
}

‎common/changes/@rushstack/ts-command-line/heft-jest-punycode_2024-12-10-05-37.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/ts-command-line",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@rushstack/ts-command-line"
10+
}

‎common/config/azure-pipelines/templates/install-node.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
- name: NodeMajorVersion
33
type: number
4-
default: 18
4+
default: 20
55

66
steps:
77
- task: NodeTool@0

‎common/config/rush/nonbrowser-approved-packages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,10 @@
786786
"name": "pseudolocale",
787787
"allowedCategories": [ "libraries" ]
788788
},
789+
{
790+
"name": "punycode",
791+
"allowedCategories": [ "libraries" ]
792+
},
789793
{
790794
"name": "read-package-tree",
791795
"allowedCategories": [ "libraries" ]

‎common/config/subspaces/build-tests-subspace/pnpm-lock.yaml

Lines changed: 13 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/config/subspaces/build-tests-subspace/repo-state.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
22
{
3-
"pnpmShrinkwrapHash": "91719dffed0a42aec00fee22b00e6c236b96fc7e",
3+
"pnpmShrinkwrapHash": "a3198248beff4dfe8ef9d9c798b873ead75ef5cd",
44
"preferredVersionsHash": "ce857ea0536b894ec8f346aaea08cfd85a5af648",
5-
"packageJsonInjectedDependenciesHash": "7bb5b296a95ab3932d6ffa5b97edd5ea79613f33"
5+
"packageJsonInjectedDependenciesHash": "35920c267d4a49b8de4b78d88cf91c7f46b83ebb"
66
}

0 commit comments

Comments
 (0)