Yarn Plug'n'Play: Implementation

.babelrc

@@ -52,6 +52,7 @@
     "stage-0"
   ],
   "plugins": [
+    ["babel-plugin-inline-import", { "extensions": [ ".tpl.js" ] }],
     ["transform-inline-imports-commonjs"],
     ["transform-runtime", { "polyfill": false, "regenerator": true }]
   ]

.gitignore

@@ -21,5 +21,7 @@ test/fixtures/**/.fbkpm
 /__tests__/fixtures/request-cache/GET/localhost/.bin
 .idea
 .yarn-meta
+.pnp.js
+.pnp
 /packages/lockfile/index.js
 .vscode/

__tests__/commands/install/integration.js

@@ -236,7 +236,7 @@ test('changes the cache path when bumping the cache version', () =>
 
     await mockConstants(config, {CACHE_VERSION: 42}, async config => {
       await cache(config, reporter, {}, ['dir']);
-      expect((JSON.parse(String(inOut.read())): any).data).toMatch(/[\\\/]v42[\\\/]?$/);
+      expect((JSON.parse(String(inOut.read())): any).data).toMatch(/[\\\/]v42([\\\/].*)?$/);
     });
   }));
 

__tests__/integration.js

@@ -506,6 +506,7 @@ test('relative cache folder', async () => {
 
   const [stdoutOutput, _] = await runYarn(['cache', 'dir'], {cwd: `${base}/sub`});
 
+  // The dirname is to remove the "v2" part
   expect(await fs.realpath(path.dirname(stdoutOutput.toString()))).toEqual(await fs.realpath(`${base}/foo`));
 });
 

__tests__/lifecycle-scripts.js

