Skip to content

Commit

Permalink
Angular 15 (#296)
Browse files Browse the repository at this point in the history
* revert Downgrade to angular 13

* feat: update to peer dependencies to 15.x

* fix: don't allow circleci to modify package-lock.json

* feat: fix wordtree type

See: #248

* feat: expand Row interface definition

See #297
  • Loading branch information
oobayly authored Sep 1, 2024
1 parent d30724c commit 20b9a81
Show file tree
Hide file tree
Showing 7 changed files with 24,446 additions and 15,935 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- restore_cache:
keys:
- node-{{ checksum "package-lock.json" }}
- run: npm install
- run: npm install --no-save
- save_cache:
key: node-{{ checksum "package-lock.json" }}
paths:
Expand Down
35 changes: 17 additions & 18 deletions apps/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,27 @@
"name": "playground",
"private": false,
"dependencies": {
"@angular/common": "^14.0.3",
"@angular/compiler": "^14.0.3",
"@angular/core": "^14.0.3",
"@angular/platform-browser": "^14.0.3",
"@angular/platform-browser-dynamic": "^14.0.3",
"@angular/router": "^14.0.3",
"core-js": "^3.23.3",
"rxjs": "^7.5.5",
"tslib": "^2.4.0",
"zone.js": "^0.11.6"
"@angular/common": "^12.0.4",
"@angular/compiler": "^12.0.4",
"@angular/core": "^12.0.4",
"@angular/platform-browser": "^12.0.4",
"@angular/platform-browser-dynamic": "^12.0.4",
"@angular/router": "^12.0.4",
"core-js": "^3.10.1",
"rxjs": "^6.6.7",
"tslib": "^2.2.0",
"zone.js": "^0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^14.0.3",
"@angular-builders/jest": "14.0.0",
"@angular/cli": "^14.0.3",
"@angular/compiler-cli": "^14.0.3",
"@types/node": "^18.0.0",
"codelyzer": "^6.0.2",
"ts-node": "^10.8.1",
"@angular-devkit/build-angular": "^12.0.4",
"@angular/cli": "^12.0.4",
"@angular/compiler-cli": "^12.0.4",
"@types/node": "^12.20.7",
"codelyzer": "^6.0.0",
"ts-node": "^8.10.2",
"tslint": "^6.1.3",
"tslint-angular": "^3.0.3",
"tslint-config-prettier": "^1.18.0",
"typescript": "~4.7.4"
"typescript": "~4.2.4"
}
}
1 change: 0 additions & 1 deletion libs/angular-google-charts/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module.exports = {
preset: 'jest-preset-angular',
setupFilesAfterEnv: ['<rootDir>/src/setup-tests.ts'],
globalSetup: 'jest-preset-angular/global-setup',
resetMocks: true,
globals: {
'ts-jest': {
Expand Down
37 changes: 18 additions & 19 deletions libs/angular-google-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,31 @@
},
"dependencies": {
"@types/google.visualization": "0.0.68",
"tslib": "^2.4.0"
"tslib": "^2.2.0"
},
"peerDependencies": {
"@angular/common": ">=6.0.0 <=14.x.x",
"@angular/core": ">=6.0.0 <=14.x.x"
"@angular/common": ">=6.0.0 <=15.x.x",
"@angular/core": ">=6.0.0 <=15.x.x"
},
"devDependencies": {
"@angular-builders/jest": "14.0.0",
"@angular-devkit/build-angular": "^14.0.3",
"@angular/cli": "^14.0.3",
"@angular/compiler-cli": "^14.0.3",
"@types/jest": "^28.1.3",
"@types/node": "^18.0.0",
"codelyzer": "^6.0.2",
"jest": "28.1.1",
"jest-junit": "^14.0.0",
"jest-preset-angular": "12.1.0",
"ng-packagr": "^14.0.2",
"standard-version": "^9.5.0",
"ts-jest": "28.0.5",
"rxjs": "^7.5.5",
"ts-node": "^10.8.1",
"@angular-builders/jest": "^12.1.0",
"@angular-devkit/build-angular": "^12.0.4",
"@angular/cli": "^12.0.4",
"@angular/compiler-cli": "^12.0.4",
"@types/jest": "^26.0.22",
"@types/node": "^12.20.7",
"codelyzer": "^6.0.0",
"jest": "^27.0.0",
"jest-junit": "^12.2.0",
"jest-preset-angular": "^9.0.3",
"ng-packagr": "^12.0.5",
"standard-version": "^9.2.0",
"ts-jest": "^27.0.0",
"ts-node": "^10.0.0",
"tslint": "^6.1.3",
"tslint-angular": "^3.0.3",
"tslint-config-prettier": "^1.18.0",
"typescript": "~4.7.4"
"typescript": "~4.2.4"
},
"main": "src/index.ts"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
import { ChartErrorEvent, ChartReadyEvent, ChartSelectionChangedEvent } from '../../types/events';

export type Column = string | google.visualization.ColumnSpec;
export type Row = (string | number | Date | null)[];
export type Row = (string | number | Date | { v: string | number | Date | null; f: string | null } | null)[];

export interface ChartBase {
/**
Expand Down
Loading

0 comments on commit 20b9a81

Please sign in to comment.