@schematics/angular 20.0.0-next.5 → 20.0.0-next.6

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

@@ -3,13 +3,14 @@
 {
   "extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/app",
     "types": []
   },
-  "files": [
-    "src/main.ts"
-  ],
   "include": [
-    "src/**/*.d.ts"
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "src/**/*.spec.ts"
   ]
 }

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

@@ -3,13 +3,13 @@
 {
   "extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/spec",
     "types": [
       "jasmine"
     ]
   },
   "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
+    "src/**/*.ts"
   ]
 }

package/application/index.js

@@ -12,16 +12,33 @@ const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const dependencies_1 = require("../utility/dependencies");
+const json_file_1 = require("../utility/json-file");
 const latest_versions_1 = require("../utility/latest-versions");
 const paths_1 = require("../utility/paths");
 const workspace_1 = require("../utility/workspace");
 const workspace_models_1 = require("../utility/workspace-models");
 const schema_1 = require("./schema");
+function addTsProjectReference(...paths) {
+    return (host) => {
+        if (!host.exists('tsconfig.json')) {
+            return host;
+        }
+        const newReferences = paths.map((path) => ({ path }));
+        const file = new json_file_1.JSONFile(host, 'tsconfig.json');
+        const jsonPath = ['references'];
+        const value = file.get(jsonPath);
+        file.modify(jsonPath, Array.isArray(value) ? [...value, ...newReferences] : newReferences);
+    };
+}
 function default_1(options) {
     return async (host, context) => {
         const { appDir, appRootSelector, componentOptions, folderName, sourceDir } = await getAppOptions(host, options);
         return (0, schematics_1.chain)([
             addAppToWorkspaceFile(options, appDir, folderName),
+            addTsProjectReference((0, core_1.join)((0, core_1.normalize)(appDir), 'tsconfig.app.json')),
+            options.skipTests
+                ? (0, schematics_1.noop)()
+                : addTsProjectReference((0, core_1.join)((0, core_1.normalize)(appDir), 'tsconfig.spec.json')),
             options.standalone
                 ? (0, schematics_1.noop)()
                 : (0, schematics_1.schematic)('module', {

package/migrations/use-application-builder/migration.js

@@ -150,6 +150,7 @@ function updateProjects(tree, context) {
                 case workspace_models_1.Builders.Application:
                 case workspace_models_1.Builders.DevServer:
                 case workspace_models_1.Builders.ExtractI18n:
+                case workspace_models_1.Builders.Karma:
                 case workspace_models_1.Builders.NgPackagr:
                     // Ignore application, dev server, and i18n extraction for devkit usage check.
                     // Both will be replaced if no other usage is found.
@@ -173,6 +174,13 @@ function updateProjects(tree, context) {
                     case workspace_models_1.Builders.ExtractI18n:
                         target.builder = '@angular/build:extract-i18n';
                         break;
+                    case workspace_models_1.Builders.Karma:
+                        target.builder = '@angular/build:karma';
+                        // Remove "builderMode" option since the builder will always use "application"
+                        for (const [, karmaOptions] of (0, workspace_1.allTargetOptions)(target)) {
+                            delete karmaOptions['builderMode'];
+                        }
+                        break;
                     case workspace_models_1.Builders.NgPackagr:
                         target.builder = '@angular/build:ng-packagr';
                         break;

package/package.json

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

package/server/index.js

@@ -95,10 +95,6 @@ function updateConfigFileApplicationBuilder(options) {
 function updateTsConfigFile(tsConfigPath) {
     return (host) => {
         const json = new json_file_1.JSONFile(host, tsConfigPath);
-        const filesPath = ['files'];
-        const files = new Set(json.get(filesPath) ?? []);
-        files.add('src/' + serverMainEntryName);
-        json.modify(filesPath, [...files]);
         const typePath = ['compilerOptions', 'types'];
         const types = new Set(json.get(typePath) ?? []);
         types.add('node');

package/ssr/index.js

@@ -107,6 +107,11 @@ function updateApplicationBuilderTsConfigRule(options) {
             return;
         }
         const json = new json_file_1.JSONFile(host, tsConfigPath);
+        // Skip adding the files entry if the server entry would already be included
+        const include = json.get(['include']);
+        if (Array.isArray(include) && include.includes('src/**/*.ts')) {
+            return;
+        }
         const filesPath = ['files'];
         const files = new Set(json.get(filesPath) ?? []);
         files.add('src/server.ts');

package/utility/latest-versions.js

@@ -16,7 +16,7 @@ exports.latestVersions = {
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: '^20.0.0-next.0',
     NgPackagr: '^20.0.0-next.0',
-    DevkitBuildAngular: '^20.0.0-next.5',
-    AngularBuild: '^20.0.0-next.5',
-    AngularSSR: '^20.0.0-next.5',
+    DevkitBuildAngular: '^20.0.0-next.6',
+    AngularBuild: '^20.0.0-next.6',
+    AngularSSR: '^20.0.0-next.6',
 };

package/workspace/files/tsconfig.json.template

@@ -2,8 +2,7 @@
 /* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
 {
   "compileOnSave": false,
-  "compilerOptions": {
-    "outDir": "./dist/out-tsc",<% if (strict) { %>
+  "compilerOptions": {<% if (strict) { %>
     "strict": true,
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
@@ -22,5 +21,6 @@
     "strictInputAccessModifiers": true,
     "typeCheckHostBindings": true,
     "strictTemplates": true<% } %>
-  }
+  },
+  "files": []
 }