@plaudit/webpack-extensions 2.30.2 → 2.31.1

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

@@ -6,6 +6,13 @@ interface AdvancedOutputConfig {
     additionalDependencies?: string[];
     directoryLayout?: 'blocks' | 'extensions';
 }
+type IndividualExternalDepConfig = string | {
+    import: string;
+    handle: string;
+};
+type Externals = {
+    [dep: string]: IndividualExternalDepConfig;
+};
 type PlauditWordpressWebpackConfig = {
     standaloneBlocks?: boolean;
     variables?: Record<string, any>;
@@ -15,12 +22,7 @@ type PlauditWordpressWebpackConfig = {
     postcss?: {
         functions?: (variables: (name: string) => unknown) => PostcssFunctionsOptions['functions'];
     };
-    externals?: {
-        [dep: string]: string | {
-            import: string;
-            handle: string;
-        };
-    };
+    externals?: Externals;
 };
 declare const _default: (config: PlauditWordpressWebpackConfig, webpackConfig?: Configuration[] | Configuration) => Configuration[];
 export = _default;

package/build/wordpress-scripts-wrapper.js

@@ -232,6 +232,48 @@ function parseEntrypointsJSON(dir) {
         });
     }
 }
+function makeDependencyExtractionPlugin(externals) {
+    const exactExternals = {};
+    const suffixExternals = [];
+    for (const [key, value] of Object.entries(externals)) {
+        if (key.startsWith("*/")) {
+            suffixExternals.push([key.substring(1), typeof value === 'string' ? { import: value, handle: key.substring(2) } : value]);
+        }
+        else {
+            exactExternals[key] = value;
+        }
+    }
+    const resolvePossibleExternal = (request) => {
+        if (request in exactExternals) {
+            return exactExternals[request];
+        }
+        for (const [key, value] of suffixExternals) {
+            if (request.endsWith(key)) {
+                return value;
+            }
+        }
+        return undefined;
+    };
+    return new dependency_extraction_webpack_plugin_1.default({
+        requestToExternal(request) {
+            const possibleExternal = resolvePossibleExternal(request);
+            if (typeof possibleExternal === 'string') {
+                return possibleExternal;
+            }
+            else if (possibleExternal !== undefined) {
+                return possibleExternal['import'];
+            }
+            return undefined;
+        },
+        requestToHandle(request) {
+            const possibleExternal = resolvePossibleExternal(request);
+            if (possibleExternal !== undefined && typeof possibleExternal !== 'string') {
+                return possibleExternal.handle;
+            }
+            return undefined;
+        }
+    });
+}
 function processIndividualWebpackConfig(config, webpackConfig, sources) {
     let scriptExtension; // This is only used in non-block contexts. It might not actually be necessary, but it is good to have
     let entrypointFields;
@@ -313,29 +355,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
                 console.error("Cannot apply externals when they have been disabled via CLI flag.");
             }
             else {
-                plugins[pluginIndex] = new dependency_extraction_webpack_plugin_1.default({
-                    requestToExternal(request) {
-                        const possibleExternal = externals[request];
-                        if (typeof possibleExternal === 'string') {
-                            return possibleExternal;
-                        }
-                        else if (possibleExternal !== undefined) {
-                            return possibleExternal['import'];
-                        }
-                        else {
-                            return undefined;
-                        }
-                    },
-                    requestToHandle(request) {
-                        const possibleExternal = externals[request];
-                        if (possibleExternal !== undefined && typeof possibleExternal !== 'string') {
-                            return typeof possibleExternal.handle;
-                        }
-                        else {
-                            return request;
-                        }
-                    }
-                });
+                plugins[pluginIndex] = makeDependencyExtractionPlugin(externals);
             }
         }
         if (process.argv.includes('--browser-sync') || process.env['BROWSER_SYNC'] === 'true') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.30.2",
+  "version": "2.31.1",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",
@@ -36,6 +36,7 @@
     "@plaudit/postcss-silent-extend": "^3.0.0",
     "@plaudit/postcss-strip-units": "^3.0.0",
     "@plaudit/postcss-variables": "^1.0.0",
+	"@wordpress/dependency-extraction-webpack-plugin": "^6.7.0",
     "@wordpress/scripts": "^28.3.0",
     "autoprefixer": "^10.4.19",
     "browser-sync": "^3.0.2",