@plaudit/webpack-extensions 2.38.0 → 2.40.0

package/build/wordpress-scripts-wrapper.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 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 AdditionalDependencyInjectorPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/AdditionalDependencyInjectorPlugin"));
 const BlockJSONManagingPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/BlockJSONManagingPlugin"));
@@ -12,6 +13,7 @@ const MiniCSSExtractPluginErrorCleaner_1 = __importDefault(require("./wordpress-
 const VariablesJSMonitorPlugin_1 = __importDefault(require("./wordpress-scripts-wrapper/VariablesJSMonitorPlugin"));
 const BrowserSyncPlugin_1 = require("./wordpress-scripts-wrapper/BrowserSyncPlugin");
 const static_configs_1 = require("./wordpress-scripts-wrapper/static-configs");
+const WPMLConfigBuilder_1 = __importDefault(require("./wordpress-scripts-wrapper/WPMLConfigBuilder"));
 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"));
@@ -246,7 +248,7 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
         scriptExtension = scriptWithoutModuleExtension;
         entrypointFields = ["editorStyle", "viewStyle", "style", "editorScript", "viewScript", "script"];
     }
-    const { standaloneBlocks, variablesFilePath, verbose, externals, assumeGlobalizedPlauditLibraries } = config;
+    const { standaloneBlocks, variablesFilePath, verbose, externals, assumeGlobalizedPlauditLibraries, combineAssetMetadata } = config;
     let currentVariables = config.currentVariables;
     const fixedRules = [
         replaceDefaultURLProcessing,
@@ -255,6 +257,16 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
         },
         injectSupportForInliningSVGsAsStrings
     ].reduce((r, a) => a(r), webpackConfig.module?.rules ?? []);
