Skip to content

Commit 2e0be43

Browse files
ghiscodingghiscoding
authored
Merge pull request #8 from ghiscoding/feat/angular12
Feat/angular12
2 parents e3079e9 + d6eb986 commit 2e0be43

File tree

19 files changed

+107
-97
lines changed

19 files changed

+107
-97
lines changed

‎bootstrap4-demo-with-locales/.browserslistrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ last 2 version
44
> 1%
55
maintained node versions
66
not dead
7-
IE 11
7+
not IE 11
88

‎bootstrap4-demo-with-locales/angular.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14-
"aot": true,
1514
"outputPath": "dist",
1615
"index": "src/index.html",
1716
"main": "src/main.ts",
1817
"tsConfig": "src/tsconfig.app.json",
1918
"showCircularDependencies": true,
2019
"polyfills": "src/polyfills.ts",
2120
"allowedCommonJsDependencies": [
22-
"angular-slickgrid"
21+
"angular-slickgrid",
22+
"excel-builder-webpacker",
23+
"stream"
2324
],
2425
"assets": [
2526
"src/assets",
@@ -59,7 +60,13 @@
5960
"node_modules/slickgrid/lib/jquery.event.drag-2.3.0.js",
6061
"node_modules/bootstrap/dist/js/bootstrap.js",
6162
"node_modules/angular-slickgrid/lib/multiple-select/multiple-select.js"
62-
]
63+
],
64+
"vendorChunk": true,
65+
"extractLicenses": false,
66+
"buildOptimizer": false,
67+
"sourceMap": true,
68+
"optimization": false,
69+
"namedChunks": true
6370
},
6471
"configurations": {
6572
"production": {
@@ -73,7 +80,6 @@
7380
"outputHashing": "all",
7481
"sourceMap": false,
7582
"namedChunks": false,
76-
"aot": true,
7783
"extractLicenses": true,
7884
"vendorChunk": false,
7985
"buildOptimizer": true,
@@ -84,7 +90,8 @@
8490
}
8591
]
8692
}
87-
}
93+
},
94+
"defaultConfiguration": ""
8895
},
8996
"serve": {
9097
"builder": "@angular-devkit/build-angular:dev-server",

‎bootstrap4-demo-with-locales/package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"ng": "ng",
77
"start": "ng serve --port 4400",
8-
"build": "ng build --prod",
8+
"build": "ng build --configuration production",
99
"test": "ng test",
1010
"lint": "ng lint",
1111
"e2e": "ng e2e",
@@ -15,15 +15,15 @@
1515
},
1616
"private": false,
1717
"dependencies": {
18-
"@angular/animations": "^11.2.3",
19-
"@angular/common": "^11.2.3",
20-
"@angular/compiler": "^11.2.3",
21-
"@angular/core": "^11.2.3",
22-
"@angular/forms": "^11.2.3",
23-
"@angular/platform-browser": "^11.2.3",
24-
"@angular/platform-browser-dynamic": "^11.2.3",
25-
"@angular/router": "^11.2.3",
26-
"@ng-select/ng-select": "^5.0.3",
18+
"@angular/animations": "^12.1.1",
19+
"@angular/common": "^12.1.1",
20+
"@angular/compiler": "^12.1.1",
21+
"@angular/core": "^12.1.1",
22+
"@angular/forms": "^12.1.1",
23+
"@angular/platform-browser": "^12.1.1",
24+
"@angular/platform-browser-dynamic": "^12.1.1",
25+
"@angular/router": "^12.1.1",
26+
"@ng-select/ng-select": "^7.1.1",
2727
"angular-slickgrid": "^2.30.2",
2828
"bootstrap": "^4.6.0",
2929
"copyfiles": "^2.2.0",
@@ -35,15 +35,16 @@
3535
"moment": "^2.29.1",
3636
"ngx-bootstrap": "^4.3.0",
3737
"rxjs": "^6.3.3",
38+
"stream-browserify": "^3.0.0",
3839
"text-encoding-utf-8": "^1.0.2",
3940
"tslib": "^2.0.0",
40-
"zone.js": "~0.10.2"
41+
"zone.js": "~0.11.4"
4142
},
4243
"devDependencies": {
43-
"@angular-devkit/build-angular": "~0.1100.7",
44-
"@angular/cli": "^11.2.2",
45-
"@angular/compiler-cli": "^11.2.3",
46-
"@angular/language-service": "^11.2.3",
44+
"@angular-devkit/build-angular": "~12.1.1",
45+
"@angular/cli": "^12.1.1",
46+
"@angular/compiler-cli": "^12.1.1",
47+
"@angular/language-service": "^12.1.1",
4748
"@ngx-translate/core": "^13.0.0",
4849
"@types/jasmine": "~3.6.4",
4950
"@types/jasminewd2": "~2.0.8",
@@ -53,7 +54,7 @@
5354
"del-cli": "^1.1.0",
5455
"jasmine-core": "~3.6.0",
5556
"jasmine-spec-reporter": "~6.0.0",
56-
"karma": "~5.1.1",
57+
"karma": "~6.3.4",
5758
"karma-chrome-launcher": "~3.1.0",
5859
"karma-cli": "~2.0.0",
5960
"karma-coverage-istanbul-reporter": "~3.0.2",
@@ -64,6 +65,6 @@
6465
"sass": "^1.32.8",
6566
"ts-node": "~8.0.2",
6667
"tslint": "~6.1.0",
67-
"typescript": "~4.0.3"
68+
"typescript": "~4.3.5"
6869
}
6970
}

