Move to upath, honor swDest subdirs (#2140)

Author: jeffposnick

Diff for: packages/workbox-build/package-lock.json

@@ -8,7 +8,7 @@
 
 const assert = require('assert');
 const fse = require('fs-extra');
-const path = require('path');
+const upath = require('upath');
 
 const errors = require('../lib/errors');
 const escapeRegexp = require('../lib/escape-regexp');
@@ -40,7 +40,7 @@ const validate = require('./options/validate');
 async function injectManifest(config) {
   const options = validate(config, injectManifestSchema);
 
-  if (path.resolve(config.swSrc) === path.resolve(config.swDest)) {
+  if (upath.resolve(config.swSrc) === upath.resolve(config.swDest)) {
     throw new Error(errors['same-src-and-dest']);
   }
 
@@ -65,7 +65,7 @@ async function injectManifest(config) {
   swFileContents = swFileContents.replace(globalRegexp, entriesString);
 
   try {
-    await fse.mkdirp(path.dirname(options.swDest));
+    await fse.mkdirp(upath.dirname(options.swDest));
   } catch (error) {
     throw new Error(errors['unable-to-make-injection-directory'] +
       ` '${error.message}'`);

Diff for: packages/workbox-build/src/entry-points/inject-manifest.js

@@ -11,7 +11,7 @@ const {terser} = require('rollup-plugin-terser');
 const {writeFile} = require('fs-extra');
 const babel = require('rollup-plugin-babel');
 const omt = require('rollup-plugin-off-main-thread');
-const path = require('path');
+const upath = require('upath');
 const presetEnv = require('@babel/preset-env');
 const replace = require('rollup-plugin-replace');
 const resolve = require('rollup-plugin-node-resolve');
@@ -27,7 +27,9 @@ module.exports = async ({
 }) => {
   // We need to write this to the "real" file system, as Rollup won't read from
   // a custom file system.
-  const temporaryFile = tempy.file({name: path.basename(swDest)});
+  const {dir, base} = upath.parse(swDest);
+
+  const temporaryFile = tempy.file({name: base});
   await writeFile(temporaryFile, unbundledCode);
 
   const plugins = [
@@ -107,5 +109,13 @@ module.exports = async ({
     }
   }
 
-  return files;
+  // Make sure that if there was a directory portion included in swDest, it's
+  // preprended to all of the generated files.
+  return files.map((file) => {
+    file.name = upath.format({
+      dir,
+      base: file.name,
+    });
+    return file;
+  });
 };

Diff for: packages/workbox-build/src/lib/bundle.js

@@ -7,7 +7,7 @@
 */
 
 const fse = require('fs-extra');
-const path = require('path');
+const upath = require('upath');
 const errors = require('./errors');
 
 
@@ -43,7 +43,7 @@ module.exports = async (destDirectory) => {
   // pkg.version whenever one of the dependent libraries gets bumped, and we
   // care about versioning the dependent libraries.
   const workboxDirectoryName = `workbox-v${thisPkg.version}`;
-  const workboxDirectoryPath = path.join(destDirectory, workboxDirectoryName);
+  const workboxDirectoryPath = upath.join(destDirectory, workboxDirectoryName);
   await fse.ensureDir(workboxDirectoryPath);
 
   const copyPromises = [];
@@ -53,10 +53,10 @@ module.exports = async (destDirectory) => {
   for (const library of librariesToCopy) {
     // Get the path to the package on the user's filesystem by require-ing
     // the package's `package.json` file via the node resolution algorithm.
-    const libraryPath = path.dirname(
+    const libraryPath = upath.dirname(
         require.resolve(`${library}/package.json`));
 
-    const buildPath = path.join(libraryPath, BUILD_DIR);
+    const buildPath = upath.join(libraryPath, BUILD_DIR);
 
     // fse.copy() copies all the files in a directory, not the directory itself.
     // See https://github.com/jprichardson/node-fs-extra/blob/master/docs/copy.md#copysrc-dest-options-callback

Diff for: packages/workbox-build/src/lib/copy-workbox-libraries.js

@@ -7,7 +7,7 @@
 */
 
 const glob = require('glob');
-const path = require('path');
+const upath = require('upath');
 
 const errors = require('./errors');
 const getFileSize = require('./get-file-size');
@@ -40,15 +40,15 @@ module.exports = ({
   }
 
   const fileDetails = globbedFiles.map((file) => {
-    const fullPath = path.join(globDirectory, file);
+    const fullPath = upath.join(globDirectory, file);
     const fileSize = getFileSize(fullPath);
     if (fileSize === null) {
       return null;
     }
 
     const fileHash = getFileHash(fullPath);
     return {
-      file: `${path.relative(globDirectory, fullPath)}`,
+      file: `${upath.relative(globDirectory, fullPath)}`,
       hash: fileHash,
       size: fileSize,
     };

Diff for: packages/workbox-build/src/lib/get-file-details.js

@@ -7,7 +7,7 @@
 */
 
 const assert = require('assert');
-const path = require('path');
+const upath = require('upath');
 
 const errors = require('./errors');
 const transformManifest = require('./transform-manifest');
@@ -38,7 +38,7 @@ module.exports = async ({
   if (globDirectory) {
     if (swDest) {
       // Ensure that we ignore the SW file we're eventually writing to disk.
-      globIgnores.push(`**/${path.basename(swDest)}`);
+      globIgnores.push(`**/${upath.basename(swDest)}`);
     }
 
     try {