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

feat(native-app): Move app to nx #17098

Merged
merged 50 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
2f32ac5
feat: init nx create app stuff
thoreyjona Nov 27, 2024
7880424
feat: copy src folder from app project
thoreyjona Nov 27, 2024
f83290e
feat: add dependencies
thoreyjona Nov 27, 2024
9543b79
feat: updating podFile
thoreyjona Nov 28, 2024
e7bf8d2
feat copy ios folder from older project
thoreyjona Nov 28, 2024
f339076
feat: copy android folder
thoreyjona Nov 28, 2024
10bddbf
feat: final fixes for ios app working locally
thoreyjona Nov 28, 2024
2e81e5c
feat: remove old src folder
thoreyjona Nov 29, 2024
e9c413c
feat: add readme
thoreyjona Nov 29, 2024
533a9a4
feat: add storybook folder
thoreyjona Nov 29, 2024
e5c4d99
feat: add back test stuff in
thoreyjona Nov 29, 2024
938b6bb
feat: add more stuff from old project
thoreyjona Nov 29, 2024
061caf5
feat: add all scripts to package.json
thoreyjona Nov 29, 2024
abe6b7d
feat: update packages that still have * to proper version
thoreyjona Nov 29, 2024
b9a5dc7
feat: final additions
thoreyjona Nov 29, 2024
3f15a90
feat: renaming app folder and removing old native folder
thoreyjona Nov 29, 2024
a40222e
fix: remove mobile from workspaces
thoreyjona Dec 2, 2024
bd15079
fix: remove extra extension
thoreyjona Dec 2, 2024
0e80804
feat: add back root level read me
thoreyjona Dec 2, 2024
0a13841
feat: add prettier and bundle config files
thoreyjona Dec 2, 2024
2206100
remove google-services.json file
thoreyjona Dec 2, 2024
6ec5a3b
feat: update gitignore file
thoreyjona Dec 3, 2024
7182168
fix: path for e2e project.json
thoreyjona Dec 3, 2024
fd35a23
chore: bump version to 1.4.8
thoreyjona Dec 3, 2024
5baffd4
remove cache: true from nx.json
thoreyjona Dec 3, 2024
53e769a
add tags to project.json
thoreyjona Dec 3, 2024
a6338d0
feat: fix yarn.lock
thoreyjona Dec 3, 2024
8f489af
fix: valid json in nx.json
thoreyjona Dec 3, 2024
7f9936b
fix: remove app-e2e folder
thoreyjona Dec 3, 2024
dc69a15
fix: update package.json
thoreyjona Dec 3, 2024
f211b8c
feat: add license to package.json in app
thoreyjona Dec 3, 2024
acfd0b8
remove private: true to fix license check
thoreyjona Dec 3, 2024
b4a39c1
chore: nx format:write update dirty files
andes-it Dec 3, 2024
907e7b9
fix: remove dom from lib in tsconfig.json
thoreyjona Dec 3, 2024
40d2f2d
update entryFilein project.json
thoreyjona Dec 3, 2024
1b58ca4
fix: update settings.gradle after android build failing
thoreyjona Dec 3, 2024
7a95175
fix: update import from build.gradle
thoreyjona Dec 3, 2024
61c4062
feat: use relative import for ui
thoreyjona Dec 5, 2024
f53ff7b
fix: remove duplicates from gitignore
thoreyjona Dec 9, 2024
1d56045
fix: remove from tsconfig things that are already inherited
thoreyjona Dec 9, 2024
0ad3e55
chore: remove babel-plugin-module-resolver
thoreyjona Dec 9, 2024
f0f7c23
remove webpack.config.js
thoreyjona Dec 9, 2024
b1c9d16
fix: update package.json to have same version as package.json in app
thoreyjona Dec 9, 2024
efa20f7
fix: update yarn.lock
thoreyjona Dec 9, 2024
55cd03e
fix: linting
thoreyjona Dec 9, 2024
6e5b7d9
chore: update react version to match root project
thoreyjona Dec 10, 2024
dd8d437
chore: update Podfile
thoreyjona Dec 10, 2024
9886428
Merge branch 'main' into feat/use-nx-for-native-app
kodiakhq[bot] Dec 10, 2024
8f5e155
chore: remove patch for old version of rn
thoreyjona Dec 10, 2024
23052c0
Merge branch 'main' into feat/use-nx-for-native-app
kodiakhq[bot] Dec 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 67 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,70 @@ apps/**/index.html
# E2E outputs
test-results/
playwright-report/
tmp-sessions/
tmp-sessions/

