@plaudit/webpack-extensions 2.78.1 → 2.80.0

package/build/plugins/AdditionalDependencyInjectorPlugin.d.ts

@@ -6,7 +6,7 @@ export declare class AdditionalDependencyInjectorPlugin extends AbstractBiPhasic
     private readonly processingModules;
     private readonly addExternalizedDep;
     private readonly referencePlugin;
-    constructor(config: VerifiedPlauditWordpressWebpackConfig, processingModules: boolean, addExternalizedDep: (dep: string) => void, referencePlugin: AbstractBiPhasicGroupAndEntryPlugin<any>);
+    constructor(config: VerifiedPlauditWordpressWebpackConfig, processingModules: boolean | undefined, addExternalizedDep: (dep: string) => void, referencePlugin: AbstractBiPhasicGroupAndEntryPlugin<any>);
     protected attachStandardPhase(compilation: Compilation): void;
     protected attachUniquePhase(): void;
 }

package/build/plugins/UnifiedLoaderGenerator.d.ts

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

package/build/plugins/UnifiedLoaderGenerator.js

@@ -93,11 +93,11 @@ class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPha
                     let writer;
                     if (compilation.outputOptions.path?.endsWith("-dev")) {
                         compilation['.gitignore' in compilation.assets ? 'updateAsset' : 'emitAsset']('.gitignore', new webpack_1.sources.RawSource('**'), { size: 2 });
-                        UnifiedLoaderGenerator.ensureDistExists(compilation.outputOptions.path);
+                        this.ensureDistExists(compilation.outputOptions.path);
                         writer = new php_writer_1.PHPWriter();
                     }
                     else {
-                        writer = UnifiedLoaderGenerator.withDistDevLoader();
+                        writer = this.withDistDevLoader();
                     }
                     if (groupedLoaderInfo.some(wc => wc.requiresBaseURI)) {
                         (0, shared_1.emitResolveBaseUriFunction)(writer);
@@ -110,7 +110,10 @@ class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPha
             }
         });
     }
-    static withDistDevLoader() {
+    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])))
@@ -118,19 +121,19 @@ class UnifiedLoaderGenerator extends AbstractBiPhasicGroupPlugin_1.AbstractBiPha
             .append("return;")
             .endIf();
     }
-    static async ensureDistExists(outputPath) {
+    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"), UnifiedLoaderGenerator.withDistDevLoader().toString() + contents.substring(5), 'utf-8');
+                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"), UnifiedLoaderGenerator.withDistDevLoader().toString(), 'utf-8');
+            await (0, promises_1.writeFile)((0, node_path_1.join)(outputPath, "unified-loader.php"), this.withDistDevLoader().toString(), 'utf-8');
         }
     }
 }

package/build/plugins/dependency-extraction-webpack-plugin-config-builder.d.ts

@@ -1,5 +1,5 @@
 import DependencyExtractionWebpackPlugin from "@wordpress/dependency-extraction-webpack-plugin";
