1a8de6f35 fix(@angular-devkit/build-angular): update copy-webpack-plugin to version 6

Author: Angular Builds

package.json

@@ -1,19 +1,19 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.803.26+6.4c2e21a",
+  "version": "0.803.26+7.1a8de6f",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#4c2e21ac7",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#4c2e21ac7",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#4c2e21ac7",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4c2e21ac7",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1a8de6f35",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#1a8de6f35",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#1a8de6f35",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a8de6f35",
     "@babel/core": "7.8.7",
     "@babel/preset-env": "7.8.7",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#4c2e21ac7",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#1a8de6f35",
     "ajv": "6.10.2",
     "autoprefixer": "9.6.1",
     "browserslist": "4.10.0",
@@ -22,7 +22,7 @@
     "circular-dependency-plugin": "5.2.0",
     "clean-css": "4.2.1",
     "coverage-istanbul-loader": "2.0.3",
-    "copy-webpack-plugin": "5.1.1",
+    "copy-webpack-plugin": "6.0.2",
     "core-js": "3.6.4",
     "file-loader": "4.2.0",
     "find-cache-dir": "3.0.0",

src/angular-cli-files/models/webpack-configs/common.js

@@ -141,30 +141,40 @@ function getCommonConfig(wco) {
         });
     }
     // process asset entries
-    if (buildOptions.assets) {
+    if (buildOptions.assets.length) {
         const copyWebpackPluginPatterns = buildOptions.assets.map((asset) => {
             // Resolve input paths relative to workspace root and add slash at the end.
-            asset.input = path.resolve(root, asset.input).replace(/\\/g, '/');
-            asset.input = asset.input.endsWith('/') ? asset.input : asset.input + '/';
-            asset.output = asset.output.endsWith('/') ? asset.output : asset.output + '/';
-            if (asset.output.startsWith('..')) {
-                const message = 'An asset cannot be written to a location outside of the output path.';
-                throw new Error(message);
+            // tslint:disable-next-line: prefer-const
+            let { input, output, ignore = [], glob } = asset;
+            input = path.resolve(root, input).replace(/\\/g, '/');
+            input = input.endsWith('/') ? input : input + '/';
+            output = output.endsWith('/') ? output : output + '/';
+            if (output.startsWith('..')) {
+                throw new Error('An asset cannot be written to a location outside of the output path.');
             }
             return {
-                context: asset.input,
+                context: input,
                 // Now we remove starting slash to make Webpack place it from the output root.
-                to: asset.output.replace(/^\//, ''),
-                ignore: asset.ignore,
-                from: {
-                    glob: asset.glob,
+                to: output.replace(/^\//, ''),
+                from: glob,
+                noErrorOnMissing: true,
+                globOptions: {
                     dot: true,
+                    ignore: [
+                        '.gitkeep',
+                        '**/.DS_Store',
+                        '**/Thumbs.db',
+                        // Negate patterns needs to be absolute because copy-webpack-plugin uses absolute globs which
+                        // causes negate patterns not to match.
+                        // See: https://github.com/webpack-contrib/copy-webpack-plugin/issues/498#issuecomment-639327909
+                        ...ignore,
+                    ].map(i => path.posix.join(input, i)),
                 },
             };
         });
-        const copyWebpackPluginOptions = { ignore: ['.gitkeep', '**/.DS_Store', '**/Thumbs.db'] };
-        const copyWebpackPluginInstance = new CopyWebpackPlugin(copyWebpackPluginPatterns, copyWebpackPluginOptions);
-        extraPlugins.push(copyWebpackPluginInstance);
+        extraPlugins.push(new CopyWebpackPlugin({
+            patterns: copyWebpackPluginPatterns,
+        }));
     }
     if (buildOptions.progress) {
         extraPlugins.push(new ProgressPlugin({ profile: buildOptions.verbose }));

uniqueId

@@ -1 +1 @@
-Wed May 27 2020 09:42:51 GMT+0000 (Coordinated Universal Time)
+Tue Jun 09 2020 11:06:49 GMT+0000 (Coordinated Universal Time)