Skip to content

Commit e7c7d11

Browse files
Merge pull request #1130 from angular/main
Create a new pull request by comparing changes across two branches
2 parents 933a18d + 94dbacf commit e7c7d11

File tree

37 files changed

+298
-336
lines changed

37 files changed

+298
-336
lines changed

modules/testing/builder/projects/hello-world-app/src/app/app.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { Component } from '@angular/core';
1010

1111
@Component({
1212
selector: 'app-root',
13+
standalone: false,
1314
templateUrl: './app.component.html',
1415
styleUrls: ['./app.component.css'],
1516
})

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,23 @@
5252
},
5353
"devDependencies": {
5454
"@ampproject/remapping": "2.3.0",
55-
"@angular/animations": "19.0.0-next.9",
55+
"@angular/animations": "19.0.0-next.10",
5656
"@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=07617f0f8540d27f8895b1820a6f994e1e5b7277#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch",
5757
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#2692c81ef1068e15c7b7eaf3ecc7a65cbdd25c9f",
58-
"@angular/cdk": "19.0.0-next.8",
59-
"@angular/common": "19.0.0-next.9",
60-
"@angular/compiler": "19.0.0-next.9",
61-
"@angular/compiler-cli": "19.0.0-next.9",
62-
"@angular/core": "19.0.0-next.9",
63-
"@angular/forms": "19.0.0-next.9",
64-
"@angular/localize": "19.0.0-next.9",
65-
"@angular/material": "19.0.0-next.8",
58+
"@angular/cdk": "19.0.0-next.9",
59+
"@angular/common": "19.0.0-next.10",
60+
"@angular/compiler": "19.0.0-next.10",
61+
"@angular/compiler-cli": "19.0.0-next.10",
62+
"@angular/core": "19.0.0-next.10",
63+
"@angular/forms": "19.0.0-next.10",
64+
"@angular/localize": "19.0.0-next.10",
65+
"@angular/material": "19.0.0-next.9",
6666
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2659cef857ffd127dbbbcbb28bb2dc4ca8625b50",
67-
"@angular/platform-browser": "19.0.0-next.9",
68-
"@angular/platform-browser-dynamic": "19.0.0-next.9",
69-
"@angular/platform-server": "19.0.0-next.9",
70-
"@angular/router": "19.0.0-next.9",
71-
"@angular/service-worker": "19.0.0-next.9",
67+
"@angular/platform-browser": "19.0.0-next.10",
68+
"@angular/platform-browser-dynamic": "19.0.0-next.10",
69+
"@angular/platform-server": "19.0.0-next.10",
70+
"@angular/router": "19.0.0-next.10",
71+
"@angular/service-worker": "19.0.0-next.10",
7272
"@babel/core": "7.25.8",
7373
"@babel/generator": "7.25.7",
7474
"@babel/helper-annotate-as-pure": "7.25.7",
@@ -84,7 +84,7 @@
8484
"@bazel/concatjs": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch",
8585
"@bazel/jasmine": "patch:@bazel/jasmine@npm%3A5.8.1#~/.yarn/patches/@bazel-jasmine-npm-5.8.1-3370fee155.patch",
8686
"@bazel/runfiles": "^5.8.1",
87-
"@discoveryjs/json-ext": "0.6.1",
87+
"@discoveryjs/json-ext": "0.6.2",
8888
"@inquirer/confirm": "5.0.0",
8989
"@inquirer/prompts": "7.0.0",
9090
"@listr2/prompt-adapter-inquirer": "2.0.17",
@@ -114,8 +114,8 @@
114114
"@types/yargs": "^17.0.20",
115115
"@types/yargs-parser": "^21.0.0",
116116
"@types/yarnpkg__lockfile": "^1.1.5",
117-
"@typescript-eslint/eslint-plugin": "8.9.0",
118-
"@typescript-eslint/parser": "8.9.0",
117+
"@typescript-eslint/eslint-plugin": "8.10.0",
118+
"@typescript-eslint/parser": "8.10.0",
119119
"@vitejs/plugin-basic-ssl": "1.1.0",
120120
"@web/test-runner": "^0.19.0",
121121
"@yarnpkg/lockfile": "1.1.0",
@@ -172,7 +172,7 @@
172172
"npm-pick-manifest": "10.0.0",
173173
"open": "10.1.0",
174174
"ora": "5.4.1",
175-
"pacote": "19.0.1",
175+
"pacote": "20.0.0",
176176
"parse5-html-rewriting-stream": "7.0.0",
177177
"picomatch": "4.0.2",
178178
"piscina": "4.7.0",
@@ -186,7 +186,7 @@
186186
"rollup": "4.24.0",
187187
"rollup-plugin-sourcemaps": "^0.6.0",
188188
"rxjs": "7.8.1",
189-
"sass": "1.79.5",
189+
"sass": "1.80.2",
190190
"sass-loader": "16.0.2",
191191
"semver": "7.6.3",
192192
"shelljs": "^0.8.5",

packages/angular/build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"picomatch": "4.0.2",
4040
"piscina": "4.7.0",
4141
"rollup": "4.24.0",
42-
"sass": "1.79.5",
42+
"sass": "1.80.2",
4343
"semver": "7.6.3",
4444
"vite": "5.4.9",
4545
"watchpack": "2.4.2"

packages/angular/build/src/builders/application/tests/behavior/rebuild-errors_spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
2727

2828
const goodDirectiveContents = `
2929
import { Directive, Input } from '@angular/core';
30-
@Directive({ selector: 'dir' })
30+
@Directive({ selector: 'dir', standalone: false })
3131
export class Dir {
3232
@Input() foo: number;
3333
}
@@ -66,6 +66,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
6666
import { Component } from '@angular/core'
6767
@Component({
6868
selector: 'app-root',
69+
standalone: false,
6970
template: '<dir [foo]="123">',
7071
})
7172
export class AppComponent { }
@@ -87,7 +88,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
8788
'src/app/dir.ts',
8889
`
8990
import { Directive, Input } from '@angular/core';
90-
@Directive({ selector: 'dir' })
91+
@Directive({ selector: 'dir', standalone: false })
9192
export class Dir {
9293
@Input() foo: string;
9394
}

packages/angular/build/src/builders/application/tests/behavior/rebuild-general_spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
3838
import './file-a';
3939
@Component({
4040
selector: 'app-root',
41+
standalone: false,
4142
template: 'App component',
4243
})
4344
export class AppComponent { }

packages/angular/build/src/builders/application/tests/behavior/rebuild-web-workers_spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
4747
import { Component } from '@angular/core'
4848
@Component({
4949
selector: 'app-root',
50+
standalone: false,
5051
template: '<h1>Worker Test</h1>',
5152
})
5253
export class AppComponent {

packages/angular/build/src/builders/application/tests/behavior/web-workers-application_spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
4242
import { Component } from '@angular/core'
4343
@Component({
4444
selector: 'app-root',
45+
standalone: false,
4546
template: '<h1>Worker Test</h1>',
4647
})
4748
export class AppComponent {

packages/angular/build/src/builders/application/tests/options/app-shell_spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const appShellRouteFiles: Record<string, string> = {
1616
1717
@Component({
1818
selector: 'app-app-shell',
19+
standalone: false,
1920
styles: ['div { color: #fff; }'],
2021
template: '<p>app-shell works!</p>',
2122
})

packages/angular/build/src/builders/application/tests/options/external-dependencies_spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
6161
import { Component } from '@angular/core'
6262
@Component({
6363
selector: 'app-root',
64+
standalone: false,
6465
template: '<h1>Worker Test</h1>',
6566
})
6667
export class AppComponent {

packages/angular/build/src/tools/vite/middlewares/assets-middleware.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export function createAngularAssetsMiddleware(
8888
// Shim the stylesheet if a component ID is provided
8989
if (componentId.length > 0) {
9090
// Validate component ID
91-
if (/^[_.\-\p{Letter}\d]+-c\d{9}$/u.test(componentId)) {
91+
if (/^[_.\-\p{Letter}\d]+-c\d+$/u.test(componentId)) {
9292
loadEsmModule<typeof import('@angular/compiler')>('@angular/compiler')
9393
.then((compilerModule) => {
9494
const encapsulatedData = compilerModule.encapsulateStyle(

0 commit comments

Comments
 (0)