Merge pull request #4 from yarnpkg/master

merge updates

__tests__/commands/_helpers.js

@@ -92,6 +92,8 @@ export function makeConfigFromDirectory(cwd: string, reporter: Reporter, flags:
       production: flags.production,
       updateChecksums: !!flags.updateChecksums,
       focus: !!flags.focus,
+      enableDefaultRc: !flags.noDefaultRc,
+      extraneousYarnrcFiles: flags.useYarnrc,
     },
     reporter,
   );

__tests__/fixtures/cache/custom-location/.yarnrc

@@ -0,0 +1 @@
+cache-folder "./uses-default-yarnrc"

__tests__/fixtures/cache/custom-location/custom-yarnrc

@@ -0,0 +1 @@
+cache-folder "./uses-custom-yarnrc"

__tests__/fixtures/cache/custom-location/package.json

@@ -0,0 +1 @@
+{}

__tests__/integration.js

@@ -271,6 +271,26 @@ test('--cwd option', async () => {
   expect(packageJson.dependencies['left-pad']).toBeDefined();
 });
 
+const customCacheCwd = `${__dirname}/fixtures/cache/custom-location`;
+
+test('default rc', async (): Promise<void> => {
+  const [stdoutOutput] = await runYarn(['cache', 'dir'], {cwd: customCacheCwd});
+
+  expect(stdoutOutput).toMatch(/uses-default-yarnrc/);
+});
+
+test('--no-default-rc', async (): Promise<void> => {
+  const [stdoutOutput] = await runYarn(['cache', 'dir', '--no-default-rc'], {cwd: customCacheCwd});
+
+  expect(stdoutOutput).not.toMatch(/uses-default-yarnrc/);
+});
+
+test('--use-yarnrc', async (): Promise<void> => {
+  const [stdoutOutput] = await runYarn(['cache', 'dir', '--use-yarnrc', './custom-yarnrc'], {cwd: customCacheCwd});
+
+  expect(stdoutOutput).toMatch(/uses-custom-yarnrc/);
+});
+
 test('yarnrc arguments', async () => {
   const cwd = await makeTemp();
 

__tests__/rc.js

@@ -10,6 +10,22 @@ test('resolve .yarnrc args and use --cwd if present', () => {
   expect(args.indexOf('--foo') !== -1).toBe(true);
 });
 
+test("don't resolve .yarnrc args from the default locations when using --no-default-rc", () => {
+  const args = getRcArgs('install', ['--cwd', path.join(fixturesLoc, 'empty'), '--no-default-rc']);
+  expect(args.indexOf('--foo') !== -1).toBe(false);
+});
+
+test('resolve .yarnrc args from the extraneous locations when using --use-yarnrc', () => {
+  const args = getRcArgs('install', [
+    '--cwd',
+    path.join(fixturesLoc, 'empty'),
+    '--no-default-rc',
+    '--use-yarnrc',
+    path.join(fixturesLoc, 'empty', '.yarnrc'),
+  ]);
+  expect(args.indexOf('--foo') !== -1).toBe(true);
+});
+
 test('resolve .yarnrc args and use process.cwd() if no --cwd present', () => {
   const cwd = process.cwd();
   process.chdir(path.join(fixturesLoc, 'empty'));

__tests__/registries/npm-registry.js

@@ -77,7 +77,7 @@ describe('request', () => {
   function createRegistry(config: Object): Object {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
     npmRegistry.config = config;
     return {
       request(url: string, options: Object, packageName: string): Object {
@@ -577,7 +577,7 @@ describe('isRequestToRegistry functional test', () => {
   test('request to registry url matching', () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
 
     const validRegistryUrls = [
       ['http://foo.bar:80/foo/bar/baz', 'http://foo.bar/foo/'],
@@ -609,7 +609,7 @@ describe('isRequestToRegistry functional test', () => {
   test('isRequestToRegistry with custom host prefix', () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
 
     npmRegistry.config = {
       'custom-host-suffix': 'some.host.org',
@@ -659,7 +659,7 @@ describe('isScopedPackage functional test', () => {
   test('identifies scope correctly', () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
 
     packageIdents.forEach(([pathname, scope]) => {
       expect(npmRegistry.isScopedPackage(pathname)).toEqual(!!scope.length);
@@ -671,7 +671,7 @@ describe('getRequestUrl functional test', () => {
   test('returns pathname when it is a full URL', () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
     const fullURL = 'HTTP://xn--xample-hva.com:80/foo/bar/baz';
 
     expect(npmRegistry.getRequestUrl('https://my.registry.co', fullURL)).toEqual(fullURL);
@@ -680,7 +680,7 @@ describe('getRequestUrl functional test', () => {
   test('correctly handles registries lacking a trailing slash', () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
     const registry = 'https://my.registry.co/registry';
     const pathname = 'foo/bar/baz';
 
@@ -692,7 +692,7 @@ describe('getScope functional test', () => {
   describe('matches scope correctly', () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
 
     packageIdents.forEach(([pathname, scope]) => {
       expect(npmRegistry.getScope(pathname)).toEqual(scope);
@@ -705,7 +705,7 @@ describe('getPossibleConfigLocations', () => {
     const testCwd = './project/subdirectory';
     const {mockRequestManager, mockRegistries} = createMocks();
     const reporter = new BufferReporter({verbose: true});
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, reporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, reporter, true, []);
     await npmRegistry.getPossibleConfigLocations('npmrc', reporter);
 
     const logs = reporter.getBuffer().map(logItem => logItem.data);
@@ -730,7 +730,7 @@ describe('checkOutdated functional test', () => {
   test('homepage URL from top level', async () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
 
     mockRequestManager.request = () => {
       return {
@@ -758,7 +758,7 @@ describe('checkOutdated functional test', () => {
   test('homepage URL fallback to wanted package manifest', async () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
 
     mockRequestManager.request = () => {
       return {
@@ -786,7 +786,7 @@ describe('checkOutdated functional test', () => {
   test('repository URL from top level', async () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
 
     mockRequestManager.request = () => {
       return {
@@ -816,7 +816,7 @@ describe('checkOutdated functional test', () => {
   test('repository URL fallback to wanted package manifest', async () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
 
     mockRequestManager.request = () => {
       return {
@@ -846,7 +846,7 @@ describe('checkOutdated functional test', () => {
   test('unpublished package (no versions)', async () => {
     const testCwd = '.';
     const {mockRequestManager, mockRegistries, mockReporter} = createMocks();
-    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter);
+    const npmRegistry = new NpmRegistry(testCwd, mockRegistries, mockRequestManager, mockReporter, true, []);
 
     mockRequestManager.request = () => {
       return {

__tests__/util/semver.js

@@ -42,6 +42,10 @@ describe('satisfiesWithPrereleases', () => {
     expect(satisfiesWithPrereleases('1.0.0-alpha.1', '1.0.0-alpha')).toBe(false);
   });
 
+  it('rejects prerelease versions that are invalid', () => {
+    expect(satisfiesWithPrereleases('1.0.0-alpha.01', '^1.0.0')).toBe(false);
+  });
+
   it('follows the semver spec when comparing prerelease versions', () => {
     // Example from http://semver.org/#spec-item-11
     expect(satisfiesWithPrereleases('1.0.0-alpha.1', '>1.0.0-alpha')).toBe(true);

bin/yarn.js

@@ -24,6 +24,9 @@ if (majorVer < 4) {
   // be truthy when built with webpack :(
   var cli = require(dirPath + 'cli');
   if (!cli.autoRun) {
-    cli.default();
+    cli.default().catch(function(error) {
+      console.error(error.stack || error.message || error);
+      process.exitCode = 1;
+    });
   }
 }

src/cli/index.js

@@ -41,21 +41,33 @@ function findProjectRoot(base: string): string {
   return base;
 }
 
-export function main({
+export async function main({
   startArgs,
   args,
   endArgs,
 }: {
   startArgs: Array<string>,
   args: Array<string>,
   endArgs: Array<string>,
-}) {
+}): Promise<void> {
+  const collect = (val, acc) => {
+    acc.push(val);
+    return acc;
+  };
+
   loudRejection();
   handleSignals();
 
   // set global options
   commander.version(version, '-v, --version');
   commander.usage('[command] [flags]');
+  commander.option('--no-default-rc', 'prevent Yarn from automatically detecting yarnrc and npmrc files');
+  commander.option(
+    '--use-yarnrc <path>',
+    'specifies a yarnrc file that Yarn should use (.yarnrc only, not .npmrc)',
+    collect,
+    [],
+  );
   commander.option('--verbose', 'output verbose messages on internal operations');
   commander.option('--offline', 'trigger an error if any required dependencies are not available in local cache');
   commander.option('--prefer-offline', 'use network only if dependencies are not available in local cache');
@@ -477,11 +489,13 @@ export function main({
 
   const cwd = command.shouldRunInCurrentCwd ? commander.cwd : findProjectRoot(commander.cwd);
 
-  config
+  await config
     .init({
       cwd,
       commandName,
 
+      enableDefaultRc: commander.defaultRc,
+      extraneousYarnrcFiles: commander.useYarnrc,
       binLinks: commander.binLinks,
       modulesFolder: commander.modulesFolder,
       linkFolder: commander.linkFolder,
@@ -564,7 +578,7 @@ export function main({
 }
 
 async function start(): Promise<void> {
-  const rc = getRcConfigForCwd(process.cwd());
+  const rc = getRcConfigForCwd(process.cwd(), process.argv.slice(2));
   const yarnPath = rc['yarn-path'];
 
   if (yarnPath && !boolifyWithDefault(process.env.YARN_IGNORE_PATH, false)) {
@@ -590,7 +604,7 @@ async function start(): Promise<void> {
     const args = process.argv.slice(2, doubleDashIndex === -1 ? process.argv.length : doubleDashIndex);
     const endArgs = doubleDashIndex === -1 ? [] : process.argv.slice(doubleDashIndex);
 
-    main({startArgs, args, endArgs});
+    await main({startArgs, args, endArgs});
   }
 }
 
@@ -599,7 +613,10 @@ async function start(): Promise<void> {
 export const autoRun = module.children.length === 0;
 
 if (require.main === module) {
-  start();
+  start().catch(error => {
+    console.error(error.stack || error.message || error);
+    process.exitCode = 1;
+  });
 }
 
 export default start;

src/config.js

@@ -49,6 +49,9 @@ export type ConfigOptions = {
   nonInteractive?: boolean,
   scriptsPrependNodePath?: boolean,
 
+  enableDefaultRc?: boolean,
+  extraneousYarnrcFiles?: Array<string>,
+
   // Loosely compare semver for invalid cases like "0.01.0"
   looseSemver?: ?boolean,
 
@@ -96,6 +99,10 @@ export default class Config {
     this._init({});
   }
 
+  //
+  enableDefaultRc: boolean;
+  extraneousYarnrcFiles: Array<string>;
+
   //
   looseSemver: boolean;
   offline: boolean;
@@ -272,8 +279,17 @@ export default class Config {
     for (const key of Object.keys(registries)) {
       const Registry = registries[key];
 
+      const extraneousRcFiles = Registry === registries.yarn ? this.extraneousYarnrcFiles : [];
+
       // instantiate registry
-      const registry = new Registry(this.cwd, this.registries, this.requestManager, this.reporter);
+      const registry = new Registry(
+        this.cwd,
+        this.registries,
+        this.requestManager,
+        this.reporter,
+        this.enableDefaultRc,
+        extraneousRcFiles,
+      );
       await registry.init({
         registry: opts.registry,
       });
@@ -388,6 +404,9 @@ export default class Config {
 
     this.commandName = opts.commandName || '';
 
+    this.enableDefaultRc = !!opts.enableDefaultRc;
+    this.extraneousYarnrcFiles = opts.extraneousYarnrcFiles || [];
+
     this.preferOffline = !!opts.preferOffline;
     this.modulesFolder = opts.modulesFolder;
     this.globalFolder = opts.globalFolder || constants.GLOBAL_MODULE_DIRECTORY;

src/fetchers/git-fetcher.js

@@ -59,23 +59,24 @@ export default class GitFetcher extends BaseFetcher {
     return path.join(this.dest, constants.TARBALL_FILENAME);
   }
 
-  *getLocalPaths(override: ?string): Generator<?string, void, void> {
-    if (override) {
-      yield path.resolve(this.config.cwd, override);
-    }
-    yield this.getTarballMirrorPath();
-    yield this.getTarballMirrorPath({
-      withCommit: false,
-    });
-    yield this.getTarballCachePath();
+  getLocalPaths(override: ?string): Array<string> {
+    const paths: Array<?string> = [
+      override ? path.resolve(this.config.cwd, override) : null,
+      this.getTarballMirrorPath(),
+      this.getTarballMirrorPath({withCommit: false}),
+      this.getTarballCachePath(),
+    ];
+    // $FlowFixMe: https://github.com/facebook/flow/issues/1414
+    return paths.filter(path => path != null);
   }
 
   async fetchFromLocal(override: ?string): Promise<FetchedOverride> {
-    const {stream, triedPaths} = await fsUtil.readFirstAvailableStream(this.getLocalPaths(override));
+    const tarPaths = this.getLocalPaths(override);
+    const stream = await fsUtil.readFirstAvailableStream(tarPaths);
 
     return new Promise((resolve, reject) => {
       if (!stream) {
-        reject(new MessageError(this.reporter.lang('tarballNotInNetworkOrCache', this.reference, triedPaths)));
+        reject(new MessageError(this.reporter.lang('tarballNotInNetworkOrCache', this.reference, tarPaths)));
         return;
       }
       invariant(stream, 'cachedStream should be available at this point');