‎bootstrap4-demo-with-locales/src/app/examples/grid-colspan.component.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ <h3>Grid 1 <small>(with Header Grouping &amp; Colspan)</small></h3>
1515

1616
<h3>Grid 2 <small>(with Header Grouping &amp; Frozen/Pinned Columns)</small></h3>
1717
<div class="col-sm 12">
18-
<button class="btn btn-outline-secondary btn-sm" (click)="setFrozenColumns2(-1)" data-test="remove-frozen-column-button">
18+
<button class="btn btn-outline-secondary btn-sm" (click)="setFrozenColumns2(-1)"
19+
data-test="remove-frozen-column-button">
1920
<i class="fa fa-times fa-lg"></i> Remove Frozen Columns
2021
</button>
2122
<button class="btn btn-outline-secondary btn-sm" (click)="setFrozenColumns2(2)" data-test="set-3frozen-columns">
@@ -27,6 +28,7 @@ <h3>Grid 2 <small>(with Header Grouping &amp; Frozen/Pinned Columns)</small></h3
2728
[gridOptions]="gridOptions2"
2829
[dataset]="dataset2"
2930
gridHeight="275"
30-
gridWidth="800">
31+
gridWidth="800"
32+
(onAngularGridCreated)="angularGridReady2($event)">
3133
</angular-slickgrid>
32-
</div>
34+
</div>

‎bootstrap4-demo-with-locales/src/polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import 'custom-event-polyfill'; // npm install custom-event-polyfill
5555
/***************************************************************************************************
5656
* Zone JS is required by Angular itself.
5757
*/
58-
import 'zone.js/dist/zone'; // Included with Angular CLI.
58+
import 'zone.js'; // Included with Angular CLI.
5959

6060

6161

‎bootstrap4-demo-with-locales/src/tsconfig.app.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"paths": {
77
"jszip": [
88
"../node_modules/jszip/dist/jszip.min.js"
9+
],
10+
"stream": [
11+
"./node_modules/stream-browserify"
912
]
1013
},
1114
"types": []

