@plaudit/webpack-extensions 1.2.2 → 2.0.0-beta.0

package/build/wordpress-scripts-wrapper/wordpressWebpackEntrypointWrapper.js

@@ -11,18 +11,20 @@ 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 cssnano_1 = __importDefault(require("cssnano"));
+function joinPossiblyAbsolutePaths(...paths) {
+    return paths.reduce((res, p) => !res || node_path_1.default.isAbsolute(p) ? p : node_path_1.default.join(res, p), '') || '.';
+}
 function addEntryPointWithMapper(entrypoints, entrypoint, dir, mapper = (entrypoint) => entrypoint) {
     for (const ep of Array.isArray(entrypoint) ? entrypoint : [entrypoint]) {
-        const mapped = node_path_1.default.join(dir, mapper(ep));
+        const mapped = joinPossiblyAbsolutePaths(dir, mapper(ep));
         if (node_fs_1.default.existsSync(mapped)) {
             const parsedEntrypoint = node_path_1.default.parse(mapped);
-            entrypoints[node_path_1.default.join(node_path_1.default.basename(parsedEntrypoint.dir), parsedEntrypoint.name)] = { import: mapped };
+            entrypoints[joinPossiblyAbsolutePaths(node_path_1.default.basename(parsedEntrypoint.dir), parsedEntrypoint.name)] = { import: mapped };
         }
     }
 }
 function default_1(config, webpackConfig = require("@wordpress/scripts/config/webpack.config")) {
-    const { legacyPostcssPlugins = false, variables = node_fs_1.default.existsSync("./variables.js") ? require("./variables.js") : {}, // TODO: There must be a better way to handle this...
-     } = config;
+    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] ?? {}, } = config;
     // Nano Config
     // http://cssnano.co/guides/optimisations/  For the value to use click on one and then
     const nanoConfig = {
@@ -71,6 +73,18 @@ function default_1(config, webpackConfig = require("@wordpress/scripts/config/we
             }
         ]
     };
