Fixes offline resolution for absolute Windows paths (#3319)

* Fixes offline resolution for absolute Windows paths * lint fix * Update tarball-fetcher.js * Update lockfiles.js * Update lockfiles.js
yarnpkg · May 4, 2017 · 8be7dc3 · 8be7dc3
1 parent 1912235
commit 8be7dc3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/__tests__/commands/install/lockfiles.js b/__tests__/commands/install/lockfiles.js
@@ -19,7 +19,9 @@ 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.replace(/\\/g, `/`)));
+    let packageJson = await fs.readFile(`${cwd}/package.json`);
+    packageJson = packageJson.replace(/%%CWD%%/g, cwd.replace(/\\/g, `/`));
+    await fs.writeFile(`${cwd}/package.json`, packageJson);
   });
 });
 

diff --git a/src/fetchers/tarball-fetcher.js b/src/fetchers/tarball-fetcher.js
@@ -180,7 +180,13 @@ export default class TarballFetcher extends BaseFetcher {
   async _fetch(): Promise<FetchedOverride> {
     const urlParse = url.parse(this.reference);
 
-    if (urlParse.protocol === null && urlParse.pathname.match(/^(?=(?:\.{1,2}|[a-z]:)?[\\\/])/i)) {
+    const isFilePath = urlParse.protocol
+      ? urlParse.protocol.match(/^[a-z]:$/i)
+      : urlParse.pathname
+        ? urlParse.pathname.match(/^(?:\.{1,2})?[\\\/]/)
+        : false;
+
+    if (isFilePath) {
       return await this.fetchFromLocal(this.reference);
     }