‎bootstrap4-demo-with-locales/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"sourceMap": true,
99
"declaration": false,
1010
"moduleResolution": "node",
11-
"emitDecoratorMetadata": true,
1211
"experimentalDecorators": true,
1312
"target": "es2015",
1413
"typeRoots": [

‎bootstrap4-demo-with-translate/.browserslistrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ last 2 version
44
> 1%
55
maintained node versions
66
not dead
7-
IE 11
8-
7+
not IE 11

‎bootstrap4-demo-with-translate/angular.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14-
"aot": true,
1514
"outputPath": "dist",
1615
"index": "src/index.html",
1716
"main": "src/main.ts",
1817
"tsConfig": "src/tsconfig.app.json",
1918
"showCircularDependencies": true,
2019
"polyfills": "src/polyfills.ts",
2120
"allowedCommonJsDependencies": [
22-
"angular-slickgrid"
21+
"angular-slickgrid",
22+
"excel-builder-webpacker",
23+
"stream"
2324
],
2425
"assets": [
2526
"src/assets",
@@ -59,7 +60,13 @@
5960
"node_modules/slickgrid/lib/jquery.event.drag-2.3.0.js",
6061
"node_modules/bootstrap/dist/js/bootstrap.js",
6162
"node_modules/angular-slickgrid/lib/multiple-select/multiple-select.js"
62-
]
63+
],
64+
"vendorChunk": true,
65+
"extractLicenses": false,
66+
"buildOptimizer": false,
67+
"sourceMap": true,
68+
"optimization": false,
69+
"namedChunks": true
6370
},
6471
"configurations": {
6572
"development": {
@@ -69,14 +76,8 @@
6976
"maximumWarning": "150kb"
7077
}
7178
],
72-
"optimization": false,
7379
"outputHashing": "all",
74-
"sourceMap": true,
75-
"namedChunks": true,
76-
"aot": true,
7780
"extractLicenses": true,
78-
"vendorChunk": true,
79-
"buildOptimizer": false,
8081
"fileReplacements": [
8182
{
8283
"replace": "src/environments/environment.ts",
@@ -93,20 +94,17 @@
9394
],
9495
"optimization": true,
9596
"outputHashing": "all",
96-
"sourceMap": true,
97-
"namedChunks": true,
9897
"aot": false,
9998
"extractLicenses": true,
100-
"vendorChunk": true,
101-
"buildOptimizer": false,
10299
"fileReplacements": [
103100
{
104101
"replace": "src/environments/environment.ts",
105102
"with": "src/environments/environment.prod.ts"
106103
}
107104
]
108105
}
109-
}
106+
},
107+
"defaultConfiguration": ""
110108
},
111109
"serve": {
112110
"builder": "@angular-devkit/build-angular:dev-server",

‎bootstrap4-demo-with-translate/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
},
1414
"private": false,
1515
"dependencies": {
16-
"@angular/animations": "^11.2.3",
17-
"@angular/common": "^11.2.3",
18-
"@angular/compiler": "^11.2.3",
19-
"@angular/core": "^11.2.3",
20-
"@angular/forms": "^11.2.3",
21-
"@angular/platform-browser": "^11.2.3",
22-
"@angular/platform-browser-dynamic": "^11.2.3",
23-
"@angular/router": "^11.2.3",
24-
"@ng-select/ng-select": "^5.0.3",
16+
"@angular/animations": "^12.1.1",
17+
"@angular/common": "^12.1.1",
18+
"@angular/compiler": "^12.1.1",
19+
"@angular/core": "^12.1.1",
20+
"@angular/forms": "^12.1.1",
21+
"@angular/platform-browser": "^12.1.1",
22+
"@angular/platform-browser-dynamic": "^12.1.1",
23+
"@angular/router": "^12.1.1",
24+
"@ng-select/ng-select": "^7.1.1",
2525
"@ngx-translate/core": "^13.0.0",
2626
"@ngx-translate/http-loader": "^6.0.0",
2727
"angular-slickgrid": "^2.30.2",
@@ -37,13 +37,13 @@
3737
"rxjs": "^6.3.3",
3838
"text-encoding-utf-8": "^1.0.2",
3939
"tslib": "^2.0.0",
40-
"zone.js": "~0.10.2"
40+
"zone.js": "~0.11.4"
4141
},
4242
"devDependencies": {
43-
"@angular-devkit/build-angular": "~0.1100.7",
44-
"@angular/cli": "^11.2.2",
45-
"@angular/compiler-cli": "^11.2.3",
46-
"@angular/language-service": "^11.2.3",
43+
"@angular-devkit/build-angular": "~12.1.1",
44+
"@angular/cli": "^12.1.1",
45+
"@angular/compiler-cli": "^12.1.1",
46+
"@angular/language-service": "^12.1.1",
4747
"@types/jasmine": "~3.6.4",
4848
"@types/jasminewd2": "~2.0.8",
4949
"@types/jquery": "^3.5.5",
@@ -52,7 +52,7 @@
5252
"del-cli": "^1.1.0",
5353
"jasmine-core": "~3.6.0",
5454
"jasmine-spec-reporter": "~6.0.0",
55-
"karma": "~6.1.1",
55+
"karma": "~6.3.4",
5656
"karma-chrome-launcher": "~3.1.0",
5757
"karma-cli": "~2.0.0",
5858
"karma-coverage-istanbul-reporter": "~3.0.3",
@@ -63,6 +63,6 @@
6363
"protractor": "~7.0.0",
6464
"ts-node": "~7.0.1",
6565
"tslint": "~6.1.0",
66-
"typescript": "~4.0.3"
66+
"typescript": "~4.3.5"
6767
}
68-
}
68+
}

‎bootstrap4-demo-with-translate/src/polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import 'custom-event-polyfill'; // npm install custom-event-polyfill
5555
/***************************************************************************************************
5656
* Zone JS is required by Angular itself.
5757
*/
58-
import 'zone.js/dist/zone'; // Included with Angular CLI.
58+
import 'zone.js'; // Included with Angular CLI.
5959

6060

6161

‎bootstrap4-demo-with-translate/src/tsconfig.app.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"paths": {
77
"jszip": [
88
"../node_modules/jszip/dist/jszip.min.js"
9+
],
10+
"stream": [
11+
"./node_modules/stream-browserify"
912
]
1013
},
1114
"types": []

‎bootstrap4-demo-with-translate/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"sourceMap": true,
99
"declaration": false,
1010
"moduleResolution": "node",
11-
"emitDecoratorMetadata": true,
1211
"experimentalDecorators": true,
1312
"target": "es2015",
1413
"typeRoots": [

‎bootstrap5-demo-with-translate/.browserslistrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ last 2 version
44
> 1%
55
maintained node versions
66
not dead
7-
IE 11
8-
7+
not IE 11

0 commit comments

Comments
 (0)