Skip to content

Commit fd8362f

Browse files
committed
Merge branch 'feature/new-arch' into develop
2 parents 9e0c981 + 50b91dc commit fd8362f

File tree

82 files changed

+15852
-22226
lines changed

Some content is hidden

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

82 files changed

+15852
-22226
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ node_modules
22
.expo
33
dist
44
*.tgz
5-
android
6-
ios
7-
.yarn
5+
.yarn/*
6+
!.yarn/releases
7+
!.yarnrc.yml

.yarn/releases/yarn-3.6.4.cjs

Lines changed: 874 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
nodeLinker: node-modules
2+
3+
yarnPath: .yarn/releases/yarn-3.6.4.cjs
4+
5+
nmHoistingLimits: workspaces # disable hoisting for all workspaces (causes issues with bare example)
6+

README.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -630,17 +630,11 @@ Contributions to this project are more than welcome.
630630
To get this project running locally:
631631
632632
1. Clone the Git repo.
633-
2. Run `yarn` to install the base dependencies
634-
3. Run `yarn setup` from the project root (this installs the example's additional dependencies)
635-
4. Run `yarn start` to start the example in Expo Go.
636-
5. Start adding cool stuff! Your changes should be immediately reflected in the Expo Go app.
633+
2. Run `yarn setup` from the project root (this installs the project dependencies and the examples' additional dependencies)
637634
638-
You can also run the library in bare React Native:
639-
640-
1. Clone the Git repo.
641-
2. Run `yarn` to install the base dependencies
642-
3. Run `yarn setup-dev`.
643-
4. Run `yarn start-bare:android` or `start-bare:ios` to start the project on an emulator/device.
635+
You can then start either the Expo example or the bare React Native example:
636+
- For Expo, run `yarn start` to start the Expo example in Expo Go.
637+
- For bare React Native, run `yarn start-bare:android` or `start-bare:ios` to start the project on an emulator/device.
644638
645639
### GitHub Guidelines
646640

example-bare/Gemfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

example-bare/app.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

example-bare/package.json

Lines changed: 0 additions & 36 deletions
This file was deleted.

example-bare/tsconfig.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)