Skip to content

Commit

Permalink
[heft-jest-plugin, repo] Fix issues with punycode in `jest-environmen…
Browse files Browse the repository at this point in the history
…t-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.
  • Loading branch information
iclanton authored Dec 10, 2024
1 parent 18d7e5c commit bb5099a
Show file tree
Hide file tree
Showing 50 changed files with 444 additions and 210 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,22 @@ jobs:
fail-fast: false
matrix:
include:
- NodeVersion: 18.18.x
- NodeVersion: 18.20.x
NodeVersionDisplayName: 18
OS: ubuntu-latest
- NodeVersion: 20.9.x
- NodeVersion: 20.18.x
NodeVersionDisplayName: 20
OS: ubuntu-latest
- NodeVersion: 22.12.x
NodeVersionDisplayName: 22
OS: ubuntu-latest
# TODO: Remove
- NodeVersion: 18.18.x
NodeVersionDisplayName: 18
OS: windows-latest
- NodeVersion: 22.12.x
NodeVersionDisplayName: 22
OS: windows-latest
name: Node.js v${{ matrix.NodeVersionDisplayName }} (${{ matrix.OS }})
runs-on: ${{ matrix.OS }}
steps:
Expand Down
3 changes: 2 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
"name": "Attach",
"type": "node",
"request": "attach",
"port": 9229
"port": 9229,
"outFiles": [],
},
{
"name": "Launch Rush Extension",
Expand Down
4 changes: 2 additions & 2 deletions apps/api-extractor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"typescript": "5.4.2"
},
"devDependencies": {
"@rushstack/heft-node-rig": "2.6.43",
"@rushstack/heft": "0.68.9",
"@rushstack/heft-node-rig": "2.6.44",
"@rushstack/heft": "0.68.10",
"@types/heft-jest": "1.0.1",
"@types/lodash": "4.14.116",
"@types/minimatch": "3.0.5",
Expand Down
4 changes: 2 additions & 2 deletions apps/heft/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"devDependencies": {
"@microsoft/api-extractor": "workspace:*",
"local-eslint-config": "workspace:*",
"@rushstack/heft": "0.68.9",
"@rushstack/heft-node-rig": "2.6.43",
"@rushstack/heft": "0.68.10",
"@rushstack/heft-node-rig": "2.6.44",
"@types/heft-jest": "1.0.1",
"@types/node": "18.17.15",
"@types/watchpack": "2.4.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@microsoft/api-extractor-model",
"comment": "",
"type": "none"
}
],
"packageName": "@microsoft/api-extractor-model"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@microsoft/api-extractor",
"comment": "",
"type": "none"
}
],
"packageName": "@microsoft/api-extractor"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/eslint-patch",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/eslint-patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/eslint-plugin-packlets",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/eslint-plugin-packlets"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/eslint-plugin-security",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/eslint-plugin-security"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/eslint-plugin",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/eslint-plugin"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/heft-api-extractor-plugin",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/heft-api-extractor-plugin"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/heft-config-file",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/heft-config-file"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/heft-jest-plugin",
"comment": "Inject `punycode` into the NodeJS module cache in Node versions 22 and above to work around a deprecation warning.",
"type": "minor"
}
],
"packageName": "@rushstack/heft-jest-plugin"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/heft-lint-plugin",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/heft-lint-plugin"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/heft-typescript-plugin",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/heft-typescript-plugin"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/heft",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/heft"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/node-core-library",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/node-core-library"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/operation-graph",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/operation-graph"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/rig-package",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/rig-package"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/terminal",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/terminal"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/tree-pattern",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/tree-pattern"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@rushstack/ts-command-line",
"comment": "",
"type": "none"
}
],
"packageName": "@rushstack/ts-command-line"
}
2 changes: 1 addition & 1 deletion common/config/azure-pipelines/templates/install-node.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
- name: NodeMajorVersion
type: number
default: 18
default: 20

steps:
- task: NodeTool@0
Expand Down
4 changes: 4 additions & 0 deletions common/config/rush/nonbrowser-approved-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,10 @@
"name": "pseudolocale",
"allowedCategories": [ "libraries" ]
},
{
"name": "punycode",
"allowedCategories": [ "libraries" ]
},
{
"name": "read-package-tree",
"allowedCategories": [ "libraries" ]
Expand Down
25 changes: 13 additions & 12 deletions common/config/subspaces/build-tests-subspace/pnpm-lock.yaml

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

4 changes: 2 additions & 2 deletions common/config/subspaces/build-tests-subspace/repo-state.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
{
"pnpmShrinkwrapHash": "91719dffed0a42aec00fee22b00e6c236b96fc7e",
"pnpmShrinkwrapHash": "a3198248beff4dfe8ef9d9c798b873ead75ef5cd",
"preferredVersionsHash": "ce857ea0536b894ec8f346aaea08cfd85a5af648",
"packageJsonInjectedDependenciesHash": "7bb5b296a95ab3932d6ffa5b97edd5ea79613f33"
"packageJsonInjectedDependenciesHash": "35920c267d4a49b8de4b78d88cf91c7f46b83ebb"
}
Loading

0 comments on commit bb5099a

Please sign in to comment.