Add outputPath option (#16)

* Add outputPath option

* Add a test for `outputPath` option

Author: wadahiro

README.md

@@ -88,6 +88,11 @@ Type: `boolean`, default: `true`
 
 If `true`, will add `filepath + '.map'` to the compilation as well.
 
+#### `outputPath`
+Type: `string`
+
+If set, will be used as the output directory of the file.
+
 #### `publicPath`
 Type: `string`
 

addAssetHtmlPlugin.js

@@ -20,7 +20,15 @@ function resolvePublicPath(compilation, filename) {
   return ensureTrailingSlash(publicPath);
 }
 
-function addFileToAssets(compilation, htmlPluginData, { filepath, typeOfAsset = 'js', includeSourcemap = true, hash = false, publicPath }) {
+function resolveOutput(compilation, addedFilename, outputPath) {
+  if (outputPath && outputPath.length) {
+    compilation.assets[`${outputPath}/${addedFilename}`] = compilation.assets[addedFilename]; // eslint-disable-line no-param-reassign
+    delete compilation.assets[addedFilename]; // eslint-disable-line no-param-reassign
+  }
+}
+
+function addFileToAssets(compilation, htmlPluginData,
+  { filepath, typeOfAsset = 'js', includeSourcemap = true, hash = false, publicPath, outputPath }) {
   if (!filepath) {
     const error = new Error('No filepath defined');
     compilation.errors.push(error);
@@ -43,11 +51,17 @@ function addFileToAssets(compilation, htmlPluginData, { filepath, typeOfAsset =
 
       htmlPluginData.assets[typeOfAsset].unshift(resolvedPath);
 
+      resolveOutput(compilation, addedFilename, outputPath);
+
       return resolvedPath;
     })
     .then(() => {
       if (includeSourcemap) {
-        return htmlPluginData.plugin.addFileToAssets(`${filepath}.map`, compilation);
+        return htmlPluginData.plugin.addFileToAssets(`${filepath}.map`, compilation)
+          .then(addedFilename => {
+            resolveOutput(compilation, addedFilename, outputPath);
+            return null;
+          });
       }
       return null;
     });

index.d.ts

@@ -5,6 +5,7 @@ interface PluginOptions {
   typeOfAsset?: string;
   includeSourcemap?: boolean;
   hash?: boolean;
+  outputPath?: string;
   publicPath?: string;
 }
 

test.js

@@ -161,3 +161,28 @@ test('should add to css if `typeOfAsset` is css', async t => {
   t.true(callback.calledOnce);
   t.true(callback.calledWithExactly(null, pluginData));
 });
+
+test('should replace compilation assets key if `outputPath` is set', async t => {
+  const callback = sinon.stub();
+  const source = { source: () => 'test' };
+  const addFileToAssetsMock = (filename, compilation) => {
+    const name = path.basename(filename);
+    compilation.assets[name] = source; // eslint-disable-line no-param-reassign
+    return Promise.resolve(name);
+  };
+  const compilation = {
+    options: { output: {} },
+    assets: {},
+  };
+  const pluginData = { assets: { js: [], css: [] }, plugin: { addFileToAssets: addFileToAssetsMock } };
+
+  await addAllAssetsToCompilation([{ filepath: 'my-file.js', outputPath: 'assets' }], compilation, pluginData, callback);
+
+  t.deepEqual(pluginData.assets.css, []);
+  t.deepEqual(pluginData.assets.js, ['my-file.js']);
+
+  t.is(compilation.assets['my-file.js'], undefined);
+  t.deepEqual(compilation.assets['assets/my-file.js'], source);
+  t.is(compilation.assets['my-file.js.map'], undefined);
+  t.deepEqual(compilation.assets['assets/my-file.js.map'], source);
+});