diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts index 41d431f37e8c..857eb8122696 100644 --- a/packages/schematics/angular/application/index_spec.ts +++ b/packages/schematics/angular/application/index_spec.ts @@ -31,7 +31,6 @@ describe('Application Schematic', () => { const defaultOptions: ApplicationOptions = { name: 'foo', - routing: false, skipPackageJson: false, }; @@ -566,8 +565,8 @@ describe('Application Schematic', () => { expect(component).toMatch(/standalone: true/); }); - it('should create routing information when routing is true', async () => { - const options = { ...defaultOptions, standalone: true, routing: true }; + it('should create routing information by default', async () => { + const options = { ...defaultOptions, standalone: true }; const tree = await schematicRunner.runSchematic('application', options, workspaceTree); diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json index 1ef4cc1e5317..95936b544b45 100644 --- a/packages/schematics/angular/application/schema.json +++ b/packages/schematics/angular/application/schema.json @@ -39,9 +39,8 @@ }, "routing": { "type": "boolean", - "description": "Create a routing NgModule.", - "default": false, - "x-prompt": "Would you like to add Angular routing?", + "description": "Creates an application with routing enabled.", + "default": true, "x-user-analytics": "ep.ng_routing" }, "prefix": { diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts index 8d80fdd15f6f..a53b8de6f5c6 100644 --- a/packages/schematics/angular/ng-new/index_spec.ts +++ b/packages/schematics/angular/ng-new/index_spec.ts @@ -51,6 +51,7 @@ describe('Ng New Schematic', () => { jasmine.arrayContaining([ '/bar/tsconfig.app.json', '/bar/src/main.ts', + '/bar/src/app/app.routes.ts', '/bar/src/app/app.config.ts', ]), ); diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json index ddc63cf6eec5..e827f696c0b7 100644 --- a/packages/schematics/angular/ng-new/schema.json +++ b/packages/schematics/angular/ng-new/schema.json @@ -91,7 +91,7 @@ }, "routing": { "type": "boolean", - "description": "Generate a routing module for the initial project.", + "description": "Enable routing in the initial project.", "x-user-analytics": "ep.ng_routing" }, "prefix": { diff --git a/packages/schematics/angular/utility/standalone/rules_spec.ts b/packages/schematics/angular/utility/standalone/rules_spec.ts index 66ea591aadd7..d79557a5f730 100644 --- a/packages/schematics/angular/utility/standalone/rules_spec.ts +++ b/packages/schematics/angular/utility/standalone/rules_spec.ts @@ -31,6 +31,7 @@ describe('standalone utilities', () => { { name: projectName, standalone, + routing: false, }, host, ); diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts index 1120ad0d8435..36c182817f17 100644 --- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts +++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts @@ -58,6 +58,7 @@ export default async function () { 'src/app/app.module.ts': ` import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; + import { RouterModule } from '@angular/router'; import { AppComponent } from './app.component'; @@ -66,6 +67,7 @@ export default async function () { AppComponent ], imports: [ + RouterModule, BrowserModule ], providers: [], @@ -95,7 +97,7 @@ export default async function () { 'src/app/app.module.ts': ` import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; - + import { RouterModule } from '@angular/router'; import { AppComponent } from './app.component'; @NgModule({ @@ -103,6 +105,7 @@ export default async function () { AppComponent ], imports: [ + RouterModule, BrowserModule ], providers: [], diff --git a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts index 62f3cf294ba1..e80f54f74ad0 100644 --- a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts +++ b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import { appendToFile, prependToFile, readFile, replaceInFile, writeFile } from '../../utils/fs'; +import { readFile, replaceInFile, writeFile } from '../../utils/fs'; import { ng } from '../../utils/process'; import { updateJsonFile } from '../../utils/project'; @@ -14,30 +14,6 @@ export default async function () { const projectName = 'test-project'; const appRoutingModulePath = 'src/app/app-routing.module.ts'; - // Add app routing. - // This is done automatically on a new app with --routing. - await writeFile( - appRoutingModulePath, - ` - import { NgModule } from '@angular/core'; - import { Routes, RouterModule } from '@angular/router'; - - const routes: Routes = []; - - @NgModule({ - imports: [RouterModule.forRoot(routes)], - exports: [RouterModule] - }) - export class AppRoutingModule { } - `, - ); - await prependToFile( - 'src/app/app.module.ts', - `import { AppRoutingModule } from './app-routing.module';`, - ); - await replaceInFile('src/app/app.module.ts', `imports: [`, `imports: [ AppRoutingModule,`); - await appendToFile('src/app/app.component.html', ''); - const originalAppRoutingModule = await readFile(appRoutingModulePath); // helper to replace loadChildren const replaceLoadChildren = async (route: string) => { diff --git a/tests/legacy-cli/e2e/tests/build/library-with-demo-app.ts b/tests/legacy-cli/e2e/tests/build/library-with-demo-app.ts index 02066a53070a..1225795fa903 100644 --- a/tests/legacy-cli/e2e/tests/build/library-with-demo-app.ts +++ b/tests/legacy-cli/e2e/tests/build/library-with-demo-app.ts @@ -25,6 +25,7 @@ export default async function () { ` import {NgModule} from '@angular/core'; import {BrowserModule} from '@angular/platform-browser'; + import {RouterModule} from '@angular/router'; import {SecondaryModule} from 'mylib/secondary'; import {AnotherModule} from 'mylib/another'; @@ -35,6 +36,7 @@ export default async function () { AppComponent ], imports: [ + RouterModule, SecondaryModule, AnotherModule, BrowserModule diff --git a/tests/legacy-cli/e2e/tests/build/no-angular-router.ts b/tests/legacy-cli/e2e/tests/build/no-angular-router.ts deleted file mode 100644 index 190f1e2a39b1..000000000000 --- a/tests/legacy-cli/e2e/tests/build/no-angular-router.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { ng } from '../../utils/process'; -import { expectFileToExist, moveFile } from '../../utils/fs'; -import { getGlobalVariable } from '../../utils/env'; -import * as path from 'path'; - -export default function () { - const tmp = getGlobalVariable('tmp-root'); - - return Promise.resolve() - .then(() => moveFile('node_modules/@angular/router', path.join(tmp, '@angular-router.backup'))) - .then(() => ng('build', '--configuration=development')) - .then(() => expectFileToExist('./dist/test-project/index.html')) - .then(() => moveFile(path.join(tmp, '@angular-router.backup'), 'node_modules/@angular/router')); -} diff --git a/tests/legacy-cli/e2e/tests/build/prod-build.ts b/tests/legacy-cli/e2e/tests/build/prod-build.ts index f9e4359a8e89..33a143fd9a97 100644 --- a/tests/legacy-cli/e2e/tests/build/prod-build.ts +++ b/tests/legacy-cli/e2e/tests/build/prod-build.ts @@ -45,5 +45,5 @@ export default async function () { await expectFileToMatch(`dist/test-project/${mainPath}`, bootstrapRegExp); // Size checks in bytes - verifySize(mainPath, 124000); + verifySize(mainPath, 210000); }