focused workspaces

Author: bdwain

__tests__/commands/check.js

@@ -33,6 +33,16 @@ test.concurrent('--verify-tree should report wrong version', async (): Promise<v
  expect(thrown).toEqual(true);
 });
 
+test.concurrent('--verify-tree should work from a workspace cwd', async (): Promise<void> => {
+ let thrown = false;
+ try {
+ await runCheck([], {verifyTree: true}, {source: 'verify-tree-workspace-cwd', cwd: '/packages/workspace-1'});
+ } catch (e) {
+ thrown = true;
+ }
+ expect(thrown).toEqual(false);
+});
+
 test.concurrent('--verify-tree should report missing dependency', async (): Promise<void> => {
  let thrown = false;
  try {

__tests__/commands/install/integration.js

@@ -257,7 +257,7 @@ test('changes the cache directory when bumping the cache version', async () => {
  await resolver.init([{pattern: 'is-array', registry: 'npm'}]);
 
  const ref = resolver.getManifests()[0]._reference;
- const cachePath = config.generateHardModulePath(ref, true);
+ const cachePath = config.generateModuleCachePath(ref);
 
  await fs.writeFile(path.join(cachePath, 'yarn.test'), 'YARN TEST');
  await fs.unlink(path.join(config.cwd, 'node_modules'));

__tests__/fixtures/check/verify-tree-workspace-cwd/package.json

@@ -0,0 +1,7 @@
+{
+ "name": "my-project",
+ "private": true,
+ "workspaces": [
+ "packages/*"
+ ]
+}

__tests__/fixtures/check/verify-tree-workspace-cwd/packages/left-pad/package.json

@@ -0,0 +1,30 @@
+{
+ "name": "left-pad",
+ "version": "1.1.2",
+ "description": "String left pad",
+ "main": "index.js",
+ "scripts": {
+ "test": "node test",
+ "bench": "node perf/perf.js"
+ },
+ "keywords": [
+ "leftpad",
+ "left",
+ "pad",
+ "padding",
+ "string",
+ "repeat"
+ ],
+ "repository": {
+ "url": "git@github.com:stevemao/left-pad.git",
+ "type": "git"
+ },
+ "author": "azer",
+ "maintainers": [
+ {
+ "name": "Cameron Westland",
+ "email": "camwest@gmail.com"
+ }
+ ],
+ "license": "WTFPL"
+}

__tests__/fixtures/check/verify-tree-workspace-cwd/packages/workspace-1/package.json

@@ -0,0 +1,7 @@
+{
+ "name": "workspace-1",
+ "version": "1.0.0",
+ "dependencies": {
+ "left-pad": "1.1.2"
+ }
+}

__tests__/package-hoister.js

@@ -46,7 +46,7 @@ function createTestFixture(
  getFolder(): string {
  return 'node_modules';
  },
- generateHardModulePath(pkg: ?PackageReference): string {
+ generateModuleCachePath(pkg: ?PackageReference): string {
  return pkg ? pkg.uid : '';
  },
  getWorkspaces(manifest: ?Manifest): ?WorkspacesConfig {

__tests__/package-resolver.js

@@ -51,7 +51,7 @@ function addTest(pattern, registry = 'npm', init: ?(cacheFolder: string) => Prom
  await resolver.init([{pattern, registry}]);
 
  const ref = resolver.getManifests()[0]._reference;
- const cachePath = config.generateHardModulePath(ref, true);
+ const cachePath = config.generateModuleCachePath(ref);
  expect(cachePath).toMatch(cachePathRe);
 
  await reporter.close();

package.json

@@ -117,6 +117,7 @@
  "release-branch": "./scripts/release-branch.sh",
  "test": "yarn lint && yarn test-only",
  "test-only": "node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose",
+ "test-only-debug": "node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose",
  "test-coverage": "node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose",
  "watch": "gulp watch",
  "commit": "git-cz"

src/cli/commands/check.js

@@ -39,7 +39,8 @@ export async function verifyTreeCheck(
  // check all dependencies recursively without relying on internal resolver
  const registryName = 'yarn';
  const registry = config.registries[registryName];
- const rootManifest = await config.readManifest(registry.cwd, registryName);
+ const cwd = config.workspaceRootFolder ? config.lockfileFolder : config.cwd;
+ const rootManifest = await config.readManifest(cwd, registryName);
 
  type PackageToVerify = {
  name: string,
@@ -59,7 +60,7 @@ export async function verifyTreeCheck(
  dependenciesToCheckVersion.push({
  name,
  originalKey: name,
- parentCwd: registry.cwd,
+ parentCwd: cwd,
  version,
  });
  }
@@ -75,7 +76,7 @@ export async function verifyTreeCheck(
  dependenciesToCheckVersion.push({
  name,
  originalKey: name,
- parentCwd: registry.cwd,
+ parentCwd: cwd,
  version,
  });
  }
@@ -109,19 +110,15 @@ export async function verifyTreeCheck(
  for (const subdep in dependencies) {
  const subDepPath = path.join(manifestLoc, registry.folder, subdep);
  let found = false;
- const relative = path.relative(registry.cwd, subDepPath);
+ const relative = path.relative(cwd, subDepPath);
  const locations = path.normalize(relative).split(registry.folder + path.sep).filter(dir => !!dir);
  locations.pop();
  while (locations.length >= 0) {
  let possiblePath;
  if (locations.length > 0) {
- possiblePath = path.join(
- registry.cwd,
- registry.folder,
- locations.join(path.sep + registry.folder + path.sep),
- );
+ possiblePath = path.join(cwd, registry.folder, locations.join(path.sep + registry.folder + path.sep));
  } else {
- possiblePath = registry.cwd;
+ possiblePath = cwd;
  }
  if (await fs.exists(path.join(possiblePath, registry.folder, subdep))) {
  dependenciesToCheckVersion.push({

src/cli/commands/install.js

@@ -75,8 +75,11 @@ type Flags = {
  // outdated, update-interactive
  includeWorkspaceDeps: boolean,
 
- // remove, upgrade
+ // add, remove, upgrade
  workspaceRootIsCwd: boolean,
+
+ // focus
+ focus: boolean,
 };
 
 /**
@@ -155,6 +158,9 @@ function normalizeFlags(config: Config, rawFlags: Object): Flags {
 
  // add, remove, update
  workspaceRootIsCwd: rawFlags.workspaceRootIsCwd !== false,
+
+ // focus
+ focus: !!rawFlags.focus,
  };
 
  if (config.getOption('ignore-scripts')) {
@@ -514,6 +520,11 @@ export class Install {
  this.reporter.warn(this.reporter.lang('shrinkwrapWarning'));
  }
 
+ // running a focused install in a workspace root is not allowed
+ if (this.flags.focus && (!this.config.workspaceRootFolder || this.config.cwd === this.config.workspaceRootFolder)) {
+ throw new MessageError(this.reporter.lang('workspacesFocusRootCheck'));
+ }
+
  let flattenedTopLevelPatterns: Array<string> = [];
  const steps: Array<(curr: number, total: number) => Promise<{bailout: boolean} | void>> = [];
  const {
@@ -545,6 +556,7 @@ export class Install {
  isFlat: this.flags.flat,
  isFrozen: this.flags.frozenLockfile,
  workspaceLayout,
+ focus: this.flags.focus,
  });
  topLevelPatterns = this.preparePatterns(rawPatterns);
  flattenedTopLevelPatterns = await this.flatten(topLevelPatterns);
@@ -575,6 +587,7 @@ export class Install {
  await this.linker.init(flattenedTopLevelPatterns, workspaceLayout, {
  linkDuplicates: this.flags.linkDuplicates,
  ignoreOptional: this.flags.ignoreOptional,
+ focus: this.flags.focus,
  });
  }),
  );
@@ -633,7 +646,7 @@ export class Install {
  (await fs.exists(path.join(this.config.lockfileFolder, constants.LOCKFILE_FILENAME)))
  ) {
  await this.saveLockfileAndIntegrity(topLevelPatterns, workspaceLayout);
- } else {
+ } else if (!this.flags.focus) {
  this.reporter.info(this.reporter.lang('notSavedLockfileNoDependencies'));
  }
  this.maybeOutputUpdate();
@@ -805,7 +818,7 @@ export class Install {
  this.scripts.getArtifacts(),
  );
 
- // --no-lockfile or --pure-lockfile or --frozen-lockfile flag
+ // --no-lockfile or --pure-lockfile or --frozen-lockfile or --focus flag
  if (this.flags.lockfile === false || this.flags.pureLockfile || this.flags.frozenLockfile) {
  return;
  }
@@ -884,7 +897,7 @@ export class Install {
  }
  loc = ref.remote.reference;
  } else {
- loc = this.config.generateHardModulePath(ref);
+ loc = this.config.generateModuleCachePath(ref);
  }
  const newPkg = await this.config.readManifest(loc);
  await this.resolver.updateManifest(ref, newPkg);
@@ -973,6 +986,7 @@ export function hasWrapper(commander: Object, args: Array<string>): boolean {
 export function setFlags(commander: Object) {
  commander.description('Yarn install is used to install all dependencies for a project.');
  commander.usage('install [flags]');
+ commander.option('--focus', 'Focus on a single workspace by installing remote copies of its sibling workspaces.');
  commander.option('-g, --global', 'DEPRECATED');
  commander.option('-S, --save', 'DEPRECATED - save package to your `dependencies`');
  commander.option('-D, --save-dev', 'DEPRECATED - save package to your `devDependencies`');