Skip to content

Commit ff7b703

Browse files
TapaiBalazsBalázs Tápai
and
Balázs Tápai
authored
chore: update dependencies (#71)
* chore: update dependencies * chore: update dependencies after rebase * chore: updated to latest NX * fix: typing * chore: updated some vulnerable dependencies * chore: increase version number of ng-utils * chore: update peer dependencies and package versions Co-authored-by: Balázs Tápai <balazs.@thisdot.co>
1 parent 8116007 commit ff7b703

28 files changed

+20024
-32702
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
!.vscode/extensions.json
2626

2727
# misc
28+
/.angular/cache
2829
/.sass-cache
2930
/connect.lock
3031
/coverage

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.2.0
1+
16.10.0

angular.json

+13-38
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,5 @@
11
{
22
"version": 1,
3-
"cli": {
4-
"analytics": "dd09100e-b7fd-414b-9917-44fd79f74f98",
5-
"defaultCollection": "@nrwl/angular"
6-
},
7-
"defaultProject": "showcase",
8-
"schematics": {
9-
"@nrwl/angular": {
10-
"application": {
11-
"linter": "eslint"
12-
},
13-
"library": {
14-
"linter": "eslint"
15-
},
16-
"storybook-configuration": {
17-
"linter": "eslint"
18-
}
19-
},
20-
"@nrwl/angular:application": {
21-
"style": "scss",
22-
"linter": "eslint",
23-
"unitTestRunner": "jest",
24-
"e2eTestRunner": "cypress"
25-
},
26-
"@nrwl/angular:library": {
27-
"style": "scss",
28-
"linter": "eslint",
29-
"unitTestRunner": "jest"
30-
},
31-
"@nrwl/angular:component": {
32-
"style": "scss"
33-
}
34-
},
353
"projects": {
364
"cypress-indexeddb": {
375
"root": "libs/cypress-indexeddb",
@@ -64,7 +32,8 @@
6432
"assets": ["libs/cypress-indexeddb/*.md"]
6533
}
6634
}
67-
}
35+
},
36+
"tags": ["framework:none", "type:e2e"]
6837
},
6938
"ng-utils": {
7039
"projectType": "library",
@@ -104,7 +73,8 @@
10473
},
10574
"outputs": ["{options.outputFile}"]
10675
}
107-
}
76+
},
77+
"tags": ["framework:angular"]
10878
},
10979
"route-config": {
11080
"projectType": "library",
@@ -143,7 +113,8 @@
143113
"passWithNoTests": true
144114
}
145115
}
146-
}
116+
},
117+
"tags": ["framework:angular"]
147118
},
148119
"showcase": {
149120
"projectType": "application",
@@ -231,7 +202,8 @@
231202
"passWithNoTests": true
232203
}
233204
}
234-
}
205+
},
206+
"tags": ["framework:angular"]
235207
},
236208
"showcase-e2e": {
237209
"root": "apps/showcase-e2e",
@@ -258,7 +230,9 @@
258230
},
259231
"outputs": ["{options.outputFile}"]
260232
}
261-
}
233+
},
234+
"tags": ["framework:angular", "type:e2e"],
235+
"implicitDependencies": ["showcase"]
262236
},
263237
"utils": {
264238
"projectType": "library",
@@ -298,7 +272,8 @@
298272
},
299273
"outputs": ["{options.outputFile}"]
300274
}
301-
}
275+
},
276+
"tags": ["framework:none"]
302277
}
303278
}
304279
}

apps/showcase-e2e/cypress.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"fixturesFolder": "./src/fixtures",
44
"integrationFolder": "./src/integration",
55
"modifyObstructiveCode": false,
6-
"pluginsFile": "./src/plugins/index",
6+
"pluginsFile": false,
77
"supportFile": "./src/support/index.ts",
88
"video": true,
99
"videosFolder": "../../dist/cypress/apps/showcase-e2e/videos",

apps/showcase-e2e/src/plugins/index.js

-20
This file was deleted.

apps/showcase/jest.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@ module.exports = {
1515
'jest-preset-angular/build/serializers/ng-snapshot',
1616
'jest-preset-angular/build/serializers/html-comment',
1717
],
18-
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
18+
transform: {
19+
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
20+
},
21+
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
1922
};

