diff --git a/LICENSE b/LICENSE index 8876c32c1..9017f114e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2017 Google, Inc. +Copyright (c) 2010-2024 Google LLC. https://angular.dev/license Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/component/index.js b/component/index.js index 417342e16..db578a4f4 100644 --- a/component/index.js +++ b/component/index.js @@ -42,6 +42,7 @@ function default_1(options) { options.selector = options.selector || buildSelector(options, (project && project.prefix) || ''); (0, validation_1.validateHtmlSelector)(options.selector); + (0, validation_1.validateClassName)(schematics_1.strings.classify(options.name)); const skipStyleFile = options.inlineStyle || options.style === schema_1.Style.None; const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [ options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(), diff --git a/config/files/.browserslistrc.template b/config/files/.browserslistrc.template index 08a555315..4ec7f1adf 100644 --- a/config/files/.browserslistrc.template +++ b/config/files/.browserslistrc.template @@ -13,4 +13,5 @@ last 1 Firefox version last 2 Edge major versions last 2 Safari major versions last 2 iOS major versions +last 2 Android major versions Firefox ESR diff --git a/config/files/karma.conf.js.template b/config/files/karma.conf.js.template index bac55a495..f8da22b16 100644 --- a/config/files/karma.conf.js.template +++ b/config/files/karma.conf.js.template @@ -19,7 +19,6 @@ module.exports = function (config) { // for example, you can disable the random execution with `random: false` // or set a specific seed with `seed: 4321` }, - clearContext: false // leave Jasmine Spec Runner output visible in browser }, jasmineHtmlReporter: { suppressAll: true // removes the duplicated traces diff --git a/directive/index.js b/directive/index.js index f1476d4e4..3e13e78d0 100644 --- a/directive/index.js +++ b/directive/index.js @@ -40,6 +40,7 @@ function default_1(options) { options.path = parsedPath.path; options.selector = options.selector || buildSelector(options, project.prefix || ''); (0, validation_1.validateHtmlSelector)(options.selector); + (0, validation_1.validateClassName)(schematics_1.strings.classify(options.name)); const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [ options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(), (0, schematics_1.applyTemplates)({ diff --git a/package.json b/package.json index 2e091c746..d6e2dc1b1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@schematics/angular", - "version": "18.2.0-next.3+sha-6419c2a", + "version": "18.2.21+sha-875aa6c", "description": "Schematics specific to Angular", "homepage": "https://github.com/angular/angular-cli", "keywords": [ @@ -22,8 +22,8 @@ }, "schematics": "./collection.json", "dependencies": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#6419c2a", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#6419c2a", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#875aa6c", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#875aa6c", "jsonc-parser": "3.3.1" }, "packageManager": "yarn@4.4.0", diff --git a/server/files/standalone-src/main.server.ts.template b/server/files/standalone-src/main.server.ts.template index 4b9d4d154..f67872486 100644 --- a/server/files/standalone-src/main.server.ts.template +++ b/server/files/standalone-src/main.server.ts.template @@ -1,7 +1,8 @@ -import { bootstrapApplication } from '@angular/platform-browser'; +import { BootstrapContext, bootstrapApplication } from '@angular/platform-browser'; import { AppComponent } from './app/app.component'; import { config } from './app/app.config.server'; -const bootstrap = () => bootstrapApplication(AppComponent, config); +const bootstrap = (context: BootstrapContext) => + bootstrapApplication(AppComponent, config, context); export default bootstrap; diff --git a/service-worker/files/ngsw-config.json.template b/service-worker/files/ngsw-config.json.template index 17954bd63..1be9a7e62 100644 --- a/service-worker/files/ngsw-config.json.template +++ b/service-worker/files/ngsw-config.json.template @@ -8,6 +8,7 @@ "resources": { "files": [ "/favicon.ico", + "/index.csr.html", "/index.html", "/manifest.webmanifest", "/*.css", diff --git a/uniqueId b/uniqueId index 5102e4f32..38bacd9e7 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Wed Aug 07 2024 20:41:07 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Thu Sep 11 2025 14:05:35 GMT+0000 (Coordinated Universal Time) \ No newline at end of file diff --git a/utility/latest-versions.js b/utility/latest-versions.js index b2b71915d..8ccdd684b 100644 --- a/utility/latest-versions.js +++ b/utility/latest-versions.js @@ -15,6 +15,6 @@ exports.latestVersions = { ...dependencies, // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current Angular: dependencies['@angular/core'], - DevkitBuildAngular: '^18.2.0-next.3+sha-6419c2a', - AngularSSR: '^18.2.0-next.3+sha-6419c2a', + DevkitBuildAngular: '^18.2.21+sha-875aa6c', + AngularSSR: '^18.2.21+sha-875aa6c', }; diff --git a/utility/latest-versions/package.json b/utility/latest-versions/package.json index f6e60bec9..29db9cce1 100644 --- a/utility/latest-versions/package.json +++ b/utility/latest-versions/package.json @@ -3,7 +3,7 @@ "comment": "This file is needed so that dependencies are synced by Renovate.", "private": true, "dependencies": { - "@angular/core": "^18.2.0-next.0", + "@angular/core": "^18.2.0", "@types/express": "^4.17.17", "@types/jasmine": "~5.1.0", "@types/node": "^18.18.0", @@ -17,13 +17,13 @@ "karma-jasmine": "~5.1.0", "karma": "~6.4.0", "less": "^4.2.0", - "ng-packagr": "^18.2.0-next.0", + "ng-packagr": "^18.2.0", "postcss": "^8.4.38", "protractor": "~7.0.0", "rxjs": "~7.8.0", "tslib": "^2.3.0", "ts-node": "~10.9.0", "typescript": "~5.5.2", - "zone.js": "~0.14.3" + "zone.js": "~0.14.10" } } diff --git a/workspace/files/__dot__editorconfig.template b/workspace/files/__dot__editorconfig.template index 59d9a3a3e..f166060da 100644 --- a/workspace/files/__dot__editorconfig.template +++ b/workspace/files/__dot__editorconfig.template @@ -10,6 +10,7 @@ trim_trailing_whitespace = true [*.ts] quote_type = single +ij_typescript_use_double_quotes = false [*.md] max_line_length = off