@plaudit/webpack-extensions 2.57.2 → 2.57.3

package/build/plugins/ExtensionsConfigFileGeneratorPlugin.js

@@ -54,12 +54,17 @@ class ExtensionsConfigFileGeneratorPlugin {
                 UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.reset(this.id);
                 compilation.hooks.processAssets.tap({ name: `${this.constructor.name}_UnifiedLoaderGeneratorIntegration`, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DERIVED }, () => {
                     UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.resolve(this.id, ['extensions-config-v2', writer => {
+                            let finalExtensionsDest = this.extensionsDest.endsWith("/") ? this.extensionsDest : this.extensionsDest + "/";
+                            if (!finalExtensionsDest.startsWith("/")) {
+                                finalExtensionsDest = "/" + finalExtensionsDest;
+                            }
                             writer
                                 .use("Plaudit\\Base\\API\\ThemeUtils")
-                                .call("trailingslashit", [new php_writer_1.Expr(`__DIR__.${php_writer_1.Expr.convertJsonToPHP("/" + this.extensionsDest)}`)], { assignTo: "$filePathPrefix" })
-                                .call("plaudit_webpack_extensions__resolve_base_uri", [new php_writer_1.Expr(`__DIR__.'/${this.extensionsDest}'`)], { assignTo: "$fileUriPrefix" })
+                                .assign("$filePathPrefix", new php_writer_1.Expr(`__DIR__.${php_writer_1.Expr.convertJsonToPHP(finalExtensionsDest)}`))
+                                .call("plaudit_webpack_extensions__resolve_base_uri", [new php_writer_1.Expr("$filePathPrefix")], { assignTo: "$fileUriPrefix" })
                                 .call("ThemeUtils::loadExtensionsV2", [
-                                new php_writer_1.Expr(`$filePathPrefix.'mapping.config.php'`), new php_writer_1.Expr("$filePathPrefix"), new php_writer_1.Expr("$fileUriPrefix"),
+                                new php_writer_1.Expr(`__DIR__.${php_writer_1.Expr.convertJsonToPHP(finalExtensionsDest + "mapping.config.php")}`),
+                                new php_writer_1.Expr(`$filePathPrefix`), new php_writer_1.Expr("$fileUriPrefix"),
                                 `${this.handlePrefix ? this.handlePrefix : node_path_1.default.basename(process.cwd())}_extension_`
                             ])
                                 .call("unset", [new php_writer_1.Expr("$filePathPrefix"), new php_writer_1.Expr("$fileUriPrefix")]);

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -266,7 +266,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
                 .call("error_log", ["UNABLE TO FIGURE OUT WHAT THE RELATIVE PATH TO THE BUILT FILES DIRECTORY SHOULD BE"])
                 .append("$path = '';")
                 .endIf()
-                .return("$base_uris[$dir] = trailingslashit(home_url($path))");
+                .call("trailingslashit", [new php_writer_1.Expr("home_url($path)")], { return: true, assignTo: "$base_uris[$dir]" });
         }, { returnType: "string", includeExistenceCheck: true });
     }
 }

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

@@ -28,6 +28,9 @@ export declare class PHPWriter {
     indent(): this;
     outdent(): this;
     append(...lines: (string | Expr)[]): this;
+    assign(variable: string | string[], expression: unknown | Expr, opts?: {
+        return?: boolean;
+    }): this;
     return(line: string | Expr): this;
     static(variable: string, opts?: {
         initializer?: unknown | Expr;
@@ -37,6 +40,7 @@ export declare class PHPWriter {
     call(func: string, args: unknown[], opts?: {
         chain?: boolean;
         assignTo?: string;
+        return?: boolean;
     }): this;
     action(name: string | Expr, contents: (writer: this) => void, args?: ActionOrFilterArgs): this;
     filter(name: string | Expr, contents: (writer: this) => void, args?: ActionOrFilterArgs): this;

package/build/utils/php-writer.js

@@ -44,6 +44,14 @@ class PHPWriter {
         }
         return this;
     }
+    assign(variable, expression, opts = {}) {
+        const lineComponents = (typeof variable === 'string' ? [variable] : variable).map(v => `${v} =`);
+        if (opts.return) {
+            lineComponents.splice(0, 0, "return");
+        }
+        lineComponents.push(Expr.convertJsonToPHP(expression));
+        return this.append(lineComponents.join(" ") + ';');
+    }
     return(line) {
         return this.append(`return ${line};`);
     }
@@ -64,8 +72,15 @@ class PHPWriter {
         return this;
     }
     call(func, args, opts = {}) {
-        const line = `${func}(${args.map(Expr.convertJsonToPHP).join(", ")})${opts.chain === true ? "" : ";"}`;
-        return this.append(opts.assignTo ? `${opts.assignTo} = ${line}` : line);
+        const lineComponents = [];
+        if (opts.return) {
+            lineComponents.push("return");
+        }
+        if (opts.assignTo) {
+            lineComponents.push(`${opts.assignTo} =`);
+        }
+        lineComponents.push(`${func}(${args.map(Expr.convertJsonToPHP).join(", ")})${opts.chain === true ? "" : ";"}`);
+        return this.append(lineComponents.join(" "));
     }
     action(name, contents, args = {}) {
         return this.actionOrFilter('action', name, contents, args);
@@ -112,7 +127,7 @@ class PHPWriter {
     }
     function(name, parameters, body, args = {}) {
         if (args.includeExistenceCheck) {
-            this.if(`!function_exists('${name}')`);
+            this.if(`!function_exists(${Expr.convertJsonToPHP(name)})`);
         }
         else {
             this.openPHP();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.57.2",
+  "version": "2.57.3",
   "license": "UNLICENSED",
   "files": [
     "/build"