@plaudit/webpack-extensions 2.46.0 → 2.47.0

package/README.md

@@ -2,12 +2,6 @@
 To test locally, either set up yarn to pull from this folder or (ideally) build and copy the resulting built files into another project for testing purposes.
 
 # To Deploy
-If you haven't
 ```
-yarn global add genversion
-```
-
-To deploy
-```
-./publish.sh y
+publish-pnpm-package
 ```

package/build/wordpress-scripts-wrapper/dependency-extraction-webpack-plugin-config-builder.d.ts

@@ -1,4 +1,5 @@
 import DependencyExtractionWebpackPlugin from "@wordpress/dependency-extraction-webpack-plugin";
+import type { Configuration } from "webpack";
 export type IndividualExternalDepConfig = string | {
     import?: string | [string, ...string[]];
     handle: string;
@@ -6,7 +7,7 @@ export type IndividualExternalDepConfig = string | {
 export type Externals = {
     [dep: string]: IndividualExternalDepConfig;
 };
-export declare function makeDependencyExtractionPlugin(externals: Externals | undefined, assumeGlobalizedPlauditLibraries: boolean, wantsGroupedDepData: boolean): {
+export declare function makeDependencyExtractionPlugin(externals: Externals | undefined, assumeGlobalizedPlauditLibraries: boolean, wantsGroupedDepData: boolean, externalizing: Required<Configuration>['output']['library']): {
     instance: DependencyExtractionWebpackPlugin;
     addExternalizedDep: (dep: string) => void;
 };

package/build/wordpress-scripts-wrapper/dependency-extraction-webpack-plugin-config-builder.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeDependencyExtractionPlugin = makeDependencyExtractionPlugin;
 const dependency_extraction_webpack_plugin_1 = __importDefault(require("@wordpress/dependency-extraction-webpack-plugin"));
-function makeDependencyExtractionPlugin(externals, assumeGlobalizedPlauditLibraries, wantsGroupedDepData) {
-    const baseProps = makeDependencyExtractionPluginProps(externals, assumeGlobalizedPlauditLibraries);
+function makeDependencyExtractionPlugin(externals, assumeGlobalizedPlauditLibraries, wantsGroupedDepData, externalizing) {
+    const baseProps = makeDependencyExtractionPluginProps(externals, assumeGlobalizedPlauditLibraries, externalizing);
     const instance = new dependency_extraction_webpack_plugin_1.default(wantsGroupedDepData ? { ...baseProps, outputFormat: "json", combineAssets: true } : baseProps);
     return {
         instance,
@@ -15,11 +15,11 @@ function makeDependencyExtractionPlugin(externals, assumeGlobalizedPlauditLibrar
         }
     };
 }
-function makeDependencyExtractionPluginProps(externals, assumeGlobalizedPlauditLibraries) {
+function makeDependencyExtractionPluginProps(externals, assumeGlobalizedPlauditLibraries, externalizing) {
     if (!externals) {
         if (assumeGlobalizedPlauditLibraries) {
             return {
-                requestToExternal: plauditRequestToExternal,
+                requestToExternal: plauditRequestToExternal(externalizing),
                 requestToHandle: plauditRequestToHandle
             };
         }
@@ -38,11 +38,11 @@ function makeDependencyExtractionPluginProps(externals, assumeGlobalizedPlauditL
     }
     const resolvePossibleExternal = (request) => {
         if (request in exactExternals) {
-            return exactExternals[request];
+            return handleExternalizingEqualsPossibleExternal(exactExternals[request], externalizing);
         }
         for (const [key, value] of suffixExternals) {
             if (request.endsWith(key)) {
-                return value;
+                return handleExternalizingEqualsPossibleExternal(value, externalizing);
             }
         }
         return undefined;
@@ -66,7 +66,7 @@ function makeDependencyExtractionPluginProps(externals, assumeGlobalizedPlauditL
     };
     if (assumeGlobalizedPlauditLibraries) {
         return {
-            requestToExternal: curryRequestHandlers(baselineRequestToExternal, plauditRequestToExternal),
+            requestToExternal: curryRequestHandlers(baselineRequestToExternal, plauditRequestToExternal(externalizing)),
             requestToHandle: curryRequestHandlers(baselineRequestToHandle, plauditRequestToHandle),
         };
     }
@@ -77,16 +77,29 @@ function makeDependencyExtractionPluginProps(externals, assumeGlobalizedPlauditL
         };
     }
 }
-const PLAUDIT_NAMESPACE = '@plaudit/';
-const EXTERNALIZABLE_PLAUDIT_LIBRARIES = ['@plaudit/frontend-apis', '@plaudit/library-extensions'];
-function plauditRequestToExternal(request) {
-    if (EXTERNALIZABLE_PLAUDIT_LIBRARIES.includes(request)) {
-        return ['plaudit', camelCaseDash(request.substring(PLAUDIT_NAMESPACE.length))];
+function firstLayersEqual(first, second) {
+    if (first.length !== second.length) {
+        return false;
     }
-    else if (request.startsWith('@plaudit/gutenberg-api-extensions')) {
-        return ['plaudit', 'gutenbergApiExtensions'];
+    for (let i = 0; i < first.length; i++) {
+        if (first[i] !== second[i]) {
+            return false;
+        }
     }
-    return undefined;
+    return true;
+}
+const PLAUDIT_NAMESPACE = '@plaudit/';
+const EXTERNALIZABLE_PLAUDIT_LIBRARIES = ['@plaudit/frontend-apis', '@plaudit/library-extensions'];
+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;
+        }
+        return undefined;
+    };
 }
 function plauditRequestToHandle(request) {
     if (EXTERNALIZABLE_PLAUDIT_LIBRARIES.includes(request)) {
@@ -106,3 +119,39 @@ function curryRequestHandlers(primary, secondary) {
 function camelCaseDash(string) {
     return string.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
 }
+function handleExternalizingEqualsPossibleExternal(possibleExternal, ext) {
+    if (!ext || !possibleExternal) {
+        return possibleExternal;
+    }
+    const possibleImport = typeof possibleExternal === 'string' ? possibleExternal : possibleExternal['import'];
+    if (!possibleImport) {
+        return possibleExternal;
+    }
+    if (typeof ext === 'string') {
+        if (typeof possibleImport === 'string') {
+            return ext !== possibleImport ? possibleExternal : undefined;
+        }
+        else {
+            return possibleImport.length !== 1 || ext !== possibleImport[0] ? possibleExternal : undefined;
+        }
+    }
+    else if (Array.isArray(ext)) {
+        if (typeof possibleImport === 'string') {
+            return ext.length !== 1 || ext[0] !== possibleImport ? possibleExternal : undefined;
+        }
+        else {
+            return !firstLayersEqual(ext, possibleImport) ? possibleExternal : undefined;
+        }
+    }
+    else if ('name' in ext) {
+        return handleExternalizingEqualsPossibleExternal(possibleExternal, ext.name);
+    }
+    else {
+        for (const key of ['amd', 'commonjs', 'root']) {
+            if (key in ext && handleExternalizingEqualsPossibleExternal(possibleExternal, ext[key])) {
+                return undefined;
+            }
+        }
+    }
+    return possibleExternal;
+}

package/build/wordpress-scripts-wrapper.d.ts

@@ -7,7 +7,7 @@ interface AdvancedOutputConfig {
     additionalDependencies?: string[];
     directoryLayout?: 'blocks' | 'extensions' | 'plain';
     assumeGlobalizedPlauditLibraries?: boolean;
-    externalize?: string[] | Required<Configuration>['output']['library'];
+    externalize?: Required<Configuration>['output']['library'];
 }
 type PlauditWordpressWebpackConfig = {
     standaloneBlocks?: boolean;

package/build/wordpress-scripts-wrapper.js

@@ -339,8 +339,8 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
             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 file");
         }
         else {
-            const localAssumeGlobalizedPlauditLibraries = typeof dest !== 'string' ? dest.assumeGlobalizedPlauditLibraries : undefined;
-            const builtDependencyExtractionWebpackPlugin = (0, dependency_extraction_webpack_plugin_config_builder_1.makeDependencyExtractionPlugin)(externals, localAssumeGlobalizedPlauditLibraries ?? assumeGlobalizedPlauditLibraries, combineAssetMetadata && !processingModules && forBlocksDirectory);
+            const localAssumeGlobalizedPlauditLibraries = (typeof dest !== 'string' ? dest.assumeGlobalizedPlauditLibraries : undefined) ?? assumeGlobalizedPlauditLibraries;
+            const builtDependencyExtractionWebpackPlugin = (0, dependency_extraction_webpack_plugin_config_builder_1.makeDependencyExtractionPlugin)(externals, localAssumeGlobalizedPlauditLibraries, combineAssetMetadata && !processingModules && forBlocksDirectory, typeof dest !== 'string' ? dest.externalize : undefined);
             plugins[pluginIndex] = builtDependencyExtractionWebpackPlugin.instance;
             plugins.push(new AdditionalDependencyInjectorPlugin_1.default(typeof dest !== 'string' && dest.additionalDependencies ? dest.additionalDependencies : [], processingModules, builtDependencyExtractionWebpackPlugin.addExternalizedDep));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "license": "UNLICENSED",
   "files": [
     "/build"
@@ -16,9 +16,9 @@
     }
   },
   "devDependencies": {
-    "@plaudit/gutenberg-api-extensions": "^2.66.1",
+    "@plaudit/gutenberg-api-extensions": "^2.68.1",
     "@types/browser-sync-webpack-plugin": "^2.2.5",
-    "@types/node": "^22.15.3",
+    "@types/node": "^22.15.18",
     "@types/postcss-functions": "^4.0.4",
     "@types/tapable": "^2.2.7",
     "@types/webpack": "^5.28.5",
@@ -34,8 +34,8 @@
     "@plaudit/postcss-silent-extend": "^3.0.0",
     "@plaudit/postcss-strip-units": "^3.0.0",
     "@plaudit/postcss-variables": "^1.1.0",
-    "@wordpress/dependency-extraction-webpack-plugin": "^6.22.0",
-    "@wordpress/scripts": "^30.15.0",
+    "@wordpress/dependency-extraction-webpack-plugin": "^6.23.0",
+    "@wordpress/scripts": "^30.16.0",
     "autoprefixer": "^10.4.21",
     "browser-sync": "^3.0.4",
     "clean-webpack-plugin": "^4.0.0",
@@ -62,9 +62,9 @@
     "postcss-url": "^10.1.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "webpack": "^5.99.7",
+    "webpack": "^5.99.8",
     "webpack-remove-empty-scripts": "^1.0.4",
-    "xml-formatter": "^3.6.5"
+    "xml-formatter": "^3.6.6"
   },
   "engines": {
     "node": ">=20"