Skip to content

Commit

Permalink
feat(multiple): add support for TypeScript 4.4
Browse files Browse the repository at this point in the history
Updates to the latest version of Angular, TypeScript, Gic and Ionic, and resolves the various build errors.
  • Loading branch information
trik committed Oct 12, 2021
1 parent 90e4539 commit 417b470
Show file tree
Hide file tree
Showing 9 changed files with 182 additions and 247 deletions.
1 change: 0 additions & 1 deletion integration/ts-compat/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ write_file(
# List of TypeScript packages that we want to run the compatibility test against.
# The list contains NPM module names that resolve to the desired TypeScript version.
typescript_version_packages = [
"typescript-4.2",
"typescript",
]

Expand Down
55 changes: 27 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,21 @@
"i18n:extract": "transloco-keys-manager extract",
"i18n:find": "transloco-keys-manager find"
},
"version": "13.0.0-next.2",
"version": "13.0.0-next.8",
"dependencies": {
"@ajf/icons": "^1.0.0",
"@angular/animations": "13.0.0-next.2",
"@angular/cdk": "13.0.0-next.2",
"@angular/common": "13.0.0-next.2",
"@angular/compiler": "13.0.0-next.2",
"@angular/core": "13.0.0-next.2",
"@angular/forms": "13.0.0-next.2",
"@angular/material": "13.0.0-next.2",
"@angular/platform-browser": "13.0.0-next.2",
"@gic/angular": "^5.6.1",
"@gic/core": "^5.6.1",
"@ionic/angular": "^5.6.0",
"@ionic/core": "^5.6.0",
"@angular/animations": "13.0.0-next.8",
"@angular/cdk": "13.0.0-next.8",
"@angular/common": "13.0.0-next.8",
"@angular/compiler": "13.0.0-next.8",
"@angular/core": "13.0.0-next.8",
"@angular/forms": "13.0.0-next.8",
"@angular/material": "13.0.0-next.8",
"@angular/platform-browser": "13.0.0-next.8",
"@gic/angular": "5.8.1",
"@gic/core": "5.8.1",
"@ionic/angular": "5.8.1",
"@ionic/core": "5.8.1",
"@ngneat/transloco": "^2.21.0",
"@webcomponents/custom-elements": "^1.1.0",
"@zxing/browser": "^0.0.9",
Expand All @@ -83,21 +83,21 @@
"rxjs": "^6.5.3",
"rxjs-tslint-rules": "^4.33.1",
"systemjs": "0.19.43",
"tslib": "^2.2.0",
"tslib": "^2.3.0",
"xlsx": "^0.17.0",
"zone.js": "~0.11.3"
},
"devDependencies": {
"@angular-devkit/build-optimizer": "0.1300.0-next.1",
"@angular-devkit/core": "13.0.0-next.1",
"@angular-devkit/schematics": "13.0.0-next.1",
"@angular/bazel": "13.0.0-next.2",
"@angular/compiler-cli": "13.0.0-next.2",
"@angular-devkit/build-optimizer": "0.1300.0-next.6",
"@angular-devkit/core": "13.0.0-next.6",
"@angular-devkit/schematics": "13.0.0-next.6",
"@angular/bazel": "13.0.0-next.8",
"@angular/compiler-cli": "13.0.0-next.8",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#16ccdd6316d72bfdaa9f95148b6918d22c0a3471",
"@angular/localize": "13.0.0-next.2",
"@angular/platform-browser-dynamic": "13.0.0-next.2",
"@angular/platform-server": "13.0.0-next.2",
"@angular/router": "13.0.0-next.2",
"@angular/localize": "13.0.0-next.8",
"@angular/platform-browser-dynamic": "13.0.0-next.8",
"@angular/platform-server": "13.0.0-next.8",
"@angular/router": "13.0.0-next.8",
"@axe-core/webdriverjs": "^4.1.0",
"@babel/core": "^7.13.10",
"@babel/traverse": "^7.13.0",
Expand All @@ -116,7 +116,7 @@
"@octokit/rest": "18.3.5",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^18.0.0",
"@schematics/angular": "13.0.0-next.1",
"@schematics/angular": "13.0.0-next.6",
"@types/browser-sync": "^2.26.1",
"@types/chart.js": "^2.9.22",
"@types/esprima": "^4.0.2",
Expand Down Expand Up @@ -198,15 +198,14 @@
"tsickle": "0.39.1",
"tslint": "^6.1.3",
"tsutils": "^3.21.0",
"typescript": "~4.3.2",
"typescript-4.2": "npm:typescript@4.2.3",
"typescript": "~4.4.2",
"vrsource-tslint-rules": "6.0.0",
"yaml": "^1.10.0"
},
"resolutions": {
"@angular/dev-infra-private/typescript": "~4.3.2",
"@angular/dev-infra-private/typescript": "~4.4.2",
"browser-sync-client": "2.26.13",
"dgeni-packages/typescript": "4.3.2",
"dgeni-packages/typescript": "4.4.2",
"**/https-proxy-agent": "5.0.0"
}
}
2 changes: 1 addition & 1 deletion packages.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PDFMAKE_PACKAGE_VERSION = "^0.1.68"
QUILL_PACKAGE_VERSION = "^1.3.7"
RESIZE_OBSERVER_TYPES_PACKAGE_VERSION = "^0.1.5"
RXJS_PACKAGE_VERSION = "^6.5.3"
TSLIB_PACKAGE_VERSION = "^2.2.0"
TSLIB_PACKAGE_VERSION = "^2.3.0"
XLSX_PACKAGE_VERSION = "^0.17.0"
ZXINGB_PACKAGE_VERSION = "^0.0.9"
ZXINGL_PACKAGE_VERSION = "^0.18.6"
Expand Down
2 changes: 1 addition & 1 deletion src/core/common/video.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class AjfVideoDirective implements AfterViewInit {
(this._source as any).srcObject = stream;
(this._source as any).play();
})
.catch((err: MediaStreamError) => {
.catch((err: any) => {
console.log(err);
});
}
Expand Down
9 changes: 0 additions & 9 deletions src/core/forms/get-type-name.spec.ts

This file was deleted.

34 changes: 0 additions & 34 deletions src/core/forms/get-type-name.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/core/forms/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export * from './form-renderer';
export * from './form-string-identifier';
export * from './forms-module';
export * from './get-table-cell-control';
export * from './get-type-name';
export * from './increment';
export * from './input-field';
export * from './image-field';
Expand Down
3 changes: 0 additions & 3 deletions tools/public_api_guard/core/forms.md
Original file line number Diff line number Diff line change
Expand Up @@ -1343,9 +1343,6 @@ export function fieldIconName(type: AjfFieldType): string;
// @public
export function flattenNodes(nodes: AjfNode[]): AjfNode[];

// @public
export function getTypeName(v: any): string;

// @public
export function initChoicesOrigin(origin: AjfChoicesOrigin<any>): Promise<void>;

Expand Down

0 comments on commit 417b470

Please sign in to comment.