Merge branch 'master' into joverbye-dedupe-optimisation

Author: jordanoverbye

.github/actions/prepare/action.yml

@@ -6,7 +6,7 @@ inputs:
   node-version:
     description: 'The version of Node.js to use'
     required: false
-    default: '22'
+    default: 'current'
 
 runs:
   using: composite

.github/workflows/integration-workflow.yml

@@ -209,12 +209,28 @@ jobs:
         name: vscode-zipfs
         path: ./packages/vscode-zipfs/vscode-zipfs-*.vsix
 
+  node-versions:
+    name: 'Acceptance test node versions'
+    outputs:
+      versions: ${{ steps.versions.outputs.versions }}
+    runs-on: ubuntu-latest
+    steps:
+    - id: versions
+      shell: bash
+      run: >
+        echo -n 'versions='
+        >> $GITHUB_OUTPUT
+
+        curl https://nodejs.org/dist/index.json |
+        jq -c '[.[0:1] + map(select(.lts)) | .[].version | capture("^v(?<major>\\d+)") | .major | tonumber] | unique | map(select(. >= 18))'
+        >> $GITHUB_OUTPUT
+
   acceptance:
     strategy:
       fail-fast: false
       matrix:
         # We run the ubuntu tests on multiple Node versions with 2 shards since they're the fastest.
-        node: [18, 19, 20, 21, 22]
+        node: ${{ fromJson(needs.node-versions.outputs.versions) }}
         platform: [[ubuntu, 22.04]]
         shard: ['1/2', '2/2']
         include:
@@ -239,7 +255,7 @@ jobs:
 
     name: '${{matrix.platform[0]}}-latest w/ Node.js ${{matrix.node}}.x (${{matrix.shard}})'
     runs-on: ${{matrix.platform[0]}}-${{matrix.platform[1]}}
-    needs: build
+    needs: [build, node-versions]
 
     # Permission required to produce a valid provenance statement during the tests
     # Only run inside the main repository; this may fail in master since it doesn't run in PRs from forks
@@ -249,10 +265,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: 'Use Node.js ${{matrix.node}}.x'
+    - name: 'Use Node.js ${{matrix.node}}'
       uses: actions/setup-node@v4
       with:
-        node-version: ${{matrix.node}}.x
+        node-version: ${{matrix.node}}
 
     - uses: actions/download-artifact@v4
       with:

.pnp.cjs

@@ -0,0 +1,38 @@
+releases:
+  "@yarnpkg/fslib": patch
+
+declined:
+  - "@yarnpkg/plugin-catalog"
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-git"
+  - "@yarnpkg/plugin-github"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-jsr"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/cli"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/libzip"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnp"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"
+  - "@yarnpkg/shell"

.yarn/versions/78344001.yml

@@ -0,0 +1,23 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-workspace-tools": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

.yarn/versions/d07cb1af.yml

@@ -29,16 +29,18 @@ const staticServer = serveStatic(npath.fromPortablePath(require(`pkg-tests-fixtu
 
 const TEST_MAJOR = process.env.TEST_MAJOR
   ? parseInt(process.env.TEST_MAJOR, 10)
-  : null;
+  : 4;
 
-function isAtLeastMajor(major: number) {
-  return TEST_MAJOR !== null && TEST_MAJOR >= major;
+function majorCheck(test: (major: number) => boolean) {
+  return TEST_MAJOR === null || test(TEST_MAJOR);
 }
 
 export const FEATURE_CHECKS = {
-  jsonLockfile: isAtLeastMajor(5),
-  prologConstraints: !isAtLeastMajor(5),
-  mergeConflictTheirs: isAtLeastMajor(5),
+  forEachWorktree: majorCheck(major => major <= 4),
+  forEachVerboseDone: majorCheck(major => major >= 5),
+  jsonLockfile: majorCheck(major => major >= 5),
+  prologConstraints: majorCheck(major => major <= 4),
+  mergeConflictTheirs: majorCheck(major => major >= 5),
 } as const;
 
 // Testing things inside a big-endian container takes forever
@@ -479,16 +481,14 @@ export const startPackageServer = ({type}: {type: keyof typeof packageServerUrls
       const packageVersionEntry = packageEntry.get(version);
       invariant(packageVersionEntry, `This can only exist`);
 
-      const data = JSON.stringify({
-        [version as string]: Object.assign({}, packageVersionEntry!.packageJson, {
-          dist: {
-            shasum: await getPackageArchiveHash(name, version),
-            tarball: (localName === `unconventional-tarball` || localName === `private-unconventional-tarball`)
-              ? (await getPackageHttpArchivePath(name, version)).replace(`/-/`, `/tralala/`)
-              : await getPackageHttpArchivePath(name, version),
-          },
-        }),
-      });
+      const data = JSON.stringify(Object.assign({}, packageVersionEntry!.packageJson, {
+        dist: {
+          shasum: await getPackageArchiveHash(name, version),
+          tarball: (localName === `unconventional-tarball` || localName === `private-unconventional-tarball`)
+            ? (await getPackageHttpArchivePath(name, version)).replace(`/-/`, `/tralala/`)
+            : await getPackageHttpArchivePath(name, version),
+        },
+      }));
 
       response.writeHead(200, {[`Content-Type`]: `application/json`});
       response.end(data);