From c9220796705894b1cb9a356be85c6d0f4c2b816e Mon Sep 17 00:00:00 2001 From: Daniel Schreiber Date: Tue, 14 May 2024 22:22:14 +0200 Subject: [PATCH 1/2] feat: support angular 18 --- .github/workflows/node.js.yml | 6 +++++- package.json | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 326fe5d..9a2ebe3 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -16,11 +16,12 @@ jobs: strategy: matrix: node-version: [14.x, 16.x, 18.x, 20.x] - angular-version: [13.2.6, 14.0.2, 15.0.3, 16.2.1, 17.0.0] + angular-version: [13.2.6, 14.0.2, 15.0.3, 16.2.1, 17.0.0, 18.0.0-rc.1] exclude: - node-version: 18.x - node-version: 20.x - angular-version: 17.0.0 + - angular-version: 18.0.0-rc.1 include: - angular-version: 13.2.6 devkit-version: 0.1302.6 @@ -39,6 +40,9 @@ jobs: - angular-version: 17.0.0 devkit-version: 0.1700.0 node-version: 20.x + - angular-version: 18.0.0-rc.1 + devkit-version: 0.1800.0-rc.1 + node-version: 20.x steps: - uses: actions/checkout@v2 diff --git a/package.json b/package.json index 0125b54..723e911 100644 --- a/package.json +++ b/package.json @@ -36,14 +36,14 @@ }, "homepage": "https://github.com/daniel-sc/ng-extract-i18n-merge#readme", "dependencies": { - "@angular-devkit/architect": "^0.1301.0 || ^0.1401.0 || ^0.1501.0 || ^0.1601.0 || ^0.1700.0", - "@angular-devkit/core": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", - "@angular-devkit/schematics": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", - "@schematics/angular": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", + "@angular-devkit/architect": "^0.1301.0 || ^0.1401.0 || ^0.1501.0 || ^0.1601.0 || ^0.1700.0 || ^0.1800.0", + "@angular-devkit/core": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", + "@angular-devkit/schematics": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", + "@schematics/angular": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "xmldoc": "^1.1.3" }, "peerDependencies": { - "@angular-devkit/build-angular": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" + "@angular-devkit/build-angular": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@types/jest": "^28.1.8 || ^29.0.0", From 1d15e2bcf9a666e0c15a078651ee4265d282be0e Mon Sep 17 00:00:00 2001 From: Daniel Schreiber Date: Wed, 22 May 2024 16:37:08 +0200 Subject: [PATCH 2/2] fix: testing with angular 18-rc.3 --- .github/workflows/node.js.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 9a2ebe3..3bebf4f 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -16,12 +16,12 @@ jobs: strategy: matrix: node-version: [14.x, 16.x, 18.x, 20.x] - angular-version: [13.2.6, 14.0.2, 15.0.3, 16.2.1, 17.0.0, 18.0.0-rc.1] + angular-version: [13.2.6, 14.0.2, 15.0.3, 16.2.1, 17.0.0, 18.0.0-rc.3] exclude: - node-version: 18.x - node-version: 20.x - angular-version: 17.0.0 - - angular-version: 18.0.0-rc.1 + - angular-version: 18.0.0-rc.3 include: - angular-version: 13.2.6 devkit-version: 0.1302.6 @@ -40,8 +40,8 @@ jobs: - angular-version: 17.0.0 devkit-version: 0.1700.0 node-version: 20.x - - angular-version: 18.0.0-rc.1 - devkit-version: 0.1800.0-rc.1 + - angular-version: 18.0.0-rc.3 + devkit-version: 0.1800.0-rc.3 node-version: 20.x steps: