fix: escaping special characters in the context option

webpack-contrib · May 16, 2020 · 0e62695 · 0e62695
1 parent 0aae9b5
commit 0e62695
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -42,6 +42,7 @@
   },
   "dependencies": {
     "cacache": "^15.0.3",
+    "fast-glob": "^3.2.2",
     "find-cache-dir": "^3.3.1",
     "glob-parent": "^5.1.1",
     "globby": "^11.0.0",

diff --git a/src/utils/createPatternGlob.js b/src/utils/createPatternGlob.js
@@ -2,15 +2,10 @@ import path from 'path';
 
 import normalizePath from 'normalize-path';
 import globParent from 'glob-parent';
+import fastGlob from 'fast-glob';
 
 function getAbsoluteContext(context) {
-  const result = normalizePath(path.resolve(context));
-
-  return result.replace(
-    // eslint-disable-next-line no-useless-escape
-    /[\*|\?|\!|\||\@|\+|\(|\)|\[|\]|\{|\}]/g,
-    (substring) => `\\${substring}`
-  );
+  return fastGlob.escapePath(normalizePath(path.resolve(context)));
 }
 
 function createPatternGlob(pattern, globalRef) {

diff --git a/test/CopyPlugin.test.js b/test/CopyPlugin.test.js
@@ -238,7 +238,7 @@ describe('CopyPlugin', () => {
     it('should exclude path with linux path segment separators', (done) => {
       runEmit({
         expectedAssetKeys: [
-          '[!]/hello.txt',
+          '[(){}[]!+@escaped-test^$]/hello.txt',
           '[special?directory]/(special-*file).txt',
           '[special?directory]/directoryfile.txt',
           '[special?directory]/nested/nestedfile.txt',

diff --git a/test/fixtures/[!]/hello.txt → ...tures/[(){}[]!+@escaped-test^$]/hello.txt b/test/fixtures/[!]/hello.txt → ...tures/[(){}[]!+@escaped-test^$]/hello.txt
diff --git a/test/from-option.test.js b/test/from-option.test.js
@@ -128,7 +128,7 @@ describe('from option', () => {
       runEmit({
         expectedAssetKeys: [
           '.file.txt',
-          '[!]/hello.txt',
+          '[(){}[]!+@escaped-test^$]/hello.txt',
           '[special?directory]/(special-*file).txt',
           '[special?directory]/directoryfile.txt',
           '[special?directory]/nested/nestedfile.txt',
@@ -158,7 +158,7 @@ describe('from option', () => {
       runEmit({
         expectedAssetKeys: [
           '.file.txt',
-          '[!]/hello.txt',
+          '[(){}[]!+@escaped-test^$]/hello.txt',
           '[special?directory]/(special-*file).txt',
           '[special?directory]/directoryfile.txt',
           '[special?directory]/nested/nestedfile.txt',
@@ -339,7 +339,7 @@ describe('from option', () => {
     it('should move files using globstar', (done) => {
       runEmit({
         expectedAssetKeys: [
-          '[!]/hello.txt',
+          '[(){}[]!+@escaped-test^$]/hello.txt',
           'binextension.bin',
           'dir (86)/file.txt',
           'dir (86)/nesteddir/deepnesteddir/deepnesteddir.txt',
@@ -367,7 +367,7 @@ describe('from option', () => {
     it('should move files using globstar and contains an absolute path', (done) => {
       runEmit({
         expectedAssetKeys: [
-          '[!]/hello.txt',
+          '[(){}[]!+@escaped-test^$]/hello.txt',
           'file.txt',
           'directory/directoryfile.txt',
           'directory/nested/deep-nested/deepnested.txt',
@@ -392,7 +392,7 @@ describe('from option', () => {
     it('should move files in nested directory using globstar', (done) => {
       runEmit({
         expectedAssetKeys: [
-          'nested/[!]/hello-31d6cf.txt',
+          'nested/[(){}[]!+@escaped-test^$]/hello-31d6cf.txt',
           'nested/binextension-31d6cf.bin',
           'nested/dir (86)/file-31d6cf.txt',
           'nested/dir (86)/nesteddir/deepnesteddir/deepnesteddir-31d6cf.txt',