Preserve images and fonts directory structure in dist/ and keep vendo…

…r ones in a new vendor directory
htmlburger · Jul 11, 2020 · 90b0910 · 90b0910
1 parent 94935d7
commit 90b0910
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/resources/build/lib/utils.js b/resources/build/lib/utils.js
@@ -113,4 +113,20 @@ module.exports.filehash = (file) => {
   return hash.digest('hex');
 };
 
-module.exports.filehashFilter = file => `[name].${module.exports.filehash(file).substr(0, 10)}.[ext]`;
+module.exports.filehasher = (relativeTo = null) => (file) => {
+  const resourcesDir = path.normalize(exports.srcPath()) + path.sep;
+  const isUserFile = path.normalize(file).substr(0, resourcesDir.length) === resourcesDir;
+  let filepath = 'vendor';
+
+  if (isUserFile) {
+    filepath = '';
+
+    if (relativeTo !== null) {
+      filepath = path.relative(relativeTo, path.dirname(file));
+    }
+  }
+
+  filepath += filepath ? '/' : '';
+
+  return `${filepath}[name].${module.exports.filehash(file).substr(0, 10)}.[ext]`;
+};
diff --git a/resources/build/webpack.development.js b/resources/build/webpack.development.js
@@ -164,7 +164,7 @@ module.exports = {
           {
             loader: 'file-loader',
             options: {
-              name: utils.filehashFilter,
+              name: utils.filehasher(utils.srcImagesPath()),
               outputPath: 'images',
             },
           },
@@ -198,7 +198,7 @@ module.exports = {
           {
             loader: 'file-loader',
             options: {
-              name: utils.filehashFilter,
+              name: utils.filehasher(utils.srcFontsPath()),
               outputPath: 'fonts',
             },
           },

diff --git a/resources/build/webpack.production.js b/resources/build/webpack.production.js
@@ -192,7 +192,7 @@ module.exports = {
           {
             loader: 'file-loader',
             options: {
-              name: utils.filehashFilter,
+              name: utils.filehasher(utils.srcImagesPath()),
               outputPath: 'images',
             },
           },
@@ -227,7 +227,7 @@ module.exports = {
           {
             loader: 'file-loader',
             options: {
-              name: utils.filehashFilter,
+              name: utils.filehasher(utils.srcFontsPath()),
               outputPath: 'fonts',
             },
           },