@plaudit/webpack-extensions 2.56.1 → 2.56.3

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/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/utils/pseduo-semaphore.js

@@ -46,7 +46,7 @@ class PseudoSemaphore {
             controller.resolve = resolve;
             controller.reject = reject;
         });
-        this.flags.set(id, [promise, controller, false, Date.now()]);
+        this.flags.set(id, [promise, controller, false]);
         this.flagSet++;
         promise.catch(() => { });
     }
@@ -55,7 +55,7 @@ class PseudoSemaphore {
         let res;
         do {
             currentFlagSet = this.flagSet;
-            res = await Promise.all(this.flags.values().toArray().sort((a, b) => a[3] - b[3]).map(flag => flag[0]));
+            res = await Promise.all(this.flags.values().map(flag => flag[0]));
         } while (currentFlagSet !== this.flagSet);
         return res;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.56.1",
+  "version": "2.56.3",
   "license": "UNLICENSED",
   "files": [
     "/build"
@@ -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",