Skip to content

Commit eb3880a

Browse files
TapaiBalazsBalázs Tápai
TapaiBalazs
and
Balázs Tápai
authored
chore: update dependencies (#90)
* chore: update dependencies * chore: installed nrwl web package * chore: #88 change rxidb builder to js/web * chore: put back linting to pre-commit Co-authored-by: Balázs Tápai <balazs.@thisdot.co>
1 parent e84b198 commit eb3880a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+14878
-13643
lines changed

‎apps/showcase-e2e/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"root": "apps/showcase-e2e",
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
33
"sourceRoot": "apps/showcase-e2e/src",
44
"projectType": "application",
55
"targets": {

‎apps/showcase/jest.config.js renamed to ‎apps/showcase/jest.config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
displayName: 'showcase',
34
preset: '../../jest.preset.js',
45
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

‎apps/showcase/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
23
"projectType": "application",
3-
"root": "apps/showcase",
44
"sourceRoot": "apps/showcase/src",
55
"prefix": "this-dot",
66
"targets": {
@@ -80,7 +80,7 @@
8080
"executor": "@nrwl/jest:jest",
8181
"outputs": ["coverage/apps/showcase"],
8282
"options": {
83-
"jestConfig": "apps/showcase/jest.config.js",
83+
"jestConfig": "apps/showcase/jest.config.ts",
8484
"passWithNoTests": true
8585
}
8686
}

‎apps/showcase/src/app/modules/rxidb-showcase/components/rxidb-auto-increment/rxidb-auto-increment.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
2-
import { FormControl } from '@angular/forms';
2+
import { UntypedFormControl } from '@angular/forms';
33
import { MatSnackBar } from '@angular/material/snack-bar';
44
import {
55
addItem,
@@ -46,7 +46,7 @@ export class RxidbAutoIncrementComponent implements OnInit, OnDestroy {
4646
readonly isLoading$ = this.isLoadingSubject.asObservable();
4747
readonly keyValues$ = this.store$.pipe(entries());
4848

49-
readonly inputControl = new FormControl('');
49+
readonly inputControl = new UntypedFormControl('');
5050

5151
constructor(
5252
private snackbar: MatSnackBar,

‎apps/showcase/src/app/modules/rxidb-showcase/components/rxidb-key-value-pair-showcase/rxidb-key-value-pair-showcase.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AfterViewInit, Component, Inject, OnDestroy, OnInit } from '@angular/core';
2-
import { FormBuilder, FormGroupDirective, Validators } from '@angular/forms';
2+
import { UntypedFormBuilder, FormGroupDirective, Validators } from '@angular/forms';
33
import { MatSnackBar } from '@angular/material/snack-bar';
44
import { connectIndexedDb, deleteItem, getObjectStore, read, setItem } from '@this-dot/rxidb';
55
import { isTruthy } from '@this-dot/utils';
@@ -34,7 +34,7 @@ export class RxidbKeyValuePairShowcaseComponent implements AfterViewInit, OnInit
3434
savedToIDB$ = new Subject<void>();
3535

3636
constructor(
37-
private formBuilder: FormBuilder,
37+
private formBuilder: UntypedFormBuilder,
3838
private snackbar: MatSnackBar,
3939
@Inject('STORE') private store$: Observable<IDBObjectStore>
4040
) {}

‎apps/showcase/tsconfig.app.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"outDir": "../../dist/out-tsc",
55
"types": []
66
},
7-
"files": ["src/main.ts", "src/polyfills.ts"]
7+
"files": ["src/main.ts", "src/polyfills.ts"],
8+
"exclude": ["jest.config.ts"]
89
}

‎apps/showcase/tsconfig.editor.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"include": ["**/*.ts"],
44
"compilerOptions": {
55
"types": ["jest", "node"]
6-
}
6+
},
7+
"exclude": ["jest.config.ts"]
78
}

‎apps/showcase/tsconfig.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
{
1313
"path": "./tsconfig.editor.json"
1414
}
15-
]
15+
],
16+
"compilerOptions": {
17+
"target": "es2020"
18+
}
1619
}

‎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", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}

‎jest.config.js renamed to ‎jest.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
const { getJestProjects } = require('@nrwl/jest');
22

3-
module.exports = { projects: getJestProjects() };
3+
export default { projects: getJestProjects() };

‎jest.preset.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
const nxPreset = require('@nrwl/jest/preset');
1+
const nxPreset = require('@nrwl/jest/preset').default;
22

