@angular-devkit/build-webpack 0.900.0-rc.7 → 0.900.1

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@angular-devkit/build-webpack",
-  "version": "0.900.0-rc.7",
+  "version": "0.900.1",
   "description": "Webpack Builder for Architect",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.900.0-rc.7",
-    "@angular-devkit/core": "9.0.0-rc.7",
+    "@angular-devkit/architect": "0.900.1",
+    "@angular-devkit/core": "9.0.1",
     "rxjs": "6.5.3"
   },
   "peerDependencies": {
@@ -29,7 +29,6 @@
   "engines": {
     "node": ">= 10.13.0",
     "npm": ">= 6.11.0",
-    "pnpm": ">= 3.2.0",
     "yarn": ">= 1.13.0"
   },
   "author": "Angular Authors",

package/src/index.d.ts

@@ -7,5 +7,4 @@
  */
 export * from './webpack';
 export * from './webpack-dev-server';
-export * from './plugins/architect';
 export { EmittedFiles } from './utils';

package/src/index.js

@@ -1,4 +1,8 @@
 "use strict";
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -6,10 +10,5 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./webpack"));
 __export(require("./webpack-dev-server"));
-__export(require("./plugins/architect"));

package/src/utils.js

@@ -14,6 +14,8 @@ function getEmittedFiles(compilation) {
     for (const chunk of compilation.chunks) {
         for (const file of chunk.files) {
             files.push({
+                // The id is guaranteed to exist at this point in the compilation process
+                // tslint:disable-next-line: no-non-null-assertion
                 id: chunk.id.toString(),
                 name: chunk.name,
                 file,

package/src/plugins/architect.d.ts

@@ -1,17 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { BuilderContext } from '@angular-devkit/architect';
-import * as webpack from 'webpack';
-/**
- * A webpack plugin that reports status and progress to Architect.
- */
-export declare class ArchitectPlugin {
-    protected context: BuilderContext;
-    constructor(context: BuilderContext);
-    apply(compiler: webpack.Compiler): void;
-}

package/src/plugins/architect.js

@@ -1,137 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
-const path = require("path");
-/**
- * This list was taken from a list of events we want to listen to, from the list of hooks in
- * webpack's typings.
- */
-const hookSafelist = [
-    'seal',
-    'optimizeDependenciesBasic',
-    'optimizeDependencies',
-    'optimizeDependenciesAdvanced',
-    'afterOptimizeDependencies',
-    'optimize',
-    'optimizeModulesBasic',
-    'optimizeModules',
-    'optimizeModulesAdvanced',
-    'afterOptimizeModules',
-    'optimizeChunksBasic',
-    'optimizeChunks',
-    'optimizeChunksAdvanced',
-    'afterOptimizeChunks',
-    'optimizeTree',
-    'afterOptimizeTree',
-    'optimizeChunkModulesBasic',
-    'optimizeChunkModules',
-    'optimizeChunkModulesAdvanced',
-    'afterOptimizeChunkModules',
-    'reviveModules',
-    'optimizeModuleOrder',
-    'advancedOptimizeModuleOrder',
-    'beforeModuleIds',
-    'moduleIds',
-    'optimizeModuleIds',
-    'afterOptimizeModuleIds',
-    'reviveChunks',
-    'optimizeChunkOrder',
-    'beforeChunkIds',
-    'optimizeChunkIds',
-    'afterOptimizeChunkIds',
-    'recordModules',
-    'recordChunks',
-    'beforeHash',
-    'afterHash',
-    'recordHash',
-    'record',
-    'beforeModuleAssets',
-    'shouldGenerateChunkAssets',
-    'beforeChunkAssets',
-    'additionalChunkAssets',
-    'additionalAssets',
-    'optimizeChunkAssets',
-    'afterOptimizeChunkAssets',
-    'optimizeAssets',
-    'afterOptimizeAssets',
-    'afterSeal',
-    'optimizeExtractedChunksBasic',
-    'optimizeExtractedChunks',
-    'optimizeExtractedChunksAdvanced',
-    'afterOptimizeExtractedChunks',
-];
-/**
- * A webpack plugin that reports status and progress to Architect.
- */
-class ArchitectPlugin {
-    constructor(context) {
-        this.context = context;
-    }
-    apply(compiler) {
-        const context = this.context;
-        let modulesCount = 0;
-        let modulesDone = 0;
-        let hooksDone = 0;
-        let numberOfHooks = 0;
-        let reset = false; // Will be true when a full compilation is done.
-        function done() {
-            modulesDone = modulesCount;
-            hooksDone = Math.max(hooksDone, numberOfHooks);
-            update('Done.');
-            reset = true;
-        }
-        function update(status) {
-            context.reportProgress(modulesDone + hooksDone, modulesCount + Math.max(hooksDone, numberOfHooks), status);
-        }
-        function updateModule(module) {
-            // This is safe since we still verify it.
-            const m = module;
-            const moduleId = '' + (typeof m.identifier == 'function' ? m.identifier() : '');
-            const id = moduleId.split(/!|\s+|\bmulti\b/).slice(-1)[0].trim();
-            const p = path.relative(context.workspaceRoot, id);
-            update(`Building ${p}`);
-        }
-        function buildModule(module) {
-            modulesCount++;
-            updateModule(module);
-        }
-        function failedModule(module) {
-            modulesDone++;
-            updateModule(module);
-        }
-        function succeedModule(module) {
-            modulesDone++;
-            updateModule(module);
-        }
-        // On the start of a new compilation, maybe reset the counters (and update the total), then
-        // listen to all hooks we're interested in.
-        compiler.hooks.compilation.tap('ArchitectPlugin', compilation => {
-            const hooks = hookSafelist;
-            if (reset) {
-                reset = false;
-                modulesCount = modulesDone = hooksDone = numberOfHooks = 0;
-            }
-            // Need to add hooks for each compilation.
-            numberOfHooks += hooks.length;
-            // Pre-emptively tell the user.
-            context.reportRunning();
-            update('Preparing...');
-            compilation.hooks.buildModule.tap('ArchitectPlugin', buildModule);
-            compilation.hooks.failedModule.tap('ArchitectPlugin', failedModule);
-            compilation.hooks.succeedModule.tap('ArchitectPlugin', succeedModule);
-            for (const name of hooks) {
-                // Transforms `camelCase` into `Camel case`. decamelize() transforms it into `camel_case`
-                // and then we replace the `_` with spaces.
-                const title = core_1.strings.capitalize(core_1.strings.decamelize(name).replace(/_/g, ' '));
-                compilation.hooks[name].intercept({
-                    call: () => {
-                        hooksDone++;
-                        update(title);
-                    },
-                });
-            }
-        });
-        compiler.hooks.done.tap('ArchitectPlugin', done);
-    }
-}
-exports.ArchitectPlugin = ArchitectPlugin;