Skip to content

Commit 327ffc2

Browse files
authored
fix(template): api type declaration merging for scripts (#11367)
Make imports in scripts (files in `scripts/`) find our mirror types used for declaration merging also for `api/src/` imports (not just web imports)
1 parent 6635e2e commit 327ffc2

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

.changesets/11367.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- fix(template): api type declaration merging for scripts (#11367) by @Tobbe
2+
3+
Make imports in scripts (files in `scripts/`) find our mirror types used for declaration merging also for `api/src/` imports (not just web imports)
4+
5+
Users upgrading are adviced to manually upgrade their tsconfig files to match
6+
what is now in the template.

__fixtures__/test-project/scripts/tsconfig.json

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"paths": {
1010
"$api/*": ["../api/*"],
1111
"api/*": ["../api/*"],
12+
"$api/src/*": ["../api/src/*", "../.redwood/types/mirror/api/src/*"],
13+
"api/src/*": ["../api/src/*", "../.redwood/types/mirror/api/src/*"],
1214
"$web/*": ["../web/*"],
1315
"web/*": ["../web/*"],
1416
"$web/src/*": ["../web/src/*", "../.redwood/types/mirror/web/src/*"],

packages/create-redwood-app/templates/js/scripts/jsconfig.json

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
"paths": {
99
"$api/*": ["../api/*"],
1010
"api/*": ["../api/*"],
11+
"$api/src/*": ["../api/src/*", "../.redwood/types/mirror/api/src/*"],
12+
"api/src/*": ["../api/src/*", "../.redwood/types/mirror/api/src/*"],
1113
"$web/*": ["../web/*"],
1214
"web/*": ["../web/*"],
1315
"$web/src/*": ["../web/src/*", "../.redwood/types/mirror/web/src/*"],

packages/create-redwood-app/templates/ts/scripts/tsconfig.json

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"paths": {
1010
"$api/*": ["../api/*"],
1111
"api/*": ["../api/*"],
12+
"$api/src/*": ["../api/src/*", "../.redwood/types/mirror/api/src/*"],
13+
"api/src/*": ["../api/src/*", "../.redwood/types/mirror/api/src/*"],
1214
"$web/*": ["../web/*"],
1315
"web/*": ["../web/*"],
1416
"$web/src/*": ["../web/src/*", "../.redwood/types/mirror/web/src/*"],

0 commit comments

Comments
 (0)