@plaudit/webpack-extensions 2.20.1 → 2.21.1

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)]
@@ -223,7 +223,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
             return undefined;
         }
         const copyFiles = srcIsDirectory && src !== dest;
-        const plugins = webpackConfig.plugins?.filter(isTruthy) ?? [];
+        const plugins = webpackConfig.plugins?.filter(isTruthy).filter(plugin => plugin.constructor.name !== 'RtlCssPlugin') ?? [];
         if (process.env["NO_TS_CHECKER"] !== "true") {
             const include = (Array.isArray(srcRoot) ? srcRoot : [srcRoot])
                 .filter(sr => node_path_1.default.extname(sr).length === 0 || scriptOrStyleTest(sr, scriptExtension) === "script")
@@ -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.1",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",
@@ -14,12 +14,14 @@
   },
   "typesVersions": {
     "*": {
-      "wordpress-scripts-wrapper": ["build/wordpress-scripts-wrapper.d.ts"]
+      "wordpress-scripts-wrapper": [
+        "build/wordpress-scripts-wrapper.d.ts"
+      ]
     }
   },
   "devDependencies": {
     "@types/browser-sync-webpack-plugin": "^2.2.5",
-    "@types/node": "^20.12.10",
+    "@types/node": "^20.12.12",
     "@types/tapable": "^2.2.7",
     "@types/webpack": "^5.28.5",
     "@types/webpack-sources": "^3.2.3",
@@ -33,7 +35,7 @@
     "@plaudit/postcss-silent-extend": "^3.0.0",
     "@plaudit/postcss-strip-units": "^3.0.0",
     "@plaudit/postcss-variables": "^1.0.0",
-    "@wordpress/scripts": "^27.8.0",
+    "@wordpress/scripts": "^27.9.0",
     "autoprefixer": "^10.4.19",
     "browser-sync": "^3.0.2",
     "clean-webpack-plugin": "^4.0.0",
@@ -42,7 +44,7 @@
     "eslint": "^8.57.0",
     "eslint-plugin-jsdoc": "^48.2.3",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
-	"http-proxy-middleware": "^3.0.0-beta.1",
+    "http-proxy-middleware": "^3.0.0-beta.1",
     "postcss": "^8.4.38",
     "postcss-calc": "^9.0.1",
     "postcss-discard-comments": "^6.0.2",