Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Monorepo [2/?] - use hoisted dependencies for Reanimated, app common code and paper example #5999

Merged
merged 67 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
409fdc5
move github actions to root
tjzel May 8, 2024
079dc5b
fix android-build, validate-plugin, validate-yarn
tjzel May 8, 2024
d9f70d8
move annotation script and fix validators
tjzel May 8, 2024
4ee2a88
remove husky install step
tjzel May 8, 2024
19b2146
fix some validations and handle static checks
tjzel May 8, 2024
9487686
fix path for annotations
tjzel May 8, 2024
6cbe745
fix detect-borken-ulrs and check-ts-react-native
tjzel May 8, 2024
5260887
remove hardened mode flag for monorepo build
tjzel May 8, 2024
06ecd2d
fix docs-check and check-static-framework-nightly
tjzel May 8, 2024
70c56cd
fix build-next-example
tjzel May 8, 2024
bf0177c
fix more
tjzel May 8, 2024
62b8c3e
fix more
tjzel May 8, 2024
3d78462
more fixes
tjzel May 8, 2024
1e01e42
trying to fix some yarn.lock issues
tjzel May 8, 2024
e3d4b0d
lets see
tjzel May 8, 2024
6a32c82
disable hardened mode for v8
tjzel May 8, 2024
48c9d0c
v8 and monorepo are naughty
tjzel May 8, 2024
0a7576a
one more
tjzel May 8, 2024
818291e
testing
tjzel May 8, 2024
dfbf55b
testing v2
tjzel May 8, 2024
830c680
not sure what fails
tjzel May 8, 2024
cdaf155
yarn.lock ikd
tjzel May 8, 2024
7edb9f2
more debugging
tjzel May 8, 2024
f7dedbe
its starting to be painful
tjzel May 8, 2024
9f39505
corepack help
tjzel May 8, 2024
4bd7e9e
even more debugging
tjzel May 8, 2024
975099b
cleanup
tjzel May 9, 2024
58942ff
init
tjzel May 9, 2024
2ff1898
mergele upstream
tjzel May 9, 2024
e0126cf
mergele upstream
tjzel May 9, 2024
a84e67a
init
tjzel May 9, 2024
6606330
remove deps
tjzel May 9, 2024
67cb365
mergele upstream
tjzel May 9, 2024
02e5fdc
yarn.lock
tjzel May 9, 2024
b041080
init
tjzel May 9, 2024
4a33b72
only paper example for now
tjzel May 10, 2024
336ab36
fix CI
tjzel May 10, 2024
d56d000
mergele main
tjzel May 17, 2024
2b53648
Merge branch '@tjzel/monorepo' into @tjzel/monorepo-github-actions
tjzel May 17, 2024
bfeba89
Merge branch '@tjzel/monorepo' into @tjzel/monorepo-github-actions
tjzel May 17, 2024
e6b2ddd
fix plugin lint
tjzel May 17, 2024
a609884
mergele upstream
tjzel May 17, 2024
5633d52
mergele upstream
tjzel May 17, 2024
6a02ee6
mergele upstream
tjzel May 17, 2024
1dc8f74
rename
tjzel May 17, 2024
29cb135
create apps
tjzel May 17, 2024
692e079
add version for monorepo
tjzel May 17, 2024
9e2715f
remove duplicate app
tjzel May 17, 2024
b1cb47b
package jsons
tjzel May 20, 2024
1222399
Merge branch '@tjzel/monorepo-github-actions' into @tjzel/monorepo-hu…
tjzel May 20, 2024
41f54d1
add build script
tjzel May 20, 2024
d0e88a8
touch more CIs
tjzel May 20, 2024
6cabace
huh
tjzel May 20, 2024
a173b6d
npm package
tjzel May 20, 2024
4a4cd1b
remove rea2
tjzel May 20, 2024
4b7f8eb
Merge branch '@tjzel/monorepo' into @tjzel/monorepo-github-actions
tjzel May 29, 2024
d3d023d
Merge branch '@tjzel/monorepo-github-actions' into @tjzel/monorepo-hu…
tjzel May 29, 2024
dfae9eb
Merge branch '@tjzel/monorepo-husky-and-precommit' into @tjzel/monore…
tjzel May 29, 2024
24a3efe
fix
tjzel May 29, 2024
c8a4cab
fix
tjzel May 29, 2024
77c7eb9
Merge branch '@tjzel/monorepo-github-actions' into @tjzel/monorepo-hu…
tjzel May 29, 2024
e9e8df6
Merge branch '@tjzel/monorepo-husky-and-precommit' into @tjzel/monore…
tjzel May 29, 2024
f30730f
Merge branch '@tjzel/monorepo' into @tjzel/monorepo-husky-and-precommit
tjzel Jun 1, 2024
d88f930
Merge branch '@tjzel/monorepo-husky-and-precommit' into @tjzel/monore…
tjzel Jun 1, 2024
ccf87e3
better safe than sorry
tjzel Jun 5, 2024
daafff6
podfile.lock
tjzel Jun 5, 2024
9ea519d
Merge branch '@tjzel/monorepo' into @tjzel/monorepo-make-reanimated-a…
tjzel Jun 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 6 additions & 9 deletions .github/workflows/android-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
- .github/workflows/android-build.yml
- packages/react-native-reanimated/android/**
- packages/react-native-reanimated/Common/**
- packages/react-native-reanimated/Example/package.json
- packages/react-native-reanimated/Example/android/**
- apps/paper-example/package.json
- apps/paper-example/android/**
- packages/react-native-reanimated/FabricExample/package.json
- packages/react-native-reanimated/FabricExample/android/**
merge_group:
Expand All @@ -21,8 +21,8 @@ on:
- .github/workflows/android-build.yml
- packages/react-native-reanimated/android/**
- packages/react-native-reanimated/Common/**
- packages/react-native-reanimated/Example/package.json
- packages/react-native-reanimated/Example/android/**
- apps/paper-example/package.json
- apps/paper-example/android/**
- packages/react-native-reanimated/FabricExample/package.json
- packages/react-native-reanimated/FabricExample/android/**

Expand All @@ -33,10 +33,7 @@ jobs:
strategy:
matrix:
working-directory:
[
packages/react-native-reanimated/Example,
packages/react-native-reanimated/FabricExample,
]
[apps/paper-example, packages/react-native-reanimated/FabricExample]
fail-fast: false
concurrency:
group: android-${{ matrix.working-directory }}-${{ github.ref }}
Expand Down Expand Up @@ -74,7 +71,7 @@ jobs:

- name: Install app node_modules
working-directory: ${{ matrix.working-directory }}
run: yarn install --immutable
run: yarn install

- name: Build app
working-directory: ${{ matrix.working-directory }}/android
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/ios-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/apple/**
- packages/react-native-reanimated/Common/**
- packages/react-native-reanimated/Example/package.json
- packages/react-native-reanimated/Example/ios/**
- apps/paper-example/package.json
- apps/paper-example/ios/**
- packages/react-native-reanimated/FabricExample/package.json
- packages/react-native-reanimated/FabricExample/ios/**
merge_group:
Expand All @@ -25,8 +25,8 @@ on:
- packages/react-native-reanimated/scripts/reanimated_utils.rb
- packages/react-native-reanimated/apple/**
- packages/react-native-reanimated/Common/**
- packages/react-native-reanimated/Example/package.json
- packages/react-native-reanimated/Example/ios/**
- apps/paper-example/package.json
- apps/paper-example/ios/**
- packages/react-native-reanimated/FabricExample/package.json
- packages/react-native-reanimated/FabricExample/ios/**

Expand All @@ -37,10 +37,7 @@ jobs:
strategy:
matrix:
working-directory:
[
packages/react-native-reanimated/Example,
packages/react-native-reanimated/FabricExample,
]
[apps/paper-example, packages/react-native-reanimated/FabricExample]
fail-fast: false
concurrency:
group: ios-${{ matrix.working-directory }}-${{ github.ref }}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,14 +1,34 @@
{
"name": "common-app",
"private": true,
"scripts": {
"build": "yarn patch-package",
"lint": "eslint --max-warnings=0 ."
},
"peerDependencies": {
"@fortawesome/fontawesome-svg-core": "*",
"@fortawesome/free-solid-svg-icons": "*",
"@fortawesome/react-native-fontawesome": "*",
"@react-native-async-storage/async-storage": "*",
"@react-native-community/slider": "*",
"@react-native-masked-view/masked-view": "*",
"@react-native-picker/picker": "*",
"@react-navigation/native": "*",
"@react-navigation/native-stack": "*",
"@react-navigation/stack": "*",
"d3-shape": "*",
"react": "*",
"react-native": "*"
"react-dom": "*",
"react-native": "*",
"react-native-gesture-handler": "*",
"react-native-pager-view": "*",
"react-native-reanimated": "*",
"react-native-safe-area-context": "*",
"react-native-screens": "*",
"react-native-svg": "*",
"react-native-web": "*"
},
"dependencies": {
"devDependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-native-fontawesome": "^0.3.0",
Expand All @@ -19,23 +39,20 @@
"@react-navigation/native": "^6.1.9",
"@react-navigation/native-stack": "^6.9.17",
"@react-navigation/stack": "^6.3.18",
"@tsconfig/react-native": "^3.0.0",
"@types/d3-shape": "^3.1.1",
"d3-shape": "^3.2.0",
"eslint": "^8.0.0-0",
"patch-package": "^7.0.0",
"prettier": "^2.8.7",
"react-dom": "18.0.0",
"react-native-gesture-handler": "^2.16.2",
"react-native-gesture-handler": "^2.16.0",
"react-native-pager-view": "^6.2.3",
"react-native-reanimated": "link:../",
"react-native-reanimated": "workspace:*",
"react-native-safe-area-context": "4.10.0-rc.1",
"react-native-screens": "3.31.0-rc.1",
"react-native-svg": "^15.2.0-rc.0",
"react-native-web": "~0.18.12"
},
"devDependencies": {
"@tsconfig/react-native": "^3.0.0",
"@types/d3-shape": "^3.1.1",
"eslint": "^8.0.0-0",
"eslint-plugin-reanimated": "link:../eslintPlugin",
"patch-package": "^7.0.0",
"prettier": "^2.8.7",
"react-native-web": "~0.18.12",
"typescript": "^5.0.2"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "../react-native-reanimated/tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
Expand Down
3 changes: 3 additions & 0 deletions apps/paper-example/App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import App from 'common-app';

export default App;
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ react {
// The root of your project, i.e. where "package.json" lives. Default is '..'
// root = file("../")
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
// reactNativeDir = file("../node_modules/react-native")
reactNativeDir = file("../../../../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
// codegenDir = file("../node_modules/@react-native/codegen")
codegenDir = file("../../../../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
// cliFile = file("../node_modules/react-native/cli.js")
cliFile = file("../../../../node_modules/react-native/cli.js")

/* Variants */
// The list of variants to that are debuggable. For those we're going to
Expand Down Expand Up @@ -118,4 +118,4 @@ dependencies {
implementation("androidx.core:core-splashscreen:1.0.1")
}

apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
apply from: file("../../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
allprojects {
project.pluginManager.withPlugin("com.facebook.react") {
react {
reactNativeDir = rootProject.file("../../../node_modules/react-native/")
// codegenDir = rootProject.file("../../../node_modules/react-native-codegen/")
}
}
}
buildscript {
ext {
buildToolsVersion = "34.0.0"
Expand Down
4 changes: 4 additions & 0 deletions apps/paper-example/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
rootProject.name = 'ReanimatedExample'
apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':app'
includeBuild('../../../node_modules/@react-native/gradle-plugin')
4 changes: 4 additions & 0 deletions apps/paper-example/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
presets: ['module:@react-native/babel-preset'],
plugins: [['react-native-reanimated/plugin', {processNestedWorklets: true}]],
};
Loading
Loading