-import type { Externals } from "../shared";
+import { Externals } from "../shared";
 import type { Configuration } from "webpack";
 export declare function makeDependencyExtractionPlugin(externals: Externals | undefined, assumeGlobalizedPlauditLibraries: boolean, wantsGroupedDepData: boolean, externalizing: Required<Configuration>['output']['library']): {
     instance: DependencyExtractionWebpackPlugin;

package/build/plugins/dependency-extraction-webpack-plugin-config-builder.js

@@ -89,38 +89,29 @@ function firstLayersEqual(first, second) {
     return true;
 }
 const PLAUDIT_NAMESPACE = '@plaudit/';
-const EXTERNALIZABLE_PLAUDIT_LIBRARIES = ['@plaudit/frontend-apis', '@plaudit/library-extensions', '@plaudit/block-supports'];
+const EXTERNALIZABLE_PLAUDIT_LIBRARIES = {
+    ...Object.fromEntries(['@plaudit/frontend-apis', '@plaudit/library-extensions', '@plaudit/block-supports', '@plaudit/gutenberg-api-extensions']
+        .map(req => {
+        return [req, {
+                import: ['plaudit', camelCaseDash(req.substring(PLAUDIT_NAMESPACE.length))],
+                handle: `plaudit-${req.substring(PLAUDIT_NAMESPACE.length)}`
+            }];
+    })),
+    "@plaudit/wp-consent-api": { handle: "wp-consent-api", import: ['plaudit'] },
+    "@plaudit/analytics-integrations-api": { handle: "plaudit/analytics-integrations/api", import: ['plaudit', 'analyticsIntegrations', 'api'] },
+    "google.maps": { handle: "plaudit-base/google-maps-api", import: ['google', 'maps'] }
+};
 function plauditRequestToExternal(ext) {
     return function (request) {
-        if (EXTERNALIZABLE_PLAUDIT_LIBRARIES.includes(request)) {
-            return handleExternalizingEqualsPossibleExternal({ import: ['plaudit', camelCaseDash(request.substring(PLAUDIT_NAMESPACE.length))], handle: "" }, ext)?.import;
-        }
-        else if (request.startsWith('@plaudit/gutenberg-api-extensions')) {
-            return handleExternalizingEqualsPossibleExternal({ import: ['plaudit', 'gutenbergApiExtensions'], handle: "" }, ext)?.import;
-        }
-        else if (request.startsWith('@plaudit/wp-consent-api')) {
-            return handleExternalizingEqualsPossibleExternal({ import: ['plaudit'], handle: "" }, ext)?.import;
-        }
-        else if (request.startsWith('@plaudit/analytics-integrations-api')) {
-            return handleExternalizingEqualsPossibleExternal({ import: ['plaudit', 'analyticsIntegrations', 'api'], handle: "" }, ext)?.import;
-        }
-        return undefined;
+        const req = EXTERNALIZABLE_PLAUDIT_LIBRARIES[normalizeRequest(request)];
+        return req ? handleExternalizingEqualsPossibleExternal(req, ext)?.import : undefined;
     };
 }
 function plauditRequestToHandle(request) {
-    if (EXTERNALIZABLE_PLAUDIT_LIBRARIES.includes(request)) {
-        return 'plaudit-' + request.substring(PLAUDIT_NAMESPACE.length);
-    }
-    else if (request.startsWith('@plaudit/gutenberg-api-extensions')) {
-        return 'plaudit-gutenberg-api-extensions';
-    }
-    else if (request.startsWith('@plaudit/wp-consent-api')) {
-        return 'wp-consent-api';
-    }
-    else if (request.startsWith('@plaudit/analytics-integrations-api')) {
-        return 'plaudit/analytics-integrations/api';
-    }
-    return undefined;
+    return EXTERNALIZABLE_PLAUDIT_LIBRARIES[normalizeRequest(request)]?.handle;
+}
+function normalizeRequest(request) {
+    return request.startsWith("@plaudit/gutenberg-api-extensions/") ? "@plaudit/gutenberg-api-extensions" : request;
 }
 function curryRequestHandlers(primary, secondary) {
     return (...args) => primary(...args) ?? secondary(...args);

package/build/shared.d.ts

@@ -63,10 +63,11 @@ export declare const enum SourceType {
     plain = "plain"
 }
 export declare function determineCurrentSourceType(dest: string | AdvancedOutputConfig, srcIsDirectory: boolean): SourceType;
-export type IndividualExternalDepConfig = string | {
+export type ObjectIndividualExternalDepConfig = {
     import?: string | [string, ...string[]];
     handle: string;
 };
+export type IndividualExternalDepConfig = string | ObjectIndividualExternalDepConfig;
 export type Externals = {
     [dep: string]: IndividualExternalDepConfig;
 };
@@ -108,6 +109,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 = {};
@@ -368,8 +368,6 @@ function handleDisablingTSCheckerIfNecessary(srcRoot, scriptExtension, plugins)
     }
 }
 function buildCommonPluginConfig(webpackConfig, config, bundleAnalyzer, assumeGlobalizedPlauditLibraries, externalize) {
-    const { externals } = config;
-    const processingModules = webpackConfig.output?.module ?? false;
     const plugins = webpackConfig.plugins?.filter(v => !!v)
         .filter(plugin => plugin.constructor.name !== 'RtlCssPlugin')
         .filter(plugin => plugin.constructor.name !== 'CopyPlugin' && plugin.constructor.name !== 'CleanWebpackPlugin')
@@ -410,13 +408,13 @@ function buildCommonPluginConfig(webpackConfig, config, bundleAnalyzer, assumeGl
         console.error("Once those commands have finished, re-run whichever command had this error. If it still doesn't work, report the issue immediately.");
         throw new 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");
     }
-    const builtDependencyExtractionWebpackPlugin = (0, dependency_extraction_webpack_plugin_config_builder_1.makeDependencyExtractionPlugin)(externals, assumeGlobalizedPlauditLibraries, true, externalize);
+    const builtDependencyExtractionWebpackPlugin = (0, dependency_extraction_webpack_plugin_config_builder_1.makeDependencyExtractionPlugin)(config.externals, assumeGlobalizedPlauditLibraries, true, externalize);
     plugins[dependencyExtractionPluginIndex] = builtDependencyExtractionWebpackPlugin.instance;
     plugins.push(new BrowserSyncPlugin_1.BrowserSyncPlugin());
     return {
         plugins, removeEmptyScriptsPlugin,
         makeAdditionalDependencyInjectorPlugin(referencePlugin) {
-            return new AdditionalDependencyInjectorPlugin_1.AdditionalDependencyInjectorPlugin(config, processingModules, builtDependencyExtractionWebpackPlugin.addExternalizedDep, referencePlugin);
+            return new AdditionalDependencyInjectorPlugin_1.AdditionalDependencyInjectorPlugin(config, webpackConfig.output?.module, builtDependencyExtractionWebpackPlugin.addExternalizedDep, referencePlugin);
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.78.1",
+  "version": "2.80.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/build"
@@ -61,7 +61,7 @@
     "postcss-reporter": "^7.1.0",
     "postcss-simple-vars": "^7.0.1",
     "postcss-url": "^10.1.3",
-    "webpack": "^5.104.0",
+    "webpack": "^5.104.1",
     "webpack-remove-empty-scripts": "^1.1.1",
     "xml-formatter": "^3.6.7"
   },