Skip to content

Commit ae8f4a6

Browse files
authored
Move @babylonjs/react-native out of Apps/Playground/node_modules (#56)
This is the setup I initially tried, which worked with React Native 0.59, but not with 0.61, but now it seems to be fixed in 0.63, so switching to this. This makes it a bit easier to work with because: - It's easier to find the module when just browsing the directory repo. - The module files will correct diff by default in GitHub PRs. - The module files will be more discoverable to tools like VS Code (which otherwise ignore directories named node_modules).
1 parent 9e48135 commit ae8f4a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+11833
-6134
lines changed

.github/workflows/pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
submodules: 'recursive'
1515
- name: Setup Ninja
1616
run: brew install ninja
17-
- name: Yarn Install (Playground)
18-
run: yarn install
17+
- name: NPM Install (Playground)
18+
run: npm install
1919
working-directory: ./Apps/Playground
2020
- name: NPM Install (Binary Package)
2121
run: npm install
@@ -31,8 +31,8 @@ jobs:
3131
uses: actions/[email protected]
3232
with:
3333
submodules: 'recursive'
34-
- name: Yarn Install (Playground)
35-
run: yarn install
34+
- name: NPM Install (Playground)
35+
run: npm install
3636
working-directory: ./Apps/Playground
3737
- name: NPM Install (Binary Package)
3838
run: npm install

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
submodules: 'recursive'
1414
- name: Setup Ninja
1515
run: brew install ninja
16-
- name: Yarn Install (Playground)
17-
run: yarn install
16+
- name: NPM Install (Playground)
17+
run: npm install
1818
working-directory: ./Apps/Playground
1919
- name: NPM Install (Binary Package)
2020
run: npm install

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "Core/react-native-babylon/submodules/BabylonNative"]
2-
path = Apps/Playground/node_modules/@babylonjs/react-native/submodules/BabylonNative
2+
path = Modules/@babylonjs/react-native/submodules/BabylonNative
33
url = https://github.com/BabylonJS/BabylonNative.git

Apps/Playground/.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ local.properties
3535

3636
# node.js
3737
#
38-
node_modules/*
38+
node_modules
3939
npm-debug.log
4040
yarn-error.log
4141

@@ -61,7 +61,3 @@ buck-out/
6161

6262
# CocoaPods
6363
/ios/Pods/
64-
65-
!node_modules/@babylonjs
66-
node_modules/@babylonjs/*
67-
!node_modules/@babylonjs/react-native

Apps/Playground/ios/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ DEPENDENCIES:
346346
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
347347
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
348348
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
349-
- "react-native-babylon (from `../node_modules/@babylonjs/react-native`)"
349+
- "react-native-babylon (from `../../../Modules/@babylonjs/react-native`)"
350350
- "react-native-slider (from `../node_modules/@react-native-community/slider`)"
351351
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
352352
- React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
@@ -410,7 +410,7 @@ EXTERNAL SOURCES:
410410
React-jsinspector:
411411
:path: "../node_modules/react-native/ReactCommon/jsinspector"
412412
react-native-babylon:
413-
:path: "../node_modules/@babylonjs/react-native"
413+
:path: "../../../Modules/@babylonjs/react-native"
414414
react-native-slider:
415415
:path: "../node_modules/@react-native-community/slider"
416416
React-RCTActionSheet:
@@ -455,7 +455,7 @@ SPEC CHECKSUMS:
455455
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
456456
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
457457
OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
458-
Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
458+
Permission-Camera: 53d46bd722aea28d796e20f05fb3cbe6cde6ccb6
459459
RCTRequired: e46bb77db03887b3e200d34b08515c804669db99
460460
RCTTypeSafety: 270fed6675c42f80fb87b47d626ef3cede1505e6
461461
React: e008906ff1328f9bccb345ff4f7826397ad223fc
@@ -467,7 +467,7 @@ SPEC CHECKSUMS:
467467
React-jsiexecutor: 0e0cb4e170ca72d4bb1179843d08dcbea3d100ac
468468
React-jsinspector: fc661eff8edbfb7e22119382c13f33bcadde0f3c
469469
react-native-babylon: 004630b2838450727c093bfcc30e05d5b08206c1
470-
react-native-slider: e51492f1264d882a8815b71c5870f8978e52887d
470+
react-native-slider: b34d943dc60deb96d952ba6b6b249aa8091e86da
471471
React-RCTActionSheet: aadd91a1d6cbfae50dd41f140004f816e9e47ade
472472
React-RCTAnimation: 7fa2ef6c0ef1e3f0b7d2261c827ec94412deb5e6
473473
React-RCTBlob: ccbbc70295aee3a76a70323b48f63fb7a7fcffd6
@@ -478,7 +478,7 @@ SPEC CHECKSUMS:
478478
React-RCTText: ba503bf4cce41881ca258ba789c33e017955efdd
479479
React-RCTVibration: 77ab1cf4a5eb854b88ad5ed3e9d8509ed124525e
480480
ReactCommon: f63556ee9e41e9802257228237e5e660451a03cf
481-
RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
481+
RNPermissions: 1888705aebcc81714efa5dbff94351e4388ae012
482482
Yoga: 7d2edc5b410474191962e6dee88ee67f9b328b6b
483483
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
484484

0 commit comments

Comments
 (0)