+    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)) {
+                for (const useElement of rule.use) {
+                    if (typeof useElement === 'object' && useElement.loader === cssLoader && typeof useElement.options === 'object') {
+                        useElement.options['url'] = false;
+                    }
+                }
+            }
+        }
+    }
     const postcssLoader = require.resolve('postcss-loader');
     if (postcssLoader && webpackConfig.module?.rules) {
         // Options: calc
@@ -82,7 +96,7 @@ function default_1(config, webpackConfig = require("@wordpress/scripts/config/we
                 require("postcss-import")(),
                 require("@plaudit/postcss-silent-extend")(),
                 require("postcss-mixins")(),
-                require("@plaudit/postcss-variables")(variables),
+                require("postcss-advanced-variables")(variables),
                 ...(legacyPostcssPlugins ? [
                     require("postcss-quantity-queries")(),
                     require("postcss-short-position")(),
@@ -123,9 +137,11 @@ function default_1(config, webpackConfig = require("@wordpress/scripts/config/we
         }
     }
     const sources = Array.isArray(config.src) ? config.src.map(s => [s, s]) : Object.entries(config.src);
-    return sources.map(([srcDir, dest]) => {
-        const srcRoot = node_path_1.default.join(process.cwd(), srcDir);
-        const copyFiles = srcDir !== dest;
+    return sources.map(([src, dest]) => {
+        const srcRoots = src.split(',');
+        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] : [];
         plugins.push(new fork_ts_checker_webpack_plugin_1.default({
             typescript: {
@@ -139,19 +155,10 @@ function default_1(config, webpackConfig = require("@wordpress/scripts/config/we
             plugins.push(new BlockJSONStyleRemappingPlugin_1.default());
         }
         plugins.push(new AdditionalDependencyInjectorPlugin_1.default());
-        return {
-            ...webpackConfig,
-            output: {
-                ...webpackConfig.output,
-                path: node_path_1.default.join(process.cwd(), dest)
-            },
-            plugins: copyFiles
-                ? plugins.map(plugin => plugin.constructor.name === 'CopyPlugin'
-                    ? new copy_webpack_plugin_1.default({ patterns: [{ from: '**/(block.json|*.(php|twig|svg))', context: srcRoot, noErrorOnMissing: true }] })
-                    : plugin)
-                : plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin' && plugin.constructor.name !== 'CleanWebpackPlugin'),
-            entry: node_fs_1.default.readdirSync(srcRoot, 'utf8')
-                .map(dir => node_path_1.default.join(srcRoot, dir))
+        let entry;
+        if (srcIsDirectory) {
+            entry = node_fs_1.default.readdirSync(srcRoot, 'utf8')
+                .map(dir => joinPossiblyAbsolutePaths(srcRoot, dir))
                 .filter(dir => node_fs_1.default.statSync(dir).isDirectory())
                 .reduce((entrypoints, dir) => {
                 try {
@@ -177,17 +184,17 @@ function default_1(config, webpackConfig = require("@wordpress/scripts/config/we
                             else {
                                 for (const [name, config] of Object.entries(entrypointsJSON)) {
                                     if (typeof config === 'string') {
-                                        entrypoints[name] = node_path_1.default.join(dir, config);
+                                        entrypoints[name] = joinPossiblyAbsolutePaths(dir, config);
                                     }
                                     else if (Array.isArray(config)) {
-                                        entrypoints[name] = config.map(c => node_path_1.default.join(dir, c));
+                                        entrypoints[name] = config.map(c => joinPossiblyAbsolutePaths(dir, c));
                                     }
                                     else {
                                         if (typeof config.import === 'string') {
-                                            config.import = node_path_1.default.join(dir, config.import);
+                                            config.import = joinPossiblyAbsolutePaths(dir, config.import);
                                         }
                                         else {
-                                            config.import = config.import.map(c => node_path_1.default.join(dir, c));
+                                            config.import = config.import.map(c => joinPossiblyAbsolutePaths(dir, c));
                                         }
                                         entrypoints[name] = config;
                                     }
@@ -200,7 +207,40 @@ function default_1(config, webpackConfig = require("@wordpress/scripts/config/we
                     }
                 }
                 return entrypoints;
-            }, {})
+            }, {});
+        }
+        else {
+            const baseDest = node_path_1.default.basename(dest);
+            entry = {
+                [baseDest.includes('.') ? node_path_1.default.basename(baseDest, node_path_1.default.extname(baseDest)) : baseDest]: srcRoot
+            };
+        }
+        let output;
+        if (srcIsDirectory) {
+            output = {
+                path: joinPossiblyAbsolutePaths(process.cwd(), dest)
+            };
+        }
+        else {
+            output = {
+                path: joinPossiblyAbsolutePaths(process.cwd(), node_path_1.default.dirname(dest))
+            };
+        }
+        return {
+            ...webpackConfig,
+            devtool: 'source-map',
+            output: {
+                ...webpackConfig.output,
+                ...output
+            },
+            plugins: copyFiles
+                ? plugins.map(plugin => plugin.constructor.name === 'CopyPlugin'
+                    ? new copy_webpack_plugin_1.default({ patterns: [{ from: '**/(block.json|*.(php|twig|svg))', context: srcRoot, noErrorOnMissing: true }] })
+                    : plugin)
+                : (srcIsDirectory
+                    ? plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin' && plugin.constructor.name !== 'CleanWebpackPlugin')
+                    : plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin')),
+            entry
         };
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "1.2.2",
+  "version": "2.0.0-beta.0",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",
@@ -13,29 +13,29 @@
     "./wordpress-scripts-wrapper": "./build/wordpress-scripts-wrapper.js"
   },
   "devDependencies": {
-    "@types/node": "^20.2.3",
+    "@types/node": "^20.2.5",
     "@types/webpack": "^5.28.1",
     "@types/webpack-sources": "^3.2.0",
     "postcss-load-config": "^4.0.1",
-    "postcss-loader": "^7.3.0",
+    "postcss-loader": "^7.3.2",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.1.3"
   },
   "dependencies": {
     "@plaudit/postcss-color-function": "^5.0.0",
     "@plaudit/postcss-silent-extend": "^3.0.0",
     "@plaudit/postcss-strip-units": "^3.0.0",
-    "@plaudit/postcss-variables": "^1.0.0",
     "@wordpress/scripts": "^26.4.0",
     "autoprefixer": "^10.4.14",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^11.0.0",
     "cssnano": "^6.0.1",
-    "eslint": "^8.39.0",
+    "eslint": "^8.42.0",
     "eslint-plugin-jsdoc": "^43.1.1",
     "fork-ts-checker-webpack-plugin": "^8.0.0",
-    "postcss": "^8.4.23",
-    "postcss-calc": "^8.2.4",
+    "postcss": "^8.4.24",
+    "postcss-advanced-variables": "^3.0.1",
+    "postcss-calc": "^9.0.1",
     "postcss-extend": "^1.0.5",
     "postcss-fallback": "^0.1.0",
     "postcss-import": "^15.1.0",
@@ -51,7 +51,7 @@
     "postcss-short-spacing": "^4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "webpack": "^5.84.0",
+    "webpack": "^5.86.0",
     "webpack-remove-empty-scripts": "^1.0.3",
     "webpack-sources": "^3.2.3"
   },