Skip to content

Commit ef2cf65

Browse files
Ghislain BeaulacGhislain Beaulac
Ghislain Beaulac
authored and
Ghislain Beaulac
committed
Merge branch 'master' of https://github.com/ghiscoding/Angular-Slickgrid into master
2 parents 9825caf + edae737 commit ef2cf65

8 files changed

+42
-47
lines changed

browserslist

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# You can see what browsers were selected by your queries by running:
6+
# npx browserslist
7+
8+
> 0.5%
9+
last 2 versions
10+
Firefox ESR
11+
not dead
12+
not IE 9-11 # For IE 9-11 support, remove 'not'.

package.json

+17-19
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
"."
8484
],
8585
"dest": "dist",
86-
"workingDirectory": ".ng_build",
8786
"lib": {
8887
"entryFile": "src/public_api.ts",
8988
"umdModuleIds": {
@@ -118,19 +117,18 @@
118117
},
119118
"devDependencies": {
120119
"@angular-builders/jest": "^7.4.2",
121-
"@angular-devkit/build-angular": "~0.13.1",
122-
"@angular/animations": "^7.2.15",
123-
"@angular/cli": "^7.3.1",
124-
"@angular/common": "^7.2.15",
125-
"@angular/compiler": "7.2.15",
126-
"@angular/compiler-cli": "7.2.15",
127-
"@angular/core": "^7.2.15",
128-
"@angular/forms": "^7.2.15",
129-
"@angular/http": "^7.2.15",
130-
"@angular/language-service": "^7.2.15",
131-
"@angular/platform-browser": "^7.2.15",
132-
"@angular/platform-browser-dynamic": "^7.2.15",
133-
"@angular/router": "^7.2.15",
120+
"@angular-devkit/build-angular": "~0.803.29",
121+
"@angular/animations": "^8.2.14",
122+
"@angular/cli": "^8.3.29",
123+
"@angular/common": "^8.2.14",
124+
"@angular/compiler": "8.2.14",
125+
"@angular/compiler-cli": "8.2.14",
126+
"@angular/core": "^8.2.14",
127+
"@angular/forms": "^8.2.14",
128+
"@angular/language-service": "^8.2.14",
129+
"@angular/platform-browser": "^8.2.14",
130+
"@angular/platform-browser-dynamic": "^8.2.14",
131+
"@angular/router": "^8.2.14",
134132
"@ng-select/ng-select": "^2.15.3",
135133
"@ngx-translate/core": "^11.0.1",
136134
"@ngx-translate/http-loader": "^4.0.0",
@@ -144,7 +142,7 @@
144142
"babel-jest": "^24.9.0",
145143
"bootstrap": "3.4.1",
146144
"codecov": "^3.7.0",
147-
"codelyzer": "~4.5.0",
145+
"codelyzer": "^5.0.1",
148146
"conventional-changelog": "^3.1.23",
149147
"copyfiles": "^2.3.0",
150148
"core-js": "^2.6.11",
@@ -161,7 +159,7 @@
161159
"jest-extended": "^0.11.5",
162160
"jest-junit": "^6.4.0",
163161
"jest-preset-angular": "^6.0.1",
164-
"ng-packagr": "~5.3.0",
162+
"ng-packagr": "^5.4.0",
165163
"ngx-bootstrap": "^4.3.0",
166164
"node-sass": "4.14.1",
167165
"npm-run-all": "^4.1.5",
@@ -171,13 +169,13 @@
171169
"run-sequence": "^2.2.1",
172170
"standard-version": "^9.0.0",
173171
"ts-node": "~3.3.0",
174-
"tsickle": "^0.34.0",
172+
"tsickle": "^0.37.0",
175173
"tslib": "^2.0.1",
176174
"tslint": "^5.12.0",
177-
"typescript": ">=3.1.1 <3.2.0",
175+
"typescript": "3.5.3",
178176
"uglify-js": "^3.10.2",
179177
"vinyl-paths": "^2.1.0",
180178
"yargs": "^15.4.1",
181-
"zone.js": "^0.8.29"
179+
"zone.js": "~0.9.1"
182180
}
183181
}

