@plaudit/webpack-extensions 2.0.2 → 2.1.0

package/build/wordpress-scripts-wrapper.js

@@ -6,11 +6,11 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const AdditionalDependencyInjectorPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/AdditionalDependencyInjectorPlugin"));
 const BlockJSONStyleRemappingPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/BlockJSONStyleRemappingPlugin"));
+const static_configs_1 = require("./wordpress-scripts-wrapper/static-configs");
 const browser_sync_webpack_plugin_1 = __importDefault(require("browser-sync-webpack-plugin"));
 const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
 const webpack_remove_empty_scripts_1 = __importDefault(require("webpack-remove-empty-scripts"));
-const static_configs_1 = require("./wordpress-scripts-wrapper/static-configs");
 function joinPossiblyAbsolutePaths(...paths) {
     return paths.reduce((res, p) => !res || node_path_1.default.isAbsolute(p) ? p : node_path_1.default.join(res, p), '') || '.';
 }
@@ -23,14 +23,49 @@ function addEntryPointWithMapper(entrypoints, entrypoint, dir, mapper = (entrypo
         }
     }
 }
+function isTruthy(value) {
+    return !!value;
+}
 module.exports = function (config, webpackConfig = require("@wordpress/scripts/config/webpack.config")) {
+    const seenPaths = new Map();
+    for (const bundleName of (Array.isArray(config.src) ? config.src : Object.values(config.src))) {
+        const key = bundleName.substring(0, bundleName.length - node_path_1.default.extname(bundleName).length);
+        let seen = seenPaths.get(key);
+        if (seen === undefined) {
+            seenPaths.set(key, seen = []);
+        }
+        seen.push(bundleName);
+        node_path_1.default.basename(bundleName, node_path_1.default.extname(bundleName));
+    }
+    let projectPrefix = undefined;
+    let duplicatedPaths = "";
+    for (const sameNamePaths of seenPaths.values()) {
+        if (sameNamePaths.length > 1) {
+            if (projectPrefix === undefined) {
+                for (let p = process.cwd(); p.length > 1; p = node_path_1.default.dirname(p)) {
+                    if (node_fs_1.default.existsSync(node_path_1.default.join(p, "docker-compose.yml"))) {
+                        projectPrefix = new RegExp(`^${p}`);
+                        break;
+                    }
+                }
+                if (projectPrefix === undefined) {
+                    projectPrefix = /^/;
+                }
+            }
+            duplicatedPaths += `\n* ${node_path_1.default.dirname(sameNamePaths[0]).replace(projectPrefix, '')}/[${sameNamePaths.map(p => node_path_1.default.basename(p)).join(', ')}]`;
+        }
+    }
+    if (duplicatedPaths.length !== 0) {
+        console.error(`Encountered multiple paths that produce the same effective bundle name:${duplicatedPaths}`);
+        process.exit(1);
+    }
     const { legacyPostcssPlugins = false, variables = ["variables.js", "preprocess/variables.js"].map(p => node_path_1.default.join(process.cwd(), p)).filter(p => node_fs_1.default.existsSync(p)).map(p => require(p))[0] ?? {}, verbose = process.argv.includes('--verbose') || process.env['VERBOSE'] === 'true' } = config;
     const cssLoader = require.resolve('css-loader');
     if (cssLoader && webpackConfig.module?.rules) {
         for (const rule of webpackConfig.module.rules) {
-            if (typeof rule === 'object' && "use" in rule && Array.isArray(rule.use)) {
+            if (isTruthy(rule) && typeof rule === 'object' && "use" in rule && Array.isArray(rule.use)) {
                 for (const useElement of rule.use) {
-                    if (typeof useElement === 'object' && useElement.loader === cssLoader && typeof useElement.options === 'object') {
+                    if (isTruthy(useElement) && typeof useElement === 'object' && useElement.loader === cssLoader && typeof useElement.options === 'object') {
                         useElement.options['url'] = false;
                     }
                 }
@@ -49,9 +84,9 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
             return undefined;
         });
         for (const rule of webpackConfig.module.rules) {
-            if (typeof rule === 'object' && Array.isArray(rule.use)) {
+            if (isTruthy(rule) && typeof rule === 'object' && Array.isArray(rule.use)) {
                 for (const useItem of rule.use) {
-                    if (typeof useItem === 'object' && typeof useItem.options === 'object') {
+                    if (isTruthy(useItem) && typeof useItem === 'object' && typeof useItem.options === 'object') {
                         if (useItem.options["sourceMap"] === false) {
                             useItem.options["sourceMap"] = true;
                         }
@@ -76,7 +111,7 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
         const srcRoot = srcRoots.length === 1 ? joinPossiblyAbsolutePaths(process.cwd(), src) : srcRoots.map(s => joinPossiblyAbsolutePaths(process.cwd(), s));
         const srcIsDirectory = !Array.isArray(srcRoot) && node_fs_1.default.lstatSync(srcRoot).isDirectory();
         const copyFiles = srcIsDirectory && src !== dest;
-        const plugins = webpackConfig.plugins ? [...webpackConfig.plugins] : [];
+        const plugins = webpackConfig.plugins?.filter(isTruthy) ?? [];
         plugins.push(new fork_ts_checker_webpack_plugin_1.default({
             typescript: {
                 diagnosticOptions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@types/browser-sync-webpack-plugin": "^2.2.2",
-    "@types/node": "^20.3.0",
+    "@types/node": "^20.3.1",
     "@types/tapable": "^2.2.3",
     "@types/webpack": "^5.28.1",
     "@types/webpack-sources": "^3.2.0",
@@ -56,7 +56,7 @@
     "postcss-simple-vars": "^7.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "webpack": "^5.86.0",
+    "webpack": "^5.87.0",
     "webpack-remove-empty-scripts": "^1.0.3",
     "webpack-sources": "^3.2.3"
   },