always reemit assets for cache support

vercel · Dec 17, 2018 · cf5cd9d · cf5cd9d
1 parent db6eb51
commit cf5cd9d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/src/loaders/node-loader.js b/src/loaders/node-loader.js
@@ -13,10 +13,7 @@ module.exports = async function (content) {
   const options = getOptions(this);
 
   const pkgBase = getPackageBase(this.resourcePath) || path.dirname(id);
-  if (!options.assetNames[`sharedlibs:${pkgBase}`]) {
-    options.assetNames[`sharedlibs:${pkgBase}`] = true;
-    await sharedlibEmit(pkgBase, this.emitFile);
-  }
+  await sharedlibEmit(pkgBase, this.emitFile);
 
   const name = getUniqueAssetName(id.substr(pkgBase.length + 1), id, options.assetNames);
   this.emitFile(name, content);

diff --git a/src/loaders/relocate-loader.js b/src/loaders/relocate-loader.js
@@ -227,9 +227,6 @@ module.exports = function (code) {
     if (assetPath.endsWith('.js') || assetPath.endsWith('.mjs'))
       return;
 
-    if (options.assets[assetPath])
-      return "__dirname + '/" + JSON.stringify(options.assets[assetPath]).slice(1, -1) + "'";
-
     let outName = path.basename(assetPath);
 
     if (assetPath.endsWith('.node')) {
@@ -238,14 +235,11 @@ module.exports = function (code) {
         outName = assetPath.substr(pkgBase.length);
       // If the asset is a ".node" binary, then glob for possible shared
       // libraries that should also be included
-      if (!options.assetNames[`sharedlibs:${pkgBase}`]) {
-        options.assetNames[`sharedlibs:${pkgBase}`] = true;
-        assetEmissionPromises = assetEmissionPromises.then(sharedlibEmit(pkgBase, this.emitFile));
-      }
+      assetEmissionPromises = assetEmissionPromises.then(sharedlibEmit(pkgBase, this.emitFile));
     }
 
-    const name = getUniqueAssetName(outName, assetPath, options.assetNames);
-    options.assets[assetPath] = name;
+    const name = options.assets[assetPath] ||
+        (options.assets[assetPath] = getUniqueAssetName(outName, assetPath, options.assetNames));
 
     // console.log('Emitting ' + assetPath + ' for module ' + id);
     assetEmissionPromises = assetEmissionPromises.then(async () => {
@@ -257,11 +251,8 @@ module.exports = function (code) {
     return "__dirname + '/" + JSON.stringify(name).slice(1, -1) + "'";
   };
   const emitAssetDirectory = (assetDirPath) => {
-    if (options.assets[assetDirPath])
-      return "__dirname + '/" + JSON.stringify(options.assets[assetDirPath]).slice(1, -1) + "'";
-
     const dirName = path.basename(assetDirPath);
-    const name = getUniqueAssetName(dirName, assetDirPath, options.assetNames);
+    const name = options.assets[assetDirPath] || (options.assets[assetDirPath] = getUniqueAssetName(dirName, assetDirPath, options.assetNames));
     options.assets[assetDirPath] = name;
 
     assetEmissionPromises = assetEmissionPromises.then(async () => {