Merge branch 'master' into merceyz/chore/generate-readme-e2e-status-list

.github/workflows/e2e-parcel-workflow.yml

@@ -29,6 +29,13 @@ jobs:
         yarn init -p
         yarn add -D parcel@nightly lodash @babel/core
 
+        # See https://github.com/parcel-bundler/parcel/issues/9114
+
+        echo "packageExtensions:
+  \"@parcel/fs@*\":
+    dependencies:
+      \"@parcel/core\": '*'" > .yarnrc.yml
+
         # JavaScript
 
         echo "import _ from 'lodash';function printHello() { console.log(_.join(['Hello', 'JS'], ' '))}; printHello();" | tee index.js

.github/workflows/e2e-storybook-workflow.yml

@@ -27,11 +27,9 @@ jobs:
     - name: 'Running the integration test'
       run: |
         source scripts/e2e-setup-ci.sh
-        yarn dlx create-react-app my-cra && cd my-cra
+        yarn create react-app my-cra && cd my-cra
 
-        # TODO: Remove when create-react-app fixes their ESLint setup
-        yarn add -D eslint-config-react-app eslint
+        yarn add @babel/preset-env
 
-        yarn dlx -p @storybook/cli@next sb init --yes
+        yarn dlx storybook@latest init --yes --no-dev
         yarn build-storybook
-

.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch → .yarn/patches/ink-npm-3.2.0-2f1df5b094.patch

@@ -1,5 +1,5 @@
 diff --git a/build/ink.js b/build/ink.js
-index f292bccdd049835ded848da83a6daac1e4f70416..54c4ebf36dc0c8f7f2580a5e69869848c83dc46f 100644
+index 3c578b82d95eaeda5a0d7b9b03e88a41c503813b..70a98636304393a9296d8b3656e97d888806245d 100644
 --- a/build/ink.js
 +++ b/build/ink.js
 @@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {

.yarn/versions/54f60131.yml

@@ -0,0 +1,24 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/libui": patch
+  "@yarnpkg/plugin-interactive-tools": patch
+  "@yarnpkg/plugin-version": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@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-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

.yarn/versions/a6283714.yml

@@ -0,0 +1,25 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/nm": patch
+  "@yarnpkg/plugin-nm": patch
+  "@yarnpkg/pnpify": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@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"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

CHANGELOG.md

@@ -9,6 +9,10 @@ Features in `master` can be tried out by running `yarn set version from sources`
 :::
 
 - Fixes `preferInteractive` forcing interactive mode in non-TTY environments.
+- `node-modules` linker now honors user-defined symlinks for `<workspace>/node_modules` directories
+- `node-modules` linker supports hoisting into inner workspaces that are parents of other workspaces
+- `node-modules` linker attemps to hoist tree more exhaustivel until nothing can be hoisted
+- `node-modules` linker uses aggregated count of peer and regular usages to decide hoisting priority, instead of preferring peer usages over regular as before, which should result in fewer duplicates
 
 ## 4.1.0
 

package.json

@@ -27,7 +27,7 @@
     "typescript": "^5.5.2"
   },
   "resolutions": {
-    "ink": "patch:ink@npm%3A3.0.8#~/.yarn/patches/ink-npm-3.0.8-3a8005f59f.patch",
+    "ink@^3.2.0": "patch:ink@npm%3A3.2.0#~/.yarn/patches/ink-npm-3.2.0-2f1df5b094.patch",
     "yoga-layout-prebuilt": "patch:[email protected]#./.yarn/patches/yoga-layout-prebuilt.patch"
   },
   "dependenciesMeta": {

packages/acceptance-tests/pkg-tests-core/sources/utils/tests.ts

@@ -927,6 +927,7 @@ export const getHttpsCertificates = async () => {
     csr,
     clientKey,
     selfSigned: true,
+    config: [`[v3_req]`, `basicConstraints = critical,CA:TRUE\``].join(`\n`),
   });
 
   const serverCSRResult = await createCSR({commonName: `localhost`});

