@plaudit/webpack-extensions 2.57.0 → 2.57.2

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.d.ts

@@ -6,12 +6,13 @@ export declare class PlainEntrypointsConfigFileGeneratorPlugin implements Webpac
     private readonly outputDir;
     private readonly usageLocations;
     private readonly handlePrefix;
+    private readonly useUnifiedLoader;
     private static readonly semaphore;
     private static cache?;
     private readonly id;
-    constructor(buildRoot: string, outputDir: string, usageLocations: UsageLocations, handlePrefix: string);
+    constructor(buildRoot: string, outputDir: string, usageLocations: UsageLocations, handlePrefix: string, useUnifiedLoader: boolean);
     apply(compiler: Compiler): void;
-    private static afterProcessAssets;
+    private afterProcessAssets;
     private static addHandlesToHandleLists;
     private static appendEnqueuingHandleLists;
     private static separateHandleListByPriority;

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -15,14 +15,16 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
     outputDir;
     usageLocations;
     handlePrefix;
+    useUnifiedLoader;
     static semaphore = new pseduo_semaphore_1.PseudoSemaphore([], "Plain");
     static cache = undefined;
     id;
-    constructor(buildRoot, outputDir, usageLocations, handlePrefix) {
+    constructor(buildRoot, outputDir, usageLocations, handlePrefix, useUnifiedLoader) {
         this.buildRoot = buildRoot;
         this.outputDir = outputDir;
         this.usageLocations = usageLocations;
         this.handlePrefix = handlePrefix;
+        this.useUnifiedLoader = useUnifiedLoader;
         this.id = Math.random().toString();
         PlainEntrypointsConfigFileGeneratorPlugin.semaphore.register(this.id);
         UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.register(this.id);
@@ -40,11 +42,10 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
             });
             compilation.hooks.processAssets.tapPromise(tapName, async (assets) => {
                 try {
-                    const emitDir = node_path_1.default.join(this.buildRoot, this.outputDir);
                     if (PlainEntrypointsConfigFileGeneratorPlugin.cache === undefined) {
                         PlainEntrypointsConfigFileGeneratorPlugin.cache = { assets: [] };
                         compilation.hooks.afterProcessAssets.tap(`${this.constructor.name}_CompileLoader`, () => {
-                            PlainEntrypointsConfigFileGeneratorPlugin.afterProcessAssets(compilation, emitDir);
+                            this.afterProcessAssets(compilation);
                         });
                     }
                     const rawAssetDataSource = assets["assets.json"]?.source();
@@ -113,7 +114,8 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
             });
         });
     }
