Skip to content

Commit 70037fa

Browse files
teoglteogl
committed
update angular version
1 parent d8a0d5b commit 70037fa

File tree

21 files changed

+3064
-3457
lines changed

21 files changed

+3064
-3457
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ speed-measure-plugin*.json
3232
.history/*
3333

3434
# misc
35+
/.angular/cache
3536
/.sass-cache
3637
/connect.lock
3738
/coverage

‎angular.json‎

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@
2828
"tsConfig": "projects/craftsjs/ngrx-action/tsconfig.spec.json",
2929
"karmaConfig": "projects/craftsjs/ngrx-action/karma.conf.js"
3030
}
31-
},
32-
"lint": {
33-
"builder": "@angular-devkit/build-angular:tslint",
34-
"options": {
35-
"tsConfig": [
36-
"projects/craftsjs/ngrx-action/tsconfig.lib.json",
37-
"projects/craftsjs/ngrx-action/tsconfig.spec.json"
38-
],
39-
"exclude": [
40-
"**/node_modules/**"
41-
]
42-
}
4331
}
4432
}
4533
},
@@ -68,18 +56,6 @@
6856
"tsConfig": "projects/craftsjs/perfect-scrollbar/tsconfig.spec.json",
6957
"karmaConfig": "projects/craftsjs/perfect-scrollbar/karma.conf.js"
7058
}
71-
},
72-
"lint": {
73-
"builder": "@angular-devkit/build-angular:tslint",
74-
"options": {
75-
"tsConfig": [
76-
"projects/craftsjs/perfect-scrollbar/tsconfig.lib.json",
77-
"projects/craftsjs/perfect-scrollbar/tsconfig.spec.json"
78-
],
79-
"exclude": [
80-
"**/node_modules/**"
81-
]
82-
}
8359
}
8460
}
8561
},
@@ -108,18 +84,6 @@
10884
"tsConfig": "projects/craftsjs/core/tsconfig.spec.json",
10985
"karmaConfig": "projects/craftsjs/core/karma.conf.js"
11086
}
111-
},
112-
"lint": {
113-
"builder": "@angular-devkit/build-angular:tslint",
114-
"options": {
115-
"tsConfig": [
116-
"projects/craftsjs/core/tsconfig.lib.json",
117-
"projects/craftsjs/core/tsconfig.spec.json"
118-
],
119-
"exclude": [
120-
"**/node_modules/**"
121-
]
122-
}
12387
}
12488
}
12589
},
@@ -148,18 +112,6 @@
148112
"tsConfig": "projects/craftsjs/card/tsconfig.spec.json",
149113
"karmaConfig": "projects/craftsjs/card/karma.conf.js"
150114
}
151-
},
152-
"lint": {
153-
"builder": "@angular-devkit/build-angular:tslint",
154-
"options": {
155-
"tsConfig": [
156-
"projects/craftsjs/card/tsconfig.lib.json",
157-
"projects/craftsjs/card/tsconfig.spec.json"
158-
],
159-
"exclude": [
160-
"**/node_modules/**"
161-
]
162-
}
163115
}
164116
}
165117
},
@@ -188,18 +140,6 @@
188140
"tsConfig": "projects/craftsjs/alert/tsconfig.spec.json",
189141
"karmaConfig": "projects/craftsjs/alert/karma.conf.js"
190142
}
191-
},
192-
"lint": {
193-
"builder": "@angular-devkit/build-angular:tslint",
194-
"options": {
195-
"tsConfig": [
196-
"projects/craftsjs/alert/tsconfig.lib.json",
197-
"projects/craftsjs/alert/tsconfig.spec.json"
198-
],
199-
"exclude": [
200-
"**/node_modules/**"
201-
]
202-
}
203143
}
204144
}
205145
},
@@ -228,18 +168,6 @@
228168
"tsConfig": "projects/craftsjs/menu-admin/tsconfig.spec.json",
229169
"karmaConfig": "projects/craftsjs/menu-admin/karma.conf.js"
230170
}
231-
},
232-
"lint": {
233-
"builder": "@angular-devkit/build-angular:tslint",
234-
"options": {
235-
"tsConfig": [
236-
"projects/craftsjs/menu-admin/tsconfig.lib.json",
237-
"projects/craftsjs/menu-admin/tsconfig.spec.json"
238-
],
239-
"exclude": [
240-
"**/node_modules/**"
241-
]
242-
}
243171
}
244172
}
245173
},
@@ -268,18 +196,6 @@
268196
"tsConfig": "projects/craftsjs/modal/tsconfig.spec.json",
269197
"karmaConfig": "projects/craftsjs/modal/karma.conf.js"
270198
}
271-
},
272-
"lint": {
273-
"builder": "@angular-devkit/build-angular:tslint",
274-
"options": {
275-
"tsConfig": [
276-
"projects/craftsjs/modal/tsconfig.lib.json",
277-
"projects/craftsjs/modal/tsconfig.spec.json"
278-
],
279-
"exclude": [
280-
"**/node_modules/**"
281-
]
282-
}
283199
}
284200
}
285201
},
@@ -308,18 +224,6 @@
308224
"tsConfig": "projects/craftsjs/notifier/tsconfig.spec.json",
309225
"karmaConfig": "projects/craftsjs/notifier/karma.conf.js"
310226
}
311-
},
312-
"lint": {
313-
"builder": "@angular-devkit/build-angular:tslint",
314-
"options": {
315-
"tsConfig": [
316-
"projects/craftsjs/notifier/tsconfig.lib.json",
317-
"projects/craftsjs/notifier/tsconfig.spec.json"
318-
],
319-
"exclude": [
320-
"**/node_modules/**"
321-
]
322-
}
323227
}
324228
}
325229
}

‎package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
},
1818
"private": false,
1919
"dependencies": {
20-
"@angular/animations": "^12.1.1",
20+
"@angular/animations": "^13.3.7",
2121
"@angular/cdk": "^12.1.1",
22-
"@angular/common": "^12.1.1",
23-
"@angular/compiler": "^12.1.1",
24-
"@angular/core": "^12.1.1",
25-
"@angular/forms": "^12.1.1",
22+
"@angular/common": "^13.3.7",
23+
"@angular/compiler": "^13.3.7",
24+
"@angular/core": "^13.3.7",
25+
"@angular/forms": "^13.3.7",
2626
"@angular/material": "^12.1.1",
27-
"@angular/platform-browser": "^12.1.1",
28-
"@angular/platform-browser-dynamic": "^12.1.1",
29-
"@angular/router": "^12.1.1",
27+
"@angular/platform-browser": "^13.3.7",
28+
"@angular/platform-browser-dynamic": "^13.3.7",
29+
"@angular/router": "^13.3.7",
3030
"@ngrx/store": "^12.2.0",
3131
"@ngx-translate/core": "^13.0.0",
3232
"perfect-scrollbar": "^1.5.0",
@@ -36,11 +36,11 @@
3636
"zone.js": "~0.11.4"
3737
},
3838
"devDependencies": {
39-
"@angular-devkit/build-angular": "^12.1.0",
39+
"@angular-devkit/build-angular": "^13.3.5",
4040
"@angular-devkit/build-ng-packagr": "^0.1000.1",
41-
"@angular/cli": "^12.1.0",
42-
"@angular/compiler-cli": "^12.1.1",
43-
"@angular/language-service": "^12.1.1",
41+
"@angular/cli": "^13.3.5",
42+
"@angular/compiler-cli": "^13.3.7",
43+
"@angular/language-service": "^13.3.7",
4444
"@types/jasmine": "~3.5.0",
4545
"@types/jasminewd2": "~2.0.3",
4646
"@types/node": "^12.11.1",
@@ -52,11 +52,11 @@
5252
"karma-coverage-istanbul-reporter": "~3.0.2",
5353
"karma-jasmine": "~3.3.0",
5454
"karma-jasmine-html-reporter": "^1.5.0",
55-
"ng-packagr": "^12.1.0",
55+
"ng-packagr": "^13.3.1",
5656
"protractor": "~7.0.0",
5757
"ts-node": "~8.3.0",
5858
"tslint": "~6.1.0",
59-
"typescript": "~4.3.5"
59+
"typescript": "~4.6.4"
6060
},
6161
"repository": {
6262
"type": "git",
@@ -74,4 +74,4 @@
7474
"modal",
7575
"notifier"
7676
]
77-
}
77+
}

‎projects/craftsjs/alert/ng-package.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
33
"dest": "../../../dist/craftsjs/alert",
44
"lib": {
5-
"entryFile": "src/public-api.ts",
6-
"umdModuleIds": {
7-
"@ngx-translate/core": "ngx-translate-core",
8-
"@craftsjs/core": "crafts-core"
9-
}
5+
"entryFile": "src/public-api.ts"
106
}
117
}

‎projects/craftsjs/alert/src/lib/alert.module.ts‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,25 @@ import {
1616
import { AlertService } from './services/alert.service';
1717

1818
@NgModule({
19-
imports: [
20-
CommonModule,
21-
TranslateModule,
22-
MatButtonModule,
23-
CoreModule,
24-
MatDialogModule
25-
],
26-
declarations: [
27-
DialogAlertComponent,
28-
AlertSuccessComponent,
29-
AlertInfoComponent,
30-
WarningComponent,
31-
ErrorComponent,
32-
AlertOkButtonComponent,
33-
AlertCancelButtonComponent
34-
],
35-
exports: [
36-
DialogAlertComponent
37-
],
38-
entryComponents: [
39-
DialogAlertComponent,
40-
AlertSuccessComponent,
41-
AlertInfoComponent,
42-
WarningComponent,
43-
ErrorComponent
44-
]
19+
imports: [
20+
CommonModule,
21+
TranslateModule,
22+
MatButtonModule,
23+
CoreModule,
24+
MatDialogModule
25+
],
26+
declarations: [
27+
DialogAlertComponent,
28+
AlertSuccessComponent,
29+
AlertInfoComponent,
30+
WarningComponent,
31+
ErrorComponent,
32+
AlertOkButtonComponent,
33+
AlertCancelButtonComponent
34+
],
35+
exports: [
36+
DialogAlertComponent
37+
]
4538
})
4639
export class AlertModule {
4740
static forRoot(): ModuleWithProviders<AlertModule> {

‎projects/craftsjs/alert/src/lib/craftsjs-alert.module.ts‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,25 @@ import {
1616
import { AlertService } from './services/alert.service';
1717

1818
@NgModule({
19-
imports: [
20-
CommonModule,
21-
TranslateModule,
22-
MatButtonModule,
23-
CoreModule,
24-
MatDialogModule
25-
],
26-
declarations: [
27-
CraftsjsDialogAlertComponent,
28-
AlertSuccessComponent,
29-
AlertInfoComponent,
30-
WarningComponent,
31-
ErrorComponent,
32-
AlertOkButtonComponent,
33-
AlertCancelButtonComponent
34-
],
35-
exports: [
36-
CraftsjsDialogAlertComponent
37-
],
38-
entryComponents: [
39-
CraftsjsDialogAlertComponent,
40-
AlertSuccessComponent,
41-
AlertInfoComponent,
42-
WarningComponent,
43-
ErrorComponent
44-
]
19+
imports: [
20+
CommonModule,
21+
TranslateModule,
22+
MatButtonModule,
23+
CoreModule,
24+
MatDialogModule
25+
],
26+
declarations: [
27+
CraftsjsDialogAlertComponent,
28+
AlertSuccessComponent,
29+
AlertInfoComponent,
30+
WarningComponent,
31+
ErrorComponent,
32+
AlertOkButtonComponent,
33+
AlertCancelButtonComponent
34+
],
35+
exports: [
36+
CraftsjsDialogAlertComponent
37+
]
4538
})
4639
export class AlertModule {
4740
static forRoot(): ModuleWithProviders {

‎projects/craftsjs/alert/src/test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ declare const require: any;
1414
// First, initialize the Angular testing environment.
1515
getTestBed().initTestEnvironment(
1616
BrowserDynamicTestingModule,
17-
platformBrowserDynamicTesting()
17+
platformBrowserDynamicTesting(), {
18+
teardown: { destroyAfterEach: false }
19+
}
1820
);
1921
// Then we find all the tests.
2022
const context = require.context('./', true, /\.spec\.ts$/);

‎projects/craftsjs/card/src/test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ declare const require: any;
1414
// First, initialize the Angular testing environment.
1515
getTestBed().initTestEnvironment(
1616
BrowserDynamicTestingModule,
17-
platformBrowserDynamicTesting()
17+
platformBrowserDynamicTesting(), {
18+
teardown: { destroyAfterEach: false }
19+
}
1820
);
1921
// Then we find all the tests.
2022
const context = require.context('./', true, /\.spec\.ts$/);

‎projects/craftsjs/core/ng-package.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
33
"dest": "../../../dist/craftsjs/core",
44
"lib": {
5-
"entryFile": "src/public-api.ts",
6-
"umdModuleIds": {
7-
"@ngrx/store": "ngrx-store",
8-
"@craftsjs/ngrx-action": "craftsjs-ngrx-action"
9-
}
5+
"entryFile": "src/public-api.ts"
106
}
117
}

‎projects/craftsjs/core/src/test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ declare const require: {
1818
// First, initialize the Angular testing environment.
1919
getTestBed().initTestEnvironment(
2020
BrowserDynamicTestingModule,
21-
platformBrowserDynamicTesting()
21+
platformBrowserDynamicTesting(), {
22+
teardown: { destroyAfterEach: false }
23+
}
2224
);
2325
// Then we find all the tests.
2426
const context = require.context('./', true, /\.spec\.ts$/);

0 commit comments

Comments
 (0)