Skip to content

fix(@schematics/angular): support using default browser option when not present #30307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/schematics/angular/environments/index_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe('Environments Schematic', () => {
build.builder = Builders.Browser;
build.options = {
...build.options,
main: build.options.browser,
main: 'projects/foo/src/main.ts',
browser: undefined,
};

Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/server/index_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ describe('Server Schematic', () => {
build.builder = Builders.Browser;
build.options = {
...build.options,
main: build.options.browser,
main: 'projects/bar/src/main.ts',
browser: undefined,
};

Expand Down
6 changes: 2 additions & 4 deletions packages/schematics/angular/service-worker/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { getAppModulePath, isStandaloneApp } from '../utility/ng-ast-utils';
import { relativePathToWorkspaceRoot } from '../utility/paths';
import { targetBuildNotFoundError } from '../utility/project-targets';
import { findAppConfig } from '../utility/standalone/app_config';
import { findBootstrapApplicationCall } from '../utility/standalone/util';
import { findBootstrapApplicationCall, getMainFilePath } from '../utility/standalone/util';
import { Builders } from '../utility/workspace-models';
import { Schema as ServiceWorkerOptions } from './schema';

Expand Down Expand Up @@ -119,20 +119,18 @@ export default function (options: ServiceWorkerOptions): Rule {
}

const buildOptions = buildTarget.options as Record<string, string | boolean>;
let browserEntryPoint: string | undefined;
const browserEntryPoint = await getMainFilePath(host, options.project);
const ngswConfigPath = join(normalize(project.root), 'ngsw-config.json');

if (
buildTarget.builder === Builders.Application ||
buildTarget.builder === Builders.BuildApplication
) {
browserEntryPoint = buildOptions.browser as string;
const productionConf = buildTarget.configurations?.production;
if (productionConf) {
productionConf.serviceWorker = ngswConfigPath;
}
} else {
browserEntryPoint = buildOptions.main as string;
buildOptions.serviceWorker = true;
buildOptions.ngswConfigPath = ngswConfigPath;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/service-worker/index_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ describe('Service Worker Schematic', () => {
build.builder = Builders.Browser;
build.options = {
...build.options,
main: build.options.browser,
main: 'projects/bar/src/main.ts',
browser: undefined,
};

Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/ssr/index_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ describe('SSR Schematic', () => {
build.builder = '@angular-devkit/build-angular:browser';
build.options = {
...build.options,
main: build.options.browser,
main: 'projects/test-app/src/main.ts',
browser: undefined,
};

Expand Down
16 changes: 12 additions & 4 deletions packages/schematics/angular/utility/standalone/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

import { SchematicsException, Tree } from '@angular-devkit/schematics';
import { join } from 'node:path/posix';
import ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
import { Change, applyToUpdateRecorder } from '../change';
import { targetBuildNotFoundError } from '../project-targets';
Expand All @@ -23,16 +24,23 @@ export async function getMainFilePath(tree: Tree, projectName: string): Promise<
const project = workspace.projects.get(projectName);
const buildTarget = project?.targets.get('build');

if (!buildTarget) {
if (!project || !buildTarget) {
throw targetBuildNotFoundError();
}

const options = buildTarget.options as Record<string, string>;

return buildTarget.builder === Builders.Application ||
if (
buildTarget.builder === Builders.Application ||
buildTarget.builder === Builders.BuildApplication
? options.browser
: options.main;
) {
// These builders support a default of `<project_source_root>/main.ts`
const projectSourceRoot = project.sourceRoot ?? join(project.root, 'src');

return options.browser ?? join(projectSourceRoot, 'main.ts');
}

return options.main;
}

/**
Expand Down