Skip to content

Commit

Permalink
fix(template): Format tsconfig and jsconfig (redwoodjs#11365)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tobbe
Tobbe authored Aug 24, 2024
1 parent b0dcd83 commit fadb9ef
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 156 deletions.
15 changes: 3 additions & 12 deletions __fixtures__/test-project/api/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,13 @@
"module": "Node16",
"moduleResolution": "Node16",
"skipLibCheck": false,
"rootDirs": [
"./src",
"../.redwood/types/mirror/api/src"
],
"rootDirs": ["./src", "../.redwood/types/mirror/api/src"],
"paths": {
"src/*": [
"./src/*",
"../.redwood/types/mirror/api/src/*"
],
"src/*": ["./src/*", "../.redwood/types/mirror/api/src/*"],
"types/*": ["./types/*", "../types/*"],
"@redwoodjs/testing": ["../node_modules/@redwoodjs/testing/api"]
},
"typeRoots": [
"../node_modules/@types",
"./node_modules/@types"
],
"typeRoots": ["../node_modules/@types", "./node_modules/@types"],
"types": ["jest"],
"jsx": "react-jsx"
},
Expand Down
26 changes: 6 additions & 20 deletions __fixtures__/test-project/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,12 @@
"module": "esnext",
"moduleResolution": "node",
"paths": {
"$api/*": [
"../api/*"
],
"api/*": [
"../api/*"
],
"$web/*": [
"../web/*"
],
"web/*": [
"../web/*"
],
"$web/src/*": [
"../web/src/*",
"../.redwood/types/mirror/web/src/*"
],
"web/src/*": [
"../web/src/*",
"../.redwood/types/mirror/web/src/*"
],
"$api/*": ["../api/*"],
"api/*": ["../api/*"],
"$web/*": ["../web/*"],
"web/*": ["../web/*"],
"$web/src/*": ["../web/src/*", "../.redwood/types/mirror/web/src/*"],
"web/src/*": ["../web/src/*", "../.redwood/types/mirror/web/src/*"],
"types/*": ["../types/*", "../web/types/*", "../api/types/*"]
},
"typeRoots": ["../node_modules/@types"],
Expand Down
18 changes: 4 additions & 14 deletions __fixtures__/test-project/web/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,16 @@
"../api/src/*",
"../.redwood/types/mirror/api/src/*"
],
"$api/*": [
"../api/*"
],
"types/*": [
"./types/*",
"../types/*"
],
"@redwoodjs/testing": [
"../node_modules/@redwoodjs/testing/web"
]
"$api/*": ["../api/*"],
"types/*": ["./types/*", "../types/*"],
"@redwoodjs/testing": ["../node_modules/@redwoodjs/testing/web"]
},
"typeRoots": [
"../node_modules/@types",
"./node_modules/@types",
"../node_modules/@testing-library"
],
"types": [
"jest",
"jest-dom"
],
"types": ["jest", "jest-dom"],
"jsx": "preserve"
},
"include": [
Expand Down
28 changes: 6 additions & 22 deletions packages/create-redwood-app/templates/js/api/jsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,14 @@
"module": "Node16",
"moduleResolution": "Node16",
"skipLibCheck": false,
"rootDirs": [
"./src",
"../.redwood/types/mirror/api/src"
],
"rootDirs": ["./src", "../.redwood/types/mirror/api/src"],
"paths": {
"src/*": [
"./src/*",
"../.redwood/types/mirror/api/src/*"
],
"types/*": [
"./types/*",
"../types/*"
],
"@redwoodjs/testing": [
"../node_modules/@redwoodjs/testing/api"
]
"src/*": ["./src/*", "../.redwood/types/mirror/api/src/*"],
"types/*": ["./types/*", "../types/*"],
"@redwoodjs/testing": ["../node_modules/@redwoodjs/testing/api"]
},
"typeRoots": [
"../node_modules/@types",
"./node_modules/@types"
],
"types": [
"jest"
],
"typeRoots": ["../node_modules/@types", "./node_modules/@types"],
"types": ["jest"],
"jsx": "react-jsx"
},
"include": [
Expand Down
36 changes: 8 additions & 28 deletions packages/create-redwood-app/templates/js/scripts/jsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,15 @@
"module": "esnext",
"moduleResolution": "node",
"paths": {
"$api/*": [
"../api/*"
],
"api/*": [
"../api/*"
],
"$web/*": [
"../web/*"
],
"web/*": [
"../web/*"
],
"$web/src/*": [
"../web/src/*",
"../.redwood/types/mirror/web/src/*"
],
"web/src/*": [
"../web/src/*",
"../.redwood/types/mirror/web/src/*"
],
"types/*": [
"../types/*",
"../web/types/*",
"../api/types/*"
]
"$api/*": ["../api/*"],
"api/*": ["../api/*"],
"$web/*": ["../web/*"],
"web/*": ["../web/*"],
"$web/src/*": ["../web/src/*", "../.redwood/types/mirror/web/src/*"],
"web/src/*": ["../web/src/*", "../.redwood/types/mirror/web/src/*"],
"types/*": ["../types/*", "../web/types/*", "../api/types/*"]
},
"typeRoots": [
"../node_modules/@types"
],
"typeRoots": ["../node_modules/@types"],
"jsx": "preserve"
},
"include": [
Expand Down
18 changes: 4 additions & 14 deletions packages/create-redwood-app/templates/js/web/jsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,16 @@
"../api/src/*",
"../.redwood/types/mirror/api/src/*"
],
"$api/*": [
"../api/*"
],
"types/*": [
"./types/*",
"../types/*"
],
"@redwoodjs/testing": [
"../node_modules/@redwoodjs/testing/web"
]
"$api/*": ["../api/*"],
"types/*": ["./types/*", "../types/*"],
"@redwoodjs/testing": ["../node_modules/@redwoodjs/testing/web"]
},
"typeRoots": [
"../node_modules/@types",
"./node_modules/@types",
"../node_modules/@testing-library"
],
"types": [
"jest",
"jest-dom"
],
"types": ["jest", "jest-dom"],
"jsx": "preserve"
},
"include": [
Expand Down
15 changes: 3 additions & 12 deletions packages/create-redwood-app/templates/ts/api/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,13 @@
"module": "Node16",
"moduleResolution": "Node16",
"skipLibCheck": false,
"rootDirs": [
"./src",
"../.redwood/types/mirror/api/src"
],
"rootDirs": ["./src", "../.redwood/types/mirror/api/src"],
"paths": {
"src/*": [
"./src/*",
"../.redwood/types/mirror/api/src/*"
],
"src/*": ["./src/*", "../.redwood/types/mirror/api/src/*"],
"types/*": ["./types/*", "../types/*"],
"@redwoodjs/testing": ["../node_modules/@redwoodjs/testing/api"]
},
"typeRoots": [
"../node_modules/@types",
"./node_modules/@types"
],
"typeRoots": ["../node_modules/@types", "./node_modules/@types"],
"types": ["jest"],
"jsx": "react-jsx"
},
Expand Down
26 changes: 6 additions & 20 deletions packages/create-redwood-app/templates/ts/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,12 @@
"module": "esnext",
"moduleResolution": "node",
"paths": {
"$api/*": [
"../api/*"
],
"api/*": [
"../api/*"
],
"$web/*": [
"../web/*"
],
"web/*": [
"../web/*"
],
"$web/src/*": [
"../web/src/*",
"../.redwood/types/mirror/web/src/*"
],
"web/src/*": [
"../web/src/*",
"../.redwood/types/mirror/web/src/*"
],
"$api/*": ["../api/*"],
"api/*": ["../api/*"],
"$web/*": ["../web/*"],
"web/*": ["../web/*"],
"$web/src/*": ["../web/src/*", "../.redwood/types/mirror/web/src/*"],
"web/src/*": ["../web/src/*", "../.redwood/types/mirror/web/src/*"],
"types/*": ["../types/*", "../web/types/*", "../api/types/*"]
},
"typeRoots": ["../node_modules/@types"],
Expand Down
18 changes: 4 additions & 14 deletions packages/create-redwood-app/templates/ts/web/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,16 @@
"../api/src/*",
"../.redwood/types/mirror/api/src/*"
],
"$api/*": [
"../api/*"
],
"types/*": [
"./types/*",
"../types/*"
],
"@redwoodjs/testing": [
"../node_modules/@redwoodjs/testing/web"
]
"$api/*": ["../api/*"],
"types/*": ["./types/*", "../types/*"],
"@redwoodjs/testing": ["../node_modules/@redwoodjs/testing/web"]
},
"typeRoots": [
"../node_modules/@types",
"./node_modules/@types",
"../node_modules/@testing-library"
],
"types": [
"jest",
"jest-dom"
],
"types": ["jest", "jest-dom"],
"jsx": "preserve"
},
"include": [
Expand Down

0 comments on commit fadb9ef

Please sign in to comment.