Skip to content

Commit

Permalink
Merge pull request #1130 from angular/main
Browse files Browse the repository at this point in the history
Create a new pull request by comparing changes across two branches
  • Loading branch information
GulajavaMinistudio authored Oct 21, 2024
2 parents 933a18d + 94dbacf commit e7c7d11
Show file tree
Hide file tree
Showing 37 changed files with 298 additions and 336 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Component } from '@angular/core';

@Component({
selector: 'app-root',
standalone: false,
templateUrl: './app.component.html',
styleUrls: ['./app.component.css'],
})
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,23 @@
},
"devDependencies": {
"@ampproject/remapping": "2.3.0",
"@angular/animations": "19.0.0-next.9",
"@angular/animations": "19.0.0-next.10",
"@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=07617f0f8540d27f8895b1820a6f994e1e5b7277#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch",
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#2692c81ef1068e15c7b7eaf3ecc7a65cbdd25c9f",
"@angular/cdk": "19.0.0-next.8",
"@angular/common": "19.0.0-next.9",
"@angular/compiler": "19.0.0-next.9",
"@angular/compiler-cli": "19.0.0-next.9",
"@angular/core": "19.0.0-next.9",
"@angular/forms": "19.0.0-next.9",
"@angular/localize": "19.0.0-next.9",
"@angular/material": "19.0.0-next.8",
"@angular/cdk": "19.0.0-next.9",
"@angular/common": "19.0.0-next.10",
"@angular/compiler": "19.0.0-next.10",
"@angular/compiler-cli": "19.0.0-next.10",
"@angular/core": "19.0.0-next.10",
"@angular/forms": "19.0.0-next.10",
"@angular/localize": "19.0.0-next.10",
"@angular/material": "19.0.0-next.9",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2659cef857ffd127dbbbcbb28bb2dc4ca8625b50",
"@angular/platform-browser": "19.0.0-next.9",
"@angular/platform-browser-dynamic": "19.0.0-next.9",
"@angular/platform-server": "19.0.0-next.9",
"@angular/router": "19.0.0-next.9",
"@angular/service-worker": "19.0.0-next.9",
"@angular/platform-browser": "19.0.0-next.10",
"@angular/platform-browser-dynamic": "19.0.0-next.10",
"@angular/platform-server": "19.0.0-next.10",
"@angular/router": "19.0.0-next.10",
"@angular/service-worker": "19.0.0-next.10",
"@babel/core": "7.25.8",
"@babel/generator": "7.25.7",
"@babel/helper-annotate-as-pure": "7.25.7",
Expand All @@ -84,7 +84,7 @@
"@bazel/concatjs": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch",
"@bazel/jasmine": "patch:@bazel/jasmine@npm%3A5.8.1#~/.yarn/patches/@bazel-jasmine-npm-5.8.1-3370fee155.patch",
"@bazel/runfiles": "^5.8.1",
"@discoveryjs/json-ext": "0.6.1",
"@discoveryjs/json-ext": "0.6.2",
"@inquirer/confirm": "5.0.0",
"@inquirer/prompts": "7.0.0",
"@listr2/prompt-adapter-inquirer": "2.0.17",
Expand Down Expand Up @@ -114,8 +114,8 @@
"@types/yargs": "^17.0.20",
"@types/yargs-parser": "^21.0.0",
"@types/yarnpkg__lockfile": "^1.1.5",
"@typescript-eslint/eslint-plugin": "8.9.0",
"@typescript-eslint/parser": "8.9.0",
"@typescript-eslint/eslint-plugin": "8.10.0",
"@typescript-eslint/parser": "8.10.0",
"@vitejs/plugin-basic-ssl": "1.1.0",
"@web/test-runner": "^0.19.0",
"@yarnpkg/lockfile": "1.1.0",
Expand Down Expand Up @@ -172,7 +172,7 @@
"npm-pick-manifest": "10.0.0",
"open": "10.1.0",
"ora": "5.4.1",
"pacote": "19.0.1",
"pacote": "20.0.0",
"parse5-html-rewriting-stream": "7.0.0",
"picomatch": "4.0.2",
"piscina": "4.7.0",
Expand All @@ -186,7 +186,7 @@
"rollup": "4.24.0",
"rollup-plugin-sourcemaps": "^0.6.0",
"rxjs": "7.8.1",
"sass": "1.79.5",
"sass": "1.80.2",
"sass-loader": "16.0.2",
"semver": "7.6.3",
"shelljs": "^0.8.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"picomatch": "4.0.2",
"piscina": "4.7.0",
"rollup": "4.24.0",
"sass": "1.79.5",
"sass": "1.80.2",
"semver": "7.6.3",
"vite": "5.4.9",
"watchpack": "2.4.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {

const goodDirectiveContents = `
import { Directive, Input } from '@angular/core';
@Directive({ selector: 'dir' })
@Directive({ selector: 'dir', standalone: false })
export class Dir {
@Input() foo: number;
}
Expand Down Expand Up @@ -66,6 +66,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
import { Component } from '@angular/core'
@Component({
selector: 'app-root',
standalone: false,
template: '<dir [foo]="123">',
})
export class AppComponent { }
Expand All @@ -87,7 +88,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
'src/app/dir.ts',
`
import { Directive, Input } from '@angular/core';
@Directive({ selector: 'dir' })
@Directive({ selector: 'dir', standalone: false })
export class Dir {
@Input() foo: string;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
import './file-a';
@Component({
selector: 'app-root',
standalone: false,
template: 'App component',
})
export class AppComponent { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
import { Component } from '@angular/core'
@Component({
selector: 'app-root',
standalone: false,
template: '<h1>Worker Test</h1>',
})
export class AppComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
import { Component } from '@angular/core'
@Component({
selector: 'app-root',
standalone: false,
template: '<h1>Worker Test</h1>',
})
export class AppComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const appShellRouteFiles: Record<string, string> = {
@Component({
selector: 'app-app-shell',
standalone: false,
styles: ['div { color: #fff; }'],
template: '<p>app-shell works!</p>',
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
import { Component } from '@angular/core'
@Component({
selector: 'app-root',
standalone: false,
template: '<h1>Worker Test</h1>',
})
export class AppComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export function createAngularAssetsMiddleware(
// Shim the stylesheet if a component ID is provided
if (componentId.length > 0) {
// Validate component ID
if (/^[_.\-\p{Letter}\d]+-c\d{9}$/u.test(componentId)) {
if (/^[_.\-\p{Letter}\d]+-c\d+$/u.test(componentId)) {
loadEsmModule<typeof import('@angular/compiler')>('@angular/compiler')
.then((compilerModule) => {
const encapsulatedData = compilerModule.encapsulateStyle(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@

import { Readable } from 'node:stream';
import { pipeline } from 'node:stream/promises';
import type { RewritingStream } from 'parse5-html-rewriting-stream';
import { loadEsmModule } from '../load-esm';

// Export helper types for the rewriter
export type StartTag = Parameters<RewritingStream['emitStartTag']>[0];
export type EndTag = Parameters<RewritingStream['emitEndTag']>[0];
export type { RewritingStream };

export async function htmlRewritingStream(content: string): Promise<{
rewriter: import('parse5-html-rewriting-stream').RewritingStream;
rewriter: RewritingStream;
transformedContent: () => Promise<string>;
}> {
const { RewritingStream } = await loadEsmModule<typeof import('parse5-html-rewriting-stream')>(
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"listr2": "8.2.5",
"npm-package-arg": "12.0.0",
"npm-pick-manifest": "10.0.0",
"pacote": "19.0.1",
"pacote": "20.0.0",
"resolve": "1.22.8",
"semver": "7.6.3",
"symbol-observable": "4.0.0",
Expand Down
13 changes: 7 additions & 6 deletions packages/angular/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@
"@angular/router": "^19.0.0-next.0"
},
"devDependencies": {
"@angular/common": "19.0.0-next.9",
"@angular/compiler": "19.0.0-next.9",
"@angular/core": "19.0.0-next.9",
"@angular/platform-browser": "19.0.0-next.9",
"@angular/platform-server": "19.0.0-next.9",
"@angular/router": "19.0.0-next.9",
"@angular/common": "19.0.0-next.10",
"@angular/compiler": "19.0.0-next.10",
"@angular/core": "19.0.0-next.10",
"@angular/platform-browser": "19.0.0-next.10",
"@angular/platform-server": "19.0.0-next.10",
"@angular/router": "19.0.0-next.10",
"@bazel/runfiles": "^5.8.1"
},
"sideEffects": false,
"schematics": "./schematics/collection.json",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/ssr/src/app-engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class AngularAppEngine {
*
* @private
*/
static ɵhooks = new Hooks();
static ɵhooks = /* #__PURE__*/ new Hooks();

/**
* Provides access to the hooks for extending or modifying the server application's behavior.
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@babel/plugin-transform-runtime": "7.25.7",
"@babel/preset-env": "7.25.8",
"@babel/runtime": "7.25.7",
"@discoveryjs/json-ext": "0.6.1",
"@discoveryjs/json-ext": "0.6.2",
"@ngtools/webpack": "0.0.0-PLACEHOLDER",
"@vitejs/plugin-basic-ssl": "1.1.0",
"ansi-colors": "4.1.3",
Expand Down Expand Up @@ -48,7 +48,7 @@
"postcss-loader": "8.1.1",
"resolve-url-loader": "5.0.0",
"rxjs": "7.8.1",
"sass": "1.79.5",
"sass": "1.80.2",
"sass-loader": "16.0.2",
"semver": "7.6.3",
"source-map-loader": "5.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ describe('AppShell Builder', () => {
@Component({
selector: 'app-app-shell',
standalone: false,
templateUrl: './app-shell.component.html',
})
export class AppShellComponent implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ describe('Browser Builder styles', () => {
@Component({
selector: 'app-root',
standalone: false,
templateUrl: './app.component.html',
styleUrls: []
})
Expand All @@ -92,6 +93,7 @@ describe('Browser Builder styles', () => {
@Component({
selector: 'app-root',
standalone: false,
templateUrl: './app.component.html',
styles: ['div { mask-composite: add; }'],
})
Expand All @@ -118,6 +120,7 @@ describe('Browser Builder styles', () => {
@Component({
selector: 'app-root',
standalone: false,
templateUrl: './app.component.html',
styles: ['div { mask-composite: add; }'],
})
Expand Down Expand Up @@ -637,6 +640,7 @@ describe('Browser Builder styles', () => {
@Component({
selector: 'app-root',
standalone: false,
templateUrl: './app.component.html',
styleUrls: ['../styles.css']
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ describe('Browser Builder allow svg', () => {
@Component({
selector: 'app-root',
standalone: false,
templateUrl: './app.component.svg',
styleUrls: []
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {

const goodDirectiveContents = `
import { Directive, Input } from '@angular/core';
@Directive({ selector: 'dir' })
@Directive({ selector: 'dir', standalone: false })
export class Dir {
@Input() foo: number;
}
Expand Down Expand Up @@ -61,6 +61,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
import { Component } from '@angular/core'
@Component({
selector: 'app-root',
standalone: false,
template: '<dir [foo]="123">',
})
export class AppComponent { }
Expand All @@ -82,7 +83,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
'src/app/dir.ts',
`
import { Directive, Input } from '@angular/core';
@Directive({ selector: 'dir' })
@Directive({ selector: 'dir', standalone: false })
export class Dir {
@Input() foo: string;
}
Expand Down Expand Up @@ -162,7 +163,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
'src/app/dir.ts',
`
import { Directive, Input } from '@angular/core';
@Directive({ selector: 'dir' })
@Directive({ selector: 'dir', standalone: false })
export class Dir {
@Input() foo: number;
}
Expand All @@ -172,7 +173,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
// Same selector with a different type on the `foo` property but initially no `@Input`
const goodDirectiveContents = `
import { Directive } from '@angular/core';
@Directive({ selector: 'dir' })
@Directive({ selector: 'dir', standalone: false })
export class Dir2 {
foo: string;
}
Expand Down Expand Up @@ -210,6 +211,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
import { Component } from '@angular/core'
@Component({
selector: 'app-root',
standalone: false,
template: '<dir [foo]="123">',
})
export class AppComponent { }
Expand All @@ -231,7 +233,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
'src/app/dir2.ts',
`
import { Directive, Input } from '@angular/core';
@Directive({ selector: 'dir' })
@Directive({ selector: 'dir', standalone: false })
export class Dir2 {
@Input() foo: string;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
@Component({
selector: 'app-root',
standalone: false,
template: '<button (click)="changeMessage()" class="change">{{ message }}</button>',
})
export class AppComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
@Component({
selector: 'app-root',
standalone: false,
template: '<p *ngFor="let asset of assets">{{ asset.content }}</p>'
})
export class AppComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
@Component({
selector: 'app-root',
standalone: false,
templateUrl: './app.component.html',
styleUrls: ['./app.component.css']
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
@Component({
selector: 'app-root',
standalone: false,
template: '<p>Hello World</p>'
})
export class AppComponent {
Expand Down Expand Up @@ -79,6 +80,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
import { HttpClient } from '@angular/common/http';
@Component({
selector: 'app-root',
standalone: false,
template: '<p *ngFor="let asset of css">{{ asset.content }}</p>'
})
export class AppComponent {
Expand Down
Loading

0 comments on commit e7c7d11

Please sign in to comment.