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.

Sign up for GitHub

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

Jump to bottom

Make react-native-macos a monorepo #1908

Merged
merged 16 commits into from
Aug 22, 2023
Merged

Make react-native-macos a monorepo #1908

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
714b502
| RN Monorepo | Migrate to package (#36434)
hoxyq Mar 17, 2023
ff70cd9
Bulk rename of relevant files based on 714b502b0c7
Aug 12, 2023
828b941
Merge commit '714b502' into 0.72-merge-monorepo
Aug 17, 2023
d16b508
Fixes to get RNTester working
Aug 17, 2023
a6cbee6
Merge branch 'main' into 0.72-merge-monorepo
Aug 17, 2023
919a0cc
Remove !scratchwork folder
Aug 17, 2023
a8dffb2
Fix path to launchPackager.command in ADO CI
Aug 17, 2023
ccedd49
Publish to Verdaccio from packages folder
Aug 18, 2023
c778e72
Re-enable iOS integration tests (#37571)
Aug 18, 2023
3734682
Fix ado-test-setup after IntegrationTests move
Aug 18, 2023
f19cef8
Fix folder name
Aug 18, 2023
c051679
Specify project root when launching packager in ADO
Aug 21, 2023
5181a02
Rename reference snapshots folder
Aug 21, 2023
c799144
Fix RNTester release bundling
Aug 22, 2023
06194dc
Set valid platforms in RNTester metro.config.js
Aug 22, 2023
1a556a8
Add macOS tags
Aug 22, 2023
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
2 changes: 1 addition & 1 deletion packages/react-native/scripts/react-native-xcode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set -x
DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH

# Enables iOS devices to get the IP address of the machine running Metro
if [[ ! "$SKIP_BUNDLING_METRO_IP" && "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator ]]; then
if [[ ! "$SKIP_BUNDLING_METRO_IP" && "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator && ! "$PLATFORM_NAME" == macosx ]]; then
amgleitman marked this conversation as resolved.
Show resolved Hide resolved
for num in 0 1 2 3 4 5 6 7 8; do
IP=$(ipconfig getifaddr en${num})
if [ ! -z "$IP" ]; then
Expand Down
31 changes: 22 additions & 9 deletions packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,7 @@
ACC52F3A299ECB7A002A2B0B /* Sources */,
ACC52F3B299ECB7A002A2B0B /* Frameworks */,
ACC52F3C299ECB7A002A2B0B /* Resources */,
66F5AB8C2A94331500C16242 /* Build JS Bundle */,
63B9AC6D4098D9EDCCD7F242 /* [CP] Copy Pods Resources */,
);
buildRules = (
Expand Down Expand Up @@ -859,6 +860,24 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
66F5AB8C2A94331500C16242 /* Build JS Bundle */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Build JS Bundle";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "set -e\n\nexport PROJECT_ROOT=\"$SRCROOT/\"\nexport ENTRY_FILE=\"$SRCROOT/js/RNTesterApp.macos.js\"\nexport SOURCEMAP_FILE=./sourcemap.macos.map\n# export FORCE_BUNDLING=true \n\nWITH_ENVIRONMENT=\"../react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
};
Saadnajmi marked this conversation as resolved.
Show resolved Hide resolved
67D0F81A83A6269C88257DC7 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -912,7 +931,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "set -e\n\nexport PROJECT_ROOT=\"$SRCROOT/../react-native/\"\nexport ENTRY_FILE=\"$SRCROOT/js/RNTesterApp.ios.js\"\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true \n\nWITH_ENVIRONMENT=\"../react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
shellScript = "set -e\n\nexport PROJECT_ROOT=\"$SRCROOT/\"\nexport ENTRY_FILE=\"$SRCROOT/js/RNTesterApp.ios.js\"\nexport SOURCEMAP_FILE=./sourcemap.ios.map\n# export FORCE_BUNDLING=true \n\nWITH_ENVIRONMENT=\"../react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
};
79E8BE2B119D4C5CCD2F04B3 /* [RN] Copy Hermes Framework */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -1317,10 +1336,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
" ",
);
OTHER_CFLAGS = "$(inherited) ";
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
Expand Down Expand Up @@ -1398,10 +1414,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = (
"$(inherited)",
" ",
);
OTHER_CFLAGS = "$(inherited) ";
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
Expand Down
22 changes: 20 additions & 2 deletions packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester Release.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
Expand Down Expand Up @@ -132,9 +132,18 @@
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "RNTester.app"
BlueprintName = "RNTester"
ReferencedContainer = "container:RNTester.xcodeproj">
ReferencedContainer = "container:RNTesterPods.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "RNTester.app"
BlueprintName = "RNTester"
ReferencedContainer = "container:RNTester.xcodeproj">
</BuildableReference>
</MacroExpansion>
<EnvironmentVariables>
<EnvironmentVariable
key = "CI_USE_PACKAGER"
Expand All @@ -159,6 +168,15 @@
ReferencedContainer = "container:RNTester.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "RNTester.app"
BlueprintName = "RNTester"
ReferencedContainer = "container:RNTester.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
4 changes: 2 additions & 2 deletions ...s/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester-macOS Release.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
Expand Down Expand Up @@ -101,7 +101,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9F15345A233AB2C4006DFE44"
BlueprintIdentifier = "ACC52F3D299ECB7A002A2B0B"
BuildableName = "RNTester-macOS.app"
BlueprintName = "RNTester-macOS"
ReferencedContainer = "container:RNTesterPods.xcodeproj">
Expand Down
Loading