Fixing output paths for glob supplementals

This requires copy-webpack-plugin 4.6.0 for the transformPath property, which
also requires working around a yet-unfixed regression in c-w-p that was causing
a test failure - the "nobraces" option no longer works properly when the input
is an explicit file or directory. So, if there's a cwpPatternConfig.fromArgs
option, we explicitly tell c-w-p to treat this as a glob. We could probably
safely do this no matter what, but better safe than sorry.

Author: dmchurch

package.json

@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "ajv": "^6.1.1",
-    "copy-webpack-plugin": "^4.4.1",
+    "copy-webpack-plugin": "^4.6.0",
     "html-webpack-include-assets-plugin": "^1.0.2"
   }
 }

src/HtmlWebpackExternalsPlugin.js

@@ -2,6 +2,7 @@ import CopyWebpackPlugin from 'copy-webpack-plugin'
 import HtmlWebpackIncludeAssetsPlugin from 'html-webpack-include-assets-plugin'
 import Ajv from 'ajv'
 import configSchema from './configSchema.json'
+import path from 'path'
 
 export default class HtmlWebpackExternalsPlugin {
   static validateArguments = (() => {
@@ -94,14 +95,22 @@ export default class HtmlWebpackExternalsPlugin {
 
     const pluginsToApply = []
 
+    const context = path.isAbsolute(this.cwpOptions.context)
+      ? this.cwpOptions.context
+      : path.resolve(compiler.options.context, this.cwpOptions.context || ".")
+
     pluginsToApply.push(
       new CopyWebpackPlugin(
-        this.assetsToCopy.map(({ dist, ...entry }) => ({
+        this.assetsToCopy.map(({ dist, cwpPatternConfig, ...entry }) => ({
           dist: dist ? `/${dist}` : '',
+          cwpPatternConfig: cwpPatternConfig || {},
           ...entry
         })).map(({ module, path, dist, cwpPatternConfig }) => ({
-          from: `${module}${dist}/${path}`,
-          to: `${this.outputPath}/${module}/${path}`,
+          from: cwpPatternConfig.fromArgs
+            ? {...cwpPatternConfig.fromArgs, glob:`${module}${dist}/${path}`}
+            : `${module}${dist}/${path}`,
+          to: 'UNEXPECTED_ERROR/', // We're going to be overwriting this below
+          transformPath: (_,absolutePath) => (absolutePath.replace(`${cwpPatternConfig.context||context}/${module}${dist}`,`${this.outputPath}/${module}`)),
           ...cwpPatternConfig,
         })),
         this.cwpOptions

test/HtmlWebpackExternalsPlugin.spec.js

@@ -402,6 +402,62 @@ describe('HtmlWebpackExternalsPlugin', function() {
       .then(() => checkHtmlIncludes('vendor/context_test/dist/contextTest.css', 'css'))
   })
 
+  it('works with glob filename supplements, matching single', function() {
+    const externals = [
+      {
+        module: 'bootstrap',
+        entry: ['dist/js/bootstrap.min.js'],
+        supplements: [
+          'dist/css/bootstrap.min.c*s',
+        ]
+      },
+    ]
+
+    return runWebpack(
+      new HtmlWebpackPlugin(),
+      new HtmlWebpackExternalsPlugin({ externals })
+    )
+      .then(() => checkCopied('vendor/bootstrap/dist/css/bootstrap.min.css'))
+  })
+
+  it('works with glob filename supplements, matching multiple', function() {
+    const externals = [
+      {
+        module: 'bootstrap',
+        entry: ['dist/js/bootstrap.min.js'],
+        supplements: [
+          'dist/css/*.min.css',
+        ]
+      },
+    ]
+
+    return runWebpack(
+      new HtmlWebpackPlugin(),
+      new HtmlWebpackExternalsPlugin({ externals })
+    )
+      .then(() => checkCopied('vendor/bootstrap/dist/css/bootstrap.min.css'))
+      .then(() => checkCopied('vendor/bootstrap/dist/css/bootstrap-reboot.min.css'))
+  })
+
+  it('works with recursive glob supplements', function() {
+    const externals = [
+      {
+        module: 'bootstrap',
+        entry: ['dist/js/bootstrap.min.js'],
+        supplements: [
+          '**/dropdown.js',
+        ]
+      },
+    ]
+
+    return runWebpack(
+      new HtmlWebpackPlugin(),
+      new HtmlWebpackExternalsPlugin({ externals })
+    )
+      .then(() => checkCopied('vendor/bootstrap/js/dist/dropdown.js'))
+      .then(() => checkCopied('vendor/bootstrap/js/src/dropdown.js'))
+  })
+
   it('Specifying which HTML files to affect example', function() {
     return runWebpack(
       new HtmlWebpackPlugin({