Skip to content

Commit 443d8d4

Browse files
authored
Fix CI Build + local Build (#180)
1 parent 39af499 commit 443d8d4

11 files changed

Lines changed: 31 additions & 86 deletions

File tree

.husky/_/check

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@ call_lefthook()
4444
elif test -f "$dir/example/node_modules/lefthook/bin/index.js"
4545
then
4646
"$dir/example/node_modules/lefthook/bin/index.js" "$@"
47-
elif test -f "$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
48-
then
49-
"$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
50-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
51-
then
52-
"$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
53-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
54-
then
55-
"$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
56-
elif test -f "$dir/docs/node_modules/lefthook/bin/index.js"
57-
then
58-
"$dir/docs/node_modules/lefthook/bin/index.js" "$@"
5947

6048
elif go tool lefthook -h >/dev/null 2>&1
6149
then

.husky/_/commit-msg

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@ call_lefthook()
4444
elif test -f "$dir/example/node_modules/lefthook/bin/index.js"
4545
then
4646
"$dir/example/node_modules/lefthook/bin/index.js" "$@"
47-
elif test -f "$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
48-
then
49-
"$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
50-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
51-
then
52-
"$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
53-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
54-
then
55-
"$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
56-
elif test -f "$dir/docs/node_modules/lefthook/bin/index.js"
57-
then
58-
"$dir/docs/node_modules/lefthook/bin/index.js" "$@"
5947

6048
elif go tool lefthook -h >/dev/null 2>&1
6149
then

.husky/_/format

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@ call_lefthook()
4444
elif test -f "$dir/example/node_modules/lefthook/bin/index.js"
4545
then
4646
"$dir/example/node_modules/lefthook/bin/index.js" "$@"
47-
elif test -f "$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
48-
then
49-
"$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
50-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
51-
then
52-
"$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
53-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
54-
then
55-
"$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
56-
elif test -f "$dir/docs/node_modules/lefthook/bin/index.js"
57-
then
58-
"$dir/docs/node_modules/lefthook/bin/index.js" "$@"
5947

6048
elif go tool lefthook -h >/dev/null 2>&1
6149
then

.husky/_/pre-commit

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@ call_lefthook()
4444
elif test -f "$dir/example/node_modules/lefthook/bin/index.js"
4545
then
4646
"$dir/example/node_modules/lefthook/bin/index.js" "$@"
47-
elif test -f "$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
48-
then
49-
"$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
50-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
51-
then
52-
"$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
53-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
54-
then
55-
"$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
56-
elif test -f "$dir/docs/node_modules/lefthook/bin/index.js"
57-
then
58-
"$dir/docs/node_modules/lefthook/bin/index.js" "$@"
5947

6048
elif go tool lefthook -h >/dev/null 2>&1
6149
then

.husky/_/prepare-commit-msg

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@ call_lefthook()
4444
elif test -f "$dir/example/node_modules/lefthook/bin/index.js"
4545
then
4646
"$dir/example/node_modules/lefthook/bin/index.js" "$@"
47-
elif test -f "$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
48-
then
49-
"$dir/docs/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
50-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
51-
then
52-
"$dir/docs/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
53-
elif test -f "$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
54-
then
55-
"$dir/docs/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
56-
elif test -f "$dir/docs/node_modules/lefthook/bin/index.js"
57-
then
58-
"$dir/docs/node_modules/lefthook/bin/index.js" "$@"
5947

6048
elif go tool lefthook -h >/dev/null 2>&1
6149
then

example/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ apply plugin: "com.facebook.react"
99
react {
1010
/* Folders */
1111
// The root of your project, i.e. where "package.json" lives. Default is '../..'
12-
// root = file("../../")
12+
root = file("../../")
1313
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
14-
reactNativeDir = file("../../node_modules/react-native")
14+
reactNativeDir = file("../../../node_modules/react-native")
1515
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
1616
codegenDir = file("../../../node_modules/@react-native/codegen")
1717
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
18-
cliFile = file("../../node_modules/react-native/cli.js")
18+
cliFile = file("../../../node_modules/react-native/cli.js")
1919

2020
/* Variants */
2121
// The list of variants to that are debuggable. For those we're going to

example/android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
pluginManagement {
2-
includeBuild("../../node_modules/.pnpm/@[email protected]/node_modules/@react-native/gradle-plugin")
2+
includeBuild("../../node_modules/@react-native/gradle-plugin")
33
}
44
plugins { id("com.facebook.react.settings") }
55
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
66
rootProject.name = 'example'
77
include ':app'
8-
includeBuild('../../node_modules/.pnpm/@[email protected]/node_modules/@react-native/gradle-plugin')
8+
includeBuild('../../node_modules/@react-native/gradle-plugin')

example/ios/Podfile.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PODS:
88
- hermes-engine (0.80.0):
99
- hermes-engine/Pre-built (= 0.80.0)
1010
- hermes-engine/Pre-built (0.80.0)
11-
- mj-studio-react-native-naver-map (2.6.4):
11+
- mj-studio-react-native-naver-map (2.6.7):
1212
- boost
1313
- DoubleConversion
1414
- fast_float
@@ -1681,7 +1681,7 @@ PODS:
16811681
- React-RCTFBReactNativeSpec
16821682
- ReactCommon/turbomodule/core
16831683
- SocketRocket
1684-
- react-native-safe-area-context (5.6.1):
1684+
- react-native-safe-area-context (5.6.2):
16851685
- boost
16861686
- DoubleConversion
16871687
- fast_float
@@ -1700,8 +1700,8 @@ PODS:
17001700
- React-hermes
17011701
- React-ImageManager
17021702
- React-jsi
1703-
- react-native-safe-area-context/common (= 5.6.1)
1704-
- react-native-safe-area-context/fabric (= 5.6.1)
1703+
- react-native-safe-area-context/common (= 5.6.2)
1704+
- react-native-safe-area-context/fabric (= 5.6.2)
17051705
- React-NativeModulesApple
17061706
- React-RCTFabric
17071707
- React-renderercss
@@ -1712,7 +1712,7 @@ PODS:
17121712
- ReactCommon/turbomodule/core
17131713
- SocketRocket
17141714
- Yoga
1715-
- react-native-safe-area-context/common (5.6.1):
1715+
- react-native-safe-area-context/common (5.6.2):
17161716
- boost
17171717
- DoubleConversion
17181718
- fast_float
@@ -1741,7 +1741,7 @@ PODS:
17411741
- ReactCommon/turbomodule/core
17421742
- SocketRocket
17431743
- Yoga
1744-
- react-native-safe-area-context/fabric (5.6.1):
1744+
- react-native-safe-area-context/fabric (5.6.2):
17451745
- boost
17461746
- DoubleConversion
17471747
- fast_float
@@ -2304,7 +2304,7 @@ PODS:
23042304
- React-perflogger (= 0.80.0)
23052305
- React-utils (= 0.80.0)
23062306
- SocketRocket
2307-
- RNPermissions (5.4.2):
2307+
- RNPermissions (5.4.4):
23082308
- boost
23092309
- DoubleConversion
23102310
- fast_float
@@ -2380,7 +2380,7 @@ DEPENDENCIES:
23802380
- React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
23812381
- React-microtasksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
23822382
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
2383-
- "react-native-slider (from `../../node_modules/@react-native-community/slider`)"
2383+
- "react-native-slider (from `../node_modules/@react-native-community/slider`)"
23842384
- React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
23852385
- React-oscompat (from `../node_modules/react-native/ReactCommon/oscompat`)
23862386
- React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
@@ -2412,7 +2412,7 @@ DEPENDENCIES:
24122412
- ReactAppDependencyProvider (from `build/generated/ios`)
24132413
- ReactCodegen (from `build/generated/ios`)
24142414
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
2415-
- RNPermissions (from `../../node_modules/react-native-permissions`)
2415+
- RNPermissions (from `../node_modules/react-native-permissions`)
24162416
- SocketRocket (~> 0.7.1)
24172417
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
24182418

@@ -2509,7 +2509,7 @@ EXTERNAL SOURCES:
25092509
react-native-safe-area-context:
25102510
:path: "../node_modules/react-native-safe-area-context"
25112511
react-native-slider:
2512-
:path: "../../node_modules/@react-native-community/slider"
2512+
:path: "../node_modules/@react-native-community/slider"
25132513
React-NativeModulesApple:
25142514
:path: "../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
25152515
React-oscompat:
@@ -2573,7 +2573,7 @@ EXTERNAL SOURCES:
25732573
ReactCommon:
25742574
:path: "../node_modules/react-native/ReactCommon"
25752575
RNPermissions:
2576-
:path: "../../node_modules/react-native-permissions"
2576+
:path: "../node_modules/react-native-permissions"
25772577
Yoga:
25782578
:path: "../node_modules/react-native/ReactCommon/yoga"
25792579

@@ -2585,7 +2585,7 @@ SPEC CHECKSUMS:
25852585
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
25862586
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
25872587
hermes-engine: 7068e976238b29e97b3bafd09a994542af7d5c0b
2588-
mj-studio-react-native-naver-map: 4e15b3b3aee667b3e9807c08c64b554d56e52982
2588+
mj-studio-react-native-naver-map: 402d1e0e8e5c9642868cd14b333a9f97e04398c5
25892589
NMapsGeometry: 4e02554fa9880ef02ed96b075dc84355d6352479
25902590
NMapsMap: 1964e6f9073301ad3cbe3a12235ba36f6f6cd905
25912591
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
@@ -2621,7 +2621,7 @@ SPEC CHECKSUMS:
26212621
React-logger: dce52a571ba0e0149c3f0fcc6866cbc0c8552c5e
26222622
React-Mapbuffer: f5754c33877eaf36e4c76c613b35615a181c85c5
26232623
React-microtasksnativemodule: 23df6374a3ac422d8c2927839bcaeed61fee3dad
2624-
react-native-safe-area-context: 8ed800930eb7d0b6651218f69656e823d37b6ef7
2624+
react-native-safe-area-context: 01f6d357d42395422eed7c3bfe715614728f2989
26252625
react-native-slider: c434f7094c9500dfa1176931f48e5957872818f8
26262626
React-NativeModulesApple: e16d5c133019987285f001fbf1461a861e40426f
26272627
React-oscompat: 7c0a341cc31e350da71ddf2e46de0a845d1d1626
@@ -2652,9 +2652,9 @@ SPEC CHECKSUMS:
26522652
React-timing: a275a1c2e6112dba17f8f7dd496d439213bbea0d
26532653
React-utils: 449a6e1fd53886510e284e80bdbb1b1c6db29452
26542654
ReactAppDependencyProvider: 3267432b637c9b38e86961b287f784ee1b08dde0
2655-
ReactCodegen: 4f2c5fc558612d65fa4b1603e0b1a077f0923a25
2655+
ReactCodegen: 8112719bdd7e42a41884f141fa7db89b58b688c6
26562656
ReactCommon: b028d09a66e60ebd83ca59d8cc9a1216360db147
2657-
RNPermissions: ad33a305df700902acd482764b4885d2dea3a78e
2657+
RNPermissions: b4852ff5abd92e38116574072de87504dfb5c798
26582658
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
26592659
Yoga: 0c4b7d2aacc910a1f702694fa86be830386f4ceb
26602660

example/react-native.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ module.exports = {
99
'@react-native-community/slider': {
1010
root: path.resolve(
1111
__dirname,
12-
'../node_modules/@react-native-community/slider'
12+
'./node_modules/@react-native-community/slider'
1313
),
1414
},
1515
'react-native-permissions': {
16-
root: path.resolve(__dirname, '../node_modules/react-native-permissions'),
16+
root: path.resolve(__dirname, './node_modules/react-native-permissions'),
1717
},
1818
},
1919
};

lefthook.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ check:
4444
typecheck:example:
4545
root: example
4646
run: pnpm tsc --noEmit
47-
typecheck:docs:
48-
root: docs
49-
run: pnpm tsc --noEmit
5047
build-expo-config-plugin:
5148
run: pnpm build:expo-config-plugin
5249
build-package:
5350
run: pnpm bob build
5451
# build-docs:
5552
# run: pnpm build:docs
53+
# typecheck:docs:
54+
# root: docs
55+
# run: pnpm tsc --noEmit
5656

5757
commit-msg:
5858
commands:

0 commit comments

Comments
 (0)