[enhancement] analyze filepath via globby (#78)

* feat: analyze filepath with globby

* chores: change test suits name

* chores: review and update code

* chores: changelog, readme and drop useless code

* 2.0.2

* Revert "2.0.2"

This reverts commit 43aecb1.

* Move changelog entry to unreleased

* Simplify glob promises

Author: Genuifx

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "eslint.enable": true
+}

CHANGELOG.md

@@ -5,7 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 Latest version of this document will always be available on https://github.com/SimenB/add-asset-html-webpack-plugin/releases
 
 ## [Unreleased]
-Nothing
+### Added
+- Support globby string as filepath option
 
 ## [2.0.1] - 2017-04-23
 ### Fixes

README.md

@@ -64,6 +64,8 @@ below, just pass multiple objects as an array.
 new AddAssetHtmlPlugin([
   { filepath: require.resolve('./some-file') }, 
   { filepath: require.resolve('./some-other-file') },
+  // Glob to match all of the dll file
+  { filepath: require.resolve('./**/*.dll.js') },
 ]);
 ```
 
@@ -75,10 +77,10 @@ new AddAssetHtmlPlugin({ filepath: require.resolve('./some-file') });
 ```
 
 #### `filepath`
-Type: `string`, mandatory
+Type: `string|Glob`, mandatory
 
 The absolute path of the file you want to add to the compilation, and resulting
-HTML file.
+HTML file. Also support globby string.
 
 #### `filter`
 Type: `string|Array<string>`, default `[]
@@ -169,7 +171,7 @@ const webpackConfig = {
     }),
     new HtmlWebpackPlugin(),
     new AddAssetHtmlPlugin({
-      filepath: require.resolve('./build/vendor.dll.js'),
+      filepath: path.resolve(__dirname,'./build/*.dll.js'),
     }),
   ],
 };

example/webpack.config.dll.js

@@ -6,11 +6,12 @@ module.exports = {
   context: __dirname,
   entry: {
     vendor: ['classnames'],
+    lib: ['classnames'],
   },
   devtool: '#source-map',
   output: {
     path: path.join(__dirname, 'build'),
-    filename: '[name].dll.js',
+    filename: '[name].[hash:4].dll.js',
     library: '[name]_[hash]',
   },
   plugins: [

example/webpack.config.js

@@ -20,7 +20,7 @@ module.exports = {
     }),
     new HtmlWebpackPlugin(),
     new AddAssetHtmlPlugin({
-      filepath: require.resolve('./build/vendor.dll.js'),
+      filepath: path.resolve(__dirname, './build/*.dll.js'),
     }),
   ],
 };

package.json

@@ -39,7 +39,8 @@
   "homepage": "https://github.com/SimenB/add-asset-html-webpack-plugin#readme",
   "dependencies": {
     "bluebird": "^3.4.6",
-    "minimatch": "^3.0.3"
+    "minimatch": "^3.0.3",
+    "globby": "^6.1.0"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",

src/addAllAssetsToCompilation.js

@@ -2,6 +2,7 @@ import path from 'path';
 import crypto from 'crypto';
 import Promise from 'bluebird';
 import minimatch from 'minimatch';
+import handleUrl from './handleUrl';
 
 function ensureTrailingSlash(string) {
   if (string.length && string.substr(-1, 1) !== '/') {
@@ -99,7 +100,8 @@ async function addFileToAssets(
 // Visible for testing
 export default async function(assets, compilation, htmlPluginData, callback) {
   try {
-    await Promise.mapSeries(assets, asset =>
+    const handledAssets = await handleUrl(assets);
+    await Promise.mapSeries(handledAssets, asset =>
       addFileToAssets(compilation, htmlPluginData, asset)
     );
 

src/handleUrl.js

@@ -0,0 +1,32 @@
+import globby from 'globby';
+
+/**
+ * handle globby filepath and return an array with all matched assets.
+ *
+ * @export
+ * @param {Array} assets
+ * @returns
+ */
+export default async function(assets) {
+  const globbyAssets = [];
+  const normalAssets = [];
+  // if filepath is null or undefined, just bubble up.
+  assets.forEach(
+    asset =>
+      asset.filepath && globby.hasMagic(asset.filepath)
+        ? globbyAssets.push(asset)
+        : normalAssets.push(asset)
+  );
+  const ret = [];
+  await Promise.all(
+    globbyAssets.map(asset =>
+      globby(asset.filepath).then(paths =>
+        paths.forEach(path =>
+          ret.push(Object.assign({}, asset, { filepath: path }))
+        )
+      )
+    )
+  );
+
+  return ret.concat(normalAssets);
+}

test.js

@@ -4,6 +4,7 @@ import path from 'path';
 import Promise from 'bluebird';
 import AddAssetHtmlPlugin from './src/index';
 import addAllAssetsToCompilation from './src/addAllAssetsToCompilation';
+import handleUrl from './src/handleUrl';
 
 const pluginMock = {
   plugin: {
@@ -295,3 +296,15 @@ test('filter option should include some files with string option', async () => {
   expect(callback).toHaveBeenCalledTimes(1);
   expect(callback).toHaveBeenCalledWith(null, pluginData);
 });
+
+test('use globby to find multi file', async () => {
+  const assets = [{ filepath: './src/*.js' }];
+  const ret = await handleUrl(assets);
+  expect(ret).toHaveLength(3);
+});
+
+test('filepath without globbyMagic should just return', async () => {
+  const assets = [{ filepath: path.join(__dirname, 'my-file.js') }];
+  const ret = await handleUrl(assets);
+  expect(ret).toHaveLength(1);
+});