Fix offline resolution (#3311)

yarnpkg · May 4, 2017 · 00f6780 · 00f6780
1 parent 0b3c443
commit 00f6780
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/__tests__/commands/install/lockfiles.js b/__tests__/commands/install/lockfiles.js
@@ -15,9 +15,11 @@ const fsNode = require('fs');
 const path = require('path');
 const os = require('os');
 
-test.concurrent('does fetch files from the local filesystem', (): Promise<void> => {
+test('does fetch files from the local filesystem', (): Promise<void> => {
   return runInstall({}, 'install-should-fetch-local-tarballs', (config): Promise<void> => {
     return Promise.resolve();
+  }, async (cwd) => {
+    await fs.writeFile(`${cwd}/package.json`, (await fs.readFile(`${cwd}/package.json`)).replace(/%%CWD%%/g, cwd));
   });
 });
 

diff --git a/...alls/@fakescope-fake-dependency-1.0.1.tgz → ...balls/fakescope-fake-dependency-1.0.1.tgz b/...alls/@fakescope-fake-dependency-1.0.1.tgz → ...balls/fakescope-fake-dependency-1.0.1.tgz
diff --git a/__tests__/fixtures/install/install-should-fetch-local-tarballs/package.json b/__tests__/fixtures/install/install-should-fetch-local-tarballs/package.json
@@ -1,6 +1,7 @@
 {
   "license": "MIT",
   "dependencies": {
-    "fake-dependency": "./fake-dependency-1.0.1.tgz"
+    "fake-dependency": "./fake-dependency-1.0.1.tgz",
+    "@fakescope/fake-dependency": "%%CWD%%/fakescope-fake-dependency-1.0.1.tgz"
   }
 }
diff --git a/src/fetchers/tarball-fetcher.js b/src/fetchers/tarball-fetcher.js
@@ -180,7 +180,7 @@ export default class TarballFetcher extends BaseFetcher {
   async _fetch(): Promise<FetchedOverride> {
     const urlParse = url.parse(this.reference);
 
-    if (urlParse.protocol === null && urlParse.pathname.match(/^\.\.?[\/\\]/)) {
+    if (urlParse.protocol === null && urlParse.pathname.match(/^(?=(?:\.{1,2}|[a-z]:)?[\\\/])/i)) {
       return await this.fetchFromLocal(this.reference);
     }