Skip to content
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

feat: support angular 18 #513

Merged
merged 4 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
7,060 changes: 3,842 additions & 3,218 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"@ionic/prettier-config": "^2.0.0",
"commitizen": "^4.2.4",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^7.32.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-prettier": "^4.0.0",
"husky": "^7.0.4",
"lerna": "^4.0.0",
"lerna": "^8.1.8",
sean-perkins marked this conversation as resolved.
Show resolved Hide resolved
"prettier": "^2.4.1",
"typescript": "~5.2.0",
"typescript": "~5.4.0",
"typescript-eslint-language-service": "^4.1.3"
},
"config": {
Expand Down
13 changes: 13 additions & 0 deletions packages/cordova-builders/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [12.0.0](https://github.com/ionic-team/angular-toolkit/compare/@ionic/[email protected]...@ionic/[email protected]) (2024-09-01)


### Features

* support angular 18 ([#508](https://github.com/ionic-team/angular-toolkit/issues/508)) ([c002c51](https://github.com/ionic-team/angular-toolkit/commit/c002c51cc09f45639ca97bc5354840d9c384556c))


### BREAKING CHANGES

* The minimum version of Angular required is now 18. Please updates your apps to use
the latest release of Angular.

# [11.0.0](https://github.com/ionic-team/angular-toolkit/compare/@ionic/[email protected]...@ionic/[email protected]) (2024-01-09)


Expand Down
2 changes: 1 addition & 1 deletion packages/cordova-builders/cordova-serve/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type {
DevServerBuilderOptions,
DevServerBuilderOutput,
} from '@angular-devkit/build-angular';
import type { IndexHtmlTransform } from '@angular-devkit/build-angular/src/utils/index-file/index-html-generator';
import type { IndexHtmlTransform } from '@angular/build/src/utils/index-file/index-html-generator';
sean-perkins marked this conversation as resolved.
Show resolved Hide resolved
import { ScriptsWebpackPlugin } from '@angular-devkit/build-angular/src/tools/webpack/plugins';
import type { json } from '@angular-devkit/core';
import * as CopyWebpackPlugin from 'copy-webpack-plugin';
Expand Down
24 changes: 13 additions & 11 deletions packages/cordova-builders/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ionic/cordova-builders",
"version": "11.0.0",
"version": "12.0.0",
"license": "MIT",
"description": "Cordova builders for @ionic/angular apps",
"homepage": "https://ionicframework.com/",
Expand Down Expand Up @@ -35,22 +35,24 @@
"ionicframework"
],
"dependencies": {
"@angular-devkit/architect": "^0.1700.0",
"@angular-devkit/build-angular": "^17.0.0",
"@angular-devkit/core": "^17.0.0",
"@angular-devkit/schematics": "^17.0.0",
"@schematics/angular": "^17.0.0",
"@angular-devkit/architect": "^0.1802.0",
"@angular-devkit/build-angular": "^18.0.0",
"@angular-devkit/core": "^18.0.0",
"@angular-devkit/schematics": "^18.0.0",
"@schematics/angular": "^18.0.0",
"cheerio": "^1.0.0-rc.10",
"colorette": "^2.0.16",
"copy-webpack-plugin": "^9.0.1",
"copy-webpack-plugin": "^12.0.2",
"ws": "^8.2.3"
},
"devDependencies": {
"@types/copy-webpack-plugin": "^8.0.1",
"@types/node": "^16.11.7",
"@types/ws": "^8.2.0",
"lint-staged": "^12.0.2",
"typescript": "~5.2.0"
"@types/ws": "^8.5.12",
"lint-staged": "^15.2.9",
"typescript": "~5.5.4",
"@angular-eslint/builder": "^18.3.0",
"@angular-eslint/eslint-plugin": "^18.0.1"

},
"builders": "./builders.json",
"schematics": "./collection.json",
Expand Down
2 changes: 1 addition & 1 deletion packages/cordova-builders/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export function prepareServerConfig(options: CordovaServeBuilderSchema, root: st
let { input, output, ignore = [], glob } = asset;
input = resolve(root, input).replace(/\\/g, '/');
input = input.endsWith('/') ? input : input + '/';
output = output.endsWith('/') ? output : output + '/';
output = output?.endsWith('/') ? output : output + '/';
sean-perkins marked this conversation as resolved.
Show resolved Hide resolved

return {
context: input,
Expand Down
13 changes: 13 additions & 0 deletions packages/schematics/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [12.0.0](https://github.com/ionic-team/angular-toolkit/compare/@ionic/[email protected]...@ionic/[email protected]) (2024-09-01)


### Features

* support angular 18 ([#508](https://github.com/ionic-team/angular-toolkit/issues/508)) ([c002c51](https://github.com/ionic-team/angular-toolkit/commit/c002c51cc09f45639ca97bc5354840d9c384556c))


### BREAKING CHANGES

* The minimum version of Angular required is now 18. Please updates your apps to use
the latest release of Angular.

## [11.0.1](https://github.com/ionic-team/angular-toolkit/compare/@ionic/[email protected]...@ionic/[email protected]) (2024-01-29)


Expand Down
10 changes: 5 additions & 5 deletions packages/schematics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ionic/angular-toolkit",
"version": "11.0.1",
"version": "12.0.0",
"license": "MIT",
"description": "Schematics for @ionic/angular apps.",
"homepage": "https://ionicframework.com/",
Expand Down Expand Up @@ -30,13 +30,13 @@
"ionicframework"
],
"dependencies": {
"@angular-devkit/core": "^17.0.0",
"@angular-devkit/schematics": "^17.0.0",
"@schematics/angular": "^17.0.0"
"@angular-devkit/core": "^18.0.0",
"@angular-devkit/schematics": "^18.0.0",
"@schematics/angular": "^18.0.0"
},
"devDependencies": {
"lint-staged": "^12.0.2",
"typescript": "~5.2.0"
"typescript": "~5.4.0"
},
"eslintConfig": {
"extends": [
Expand Down