Skip to content

Commit 49109ff

Browse files
committed
Merge branch 'main' into development
# Conflicts: # package.json
2 parents 6e754b0 + a3895ed commit 49109ff

File tree

7 files changed

+25643
-20199
lines changed

7 files changed

+25643
-20199
lines changed

apps/react-kit-demo/src/app/Home.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import { Link } from 'react-router-dom';
32

43
export default function Home() {
Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
{
2-
"extends": "./tsconfig.json",
3-
"compilerOptions": {
4-
"outDir": "../../dist/out-tsc",
5-
"types": [
6-
"node",
7-
"@nx/react/typings/cssmodule.d.ts",
8-
"@nx/react/typings/image.d.ts",
9-
"vite/client"
10-
]
11-
},
12-
"exclude": [
13-
"src/**/*.spec.ts",
14-
"src/**/*.test.ts",
15-
"src/**/*.spec.tsx",
16-
"src/**/*.test.tsx",
17-
"src/**/*.spec.js",
18-
"src/**/*.test.js",
19-
"src/**/*.spec.jsx",
20-
"src/**/*.test.jsx"
21-
],
22-
"include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
2+
"extends": "./tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "../../dist/out-tsc",
5+
"types": ["node", "@nx/react/typings/cssmodule.d.ts", "@nx/react/typings/image.d.ts", "vite/client"]
6+
},
7+
"exclude": [
8+
"src/**/*.spec.ts",
9+
"src/**/*.test.ts",
10+
"src/**/*.spec.tsx",
11+
"src/**/*.test.tsx",
12+
"src/**/*.spec.js",
13+
"src/**/*.test.js",
14+
"src/**/*.spec.jsx",
15+
"src/**/*.test.jsx"
16+
],
17+
"include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
2318
}

apps/react-kit-demo/tsconfig.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"compilerOptions": {
3-
"jsx": "react-jsx",
4-
"allowJs": false,
5-
"esModuleInterop": false,
6-
"allowSyntheticDefaultImports": true,
7-
"strict": true,
8-
"types": ["vite/client", "vitest"]
9-
},
10-
"files": [],
11-
"include": [],
12-
"references": [
13-
{
14-
"path": "./tsconfig.app.json"
15-
},
16-
{
17-
"path": "./tsconfig.spec.json"
18-
}
19-
],
20-
"extends": "../../tsconfig.base.json"
2+
"compilerOptions": {
3+
"jsx": "react-jsx",
4+
"allowJs": false,
5+
"esModuleInterop": false,
6+
"allowSyntheticDefaultImports": true,
7+
"strict": true,
8+
"types": ["vite/client", "vitest"]
9+
},
10+
"files": [],
11+
"include": [],
12+
"references": [
13+
{
14+
"path": "./tsconfig.app.json"
15+
},
16+
{
17+
"path": "./tsconfig.spec.json"
18+
}
19+
],
20+
"extends": "../../tsconfig.base.json"
2121
}

migrations.json

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)