@plaudit/webpack-extensions 2.1.0 → 2.1.2

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

@@ -19,19 +19,28 @@ class BlockJSONStyleRemappingPlugin {
                     errorDetails: false,
                     timings: false
                 });
-                const toNumericChunkId = (chunk) => typeof chunk !== 'number' ? parseInt(chunk) : chunk;
-                const assetSourceFiles = new Map(stats.assets?.map(asset => [asset.name, asset.info?.sourceFilename])
-                    .filter((v) => v[0] !== undefined && v[1] !== undefined) ?? []);
-                const singleFileChunkToOutputName = new Map(stats.assets?.filter((asset) => asset.chunks?.length === 1)
+                if (!stats.assets) {
+                    throw new Error("Stats did not include assets despite them being requested");
+                }
+                if (!stats.modules) {
+                    throw new Error("Stats did not include modules despite them being requested");
+                }
+                const assetSourceFiles = new Map(stats.assets
+                    .map(asset => [asset.name, asset.info?.sourceFilename])
+                    .filter((v) => v[0] !== undefined && v[1] !== undefined));
+                const singleFileChunkToOutputName = new Map(stats.assets
+                    .filter((asset) => asset.chunks?.length === 1)
                     .filter(asset => !asset.name.endsWith('.asset.php'))
-                    .map(asset => [toNumericChunkId(asset.chunks[0]), asset.name]) ?? []);
-                const singleFileInputToOutputName = new Map(stats.modules?.map(module => {
+                    .map(asset => [asset.chunks[0], asset.name]));
+                const singleFileInputToOutputName = new Map(stats.modules
+                    .map(module => {
                     if (module.nameForCondition !== undefined && module.chunks?.length === 1) {
-                        const output = singleFileChunkToOutputName.get(toNumericChunkId(module.chunks[0]));
+                        const output = singleFileChunkToOutputName.get(module.chunks[0]);
                         return output !== undefined ? [module.nameForCondition, output] : undefined;
                     }
                     return undefined;
-                }).filter((v) => v !== undefined) ?? []);
+                })
+                    .filter((v) => v !== undefined));
                 const remapValue = (value, name, dirname) => {
                     if (value.startsWith("file:")) {
                         const styleInputPath = node_path_1.default.normalize(node_path_1.default.join(compiler.context, dirname, value.substring(5)));

package/build/wordpress-scripts-wrapper/static-configs.d.ts

@@ -1,2 +1,2 @@
 import type { PostCSSLoaderOptions } from "postcss-loader/dist/config";
-export declare function postcssConfigBuilder(verbose: boolean, legacyPostcssPlugins: boolean, variables: (name: string) => string | undefined): PostCSSLoaderOptions;
+export declare function postcssConfigBuilder(verbose: boolean, variables: (name: string) => string | undefined): PostCSSLoaderOptions;

package/build/wordpress-scripts-wrapper/static-configs.js

@@ -57,20 +57,18 @@ const nanoConfig = {
         }
     ]
 };
-function postcssConfigBuilder(verbose, legacyPostcssPlugins, variables) {
+function postcssConfigBuilder(verbose, variables) {
     return {
         plugins: [
             require("postcss-import")(),
             require("@plaudit/postcss-silent-extend")({ warnOfUnused: verbose }),
             require("postcss-mixins")(),
             require("@plaudit/postcss-variables")({ variables }),
-            ...(legacyPostcssPlugins ? [
-                require("postcss-quantity-queries")(),
-                require("postcss-short-position")(),
-                require("postcss-short-size")(),
-                require("postcss-short-spacing")(),
-                require("postcss-fallback")() // Legacy
-            ] : []),
+            require("postcss-quantity-queries")(),
+            require("postcss-short-position")(),
+            require("postcss-short-size")(),
+            require("postcss-short-spacing")(),
+            require("postcss-fallback")(),
             require("postcss-property-lookup")({ logLevel: "warn" }),
             require("@plaudit/postcss-strip-units")(),
             require("postcss-media-minmax")(),

package/build/wordpress-scripts-wrapper.d.ts

@@ -1,6 +1,5 @@
 import type { Configuration } from "webpack";
 interface PlauditWordpressWebpackConfig {
-    legacyPostcssPlugins?: boolean;
     variables?: Record<string, any>;
     verbose?: boolean;
     src: string[] | Record<string, string>;

package/build/wordpress-scripts-wrapper.js

@@ -59,7 +59,7 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
         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 { 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) {
@@ -74,7 +74,7 @@ module.exports = function (config, webpackConfig = require("@wordpress/scripts/c
     }
     let currentEntrypoint = '';
     if (webpackConfig.module?.rules) {
-        const postcssConfig = (0, static_configs_1.postcssConfigBuilder)(verbose, legacyPostcssPlugins, (name) => {
+        const postcssConfig = (0, static_configs_1.postcssConfigBuilder)(verbose, (name) => {
             if (variables[name]) {
                 return variables[name];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",
@@ -56,7 +56,7 @@
     "postcss-simple-vars": "^7.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "webpack": "^5.87.0",
+    "webpack": "^5.88.0",
     "webpack-remove-empty-scripts": "^1.0.3",
     "webpack-sources": "^3.2.3"
   },