@plaudit/webpack-extensions 2.78.0 → 2.79.0

package/build/plugins/UnifiedLoaderGenerator.d.ts

@@ -15,5 +15,7 @@ export declare class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin
     constructor(config: VerifiedPlauditWordpressWebpackConfig);
     protected attachStandardPhase(compilation: Compilation): void;
     protected attachUniquePhase(compilation: Compilation): void;
+    private withDistDevLoader;
+    private ensureDistExists;
 }
 export {};

package/build/plugins/UnifiedLoaderGenerator.js

@@ -1,16 +1,47 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnifiedLoaderGenerator = void 0;
-const node_path_1 = __importDefault(require("node:path"));
+const node_path_1 = __importStar(require("node:path"));
 const php_writer_1 = require("@plaudit/php-writer");
 const expressions_1 = require("@plaudit/php-writer/expressions");
 const AbstractBiPhasicGroupPlugin_1 = require("./AbstractBiPhasicGroupPlugin");
 const shared_1 = require("../shared");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const webpack_1 = require("webpack");
+const promises_1 = require("node:fs/promises");
 class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPhasicGroupPlugin {
     static semaphore = new pseduo_semaphore_1.PseudoSemaphore("Unified");
     constructor(config) {
@@ -59,17 +90,14 @@ class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPha
             }
             if (this.config.useUnifiedLoader) {
                 compilation.hooks.afterProcessAssets.tap(this.constructor.name, () => {
-                    const writer = new php_writer_1.PHPWriter();
+                    let writer;
                     if (compilation.outputOptions.path?.endsWith("-dev")) {
                         compilation['.gitignore' in compilation.assets ? 'updateAsset' : 'emitAsset']('.gitignore', new webpack_1.sources.RawSource('**'), { size: 2 });
+                        this.ensureDistExists(compilation.outputOptions.path);
+                        writer = new php_writer_1.PHPWriter();
                     }
                     else {
-                        const devLoaderPath = expressions_1.Op.concat(expressions_1.Constants.__DIR__, '-dev/unified-loader.php');
-                        writer
-                            .if(expressions_1.Op.binary(expressions_1.Op.binary(expressions_1.Expr.call('wp_get_environment_type', []), ' === ', 'development'), ' && ', expressions_1.Expr.call('file_exists', [devLoaderPath])))
-                            .require(devLoaderPath, { once: true })
-                            .append("return;")
-                            .endIf();
+                        writer = this.withDistDevLoader();
                     }
                     if (groupedLoaderInfo.some(wc => wc.requiresBaseURI)) {
                         (0, shared_1.emitResolveBaseUriFunction)(writer);
@@ -82,5 +110,31 @@ class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPha
             }
         });
     }
+    withDistDevLoader() {
+        if (this.config.omitDistDev) {
+            return new php_writer_1.PHPWriter();
+        }
+        const devLoaderPath = expressions_1.Op.concat(expressions_1.Constants.__DIR__, '-dev/unified-loader.php');
+        return new php_writer_1.PHPWriter()
+            .if(expressions_1.Op.binary(expressions_1.Op.binary(expressions_1.Expr.call('wp_get_environment_type', []), ' === ', 'development'), ' && ', expressions_1.Expr.call('file_exists', [devLoaderPath])))
+            .require(devLoaderPath, { once: true })
+            .append("return;")
+            .endIf();
+    }
+    async ensureDistExists(outputPath) {
+        if (outputPath.endsWith("-dev")) {
+            outputPath = outputPath.substring(0, outputPath.length - 4);
+        }
+        try {
+            const contents = await (0, promises_1.readFile)((0, node_path_1.join)(outputPath, "unified-loader.php"), 'utf-8');
+            if (!contents.includes("-dev/unified-loader.php")) {
+                await (0, promises_1.writeFile)((0, node_path_1.join)(outputPath, "unified-loader.php"), this.withDistDevLoader().toString() + contents.substring(5), 'utf-8');
+            }
+        }
+        catch {
+            await (0, promises_1.mkdir)(outputPath, { recursive: true });
+            await (0, promises_1.writeFile)((0, node_path_1.join)(outputPath, "unified-loader.php"), this.withDistDevLoader().toString(), 'utf-8');
+        }
+    }
 }
 exports.UnifiedLoaderGenerator = UnifiedLoaderGenerator;

package/build/shared.d.ts

@@ -108,6 +108,7 @@ export type PlauditWordpressWebpackConfig = {
     srcPrefixes?: string[];
     useUnifiedLoader?: boolean;
     includePostInitFallback?: boolean;
+    omitDistDev?: boolean;
 };
 export type FileSegmentBlockEntrypointInfo = {
     blockJsonOrigin: string;

package/build/wordpress-scripts-wrapper.js

@@ -105,7 +105,7 @@ function injectPostcssConfigOverrides(rules, config, variables, postcssFunctions
                         }
                     }
                 }
-                if (rule.test instanceof RegExp && (rule.test.test("index.ts") || rule.test.test("index.mts"))) { // Then this is the javascript and typescript rule
+                if (rule.test instanceof RegExp && (rule.test.test("index.ts") || rule.test.test("index.mts"))) { // Then this is the JavaScript and TypeScript rule
                     rule.test = /\.m?[jt]sx?$/; // This hacks in support for mjs and mts files
                 }
             }
@@ -157,9 +157,9 @@ function injectSupportForInliningSVGsAsStrings(rules) {
     });
 }
 function buildVerifiedConfig(config) {
-    const { standaloneBlocks = false, stats = 'errors-warnings', variables: rawVariables, verbose = process.argv.includes('--verbose') || process.env['VERBOSE'] === 'true', postcss = {}, externals, assumeGlobalizedPlauditLibraries = true, processTranslationConfigs = true, combineAssetMetadata = true, useWebpackResourceFiltering = true, plainEntrypointsVersion = 1, srcDir = "", useUnifiedLoader = false, includePostInitFallback = false } = config;
+    const { standaloneBlocks = false, stats = 'errors-warnings', variables: rawVariables, verbose = process.argv.includes('--verbose') || process.env['VERBOSE'] === 'true', postcss = {}, externals, assumeGlobalizedPlauditLibraries = true, processTranslationConfigs = true, combineAssetMetadata = true, useWebpackResourceFiltering = true, plainEntrypointsVersion = 1, srcDir = "", useUnifiedLoader = false, includePostInitFallback = false, omitDistDev = false } = config;
     let outputDir = config.outputDir ?? "";
-    if (outputDir && useUnifiedLoader && (process.env['SERVER_MODE'] ?? 'development') === 'development') {
+    if (outputDir && useUnifiedLoader && !omitDistDev && (process.env['SERVER_MODE'] ?? 'development') === 'development') {
         outputDir += "-dev";
     }
     let srcPrefixes;
@@ -209,7 +209,7 @@ function buildVerifiedConfig(config) {
     }
     const cfg = {
         currentVariables, postcss, standaloneBlocks, stats, variablesFilePath, verbose, externals, assumeGlobalizedPlauditLibraries, processTranslationConfigs, combineAssetMetadata,
-        useWebpackResourceFiltering, outputDir, extensionsVersion, plainEntrypointsVersion, srcDir, srcPrefixes, targetHandlePrefix, useUnifiedLoader, includePostInitFallback
+        useWebpackResourceFiltering, outputDir, extensionsVersion, plainEntrypointsVersion, srcDir, srcPrefixes, targetHandlePrefix, useUnifiedLoader, includePostInitFallback, omitDistDev
     };
     // Destination -> source map
     const allocatedDestinations = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.78.0",
+  "version": "2.79.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/build"