packages/acceptance-tests/pkg-tests-specs/sources/features/plugins.test.ts

@@ -8,6 +8,7 @@ import {mockPluginServer}         from './plugins.utility';
 const COMMANDS_PLUGIN = (name: string, {async = false, printOnBoot = false, thirdParty = false} = {}) => `
 const factory = ${async ? `async` : ``} r => {
   const {Command} = r('clipanion');
+  const path = r('node:path');
 
   if (${printOnBoot})
     console.log('Booting ${name.toUpperCase()}');
@@ -22,6 +23,14 @@ const factory = ${async ? `async` : ``} r => {
             this.context.stdout.write('Executing ${name.toUpperCase()}\\n');
           }
         },
+
+        class MyCommandPath extends Command {
+          static paths = [['${name}', 'path']];
+
+          async execute() {
+            this.context.stdout.write(path.posix.join('a', 'b') + '\\n');
+          }
+        },
       ],
     },
   };
@@ -77,6 +86,19 @@ describe(`Features`, () => {
       });
     }));
 
+    test(`it should support plugins using builtin modules`, makeTemporaryEnv({
+    }, async ({path, run, source}) => {
+      await xfs.writeFilePromise(`${path}/plugin-a.js` as PortablePath, COMMANDS_PLUGIN(`a`));
+
+      await xfs.writeFilePromise(`${path}/.yarnrc.yml` as PortablePath, stringifySyml({
+        plugins: [`./plugin-a.js`],
+      }));
+
+      await expect(run(`a`, `path`)).resolves.toMatchObject({
+        stdout: `a/b\n`,
+      });
+    }));
+
     test(`it should accept asynchronous plugins`, makeTemporaryEnv({
     }, async ({path, run, source}) => {
       await xfs.writeFilePromise(`${path}/plugin-a.js` as PortablePath, COMMANDS_PLUGIN(`a`, {async: true}));

packages/acceptance-tests/pkg-tests-specs/sources/node-modules.test.ts

@@ -1855,6 +1855,47 @@ describe(`Node_Modules`, () => {
       }),
   );
 
+  it(`should work with user-created <workspace>/node_modules symlinks`,
+    makeTemporaryEnv(
+      {
+        workspaces: [`ws`],
+        dependencies: {
+        },
+      },
+      {
+        nodeLinker: `node-modules`,
+        nmHoistingLimits: `workspaces`,
+      },
+      async ({path, run}) => {
+        await xfs.mkdirpPromise(ppath.join(path, `ws`));
+        const trueInstallDir = ppath.resolve(path, `target`);
+        await xfs.mkdirPromise(trueInstallDir);
+
+        await xfs.writeJsonPromise(ppath.join(path, `ws/${Filename.manifest}`), {
+          name: `ws`,
+          devDependencies: {
+            [`no-deps`]: `1.0.0`,
+          },
+        });
+
+        await xfs.symlinkPromise(trueInstallDir, ppath.join(path, `ws/node_modules`));
+
+        await run(`install`);
+
+        expect(xfs.existsSync(ppath.join(trueInstallDir, `no-deps`))).toBeTruthy();
+        expect(xfs.lstatSync(ppath.join(path, `ws/node_modules`)).isSymbolicLink()).toBeTruthy();
+
+        await xfs.writeJsonPromise(ppath.join(path, `ws/${Filename.manifest}`), {
+          name: `ws`,
+        });
+
+        await run(`install`);
+
+        expect(xfs.existsSync(ppath.join(trueInstallDir, `no-deps`))).toBeFalsy();
+        expect(xfs.lstatSync(ppath.join(path, `ws/node_modules`)).isSymbolicLink()).toBeTruthy();
+      }),
+  );
+
   it(`should support supportedArchitectures`,
     makeTemporaryEnv(
       {