@plaudit/webpack-extensions 2.55.0 → 2.55.1

package/build/utils/php-writer.js

@@ -22,7 +22,7 @@ class Expr {
 exports.Expr = Expr;
 class PHPWriter {
     inlineFirstLine;
-    buffer = "";
+    buffer = [];
     indentation = "";
     printingInPHP = true;
     fileNamespace = "";
@@ -40,7 +40,7 @@ class PHPWriter {
     }
     append(...lines) {
         for (const line of lines) {
-            this.buffer += `\n${this.indentation}${line}`;
+            this.buffer.push(`${this.indentation}${line}`);
         }
         return this;
     }
@@ -57,7 +57,7 @@ class PHPWriter {
         return this;
     }
     linebreak() {
-        this.buffer += '\n';
+        this.buffer.push("");
         return this;
     }
     call(func, args, opts = {}) {
@@ -166,21 +166,25 @@ class PHPWriter {
         return this;
     }
     toString() {
-        let fileContents = "";
+        const fileContents = [];
+        let canInline = true;
         if (this.fileNamespace) {
-            fileContents += `\nnamespace ${this.fileNamespace};\n`;
+            canInline = false;
+            fileContents.push(`namespace ${this.fileNamespace};`);
         }
-        if (this.useList) {
-            for (const use of this.useList.toSorted()) {
-                fileContents += `\nuse ${use};`;
-            }
-            fileContents += "\n";
+        if (this.useList.length) {
+            canInline = false;
+            fileContents.push(...this.useList.map(use => `use ${use};`));
+        }
+        fileContents.push(...this.buffer);
+        if (this.inlineFirstLine && canInline) {
+            return `<?php ${fileContents.join("\n")}`;
         }
-        if (this.inlineFirstLine && !fileContents) {
-            return `<?php ${this.buffer.trimStart()}`;
+        else if (fileContents.find(line => line.length > 0)) {
+            return "<?php\n" + fileContents.join("\n");
         }
         else {
-            return "<?php" + fileContents + this.buffer;
+            return "<?php";
         }
     }
     emitAsset(compilation, file, assetInfo) {

package/build/wordpress-scripts-wrapper.js

@@ -333,6 +333,7 @@ function commonConfigProcessingPrep(config, webpackConfig) {
         updateCurrentVariables: (value) => currentVariables = value
     };
 }
+//TODO: Implement path deduplication w/ the same code we use for block.json (only for plain v2 w/ specified handles
 //TODO: Try using context to avoid needing to cobble dest paths together?
 function processIndividualWebpackConfig(config, webpackConfig, sources) {
     const commonConfig = commonConfigProcessingPrep(config, webpackConfig);

package/package.json

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