Skip to content

Commit

Permalink
feat: upgrade ng to 18
Browse files Browse the repository at this point in the history
  • Loading branch information
why520crazy authored Aug 19, 2024
1 parent 7d23308 commit 42734b2
Show file tree
Hide file tree
Showing 8 changed files with 2,811 additions and 3,002 deletions.
2 changes: 1 addition & 1 deletion .docgeni/public/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@tethys/store": ["../../packages/store/index.ts"]
}
},
"files": ["src/main.ts", "src/polyfills.ts"],
"files": ["src/main.ts"],
"include": ["src/**/*.d.ts"],
"exclude": ["src/assets", "test.ts"]
}
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x
- name: Setup
run: yarn --frozen-lockfile

Expand Down
56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,40 +27,40 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^17.2.3",
"@angular/cdk": "^17.2.0",
"@angular/common": "^17.2.3",
"@angular/compiler": "^17.2.3",
"@angular/core": "^17.2.3",
"@angular/forms": "^17.2.3",
"@angular/platform-browser": "^17.2.3",
"@angular/platform-browser-dynamic": "^17.2.3",
"@angular/router": "^17.2.3",
"@tethys/cdk": "^17.0.0",
"@angular/animations": "^18.2.0",
"@angular/cdk": "^18.2.0",
"@angular/common": "^18.2.0",
"@angular/compiler": "^18.2.0",
"@angular/core": "^18.2.0",
"@angular/forms": "^18.2.0",
"@angular/platform-browser": "^18.2.0",
"@angular/platform-browser-dynamic": "^18.2.0",
"@angular/router": "^18.2.0",
"@tethys/cdk": "^18.0.0",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"zone.js": "~0.14.4"
"zone.js": "~0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.2.2",
"@angular-eslint/builder": "17.2.1",
"@angular-eslint/eslint-plugin": "17.2.1",
"@angular-eslint/eslint-plugin-template": "17.2.1",
"@angular-eslint/schematics": "17.2.1",
"@angular-eslint/template-parser": "17.2.1",
"@angular/cli": "^17.2.2",
"@angular/compiler-cli": "^17.2.3",
"@angular-devkit/build-angular": "^18.2.0",
"@angular-eslint/builder": "18.3.0",
"@angular-eslint/eslint-plugin": "18.3.0",
"@angular-eslint/eslint-plugin-template": "18.3.0",
"@angular-eslint/schematics": "18.3.0",
"@angular-eslint/template-parser": "18.3.0",
"@angular/cli": "^18.2.0",
"@angular/compiler-cli": "^18.2.0",
"@commitlint/cli": "^12.0.1",
"@commitlint/config-angular": "^12.0.1",
"@docgeni/cli": "^2.2.0",
"@docgeni/template": "^2.2.0",
"@docgeni/cli": "2.3.0",
"@docgeni/template": "2.3.0",
"@types/jasmine": "~3.6.0",
"@types/node": "^20.0.0",
"@typescript-eslint/eslint-plugin": "^5.59.2",
"@typescript-eslint/parser": "^5.59.2",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@worktile/pkg-manager": "0.0.9",
"coveralls": "^3.0.9",
"eslint": "^8.39.0",
"eslint": "^8.57.0",
"husky": "^6.0.0",
"jasmine-core": "~4.5.0",
"jasmine-spec-reporter": "~5.0.0",
Expand All @@ -69,11 +69,11 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"ng-packagr": "^17.2.1",
"prettier": "^2.2.1",
"pretty-quick": "^3.1.0",
"ng-packagr": "^18.2.0",
"prettier": "^3.3.3",
"pretty-quick": "^4.0.0",
"todomvc-app-css": "^2.4.1",
"ts-node": "~8.3.0",
"typescript": "~5.3.3"
"typescript": "~5.5.4"
}
}
8 changes: 4 additions & 4 deletions packages/store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"name": "@tethys/store",
"version": "18.0.0-next.0",
"peerDependencies": {
"@angular/common": "^17.0.0",
"@angular/core": "^17.0.0",
"@tethys/cdk": "^17.0.0"
"@angular/common": "^18.2.0",
"@angular/core": "^18.2.0",
"@tethys/cdk": "^18.0.0"
},
"dependencies": {
"tslib": "^2.0.0",
"@tethys/cdk": "^17.0.0"
"@tethys/cdk": "^18.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/store/test/module.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NgModule, Injector, Injectable } from '@angular/core';
import { async, TestBed } from '@angular/core/testing';
import { waitForAsync, TestBed } from '@angular/core/testing';

import { ThyStoreModule, Store } from '../index';
import { getInjector } from '../internals/static-injector';
Expand Down Expand Up @@ -60,7 +60,7 @@ describe('module', () => {
expect(TestBed.inject(RootStore)).toEqual(getInjector().get(RootStore));
});

it('should initialize all modules state', async(() => {
it('should initialize all modules state', waitForAsync(() => {
TestBed.configureTestingModule({
imports: [RootModule]
});
Expand Down
4 changes: 2 additions & 2 deletions packages/store/test/select.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, Injectable } from '@angular/core';
import { TestBed, async } from '@angular/core/testing';
import { TestBed, waitForAsync } from '@angular/core/testing';
import { Observable } from 'rxjs';
import { ThyStoreModule, Store } from '../index';

Expand Down Expand Up @@ -44,7 +44,7 @@ class StringSelectComponent {
}

describe('select', () => {
it('should select the correct state using string', async(() => {
it('should select the correct state using string', waitForAsync(() => {
TestBed.configureTestingModule({
imports: [ThyStoreModule.forRoot([StringSelectStore])],
declarations: [StringSelectComponent]
Expand Down
2 changes: 1 addition & 1 deletion packages/store/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"outDir": "../../out-tsc/spec",
"types": ["jasmine"]
},
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "**/*.ts"]
}
Loading

0 comments on commit 42734b2

Please sign in to comment.