@@ -48,31 +48,31 @@ async function execCommand(cmd: string, packageName: string, env = process.env):
 
 test.concurrent('should add the global yarnrc arguments to the command line', async () => {
   const stdout = await execCommand('cache dir', 'yarnrc-cli');
-  expect(stdout.replace(/\\/g, '/')).toMatch(/^(C:)?\/tmp\/foobar\/v[0-9]+\n$/);
+  expect(stdout.replace(/\\/g, '/')).toMatch(/^(C:)?\/tmp\/foobar\/v[0-9]+(\/.*)?\n$/);
 });
 
 test.concurrent(
   'should add the command-specific yarnrc arguments to the command line if the command name matches',
   async () => {
     const stdout = await execCommand('cache dir', 'yarnrc-cli-command-specific-ok');
-    expect(stdout.replace(/\\/g, '/')).toMatch(/^(C:)?\/tmp\/foobar\/v[0-9]+\n$/);
+    expect(stdout.replace(/\\/g, '/')).toMatch(/^(C:)?\/tmp\/foobar\/v[0-9]+(\/.*)?\n$/);
   },
 );
 
 test.concurrent("should not add the command-specific yarnrc arguments if the command name doesn't match", async () => {
   const stdout = await execCommand('cache dir', 'yarnrc-cli-command-specific-ko');
-  expect(stdout.replace(/\\/g, '/')).not.toMatch(/^(C:)?\/tmp\/foobar\/v[0-9]+\n$/);
+  expect(stdout.replace(/\\/g, '/')).not.toMatch(/^(C:)?\/tmp\/foobar\/v[0-9]+(\/.*)?\n$/);
 });
 
 test.concurrent('should allow overriding the yarnrc values from the command line', async () => {
   const stdout = await execCommand('cache dir --cache-folder /tmp/toto', 'yarnrc-cli');
-  expect(stdout.replace(/\\/g, '/')).toMatch(/^(C:)?\/tmp\/toto\/v[0-9]+\n$/);
+  expect(stdout.replace(/\\/g, '/')).toMatch(/^(C:)?\/tmp\/toto\/v[0-9]+(\/.*)?\n$/);
 });
 
 // Test disabled for now, cf rc.js
 test.concurrent('should resolve the yarnrc values relative to where the file lives', async () => {
   const stdout = await execCommand('cache dir', 'yarnrc-cli-relative');
-  expect(stdout.replace(/\\/g, '/')).toMatch(/^(C:)?(\/[^\/]+)+\/foobar\/hello\/world\/v[0-9]+\n$/);
+  expect(stdout.replace(/\\/g, '/')).toMatch(/^(C:)?(\/[^\/]+)+\/foobar\/hello\/world\/v[0-9]+(\/.*)?\n$/);
 });
 
 test.concurrent(

__tests__/package-resolver.js

@@ -13,8 +13,8 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 90000;
 
 const path = require('path');
 
-// regexp which verifies that cache path contains semver + hash
-const cachePathRe = /-\d+\.\d+\.\d+-[\dabcdef]{40}$/;
+// regexp which verifies that the cache path contains a path component ending with semver + hash
+const cachePathRe = /-\d+\.\d+\.\d+-[\dabcdef]{40}[\\\/]/;
 
 async function createEnv(configOptions): Object {
   const lockfile = new Lockfile();
@@ -82,7 +82,7 @@ addTest(
   '@foo/bar@1.2.3',
   'npm',
   async cacheFolder => {
-    const folder = path.join(cacheFolder, 'npm-@foo', 'bar');
+    const folder = path.join(cacheFolder, 'npm-@foo-bar', 'node_modules', '@foo', 'bar');
     await fs.mkdirp(folder);
     await fs.writeFile(
       path.join(folder, constants.METADATA_FILENAME),

package.json

@@ -57,6 +57,7 @@
     "babel-eslint": "^7.2.3",
     "babel-loader": "^6.2.5",
     "babel-plugin-array-includes": "^2.0.3",
+    "babel-plugin-inline-import": "^2.0.6",
     "babel-plugin-transform-builtin-extend": "^1.1.2",
     "babel-plugin-transform-inline-imports-commonjs": "^1.0.0",
     "babel-plugin-transform-runtime": "^6.4.3",

packages/pkg-tests/package.json

@@ -10,7 +10,7 @@
         "babel-preset-env": "^1.6.1",
         "babel-preset-flow": "^6.23.0",
         "flow-bin": "^0.66.0",
-        "jest": "^22.3.0",
+        "jest": "^23.0.0",
         "prettier": "^1.10.2"
     },
     "scripts": {

packages/pkg-tests/pkg-tests-core/sources/utils/fs.js

@@ -174,8 +174,12 @@ exports.readJson = async function readJson(source: string): Promise<any> {
   }
 };
 
-exports.chmod = function chmod(target: string, mod: number): Promise<void> {
-  return fs.chmod(target, mod);
+exports.chmod = async function chmod(target: string, mod: number): Promise<void> {
+  await fs.chmod(target, mod);
+};
+
+exports.realpath = function realpath(source: string): Promise<string> {
+  return fs.realpath(source);
 };
 
 exports.makeFakeBinary = async function(

packages/pkg-tests/pkg-tests-core/sources/utils/tests.js

@@ -22,6 +22,17 @@ export type PackageRunDriver = (
 
 export type PackageDriver = any;
 
+let whitelist = new Map();
+
+exports.setPackageWhitelist = async function whitelistPackages(
+  packages: Map<string, Set<string>>,
+  fn: () => Promise<void>,
+) {
+  whitelist = packages;
+  await fn();
+  whitelist = new Map();
+};
+
 exports.getPackageRegistry = function getPackageRegistry(): Promise<PackageRegistry> {
   if (getPackageRegistry.promise) {
     return getPackageRegistry.promise;
@@ -182,7 +193,12 @@ exports.startPackageServer = function startPackageServer(): Promise<string> {
       return processError(res, 404, `Package not found: ${name}`);
     }
 
-    const versions = Array.from(packageEntry.keys());
+    let versions = Array.from(packageEntry.keys());
+
+    const whitelistedVersions = whitelist.get(name);
+    if (whitelistedVersions) {
+      versions = versions.filter(version => whitelistedVersions.has(version));
+    }
 
     const data = JSON.stringify({
       name,
@@ -300,29 +316,42 @@ exports.generatePkgDriver = function generatePkgDriver({runDriver}: {|runDriver:
       }
 
       return async function(): Promise<void> {
-        const path = await fsUtils.createTemporaryFolder();
+        const path = await fsUtils.realpath(await fsUtils.createTemporaryFolder());
 
         const registryUrl = await exports.startPackageServer();
 
         // Writes a new package.json file into our temporary directory
         await fsUtils.writeJson(`${path}/package.json`, await deepResolve(packageJson));
 
         const run = (...args) => {
+          let callDefinition = {};
+
+          if (args.length > 0 && typeof args[args.length - 1] === 'object') {
+            callDefinition = args.pop();
+          }
+
           return runDriver(path, args, {
             registryUrl,
+            ...definition,
             ...subDefinition,
+            ...callDefinition,
           });
         };
 
         const source = async script => {
-          return JSON.parse((await run('node', '-p', `JSON.stringify(${script})`)).stdout.toString());
+          return JSON.parse((await run('node', '-p', `JSON.stringify((() => ${script})())`)).stdout.toString());
         };
 
-        await fn({
-          path,
-          run,
-          source,
-        });
+        try {
+          await fn({
+            path,
+            run,
+            source,
+          });
+        } catch (error) {
+          error.message = `Temporary fixture folder: ${path}\n\n` + error.message;
+          throw error;
+        }
       };
     };
 

packages/pkg-tests/pkg-tests-fixtures/default-index.js

@@ -2,7 +2,9 @@
 
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  // $FlowFixMe The whole point of this file is to be dynamic
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/dep-loop-entry-1.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/dep-loop-exit-1.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/dev-deps-1.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/dragon-test-1-a-1.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/dragon-test-1-b-1.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/dragon-test-1-b-2.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/dragon-test-1-c-1.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/dragon-test-1-d-1.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/dragon-test-1-e-1.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }

packages/pkg-tests/pkg-tests-fixtures/packages/has-bin-entries-1.0.0/bin-get-pwd.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+console.log(process.cwd());

packages/pkg-tests/pkg-tests-fixtures/packages/has-bin-entries-1.0.0/bin-with-relative-require.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+const secret = require('./secret');
+
+console.log(secret);

packages/pkg-tests/pkg-tests-fixtures/packages/has-bin-entries-1.0.0/bin-with-require.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+
+const noDeps = require('no-deps');
+
+console.log(noDeps.name);
+console.log(noDeps.version);

packages/pkg-tests/pkg-tests-fixtures/packages/has-bin-entries-1.0.0/bin.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+for (let t = 2; t < process.argv.length; ++t) {
+  console.log(process.argv[t]);
+}

packages/pkg-tests/pkg-tests-fixtures/packages/has-bin-entries-1.0.0/index.js

@@ -0,0 +1,10 @@
+/* @flow */
+
+module.exports = require(`./package.json`);
+
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
+}

packages/pkg-tests/pkg-tests-fixtures/packages/has-bin-entries-1.0.0/package.json

@@ -0,0 +1,13 @@
+{
+    "name": "has-bin-entries",
+    "version": "1.0.0",
+    "bin": {
+        "has-bin-entries": "./bin.js",
+        "has-bin-entries-with-require": "./bin-with-require.js",
+        "has-bin-entries-with-relative-require": "./bin-with-relative-require.js",
+        "has-bin-entries-get-pwd": "./bin-get-pwd.js"
+    },
+    "dependencies": {
+        "no-deps": "1.0.0"
+    }
+}

packages/pkg-tests/pkg-tests-fixtures/packages/has-bin-entries-1.0.0/secret.js

@@ -0,0 +1 @@
+module.exports = 42;

packages/pkg-tests/pkg-tests-fixtures/packages/hoisting-peer-check-child-1.0.0/index.js

@@ -1,5 +1,10 @@
+/* @flow */
+
 module.exports = require(`./package.json`);
 
-for (const key of Object.keys(module.exports.dependencies || {})) {
-  module.exports.dependencies[key] = require(key);
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    // $FlowFixMe The whole point of this file is to be dynamic
+    module.exports[key][dep] = require(dep);
+  }
 }