Skip to content

Commit

Permalink
Merge pull request #27 from GordonSmith/TSC_3_6
Browse files Browse the repository at this point in the history
chore(build): Bump typescript to version 3.6.4
  • Loading branch information
Steven Silvester authored Dec 11, 2019
2 parents 464aac1 + f15ffe0 commit cff0fbe
Show file tree
Hide file tree
Showing 50 changed files with 118 additions and 89 deletions.
2 changes: 1 addition & 1 deletion examples/example-datagrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"file-loader": "^0.11.1",
"rimraf": "^2.5.2",
"style-loader": "^0.13.1",
"typescript": "~3.0.3",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
}
}
2 changes: 1 addition & 1 deletion examples/example-datagrid/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"moduleResolution": "node",
"target": "ES5",
"outDir": "./build",
"lib": ["ES5", "ES2015.Promise", "DOM"],
"lib": ["ES5", "ES2015.Promise", "ES2015.Iterable", "DOM"],
"types": []
},
"include": ["src/*"]
Expand Down
2 changes: 1 addition & 1 deletion examples/example-datastore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"file-loader": "^0.11.1",
"rimraf": "^2.5.2",
"style-loader": "^0.13.1",
"typescript": "~3.3.1",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/example-datastore/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ async function init(): Promise<void> {
commands.addCommand('undo', {
label: 'Undo',
execute: () => {
let editor = ArrayExt.findFirstValue([e1, e2, e3], e => e.hasFocus());
let editor = ArrayExt.findFirstValue([e1, e2, e3], (e: CodeMirrorEditor) => e.hasFocus());
if (editor) {
editor.undo();
}
Expand All @@ -97,7 +97,7 @@ async function init(): Promise<void> {
commands.addCommand('redo', {
label: 'Redo',
execute: () => {
let editor = ArrayExt.findFirstValue([e1, e2, e3], e => e.hasFocus());
let editor = ArrayExt.findFirstValue([e1, e2, e3], (e: CodeMirrorEditor) => e.hasFocus());
if (editor) {
editor.redo();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/example-datastore/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"moduleResolution": "node",
"target": "ES5",
"outDir": "./build",
"lib": ["ES5", "es2015.collection", "DOM", "ES2015.Promise"],
"lib": ["ES5", "es2015.collection", "DOM", "ES2015.Promise","ES2015.Iterable"],
"types": []
},
"include": ["src/*"]
Expand Down
2 changes: 1 addition & 1 deletion examples/example-dockpanel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"file-loader": "^0.11.1",
"rimraf": "^2.5.2",
"style-loader": "^0.13.1",
"typescript": "~3.0.3",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
}
}
2 changes: 1 addition & 1 deletion examples/example-dockpanel/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"moduleResolution": "node",
"target": "ES5",
"outDir": "./build",
"lib": ["ES5", "ES2015.Promise", "DOM"],
"lib": ["ES5", "ES2015.Promise", "ES2015.Iterable", "DOM"],
"types": []
},
"include": ["src/*"]
Expand Down
6 changes: 3 additions & 3 deletions packages/algorithm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"api": "api-extractor run --local --verbose",
"build": "tsc --build",
"build:test": "tsc --build tests && cd tests && webpack",
"clean": "rimraf lib",
"clean": "rimraf lib && rimraf *.tsbuildinfo",
"clean:test": "rimraf tests/build",
"docs": "typedoc --options tdoptions.json src",
"test": "npm run test:firefox",
Expand All @@ -52,8 +52,8 @@
"karma-mocha-reporter": "^2.2.2",
"mocha": "^3.2.0",
"rimraf": "^2.5.2",
"typedoc": "~0.12.0",
"typescript": "~3.0.3",
"typedoc": "~0.15.0",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
},
"publishConfig": {
Expand Down
3 changes: 2 additions & 1 deletion packages/algorithm/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"outDir": "lib",
"lib": [
"ES5",
"ES2015.Collection"
"ES2015.Collection",
"ES2015.Iterable"
],
"types": [],
"rootDir": "src"
Expand Down
4 changes: 2 additions & 2 deletions packages/application/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"karma-mocha-reporter": "^2.2.2",
"mocha": "^3.2.0",
"rimraf": "^2.5.2",
"typedoc": "~0.12.0",
"typescript": "~3.0.3",
"typedoc": "~0.15.0",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
},
"publishConfig": {
Expand Down
1 change: 1 addition & 0 deletions packages/application/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"ES5",
"ES2015.Collection",
"ES2015.Promise",
"ES2015.Iterable",
"DOM"
],
"types": [],
Expand Down
6 changes: 3 additions & 3 deletions packages/collections/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"api": "api-extractor run --local --verbose",
"build": "tsc --build",
"build:test": "tsc --build tests && cd tests && webpack",
"clean": "rimraf lib",
"clean": "rimraf lib && rimraf *.tsbuildinfo",
"clean:test": "rimraf tests/build",
"docs": "typedoc --options tdoptions.json src",
"test": "npm run test:firefox",
Expand All @@ -56,8 +56,8 @@
"karma-mocha-reporter": "^2.2.2",
"mocha": "^3.2.0",
"rimraf": "^2.5.2",
"typedoc": "~0.12.0",
"typescript": "~3.0.3",
"typedoc": "~0.15.0",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
},
"publishConfig": {
Expand Down
6 changes: 3 additions & 3 deletions packages/commands/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"api": "api-extractor run --local --verbose",
"build": "tsc --build",
"build:test": "tsc --build tests && cd tests && webpack",
"clean": "rimraf lib",
"clean": "rimraf lib && rimraf *.tsbuildinfo",
"clean:test": "rimraf tests/build",
"docs": "typedoc --options tdoptions.json src",
"test": "npm run test:firefox",
Expand Down Expand Up @@ -63,8 +63,8 @@
"mocha": "^3.2.0",
"rimraf": "^2.5.2",
"simulate-event": "^1.4.0",
"typedoc": "~0.12.0",
"typescript": "~3.0.3",
"typedoc": "~0.15.0",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/commands/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,7 @@ namespace Private {
return dfault;
}
if (typeof value === 'function') {
return value;
return value as CommandFunc<T>;
}
return () => value;
}
Expand Down
1 change: 1 addition & 0 deletions packages/commands/tests/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"lib": [
"ES5",
"ES2015.Promise",
"ES2015.Iterable",
"DOM"
],
"types": [
Expand Down
1 change: 1 addition & 0 deletions packages/commands/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"lib": [
"ES5",
"ES2015.Promise",
"ES2015.Iterable",
"DOM"
],
"types": [],
Expand Down
6 changes: 3 additions & 3 deletions packages/coreutils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"api": "api-extractor run --local --verbose",
"build": "tsc --build",
"build:test": "tsc --build tests && cd tests && webpack",
"clean": "rimraf lib",
"clean": "rimraf lib && rimraf *.tsbuildinfo",
"clean:test": "rimraf tests/build",
"docs": "typedoc --options tdoptions.json src",
"test": "npm run test:firefox",
Expand All @@ -54,8 +54,8 @@
"karma-mocha-reporter": "^2.2.2",
"mocha": "^3.2.0",
"rimraf": "^2.5.2",
"typedoc": "~0.12.0",
"typescript": "~3.0.3",
"typedoc": "~0.15.0",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
},
"publishConfig": {
Expand Down
3 changes: 2 additions & 1 deletion packages/coreutils/tests/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"outDir": "build",
"lib": [
"ES5",
"ES2015.Promise"
"ES2015.Promise",
"ES2015.Iterable"
],
"types": [
"chai",
Expand Down
3 changes: 2 additions & 1 deletion packages/coreutils/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"outDir": "lib",
"lib": [
"ES5",
"ES2015.Promise"
"ES2015.Promise",
"ES2015.Iterable"
],
"types": [],
"rootDir": "src"
Expand Down
6 changes: 3 additions & 3 deletions packages/datagrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"scripts": {
"api": "api-extractor run --local --verbose",
"build": "tsc --build",
"clean": "rimraf lib",
"clean": "rimraf lib && rimraf *.tsbuildinfo",
"docs": "typedoc --options tdoptions.json src",
"watch": "tsc --build --watch"
},
Expand All @@ -46,8 +46,8 @@
},
"devDependencies": {
"rimraf": "^2.5.2",
"typedoc": "~0.12.0",
"typescript": "~3.0.3"
"typedoc": "~0.15.0",
"typescript": "~3.6.4"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/datagrid/src/cellrenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,6 @@ namespace CellRenderer {
*/
export
function resolveOption<T>(option: ConfigOption<T>, config: CellConfig): T {
return typeof option === 'function' ? option(config) : option;
return typeof option === 'function' ? (option as ConfigFunc<T>)(config) : option;
}
}
18 changes: 9 additions & 9 deletions packages/datagrid/src/graphicscontext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,33 +94,33 @@ class GraphicsContext implements IDisposable {
}
}

get textAlign(): string {
get textAlign(): CanvasTextAlign {
return this._context.textAlign;
}

set textAlign(value: string) {
set textAlign(value: CanvasTextAlign) {
if (this._state.textAlign !== value) {
this._state.textAlign = value;
this._context.textAlign = value;
}
}

get textBaseline(): string {
get textBaseline(): CanvasTextBaseline {
return this._context.textBaseline;
}

set textBaseline(value: string) {
set textBaseline(value: CanvasTextBaseline) {
if (this._state.textBaseline !== value) {
this._state.textBaseline = value;
this._context.textBaseline = value;
}
}

get lineCap(): string {
get lineCap(): CanvasLineCap {
return this._context.lineCap;
}

set lineCap(value: string) {
set lineCap(value: CanvasLineCap) {
if (this._state.lineCap !== value) {
this._state.lineCap = value;
this._context.lineCap = value;
Expand All @@ -138,11 +138,11 @@ class GraphicsContext implements IDisposable {
}
}

get lineJoin(): string {
get lineJoin(): CanvasLineJoin {
return this._context.lineJoin;
}

set lineJoin(value: string) {
set lineJoin(value: CanvasLineJoin) {
if (this._state.lineJoin !== value) {
this._state.lineJoin = value;
this._context.lineJoin = value;
Expand Down Expand Up @@ -415,7 +415,7 @@ class GraphicsContext implements IDisposable {
return this._context.createRadialGradient(x0, y0, r0, x1, y1, r1);
}

createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern {
createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern | null {
return this._context.createPattern(image, repetition);
}

Expand Down
3 changes: 2 additions & 1 deletion packages/datagrid/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"outDir": "lib",
"lib": [
"ES5",
"DOM"
"DOM",
"ES2015.Iterable"
],
"types": [],
"rootDir": "src"
Expand Down
4 changes: 2 additions & 2 deletions packages/datastore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"scripts": {
"api": "api-extractor run --local --verbose",
"build": "tsc --build",
"clean": "rimraf lib",
"clean": "rimraf lib && rimraf *.tsbuildinfo",
"docs": "typedoc --options tdoptions.json src",
"test": "npm run test:firefox",
"test:chrome": "cd tests && karma start --browsers=Chrome",
Expand All @@ -51,7 +51,7 @@
"devDependencies": {
"rimraf": "^2.5.2",
"typedoc": "~0.15.0",
"typescript": "~3.5.1"
"typescript": "~3.6.4"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/datastore/tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"karma-mocha": "^1.3.0",
"karma-mocha-reporter": "^2.2.2",
"rimraf": "^2.5.2",
"typescript": "~3.0.3",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
},
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions packages/disposable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"api": "api-extractor run --local --verbose",
"build": "tsc --build",
"build:test": "tsc --build tests && cd tests && webpack",
"clean": "rimraf lib",
"clean": "rimraf lib && rimraf *.tsbuildinfo",
"clean:test": "rimraf tests/build",
"docs": "typedoc --options tdoptions.json src",
"test": "npm run test:firefox",
Expand All @@ -57,8 +57,8 @@
"karma-mocha-reporter": "^2.2.2",
"mocha": "^3.2.0",
"rimraf": "^2.5.2",
"typedoc": "~0.12.0",
"typescript": "~3.0.3",
"typedoc": "~0.15.0",
"typescript": "~3.6.4",
"webpack": "^2.2.1"
},
"publishConfig": {
Expand Down
3 changes: 2 additions & 1 deletion packages/disposable/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"outDir": "lib",
"lib": [
"ES5",
"ES2015.Collection"
"ES2015.Collection",
"ES2015.Iterable"
],
"types": []
},
Expand Down
Loading

0 comments on commit cff0fbe

Please sign in to comment.