Skip to content

Commit 65a5dac

Browse files
satya164satya164
committed
fix: make sure paths aren't aliased when building definitions
closes react-navigation#265
1 parent 536225c commit 65a5dac

23 files changed

+95
-33
lines changed

‎packages/bottom-tabs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"react-native-iphone-x-helper": "^1.2.1"
3535
},
3636
"devDependencies": {
37-
"@react-native-community/bob": "^0.7.1",
37+
"@react-native-community/bob": "^0.8.0",
3838
"@types/color": "^3.0.1",
3939
"@types/react": "^16.9.17",
4040
"@types/react-native": "^0.60.30",
@@ -56,7 +56,7 @@
5656
"targets": [
5757
"commonjs",
5858
"module",
59-
"typescript"
59+
["typescript", {"project": "tsconfig.build.json"}]
6060
]
6161
}
6262
}

‎packages/bottom-tabs/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎packages/compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"targets": [
3838
"commonjs",
3939
"module",
40-
"typescript"
40+
["typescript", {"project": "tsconfig.build.json"}]
4141
]
4242
}
4343
}

‎packages/compat/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎packages/core/package.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@
3232
},
3333
"devDependencies": {
3434
"@babel/core": "^7.7.7",
35-
"@react-native-community/bob": "^0.7.1",
35+
"@react-native-community/bob": "^0.8.0",
3636
"@types/react": "^16.9.17",
3737
"@types/shortid": "^0.0.29",
38+
"@types/use-subscription": "^1.0.0",
3839
"del-cli": "^3.0.0",
3940
"react": "~16.9.0",
4041
"react-native-testing-library": "^1.12.0",
@@ -50,7 +51,12 @@
5051
"targets": [
5152
"commonjs",
5253
"module",
53-
"typescript"
54+
[
55+
"typescript",
56+
{
57+
"project": "tsconfig.build.json"
58+
}
59+
]
5460
]
5561
}
5662
}

‎packages/core/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎packages/drawer/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"react-native-iphone-x-helper": "^1.2.1"
3636
},
3737
"devDependencies": {
38-
"@react-native-community/bob": "^0.7.1",
38+
"@react-native-community/bob": "^0.8.0",
3939
"@types/react": "^16.9.17",
4040
"@types/react-native": "^0.60.30",
4141
"del-cli": "^3.0.0",
@@ -62,7 +62,7 @@
6262
"targets": [
6363
"commonjs",
6464
"module",
65-
"typescript"
65+
["typescript", {"project": "tsconfig.build.json"}]
6666
]
6767
}
6868
}

‎packages/drawer/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎packages/material-bottom-tabs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@react-navigation/routers": "^5.0.0-alpha.23"
3434
},
3535
"devDependencies": {
36-
"@react-native-community/bob": "^0.7.1",
36+
"@react-native-community/bob": "^0.8.0",
3737
"@types/react": "^16.9.17",
3838
"@types/react-native": "^0.60.30",
3939
"@types/react-native-vector-icons": "^6.4.5",
@@ -57,7 +57,7 @@
5757
"targets": [
5858
"commonjs",
5959
"module",
60-
"typescript"
60+
["typescript", {"project": "tsconfig.build.json"}]
6161
]
6262
}
6363
}

‎packages/material-bottom-tabs/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎packages/material-top-tabs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"color": "^3.1.2"
3535
},
3636
"devDependencies": {
37-
"@react-native-community/bob": "^0.7.1",
37+
"@react-native-community/bob": "^0.8.0",
3838
"@types/react": "^16.9.17",
3939
"@types/react-native": "^0.60.30",
4040
"del-cli": "^3.0.0",
@@ -59,7 +59,7 @@
5959
"targets": [
6060
"commonjs",
6161
"module",
62-
"typescript"
62+
["typescript", {"project": "tsconfig.build.json"}]
6363
]
6464
}
6565
}

‎packages/material-top-tabs/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎packages/native-stack/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@react-navigation/routers": "^5.0.0-alpha.23"
2929
},
3030
"devDependencies": {
31-
"@react-native-community/bob": "^0.7.1",
31+
"@react-native-community/bob": "^0.8.0",
3232
"del-cli": "^3.0.0",
3333
"react-native-screens": "^2.0.0-alpha.22",
3434
"typescript": "^3.7.4"
@@ -45,7 +45,7 @@
4545
"targets": [
4646
"commonjs",
4747
"module",
48-
"typescript"
48+
["typescript", {"project": "tsconfig.build.json"}]
4949
]
5050
}
5151
}

