@schematics/angular 15.0.0-next.2 → 15.0.0-next.3

package/application/files/src/main.ts.template

@@ -1,12 +1,8 @@
-import { enableProdMode<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%> } from '@angular/core';
+<% if(!!viewEncapsulation) { %>import { ViewEncapsulation } from '@angular/core';<% }%>
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
 
-if (environment.production) {
-  enableProdMode();
-}
 <% if(!!viewEncapsulation) { %>
 platformBrowserDynamic().bootstrapModule(AppModule, {
   defaultEncapsulation: ViewEncapsulation.<%= viewEncapsulation %>
@@ -15,4 +11,4 @@ platformBrowserDynamic().bootstrapModule(AppModule, {
 <% } else { %>
 platformBrowserDynamic().bootstrapModule(AppModule)
   .catch(err => console.error(err));
-<% } %>
+<% } %>

package/application/files/tsconfig.app.json.template

@@ -6,8 +6,7 @@
     "types": []
   },
   "files": [
-    "src/main.ts",
-    "src/polyfills.ts"
+    "src/main.ts"
   ],
   "include": [
     "src/**/*.d.ts"

package/application/files/tsconfig.spec.json.template

@@ -7,10 +7,6 @@
       "jasmine"
     ]
   },
-  "files": [
-    "src/test.ts",
-    "src/polyfills.ts"
-  ],
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"

package/application/index.js

@@ -127,7 +127,7 @@ function addAppToWorkspaceFile(options, appDir, folderName) {
                     outputPath: `dist/${folderName}`,
                     index: `${sourceRoot}/index.html`,
                     main: `${sourceRoot}/main.ts`,
-                    polyfills: `${sourceRoot}/polyfills.ts`,
+                    polyfills: ['zone.js'],
                     tsConfig: `${projectRoot}tsconfig.app.json`,
                     inlineStyleLanguage,
                     assets: [`${sourceRoot}/favicon.ico`, `${sourceRoot}/assets`],
@@ -137,12 +137,6 @@ function addAppToWorkspaceFile(options, appDir, folderName) {
                 configurations: {
                     production: {
                         budgets,
-                        fileReplacements: [
-                            {
-                                replace: `${sourceRoot}/environments/environment.ts`,
-                                with: `${sourceRoot}/environments/environment.prod.ts`,
-                            },
-                        ],
                         outputHashing: 'all',
                     },
                     development: {
@@ -179,8 +173,7 @@ function addAppToWorkspaceFile(options, appDir, folderName) {
                 : {
                     builder: workspace_models_1.Builders.Karma,
                     options: {
-                        main: `${sourceRoot}/test.ts`,
-                        polyfills: `${sourceRoot}/polyfills.ts`,
+                        polyfills: ['zone.js', 'zone.js/testing'],
                         tsConfig: `${projectRoot}tsconfig.spec.json`,
                         karmaConfig: `${projectRoot}karma.conf.js`,
                         inlineStyleLanguage,
@@ -199,7 +192,7 @@ function addAppToWorkspaceFile(options, appDir, folderName) {
     });
 }
 function minimalPathFilter(path) {
-    const toRemoveList = /(test.ts|tsconfig.spec.json|karma.conf.js).template$/;
+    const toRemoveList = /(tsconfig.spec.json|karma.conf.js).template$/;
     return !toRemoveList.test(path);
 }
 function default_1(options) {

package/library/files/tsconfig.lib.json.template

@@ -9,7 +9,6 @@
     "types": []
   },
   "exclude": [
-    "src/test.ts",
     "**/*.spec.ts"
   ]
 }

package/library/files/tsconfig.spec.json.template

@@ -7,9 +7,6 @@
       "jasmine"
     ]
   },
-  "files": [
-    "src/test.ts"
-  ],
   "include": [
     "**/*.spec.ts",
     "**/*.d.ts"

package/library/index.js

@@ -86,8 +86,8 @@ function addLibToWorkspaceFile(options, projectRoot, projectName) {
                 test: {
                     builder: workspace_models_1.Builders.Karma,
                     options: {
-                        main: `${projectRoot}/src/test.ts`,
                         tsConfig: `${projectRoot}/tsconfig.spec.json`,
+                        polyfills: ['zone.js', 'zone.js/testing'],
                         karmaConfig: `${projectRoot}/karma.conf.js`,
                     },
                 },

package/migrations/migration-collection.json

@@ -14,6 +14,16 @@
       "version": "15.0.0",
       "factory": "./update-15/update-typescript-target",
       "description": "Update TypeScript compiler `target` and set `useDefineForClassFields`. These changes are for IDE purposes as TypeScript compiler options `target` and `useDefineForClassFields` are set to `ES2022` and `false` respectively by the Angular CLI. To control ECMA version and features use the Browerslist configuration."
+    },
+    "update-workspace-config": {
+      "version": "15.0.0",
+      "factory": "./update-15/update-workspace-config",
+      "description": "Remove options from 'angular.json' that are no longer supported by the official builders."
+    },
+    "update-karma-main-file": {
+      "version": "15.0.0",
+      "factory": "./update-15/update-karma-main-file",
+      "description": "Remove no longer needed require calls in Karma builder main file."
     }
   }
 }

package/migrations/update-15/update-karma-main-file.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC 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 { Rule } from '@angular-devkit/schematics';
+export default function (): Rule;

package/migrations/update-15/update-karma-main-file.js

@@ -0,0 +1,106 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts = __importStar(require("../../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const utility_1 = require("../../utility");
+const workspace_1 = require("../../utility/workspace");
+const workspace_models_1 = require("../../utility/workspace-models");
+function default_1() {
+    return async (host) => {
+        for (const file of await findTestMainFiles(host)) {
+            updateTestFile(host, file);
+        }
+    };
+}
+exports.default = default_1;
+async function findTestMainFiles(host) {
+    const testFiles = new Set();
+    const workspace = await (0, utility_1.readWorkspace)(host);
+    // find all test.ts files.
+    for (const project of workspace.projects.values()) {
+        for (const target of project.targets.values()) {
+            if (target.builder !== workspace_models_1.Builders.Karma) {
+                continue;
+            }
+            for (const [, options] of (0, workspace_1.allTargetOptions)(target)) {
+                if (typeof options.main === 'string') {
+                    testFiles.add(options.main);
+                }
+            }
+        }
+    }
+    return testFiles;
+}
+function updateTestFile(host, file) {
+    const content = host.readText(file);
+    if (!content.includes('require.context')) {
+        return;
+    }
+    const sourceFile = ts.createSourceFile(file, content.replace(/^\uFEFF/, ''), ts.ScriptTarget.Latest, true);
+    const usedVariableNames = new Set();
+    const recorder = host.beginUpdate(sourceFile.fileName);
+    ts.forEachChild(sourceFile, (node) => {
+        var _a, _b;
+        if (ts.isVariableStatement(node)) {
+            const variableDeclaration = node.declarationList.declarations[0];
+            if ((_a = ts.getModifiers(node)) === null || _a === void 0 ? void 0 : _a.some((m) => m.kind === ts.SyntaxKind.DeclareKeyword)) {
+                // `declare const require`
+                if (variableDeclaration.name.getText() !== 'require') {
+                    return;
+                }
+            }
+            else {
+                // `const context = require.context('./', true, /\.spec\.ts$/);`
+                if (!((_b = variableDeclaration.initializer) === null || _b === void 0 ? void 0 : _b.getText().startsWith('require.context'))) {
+                    return;
+                }
+                // add variable name as used.
+                usedVariableNames.add(variableDeclaration.name.getText());
+            }
+            // Delete node.
+            recorder.remove(node.getFullStart(), node.getFullWidth());
+        }
+        if (usedVariableNames.size &&
+            ts.isExpressionStatement(node) && // context.keys().map(context);
+            ts.isCallExpression(node.expression) && // context.keys().map(context);
+            ts.isPropertyAccessExpression(node.expression.expression) && // context.keys().map
+            ts.isCallExpression(node.expression.expression.expression) && // context.keys()
+            ts.isPropertyAccessExpression(node.expression.expression.expression.expression) && // context.keys
+            ts.isIdentifier(node.expression.expression.expression.expression.expression) && // context
+            usedVariableNames.has(node.expression.expression.expression.expression.expression.getText())) {
+            // `context.keys().map(context);`
+            // `context.keys().forEach(context);`
+            recorder.remove(node.getFullStart(), node.getFullWidth());
+        }
+    });
+    host.commitUpdate(recorder);
+}

package/migrations/update-15/update-workspace-config.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC 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 { Rule } from '@angular-devkit/schematics';
+export default function (): Rule;

package/migrations/update-15/update-workspace-config.js

@@ -0,0 +1,26 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const workspace_1 = require("../../utility/workspace");
+const workspace_models_1 = require("../../utility/workspace-models");
+function default_1() {
+    return (0, workspace_1.updateWorkspace)((workspace) => {
+        for (const project of workspace.projects.values()) {
+            for (const target of project.targets.values()) {
+                if (target.builder !== workspace_models_1.Builders.Server) {
+                    continue;
+                }
+                for (const [, options] of (0, workspace_1.allTargetOptions)(target)) {
+                    delete options.bundleDependencies;
+                }
+            }
+        }
+    });
+}
+exports.default = default_1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "15.0.0-next.2",
+  "version": "15.0.0-next.3",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -23,8 +23,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "15.0.0-next.2",
-    "@angular-devkit/schematics": "15.0.0-next.2",
+    "@angular-devkit/core": "15.0.0-next.3",
+    "@angular-devkit/schematics": "15.0.0-next.3",
     "jsonc-parser": "3.2.0"
   },
   "repository": {

package/service-worker/index.js

@@ -62,47 +62,18 @@ function updateAppModule(mainPath) {
         context.logger.debug('Updating appmodule');
         const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, mainPath);
         context.logger.debug(`module path: ${modulePath}`);
-        // add import
-        let moduleSource = getTsSourceFile(host, modulePath);
-        let importModule = 'ServiceWorkerModule';
-        let importPath = '@angular/service-worker';
-        if (!(0, ast_utils_1.isImported)(moduleSource, importModule, importPath)) {
-            const change = (0, ast_utils_1.insertImport)(moduleSource, modulePath, importModule, importPath);
-            if (change) {
-                const recorder = host.beginUpdate(modulePath);
-                (0, change_1.applyToUpdateRecorder)(recorder, [change]);
-                host.commitUpdate(recorder);
-            }
-        }
-        // add import for environments
-        // import { environment } from '../environments/environment';
-        moduleSource = getTsSourceFile(host, modulePath);
-        const environmentExportName = (0, ast_utils_1.getEnvironmentExportName)(moduleSource);
-        // if environemnt import already exists then use the found one
-        // otherwise use the default name
-        importModule = environmentExportName || 'environment';
-        // TODO: dynamically find environments relative path
-        importPath = '../environments/environment';
-        if (!environmentExportName) {
-            // if environment import was not found then insert the new one
-            // with default path and default export name
-            const change = (0, ast_utils_1.insertImport)(moduleSource, modulePath, importModule, importPath);
-            if (change) {
-                const recorder = host.beginUpdate(modulePath);
-                (0, change_1.applyToUpdateRecorder)(recorder, [change]);
-                host.commitUpdate(recorder);
-            }
-        }
+        addImport(host, modulePath, 'ServiceWorkerModule', '@angular/service-worker');
+        addImport(host, modulePath, 'isDevMode', '@angular/core');
         // register SW in application module
         const importText = core_1.tags.stripIndent `
       ServiceWorkerModule.register('ngsw-worker.js', {
-        enabled: ${importModule}.production,
+        enabled: !isDevMode(),
         // Register the ServiceWorker as soon as the application is stable
         // or after 30 seconds (whichever comes first).
         registrationStrategy: 'registerWhenStable:30000'
       })
     `;
-        moduleSource = getTsSourceFile(host, modulePath);
+        const moduleSource = getTsSourceFile(host, modulePath);
         const metadataChanges = (0, ast_utils_1.addSymbolToNgModuleMetadata)(moduleSource, modulePath, 'imports', importText);
         if (metadataChanges) {
             const recorder = host.beginUpdate(modulePath);
@@ -157,3 +128,12 @@ function default_1(options) {
     };
 }
 exports.default = default_1;
+function addImport(host, filePath, symbolName, moduleName) {
+    const moduleSource = getTsSourceFile(host, filePath);
+    const change = (0, ast_utils_1.insertImport)(moduleSource, filePath, symbolName, moduleName);
+    if (change) {
+        const recorder = host.beginUpdate(filePath);
+        (0, change_1.applyToUpdateRecorder)(recorder, [change]);
+        host.commitUpdate(recorder);
+    }
+}

package/universal/files/src/__main@stripTsExtension__.ts.template

@@ -12,12 +12,5 @@ import '@angular/platform-server/init';
  */
 import '@angular/localize/init';
 
-<% } %>import { enableProdMode } from '@angular/core';
-
-import { environment } from './environments/environment';
-
-if (environment.production) {
-  enableProdMode();
-}
-
+<% } %>
 export { <%= rootModuleClassName %> } from './app/<%= stripTsExtension(rootModuleFileName) %>';

package/utility/ast-utils.d.ts

@@ -86,12 +86,6 @@ export declare function addBootstrapToModule(source: ts.SourceFile, modulePath:
  * Determine if an import already exists.
  */
 export declare function isImported(source: ts.SourceFile, classifiedName: string, importPath: string): boolean;
-/**
- * This function returns the name of the environment export
- * whether this export is aliased or not. If the environment file
- * is not imported, then it will return `null`.
- */
-export declare function getEnvironmentExportName(source: ts.SourceFile): string | null;
 /**
  * Returns the RouterModule declaration from NgModule metadata, if any.
  */

package/utility/ast-utils.js

@@ -30,7 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addRouteDeclarationToModule = exports.getRouterModuleDeclaration = exports.getEnvironmentExportName = exports.isImported = exports.addBootstrapToModule = exports.addExportToModule = exports.addProviderToModule = exports.addImportToModule = exports.addDeclarationToModule = exports.addSymbolToNgModuleMetadata = exports.getMetadataField = exports.getDecoratorMetadata = exports.insertAfterLastOccurrence = exports.findNode = exports.getSourceNodes = exports.findNodes = exports.insertImport = void 0;
+exports.addRouteDeclarationToModule = exports.getRouterModuleDeclaration = exports.isImported = exports.addBootstrapToModule = exports.addExportToModule = exports.addProviderToModule = exports.addImportToModule = exports.addDeclarationToModule = exports.addSymbolToNgModuleMetadata = exports.getMetadataField = exports.getDecoratorMetadata = exports.insertAfterLastOccurrence = exports.findNode = exports.getSourceNodes = exports.findNodes = exports.insertImport = void 0;
 const core_1 = require("@angular-devkit/core");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const change_1 = require("./change");
@@ -423,43 +423,6 @@ function isImported(source, classifiedName, importPath) {
     return matchingNodes.length > 0;
 }
 exports.isImported = isImported;
-/**
- * This function returns the name of the environment export
- * whether this export is aliased or not. If the environment file
- * is not imported, then it will return `null`.
- */
-function getEnvironmentExportName(source) {
-    // Initial value is `null` as we don't know yet if the user
-    // has imported `environment` into the root module or not.
-    let environmentExportName = null;
-    const allNodes = getSourceNodes(source);
-    allNodes
-        .filter(ts.isImportDeclaration)
-        .filter((declaration) => declaration.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral &&
-        declaration.importClause !== undefined)
-        .map((declaration) => 
-    // If `importClause` property is defined then the first
-    // child will be `NamedImports` object (or `namedBindings`).
-    declaration.importClause.getChildAt(0))
-        // Find those `NamedImports` object that contains `environment` keyword
-        // in its text. E.g. `{ environment as env }`.
-        .filter(ts.isNamedImports)
-        .filter((namedImports) => namedImports.getText().includes('environment'))
-        .forEach((namedImports) => {
-        for (const specifier of namedImports.elements) {
-            // `propertyName` is defined if the specifier
-            // has an aliased import.
-            const name = specifier.propertyName || specifier.name;
-            // Find specifier that contains `environment` keyword in its text.
-            // Whether it's `environment` or `environment as env`.
-            if (name.text.includes('environment')) {
-                environmentExportName = specifier.name.text;
-            }
-        }
-    });
-    return environmentExportName;
-}
-exports.getEnvironmentExportName = getEnvironmentExportName;
 /**
  * Returns the RouterModule declaration from NgModule metadata, if any.
  */

package/application/files/src/environments/environment.prod.ts.template

@@ -1,3 +0,0 @@
-export const environment = {
-  production: true
-};

package/application/files/src/environments/environment.ts.template

@@ -1,16 +0,0 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// `ng build` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
-
-export const environment = {
-  production: false
-};
-
-/*
- * For easier debugging in development mode, you can import the following file
- * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
- *
- * This import should be commented out in production mode because it will have a negative impact
- * on performance if an error is thrown.
- */
-// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.

package/application/files/src/polyfills.ts.template

@@ -1,53 +0,0 @@
-/**
- * This file includes polyfills needed by Angular and is loaded before the app.
- * You can add your own extra polyfills to this file.
- *
- * This file is divided into 2 sections:
- *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
- *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
- *      file.
- *
- * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
- * automatically update themselves. This includes recent versions of Safari, Chrome (including
- * Opera), Edge on the desktop, and iOS and Chrome on mobile.
- *
- * Learn more in https://angular.io/guide/browser-support
- */
-
-/***************************************************************************************************
- * BROWSER POLYFILLS
- */
-
-/**
- * By default, zone.js will patch all possible macroTask and DomEvents
- * user can disable parts of macroTask/DomEvents patch by setting following flags
- * because those flags need to be set before `zone.js` being loaded, and webpack
- * will put import in the top of bundle, so user need to create a separate file
- * in this directory (for example: zone-flags.ts), and put the following flags
- * into that file, and then add the following code before importing zone.js.
- * import './zone-flags';
- *
- * The flags allowed in zone-flags.ts are listed here.
- *
- * The following flags will work for all browsers.
- *
- * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
- * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
- *
- *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
- *  with the following flag, it will bypass `zone.js` patch for IE/Edge
- *
- *  (window as any).__Zone_enable_cross_context_check = true;
- *
- */
-
-/***************************************************************************************************
- * Zone JS is required by default for Angular itself.
- */
-import 'zone.js';  // Included with Angular CLI.
-
-
-/***************************************************************************************************
- * APPLICATION IMPORTS
- */

package/application/files/src/test.ts.template

@@ -1,26 +0,0 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'zone.js/testing';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    <T>(id: string): T;
-    keys(): string[];
-  };
-};
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  errorOnUnknownElements: true,
-  errorOnUnknownProperties: true
-});
-
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().forEach(context);

package/library/files/src/test.ts.template

@@ -1,27 +0,0 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'zone.js';
-import 'zone.js/testing';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    <T>(id: string): T;
-    keys(): string[];
-  };
-};
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  errorOnUnknownElements: true,
-  errorOnUnknownProperties: true
-});
-
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().forEach(context);