@plaudit/webpack-extensions 2.72.0 → 2.73.0

package/build/shared.d.ts

@@ -129,7 +129,7 @@ export declare const scriptExtension: RegExp;
 export declare const scriptWithoutModuleExtension: RegExp;
 export declare const scriptWithModuleExtension: RegExp;
 export declare const styleExtension: RegExp;
-export declare function scriptOrStyleTest(entryPath: string, scriptExtension: RegExp): "" | "style" | "script";
+export declare function scriptOrStyleTest(entryPath: string, scriptExtension: RegExp): "style" | "script" | "";
 export declare function isStyleField(field: string): field is 'style' | 'viewStyle' | 'editorStyle';
 export declare function isScriptModuleField(field: string): field is 'scriptModule' | 'viewScriptModule';
 export declare function getHandleGroup(field: string): 'styleHandles' | 'scriptHandles' | 'scriptModuleHandles';
@@ -147,4 +147,6 @@ export declare function newWebpackErrorForFile(error: string | ConstructorParame
 export declare function emitResolveBaseUriFunction(writer: PHPWriter): void;
 export declare function getAssetsJson(compilation: Compilation): ParsedAssetsJson;
 export declare function emitPHPWriterAsAsset(writer: PHPWriter, compilation: Compilation, file: string, assetInfo?: AssetInfo): void;
+export declare function dedent(text: TemplateStringsArray): string;
+export declare function resolveLegacyBlockScriptsInFolder(folder: string): string[];
 export {};

package/build/shared.js

@@ -25,7 +25,11 @@ exports.newWebpackErrorForFile = newWebpackErrorForFile;
 exports.emitResolveBaseUriFunction = emitResolveBaseUriFunction;
 exports.getAssetsJson = getAssetsJson;
 exports.emitPHPWriterAsAsset = emitPHPWriterAsAsset;
+exports.dedent = dedent;
+exports.resolveLegacyBlockScriptsInFolder = resolveLegacyBlockScriptsInFolder;
+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 php_writer_1 = require("@plaudit/php-writer");
 const expressions_1 = require("@plaudit/php-writer/expressions");
 const webpack_1 = require("webpack");
@@ -183,3 +187,25 @@ function emitPHPWriterAsAsset(writer, compilation, file, assetInfo) {
     const contents = writer.toString() + "\n";
     compilation[file in compilation.assets ? 'updateAsset' : 'emitAsset'](file, new webpack_1.sources.RawSource(contents), { size: Buffer.byteLength(contents), ...assetInfo });
 }
+function dedent(text) {
+    const actualText = text.join("\n");
+    const firstLineIndent = actualText.split("\r?\n").find(line => line.length > 0)?.match(/^\s+/)?.[0];
+    if (!firstLineIndent) {
+        return actualText;
+    }
+    return actualText.replaceAll(new RegExp("^" + firstLineIndent, 'mg'), "").replace(/\n{2}$/, "\n");
+}
+function resolveLegacyBlockScriptsInFolder(folder) {
+    const blockScriptEntrypoints = [];
+    for (const blockDir of node_fs_1.default.readdirSync(folder)) {
+        const fullBlockDir = node_path_1.default.join(folder, blockDir);
+        const packageJSON = node_path_1.default.join(fullBlockDir, 'package.json');
+        if (node_fs_1.default.existsSync(packageJSON)) {
+            const main = JSON.parse(node_fs_1.default.readFileSync(packageJSON, 'utf8'))['main'];
+            if (main && node_fs_1.default.existsSync(node_path_1.default.join(fullBlockDir, main))) {
+                blockScriptEntrypoints.push(node_path_1.default.join(fullBlockDir, main));
+            }
+        }
+    }
+    return blockScriptEntrypoints;
+}

package/build/wordpress-scripts-wrapper.js

@@ -22,24 +22,9 @@ const VariablesJSMonitorPlugin_1 = require("./plugins/VariablesJSMonitorPlugin")
 const WPMLConfigBuilder_1 = require("./plugins/WPMLConfigBuilder");
 const static_configs_1 = require("./plugins/static-configs");
 const UnifiedLoaderGenerator_1 = require("./plugins/UnifiedLoaderGenerator");
-const dependency_extraction_webpack_plugin_1 = __importDefault(require("@wordpress/dependency-extraction-webpack-plugin"));
 const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
 const webpack_remove_empty_scripts_1 = __importDefault(require("webpack-remove-empty-scripts"));
-function resolveLegacyBlockScriptsInFolder(folder) {
-    const blockScriptEntrypoints = [];
-    for (const blockDir of node_fs_1.default.readdirSync(folder)) {
-        const fullBlockDir = node_path_1.default.join(folder, blockDir);
-        const packageJSON = node_path_1.default.join(fullBlockDir, 'package.json');
-        if (node_fs_1.default.existsSync(packageJSON)) {
-            const main = JSON.parse(node_fs_1.default.readFileSync(packageJSON, 'utf8'))['main'];
-            if (main && node_fs_1.default.existsSync(node_path_1.default.join(fullBlockDir, main))) {
-                blockScriptEntrypoints.push(node_path_1.default.join(fullBlockDir, main));
-            }
-        }
-    }
-    return blockScriptEntrypoints;
-}
 function testForDuplicatedEntryPaths(sources) {
     const seenPaths = (0, common_config_helpers_1.groupEntrypointsByAssetFile)(Array.isArray(sources)
         ? sources.map(s => typeof s === 'string' ? s : s[1].destination)
@@ -400,10 +385,16 @@ function buildCommonPluginConfig(webpackConfig, config, bundleAnalyzer, assumeGl
         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);
+    // We have to use constructor.name here the version desyncs can result in multiple equivalent versions kicking around
+    const dependencyExtractionPluginIndex = plugins.findIndex(plugin => plugin.constructor.name === 'DependencyExtractionWebpackPlugin');
     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");
-        throw new Error();
+        console.error((0, shared_1.dedent) `
+			Unable to find the DependencyExtractionWebpackPlugin.
+			If this is your first time seeing this error, please run: pnpm up && pnpm dedupe && pnpm up
+			Once those commands have finished, re-run whichever command had this error. If it still doesn't work, report the issue immediately.
+			`);
+        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);
     plugins[dependencyExtractionPluginIndex] = builtDependencyExtractionWebpackPlugin.instance;
@@ -461,7 +452,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources, canClean
     const { processingModules, scriptExtension } = commonConfig;
     const allSrcRoots = sources.map(([src, dest]) => {
         const srcRoots = (dest.withLegacyBlocksIn
-            ? [...src.split(','), ...resolveLegacyBlockScriptsInFolder(node_path_1.default.join(config.srcDir, dest.withLegacyBlocksIn))]
+            ? [...src.split(','), ...(0, shared_1.resolveLegacyBlockScriptsInFolder)(node_path_1.default.join(config.srcDir, dest.withLegacyBlocksIn))]
             : src.split(',')).filter(s => s.endsWith(".json") || !s.substring(s.lastIndexOf('/')).includes('.') || processingModules === shared_1.scriptWithModuleExtension.test(s));
         const srcRoot = srcRoots.length < 2 ? (0, common_config_helpers_1.joinPossiblyAbsolutePaths)(process.cwd(), src) : srcRoots.map(s => (0, common_config_helpers_1.joinPossiblyAbsolutePaths)(process.cwd(), s));
         const srcIsDirectory = !Array.isArray(srcRoot) && node_fs_1.default.lstatSync(srcRoot, { throwIfNoEntry: false })?.isDirectory();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.72.0",
+  "version": "2.73.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/build"
@@ -20,9 +20,9 @@
     }
   },
   "devDependencies": {
-    "@plaudit/gutenberg-api-extensions": "^2.77.2",
+    "@plaudit/gutenberg-api-extensions": "^2.78.1",
     "@types/browser-sync-webpack-plugin": "^2.2.5",
-    "@types/node": "^24.7.2",
+    "@types/node": "^24.9.2",
     "@types/postcss-functions": "^4.0.4",
     "@types/tapable": "^2.3.0",
     "@types/webpack": "^5.28.5",
@@ -34,14 +34,14 @@
     "webpack-bundle-analyzer": "^4.10.2"
   },
   "dependencies": {
-    "@plaudit/php-writer": "^1.0.0",
+    "@plaudit/php-writer": "^1.2.3",
     "@plaudit/postcss-color-function": "^5.0.0",
     "@plaudit/postcss-legacy-shorthand": "^1.0.0",
     "@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.32.0",
-    "@wordpress/scripts": "^30.25.0",
+    "@wordpress/dependency-extraction-webpack-plugin": "^6.34.0",
+    "@wordpress/scripts": "^30.27.0",
     "autoprefixer": "^10.4.21",
     "browser-sync": "^3.0.4",
     "copy-webpack-plugin": "^10.2.4",