From 63044e5e707c79f6e0b81b50496095bf130448c9 Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Thu, 8 Feb 2018 10:35:13 -0500 Subject: [PATCH] fix(@angular/cli): update minimum version of copy-webpack-plugin --- package-lock.json | 78 ++++++++++++------- package.json | 2 +- .../cli/models/webpack-configs/common.ts | 6 +- packages/@angular/cli/package.json | 2 +- 4 files changed, 55 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a3059f0e702..c89b62f7d836 100644 --- a/package-lock.json +++ b/package-lock.json @@ -570,8 +570,7 @@ "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" }, "asap": { "version": "2.0.6", @@ -1899,24 +1898,32 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "copy-webpack-plugin": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.1.1.tgz", - "integrity": "sha512-qcjV9uj5PFuKo9GDr0xYAZ3DwFA3ugwDcfbLHfiDrvnUx66Z7C4r00/ds856GaGb2cGHqLTwrGxwfvW+lgAQew==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.4.1.tgz", + "integrity": "sha512-ojaz8MpS3zoLJT/JbYMusYM+dCEArhW24hGAUPYPydTCS+87NFh2TWr85sywG3So4Q4E68QoerqQ+Ns1g0fhDg==", "requires": { - "bluebird": "3.5.1", - "fs-extra": "4.0.2", - "glob": "7.1.2", + "cacache": "10.0.1", + "find-cache-dir": "1.0.0", + "globby": "7.1.1", "is-glob": "4.0.0", "loader-utils": "0.2.17", - "lodash": "4.17.4", "minimatch": "3.0.4", - "node-dir": "0.1.17" + "p-limit": "1.1.0", + "serialize-javascript": "1.4.0" }, "dependencies": { - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" + "globby": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", + "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", + "requires": { + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "glob": "7.1.2", + "ignore": "3.3.5", + "pify": "3.0.0", + "slash": "1.0.0" + } }, "is-glob": { "version": "4.0.0", @@ -1936,6 +1943,11 @@ "json5": "0.5.1", "object-assign": "4.1.1" } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" } } }, @@ -2273,6 +2285,30 @@ "randombytes": "2.0.5" } }, + "dir-glob": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", + "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", + "requires": { + "arrify": "1.0.1", + "path-type": "3.0.0" + }, + "dependencies": { + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "requires": { + "pify": "3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, "dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", @@ -4572,8 +4608,7 @@ "ignore": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", - "dev": true + "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==" }, "image-size": { "version": "0.5.5", @@ -5928,14 +5963,6 @@ "lower-case": "1.1.4" } }, - "node-dir": { - "version": "0.1.17", - "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", - "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", - "requires": { - "minimatch": "3.0.4" - } - }, "node-forge": { "version": "0.6.33", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz", @@ -8033,8 +8060,7 @@ "slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" }, "slice-ansi": { "version": "0.0.4", diff --git a/package.json b/package.json index 5fefc64cb0cf..d4ba10e9ddc4 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "circular-dependency-plugin": "^4.2.1", "clean-css": "^4.1.9", "common-tags": "^1.3.1", - "copy-webpack-plugin": "^4.1.1", + "copy-webpack-plugin": "~4.4.1", "core-object": "^3.1.0", "denodeify": "^1.2.1", "ember-cli-string-utils": "^1.0.0", diff --git a/packages/@angular/cli/models/webpack-configs/common.ts b/packages/@angular/cli/models/webpack-configs/common.ts index 6a7245c7a7e5..251cc4bcaba4 100644 --- a/packages/@angular/cli/models/webpack-configs/common.ts +++ b/packages/@angular/cli/models/webpack-configs/common.ts @@ -128,15 +128,11 @@ export function getCommonConfig(wco: WebpackConfigOptions) { asset.glob = asset.glob + '/**/*'; } - // Escape the input in case it has special charaters and use to make glob absolute - const escapedInput = asset.input - .replace(/[\\|\*|\?|\!|\(|\)|\[|\]|\{|\}]/g, (substring) => `\\${substring}`); - return { context: asset.input, to: asset.output, from: { - glob: path.resolve(escapedInput, asset.glob), + glob: asset.glob, dot: true } }; diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json index 1afc70948a41..1a65714a0ff3 100644 --- a/packages/@angular/cli/package.json +++ b/packages/@angular/cli/package.json @@ -40,7 +40,7 @@ "circular-dependency-plugin": "^4.2.1", "clean-css": "^4.1.9", "common-tags": "^1.3.1", - "copy-webpack-plugin": "^4.1.1", + "copy-webpack-plugin": "~4.4.1", "core-object": "^3.1.0", "denodeify": "^1.2.1", "ember-cli-string-utils": "^1.0.0",