33
module.exports = { ...nxPreset };

‎libs/cypress-indexeddb/jest.config.js renamed to ‎libs/cypress-indexeddb/jest.config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
displayName: 'cypress-indexeddb',
34
preset: '../../jest.preset.js',
45
globals: {

‎libs/cypress-indexeddb/project.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"root": "libs/cypress-indexeddb",
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
33
"sourceRoot": "libs/cypress-indexeddb/src",
44
"projectType": "library",
55
"targets": {
@@ -14,12 +14,12 @@
1414
"executor": "@nrwl/jest:jest",
1515
"outputs": ["coverage/libs/cypress-indexeddb"],
1616
"options": {
17-
"jestConfig": "libs/cypress-indexeddb/jest.config.js",
17+
"jestConfig": "libs/cypress-indexeddb/jest.config.ts",
1818
"passWithNoTests": true
1919
}
2020
},
2121
"build": {
22-
"executor": "@nrwl/node:package",
22+
"executor": "@nrwl/js:tsc",
2323
"outputs": ["{options.outputPath}"],
2424
"options": {
2525
"outputPath": "dist/libs/cypress-indexeddb",

‎libs/cypress-indexeddb/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"declaration": true,
77
"types": ["cypress", "node"]
88
},
9-
"exclude": ["**/*.spec.ts"],
9+
"exclude": ["**/*.spec.ts", "jest.config.ts"],
1010
"include": ["**/*.ts"]
1111
}

‎libs/cypress-indexeddb/tsconfig.spec.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,12 @@
55
"module": "commonjs",
66
"types": ["jest", "node"]
77
},
8-
"include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js", "**/*.spec.jsx", "**/*.d.ts"]
8+
"include": [
9+
"**/*.spec.ts",
10+
"**/*.spec.tsx",
11+
"**/*.spec.js",
12+
"**/*.spec.jsx",
13+
"**/*.d.ts",
14+
"jest.config.ts"
15+
]
916
}

‎libs/ng-utils/jest.config.js renamed to ‎libs/ng-utils/jest.config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
displayName: 'ng-utils',
34
preset: '../../jest.preset.js',
45
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

‎libs/ng-utils/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
23
"projectType": "library",
3-
"root": "libs/ng-utils",
44
"sourceRoot": "libs/ng-utils/src",
55
"prefix": "this-dot",
66
"targets": {
@@ -25,7 +25,7 @@
2525
"executor": "@nrwl/jest:jest",
2626
"outputs": ["coverage/libs/ng-utils"],
2727
"options": {
28-
"jestConfig": "libs/ng-utils/jest.config.js",
28+
"jestConfig": "libs/ng-utils/jest.config.ts",
2929
"passWithNoTests": true
3030
}
3131
},

‎libs/ng-utils/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"forceConsistentCasingInFileNames": true,
1818
"strict": true,
1919
"noImplicitReturns": true,
20-
"noFallthroughCasesInSwitch": true
20+
"noFallthroughCasesInSwitch": true,
21+
"target": "es2020"
2122
},
2223
"angularCompilerOptions": {
2324
"strictInjectionParameters": true,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
5-
"target": "es2015",
5+
"target": "es2020",
66
"declaration": true,
77
"declarationMap": true,
88
"inlineSources": true,
99
"types": [],
1010
"lib": ["dom", "es2018"]
1111
},
12-
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
12+
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
1313
"include": ["**/*.ts"]
1414
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
},
66
"angularCompilerOptions": {
77
"compilationMode": "partial"
8-
}
8+
},
9+
"exclude": ["jest.config.ts"]
910
}

‎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", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}

‎libs/route-config/jest.config.js renamed to ‎libs/route-config/jest.config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
displayName: 'route-config',
34
preset: '../../jest.preset.js',
45
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

‎libs/route-config/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
23
"projectType": "library",
3-
"root": "libs/route-config",
44
"sourceRoot": "libs/route-config/src",
55
"prefix": "td",
66
"targets": {
@@ -31,7 +31,7 @@
3131
"executor": "@nrwl/jest:jest",
3232
"outputs": ["coverage/libs/route-config"],
3333
"options": {
34-
"jestConfig": "libs/route-config/jest.config.js",
34+
"jestConfig": "libs/route-config/jest.config.ts",
3535
"passWithNoTests": true
3636
}
3737
},

