From 70917b7ed7122fd7160064b0199fc2e1cb738f86 Mon Sep 17 00:00:00 2001 From: Evilebot Tnawi Date: Wed, 24 Apr 2019 17:08:13 +0300 Subject: [PATCH] fix: alone `[N]` interpolation in `to` option (#375) --- src/utils/isTemplateLike.js | 2 +- test/CopyPlugin.test.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/utils/isTemplateLike.js b/src/utils/isTemplateLike.js index ead6d5c9..a06b396e 100644 --- a/src/utils/isTemplateLike.js +++ b/src/utils/isTemplateLike.js @@ -1,4 +1,4 @@ export default (pattern) => - /(\[ext\])|(\[name\])|(\[path\])|(\[folder\])|(\[emoji(?::(\d+))?\])|(\[(?:([^:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\])/.test( + /(\[ext\])|(\[name\])|(\[path\])|(\[folder\])|(\[emoji(?::(\d+))?\])|(\[(?:([^:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\])|(\[\d+\])/.test( pattern ); diff --git a/test/CopyPlugin.test.js b/test/CopyPlugin.test.js index 24ab24fd..4e834a65 100644 --- a/test/CopyPlugin.test.js +++ b/test/CopyPlugin.test.js @@ -1808,6 +1808,21 @@ describe('apply function', () => { .catch(done); }); + it('can move multiple files to a non-root directory with [1]', (done) => { + runEmit({ + expectedAssetKeys: ['nested/txt'], + patterns: [ + { + from: 'directory/nested/deep-nested', + to: 'nested/[1]', + test: /\.(.*)$/, + }, + ], + }) + .then(done) + .catch(done); + }); + it("can move a directory's contents to the root directory from symbolic link", (done) => { runEmit({ // Windows doesn't support symbolic link