@plaudit/webpack-extensions 2.20.1 → 2.21.0

package/build/wordpress-scripts-wrapper.js

@@ -142,7 +142,7 @@ function disableDefaultURLProcessing(webpackConfig) {
         }
     }
 }
-function injectPostcssConfigOverrides(webpackConfig, variables, verbose, processingModules) {
+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 => {
@@ -163,7 +163,7 @@ function injectPostcssConfigOverrides(webpackConfig, variables, verbose, process
                     }
                 }
                 if (rule.test instanceof RegExp && (rule.test.test("index.ts") || rule.test.test("index.mts"))) { // Then this is the javascript and typescript rule
-                    return { ...rule, test: processingModules ? scriptWithModuleExtension : scriptWithoutModuleExtension }; // This hacks in differentiated support for mjs and mts files
+                    rule.test = /\.m?[jt]sx?$/; // This hacks in support for mjs and mts files
                 }
             }
             return rule;
@@ -197,7 +197,7 @@ function parseEntrypointsJSON(dir) {
     }
 }
 function processIndividualWebpackConfig(config, webpackConfig, sources) {
-    let scriptExtension;
+    let scriptExtension; // This is only used in non-block contexts. It might not actually be necessary, but it is good to have
     let entrypointFields;
     const processingModules = webpackConfig.output?.module ?? false;
     if (processingModules) {
@@ -211,7 +211,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
     const { standaloneBlocks, variablesFilePath, verbose } = config;
     let currentVariables = config.currentVariables;
     disableDefaultURLProcessing(webpackConfig);
-    const fixedRules = injectPostcssConfigOverrides(webpackConfig, name => currentVariables[name], verbose, processingModules);
+    const fixedRules = injectPostcssConfigOverrides(webpackConfig, name => currentVariables[name], verbose);
     return sources.map(([src, dest]) => {
         const srcRoots = (typeof dest !== 'string' && dest.withLegacyBlocksIn
             ? [...src.split(','), ...resolveLegacyBlockScriptsInFolder(dest.withLegacyBlocksIn)]
@@ -363,7 +363,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
             },
             resolve: {
                 ...webpackConfig.resolve,
-                extensions: processingModules ? ['.mjsx', '.mjs', '.mtsx', '.mts'] : ['.jsx', '.tsx', '.ts', '...']
+                extensions: ['.mjsx', '.mjs', '.mtsx', '.mts', '.jsx', '.tsx', '.ts', '...']
             },
             stats: config.stats,
             plugins: copyFiles

package/package.json

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