2908985 fix(@angular/cli): prevent nested schematic execution from generating analytics

Author: Angular Builds

package.json

@@ -1,17 +1,17 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.800.0-beta.18+102.56d6dc8",
+  "version": "0.800.0-beta.18+100.2908985",
   "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#56d6dc8",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#56d6dc8",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#56d6dc8",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#56d6dc8",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#56d6dc8",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#2908985",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#2908985",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#2908985",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#2908985",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#2908985",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
     "browserslist": "4.6.0",
@@ -43,6 +43,7 @@
     "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
+    "stats-webpack-plugin": "0.7.0",
     "style-loader": "0.23.1",
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",

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

@@ -12,17 +12,18 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 const path = require("path");
 const typescript_1 = require("typescript");
 const webpack_1 = require("webpack");
-const webpack_sources_1 = require("webpack-sources");
 const differential_loading_1 = require("../../../utils/differential-loading");
 const bundle_budget_1 = require("../../plugins/bundle-budget");
 const cleancss_webpack_plugin_1 = require("../../plugins/cleancss-webpack-plugin");
 const named_chunks_plugin_1 = require("../../plugins/named-chunks-plugin");
 const scripts_webpack_plugin_1 = require("../../plugins/scripts-webpack-plugin");
 const find_up_1 = require("../../utilities/find-up");
+const require_project_module_1 = require("../../utilities/require-project-module");
 const utils_1 = require("./utils");
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
+const StatsPlugin = require('stats-webpack-plugin');
 // tslint:disable-next-line:no-any
 const g = typeof global !== 'undefined' ? global : {};
 exports.buildOptimizerLoader = g['_DevKitIsLocal']
@@ -159,14 +160,7 @@ function getCommonConfig(wco) {
         }));
     }
     if (buildOptions.statsJson) {
-        extraPlugins.push(new class {
-            apply(compiler) {
-                compiler.hooks.emit.tap('angular-cli-stats', compilation => {
-                    const data = JSON.stringify(compilation.getStats().toJson('verbose'));
-                    compilation.assets[`stats${targetInFileName}.json`] = new webpack_sources_1.RawSource(data);
-                });
-            }
-        });
+        extraPlugins.push(new StatsPlugin(`stats${targetInFileName}.json`, 'verbose'));
     }
     if (buildOptions.namedChunks) {
         extraPlugins.push(new named_chunks_plugin_1.NamedLazyChunksPlugin());
@@ -198,13 +192,13 @@ function getCommonConfig(wco) {
     const loaderNodeModules = find_up_1.findAllNodeModules(__dirname, projectRoot);
     loaderNodeModules.unshift('node_modules');
     // Load rxjs path aliases.
-    // https://github.com/ReactiveX/rxjs/blob/master/doc/pipeable-operators.md#build-and-treeshaking
+    // https://github.com/ReactiveX/rxjs/blob/master/doc/lettable-operators.md#build-and-treeshaking
     let alias = {};
     try {
         const rxjsPathMappingImport = wco.supportES2015
             ? 'rxjs/_esm2015/path-mapping'
             : 'rxjs/_esm5/path-mapping';
-        const rxPaths = require(require.resolve(rxjsPathMappingImport, { paths: [projectRoot] }));
+        const rxPaths = require_project_module_1.requireProjectModule(projectRoot, rxjsPathMappingImport);
         alias = rxPaths(nodeModules);
     }
     catch (_a) { }

src/angular-cli-files/utilities/read-tsconfig.d.ts

@@ -1 +1,9 @@
-export declare function readTsconfig(tsconfigPath: string): import("typescript").ParsedCommandLine;
+/**
+ * @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 * as ts from 'typescript';
+export declare function readTsconfig(tsconfigPath: string): ts.ParsedCommandLine;

src/angular-cli-files/utilities/read-tsconfig.js

@@ -1,17 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * @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
- */
-// TODO: cleanup this file, it's copied as is from Angular CLI.
 const path = require("path");
+const require_project_module_1 = require("../utilities/require-project-module");
 function readTsconfig(tsconfigPath) {
-    // build-angular has a peer dependency on typescript
-    const projectTs = require('typescript');
+    const projectTs = require_project_module_1.requireProjectModule(path.dirname(tsconfigPath), 'typescript');
     const configResult = projectTs.readConfigFile(tsconfigPath, projectTs.sys.readFile);
     const tsConfig = projectTs.parseJsonConfigFileContent(configResult.config, projectTs.sys, path.dirname(tsconfigPath), undefined, tsconfigPath);
     if (tsConfig.errors.length > 0) {

src/angular-cli-files/utilities/require-project-module.d.ts

@@ -0,0 +1,2 @@
+export declare function resolveProjectModule(root: string, moduleName: string): string;
+export declare function requireProjectModule(root: string, moduleName: string): any;

src/angular-cli-files/utilities/require-project-module.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @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
+ */
+const node_1 = require("@angular-devkit/core/node");
+// Resolve dependencies within the target project.
+function resolveProjectModule(root, moduleName) {
+    return node_1.resolve(moduleName, {
+        basedir: root,
+        checkGlobal: false,
+        checkLocal: true,
+    });
+}
+exports.resolveProjectModule = resolveProjectModule;
+// Require dependencies within the target project.
+function requireProjectModule(root, moduleName) {
+    return require(resolveProjectModule(root, moduleName));
+}
+exports.requireProjectModule = requireProjectModule;

src/app-shell/index.js

@@ -12,18 +12,15 @@ const core_1 = require("@angular-devkit/core");
 const node_1 = require("@angular-devkit/core/node");
 const fs = require("fs");
 const path = require("path");
+const require_project_module_1 = require("../angular-cli-files/utilities/require-project-module");
 const service_worker_1 = require("../angular-cli-files/utilities/service-worker");
 async function _renderUniversal(options, context, browserResult, serverResult) {
     const browserIndexOutputPath = path.join(browserResult.outputPath || '', 'index.html');
     const indexHtml = fs.readFileSync(browserIndexOutputPath, 'utf8');
     const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult);
     const root = context.workspaceRoot;
-    // Initialize zone.js
-    const zonePackage = require.resolve('zone.js', { paths: [root] });
-    await Promise.resolve().then(() => require(zonePackage));
-    // Load platform server module renderer
-    const platformServerPackage = require.resolve('@angular/platform-server', { paths: [root] });
-    const renderModuleFactory = await Promise.resolve().then(() => require(platformServerPackage)).then((m) => m.renderModuleFactory);
+    require_project_module_1.requireProjectModule(root, 'zone.js/dist/zone-node');
+    const renderModuleFactory = require_project_module_1.requireProjectModule(root, '@angular/platform-server').renderModuleFactory;
     const AppServerModuleNgFactory = require(serverBundlePath).AppServerModuleNgFactory;
     const outputIndexPath = options.outputIndexPath
         ? path.join(root, options.outputIndexPath)

uniqueId

@@ -1 +1 @@
-Wed May 15 2019 21:44:28 GMT+0000 (Coordinated Universal Time)
+Wed May 15 2019 21:47:13 GMT+0000 (Coordinated Universal Time)