# React Native

# Xcode
#
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.dSYM.zip
*.xcuserstate
**/.xcode.env.local
ios/*.cer
ios/*.certSigningRequest
ios/*.mobileprovision
thoreyjona marked this conversation as resolved.
Show resolved Hide resolved
ios/*.p12

# Android/IntelliJ
#
build/
.idea
.gradle
local.properties
*.iml
*.hprof
.cxx/
*.keystore
!debug.keystore
google-services.json
service-account.json

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/

**/fastlane/report.xml
**/fastlane/Preview.html
**/fastlane/screenshots
**/fastlane/test_output

# Bundle artifact
*.jsbundle

# Ruby / CocoaPods
**/Pods/
**/vendor/bundle/

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*

# testing
/coverage
Binary file not shown.
14 changes: 14 additions & 0 deletions apps/native/app/.babelrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = function (api) {
api.cache(true)

return {
presets: [
['module:@react-native/babel-preset', { useTransformReactJSX: true }],
],
plugins: [
// react-native-reanimated/plugin has to be listed last.
// Reason: In short, the Reanimated babel plugin automatically converts special JavaScript functions (called worklets) to allow them to be passed and run on the UI thread.
'react-native-reanimated/plugin',
],
}
}
2 changes: 1 addition & 1 deletion apps/native/app/.bundle/config
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
BUNDLE_PATH: "vendor/bundle"
BUNDLE_FORCE_RUBY_PLATFORM: 1
BUNDLE_FORCE_RUBY_PLATFORM: 1
11 changes: 8 additions & 3 deletions apps/native/app/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"**/*.stories.tsx",
"lib/pdf417/*-min.js"
],
"rules": {},
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
Expand All @@ -20,7 +19,13 @@
"func-style": "off"
}
},
{ "files": ["*.ts", "*.tsx"], "rules": {} },
{ "files": ["*.js", "*.jsx"], "rules": {} }
{
"files": ["*.ts", "*.tsx"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"rules": {}
}
]
}
81 changes: 0 additions & 81 deletions apps/native/app/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion apps/native/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ ruby ">= 2.6.10"
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
4 changes: 2 additions & 2 deletions apps/native/app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode getMyVersionCode(143)
versionName "1.4.7"
versionName "1.4.8"
manifestPlaceholders = [
appAuthRedirectScheme: "is.island.app" // project.config.get("BUNDLE_ID_ANDROID")
]
Expand Down Expand Up @@ -171,4 +171,4 @@ dependencies {
}
}

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)
4 changes: 2 additions & 2 deletions apps/native/app/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
rootProject.name = 'IslandApp'

apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle");
apply from: file("../../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle");
thoreyjona marked this conversation as resolved.
Show resolved Hide resolved
applyNativeModulesSettingsGradle(settings)

include ':app', ':react-native-code-push'
project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../../../../node_modules/react-native-code-push/android/app')

include ':react-native-clipboard'
project(':react-native-clipboard').projectDir = new File(rootProject.projectDir, '../../node_modules/@react-native-clipboard/clipboard/android')
thoreyjona marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
17 changes: 0 additions & 17 deletions apps/native/app/babel.config.js

This file was deleted.

10 changes: 5 additions & 5 deletions apps/native/app/ios/IslandApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../../../../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../../../../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
};
1D5D14183630A5603D9A6D3E /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -425,7 +425,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi\n";
shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../../../../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../../../../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -554,7 +554,7 @@
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
VALIDATE_PRODUCT = YES;
Expand Down Expand Up @@ -629,7 +629,7 @@
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
VALIDATE_PRODUCT = YES;
Expand Down Expand Up @@ -752,7 +752,7 @@
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
};
Expand Down
2 changes: 1 addition & 1 deletion apps/native/app/ios/IslandApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.7</string>
<string>1.4.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down
Loading
Loading