‎libs/route-config/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"forceConsistentCasingInFileNames": true,
1818
"strict": true,
1919
"noImplicitReturns": true,
20-
"noFallthroughCasesInSwitch": true
20+
"noFallthroughCasesInSwitch": true,
21+
"target": "es2020"
2122
},
2223
"angularCompilerOptions": {
2324
"strictInjectionParameters": true,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
5-
"target": "es2015",
5+
"target": "es2020",
66
"declaration": true,
77
"declarationMap": true,
88
"inlineSources": true,
99
"types": [],
1010
"lib": ["dom", "es2018"]
1111
},
12-
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
12+
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
1313
"include": ["**/*.ts"]
1414
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
},
66
"angularCompilerOptions": {
77
"compilationMode": "partial"
8-
}
8+
},
9+
"exclude": ["jest.config.ts"]
910
}

‎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", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}

‎libs/rxidb/.babelrc

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
{
2-
"presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
2+
"presets": [
3+
[
4+
"@nrwl/web/babel",
5+
{
6+
"useBuiltIns": "usage"
7+
}
8+
]
9+
]
310
}

‎libs/rxidb/jest.config.js renamed to ‎libs/rxidb/jest.config.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
displayName: 'rxidb',
34
preset: '../../jest.preset.js',
45
globals: {
56
'ts-jest': {
67
tsconfig: '<rootDir>/tsconfig.spec.json',
78
},
89
},
9-
testEnvironment: 'node',
1010
transform: {
11-
'^.+\\.[tj]sx?$': 'ts-jest',
11+
'^.+\\.[tj]s$': 'ts-jest',
1212
},
13-
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
13+
moduleFileExtensions: ['ts', 'js', 'html'],
1414
coverageDirectory: '../../coverage/libs/rxidb',
1515
};

‎libs/rxidb/project.json

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
11
{
2-
"root": "libs/rxidb",
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
33
"sourceRoot": "libs/rxidb/src",
44
"projectType": "library",
55
"targets": {
6-
"lint": {
7-
"executor": "@nrwl/linter:eslint",
8-
"outputs": ["{options.outputFile}"],
9-
"options": {
10-
"lintFilePatterns": ["libs/rxidb/**/*.ts"]
11-
}
12-
},
13-
"test": {
14-
"executor": "@nrwl/jest:jest",
15-
"outputs": ["coverage/libs/rxidb"],
16-
"options": {
17-
"jestConfig": "libs/rxidb/jest.config.js",
18-
"passWithNoTests": true
19-
}
20-
},
216
"build": {
22-
"executor": "@nrwl/node:package",
7+
"executor": "@nrwl/js:tsc",
238
"outputs": ["{options.outputPath}"],
249
"options": {
2510
"outputPath": "dist/libs/rxidb",
26-
"tsConfig": "libs/rxidb/tsconfig.lib.json",
27-
"packageJson": "libs/rxidb/package.json",
2811
"main": "libs/rxidb/src/index.ts",
12+
"tsConfig": "libs/rxidb/tsconfig.lib.json",
2913
"assets": ["libs/rxidb/*.md"]
3014
}
3115
},
@@ -48,7 +32,22 @@
4832
"options": {
4933
"access": "public"
5034
}
35+
},
36+
"lint": {
37+
"executor": "@nrwl/linter:eslint",
38+
"outputs": ["{options.outputFile}"],
39+
"options": {
40+
"lintFilePatterns": ["libs/rxidb/**/*.ts"]
41+
}
42+
},
43+
"test": {
44+
"executor": "@nrwl/jest:jest",
45+
"outputs": ["coverage/libs/rxidb"],
46+
"options": {
47+
"jestConfig": "libs/rxidb/jest.config.ts",
48+
"passWithNoTests": true
49+
}
5150
}
5251
},
53-
"tags": ["framework:none"]
52+
"tags": []
5453
}

‎libs/rxidb/tsconfig.json

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{
22
"extends": "../../tsconfig.base.json",
3+
"compilerOptions": {
4+
"module": "commonjs",
5+
"forceConsistentCasingInFileNames": true,
6+
"strict": true,
7+
"noImplicitOverride": true,
8+
"noPropertyAccessFromIndexSignature": true,
9+
"noImplicitReturns": true,
10+
"noFallthroughCasesInSwitch": true
11+
},
312
"files": [],
413
"include": [],
514
"references": [

0 commit comments

Comments
 (0)