@plaudit/webpack-extensions 2.56.0 → 2.56.2

package/build/plugins/PlainEntrypointsConfigFileGeneratorPlugin.js

@@ -134,7 +134,7 @@ class PlainEntrypointsConfigFileGeneratorPlugin {
                     finalHandleName = handleName;
                 }
                 else {
-                    const basename = node_path_1.default.basename(src).replace(/_(?:script|style)(?:-\d+)?\.(?:css|js)$/, "");
+                    const basename = node_path_1.default.basename(src).replace(/_(?:script(?:-\d+)?\.js|style(?:-\d+)?\.css)$|(?<!_(script|style))\.(js|css)$/, "");
                     const baseFinalHandleName = `${handlePrefix}.${kebabCase(basename)}`;
                     const handleNameMap = (isScript ? usedScriptHandleNames : usedStyleHandleNames);
                     finalHandleName = baseFinalHandleName;

package/build/utils/pseduo-semaphore.js

@@ -46,7 +46,7 @@ class PseudoSemaphore {
             controller.resolve = resolve;
             controller.reject = reject;
         });
-        this.flags.set(id, [promise, controller, false, Date.now()]);
+        this.flags.set(id, [promise, controller, false]);
         this.flagSet++;
         promise.catch(() => { });
     }
@@ -55,7 +55,7 @@ class PseudoSemaphore {
         let res;
         do {
             currentFlagSet = this.flagSet;
-            res = await Promise.all(this.flags.values().toArray().sort((a, b) => a[3] - b[3]).map(flag => flag[0]));
+            res = await Promise.all(this.flags.values().map(flag => flag[0]));
         } while (currentFlagSet !== this.flagSet);
         return res;
     }

package/build/wordpress-scripts-wrapper.js

@@ -268,10 +268,9 @@ function finalizeEntryDestination(entry, dynamicEffectiveDestinationsWithExpecte
     if (entry[1].staticallyDeclaredDestination) {
         return entry;
     }
-    //TODO: Maybe try to figure out a way to avoid generated handles unnecessarily including "_script" and "_style"
     const extension = node_path_1.default.extname(entry[1].destination);
     const filename = dynamicEffectiveDestinationsWithExpectedNaiveDuplicates[entry[1].effectiveDestination]
-        ? entry[1].effectiveDestination + (extension === '.css' ? "_script" : "_style")
+        ? entry[1].effectiveDestination + (extension === '.css' ? "_style" : "_script")
         : entry[1].effectiveDestination;
     let count = 0, derivedDestination = filename + extension;
     while (derivedDestination in allocatedDestinations && allocatedDestinations[derivedDestination] !== entry[0]) {
@@ -414,7 +413,6 @@ function commonConfigProcessingPrep(config, webpackConfig) {
         updateCurrentVariables: (value) => currentVariables = value
     };
 }
-//TODO: Implement path deduplication w/ the same code we use for block.json (only for plain v2 w/ specified handles
 //TODO: Try using context to avoid needing to cobble dest paths together?
 function processIndividualWebpackConfig(config, webpackConfig, sources) {
     const commonConfig = commonConfigProcessingPrep(config, webpackConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.56.0",
+  "version": "2.56.2",
   "license": "UNLICENSED",
   "files": [
     "/build"