-    static afterProcessAssets(compilation, emitDir) {
+    afterProcessAssets(compilation) {
+        const emitDir = node_path_1.default.join(this.buildRoot, this.outputDir);
         //TODO: Add support for editorStyles via the 'block_editor_settings_all' filter
         const handleLists = {
             register: [],
@@ -171,7 +173,9 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
         }
         const writer = new php_writer_1.PHPWriter();
         if (handleLists.register.length > 0) {
-            PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+            if (!this.useUnifiedLoader) {
+                PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+            }
             for (const [priority, prioritizedHandleList] of PlainEntrypointsConfigFileGeneratorPlugin.separateHandleListByPriority(handleLists.register)) {
                 writer.action("init", writer => {
                     writer.call("plaudit_webpack_extensions__resolve_base_uri", [new php_writer_1.Expr('__DIR__')], { assignTo: "$base_uri" });

package/build/plugins/SpecialAssetHandlingPlugin.d.ts

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

package/build/plugins/SpecialAssetHandlingPlugin.js

@@ -12,12 +12,14 @@ const webpack_1 = require("webpack");
 const UnifiedLoaderGenerator_1 = require("./UnifiedLoaderGenerator");
 class SpecialAssetHandlingPlugin {
     outputDir;
+    useUnifiedLoader;
     static semaphore = new pseduo_semaphore_1.PseudoSemaphore({}, "Special");
     static hasAttachedAssetCollatorForCurrentBatch = false;
     static validPathname = undefined;
     id;
-    constructor(outputDir) {
+    constructor(outputDir, useUnifiedLoader) {
         this.outputDir = outputDir;
+        this.useUnifiedLoader = useUnifiedLoader;
         this.id = Math.random().toString();
         SpecialAssetHandlingPlugin.semaphore.register(this.id);
         UnifiedLoaderGenerator_1.UnifiedLoaderGenerator.semaphore.register(this.id);
@@ -85,7 +87,9 @@ class SpecialAssetHandlingPlugin {
             writer.emitAsset(compilation, outputFile);
             return;
         }
-        PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+        if (!this.useUnifiedLoader) {
+            PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin.emitResolveBaseUriFunction(writer);
+        }
         writer.action("wp_head", writer => {
             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) {

package/build/shared.d.ts

@@ -69,6 +69,7 @@ export type PlauditWordpressWebpackConfig = {
     plainEntrypointsVersion?: 1 | 2;
     srcDir?: string;
     srcPrefixes?: string[];
+    useUnifiedLoader?: boolean;
 };
 export declare function makeEmittableConfigPHP(data: any): string;
 export type Sync<V> = {

package/build/wordpress-scripts-wrapper.js

@@ -169,7 +169,7 @@ 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, outputDir = "", extensionsVersion = 1, plainEntrypointsVersion = 1, srcDir = "" } = 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, outputDir = "", extensionsVersion = 1, plainEntrypointsVersion = 1, srcDir = "", useUnifiedLoader = false } = config;
     let srcPrefixes;
     const trailingSlashedSrcDir = srcDir && !srcDir.endsWith("/") ? srcDir + "/" : srcDir;
     if (config.srcPrefixes === undefined) {
@@ -238,7 +238,7 @@ function buildVerifiedConfig(config) {
     }
     const cfg = {
         currentVariables, postcss, standaloneBlocks, stats, variablesFilePath, verbose, externals, assumeGlobalizedPlauditLibraries, processTranslationConfigs, combineAssetMetadata,
-        useWebpackResourceFiltering, outputDir, extensionsVersion, plainEntrypointsVersion, plainEntrypointsHandlePrefix, srcDir, srcPrefixes
+        useWebpackResourceFiltering, outputDir, extensionsVersion, plainEntrypointsVersion, plainEntrypointsHandlePrefix, srcDir, srcPrefixes, useUnifiedLoader
     };
     return cfg.outputDir ? { cfg, sources } : withDerivedOutputDir(cfg, sources);
 }
@@ -380,11 +380,11 @@ function buildCommonPluginConfig(srcRoot, scriptExtension, webpackConfig, dest,
         extensions: ['css', 'scss', 'sass', 'less', 'styl', 'pcss']
     });
     plugins.push(removeEmptyScriptsPlugin, new MiniCSSExtractPluginErrorCleaner_1.MiniCSSExtractPluginErrorCleaner());
-    if (config.outputDir) {
+    if (config.useUnifiedLoader) {
         plugins.push(new UnifiedLoaderGenerator_1.UnifiedLoaderGenerator());
     }
     if (config.useWebpackResourceFiltering) {
-        plugins.push(new SpecialAssetHandlingPlugin_1.SpecialAssetHandlingPlugin(config.outputDir));
+        plugins.push(new SpecialAssetHandlingPlugin_1.SpecialAssetHandlingPlugin(config.outputDir, config.useUnifiedLoader));
     }
     if (variablesFilePath) {
         plugins.push(new VariablesJSMonitorPlugin_1.VariablesJSMonitorPlugin(variablesFilePath));
@@ -520,7 +520,7 @@ function makePlainV1WebpackConfig(config, commonConfig, webpackConfig, dest, src
     return (0, common_config_helpers_1.commonMakeWebpackConfig)(config, commonConfig, webpackConfig, srcIsDirectory, dest, src, srcRoot, entry, plugins);
 }
 function makePlainV2WebpackConfig(config, commonConfig, webpackConfig, dest, src, srcRoot, plugins, srcIsDirectory) {
-    plugins.push(new PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin(process.cwd(), config.outputDir, dest.locations ?? {}, config.plainEntrypointsHandlePrefix));
+    plugins.push(new PlainEntrypointsConfigFileGeneratorPlugin_1.PlainEntrypointsConfigFileGeneratorPlugin(process.cwd(), config.outputDir, dest.locations ?? {}, config.plainEntrypointsHandlePrefix, config.useUnifiedLoader));
     const baseDest = stripExtension(dest.destination);
     const entry = srcIsDirectory // This being true implies that srcRoot is not an array
         ? (0, common_config_helpers_1.resolveEntryFromDirectory)(commonConfig, srcRoot, dest)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.57.0",
+  "version": "2.57.2",
   "license": "UNLICENSED",
   "files": [
     "/build"
@@ -63,7 +63,7 @@
     "postcss-url": "^10.1.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "webpack": "^5.101.0",
+    "webpack": "^5.101.1",
     "webpack-remove-empty-scripts": "^1.1.1",
     "xml-formatter": "^3.6.6"
   },