+    if (config.processTranslationConfigs) {
+        fixedRules.push({
+            test: /wpml-config\.xml$/i,
+            type: 'asset/resource',
+            generator: {
+                filename: '[name][ext]',
+                emit: false
+            }
+        });
+    }
     return sources.map(([src, dest]) => {
         const srcRoots = (typeof dest !== 'string' && dest.withLegacyBlocksIn
             ? [...src.split(','), ...resolveLegacyBlockScriptsInFolder(dest.withLegacyBlocksIn)]
@@ -302,22 +314,26 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
         if (variablesFilePath) {
             plugins.push(new VariablesJSMonitorPlugin_1.default(variablesFilePath));
         }
-        if (copyFiles && (typeof dest === 'string' || dest.directoryLayout !== 'extensions')) {
-            plugins.push(new BlockJSONManagingPlugin_1.default(standaloneBlocks, processingModules));
-        }
-        plugins.push(new AdditionalDependencyInjectorPlugin_1.default(typeof dest !== 'string' && dest.additionalDependencies ? dest.additionalDependencies : [], processingModules));
-        if (srcIsDirectory && (typeof dest !== 'string' && dest.directoryLayout === 'extensions')) {
-            plugins.push(new ExtensionsConfigFileGeneratorPlugin_1.default(srcRoot));
+        const forBlocksDirectory = copyFiles && (typeof dest === 'string' || dest.directoryLayout !== 'extensions');
+        if (forBlocksDirectory) {
+            const blockJSONManagingPlugin = new BlockJSONManagingPlugin_1.default(standaloneBlocks, processingModules);
+            plugins.push(blockJSONManagingPlugin);
+            if (config.processTranslationConfigs && srcIsDirectory && !processingModules) {
+                plugins.push(new WPMLConfigBuilder_1.default(blockJSONManagingPlugin));
+            }
         }
         const pluginIndex = plugins.findIndex(plugin => plugin instanceof dependency_extraction_webpack_plugin_1.default);
         if (pluginIndex === -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 file");
         }
         else {
-            const builtDependencyExtractionWebpackPlugin = (0, dependency_extraction_webpack_plugin_config_builder_1.makeDependencyExtractionPlugin)(externals, (typeof dest !== 'string' ? dest.assumeGlobalizedPlauditLibraries : undefined) ?? assumeGlobalizedPlauditLibraries);
-            if (builtDependencyExtractionWebpackPlugin) {
-                plugins[pluginIndex] = builtDependencyExtractionWebpackPlugin;
-            }
+            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);
+            plugins[pluginIndex] = builtDependencyExtractionWebpackPlugin.instance;
+            plugins.push(new AdditionalDependencyInjectorPlugin_1.default(typeof dest !== 'string' && dest.additionalDependencies ? dest.additionalDependencies : [], processingModules, builtDependencyExtractionWebpackPlugin.addExternalizedDep));
+        }
+        if (srcIsDirectory && (typeof dest !== 'string' && dest.directoryLayout === 'extensions')) {
+            plugins.push(new ExtensionsConfigFileGeneratorPlugin_1.default(srcRoot));
         }
         if (process.argv.includes('--browser-sync') || process.env['BROWSER_SYNC'] === 'true') {
             plugins.push(new BrowserSyncPlugin_1.BrowserSyncPlugin());
@@ -325,50 +341,69 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
         let entry;
         if (srcIsDirectory) {
             if (typeof dest !== 'string' && dest.directoryLayout === 'extensions') {
-                entry = () => {
-                    const rawEntrypoints = node_fs_1.default.readdirSync(srcRoot, 'utf8')
-                        .map(file => joinPossiblyAbsolutePaths(srcRoot, file))
-                        .filter(file => (scriptExtension.test(file) || styleExtension.test(file)) && node_fs_1.default.statSync(file).isFile())
-                        .map((file) => [node_path_1.default.basename(file, node_path_1.default.extname(file)), file]);
+                entry = async () => {
+                    const rawEntrypoints = [];
+                    for await (const dirent of await promises_1.default.opendir(srcRoot)) {
+                        if (dirent.isFile()) {
+                            if (scriptExtension.test(dirent.name) || styleExtension.test(dirent.name)) {
+                                const file = joinPossiblyAbsolutePaths(srcRoot, dirent.name);
+                                rawEntrypoints.push([node_path_1.default.basename(file, node_path_1.default.extname(file)), file]);
+                            }
+                        }
+                    }
                     return Object.fromEntries(rawEntrypoints);
                 };
             }
             else {
-                entry = () => {
-                    const rawEntrypoints = node_fs_1.default.readdirSync(srcRoot, 'utf8')
-                        .map(dir => joinPossiblyAbsolutePaths(srcRoot, dir))
-                        .filter(dir => node_fs_1.default.statSync(dir).isDirectory())
-                        .flatMap(dir => {
-                        const res = [];
-                        try {
-                            const blockJSON = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(dir, 'block.json'), 'utf8'));
-                            const blockJSONChunkName = node_path_1.default.join(node_path_1.default.basename(dir), "block.json");
-                            for (const key of entrypointFields) {
-                                if (key in blockJSON) {
-                                    res.push(...mapToRealEntrypoints(blockJSON[key], dir, ep => ep.startsWith("file:") ? ep.substring(5) : ep, blockJSONChunkName));
-                                }
-                            }
-                            BlockJSONManagingPlugin_1.default.recordBlockJSONAssetSourceDir(blockJSONChunkName, dir);
-                            return res;
+                entry = async () => {
+                    const loadingEntrypoints = [];
+                    for await (const dirent of await promises_1.default.opendir(srcRoot)) {
+                        if (!dirent.isDirectory()) {
+                            continue;
                         }
-                        catch (e) {
+                        const dir = joinPossiblyAbsolutePaths(srcRoot, dirent.name);
+                        loadingEntrypoints.push(new Promise(async (resolve) => {
+                            const rawEntrypoints = [];
+                            const wpmlFiles = [];
                             try {
-                                const packageJSON = JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.join(dir, 'package.json'), 'utf8'));
-                                res.push(...mapToRealEntrypoints(packageJSON['main'], dir));
-                                res.push(...mapToRealEntrypoints(packageJSON['style'], dir));
+                                const blockJSON = JSON.parse(await promises_1.default.readFile(node_path_1.default.join(dir, 'block.json'), 'utf8'));
+                                const blockJSONChunkName = node_path_1.default.join(node_path_1.default.basename(dir), "block.json");
+                                for (const key of entrypointFields) {
+                                    if (key in blockJSON) {
+                                        rawEntrypoints.push(...mapToRealEntrypoints(blockJSON[key], dir, ep => ep.startsWith("file:") ? ep.substring(5) : ep, blockJSONChunkName));
+                                    }
+                                }
+                                wpmlFiles.push(node_path_1.default.join(dir, 'block.json'));
+                                BlockJSONManagingPlugin_1.default.recordBlockJSONAssetSourceDir(blockJSONChunkName, dir);
                             }
                             catch (e) {
                                 try {
-                                    res.push(...parseEntrypointsJSON(dir));
+                                    const packageJSON = JSON.parse(await promises_1.default.readFile(node_path_1.default.join(dir, 'package.json'), 'utf8'));
+                                    rawEntrypoints.push(...mapToRealEntrypoints(packageJSON['main'], dir));
+                                    rawEntrypoints.push(...mapToRealEntrypoints(packageJSON['style'], dir));
                                 }
                                 catch (e) {
-                                    // This just means that the directory doesn't contain any declared entrypoints.
+                                    try {
+                                        rawEntrypoints.push(...parseEntrypointsJSON(dir));
+                                    }
+                                    catch (e) {
+                                        // This just means that the directory doesn't contain any declared entrypoints.
+                                    }
                                 }
                             }
-                        }
-                        return res;
-                    });
-                    const perAssetPathGroupedEntrypoints = groupEntrypointsByAssetFile(rawEntrypoints, e => e[0]);
+                            try {
+                                const wpmlFilePath = node_path_1.default.join(dir, "wpml-config.xml");
+                                await promises_1.default.access(wpmlFilePath);
+                                wpmlFiles.push(wpmlFilePath);
+                            }
+                            catch (e) {
+                                // This just means that the file doesn't exist
+                            }
+                            resolve([rawEntrypoints, wpmlFiles]);
+                        }));
+                    }
+                    const allEntrypoints = await Promise.all(loadingEntrypoints);
+                    const perAssetPathGroupedEntrypoints = groupEntrypointsByAssetFile(allEntrypoints.flatMap(e => e[0]), e => e[0]);
                     const currentEntry = {};
                     for (const groupedEntrypoints of perAssetPathGroupedEntrypoints.values()) {
                         if (groupedEntrypoints.length === 1 && groupedEntrypoints[0] !== undefined) {
@@ -387,6 +422,16 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
                             BlockJSONManagingPlugin_1.default.recordRawDependency(entry.lazyDependent, key);
                         }
                     }
+                    const wpmlEntrypointFiles = allEntrypoints.flatMap(e => e[1]);
+                    try {
+                        await promises_1.default.access(node_path_1.default.join(srcRoot, "wpml-config.xml"));
+                        currentEntry["wpml-config.xml"] = { import: [node_path_1.default.join(srcRoot, "wpml-config.xml"), ...wpmlEntrypointFiles] };
+                    }
+                    catch (e) {
+                        if (wpmlEntrypointFiles.length) {
+                            currentEntry["wpml-config.xml"] = { import: wpmlEntrypointFiles };
+                        }
+                    }
                     return currentEntry;
                 };
             }
@@ -469,13 +514,13 @@ function processIndividualWebpackConfig(config, webpackConfig, sources) {
 }
 module.exports = function (config, webpackConfig = require("@wordpress/scripts/config/webpack.config")) {
     testForDuplicatedEntryPaths(config);
-    const { standaloneBlocks = false, stats = 'errors-warnings', variables: rawVariables, verbose = process.argv.includes('--verbose') || process.env['VERBOSE'] === 'true', postcss = {}, externals, assumeGlobalizedPlauditLibraries = true } = 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 } = config;
     let variablesFilePath = undefined;
     const currentVariables = rawVariables ?? {};
     if (!rawVariables) {
         variablesFilePath = ["variables.js", "src/site/variables.js"].map(p => node_path_1.default.join(process.cwd(), p)).filter(p => node_fs_1.default.existsSync(p))[0];
     }
-    const cfg = { currentVariables, postcss, standaloneBlocks, stats, variablesFilePath, verbose, externals, assumeGlobalizedPlauditLibraries };
+    const cfg = { currentVariables, postcss, standaloneBlocks, stats, variablesFilePath, verbose, externals, assumeGlobalizedPlauditLibraries, processTranslationConfigs, combineAssetMetadata };
     const sources = Array.isArray(config.src) ? config.src.map(s => [s, s]) : Object.entries(config.src);
     if (Array.isArray(webpackConfig)) {
         return webpackConfig.toSorted((a, b) => {

package/package.json

@@ -1,74 +1,93 @@
 {
-  "name": "@plaudit/webpack-extensions",
-  "version": "2.38.0",
-  "license": "UNLICENSED",
-  "scripts": {
-    "prepublishOnly": "rm -rf build && mkdir build && tsc",
-    "build": "tsc",
-    "watch": "tsc -w"
-  },
-  "files": [
-    "/build"
-  ],
-  "exports": {
-    "./wordpress-scripts-wrapper": "./build/wordpress-scripts-wrapper.js"
-  },
-  "typesVersions": {
-    "*": {
-      "wordpress-scripts-wrapper": [
-        "build/wordpress-scripts-wrapper.d.ts"
-      ]
-    }
-  },
-  "devDependencies": {
-    "@types/browser-sync-webpack-plugin": "^2.2.5",
-    "@types/postcss-functions": "^4.0.4",
-    "@types/node": "^22.9.0",
-    "@types/tapable": "^2.2.7",
-    "@types/webpack": "^5.28.5",
-    "@types/webpack-sources": "^3.2.3",
-    "postcss-load-config": "^4.0.2",
-    "postcss-loader": "^7.3.4",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.6.3"
-  },
-  "dependencies": {
-    "@plaudit/postcss-color-function": "^5.0.0",
-    "@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.11.0",
-    "@wordpress/scripts": "^30.4.0",
-    "autoprefixer": "^10.4.19",
-    "browser-sync": "^3.0.3",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^12.0.2",
-    "cssnano": "^6.1.2",
-    "eslint": "^8.57.0",
-    "eslint-plugin-jsdoc": "^48.2.3",
-    "fork-ts-checker-webpack-plugin": "^9.0.2",
-    "http-proxy-middleware": "^3.0.3",
-    "postcss": "^8.4.39",
-    "postcss-calc": "^9.0.1",
-    "postcss-discard-comments": "^6.0.2",
-    "postcss-fallback": "^0.1.0",
-    "postcss-functions": "^4.0.2",
-    "postcss-import": "^16.1.0",
-    "postcss-inline-svg": "^6.0.0",
-    "postcss-media-minmax": "^5.0.0",
-    "postcss-mixins": "6.2.3",
-    "postcss-nested": "^6.0.1",
-    "postcss-property-lookup": "^3.0.0",
-    "postcss-quantity-queries": "^0.5.0",
-    "postcss-reporter": "^7.1.0",
-    "postcss-short-position": "^4.0.1",
-    "postcss-short-size": "^4.0.0",
-    "postcss-short-spacing": "^4.0.0",
-    "postcss-simple-vars": "^7.0.1",
-    "postcss-url": "^10.1.3",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "webpack": "^5.96.1",
-    "webpack-remove-empty-scripts": "^1.0.4"
-  }
+	"name": "@plaudit/webpack-extensions",
+	"version": "2.40.0",
+	"license": "UNLICENSED",
+	"scripts": {
+		"prepublishOnly": "rm -rf build && mkdir build && tsc",
+		"build": "tsc",
+		"watch": "tsc -w"
+	},
+	"files": [
+		"/build"
+	],
+	"exports": {
+		"./wordpress-scripts-wrapper": "./build/wordpress-scripts-wrapper.js"
+	},
+	"typesVersions": {
+		"*": {
+			"wordpress-scripts-wrapper": [
+				"build/wordpress-scripts-wrapper.d.ts"
+			]
+		}
+	},
+	"devDependencies": {
+		"@plaudit/gutenberg-api-extensions": "^2.66.0",
+		"@types/browser-sync-webpack-plugin": "^2.2.5",
+		"@types/node": "^22.13.13",
+		"@types/postcss-functions": "^4.0.4",
+		"@types/tapable": "^2.2.7",
+		"@types/webpack": "^5.28.5",
+		"@types/webpack-sources": "^3.2.3",
+		"postcss-load-config": "^4.0.2",
+		"postcss-loader": "^7.3.4",
+		"ts-node": "^10.9.2",
+		"typescript": "^5.8.2"
+	},
+	"dependencies": {
+		"@plaudit/postcss-color-function": "^5.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.20.0",
+		"@wordpress/scripts": "^30.13.0",
+		"autoprefixer": "^10.4.21",
+		"browser-sync": "^3.0.3",
+		"clean-webpack-plugin": "^4.0.0",
+		"copy-webpack-plugin": "^10.2.4",
+		"cssnano": "^6.1.2",
+		"eslint": "^8.57.1",
+		"eslint-plugin-jsdoc": "^48.11.0",
+		"fork-ts-checker-webpack-plugin": "^9.0.2",
+		"http-proxy-middleware": "^3.0.3",
+		"postcss": "^8.5.3",
+		"postcss-calc": "^9.0.1",
+		"postcss-discard-comments": "^6.0.2",
+		"postcss-fallback": "^0.1.0",
+		"postcss-functions": "^4.0.2",
+		"postcss-import": "^16.1.0",
+		"postcss-inline-svg": "^6.0.0",
+		"postcss-media-minmax": "^5.0.0",
+		"postcss-mixins": "6.2.3",
+		"postcss-nested": "^6.2.0",
+		"postcss-property-lookup": "^3.0.0",
+		"postcss-quantity-queries": "^0.5.0",
+		"postcss-reporter": "^7.1.0",
+		"postcss-short-position": "^4.0.1",
+		"postcss-short-size": "^4.0.0",
+		"postcss-short-spacing": "^4.0.0",
+		"postcss-simple-vars": "^7.0.1",
+		"postcss-url": "^10.1.3",
+		"react": "^18.3.1",
+		"react-dom": "^18.3.1",
+		"webpack": "^5.98.0",
+		"webpack-remove-empty-scripts": "^1.0.4",
+		"xml-formatter": "^3.6.5"
+	},
+	"engines": {
+		"node": ">=20"
+	},
+	"pnpm": {
+		"onlyBuiltDependencies": [
+			"core-js",
+			"core-js-pure"
+		],
+		"ignoredBuiltDependencies": [
+			"@parcel/watcher"
+		],
+		"overrides": {
+			"micromatch": "^4",
+			"react-autosize-textarea>react": "*",
+			"react-autosize-textarea>react-dom": "*"
+		}
+	}
 }