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

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

@@ -15,10 +15,10 @@ declare const require: {
 };
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-);
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+  errorOnUnknownElements: true,
+  errorOnUnknownProperties: true
+});
 
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

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

@@ -16,10 +16,10 @@ declare const require: {
 };
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting(),
-);
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+  errorOnUnknownElements: true,
+  errorOnUnknownProperties: true
+});
 
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

package/migrations/migration-collection.json

@@ -4,6 +4,16 @@
       "version": "15.0.0",
       "factory": "./update-15/remove-browserslist-config",
       "description": "Remove Browserslist configuration files that matches the Angular CLI default configuration."
+    },
+    "remove-platform-server-exports": {
+      "version": "15.0.0",
+      "factory": "./update-15/remove-platform-server-exports",
+      "description": "Remove exported `@angular/platform-server` `renderModule` method. The `renderModule` method is now exported by the Angular CLI."
+    },
+    "update-typescript-target": {
+      "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."
     }
   }
 }

package/migrations/update-15/remove-platform-server-exports.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/remove-platform-server-exports.js

@@ -0,0 +1,102 @@
+"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"));
+function* visit(directory) {
+    for (const path of directory.subfiles) {
+        if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
+            const entry = directory.file(path);
+            if (entry) {
+                const content = entry.content;
+                if (content.includes('@angular/platform-server') && content.includes('renderModule')) {
+                    const source = ts.createSourceFile(entry.path, content.toString().replace(/^\uFEFF/, ''), ts.ScriptTarget.Latest, true);
+                    yield source;
+                }
+            }
+        }
+    }
+    for (const path of directory.subdirs) {
+        if (path === 'node_modules' || path.startsWith('.')) {
+            continue;
+        }
+        yield* visit(directory.dir(path));
+    }
+}
+function default_1() {
+    return (tree) => {
+        for (const sourceFile of visit(tree.root)) {
+            let recorder;
+            let printer;
+            ts.forEachChild(sourceFile, function analyze(node) {
+                if (!(ts.isExportDeclaration(node) &&
+                    node.moduleSpecifier &&
+                    ts.isStringLiteral(node.moduleSpecifier) &&
+                    node.moduleSpecifier.text === '@angular/platform-server' &&
+                    node.exportClause &&
+                    ts.isNamedExports(node.exportClause))) {
+                    // Not a @angular/platform-server named export.
+                    return;
+                }
+                const exportClause = node.exportClause;
+                const newElements = [];
+                for (const element of exportClause.elements) {
+                    if (element.name.text !== 'renderModule') {
+                        newElements.push(element);
+                    }
+                }
+                if (newElements.length === exportClause.elements.length) {
+                    // No changes
+                    return;
+                }
+                recorder !== null && recorder !== void 0 ? recorder : (recorder = tree.beginUpdate(sourceFile.fileName));
+                if (newElements.length) {
+                    // Update named exports as there are leftovers.
+                    const newExportClause = ts.factory.updateNamedExports(exportClause, newElements);
+                    printer !== null && printer !== void 0 ? printer : (printer = ts.createPrinter());
+                    const fix = printer.printNode(ts.EmitHint.Unspecified, newExportClause, sourceFile);
+                    const index = exportClause.getStart();
+                    const length = exportClause.getWidth();
+                    recorder.remove(index, length).insertLeft(index, fix);
+                }
+                else {
+                    // Delete export as no exports remain.
+                    recorder.remove(node.getStart(), node.getWidth());
+                }
+                ts.forEachChild(node, analyze);
+            });
+            if (recorder) {
+                tree.commitUpdate(recorder);
+            }
+        }
+    };
+}
+exports.default = default_1;

package/migrations/update-15/update-typescript-target.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-typescript-target.js

@@ -0,0 +1,68 @@
+"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 json_file_1 = require("../../utility/json-file");
+const workspace_1 = require("../../utility/workspace");
+const workspace_models_1 = require("../../utility/workspace-models");
+function default_1() {
+    return async (host) => {
+        // Workspace level tsconfig
+        updateTarget(host, 'tsconfig.json');
+        const workspace = await (0, workspace_1.getWorkspace)(host);
+        // Find all tsconfig which are refereces used by builders
+        for (const [, project] of workspace.projects) {
+            for (const [, target] of project.targets) {
+                // Update all other known CLI builders that use a tsconfig
+                const tsConfigs = [target.options || {}, ...Object.values(target.configurations || {})]
+                    .filter((opt) => typeof (opt === null || opt === void 0 ? void 0 : opt.tsConfig) === 'string')
+                    .map((opt) => opt.tsConfig);
+                const uniqueTsConfigs = [...new Set(tsConfigs)];
+                if (uniqueTsConfigs.length < 1) {
+                    continue;
+                }
+                switch (target.builder) {
+                    case workspace_models_1.Builders.Server:
+                    case workspace_models_1.Builders.Karma:
+                    case workspace_models_1.Builders.Browser:
+                    case workspace_models_1.Builders.NgPackagr:
+                        for (const tsConfig of uniqueTsConfigs) {
+                            removeOrUpdateTarget(host, tsConfig);
+                        }
+                        break;
+                }
+            }
+        }
+    };
+}
+exports.default = default_1;
+function removeOrUpdateTarget(host, tsConfigPath) {
+    const json = new json_file_1.JSONFile(host, tsConfigPath);
+    if (typeof json.get(['extends']) === 'string') {
+        json.remove(['compilerOptions', 'target']);
+    }
+    else {
+        updateTarget(host, tsConfigPath);
+    }
+}
+const ESNEXT_ES2022_REGEXP = /^es(?:next|2022)$/i;
+function updateTarget(host, tsConfigPath) {
+    const json = new json_file_1.JSONFile(host, tsConfigPath);
+    const jsonPath = ['compilerOptions'];
+    const compilerOptions = json.get(jsonPath);
+    if (compilerOptions && typeof compilerOptions === 'object') {
+        const { target } = compilerOptions;
+        if (typeof target === 'string' && !ESNEXT_ES2022_REGEXP.test(target)) {
+            json.modify(jsonPath, {
+                ...compilerOptions,
+                'target': 'ES2022',
+                'useDefineForClassFields': false,
+            });
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "15.0.0-next.1",
+  "version": "15.0.0-next.2",
   "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.1",
-    "@angular-devkit/schematics": "15.0.0-next.1",
+    "@angular-devkit/core": "15.0.0-next.2",
+    "@angular-devkit/schematics": "15.0.0-next.2",
     "jsonc-parser": "3.2.0"
   },
   "repository": {

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

@@ -21,4 +21,3 @@ if (environment.production) {
 }
 
 export { <%= rootModuleClassName %> } from './app/<%= stripTsExtension(rootModuleFileName) %>';
-export { renderModule } from '@angular/platform-server';

package/workspace/files/tsconfig.json.template

@@ -16,10 +16,11 @@
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "importHelpers": true,
-    "target": "es2020",
-    "module": "es2020",
+    "target": "ES2022",
+    "module": "ES2022",
+    "useDefineForClassFields": false,
     "lib": [
-      "es2020",
+      "ES2022",
       "dom"
     ]
   },