fix(src/): don't escape non-glob patterns (#230)

webpack-contrib · Feb 23, 2018 · 0eb2cd5 · 0eb2cd5
1 parent 4e15c1c
commit 0eb2cd5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/preProcessPattern.js b/src/preProcessPattern.js
@@ -46,7 +46,8 @@ export default function preProcessPattern(globalRef, pattern) {
         delete fromArgs.glob;
 
         pattern.fromArgs = fromArgs;
-        pattern.absoluteFrom = escape(pattern.context, pattern.from.glob);
+        pattern.glob = escape(pattern.context, pattern.from.glob);
+        pattern.absoluteFrom = path.resolve(pattern.context, pattern.from.glob);
         return Promise.resolve(pattern);
     }
 
@@ -63,7 +64,7 @@ export default function preProcessPattern(globalRef, pattern) {
         // If from doesn't appear to be a glob, then log a warning
         if (isGlob(pattern.from) || pattern.from.indexOf('*') !== -1) {
             pattern.fromType = 'glob';
-            pattern.absoluteFrom = escape(pattern.context, pattern.from);
+            pattern.glob = escape(pattern.context, pattern.from);
         } else {
             const msg = `unable to locate '${pattern.from}' at '${pattern.absoluteFrom}'`;
             warning(msg);
@@ -80,14 +81,15 @@ export default function preProcessPattern(globalRef, pattern) {
             pattern.fromType = 'dir';
             pattern.context = pattern.absoluteFrom;
             contextDependencies.push(pattern.absoluteFrom);
-            pattern.absoluteFrom = escape(pattern.absoluteFrom, '**/*');
+            pattern.glob = escape(pattern.absoluteFrom, '**/*');
+            pattern.absoluteFrom = path.join(pattern.absoluteFrom, '**/*');
             pattern.fromArgs = {
                 dot: true
             };
         } else if(stat.isFile()) {
             pattern.fromType = 'file';
             pattern.context = path.dirname(pattern.absoluteFrom);
-            pattern.absoluteFrom = escape(pattern.absoluteFrom);
+            pattern.glob = escape(pattern.absoluteFrom);
             pattern.fromArgs = {
                 dot: true
             };

diff --git a/src/processPattern.js b/src/processPattern.js
@@ -17,8 +17,8 @@ export default function processPattern(globalRef, pattern) {
 
     const limit = pLimit(concurrency || 100);
 
-    info(`begin globbing '${pattern.absoluteFrom}' with a context of '${pattern.context}'`);
-    return globby(pattern.absoluteFrom, globArgs)
+    info(`begin globbing '${pattern.glob}' with a context of '${pattern.context}'`);
+    return globby(pattern.glob, globArgs)
         .then((paths) => Promise.all(paths.map((from) => limit(() => {
             const file = {
                 force: pattern.force,