@plaudit/webpack-extensions 1.0.3 → 1.1.0

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

@@ -8,7 +8,7 @@ const webpack_sources_1 = require("webpack-sources");
 class BlockJSONStyleRemappingPlugin {
     apply(compiler) {
         compiler.hooks.compilation.tap("BlockJSONStyleRemappingPlugin", compilation => {
-            compilation.hooks.processAssets.tap("BlockJSONStyleRemappingPlugin_ProcessAssets", compilationAssets => {
+            compilation.hooks.afterProcessAssets.tap("BlockJSONStyleRemappingPlugin_ProcessAssets", compilationAssets => {
                 const stats = compilation.getStats().toJson({
                     hash: true,
                     publicPath: true,
@@ -23,6 +23,7 @@ class BlockJSONStyleRemappingPlugin {
                 const assetSourceFiles = new Map(stats.assets?.map(asset => [asset.name, asset.info?.sourceFilename])
                     .filter((v) => v[0] !== undefined && v[1] !== undefined) ?? []);
                 const singleFileChunkToOutputName = new Map(stats.assets?.filter((asset) => asset.chunks?.length === 1)
+                    .filter(asset => !asset.name.endsWith('.asset.php'))
                     .map(asset => [toNumericChunkId(asset.chunks[0]), asset.name]) ?? []);
                 const singleFileInputToOutputName = new Map(stats.modules?.map(module => {
                     if (module.nameForCondition !== undefined && module.chunks?.length === 1) {

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

@@ -122,14 +122,20 @@ function default_1(config, webpackConfig = require("@wordpress/scripts/config/we
             }
         }
     }
-    (webpackConfig.plugins ?? (webpackConfig.plugins = [])).push(new fork_ts_checker_webpack_plugin_1.default({
+    const copyFiles = !!process.env['WP_COPY_PHP_FILES_TO_DIST'];
+    const plugins = webpackConfig.plugins ?? [];
+    plugins.push(new fork_ts_checker_webpack_plugin_1.default({
         typescript: {
             diagnosticOptions: {
                 semantic: true,
                 syntactic: true,
-            },
-        },
-    }), new webpack_remove_empty_scripts_1.default({ stage: webpack_remove_empty_scripts_1.default.STAGE_AFTER_PROCESS_PLUGINS }), new BlockJSONStyleRemappingPlugin_1.default(), new AdditionalDependencyInjectorPlugin_1.default());
+            }
+        }
+    }), new webpack_remove_empty_scripts_1.default({ stage: webpack_remove_empty_scripts_1.default.STAGE_AFTER_PROCESS_PLUGINS, extensions: ['css', 'scss', 'sass', 'less', 'styl', 'pcss'] }));
+    if (copyFiles) {
+        plugins.push(new BlockJSONStyleRemappingPlugin_1.default());
+    }
+    plugins.push(new AdditionalDependencyInjectorPlugin_1.default());
     return Object.entries(config.src).map(([srcDir, dest]) => {
         const srcRoot = node_path_1.default.join(process.cwd(), srcDir);
         return {
@@ -138,9 +144,11 @@ function default_1(config, webpackConfig = require("@wordpress/scripts/config/we
                 ...webpackConfig.output,
                 path: node_path_1.default.join(process.cwd(), dest)
             },
-            plugins: webpackConfig.plugins.map(plugin => plugin.constructor.name === 'CopyPlugin'
-                ? new copy_webpack_plugin_1.default({ patterns: [{ from: '**/(block.json|*.(php|twig|svg))', context: srcRoot, noErrorOnMissing: true }] })
-                : plugin),
+            plugins: copyFiles
+                ? plugins.map(plugin => plugin.constructor.name === 'CopyPlugin'
+                    ? new copy_webpack_plugin_1.default({ patterns: [{ from: '**/(block.json|*.(php|twig|svg))', context: srcRoot, noErrorOnMissing: true }] })
+                    : plugin)
+                : plugins.filter(plugin => plugin.constructor.name !== 'CopyPlugin'),
             entry: node_fs_1.default.readdirSync(srcRoot, 'utf8')
                 .map(dir => node_path_1.default.join(srcRoot, dir))
                 .filter(dir => node_fs_1.default.statSync(dir).isDirectory())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "scripts": {
     "prepublishOnly": "rm -rf build && mkdir build && tsc",
     "build": "tsc",
@@ -13,11 +13,11 @@
     "./wordpress-scripts-wrapper": "./build/wordpress-scripts-wrapper.js"
   },
   "devDependencies": {
-    "@types/node": "^18.15.13",
+    "@types/node": "^20.2.3",
     "@types/webpack": "^5.28.1",
     "@types/webpack-sources": "^3.2.0",
     "postcss-load-config": "^4.0.1",
-    "postcss-loader": "^7.2.4",
+    "postcss-loader": "^7.3.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
@@ -26,13 +26,13 @@
     "@plaudit/postcss-silent-extend": "^3.0.0",
     "@plaudit/postcss-strip-units": "^3.0.0",
     "@plaudit/postcss-variables": "^1.0.0",
-    "@wordpress/scripts": "^26.2.0",
+    "@wordpress/scripts": "^26.4.0",
     "autoprefixer": "^10.4.14",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^11.0.0",
-    "cssnano": "^6.0.0",
-    "eslint": "^8.38.0",
-    "eslint-plugin-jsdoc": "^43.0.7",
+    "cssnano": "^6.0.1",
+    "eslint": "^8.39.0",
+    "eslint-plugin-jsdoc": "^43.1.1",
     "fork-ts-checker-webpack-plugin": "^8.0.0",
     "postcss": "^8.4.23",
     "postcss-calc": "^8.2.4",
@@ -51,11 +51,11 @@
     "postcss-short-spacing": "^4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "webpack": "^5.80.0",
+    "webpack": "^5.84.0",
     "webpack-remove-empty-scripts": "^1.0.3",
     "webpack-sources": "^3.2.3"
   },
   "resolutions": {
-    "eslint-plugin-jsdoc": "^43.0.7"
+    "eslint-plugin-jsdoc": "^43.1.1"
   }
 }