@plaudit/webpack-extensions 2.82.1 → 2.82.3

package/build/shared.d.ts

@@ -133,7 +133,7 @@ export type MinimumViableMetadata = {
 };
 export declare function convertUsageLocationsHandleToEmittableHandle(handle: UsageLocations['handle'], generatedHandle: string): string;
 export declare function makeEmittableConfigPHP(data: any, asFullFile: boolean, parentIndent?: string): string;
-export declare const entrypointFields: readonly ["editorStyle", "viewStyle", "style", "editorScript", "viewScript", "script", "viewScriptModule", "scriptModule"];
+export declare const entrypointFields: readonly ["editorStyle", "viewStyle", "style", "editorScript", "viewScript", "script", "viewScriptModule"];
 export type EntrypointFields = (typeof entrypointFields[number])[];
 export declare function convertEntrypointFieldForAssetType(entrypointField: EntrypointFields[number], assetType: 'script' | 'style'): EntrypointFields[number];
 export declare function leadingSlashIt(pathOrSomething: string): string;
@@ -143,7 +143,7 @@ export declare const scriptWithModuleExtension: RegExp;
 export declare const styleExtension: RegExp;
 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 isScriptModuleField(field: string): field is 'viewScriptModule';
 export declare function getHandleGroup(field: string): 'styleHandles' | 'scriptHandles' | 'scriptModuleHandles';
 export declare function hasAtLeastOneItem<T>(list: T[]): list is [T, ...T[]];
 export type TupleOf<T, N extends number> = N extends N ? number extends N ? T[] : _TupleOf<T, N, []> : never;

package/build/shared.js

@@ -89,10 +89,10 @@ function makeEmittableConfigPHP(data, asFullFile, parentIndent = "") {
         .replaceAll(/'rest' => \[\n\t+(\[(?:'[^']+')?]),\n\t+('[^']+')(?:,\n\t+(\[[^\n]+]))?\n\t+]/gs, (_, deps, hash, args) => `'rest' => [${[deps, hash, args].filter(value => !!value).join(", ")}]`);
     return asFullFile ? `<?php return ${prettyPrintedMetadata};` : prettyPrintedMetadata.trim();
 }
-exports.entrypointFields = ["editorStyle", "viewStyle", "style", "editorScript", "viewScript", "script", "viewScriptModule", "scriptModule"];
+exports.entrypointFields = ["editorStyle", "viewStyle", "style", "editorScript", "viewScript", "script", "viewScriptModule"];
 function convertEntrypointFieldForAssetType(entrypointField, assetType) {
     // Using these word fragments instead of the full words allows us to avoid having to deal with the capitalization of the first letter
-    const searchRep = assetType === 'script' ? ['tyle', 'cript'] : ['cript', 'tyle'];
+    const searchRep = assetType === 'script' ? ['tyle', 'cript'] : [/cript(?:Module)?/, 'tyle'];
     return entrypointField.replace(...searchRep);
 }
 function leadingSlashIt(pathOrSomething) {
@@ -189,10 +189,9 @@ function getAssetsJson(compilation) {
 function getParsedAssetsJsonDataForEntrypoint(compilation, entrypoint, metadata) {
     const dest = metadata.dest;
     const parsedAssetJson = getAssetsJson(compilation);
-    const scriptExtension = compilation.outputOptions.module ? exports.scriptWithModuleExtension : exports.scriptWithoutModuleExtension;
-    const assetType = scriptOrStyleTest(metadata.absoluteSrc, scriptExtension);
+    const assetType = scriptOrStyleTest(metadata.absoluteSrc, exports.scriptExtension);
     const chunkFiles = [dest.destination, ...entrypoint.chunks.flatMap(chunk => Array.from(chunk.files))]
-        .filter(chunkFile => scriptOrStyleTest(chunkFile, scriptExtension) === assetType);
+        .filter(chunkFile => scriptOrStyleTest(chunkFile, exports.scriptExtension) === assetType);
     for (const chunkFile of chunkFiles) {
         if (parsedAssetJson[chunkFile]) {
             return { assetName: chunkFile, assetData: parsedAssetJson[chunkFile] };

package/build/utils/common-config-helpers.js

@@ -36,7 +36,7 @@ function mapToRealEntrypoints(entrypoint, dir, supportedExtensions, args) {
         .filter(ep => supportedExtensions(ep) && node_fs_1.default.statSync(ep, { throwIfNoEntry: false })?.isFile())
         .map(ep => {
         const parsedEntrypoint = node_path_1.default.parse(ep);
-        const entrypointField = shared_1.styleExtension.test(ep) ? 'style' : shared_1.scriptWithModuleExtension.test(ep) ? 'scriptModule' : 'script';
+        const entrypointField = shared_1.styleExtension.test(ep) ? 'style' : shared_1.scriptWithModuleExtension.test(ep) ? 'viewScriptModule' : 'script';
         const fakeEntrypointInfo = {
             blockJsonOrigin: args.entrypointJsonOrigin,
             entrypointField,

package/build/wordpress-scripts-wrapper.js

@@ -431,7 +431,7 @@ function commonConfigProcessingPrep(config, webpackConfig) {
     const processingModules = webpackConfig.output?.module ?? false;
     if (processingModules) {
         scriptExtension = shared_1.scriptWithModuleExtension;
-        entrypointFields = ["viewScriptModule", "scriptModule"];
+        entrypointFields = ["viewScriptModule"];
     }
     else {
         scriptExtension = shared_1.scriptWithoutModuleExtension;
@@ -467,6 +467,17 @@ function destToKey(dest) {
     return [dest.assumeGlobalizedPlauditLibraries, dest.bundleAnalyzer, externalize].join("~");
 }
 function processIndividualWebpackConfig(config, webpackConfig, sources, canClean) {
+    if (webpackConfig.output?.module) {
+        // This ensures that module files are emitted as module files
+        webpackConfig = {
+            ...webpackConfig,
+            output: {
+                ...webpackConfig.output,
+                filename: '[name].mjs',
+                chunkFilename: '[name].mjs?ver=[chunkhash]',
+            }
+        };
+    }
     const commonConfig = commonConfigProcessingPrep(config, webpackConfig);
     const { processingModules, scriptExtension } = commonConfig;
     const allSrcRoots = sources.map(([src, dest]) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.82.1",
+  "version": "2.82.3",
   "license": "SEE LICENSE IN LICENSE.md",
   "files": [
     "/build"