src/app/examples/swt-common-grid-test.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export class SwtCommonGridTestComponent implements OnInit, AfterViewInit {
2323
testurl = 'http://127.0.0.1:8080/grid!display.do?';
2424
currentUrl = this.testurl;
2525

26-
@ViewChild('commonGrid1') commonGrid: SwtCommonGridComponent;
27-
@ViewChild('commonGridPag1') commonGridPag: SwtCommonGridPaginationComponent;
26+
@ViewChild('commonGrid1', { static: true }) commonGrid: SwtCommonGridComponent;
27+
@ViewChild('commonGridPag1', { static: true }) commonGridPag: SwtCommonGridPaginationComponent;
2828

2929
private logger: Logger = null;
3030

src/app/examples/swt-common-grid.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class SwtCommonGridComponent implements OnInit, AfterViewInit, BackendSer
5454
gridHeightString: string;
5555
gridWidthString: string;
5656

57-
@ViewChild('angularSlickGrid') angularSlickGrid: AngularSlickgridComponent;
57+
@ViewChild('angularSlickGrid', { static: true }) angularSlickGrid: AngularSlickgridComponent;
5858

5959
columnDefinitions: Column[] = [];
6060
dataset: any[];

src/polyfills.ts

+3-18
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,13 @@
1111
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
1212
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
1313
*
14-
* Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
14+
* Learn more in https://angular.io/guide/browser-support
1515
*/
1616

1717
/***************************************************************************************************
18-
* BROWSER POLYFILLS
19-
*/
18+
* BROWSER POLYFILLS
19+
*/
2020

21-
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
22-
import 'core-js/es6/symbol';
23-
import 'core-js/es6/object';
24-
import 'core-js/es6/function';
25-
import 'core-js/es6/parse-int';
26-
import 'core-js/es6/parse-float';
27-
import 'core-js/es6/number';
28-
import 'core-js/es6/math';
29-
import 'core-js/es6/string';
30-
import 'core-js/es6/date';
31-
import 'core-js/es6/array';
32-
import 'core-js/es6/regexp';
33-
import 'core-js/es6/map';
34-
import 'core-js/es6/weak-map';
35-
import 'core-js/es6/set';
3621

3722
/** IE11 was throwing console errors without these (cannot find "includes") */
3823
import 'core-js/es7/array';

src/tsconfig.app.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"allowSyntheticDefaultImports": true,
55
"outDir": "../out-tsc/app",
66
"baseUrl": "./",
7-
"module": "es2015",
87
"types": [
98
"moment",
109
"jquery"

tsconfig.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"compileOnSave": false,
33
"compilerOptions": {
44
"allowSyntheticDefaultImports": true,
5+
"downlevelIteration": true,
56
"importHelpers": true,
67
"outDir": "./dist/out-tsc",
78
"sourceMap": true,
@@ -13,7 +14,7 @@
1314
"noImplicitReturns": true,
1415
"emitDecoratorMetadata": true,
1516
"experimentalDecorators": true,
16-
"target": "es5",
17+
"target": "es2015",
1718
"typeRoots": [
1819
"node_modules/@types",
1920
"typings"
@@ -22,7 +23,7 @@
2223
"es2017",
2324
"dom"
2425
],
25-
"module": "es2015",
26+
"module": "esnext",
2627
"baseUrl": "./",
2728
"paths": {
2829
"jszip": [

tslint.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@
129129
"app",
130130
"kebab-case"
131131
],
132-
"use-input-property-decorator": true,
133-
"use-output-property-decorator": true,
134-
"use-host-property-decorator": true,
132+
"no-inputs-metadata-property": true,
133+
"no-outputs-metadata-property": true,
134+
"no-host-metadata-property": true,
135135
"no-input-rename": true,
136136
"no-output-rename": false,
137-
"use-life-cycle-interface": true,
137+
"use-lifecycle-interface": true,
138138
"use-pipe-transform-interface": true,
139139
"component-class-suffix": true,
140140
"directive-class-suffix": true,

0 commit comments

Comments
 (0)