improve webpack plugins

Author: jancajthaml

cli/helpers/lint-stream.mjs

@@ -28,6 +28,7 @@ export async function run(options) {
       {
         cwd: process.env.INIT_CWD,
         ignore: [
+          "**/*.git*/**",
           "**/*node_modules/**",
           "**/*build/**",
           "**/*dist/**",
@@ -36,6 +37,7 @@ export async function run(options) {
           "**/*.dll.js",
           "**/*-lock.json",
           "**/lint-final.json",
+          "**/coverage-final.json",
         ],
       },
       (error, files) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lastui/rocker",
-  "version": "0.19.11",
+  "version": "0.19.12",
   "license": "Apache-2.0",
   "author": "[email protected]",
   "homepage": "https://github.com/lastui/rocker#readme",

webpack/plugins/ModuleLocalesPlugin.js

@@ -3,42 +3,32 @@ const path = require("path");
 
 const settings = require("../settings");
 
+async function ensureFile(filename, reject, resolve) {
+  fs.stat(filename, (stat_err, _stat) => {
+    if (stat_err === null) {
+      resolve(true);
+    } else if (stat_err.code === "ENOENT") {
+      fs.mkdir(path.dirname(filename), (mkdir_err) => {
+        if (mkdir_err && mkdir_err.code !== "EEXIST") {
+          reject(mkdir_err);
+        } else {
+          resolve(true);
+        }
+      });
+    } else {
+      reject(stat_err);
+    }
+  });
+}
+
 class ModuleLocalesPlugin {
-  constructor(options) {
-    this.from = options.from;
+  constructor() {
     this.paths_to_watch = [];
     for (const language of settings.SUPPORTED_LOCALES) {
       this.paths_to_watch.push(`${language}.json`);
     }
   }
 
-  async ensureAsset(filename) {
-    try {
-      return await fs.promises.readFile(filename, "utf8");
-    } catch (_error) {
-      await new Promise((resolve, reject) => {
-        const parent = path.dirname(filename);
-        fs.stat(parent, (stat_err, _stat) => {
-          if (stat_err === null) {
-            resolve(true);
-          } else if (stat_err.code === "ENOENT") {
-            fs.mkdir(parent, (mkdir_err) => {
-              if (mkdir_err && mkdir_err.code !== "EEXIST") {
-                reject(mkdir_err);
-              } else {
-                resolve(true);
-              }
-            });
-          } else {
-            reject(stat_err);
-          }
-        });
-      });
-      await fs.promises.writeFile(filename, "{}");
-      return "{}";
-    }
-  }
-
   apply(compiler) {
     compiler.hooks.thisCompilation.tap(ModuleLocalesPlugin.name, (compilation) => {
       compilation.hooks.processAssets.tapPromise(
@@ -49,6 +39,8 @@ class ModuleLocalesPlugin {
         async (_assets) => {
           const assetOutputDirectory = path.dirname(compilation.outputOptions.assetModuleFilename);
 
+          const assetsToWatch = [];
+
           for (const entryPoint of compilation.entrypoints.values()) {
             let entryPointOrigin = null;
 
@@ -65,14 +57,17 @@ class ModuleLocalesPlugin {
               if (origin.request.indexOf("webpack") !== -1) {
                 continue;
               }
+
               entryPointOrigin = path.extname(origin.request)
                 ? path.resolve(origin.request, "..", "..", "messages")
                 : path.resolve(origin.request, "..", "messages");
               break;
             }
 
+            const hasRuntimeChunk = entryPoint.chunks.length > 1;
+
             for (const chunk of entryPoint.chunks) {
-              if (chunk.id === chunk.runtime) {
+              if (hasRuntimeChunk && chunk.id === chunk.runtime) {
                 continue;
               }
 
@@ -81,18 +76,41 @@ class ModuleLocalesPlugin {
                 if (compilation.getAsset(outputPath)) {
                   continue;
                 }
-
                 const inputPath = path.resolve(entryPointOrigin, asset);
-                try {
-                  const content = await this.ensureAsset(inputPath);
-                  compilation.fileDependencies.add(inputPath);
-                  compilation.emitAsset(outputPath, new compiler.webpack.sources.RawSource(content));
-                } catch (error) {
-                  console.error("Failed to process locale asset", inputPath, "with error", error);
-                }
+                assetsToWatch.push([inputPath, outputPath]);
               }
             }
           }
+
+          for (const [inputPath, outputPath] of assetsToWatch) {
+            try {
+              const content = await new Promise((resolve, reject) => {
+                fs.readFile(inputPath, "utf8", (read_err, read_ok) => {
+                  if (!read_err) {
+                    resolve(read_ok);
+                    return;
+                  }
+                  ensureFile(inputPath, (ensure_err, _ensure_ok) => {
+                    if (ensure_err) {
+                      reject(ensure_err);
+                      return;
+                    }
+                    fs.writeFile(inputPath, "{}", (write_err, _write_ok) => {
+                      if (write_err) {
+                        reject(write_err);
+                        return;
+                      }
+                      resolve("{}");
+                    });
+                  });
+                });
+              });
+              compilation.fileDependencies.add(inputPath);
+              compilation.emitAsset(outputPath, new compiler.webpack.sources.RawSource(content));
+            } catch (error) {
+              console.error("Failed to process locale asset", inputPath, "with error", error);
+            }
+          }
         },
       );
     });

webpack/plugins/NormalizedModuleIdPlugin.js

@@ -1,23 +1,27 @@
 class NormalizedModuleIdPlugin {
+  constructor() {
+    this.volatileDir = new RegExp(/\/(dist|esm?|cjs|lib|unpkg)\//);
+    this.volatileExt = new RegExp(/\.(esm\.|cjs\.|m)js$/);
+  }
+
   apply(compiler) {
     compiler.hooks.compilation.tap(NormalizedModuleIdPlugin.name, (compilation) => {
       compilation.hooks.beforeModuleIds.tap(NormalizedModuleIdPlugin.name, (modules) => {
         for (const item of modules) {
           if (!item.libIdent) {
             continue;
           }
+
           const id = item.libIdent({ context: compiler.options.context });
-          if (!id) {
+          if (!id || id.startsWith("dll-reference")) {
             continue;
           }
+
           compilation.chunkGraph.setModuleId(
             item,
-            id.startsWith("./node_modules/@lastui/rocker")
-              ? id.replace(/.\/node_modules\/@lastui\/rocker/g, "@rocker")
-              : id
-                  .replace(/\/(dist|esm?|cjs|lib|unpkg)\//g, "/")
-                  .replace(/\.(esm|cjs)\.js$/g, ".js")
-                  .replace(/\.m?js$/g, ".js"),
+            id.startsWith("./node_modules/@lastui/rocker/")
+              ? "@" + id.substr(23)
+              : id.replace(this.volatileDir, "/").replace(this.volatileExt, ".js"),
           );
         }
       });