‎packages/native-stack/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎packages/native/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@react-navigation/core": "^5.0.0-alpha.33"
3030
},
3131
"devDependencies": {
32-
"@react-native-community/bob": "^0.7.1",
32+
"@react-native-community/bob": "^0.8.0",
3333
"@types/react": "^16.9.17",
3434
"@types/react-native": "^0.60.30",
3535
"del-cli": "^3.0.0",
@@ -47,7 +47,7 @@
4747
"targets": [
4848
"commonjs",
4949
"module",
50-
"typescript"
50+
["typescript", {"project": "tsconfig.build.json"}]
5151
]
5252
}
5353
}

‎packages/native/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎packages/routers/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"shortid": "^2.2.15"
3030
},
3131
"devDependencies": {
32-
"@react-native-community/bob": "^0.7.1",
32+
"@react-native-community/bob": "^0.8.0",
3333
"del-cli": "^3.0.0",
3434
"typescript": "^3.7.4"
3535
},
@@ -39,7 +39,7 @@
3939
"targets": [
4040
"commonjs",
4141
"module",
42-
"typescript"
42+
["typescript", {"project": "tsconfig.build.json"}]
4343
]
4444
}
4545
}

‎packages/routers/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎packages/stack/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"react-native-iphone-x-helper": "^1.2.1"
3535
},
3636
"devDependencies": {
37-
"@react-native-community/bob": "^0.7.1",
37+
"@react-native-community/bob": "^0.8.0",
3838
"@react-native-community/masked-view": "^0.1.5",
3939
"@types/color": "^3.0.1",
4040
"@types/react": "^16.9.17",
@@ -62,7 +62,7 @@
6262
"targets": [
6363
"commonjs",
6464
"module",
65-
"typescript"
65+
["typescript", {"project": "tsconfig.build.json"}]
6666
]
6767
}
6868
}

‎packages/stack/tsconfig.build.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig",
3+
"compilerOptions": {
4+
"paths": {}
5+
}
6+
}

‎tsconfig.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
"compilerOptions": {
33
"baseUrl": ".",
44
"paths": {
5-
"@react-navigation/*": [
6-
"./packages/*/src"
7-
],
8-
"use-subscription": ["./typings/use-subscription.d"]
5+
"@react-navigation/*": ["./packages/*/src"]
96
},
107
"composite": true,
118
"allowUnreachableCode": false,

‎typings/use-subscription.d.ts

-6
This file was deleted.

‎yarn.lock

+9-4
Original file line numberDiff line numberDiff line change
@@ -2749,10 +2749,10 @@
27492749
dependencies:
27502750
"@types/node" ">= 8"
27512751

2752-
"@react-native-community/bob@^0.7.1":
2753-
version "0.7.1"
2754-
resolved "https://registry.yarnpkg.com/@react-native-community/bob/-/bob-0.7.1.tgz#481bf46704c5846ab5a9551c90d25a59bfd5bb0c"
2755-
integrity sha512-lTTRVfk1crR3HT6vxT+JFrhWATy/HVtbMxewkfWqaxiiYtnIc19y/WuguvSyOGpGgDniuGBU62fUVnlD8n7pWg==
2752+
"@react-native-community/bob@^0.8.0":
2753+
version "0.8.0"
2754+
resolved "https://registry.yarnpkg.com/@react-native-community/bob/-/bob-0.8.0.tgz#8eb33d18393584b2769adde55a042337c5311c80"
2755+
integrity sha512-b4I3YY/3RrJtsBN7BBE56QGH2/jEoEKeEJqnkXiK4hbEEOnHl6/4mEQTZRM1OX8UUhQy9xHdmFfne+xjhSvs9g==
27562756
dependencies:
27572757
"@babel/core" "^7.7.7"
27582758
chalk "^3.0.0"
@@ -3152,6 +3152,11 @@
31523152
resolved "https://registry.yarnpkg.com/@types/untildify/-/untildify-3.0.0.tgz#cd3e6624e46ccf292d3823fb48fa90dda0deaec0"
31533153
integrity sha512-FTktI3Y1h+gP9GTjTvXBP5v8xpH4RU6uS9POoBcGy4XkS2Np6LNtnP1eiNNth4S7P+qw2c/rugkwBasSHFzJEg==
31543154

3155+
"@types/use-subscription@^1.0.0":
3156+
version "1.0.0"
3157+
resolved "https://registry.yarnpkg.com/@types/use-subscription/-/use-subscription-1.0.0.tgz#d146f8d834f70f50d48bd8246a481d096f11db19"
3158+
integrity sha512-0WWZ5GUDKMXUY/1zy4Ur5/zsC0s/B+JjXfHdkvx6JgDNZzZV5eW+KKhDqsTGyqX56uh99gwGwbsKbVwkcVIKQA==
3159+
31553160
"@types/uuid-js@^0.7.1":
31563161
version "0.7.2"
31573162
resolved "https://registry.yarnpkg.com/@types/uuid-js/-/uuid-js-0.7.2.tgz#5b5552fcbaaf4acf026fb6dc66f7e5bd6b4be92f"

0 commit comments

Comments
 (0)