@plaudit/webpack-extensions 2.59.0 → 2.60.0

package/build/plugins/BrowserSyncPlugin.d.ts

@@ -9,8 +9,7 @@ export type PluginOptions = {
 };
 export declare class BrowserSyncPlugin implements WebpackPluginInstance {
     private static isBrowserSyncRunning;
-    private static browserSyncPluginOptions;
-    private static envFileContents;
+    private static browserSyncPluginOptions?;
     private readonly pluginOptions;
     private readonly browserSyncInstance;
     private isWebpackWatching;
@@ -18,7 +17,7 @@ export declare class BrowserSyncPlugin implements WebpackPluginInstance {
     private shouldNotify;
     constructor(pluginOptions?: Partial<PluginOptions>);
     private static getBrowserSyncPluginOptions;
-    private static loadEnvFile;
+    private static findEnvFile;
     apply(compiler: Compiler): void;
     private getCssOnlyEmittedAssetsNames;
     private static getSiteUrls;

package/build/plugins/BrowserSyncPlugin.js

@@ -7,13 +7,13 @@ exports.BrowserSyncPlugin = void 0;
 const node_child_process_1 = __importDefault(require("node:child_process"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const shared_1 = require("../shared");
 const browser_sync_1 = __importDefault(require("browser-sync"));
 const http_proxy_middleware_1 = require("http-proxy-middleware");
 const open_1 = __importDefault(require("open"));
 class BrowserSyncPlugin {
     static isBrowserSyncRunning = false;
-    static browserSyncPluginOptions = undefined;
-    static envFileContents = undefined;
+    static browserSyncPluginOptions;
     pluginOptions;
     browserSyncInstance;
     isWebpackWatching = false;
@@ -24,11 +24,11 @@ class BrowserSyncPlugin {
         this.browserSyncInstance = browser_sync_1.default.has(this.pluginOptions.name) ? browser_sync_1.default.get(this.pluginOptions.name) : browser_sync_1.default.create(this.pluginOptions.name);
     }
     static getBrowserSyncPluginOptions() {
-        return BrowserSyncPlugin.browserSyncPluginOptions ?? (BrowserSyncPlugin.browserSyncPluginOptions = new Promise(resolve => {
-            const envFile = BrowserSyncPlugin.loadEnvFile();
-            //docker container inspect "$(docker compose ps --format=json | jq '. | select(. | contains({"Service": "wordpress"})) | .ID' -r)" | jq '.[].Config.Env'
+        return BrowserSyncPlugin.browserSyncPluginOptions ?? (BrowserSyncPlugin.browserSyncPluginOptions = new Promise(async (resolve) => {
+            const envFilePath = BrowserSyncPlugin.findEnvFile();
+            const envFile = envFilePath ? await (0, shared_1.loadEnvFile)(envFilePath) : {};
             const prefixes = BrowserSyncPlugin.getSiteUrls();
-            const targetPort = envFile.match(/WEB_PORT_SSL=(\d+)/i)?.[1] ?? "8443";
+            const targetPort = envFile["WEB_PORT_SSL"]?.match(/^\d+$/) ? envFile["WEB_PORT_SSL"] : "8443";
             const targetHost = targetPort === "443" ? "localhost" : `localhost:${targetPort}`;
             if (prefixes.length === 0 || prefixes.every(prefix => prefix.startsWith("localhost"))) {
                 resolve([{
@@ -88,18 +88,28 @@ class BrowserSyncPlugin {
             }
         }));
     }
-    static loadEnvFile() {
-        if (BrowserSyncPlugin.envFileContents !== undefined) {
-            return BrowserSyncPlugin.envFileContents;
-        }
+    static findEnvFile() {
         for (let envFileHolderPath = process.cwd(); envFileHolderPath.length > 5; envFileHolderPath = node_path_1.default.dirname(envFileHolderPath)) {
             if (node_fs_1.default.existsSync(node_path_1.default.join(envFileHolderPath, ".env"))) {
-                return BrowserSyncPlugin.envFileContents = node_fs_1.default.readFileSync(node_path_1.default.join(envFileHolderPath, ".env"), { encoding: 'utf8' });
+                return node_path_1.default.join(envFileHolderPath, ".env");
             }
         }
-        return "";
+        return undefined;
     }
     apply(compiler) {
+        if (!process.argv.includes('--browser-sync') && process.env['BROWSER_SYNC'] !== 'true') {
+            return;
+        }
+        let devTarget = process.env['DEV_TARGET'] ?? process.argv.find(a => a.startsWith("--dev-target="))?.substring(13);
+        if (devTarget === undefined) {
+            const flagIndex = process.argv.findIndex(a => a === "--dev-target");
+            if (flagIndex > -1) {
+                devTarget = process.argv[flagIndex + 1];
+            }
+        }
+        if (devTarget !== undefined && devTarget !== node_path_1.default.basename(process.cwd()) && !(devTarget === "theme" && node_fs_1.default.existsSync(node_path_1.default.join(process.cwd(), "style.css")))) {
+            return;
+        }
         compiler.hooks.watchRun.tap(BrowserSyncPlugin.name, () => {
             this.isWebpackWatching = true;
         });

package/build/plugins/SpecialAssetHandlingPlugin.d.ts

@@ -1,12 +1,12 @@
+import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
 import { type Compiler, type WebpackPluginInstance } from "webpack";
 export declare class SpecialAssetHandlingPlugin implements WebpackPluginInstance {
-    private readonly outputDir;
-    private readonly useUnifiedLoader;
+    private readonly config;
     private static readonly semaphore;
     private static hasAttachedAssetCollatorForCurrentBatch;
     private static validPathname?;
     private readonly id;
-    constructor(outputDir: string, useUnifiedLoader: boolean);
+    constructor(config: VerifiedPlauditWordpressWebpackConfig);
     apply(compiler: Compiler): void;
     private collateAssets;
 }

package/build/plugins/SpecialAssetHandlingPlugin.js

@@ -5,26 +5,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpecialAssetHandlingPlugin = void 0;
 const node_path_1 = __importDefault(require("node:path"));
-const PlainEntrypointsConfigFileGeneratorPlugin_1 = require("./PlainEntrypointsConfigFileGeneratorPlugin");
 const php_writer_1 = require("../utils/php-writer");
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
-const webpack_1 = require("webpack");
+const PlainEntrypointsConfigFileGeneratorPlugin_1 = require("./PlainEntrypointsConfigFileGeneratorPlugin");
 const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
+const webpack_1 = require("webpack");
 class SpecialAssetHandlingPlugin {
-    outputDir;
-    useUnifiedLoader;
+    config;
     static semaphore = new pseduo_semaphore_1.PseudoSemaphore({}, "Special");
     static hasAttachedAssetCollatorForCurrentBatch = false;
     static validPathname = undefined;
     id;
-    constructor(outputDir, useUnifiedLoader) {
-        this.outputDir = outputDir;
-        this.useUnifiedLoader = useUnifiedLoader;
+    constructor(config) {
+        this.config = config;
         this.id = Math.random().toString();
-        SpecialAssetHandlingPlugin.semaphore.register(this.id);
-        UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.register(this.id);
     }
     apply(compiler) {
+        if (!this.config.useWebpackResourceFiltering) {
+            return;
+        }
+        SpecialAssetHandlingPlugin.semaphore.register(this.id);
+        UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.register(this.id);
         compiler.hooks.compilation.tap(this.constructor.name, compilation => {
             SpecialAssetHandlingPlugin.hasAttachedAssetCollatorForCurrentBatch = false;
             SpecialAssetHandlingPlugin.semaphore.reset(this.id);
@@ -81,15 +82,15 @@ class SpecialAssetHandlingPlugin {
         const preloadedAssets = Object.entries(collatedSpecialAssetData)
             .filter(([_, { preload }]) => preload)
             .sort(([a], [b]) => a.localeCompare(b));
-        const outputFile = this.outputDir ? "special-assets.php" : node_path_1.default.join(node_path_1.default.dirname(node_path_1.default.dirname(SpecialAssetHandlingPlugin.validPathname)), "special-assets.php");
+        const outputFile = this.config.outputDir ? "special-assets.php" : node_path_1.default.join(node_path_1.default.dirname(node_path_1.default.dirname(SpecialAssetHandlingPlugin.validPathname)), "special-assets.php");
         const writer = new php_writer_1.PHPWriter();
         if (!preloadedAssets.length) {
-            if (!this.useUnifiedLoader) {
+            if (!this.config.useUnifiedLoader) {
                 writer.emitAsset(compilation, outputFile);
             }
             return;
         }
-        if (!this.useUnifiedLoader) {
+        if (!this.config.useUnifiedLoader) {
             PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
         }
         writer.action("wp_head", writer => {

package/build/plugins/UnifiedLoaderGenerator.d.ts

@@ -1,3 +1,4 @@
+import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
 import { PseudoSemaphore } from "../utils/pseduo-semaphore";
 import { PHPWriter } from "../utils/php-writer";
 import { Compiler, WebpackPluginInstance } from "webpack";
@@ -8,10 +9,11 @@ type LoaderInfo = {
     priority?: number;
 };
 export declare class UnifiedLoaderGenerator implements WebpackPluginInstance {
+    private readonly config;
     static readonly semaphore: PseudoSemaphore<LoaderInfo | undefined>;
     private static attached;
     private readonly id;
-    constructor();
+    constructor(config: VerifiedPlauditWordpressWebpackConfig);
     apply(compiler: Compiler): void;
 }
 export {};

package/build/plugins/UnifiedLoaderGenerator.js

@@ -3,17 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnifiedLoaderGenerator = void 0;
 const pseduo_semaphore_1 = require("../utils/pseduo-semaphore");
 const php_writer_1 = require("../utils/php-writer");
-const webpack_1 = require("webpack");
 const PlainEntrypointsConfigFileGeneratorPlugin_1 = require("./PlainEntrypointsConfigFileGeneratorPlugin");
+const webpack_1 = require("webpack");
 class UnifiedLoaderGenerator {
+    config;
     static semaphore = new pseduo_semaphore_1.PseudoSemaphore(undefined, "Unified");
     static attached = false;
     id;
-    constructor() {
+    constructor(config) {
+        this.config = config;
         this.id = Math.random().toString();
-        UnifiedLoaderGenerator.semaphore.register(this.id);
     }
     apply(compiler) {
+        if (!this.config.useUnifiedLoader) {
+            return;
+        }
+        UnifiedLoaderGenerator.semaphore.register(this.id);
         const tapName = { name: this.constructor.name, stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT };
         compiler.hooks.compilation.tap(this.constructor.name, compilation => {
             UnifiedLoaderGenerator.attached = false;

package/build/plugins/VariablesJSMonitorPlugin.d.ts

@@ -1,6 +1,7 @@
+import type { VerifiedPlauditWordpressWebpackConfig } from "../utils/common-config-helpers";
 import type { Compiler, WebpackPluginInstance } from "webpack";
 export declare class VariablesJSMonitorPlugin implements WebpackPluginInstance {
-    private readonly variablesFilePath;
-    constructor(variablesFilePath: string);
+    private readonly config;
+    constructor(config: VerifiedPlauditWordpressWebpackConfig);
     apply(compiler: Compiler): void;
 }

package/build/plugins/VariablesJSMonitorPlugin.js

@@ -2,16 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VariablesJSMonitorPlugin = void 0;
 class VariablesJSMonitorPlugin {
-    variablesFilePath;
-    constructor(variablesFilePath) {
-        this.variablesFilePath = variablesFilePath;
+    config;
+    constructor(config) {
+        this.config = config;
     }
     apply(compiler) {
-        compiler.hooks.make.tap(this.constructor.name, compilation => {
-            if (!compilation.fileDependencies.has(this.variablesFilePath)) {
-                compilation.fileDependencies.add(this.variablesFilePath);
-            }
-        });
+        const variablesFilePath = this.config.variablesFilePath;
+        if (variablesFilePath) {
+            compiler.hooks.make.tap(this.constructor.name, compilation => {
+                if (!compilation.fileDependencies.has(variablesFilePath)) {
+                    compilation.fileDependencies.add(variablesFilePath);
+                }
+            });
+        }
     }
 }
 exports.VariablesJSMonitorPlugin = VariablesJSMonitorPlugin;

package/build/shared.d.ts

@@ -95,4 +95,6 @@ export declare const styleExtension: RegExp;
 export declare function scriptOrStyleTest(entryPath: string, scriptExtension: RegExp): "" | "script" | "style";
 export declare function hasAtLeastOneItem<T>(list: T[]): list is [T, ...T[]];
 export declare function kebabCase(value: string): string;
+export declare function loadEnvFile(filePath: string): Promise<Record<string, string>>;
+export declare function parseEnvFile(contents: string): Record<string, string>;
 export {};

package/build/shared.js

@@ -11,7 +11,10 @@ exports.leadingSlashIt = leadingSlashIt;
 exports.scriptOrStyleTest = scriptOrStyleTest;
 exports.hasAtLeastOneItem = hasAtLeastOneItem;
 exports.kebabCase = kebabCase;
+exports.loadEnvFile = loadEnvFile;
+exports.parseEnvFile = parseEnvFile;
 const json_to_php_but_with____injection_1 = __importDefault(require("./utils/json-to-php-but-with-__-injection"));
+const promises_1 = __importDefault(require("node:fs/promises"));
 function isRawAssetData(thing) {
     if (!thing || typeof thing !== 'object') {
         return false;
@@ -87,3 +90,14 @@ function kebabCase(value) {
     const kebabCaseRegexes = [[/([a-z])([A-Z])/g, "$1-$2"], [/[\s_.\-]+/g, "-"]];
     return kebabCaseRegexes.reduce((str, [pattern, replacement]) => str.replace(pattern, replacement), value).toLowerCase();
 }
+async function loadEnvFile(filePath) {
+    return promises_1.default.readFile(filePath, 'utf-8').then(parseEnvFile, () => ({}));
+}
+function parseEnvFile(contents) {
+    return Object.fromEntries(contents.split(/(\r?\n)+/).map(line => line.trim())
+        .filter(line => line.length > 0 && !line.startsWith("#") && !line.startsWith("//"))
+        .map(line => {
+        const equalsPos = line.indexOf('=');
+        return equalsPos === -1 ? [line, ""] : [line.substring(0, equalsPos), line.substring(equalsPos + 1)];
+    }));
+}

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

@@ -8,11 +8,11 @@ exports.groupEntrypointsByAssetFile = groupEntrypointsByAssetFile;
 exports.resolveEntryFromDirectory = resolveEntryFromDirectory;
 exports.commonMakeWebpackConfig = commonMakeWebpackConfig;
 const node_fs_1 = __importDefault(require("node:fs"));
+const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
+const BlockJSONManagingPlugin_1 = require("../plugins/BlockJSONManagingPlugin");
 const shared_1 = require("../shared");
 const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
-const promises_1 = __importDefault(require("node:fs/promises"));
-const BlockJSONManagingPlugin_1 = require("../plugins/BlockJSONManagingPlugin");
 let isInThemeCache = undefined;
 function isInTheme() {
     return isInThemeCache ?? (isInThemeCache = node_fs_1.default.existsSync(node_path_1.default.join(process.cwd(), "theme.json")));
@@ -256,7 +256,8 @@ function commonMakeWebpackConfig(config, commonConfig, webpackConfig, srcIsDirec
     }
     const canCopyFiles = srcIsDirectory && src !== dest.destination;
     const possiblePlugins = canCopyFiles
-        ? plugins.map(plugin => !processingModules && plugin.constructor.name === 'CopyPlugin'
+        ? plugins.filter(plugin => plugin.constructor.name !== 'CleanWebpackPlugin')
+            .map(plugin => !processingModules && plugin.constructor.name === 'CopyPlugin'
             ? new copy_webpack_plugin_1.default({
                 patterns: [{
                         from: standaloneBlocks ? '**/(block.json|*.(php|twig|svg))' : '**/(block.json|*.(asset\.php|svg))',
@@ -265,9 +266,7 @@ function commonMakeWebpackConfig(config, commonConfig, webpackConfig, srcIsDirec
                     }]
             })
             : plugin)
-        : (srcIsDirectory
-            ? plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin' && plugin.constructor.name !== 'CleanWebpackPlugin')
-            : plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin'));
+        : plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin' && plugin.constructor.name !== 'CleanWebpackPlugin');
     const extensions = processingModules ? ['.mjsx', '.mjs', '.mtsx', '.mts', '...'] : ['.jsx', '.tsx', '.ts', '...'];
     return {
         ...webpackConfig,
@@ -312,7 +311,7 @@ function commonMakeWebpackConfig(config, commonConfig, webpackConfig, srcIsDirec
             extensions
         },
         stats: config.stats,
-        plugins: config.outputDir ? possiblePlugins : possiblePlugins.filter(plugin => plugin.constructor.name !== 'CleanWebpackPlugin'),
+        plugins: possiblePlugins,
         entry() {
             if (variablesFilePath) {
                 delete require.cache[require.resolve(variablesFilePath)];

package/build/wordpress-scripts-wrapper.js

@@ -354,7 +354,7 @@ function handleDisablingTSCheckerIfNecessary(srcRoot, scriptExtension, plugins)
     }
 }
 function buildCommonPluginConfig(srcRoot, scriptExtension, webpackConfig, dest, config, sourceType) {
-    const { assumeGlobalizedPlauditLibraries, combineAssetMetadata, externals, extensionsVersion, plainEntrypointsVersion, variablesFilePath } = config;
+    const { assumeGlobalizedPlauditLibraries, combineAssetMetadata, externals, extensionsVersion, plainEntrypointsVersion, } = config;
     const processingModules = webpackConfig.output?.module ?? false;
     const plugins = webpackConfig.plugins?.filter(v => !!v)
         .filter(plugin => plugin.constructor.name !== 'RtlCssPlugin')
@@ -380,15 +380,9 @@ function buildCommonPluginConfig(srcRoot, scriptExtension, webpackConfig, dest,
         extensions: ['css', 'scss', 'sass', 'less', 'styl', 'pcss']
     });
     plugins.push(removeEmptyScriptsPlugin, new MiniCSSExtractPluginErrorCleaner_1.MiniCSSExtractPluginErrorCleaner());
-    if (config.useUnifiedLoader) {
-        plugins.push(new UnifiedLoaderGenerator_1.UnifiedLoaderGenerator());
-    }
-    if (config.useWebpackResourceFiltering) {
-        plugins.push(new SpecialAssetHandlingPlugin_1.SpecialAssetHandlingPlugin(config.outputDir, config.useUnifiedLoader));
-    }
-    if (variablesFilePath) {
-        plugins.push(new VariablesJSMonitorPlugin_1.VariablesJSMonitorPlugin(variablesFilePath));
-    }
+    plugins.push(new UnifiedLoaderGenerator_1.UnifiedLoaderGenerator(config));
+    plugins.push(new SpecialAssetHandlingPlugin_1.SpecialAssetHandlingPlugin(config));
+    plugins.push(new VariablesJSMonitorPlugin_1.VariablesJSMonitorPlugin(config));
     const dependencyExtractionPluginIndex = plugins.findIndex(plugin => plugin instanceof dependency_extraction_webpack_plugin_1.default);
     if (dependencyExtractionPluginIndex === -1) {
         console.error("Cannot apply externals when they have been disabled via CLI flag. This will greatly increase bundle size and will likely cause the build to fail");
@@ -403,9 +397,7 @@ function buildCommonPluginConfig(srcRoot, scriptExtension, webpackConfig, dest,
         plugins[dependencyExtractionPluginIndex] = builtDependencyExtractionWebpackPlugin.instance;
         plugins.push(new AdditionalDependencyInjectorPlugin_1.AdditionalDependencyInjectorPlugin(dest.additionalDependencies ? dest.additionalDependencies : [], processingModules, builtDependencyExtractionWebpackPlugin.addExternalizedDep));
     }
-    if (process.argv.includes('--browser-sync') || process.env['BROWSER_SYNC'] === 'true') {
-        plugins.push(new BrowserSyncPlugin_1.BrowserSyncPlugin());
-    }
+    plugins.push(new BrowserSyncPlugin_1.BrowserSyncPlugin());
     return { plugins, removeEmptyScriptsPlugin };
 }
 function commonConfigProcessingPrep(config, webpackConfig) {

package/package.json

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