@plaudit/webpack-extensions 2.21.3 → 2.22.0

package/build/wordpress-scripts-wrapper.js

@@ -128,14 +128,18 @@ function testForDuplicatedEntryPaths(config) {
         process.exit(1);
     }
 }
-function disableDefaultURLProcessing(webpackConfig) {
+function replaceDefaultURLProcessing(webpackConfig) {
     const cssLoader = require.resolve('css-loader');
     if (cssLoader && webpackConfig.module?.rules) {
         for (const rule of webpackConfig.module.rules) {
             if (isTruthy(rule) && typeof rule === 'object' && "use" in rule && Array.isArray(rule.use)) {
                 for (const useElement of rule.use) {
                     if (isTruthy(useElement) && typeof useElement === 'object' && useElement.loader === cssLoader && typeof useElement.options === 'object') {
-                        useElement.options['url'] = false;
+                        useElement.options['url'] = {
+                            filter(url) {
+                                return !url.startsWith("/") && !!url.match(/\.(woff|woff2|eot|ttf|otf|png|jpe?g|svg|webp|avif|gif)[^.]*?(\?.*)?/i);
+                            }
+                        };
                     }
                 }
             }
@@ -146,24 +150,32 @@ function injectPostcssConfigOverrides(webpackConfig, variables, verbose) {
     if (webpackConfig.module?.rules) {
         const postcssConfig = (0, static_configs_1.postcssConfigBuilder)(verbose, name => variables(name) ?? (name === 'ENV' ? '' : undefined));
         return webpackConfig.module.rules.map(rule => {
-            if (isTruthy(rule) && typeof rule === 'object' && Array.isArray(rule.use)) {
-                for (const useItem of rule.use) {
-                    if (isTruthy(useItem) && typeof useItem === 'object' && typeof useItem.options === 'object') {
-                        if (useItem.options["sourceMap"] === false) {
-                            useItem.options["sourceMap"] = true;
-                        }
-                        if (useItem.loader?.includes('postcss-loader')) {
-                            if (useItem.options["postcssOptions"]) {
-                                useItem.options["postcssOptions"] = { ...useItem.options["postcssOptions"], ...postcssConfig, sourceMap: true };
+            if (isTruthy(rule) && typeof rule === 'object') {
+                if (Array.isArray(rule.use)) {
+                    for (const useItem of rule.use) {
+                        if (isTruthy(useItem) && typeof useItem === 'object' && typeof useItem.options === 'object') {
+                            if (useItem.options["sourceMap"] === false) {
+                                useItem.options["sourceMap"] = true;
                             }
-                            else {
-                                useItem.options["postcssOptions"] = { ...postcssConfig, sourceMap: true };
+                            if (useItem.loader?.includes('postcss-loader')) {
+                                if (useItem.options["postcssOptions"]) {
+                                    useItem.options["postcssOptions"] = { ...useItem.options["postcssOptions"], ...postcssConfig, sourceMap: true };
+                                }
+                                else {
+                                    useItem.options["postcssOptions"] = { ...postcssConfig, sourceMap: true };
+                                }
                             }
                         }
                     }
+                    if (rule.test instanceof RegExp && (rule.test.test("index.ts") || rule.test.test("index.mts"))) { // Then this is the javascript and typescript rule
+                        rule.test = /\.m?[jt]sx?$/; // This hacks in support for mjs and mts files
+                    }
                 }
-                if (rule.test instanceof RegExp && (rule.test.test("index.ts") || rule.test.test("index.mts"))) { // Then this is the javascript and typescript rule
-                    rule.test = /\.m?[jt]sx?$/; // This hacks in support for mjs and mts files
+                if (typeof rule.generator === 'object') {
+                    const ruleGeneratorFilename = rule.generator["filename"];
+                    if (typeof ruleGeneratorFilename === 'string' && (ruleGeneratorFilename.startsWith("images/") || ruleGeneratorFilename.startsWith("fonts/"))) {
+                        rule.generator["filename"] = `../${ruleGeneratorFilename}`;
+                    }
                 }
             }
             return rule;
@@ -210,7 +222,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
     }
     const { standaloneBlocks, variablesFilePath, verbose } = config;
     let currentVariables = config.currentVariables;
-    disableDefaultURLProcessing(webpackConfig);
+    replaceDefaultURLProcessing(webpackConfig);
     const fixedRules = injectPostcssConfigOverrides(webpackConfig, name => currentVariables[name], verbose);
     return sources.map(([src, dest]) => {
         const srcRoots = (typeof dest !== 'string' && dest.withLegacyBlocksIn
@@ -347,6 +359,26 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
                 publicPath = `/${node_path_1.default.relative(prefix, outPath)}/`;
             }
         }
+        let viableRoots = [...(Array.isArray(webpackConfig.context) ? webpackConfig.context : [webpackConfig.context ?? process.cwd()])];
+        if (Array.isArray(srcRoot)) {
+            viableRoots.push(...(srcIsDirectory ? srcRoot : srcRoot.map(s => node_path_1.default.dirname(s))));
+        }
+        else {
+            viableRoots.push(srcIsDirectory ? srcRoot : node_path_1.default.dirname(srcRoot));
+        }
+        let wpContentHolderDirectory = process.cwd();
+        while (wpContentHolderDirectory.length > 5) {
+            if (node_path_1.default.basename(wpContentHolderDirectory) === 'wp-content') {
+                wpContentHolderDirectory = node_path_1.default.dirname(wpContentHolderDirectory);
+                if (wpContentHolderDirectory.length > 5) {
+                    viableRoots.push(wpContentHolderDirectory);
+                }
+                break;
+            }
+            wpContentHolderDirectory = node_path_1.default.dirname(wpContentHolderDirectory);
+        }
+        const distinctViableRoots = new Set();
+        viableRoots = viableRoots.filter(value => distinctViableRoots.has(value) ? false : distinctViableRoots.add(value) && true);
         return {
             ...webpackConfig,
             devtool: 'source-map',
@@ -363,6 +395,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
             },
             resolve: {
                 ...webpackConfig.resolve,
+                roots: viableRoots,
                 extensions: ['.mjsx', '.mjs', '.mtsx', '.mts', '.jsx', '.tsx', '.ts', '...']
             },
             stats: config.stats,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.21.3",
+  "version": "2.22.0",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",