build: update dependencies and support angular v11.0.5

enten · Dec 21, 2020 · 075d5fc · 075d5fc
1 parent 3c59e03
commit 075d5fc
Show file tree

Hide file tree

Showing 18 changed files with 2,040 additions and 6,336 deletions.
diff --git a/angular/lib/build/ng-devkit.ts b/angular/lib/build/ng-devkit.ts
@@ -1231,7 +1231,7 @@ function statsToString(json: any, statsConfig: any, bundleState?: BundleStats[])
 
   const statsTable = generateBuildStatsTable(changedChunksStats, colors, unchangedChunkNumber === 0);
 
-  // In some cases we do things outside of webpack context 
+  // In some cases we do things outside of webpack context
   // Such us index generation, service worker augmentation etc...
   // This will correct the time and include these.
   const time = (Date.now() - json.builtAt) + json.time;

diff --git a/angular/lib/serve/devContainer.ts b/angular/lib/serve/devContainer.ts
@@ -6,7 +6,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as util from 'util';
 import webpack = require('webpack');
-import wpc = require('../../../webpack-plugin-compat');
+import wpc = require('webpack-plugin-compat');
 
 import {
   Architect,

diff --git a/angular/package.json b/angular/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "@architect/udk",
   "peerDependencies": {
-    "@angular-devkit/build-angular": "0.1100.3",
-    "@angular/cli": "11.0.3"
+    "@angular-devkit/build-angular": "0.1100.5",
+    "@angular/cli": "11.0.5"
   }
 }
diff --git a/bin/udk-webpack4.ts b/bin/udk-webpack4.ts
@@ -10,7 +10,7 @@ process.exitCode = 0;
 const runCommand = (command: string, args: string[]) => {
   const cp = require('child_process');
 
-  return new Promise((resolve, reject) => {
+  return new Promise<void>((resolve, reject) => {
     const executedCommand = cp.spawn(command, args, {
       stdio: 'inherit',
       shell: true,

diff --git a/docs/implementation.md b/docs/implementation.md
@@ -4,6 +4,7 @@
 
 | udk | webpack3 | webpack4 | angular-devkit |
 |-----|----------|----------|----------------|
+| v1.1.11-rc.1 |  | | v0.1100.5 |
 | v1.1.11-rc.0 |  | v4.44.2 | v0.1100.3 |
 | v1.1.10 |  |  | v0.1000.0 |
 | v1.1.9 |  |  | v0.901.7 |

diff --git a/lib/MultiCompiler.ts b/lib/MultiCompiler.ts
@@ -4,7 +4,7 @@ import * as webpack from 'webpack';
 
 import debug = require('debug');
 import { DepGraph } from 'dependency-graph';
-import wpc = require('../webpack-plugin-compat');
+import wpc = require('webpack-plugin-compat');
 
 export const MultiCompiler1: MultiCompilerStatic = require('webpack/lib/MultiCompiler');
 

diff --git a/lib/devContainer.ts b/lib/devContainer.ts
@@ -4,7 +4,7 @@ import * as http from 'http';
 import * as path from 'path';
 
 import * as webpack from 'webpack';
-import wpc = require('../webpack-plugin-compat');
+import wpc = require('webpack-plugin-compat');
 
 import MultiCompiler from './MultiCompiler';
 

diff --git a/lib/webpack.v3.ts b/lib/webpack.v3.ts
@@ -36,10 +36,10 @@ const webpackV3 = ((options, callback?) => {
     compiler.options = options;
     new NodeEnvironmentPlugin().apply(compiler);
     if (options.plugins && Array.isArray(options.plugins)) {
-      compiler.apply.apply(compiler, options.plugins);
+      (compiler as any).apply.apply(compiler, options.plugins);
     }
-    compiler.applyPlugins('environment');
-    compiler.applyPlugins('after-environment');
+    (compiler as any).applyPlugins('environment');
+    (compiler as any).applyPlugins('after-environment');
     compiler.options = new WebpackOptionsApply().process(options, compiler);
   } else {
     throw new Error('Invalid argument: options');