apps/showcase/src/polyfills.ts

-12
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@
1818
* BROWSER POLYFILLS
1919
*/
2020

21-
/**
22-
* IE11 requires the following for NgClass support on SVG elements
23-
*/
24-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
25-
26-
/**
27-
* Web Animations `@angular/platform-browser/animations`
28-
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
29-
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
30-
*/
31-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
32-
3321
/**
3422
* By default, zone.js will patch all possible macroTask and DomEvents
3523
* user can disable parts of macroTask/DomEvents patch by setting following flags

apps/showcase/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
1010
}

libs/ng-utils/jest.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ module.exports = {
1010
},
1111
coverageDirectory: '../../coverage/libs/ng-utils',
1212
transform: {
13-
'^.+\\.(ts|js|html)$': 'jest-preset-angular',
13+
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
1414
},
15+
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
1516
snapshotSerializers: [
1617
'jest-preset-angular/build/serializers/no-ng-attributes',
1718
'jest-preset-angular/build/serializers/ng-snapshot',

libs/ng-utils/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@this-dot/ng-utils",
3-
"version": "0.1.6",
3+
"version": "0.1.7",
44
"description": "A library containing useful utilities for Angular",
55
"license": "MIT",
66
"author": "This Dot Labs",
@@ -20,8 +20,8 @@
2020
"utilities"
2121
],
2222
"peerDependencies": {
23-
"@angular/common": "^12.0.0",
24-
"@angular/core": "^12.0.0"
23+
"@angular/common": ">= 12.0.0 < 14",
24+
"@angular/core": ">= 12.0.0 < 14"
2525
},
2626
"dependencies": {
2727
"tslib": "^2.2.0"

libs/ng-utils/src/lib/use-http-image-source/use-http-image-source.pipe.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export class UseHttpImageSourcePipe implements PipeTransform, OnDestroy {
6565
tap(() => (this.latestValue = undefined)),
6666
switchMap((imagePath: string) =>
6767
this.httpClient.get(imagePath, { observe: 'response', responseType: 'blob' }).pipe(
68-
map((response: HttpResponse<Blob>) => URL.createObjectURL(response.body)),
68+
map((response: HttpResponse<Blob>) => URL.createObjectURL(response.body as Blob)),
6969
tap((blobUrl) => {
7070
this.revokeLatestBlob();
7171
this.latestBlobUrl = blobUrl;

libs/ng-utils/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"types": [],
1010
"lib": ["dom", "es2018"]
1111
},
12-
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
12+
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
1313
"include": ["**/*.ts"]
1414
}

libs/ng-utils/tsconfig.lib.prod.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* To learn more about this file see: https://angular.io/config/tsconfig. */
21
{
32
"extends": "./tsconfig.lib.json",
43
"compilerOptions": {

libs/ng-utils/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
1010
}

libs/route-config/jest.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@ module.exports = {
1515
'jest-preset-angular/build/serializers/ng-snapshot',
1616
'jest-preset-angular/build/serializers/html-comment',
1717
],
18-
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
18+
transform: {
19+
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
20+
},
21+
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
1922
};

libs/route-config/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@this-dot/route-config",
3-
"version": "1.2.2",
3+
"version": "1.2.1",
44
"description": "A library containing directives and services for configuring components via Route's routeData property",
55
"license": "MIT",
66
"author": "This Dot Labs",
@@ -21,12 +21,12 @@
2121
"route-config"
2222
],
2323
"peerDependencies": {
24-
"@angular/common": "^12.0.0",
25-
"@angular/core": "^12.0.0",
26-
"@angular/router": "^12.0.0",
27-
"rxjs": "^6.0.0"
24+
"@angular/common": ">= 12.0.0 < 14",
25+
"@angular/core": ">= 12.0.0 < 14",
26+
"@angular/router": ">= 12.0.0 < 14",
27+
"rxjs": "7.0.0"
2828
},
2929
"dependencies": {
30-
"tslib": "^2.1.0"
30+
"tslib": "^2.2.0"
3131
}
3232
}

