@plaudit/webpack-extensions 2.56.2 → 2.56.4

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -166,7 +166,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
             PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
             for (const [priority, prioritizedHandleList] of PlainEntrypointsConfigFileGeneratorPlugin.separateHandleListByPriority(handleLists.register)) {
                 writer.action("init", writer => {
-                    writer.call("plaudit_webpack_extensions__resolve_base_uri", [], { assignTo: "$base_uri" });
+                    writer.call("plaudit_webpack_extensions__resolve_base_uri", [new php_writer_1.Expr('__DIR__')], { assignTo: "$base_uri" });
                     for (const { handle, type, data } of prioritizedHandleList) {
                         writer.call(`wp_register_${type}`, [handle, new php_writer_1.Expr(`$base_uri.${php_writer_1.Expr.jsonToPHPConverter(node_path_1.default.relative(emitDir, data.src))}`), ...data.rest]);
                     }
@@ -245,18 +245,20 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
      * The primary benefit of emitting a function instead of baking its contents into each function that uses it is that it allows us to avoid recomputing the base uri multiple times
      */
     static emitResolveBaseUriFunction(writer) {
-        writer.function("plaudit_webpack_extensions__resolve_base_uri", [], () => {
+        writer.function("plaudit_webpack_extensions__resolve_base_uri", ["$dir"], () => {
             writer
-                .static("$base_uri", { withTest: 'chainable' })
-                .elseIf("str_starts_with(__DIR__, ABSPATH)")
-                .append("$path = ltrim(substr(__DIR__, strlen(ABSPATH)), '/');")
-                .elseIf("str_starts_with(__DIR__, '/workspace/website')")
-                .append("$path = ltrim(substr(__DIR__, 18), '/');")
+                .static("$base_uris", { initializer: [] })
+                .if("isset($base_uris[$dir])")
+                .return("$base_uris[$dir]")
+                .elseIf("str_starts_with($dir, ABSPATH)")
+                .append("$path = ltrim(substr($dir, strlen(ABSPATH)), '/');")
+                .elseIf("str_starts_with($dir, '/workspace/website')")
+                .append("$path = ltrim(substr($dir, 18), '/');")
                 .else()
                 .call("error_log", ["UNABLE TO FIGURE OUT WHAT THE RELATIVE PATH TO THE BUILT FILES DIRECTORY SHOULD BE"])
                 .append("$path = '';")
                 .endIf()
-                .append("return $base_uri = trailingslashit(home_url($path));");
+                .return("$base_uris[$dir] = trailingslashit(home_url($path))");
         }, { returnType: "string", includeExistenceCheck: true });
     }
 }

package/build/plugins/SpecialAssetHandlingPlugin.js

@@ -86,7 +86,7 @@ class SpecialAssetHandlingPlugin {
         }
         PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
         writer.action("wp_head", writer => {
-            writer.call("plaudit_webpack_extensions__resolve_base_uri", [], { assignTo: "$base_uri" }).closePHP();
+            writer.call("plaudit_webpack_extensions__resolve_base_uri", [new php_writer_1.Expr('__DIR__')], { assignTo: "$base_uri" }).closePHP();
             for (let [filename, { preload, fetchpriority, crossorigin }] of preloadedAssets) {
                 if (!preload) {
                     continue;

package/build/utils/common-config-helpers.js

@@ -267,6 +267,7 @@ function commonMakeWebpackConfig(config, commonConfig, webpackConfig, srcIsDirec
         : (srcIsDirectory
             ? plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin' && plugin.constructor.name !== 'CleanWebpackPlugin')
             : plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin'));
+    const extensions = processingModules ? ['.mjsx', '.mjs', '.mtsx', '.mts', '...'] : ['.jsx', '.tsx', '.ts', '...'];
     return {
         ...webpackConfig,
         devtool: 'source-map',
@@ -307,7 +308,7 @@ function commonMakeWebpackConfig(config, commonConfig, webpackConfig, srcIsDirec
         resolve: {
             ...webpackConfig.resolve,
             roots: viableRoots,
-            extensions: ['.mjsx', '.mjs', '.mtsx', '.mts', '.jsx', '.tsx', '.ts', '...']
+            extensions
         },
         stats: config.stats,
         plugins: config.outputDir ? possiblePlugins : possiblePlugins.filter(plugin => plugin.constructor.name !== 'CleanWebpackPlugin'),

package/build/utils/php-writer.d.ts

@@ -28,8 +28,9 @@ export declare class PHPWriter {
     indent(): this;
     outdent(): this;
     append(...lines: (string | Expr)[]): this;
+    return(line: string | Expr): this;
     static(variable: string, opts?: {
-        initializer?: string | Expr;
+        initializer?: unknown | Expr;
         withTest?: boolean | 'chainable';
     }): this;
     linebreak(): this;

package/build/utils/php-writer.js

@@ -44,6 +44,9 @@ class PHPWriter {
         }
         return this;
     }
+    return(line) {
+        return this.append(`return ${line};`);
+    }
     static(variable, opts = {}) {
         const initializer = opts.initializer ? Expr.convertJsonToPHP(opts.initializer) : "null";
         this.append(`static ${variable} = ${initializer};`);

package/build/wordpress-scripts-wrapper.js

@@ -442,12 +442,17 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
                 return makeExtensionsWebpackConfig(config, commonConfig, webpackConfig, dest, src, srcRoot, plugins);
             }
             case "plain" /* SourceType.plain */:
-                if (config.plainEntrypointsVersion > 1) {
-                    // plainEntrypoints.push({dest, src, srcRoot});
-                    // return undefined;
-                    return makePlainV2WebpackConfig(config, commonConfig, webpackConfig, dest, src, srcRoot, srcIsDirectory);
+                if (!srcIsDirectory) {
+                    //TODO: We need to filter this when in directory mode as well
+                    const primarySrcRoot = typeof srcRoot === 'string' ? srcRoot : srcRoot[0];
+                    if (!scriptExtension.test(primarySrcRoot) && !shared_1.styleExtension.test(primarySrcRoot)) {
+                        return undefined;
+                    }
                 }
                 const { plugins } = buildCommonPluginConfig(srcRoot, scriptExtension, webpackConfig, dest, config, "plain" /* SourceType.plain */);
+                if (config.plainEntrypointsVersion > 1) {
+                    return makePlainV2WebpackConfig(config, commonConfig, webpackConfig, dest, src, srcRoot, plugins, srcIsDirectory);
+                }
                 return makePlainV1WebpackConfig(config, commonConfig, webpackConfig, dest, src, srcRoot, plugins, srcIsDirectory);
         }
     }).filter(cfg => cfg !== undefined);
@@ -484,8 +489,7 @@ function makePlainV1WebpackConfig(config, commonConfig, webpackConfig, dest, src
         : () => ({ [baseDest]: srcRoot });
     return (0, common_config_helpers_1.commonMakeWebpackConfig)(config, commonConfig, webpackConfig, srcIsDirectory, dest, src, srcRoot, entry, plugins);
 }
-function makePlainV2WebpackConfig(config, commonConfig, webpackConfig, dest, src, srcRoot, srcIsDirectory) {
-    const { plugins } = buildCommonPluginConfig(srcRoot, commonConfig.scriptExtension, webpackConfig, dest, config, "extensions" /* SourceType.extensions */);
+function makePlainV2WebpackConfig(config, commonConfig, webpackConfig, dest, src, srcRoot, plugins, srcIsDirectory) {
     plugins.push(new PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin(process.cwd(), config.outputDir, dest.locations ?? {}, config.plainEntrypointsHandlePrefix));
     const baseDest = stripExtension(dest.destination);
     const entry = srcIsDirectory // This being true implies that srcRoot is not an array

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.56.2",
+  "version": "2.56.4",
   "license": "UNLICENSED",
   "files": [
     "/build"
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@plaudit/gutenberg-api-extensions": "^2.75.0",
     "@types/browser-sync-webpack-plugin": "^2.2.5",
-    "@types/node": "^22.17.0",
+    "@types/node": "^22.17.1",
     "@types/postcss-functions": "^4.0.4",
     "@types/tapable": "^2.2.7",
     "@types/webpack": "^5.28.5",
@@ -35,8 +35,8 @@
     "@plaudit/postcss-silent-extend": "^3.0.0",
     "@plaudit/postcss-strip-units": "^3.0.0",
     "@plaudit/postcss-variables": "^1.1.0",
-    "@wordpress/dependency-extraction-webpack-plugin": "^6.27.0",
-    "@wordpress/scripts": "^30.20.0",
+    "@wordpress/dependency-extraction-webpack-plugin": "^6.28.0",
+    "@wordpress/scripts": "^30.21.0",
     "autoprefixer": "^10.4.21",
     "browser-sync": "^3.0.4",
     "clean-webpack-plugin": "^4.0.0",