Merge branch 'main' into mrtenz/typescript-5.4.5

.github/workflows/build-lint-test.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
     steps:
       - uses: actions/checkout@v4
       - name: Install Corepack via Node
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [22.x]
     steps:
       - uses: actions/checkout@v4
       - name: Install Corepack via Node
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [22.x]
     steps:
       - uses: actions/checkout@v4
       - name: Install Corepack via Node
@@ -100,7 +100,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
     steps:
       - uses: actions/checkout@v4
       - name: Install Corepack via Node
@@ -131,7 +131,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
     steps:
       - uses: actions/checkout@v4
       - name: Install Corepack via Node

package.json

@@ -53,8 +53,7 @@
     "@metamask/eslint-config-jest": "^12.1.0",
     "@metamask/eslint-config-nodejs": "^12.1.0",
     "@metamask/eslint-config-typescript": "^12.1.0",
-    "@ts-bridge/cli": "^0.1.4",
-    "@ts-bridge/shims": "^0.1.1",
+    "@ts-bridge/cli": "^0.6.0",
     "@types/jest": "^28.1.6",
     "@types/node": "^18.18",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
@@ -80,7 +79,7 @@
   },
   "packageManager": "[email protected]",
   "engines": {
-    "node": "^18.18 || >=20"
+    "node": "^18.20 || ^20.17 || >=22"
   },
   "publishConfig": {
     "access": "public",

yarn.config.cjs

@@ -179,7 +179,7 @@ async function expectPullRequestTemplate(workspace, workspaceName) {
 
   const pullRequestTemplate = await getWorkspaceFile(
     workspace,
-    '.github/PULL_REQUEST_TEMPLATE.md',
+    '.github/pull_request_template.md',
   );
 
   if (!pullRequestTemplate) {
@@ -253,8 +253,8 @@ module.exports = defineConfig({
     workspace.set('repository.type', 'git');
     workspace.set('repository.url', `${workspaceRepository}.git`);
 
-    // The package must specify a minimum Node.js version of 18.18.
-    workspace.set('engines.node', '^18.18 || >=20');
+    // The package must specify the expected minimum Node versions
+    workspace.set('engines.node', '^18.20 || ^20.17 || >=22');
 
     // The package must provide the location of the CommonJS-compatible
     // entrypoint and its matching type declaration file.

yarn.lock

@@ -1014,8 +1014,7 @@ __metadata:
     "@metamask/eslint-config-jest": "npm:^12.1.0"
     "@metamask/eslint-config-nodejs": "npm:^12.1.0"
     "@metamask/eslint-config-typescript": "npm:^12.1.0"
-    "@ts-bridge/cli": "npm:^0.1.4"
-    "@ts-bridge/shims": "npm:^0.1.1"
+    "@ts-bridge/cli": "npm:^0.6.0"
     "@types/jest": "npm:^28.1.6"
     "@types/node": "npm:^18.18"
     "@typescript-eslint/eslint-plugin": "npm:^5.43.0"
@@ -1216,30 +1215,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ts-bridge/cli@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "@ts-bridge/cli@npm:0.1.4"
+"@ts-bridge/cli@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@ts-bridge/cli@npm:0.6.0"
   dependencies:
+    "@ts-bridge/resolver": "npm:^0.2.0"
     chalk: "npm:^5.3.0"
-    resolve.exports: "npm:^2.0.2"
+    cjs-module-lexer: "npm:^1.3.1"
     yargs: "npm:^17.7.2"
   peerDependencies:
-    "@ts-bridge/shims": ^0.1.1
     typescript: ">=4.8.0"
-  peerDependenciesMeta:
-    "@ts-bridge/shims":
-      optional: true
   bin:
     ts-bridge: ./dist/index.js
     tsbridge: ./dist/index.js
-  checksum: 10/db83db5d283d7341f53f042f115884f514acd1ce6c7e14975b821b39cc4852f3cd6e41790a8cbb2b8615f0e5de77e5bdcec0745935b41267b2af4db031400c84
+  checksum: 10/a23da563b99c56124538fbaf77a2d7a0ad01c898c86ab3be527e3dbe0b22f380daa9207bfeffd8591508ed878959ba168daf6197e06822ba8a3b62dfd7396dab
   languageName: node
   linkType: hard
 
-"@ts-bridge/shims@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "@ts-bridge/shims@npm:0.1.1"
-  checksum: 10/df15df15450f0a6305033655a0afa2458a76362d644eab046d9899b9dc9ba200023144dc8d80040f68cd74f12ba4f2da2ea2c4c950d552ff66688eccd658e2f0
+"@ts-bridge/resolver@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@ts-bridge/resolver@npm:0.2.0"
+  checksum: 10/d4cfd1f47e9648a5f9c893b1b076adabde3a57cbe81ef823bcbbcc77a122fb6f06d99f40ff48198f8dc766bfc4b3b351d4e87cfcf2db64f7e6db924eb82a5db1
   languageName: node
   linkType: hard
 
@@ -2331,10 +2327,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cjs-module-lexer@npm:^1.0.0":
-  version: 1.2.2
-  resolution: "cjs-module-lexer@npm:1.2.2"
-  checksum: 10/f80f84bfdcc53379cc18e25ea3c0cdb4595c142b8e28df304f5c88f38202e1bccf13e845401593656781f79fb43273e1d402d6187d0eeee8dca5ddecee1dcad4
+"cjs-module-lexer@npm:^1.0.0, cjs-module-lexer@npm:^1.3.1":
+  version: 1.4.1
+  resolution: "cjs-module-lexer@npm:1.4.1"
+  checksum: 10/6e830a1e00a34d416949bbc1924f3e8da65cef4a6a09e2b7fa35722e2d1c34bf378d3baca987b698d1cbc3eb83e44b044039b4e82755c96f30e0f03d1d227637
   languageName: node
   linkType: hard
 
@@ -5915,13 +5911,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve.exports@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "resolve.exports@npm:2.0.2"
-  checksum: 10/f1cc0b6680f9a7e0345d783e0547f2a5110d8336b3c2a4227231dd007271ffd331fd722df934f017af90bae0373920ca0d4005da6f76cb3176c8ae426370f893
-  languageName: node
-  linkType: hard
-
 "resolve@npm:1.22.8, resolve@npm:^1.18.1, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"