libs/route-config/src/lib/route-data-has/route-data-has.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class RouteDataHasService<
1717
private tags$ = new BehaviorSubject<RouteTags[]>([]);
1818
private propName$ = new BehaviorSubject<RoutePropNames | undefined>(undefined);
1919
private elseTemplate$ = new BehaviorSubject<TemplateRef<CElse> | null>(null);
20-
private destroy$ = new Subject();
20+
private destroy$ = new Subject<void>();
2121

2222
private display$ = combineLatest([
2323
this.tags$,

libs/route-config/src/lib/route-data/route-data.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface RouteDataDirectiveContext<C> {
1919
selector: '[tdRouteData]',
2020
})
2121
export class RouteDataDirective<C extends RouteData> implements OnInit, OnDestroy {
22-
private destroy$ = new Subject();
22+
private destroy$ = new Subject<void>();
2323

2424
private defaultValue$ = new BehaviorSubject<Partial<C>>({});
2525
private view!: EmbeddedViewRef<RouteDataDirectiveContext<Partial<C>>>;

libs/route-config/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"types": [],
1010
"lib": ["dom", "es2018"]
1111
},
12-
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
12+
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
1313
"include": ["**/*.ts"]
1414
}

libs/route-config/tsconfig.lib.prod.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* To learn more about this file see: https://angular.io/config/tsconfig. */
21
{
32
"extends": "./tsconfig.lib.json",
43
"compilerOptions": {

libs/route-config/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
1010
}

libs/utils/jest.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ module.exports = {
1010
},
1111
coverageDirectory: '../../coverage/libs/utils',
1212
transform: {
13-
'^.+\\.(ts|js|html)$': 'jest-preset-angular',
13+
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
1414
},
15+
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
1516
snapshotSerializers: [
1617
'jest-preset-angular/build/serializers/no-ng-attributes',
1718
'jest-preset-angular/build/serializers/ng-snapshot',

libs/utils/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"types": [],
1010
"lib": ["dom", "es2018"]
1111
},
12-
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
12+
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
1313
"include": ["**/*.ts"]
1414
}

libs/utils/tsconfig.lib.prod.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* To learn more about this file see: https://angular.io/config/tsconfig. */
21
{
32
"extends": "./tsconfig.lib.json",
43
"compilerOptions": {

libs/utils/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
1010
}

nx.json

+29-17
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,41 @@
1717
"cacheableOperations": ["build", "lint", "test", "e2e"],
1818
"accessToken": "M2M0MGQzYzktZjdlYy00NjU5LWE4MzQtZWFlNDgwM2JlNTFhfHJlYWQtd3JpdGU=",
1919
"canTrackAnalytics": false,
20-
"showUsageWarnings": true
20+
"showUsageWarnings": true,
21+
"parallel": 1
2122
}
2223
}
2324
},
24-
"projects": {
25-
"cypress-indexeddb": {
26-
"tags": ["framework:none", "type:e2e"]
27-
},
28-
"ng-utils": {
29-
"tags": ["framework:angular"]
30-
},
31-
"route-config": {
32-
"tags": ["framework:angular"]
25+
"cli": {
26+
"analytics": "dd09100e-b7fd-414b-9917-44fd79f74f98",
27+
"defaultCollection": "@nrwl/angular"
28+
},
29+
"defaultProject": "showcase",
30+
"generators": {
31+
"@nrwl/angular": {
32+
"application": {
33+
"linter": "eslint"
34+
},
35+
"library": {
36+
"linter": "eslint"
37+
},
38+
"storybook-configuration": {
39+
"linter": "eslint"
40+
}
3341
},
34-
"showcase": {
35-
"tags": ["framework:angular"]
42+
"@nrwl/angular:application": {
43+
"style": "scss",
44+
"linter": "eslint",
45+
"unitTestRunner": "jest",
46+
"e2eTestRunner": "cypress"
3647
},
37-
"showcase-e2e": {
38-
"tags": ["framework:angular", "type:e2e"],
39-
"implicitDependencies": ["showcase"]
48+
"@nrwl/angular:library": {
49+
"style": "scss",
50+
"linter": "eslint",
51+
"unitTestRunner": "jest"
4052
},
41-
"utils": {
42-
"tags": ["framework:none"]
53+
"@nrwl/angular:component": {
54+
"style": "scss"
4355
}
4456
}
4557
}

0 commit comments

Comments
 (0)