Merge branch 'master' into feat-2

CHANGELOG.md

@@ -9,6 +9,7 @@ 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
 
 ## 4.1.0
 

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(
       {