@plaudit/webpack-extensions 1.2.1 → 1.2.2

package/build/wordpress-scripts-wrapper/AdditionalDependencyInjectorPlugin.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
 const webpack_1 = require("webpack");
 const webpack_sources_1 = require("webpack-sources");
 class AdditionalDependencyInjectorPlugin {
@@ -14,26 +13,33 @@ class AdditionalDependencyInjectorPlugin {
                 name: "AdditionalDependencyInjectorPlugin_ProcessAssets",
                 stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_ANALYSE
             }, compilationAssets => {
-                for (const [name, asset] of Object.entries(compilationAssets)) {
-                    if (name.endsWith(".asset.php") && asset.constructor.name === 'RawSource') {
-                        const extensionlessName = name.substring(0, name.length - 10);
-                        const additionalDependencies = [];
-                        dependencyFinder: for (const srcRoot of compilation.contextDependencies) {
-                            for (const possibleExtension of ['ts', 'tsx', 'js', 'jsx']) {
-                                const possibleFile = node_path_1.default.join(srcRoot, `${extensionlessName}.${possibleExtension}`);
-                                if (node_fs_1.default.existsSync(possibleFile)) {
-                                    const firstLine = node_fs_1.default.readFileSync(possibleFile, 'utf8').trim().split(/\r?\n/)[0];
-                                    if (firstLine.startsWith("//ADDITIONAL_DEPENDENCIES:")) {
-                                        additionalDependencies.push(...firstLine.substring(26).trim().split(','));
-                                    }
-                                    break dependencyFinder;
+                const assetSources = new Map();
+                for (const entrypoint of compilation.entrypoints.values()) {
+                    const typeScriptOrigins = entrypoint.origins.filter(origin => origin.request.endsWith('.ts') || origin.request.endsWith('.tsx'));
+                    if (typeScriptOrigins.length > 0) {
+                        for (const chunk of entrypoint.chunks) {
+                            for (const file of chunk.files) {
+                                if (file.endsWith('.asset.php')) {
+                                    assetSources.set(file, typeScriptOrigins[0].request);
                                 }
                             }
                         }
-                        const seen = new Set();
-                        const additionalDeps = additionalDependencies.filter(dep => !seen.has(dep) && seen.add(dep)).sort().map(v => `'${v}'`).join(', ');
-                        if (additionalDeps) {
-                            compilation.updateAsset(name, new webpack_sources_1.RawSource(asset.source().replace(/('dependencies'\s+=>\s+(?:array\(|\[))(.*)([)\]], 'version')/g, (match, g1, g2, g3) => `${g1}${g2.length > 0 ? `${g2}, ${additionalDeps}` : additionalDeps}${g3}`)));
+                    }
+                }
+                for (const [name, asset] of Object.entries(compilationAssets)) {
+                    if (name.endsWith(".asset.php") && asset.constructor.name === 'RawSource') {
+                        const assetSource = assetSources.get(name);
+                        if (!assetSource) {
+                            continue;
+                        }
+                        const firstLine = node_fs_1.default.readFileSync(assetSource, 'utf8').trim().split(/\r?\n/)[0];
+                        if (firstLine.startsWith("//ADDITIONAL_DEPENDENCIES:")) {
+                            const additionalDependencies = firstLine.substring(26).trim().split(',');
+                            const seen = new Set();
+                            const additionalDeps = additionalDependencies.filter(dep => !seen.has(dep) && seen.add(dep)).sort().map(v => `'${v}'`).join(', ');
+                            if (additionalDeps) {
+                                compilation.updateAsset(name, new webpack_sources_1.RawSource(asset.source().replace(/('dependencies'\s+=>\s+(?:array\(|\[))(.*)([)\]], 'version')/g, (match, g1, g2, g3) => `${g1}${g2.length > 0 ? `${g2}, ${additionalDeps}` : additionalDeps}${g3}`)));
+                            }
                         }
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",