Skip to content

Commit

Permalink
fix(@angular/cli): update minimum version of copy-webpack-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
clydin authored and Brocco committed Feb 12, 2018
1 parent f19c5f7 commit 63044e5
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 33 deletions.
78 changes: 52 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 1 addition & 5 deletions packages/@angular/cli/models/webpack-configs/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
};
Expand Down
2 changes: 1 addition & 1 deletion packages/@angular/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 63044e5

Please sign in to comment.