@schematics/angular 20.0.0-rc.0 → 20.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "20.0.0-rc.0",
+  "version": "20.0.0-rc.2",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -22,15 +22,15 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "20.0.0-rc.0",
-    "@angular-devkit/schematics": "20.0.0-rc.0",
+    "@angular-devkit/core": "20.0.0-rc.2",
+    "@angular-devkit/schematics": "20.0.0-rc.2",
     "jsonc-parser": "3.3.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
-  "packageManager": "pnpm@9.15.6",
+  "packageManager": "pnpm@9.15.9",
   "engines": {
     "node": "^20.11.1 || ^22.11.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/service-worker/index.js

@@ -120,18 +120,16 @@ function default_1(options) {
             throw (0, project_targets_1.targetBuildNotFoundError)();
         }
         const buildOptions = buildTarget.options;
-        let browserEntryPoint;
+        const browserEntryPoint = await (0, util_1.getMainFilePath)(host, options.project);
         const ngswConfigPath = (0, core_1.join)((0, core_1.normalize)(project.root), 'ngsw-config.json');
         if (buildTarget.builder === workspace_models_1.Builders.Application ||
             buildTarget.builder === workspace_models_1.Builders.BuildApplication) {
-            browserEntryPoint = buildOptions.browser;
             const productionConf = buildTarget.configurations?.production;
             if (productionConf) {
                 productionConf.serviceWorker = ngswConfigPath;
             }
         }
         else {
-            browserEntryPoint = buildOptions.main;
             buildOptions.serviceWorker = true;
             buildOptions.ngswConfigPath = ngswConfigPath;
         }

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-rc.0',
-    AngularBuild: '^20.0.0-rc.0',
-    AngularSSR: '^20.0.0-rc.0',
+    DevkitBuildAngular: '^20.0.0-rc.2',
+    AngularBuild: '^20.0.0-rc.2',
+    AngularSSR: '^20.0.0-rc.2',
 };

package/utility/standalone/util.js

@@ -17,6 +17,7 @@ exports.applyChangesToFile = applyChangesToFile;
 exports.isMergeAppConfigCall = isMergeAppConfigCall;
 exports.findProvidersLiteral = findProvidersLiteral;
 const schematics_1 = require("@angular-devkit/schematics");
+const posix_1 = require("node:path/posix");
 const typescript_1 = __importDefault(require("../../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const change_1 = require("../change");
 const project_targets_1 = require("../project-targets");
@@ -31,14 +32,17 @@ async function getMainFilePath(tree, projectName) {
     const workspace = await (0, workspace_1.getWorkspace)(tree);
     const project = workspace.projects.get(projectName);
     const buildTarget = project?.targets.get('build');
-    if (!buildTarget) {
+    if (!project || !buildTarget) {
         throw (0, project_targets_1.targetBuildNotFoundError)();
     }
     const options = buildTarget.options;
-    return buildTarget.builder === workspace_models_1.Builders.Application ||
-        buildTarget.builder === workspace_models_1.Builders.BuildApplication
-        ? options.browser
-        : options.main;
+    if (buildTarget.builder === workspace_models_1.Builders.Application ||
+        buildTarget.builder === workspace_models_1.Builders.BuildApplication) {
+        // These builders support a default of `<project_source_root>/main.ts`
+        const projectSourceRoot = project.sourceRoot ?? (0, posix_1.join)(project.root, 'src');
+        return options.browser ?? (0, posix_1.join)(projectSourceRoot, 'main.ts');
+    }
+    return options.main;
 }
 /**
  * Gets a TypeScript source file at a specific path.