Make react-native-macos a monorepo#1908

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

Merged
Adam Gleitman (amgleitman) merged 16 commits into from
Aug 22, 2023
Merged

Make react-native-macos a monorepo #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
714b502
| RN Monorepo | Migrate to package (#36434)
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .ado/ado-test-setup.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ THIS_DIR=$PWD
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command\""

COMMAND="$TMPDIR/launchPackager.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./scripts/launchPackager.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; PROJECT_ROOT=packages/rn-tester ./packages/react-native/scripts/launchPackager.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForPackager

COMMAND="$TMPDIR/launchWebSocketServer.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./packages/rn-tester/IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForWebSocketServer
1 change: 1 addition & 0 deletions .ado/templates/verdaccio-publish.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ steps:
- script: |
npm publish --registry http://localhost:4873
displayName: Publish react-native-macos to verdaccio
workingDirectory: packages/react-native

- script: |
npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
Expand Down
16 changes: 8 additions & 8 deletions .circleci/Dockerfiles/Dockerfile.android
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,15 +32,15 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"
ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"

ADD .buckconfig /app/.buckconfig
ADD .buckjavaargs /app/.buckjavaargs
ADD BUCK /app/BUCK
ADD Libraries /app/Libraries
ADD ReactAndroid /app/ReactAndroid
ADD ReactCommon /app/ReactCommon
ADD React /app/React
ADD packages/react-native/Libraries /app/packages/react-native/Libraries
ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
ADD packages/react-native/React /app/packages/react-native/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
Expand All@@ -57,8 +57,8 @@ WORKDIR /app

RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

ADD gradle /app/gradle
ADD gradlew /app/gradlew
Expand All@@ -77,4 +77,4 @@ ADD . /app

RUN yarn

RUN ./gradlew :ReactAndroid:assembleDebug
RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug
2 changes: 1 addition & 1 deletion .circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ function e2e_suite() {
fi
fi

if ! npm pack
if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
then
echo "Failed to pack react-native"
return 1
Expand Down
77 changes: 40 additions & 37 deletions .circleci/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ references:
cache_keys:
checkout_cache_key: &checkout_cache_key v1-checkout
gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "packages/react-native/ReactAndroid/gradle.properties" }}
hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
Expand All@@ -73,8 +73,8 @@ references:

cache_paths:
hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths
- ~/react-native/sdks/hermes/build_macosx
- ~/react-native/sdks/hermes/destroot
- ~/react-native/packages/react-native/sdks/hermes/build_macosx
- ~/react-native/packages/react-native/sdks/hermes/destroot
hermes_tarball_cache_paths: &hermes_tarball_cache_paths
- *hermes_tarball_artifacts_dir

Expand DownExpand Up@@ -317,7 +317,7 @@ commands:
- run:
name: Get React Native version
command: |
VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
# Save the react native version we are building in a file so we can use that file as part of the cache key.
echo "$VERSION" > /tmp/react-native-version
echo "React Native Version is $(cat /tmp/react-native-version)"
Expand DownExpand Up@@ -371,7 +371,7 @@ commands:
exit 0
fi

TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME

echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
Expand All@@ -388,7 +388,7 @@ commands:
name: Print Hermes version
command: |
HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
if [[ -e $TARBALL_PATH ]]; then
tar -xf $TARBALL_PATH
Expand DownExpand Up@@ -455,8 +455,8 @@ commands:
hermesc_artifacts_path=<< parameters.artifacts_dir >>/<< parameters.flavor >>/hermesc

hermesc_bin_path=bin/hermesc
hermes_build_dir_macos=$(pwd)/sdks/hermes/build_macosx
hermes_build_dir_ios=$(pwd)/sdks/hermes/build_iphoneos
hermes_build_dir_macos=$(pwd)/packages/react-native/sdks/hermes/build_macosx
hermes_build_dir_ios=$(pwd)/packages/react-native/sdks/hermes/build_iphoneos

function export_hermesc_cmake_path {
build_dir=$1
Expand DownExpand Up@@ -729,7 +729,7 @@ jobs:
test_buck:
executor: reactnativeandroid
environment:
KOTLIN_HOME=third-party/kotlin
KOTLIN_HOME=packages/react-native/third-party/kotlin
steps:
- checkout
- setup_artifacts
Expand All@@ -742,32 +742,33 @@ jobs:
- run:
name: Build & Test React Native using Buck
command: |
buck build ReactAndroid/src/main/java/com/facebook/react
buck build ReactAndroid/src/main/java/com/facebook/react/shell
buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

- run:
name: Run Tests - Android Unit Tests with Buck
command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
command: buck test packages/react-native/ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml

- run:
name: Build JavaScript Bundle for instrumentation tests
working_directory: ~/react-native/packages/react-native
command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js

- run:
name: Build Tests - Android Instrumentation Tests with Buck
# Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
command: |
if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
if [[ ! -e packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
fi
source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build packages/react-native/ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS

- run:
name: Collect Test Results
command: |
find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
find . -type f -regex ".*/buck-out/gen/packages/react-native/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
fi
Expand DownExpand Up@@ -855,7 +856,7 @@ jobs:
command: |
REPO_ROOT=$(pwd)
node ./scripts/set-rn-template-version.js "file:$REPO_ROOT/build/$(cat build/react-native-package-version)"
node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
- run:
name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
command: |
Expand DownExpand Up@@ -930,7 +931,7 @@ jobs:
name: Set HERMES_ENGINE_TARBALL_PATH
command: |
BUILD_TYPE="<< parameters.flavor >>"
TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
echo "export HERMES_ENGINE_TARBALL_PATH=$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME" >> $BASH_ENV
- run:
name: Create iOS template project
Expand All@@ -939,7 +940,7 @@ jobs:
PACKAGE=$(cat build/react-native-package-version)
PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE"
node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
- run:
name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >>
command: |
Expand DownExpand Up@@ -1205,9 +1206,9 @@ jobs:
- run:
name: Download Hermes tarball
command: |
node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
cp sdks/download/* $HERMES_WS_DIR/download/.
cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
node packages/react-native/scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
cp packages/react-native/sdks/download/* $HERMES_WS_DIR/download/.
cp -r packages/react-native/sdks/hermes/* $HERMES_WS_DIR/hermes/.

cat /tmp/hermes/hermesversion
- save_cache:
Expand DownExpand Up@@ -1301,9 +1302,9 @@ jobs:
- run:
name: Set up workspace
command: |
mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./sdks/hermes
cp -r $HERMES_WS_DIR/hermes/* ./sdks/hermes/.
cp -r ./sdks/hermes-engine/utils ./sdks/hermes/.
mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./packages/react-native/sdks/hermes
cp -r $HERMES_WS_DIR/hermes/* ./packages/react-native/sdks/hermes/.
cp -r ./packages/react-native/sdks/hermes-engine/utils ./packages/react-native/sdks/hermes/.
- brew_install:
package: cmake
- with_hermes_tarball_cache_span:
Expand All@@ -1315,12 +1316,12 @@ jobs:
- run:
name: Build the Hermes Mac frameworks
command: |
cd ./sdks/hermes || exit 1
cd ./packages/react-native/sdks/hermes || exit 1
BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
- run:
name: Build the Hermes iOS frameworks
command: |
cd ./sdks/hermes || exit 1
cd ./packages/react-native/sdks/hermes || exit 1
BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh
- run:
name: Package the Hermes Apple frameworks
Expand All@@ -1330,12 +1331,12 @@ jobs:

TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)

TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")

echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"

TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
--inputDir ./sdks/hermes \
TARBALL_OUTPUT_PATH=$(node ./packages/react-native/scripts/hermes/create-tarball.js \
--inputDir ./packages/react-native/sdks/hermes \
--buildType "$BUILD_TYPE" \
--outputDir $TARBALL_OUTPUT_DIR)

Expand DownExpand Up@@ -1497,20 +1498,20 @@ jobs:
- run:
name: Copy Hermes binaries
command: |
mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
mkdir -p ./packages/react-native/sdks/hermesc ./packages/react-native/sdks/hermesc/osx-bin ./packages/react-native/sdks/hermesc/win64-bin ./packages/react-native/sdks/hermesc/linux64-bin

# When build_hermes_macos runs as a matrix, it outputs
if [[ -d $HERMES_WS_DIR/osx-bin/Release ]]; then
cp -r $HERMES_WS_DIR/osx-bin/Release/* ./sdks/hermesc/osx-bin/.
cp -r $HERMES_WS_DIR/osx-bin/Release/* ./packages/react-native/sdks/hermesc/osx-bin/.
elif [[ -d $HERMES_WS_DIR/osx-bin/Debug ]]; then
cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./sdks/hermesc/osx-bin/.
cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./packages/react-native/sdks/hermesc/osx-bin/.
else
ls $HERMES_WS_DIR/osx-bin || echo "hermesc macOS artifacts directory missing."
echo "Could not locate macOS hermesc binary."; exit 1;
fi

cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
cp -r $HERMES_WS_DIR/linux64-bin/* ./sdks/hermesc/linux64-bin/.
cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
mkdir -p ./ReactAndroid/external-artifacts/artifacts/
cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
Expand All@@ -1532,7 +1533,7 @@ jobs:
- run: node ./scripts/publish-npm.js --<< parameters.release_type >>
- run:
name: Zip Hermes Native Symbols
command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/packages/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
- store_artifacts:
path: /tmp/hermes-native-symbols.zip
- run:
Expand All@@ -1555,8 +1556,10 @@ jobs:
name: Build release package as a job artifact
command: |
mkdir -p build
FILENAME=$(npm pack)
mv $FILENAME build/

FILENAME=$(cd packages/react-native; npm pack | tail -1)
mv packages/react-native/$FILENAME build/

echo $FILENAME > build/react-native-package-version
- store_artifacts:
path: ~/react-native/build/
Expand Down
6 changes: 3 additions & 3 deletions .eslintignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
**/main.js
**/staticBundle.js
docs/generatedComponentApiDocs.js
flow/
Libraries/Renderer/*
Libraries/vendor/**/*
packages/react-native/flow/
packages/react-native/Libraries/Renderer/*
packages/react-native/Libraries/vendor/**/*
node_modules/
packages/*/node_modules
packages/react-native-codegen/lib
Expand Down
6 changes: 3 additions & 3 deletions .eslintrc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ module.exports = {
},

{
files: ['Libraries/**/*.js'],
files: ['packages/react-native/Libraries/**/*.js'],
rules: {
'@react-native/platform-colors': 2,
'@react-native/specs/react-native-modules': 2,
Expand All@@ -47,7 +47,7 @@ module.exports = {
},
},
{
files: ['flow-typed/**/*.js'],
files: ['packages/react-native/flow-typed/**/*.js'],
rules: {
'lint/valid-flow-typed-signature': 2,
'no-unused-vars': 0,
Expand All@@ -59,7 +59,7 @@ module.exports = {
'**/__fixtures__/**/*.js',
'**/__mocks__/**/*.js',
'**/__tests__/**/*.js',
'jest/**/*.js',
'packages/react-native/jest/**/*.js',
'packages/rn-tester/**/*.js',
],
globals: {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Make react-native-macos a monorepo#1908

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

 Merged

Adam Gleitman (amgleitman)
merged 16 commits into

from

Aug 22, 2023
 Merged


Make react-native-macos a monorepo
#1908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
714b502

| RN Monorepo | Migrate to package (#36434)

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

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

The diff you're trying to view is too large. We only load the first 3000 changed files.


4 changes: 2 additions & 2 deletions
.ado/ado-test-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ THIS_DIR=$PWD
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command\""

COMMAND="$TMPDIR/launchPackager.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./scripts/launchPackager.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; PROJECT_ROOT=packages/rn-tester ./packages/react-native/scripts/launchPackager.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForPackager

COMMAND="$TMPDIR/launchWebSocketServer.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./packages/rn-tester/IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForWebSocketServer

1 change: 1 addition & 0 deletions
.ado/templates/verdaccio-publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ steps:
 - script: |
 npm publish --registry http://localhost:4873
 displayName: Publish react-native-macos to verdaccio
 workingDirectory: packages/react-native

 - script: |
 npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
Expand Down

16 changes: 8 additions & 8 deletions
.circleci/Dockerfiles/Dockerfile.android

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,15 +32,15 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"
ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"

ADD .buckconfig /app/.buckconfig
ADD .buckjavaargs /app/.buckjavaargs
ADD BUCK /app/BUCK
ADD Libraries /app/Libraries
ADD ReactAndroid /app/ReactAndroid
ADD ReactCommon /app/ReactCommon
ADD React /app/React
ADD packages/react-native/Libraries /app/packages/react-native/Libraries
ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
ADD packages/react-native/React /app/packages/react-native/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
Expand All@@ -57,8 +57,8 @@ WORKDIR /app

RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

ADD gradle /app/gradle
ADD gradlew /app/gradlew
Expand All@@ -77,4 +77,4 @@ ADD . /app

RUN yarn

RUN ./gradlew :ReactAndroid:assembleDebug
RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug

2 changes: 1 addition & 1 deletion
.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ function e2e_suite() {
 fi
 fi

 if ! npm pack
 if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
 then
 echo "Failed to pack react-native"
 return 1
Expand Down

77 changes: 40 additions & 37 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ references:
 cache_keys:
 checkout_cache_key: &checkout_cache_key v1-checkout
 gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "packages/react-native/ReactAndroid/gradle.properties" }}
 hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
 hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
 hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
Expand All@@ -73,8 +73,8 @@ references:

 cache_paths:
 hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths
 - ~/react-native/sdks/hermes/build_macosx
 - ~/react-native/sdks/hermes/destroot
 - ~/react-native/packages/react-native/sdks/hermes/build_macosx
 - ~/react-native/packages/react-native/sdks/hermes/destroot
 hermes_tarball_cache_paths: &hermes_tarball_cache_paths
 - *hermes_tarball_artifacts_dir

Expand DownExpand Up@@ -317,7 +317,7 @@ commands:
 - run:
 name: Get React Native version
 command: |
 VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
 VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
 # Save the react native version we are building in a file so we can use that file as part of the cache key.
 echo "$VERSION" > /tmp/react-native-version
 echo "React Native Version is $(cat /tmp/react-native-version)"
Expand DownExpand Up@@ -371,7 +371,7 @@ commands:
 exit 0
 fi

 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME

 echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
Expand All@@ -388,7 +388,7 @@ commands:
 name: Print Hermes version
 command: |
 HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
 if [[ -e $TARBALL_PATH ]]; then
 tar -xf $TARBALL_PATH
Expand DownExpand Up@@ -455,8 +455,8 @@ commands:
 hermesc_artifacts_path=<< parameters.artifacts_dir >>/<< parameters.flavor >>/hermesc

 hermesc_bin_path=bin/hermesc
 hermes_build_dir_macos=$(pwd)/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/sdks/hermes/build_iphoneos
 hermes_build_dir_macos=$(pwd)/packages/react-native/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/packages/react-native/sdks/hermes/build_iphoneos

 function export_hermesc_cmake_path {
 build_dir=$1
Expand DownExpand Up@@ -729,7 +729,7 @@ jobs:
 test_buck:
 executor: reactnativeandroid
 environment:
 KOTLIN_HOME=third-party/kotlin
 KOTLIN_HOME=packages/react-native/third-party/kotlin
 steps:
 - checkout
 - setup_artifacts
Expand All@@ -742,32 +742,33 @@ jobs:
 - run:
 name: Build & Test React Native using Buck
 command: |
 buck build ReactAndroid/src/main/java/com/facebook/react
 buck build ReactAndroid/src/main/java/com/facebook/react/shell
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

 - run:
 name: Run Tests - Android Unit Tests with Buck
 command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
 command: buck test packages/react-native/ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml

 - run:
 name: Build JavaScript Bundle for instrumentation tests
 working_directory: ~/react-native/packages/react-native
 command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js

 - run:
 name: Build Tests - Android Instrumentation Tests with Buck
 # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
 command: |
 if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 if [[ ! -e packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
 fi
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build packages/react-native/ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS

 - run:
 name: Collect Test Results
 command: |
 find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
 find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
 find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 find . -type f -regex ".*/buck-out/gen/packages/react-native/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
 ~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
 fi
Expand DownExpand Up@@ -855,7 +856,7 @@ jobs:
 command: |
 REPO_ROOT=$(pwd)
 node ./scripts/set-rn-template-version.js "file:$REPO_ROOT/build/$(cat build/react-native-package-version)"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
 command: |
Expand DownExpand Up@@ -930,7 +931,7 @@ jobs:
 name: Set HERMES_ENGINE_TARBALL_PATH
 command: |
 BUILD_TYPE="<< parameters.flavor >>"
 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 echo "export HERMES_ENGINE_TARBALL_PATH=$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME" >> $BASH_ENV
 - run:
 name: Create iOS template project
Expand All@@ -939,7 +940,7 @@ jobs:
 PACKAGE=$(cat build/react-native-package-version)
 PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
 node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >>
 command: |
Expand DownExpand Up@@ -1205,9 +1206,9 @@ jobs:
 - run:
 name: Download Hermes tarball
 command: |
 node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp sdks/download/* $HERMES_WS_DIR/download/.
 cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
 node packages/react-native/scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp packages/react-native/sdks/download/* $HERMES_WS_DIR/download/.
 cp -r packages/react-native/sdks/hermes/* $HERMES_WS_DIR/hermes/.

 cat /tmp/hermes/hermesversion
 - save_cache:
Expand DownExpand Up@@ -1301,9 +1302,9 @@ jobs:
 - run:
 name: Set up workspace
 command: |
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./sdks/hermes/.
 cp -r ./sdks/hermes-engine/utils ./sdks/hermes/.
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./packages/react-native/sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./packages/react-native/sdks/hermes/.
 cp -r ./packages/react-native/sdks/hermes-engine/utils ./packages/react-native/sdks/hermes/.
 - brew_install:
 package: cmake
 - with_hermes_tarball_cache_span:
Expand All@@ -1315,12 +1316,12 @@ jobs:
 - run:
 name: Build the Hermes Mac frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
 - run:
 name: Build the Hermes iOS frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh
 - run:
 name: Package the Hermes Apple frameworks
Expand All@@ -1330,12 +1331,12 @@ jobs:

 TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)

 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")

 echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"

 TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
 --inputDir ./sdks/hermes \
 TARBALL_OUTPUT_PATH=$(node ./packages/react-native/scripts/hermes/create-tarball.js \
 --inputDir ./packages/react-native/sdks/hermes \
 --buildType "$BUILD_TYPE" \
 --outputDir $TARBALL_OUTPUT_DIR)

Expand DownExpand Up@@ -1497,20 +1498,20 @@ jobs:
 - run:
 name: Copy Hermes binaries
 command: |
 mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
 mkdir -p ./packages/react-native/sdks/hermesc ./packages/react-native/sdks/hermesc/osx-bin ./packages/react-native/sdks/hermesc/win64-bin ./packages/react-native/sdks/hermesc/linux64-bin

 # When build_hermes_macos runs as a matrix, it outputs
 if [[ -d $HERMES_WS_DIR/osx-bin/Release ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./packages/react-native/sdks/hermesc/osx-bin/.
 elif [[ -d $HERMES_WS_DIR/osx-bin/Debug ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./packages/react-native/sdks/hermesc/osx-bin/.
 else
 ls $HERMES_WS_DIR/osx-bin || echo "hermesc macOS artifacts directory missing."
 echo "Could not locate macOS hermesc binary."; exit 1;
 fi

 cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./sdks/hermesc/linux64-bin/.
 cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
 mkdir -p ./ReactAndroid/external-artifacts/artifacts/
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
Expand All@@ -1532,7 +1533,7 @@ jobs:
 - run: node ./scripts/publish-npm.js --<< parameters.release_type >>
 - run:
 name: Zip Hermes Native Symbols
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/packages/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 - store_artifacts:
 path: /tmp/hermes-native-symbols.zip
 - run:
Expand All@@ -1555,8 +1556,10 @@ jobs:
 name: Build release package as a job artifact
 command: |
 mkdir -p build
 FILENAME=$(npm pack)
 mv $FILENAME build/

 FILENAME=$(cd packages/react-native; npm pack | tail -1)
 mv packages/react-native/$FILENAME build/

 echo $FILENAME > build/react-native-package-version
 - store_artifacts:
 path: ~/react-native/build/
Expand Down

6 changes: 3 additions & 3 deletions
.eslintignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
**/main.js
**/staticBundle.js
docs/generatedComponentApiDocs.js
flow/
Libraries/Renderer/*
Libraries/vendor/**/*
packages/react-native/flow/
packages/react-native/Libraries/Renderer/*
packages/react-native/Libraries/vendor/**/*
node_modules/
packages/*/node_modules
packages/react-native-codegen/lib
Expand Down

6 changes: 3 additions & 3 deletions
.eslintrc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ module.exports = {
 },

 {
 files: ['Libraries/**/*.js'],
 files: ['packages/react-native/Libraries/**/*.js'],
 rules: {
 '@react-native/platform-colors': 2,
 '@react-native/specs/react-native-modules': 2,
Expand All@@ -47,7 +47,7 @@ module.exports = {
 },
 },
 {
 files: ['flow-typed/**/*.js'],
 files: ['packages/react-native/flow-typed/**/*.js'],
 rules: {
 'lint/valid-flow-typed-signature': 2,
 'no-unused-vars': 0,
Expand All@@ -59,7 +59,7 @@ module.exports = {
 '**/__fixtures__/**/*.js',
 '**/__mocks__/**/*.js',
 '**/__tests__/**/*.js',
 'jest/**/*.js',
 'packages/react-native/jest/**/*.js',
 'packages/rn-tester/**/*.js',
 ],
 globals: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make react-native-macos a monorepo#1908

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

 Merged

Adam Gleitman (amgleitman)
merged 16 commits into

from

Aug 22, 2023
 Merged


Make react-native-macos a monorepo
#1908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
714b502

| RN Monorepo | Migrate to package (#36434)

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

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

The diff you're trying to view is too large. We only load the first 3000 changed files.


4 changes: 2 additions & 2 deletions
.ado/ado-test-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ THIS_DIR=$PWD
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command\""

COMMAND="$TMPDIR/launchPackager.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./scripts/launchPackager.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; PROJECT_ROOT=packages/rn-tester ./packages/react-native/scripts/launchPackager.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForPackager

COMMAND="$TMPDIR/launchWebSocketServer.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./packages/rn-tester/IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForWebSocketServer

1 change: 1 addition & 0 deletions
.ado/templates/verdaccio-publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ steps:
 - script: |
 npm publish --registry http://localhost:4873
 displayName: Publish react-native-macos to verdaccio
 workingDirectory: packages/react-native

 - script: |
 npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
Expand Down

16 changes: 8 additions & 8 deletions
.circleci/Dockerfiles/Dockerfile.android

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,15 +32,15 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"
ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"

ADD .buckconfig /app/.buckconfig
ADD .buckjavaargs /app/.buckjavaargs
ADD BUCK /app/BUCK
ADD Libraries /app/Libraries
ADD ReactAndroid /app/ReactAndroid
ADD ReactCommon /app/ReactCommon
ADD React /app/React
ADD packages/react-native/Libraries /app/packages/react-native/Libraries
ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
ADD packages/react-native/React /app/packages/react-native/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
Expand All@@ -57,8 +57,8 @@ WORKDIR /app

RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

ADD gradle /app/gradle
ADD gradlew /app/gradlew
Expand All@@ -77,4 +77,4 @@ ADD . /app

RUN yarn

RUN ./gradlew :ReactAndroid:assembleDebug
RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug

2 changes: 1 addition & 1 deletion
.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ function e2e_suite() {
 fi
 fi

 if ! npm pack
 if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
 then
 echo "Failed to pack react-native"
 return 1
Expand Down

77 changes: 40 additions & 37 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ references:
 cache_keys:
 checkout_cache_key: &checkout_cache_key v1-checkout
 gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "packages/react-native/ReactAndroid/gradle.properties" }}
 hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
 hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
 hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
Expand All@@ -73,8 +73,8 @@ references:

 cache_paths:
 hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths
 - ~/react-native/sdks/hermes/build_macosx
 - ~/react-native/sdks/hermes/destroot
 - ~/react-native/packages/react-native/sdks/hermes/build_macosx
 - ~/react-native/packages/react-native/sdks/hermes/destroot
 hermes_tarball_cache_paths: &hermes_tarball_cache_paths
 - *hermes_tarball_artifacts_dir

Expand DownExpand Up@@ -317,7 +317,7 @@ commands:
 - run:
 name: Get React Native version
 command: |
 VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
 VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
 # Save the react native version we are building in a file so we can use that file as part of the cache key.
 echo "$VERSION" > /tmp/react-native-version
 echo "React Native Version is $(cat /tmp/react-native-version)"
Expand DownExpand Up@@ -371,7 +371,7 @@ commands:
 exit 0
 fi

 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME

 echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
Expand All@@ -388,7 +388,7 @@ commands:
 name: Print Hermes version
 command: |
 HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
 if [[ -e $TARBALL_PATH ]]; then
 tar -xf $TARBALL_PATH
Expand DownExpand Up@@ -455,8 +455,8 @@ commands:
 hermesc_artifacts_path=<< parameters.artifacts_dir >>/<< parameters.flavor >>/hermesc

 hermesc_bin_path=bin/hermesc
 hermes_build_dir_macos=$(pwd)/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/sdks/hermes/build_iphoneos
 hermes_build_dir_macos=$(pwd)/packages/react-native/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/packages/react-native/sdks/hermes/build_iphoneos

 function export_hermesc_cmake_path {
 build_dir=$1
Expand DownExpand Up@@ -729,7 +729,7 @@ jobs:
 test_buck:
 executor: reactnativeandroid
 environment:
 KOTLIN_HOME=third-party/kotlin
 KOTLIN_HOME=packages/react-native/third-party/kotlin
 steps:
 - checkout
 - setup_artifacts
Expand All@@ -742,32 +742,33 @@ jobs:
 - run:
 name: Build & Test React Native using Buck
 command: |
 buck build ReactAndroid/src/main/java/com/facebook/react
 buck build ReactAndroid/src/main/java/com/facebook/react/shell
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

 - run:
 name: Run Tests - Android Unit Tests with Buck
 command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
 command: buck test packages/react-native/ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml

 - run:
 name: Build JavaScript Bundle for instrumentation tests
 working_directory: ~/react-native/packages/react-native
 command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js

 - run:
 name: Build Tests - Android Instrumentation Tests with Buck
 # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
 command: |
 if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 if [[ ! -e packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
 fi
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build packages/react-native/ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS

 - run:
 name: Collect Test Results
 command: |
 find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
 find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
 find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 find . -type f -regex ".*/buck-out/gen/packages/react-native/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
 ~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
 fi
Expand DownExpand Up@@ -855,7 +856,7 @@ jobs:
 command: |
 REPO_ROOT=$(pwd)
 node ./scripts/set-rn-template-version.js "file:$REPO_ROOT/build/$(cat build/react-native-package-version)"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
 command: |
Expand DownExpand Up@@ -930,7 +931,7 @@ jobs:
 name: Set HERMES_ENGINE_TARBALL_PATH
 command: |
 BUILD_TYPE="<< parameters.flavor >>"
 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 echo "export HERMES_ENGINE_TARBALL_PATH=$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME" >> $BASH_ENV
 - run:
 name: Create iOS template project
Expand All@@ -939,7 +940,7 @@ jobs:
 PACKAGE=$(cat build/react-native-package-version)
 PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
 node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >>
 command: |
Expand DownExpand Up@@ -1205,9 +1206,9 @@ jobs:
 - run:
 name: Download Hermes tarball
 command: |
 node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp sdks/download/* $HERMES_WS_DIR/download/.
 cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
 node packages/react-native/scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp packages/react-native/sdks/download/* $HERMES_WS_DIR/download/.
 cp -r packages/react-native/sdks/hermes/* $HERMES_WS_DIR/hermes/.

 cat /tmp/hermes/hermesversion
 - save_cache:
Expand DownExpand Up@@ -1301,9 +1302,9 @@ jobs:
 - run:
 name: Set up workspace
 command: |
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./sdks/hermes/.
 cp -r ./sdks/hermes-engine/utils ./sdks/hermes/.
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./packages/react-native/sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./packages/react-native/sdks/hermes/.
 cp -r ./packages/react-native/sdks/hermes-engine/utils ./packages/react-native/sdks/hermes/.
 - brew_install:
 package: cmake
 - with_hermes_tarball_cache_span:
Expand All@@ -1315,12 +1316,12 @@ jobs:
 - run:
 name: Build the Hermes Mac frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
 - run:
 name: Build the Hermes iOS frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh
 - run:
 name: Package the Hermes Apple frameworks
Expand All@@ -1330,12 +1331,12 @@ jobs:

 TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)

 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")

 echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"

 TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
 --inputDir ./sdks/hermes \
 TARBALL_OUTPUT_PATH=$(node ./packages/react-native/scripts/hermes/create-tarball.js \
 --inputDir ./packages/react-native/sdks/hermes \
 --buildType "$BUILD_TYPE" \
 --outputDir $TARBALL_OUTPUT_DIR)

Expand DownExpand Up@@ -1497,20 +1498,20 @@ jobs:
 - run:
 name: Copy Hermes binaries
 command: |
 mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
 mkdir -p ./packages/react-native/sdks/hermesc ./packages/react-native/sdks/hermesc/osx-bin ./packages/react-native/sdks/hermesc/win64-bin ./packages/react-native/sdks/hermesc/linux64-bin

 # When build_hermes_macos runs as a matrix, it outputs
 if [[ -d $HERMES_WS_DIR/osx-bin/Release ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./packages/react-native/sdks/hermesc/osx-bin/.
 elif [[ -d $HERMES_WS_DIR/osx-bin/Debug ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./packages/react-native/sdks/hermesc/osx-bin/.
 else
 ls $HERMES_WS_DIR/osx-bin || echo "hermesc macOS artifacts directory missing."
 echo "Could not locate macOS hermesc binary."; exit 1;
 fi

 cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./sdks/hermesc/linux64-bin/.
 cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
 mkdir -p ./ReactAndroid/external-artifacts/artifacts/
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
Expand All@@ -1532,7 +1533,7 @@ jobs:
 - run: node ./scripts/publish-npm.js --<< parameters.release_type >>
 - run:
 name: Zip Hermes Native Symbols
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/packages/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 - store_artifacts:
 path: /tmp/hermes-native-symbols.zip
 - run:
Expand All@@ -1555,8 +1556,10 @@ jobs:
 name: Build release package as a job artifact
 command: |
 mkdir -p build
 FILENAME=$(npm pack)
 mv $FILENAME build/

 FILENAME=$(cd packages/react-native; npm pack | tail -1)
 mv packages/react-native/$FILENAME build/

 echo $FILENAME > build/react-native-package-version
 - store_artifacts:
 path: ~/react-native/build/
Expand Down

6 changes: 3 additions & 3 deletions
.eslintignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
**/main.js
**/staticBundle.js
docs/generatedComponentApiDocs.js
flow/
Libraries/Renderer/*
Libraries/vendor/**/*
packages/react-native/flow/
packages/react-native/Libraries/Renderer/*
packages/react-native/Libraries/vendor/**/*
node_modules/
packages/*/node_modules
packages/react-native-codegen/lib
Expand Down

6 changes: 3 additions & 3 deletions
.eslintrc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ module.exports = {
 },

 {
 files: ['Libraries/**/*.js'],
 files: ['packages/react-native/Libraries/**/*.js'],
 rules: {
 '@react-native/platform-colors': 2,
 '@react-native/specs/react-native-modules': 2,
Expand All@@ -47,7 +47,7 @@ module.exports = {
 },
 },
 {
 files: ['flow-typed/**/*.js'],
 files: ['packages/react-native/flow-typed/**/*.js'],
 rules: {
 'lint/valid-flow-typed-signature': 2,
 'no-unused-vars': 0,
Expand All@@ -59,7 +59,7 @@ module.exports = {
 '**/__fixtures__/**/*.js',
 '**/__mocks__/**/*.js',
 '**/__tests__/**/*.js',
 'jest/**/*.js',
 'packages/react-native/jest/**/*.js',
 'packages/rn-tester/**/*.js',
 ],
 globals: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make react-native-macos a monorepo#1908

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

 Merged

Adam Gleitman (amgleitman)
merged 16 commits into

from

Aug 22, 2023
 Merged


Make react-native-macos a monorepo
#1908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
714b502

| RN Monorepo | Migrate to package (#36434)

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

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

The diff you're trying to view is too large. We only load the first 3000 changed files.


4 changes: 2 additions & 2 deletions
.ado/ado-test-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ THIS_DIR=$PWD
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command\""

COMMAND="$TMPDIR/launchPackager.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./scripts/launchPackager.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; PROJECT_ROOT=packages/rn-tester ./packages/react-native/scripts/launchPackager.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForPackager

COMMAND="$TMPDIR/launchWebSocketServer.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./packages/rn-tester/IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForWebSocketServer

1 change: 1 addition & 0 deletions
.ado/templates/verdaccio-publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ steps:
 - script: |
 npm publish --registry http://localhost:4873
 displayName: Publish react-native-macos to verdaccio
 workingDirectory: packages/react-native

 - script: |
 npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
Expand Down

16 changes: 8 additions & 8 deletions
.circleci/Dockerfiles/Dockerfile.android

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,15 +32,15 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"
ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"

ADD .buckconfig /app/.buckconfig
ADD .buckjavaargs /app/.buckjavaargs
ADD BUCK /app/BUCK
ADD Libraries /app/Libraries
ADD ReactAndroid /app/ReactAndroid
ADD ReactCommon /app/ReactCommon
ADD React /app/React
ADD packages/react-native/Libraries /app/packages/react-native/Libraries
ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
ADD packages/react-native/React /app/packages/react-native/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
Expand All@@ -57,8 +57,8 @@ WORKDIR /app

RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

ADD gradle /app/gradle
ADD gradlew /app/gradlew
Expand All@@ -77,4 +77,4 @@ ADD . /app

RUN yarn

RUN ./gradlew :ReactAndroid:assembleDebug
RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug

2 changes: 1 addition & 1 deletion
.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ function e2e_suite() {
 fi
 fi

 if ! npm pack
 if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
 then
 echo "Failed to pack react-native"
 return 1
Expand Down

77 changes: 40 additions & 37 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ references:
 cache_keys:
 checkout_cache_key: &checkout_cache_key v1-checkout
 gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "packages/react-native/ReactAndroid/gradle.properties" }}
 hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
 hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
 hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
Expand All@@ -73,8 +73,8 @@ references:

 cache_paths:
 hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths
 - ~/react-native/sdks/hermes/build_macosx
 - ~/react-native/sdks/hermes/destroot
 - ~/react-native/packages/react-native/sdks/hermes/build_macosx
 - ~/react-native/packages/react-native/sdks/hermes/destroot
 hermes_tarball_cache_paths: &hermes_tarball_cache_paths
 - *hermes_tarball_artifacts_dir

Expand DownExpand Up@@ -317,7 +317,7 @@ commands:
 - run:
 name: Get React Native version
 command: |
 VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
 VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
 # Save the react native version we are building in a file so we can use that file as part of the cache key.
 echo "$VERSION" > /tmp/react-native-version
 echo "React Native Version is $(cat /tmp/react-native-version)"
Expand DownExpand Up@@ -371,7 +371,7 @@ commands:
 exit 0
 fi

 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME

 echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
Expand All@@ -388,7 +388,7 @@ commands:
 name: Print Hermes version
 command: |
 HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
 if [[ -e $TARBALL_PATH ]]; then
 tar -xf $TARBALL_PATH
Expand DownExpand Up@@ -455,8 +455,8 @@ commands:
 hermesc_artifacts_path=<< parameters.artifacts_dir >>/<< parameters.flavor >>/hermesc

 hermesc_bin_path=bin/hermesc
 hermes_build_dir_macos=$(pwd)/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/sdks/hermes/build_iphoneos
 hermes_build_dir_macos=$(pwd)/packages/react-native/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/packages/react-native/sdks/hermes/build_iphoneos

 function export_hermesc_cmake_path {
 build_dir=$1
Expand DownExpand Up@@ -729,7 +729,7 @@ jobs:
 test_buck:
 executor: reactnativeandroid
 environment:
 KOTLIN_HOME=third-party/kotlin
 KOTLIN_HOME=packages/react-native/third-party/kotlin
 steps:
 - checkout
 - setup_artifacts
Expand All@@ -742,32 +742,33 @@ jobs:
 - run:
 name: Build & Test React Native using Buck
 command: |
 buck build ReactAndroid/src/main/java/com/facebook/react
 buck build ReactAndroid/src/main/java/com/facebook/react/shell
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

 - run:
 name: Run Tests - Android Unit Tests with Buck
 command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
 command: buck test packages/react-native/ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml

 - run:
 name: Build JavaScript Bundle for instrumentation tests
 working_directory: ~/react-native/packages/react-native
 command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js

 - run:
 name: Build Tests - Android Instrumentation Tests with Buck
 # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
 command: |
 if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 if [[ ! -e packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
 fi
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build packages/react-native/ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS

 - run:
 name: Collect Test Results
 command: |
 find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
 find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
 find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 find . -type f -regex ".*/buck-out/gen/packages/react-native/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
 ~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
 fi
Expand DownExpand Up@@ -855,7 +856,7 @@ jobs:
 command: |
 REPO_ROOT=$(pwd)
 node ./scripts/set-rn-template-version.js "file:$REPO_ROOT/build/$(cat build/react-native-package-version)"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
 command: |
Expand DownExpand Up@@ -930,7 +931,7 @@ jobs:
 name: Set HERMES_ENGINE_TARBALL_PATH
 command: |
 BUILD_TYPE="<< parameters.flavor >>"
 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 echo "export HERMES_ENGINE_TARBALL_PATH=$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME" >> $BASH_ENV
 - run:
 name: Create iOS template project
Expand All@@ -939,7 +940,7 @@ jobs:
 PACKAGE=$(cat build/react-native-package-version)
 PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
 node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >>
 command: |
Expand DownExpand Up@@ -1205,9 +1206,9 @@ jobs:
 - run:
 name: Download Hermes tarball
 command: |
 node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp sdks/download/* $HERMES_WS_DIR/download/.
 cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
 node packages/react-native/scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp packages/react-native/sdks/download/* $HERMES_WS_DIR/download/.
 cp -r packages/react-native/sdks/hermes/* $HERMES_WS_DIR/hermes/.

 cat /tmp/hermes/hermesversion
 - save_cache:
Expand DownExpand Up@@ -1301,9 +1302,9 @@ jobs:
 - run:
 name: Set up workspace
 command: |
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./sdks/hermes/.
 cp -r ./sdks/hermes-engine/utils ./sdks/hermes/.
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./packages/react-native/sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./packages/react-native/sdks/hermes/.
 cp -r ./packages/react-native/sdks/hermes-engine/utils ./packages/react-native/sdks/hermes/.
 - brew_install:
 package: cmake
 - with_hermes_tarball_cache_span:
Expand All@@ -1315,12 +1316,12 @@ jobs:
 - run:
 name: Build the Hermes Mac frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
 - run:
 name: Build the Hermes iOS frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh
 - run:
 name: Package the Hermes Apple frameworks
Expand All@@ -1330,12 +1331,12 @@ jobs:

 TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)

 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")

 echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"

 TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
 --inputDir ./sdks/hermes \
 TARBALL_OUTPUT_PATH=$(node ./packages/react-native/scripts/hermes/create-tarball.js \
 --inputDir ./packages/react-native/sdks/hermes \
 --buildType "$BUILD_TYPE" \
 --outputDir $TARBALL_OUTPUT_DIR)

Expand DownExpand Up@@ -1497,20 +1498,20 @@ jobs:
 - run:
 name: Copy Hermes binaries
 command: |
 mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
 mkdir -p ./packages/react-native/sdks/hermesc ./packages/react-native/sdks/hermesc/osx-bin ./packages/react-native/sdks/hermesc/win64-bin ./packages/react-native/sdks/hermesc/linux64-bin

 # When build_hermes_macos runs as a matrix, it outputs
 if [[ -d $HERMES_WS_DIR/osx-bin/Release ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./packages/react-native/sdks/hermesc/osx-bin/.
 elif [[ -d $HERMES_WS_DIR/osx-bin/Debug ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./packages/react-native/sdks/hermesc/osx-bin/.
 else
 ls $HERMES_WS_DIR/osx-bin || echo "hermesc macOS artifacts directory missing."
 echo "Could not locate macOS hermesc binary."; exit 1;
 fi

 cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./sdks/hermesc/linux64-bin/.
 cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
 mkdir -p ./ReactAndroid/external-artifacts/artifacts/
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
Expand All@@ -1532,7 +1533,7 @@ jobs:
 - run: node ./scripts/publish-npm.js --<< parameters.release_type >>
 - run:
 name: Zip Hermes Native Symbols
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/packages/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 - store_artifacts:
 path: /tmp/hermes-native-symbols.zip
 - run:
Expand All@@ -1555,8 +1556,10 @@ jobs:
 name: Build release package as a job artifact
 command: |
 mkdir -p build
 FILENAME=$(npm pack)
 mv $FILENAME build/

 FILENAME=$(cd packages/react-native; npm pack | tail -1)
 mv packages/react-native/$FILENAME build/

 echo $FILENAME > build/react-native-package-version
 - store_artifacts:
 path: ~/react-native/build/
Expand Down

6 changes: 3 additions & 3 deletions
.eslintignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
**/main.js
**/staticBundle.js
docs/generatedComponentApiDocs.js
flow/
Libraries/Renderer/*
Libraries/vendor/**/*
packages/react-native/flow/
packages/react-native/Libraries/Renderer/*
packages/react-native/Libraries/vendor/**/*
node_modules/
packages/*/node_modules
packages/react-native-codegen/lib
Expand Down

6 changes: 3 additions & 3 deletions
.eslintrc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ module.exports = {
 },

 {
 files: ['Libraries/**/*.js'],
 files: ['packages/react-native/Libraries/**/*.js'],
 rules: {
 '@react-native/platform-colors': 2,
 '@react-native/specs/react-native-modules': 2,
Expand All@@ -47,7 +47,7 @@ module.exports = {
 },
 },
 {
 files: ['flow-typed/**/*.js'],
 files: ['packages/react-native/flow-typed/**/*.js'],
 rules: {
 'lint/valid-flow-typed-signature': 2,
 'no-unused-vars': 0,
Expand All@@ -59,7 +59,7 @@ module.exports = {
 '**/__fixtures__/**/*.js',
 '**/__mocks__/**/*.js',
 '**/__tests__/**/*.js',
 'jest/**/*.js',
 'packages/react-native/jest/**/*.js',
 'packages/rn-tester/**/*.js',
 ],
 globals: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Make react-native-macos a monorepo#1908

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

 Merged

Adam Gleitman (amgleitman)
merged 16 commits into

from

Aug 22, 2023
 Merged


Make react-native-macos a monorepo
#1908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
714b502

| RN Monorepo | Migrate to package (#36434)

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

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

The diff you're trying to view is too large. We only load the first 3000 changed files.


4 changes: 2 additions & 2 deletions
.ado/ado-test-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ THIS_DIR=$PWD
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command\""

COMMAND="$TMPDIR/launchPackager.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./scripts/launchPackager.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; PROJECT_ROOT=packages/rn-tester ./packages/react-native/scripts/launchPackager.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForPackager

COMMAND="$TMPDIR/launchWebSocketServer.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./packages/rn-tester/IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForWebSocketServer

1 change: 1 addition & 0 deletions
.ado/templates/verdaccio-publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ steps:
 - script: |
 npm publish --registry http://localhost:4873
 displayName: Publish react-native-macos to verdaccio
 workingDirectory: packages/react-native

 - script: |
 npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
Expand Down

16 changes: 8 additions & 8 deletions
.circleci/Dockerfiles/Dockerfile.android

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,15 +32,15 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"
ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"

ADD .buckconfig /app/.buckconfig
ADD .buckjavaargs /app/.buckjavaargs
ADD BUCK /app/BUCK
ADD Libraries /app/Libraries
ADD ReactAndroid /app/ReactAndroid
ADD ReactCommon /app/ReactCommon
ADD React /app/React
ADD packages/react-native/Libraries /app/packages/react-native/Libraries
ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
ADD packages/react-native/React /app/packages/react-native/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
Expand All@@ -57,8 +57,8 @@ WORKDIR /app

RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

ADD gradle /app/gradle
ADD gradlew /app/gradlew
Expand All@@ -77,4 +77,4 @@ ADD . /app

RUN yarn

RUN ./gradlew :ReactAndroid:assembleDebug
RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug

2 changes: 1 addition & 1 deletion
.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ function e2e_suite() {
 fi
 fi

 if ! npm pack
 if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
 then
 echo "Failed to pack react-native"
 return 1
Expand Down

77 changes: 40 additions & 37 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ references:
 cache_keys:
 checkout_cache_key: &checkout_cache_key v1-checkout
 gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "packages/react-native/ReactAndroid/gradle.properties" }}
 hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
 hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
 hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
Expand All@@ -73,8 +73,8 @@ references:

 cache_paths:
 hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths
 - ~/react-native/sdks/hermes/build_macosx
 - ~/react-native/sdks/hermes/destroot
 - ~/react-native/packages/react-native/sdks/hermes/build_macosx
 - ~/react-native/packages/react-native/sdks/hermes/destroot
 hermes_tarball_cache_paths: &hermes_tarball_cache_paths
 - *hermes_tarball_artifacts_dir

Expand DownExpand Up@@ -317,7 +317,7 @@ commands:
 - run:
 name: Get React Native version
 command: |
 VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
 VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
 # Save the react native version we are building in a file so we can use that file as part of the cache key.
 echo "$VERSION" > /tmp/react-native-version
 echo "React Native Version is $(cat /tmp/react-native-version)"
Expand DownExpand Up@@ -371,7 +371,7 @@ commands:
 exit 0
 fi

 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME

 echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
Expand All@@ -388,7 +388,7 @@ commands:
 name: Print Hermes version
 command: |
 HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
 if [[ -e $TARBALL_PATH ]]; then
 tar -xf $TARBALL_PATH
Expand DownExpand Up@@ -455,8 +455,8 @@ commands:
 hermesc_artifacts_path=<< parameters.artifacts_dir >>/<< parameters.flavor >>/hermesc

 hermesc_bin_path=bin/hermesc
 hermes_build_dir_macos=$(pwd)/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/sdks/hermes/build_iphoneos
 hermes_build_dir_macos=$(pwd)/packages/react-native/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/packages/react-native/sdks/hermes/build_iphoneos

 function export_hermesc_cmake_path {
 build_dir=$1
Expand DownExpand Up@@ -729,7 +729,7 @@ jobs:
 test_buck:
 executor: reactnativeandroid
 environment:
 KOTLIN_HOME=third-party/kotlin
 KOTLIN_HOME=packages/react-native/third-party/kotlin
 steps:
 - checkout
 - setup_artifacts
Expand All@@ -742,32 +742,33 @@ jobs:
 - run:
 name: Build & Test React Native using Buck
 command: |
 buck build ReactAndroid/src/main/java/com/facebook/react
 buck build ReactAndroid/src/main/java/com/facebook/react/shell
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

 - run:
 name: Run Tests - Android Unit Tests with Buck
 command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
 command: buck test packages/react-native/ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml

 - run:
 name: Build JavaScript Bundle for instrumentation tests
 working_directory: ~/react-native/packages/react-native
 command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js

 - run:
 name: Build Tests - Android Instrumentation Tests with Buck
 # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
 command: |
 if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 if [[ ! -e packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
 fi
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build packages/react-native/ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS

 - run:
 name: Collect Test Results
 command: |
 find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
 find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
 find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 find . -type f -regex ".*/buck-out/gen/packages/react-native/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
 ~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
 fi
Expand DownExpand Up@@ -855,7 +856,7 @@ jobs:
 command: |
 REPO_ROOT=$(pwd)
 node ./scripts/set-rn-template-version.js "file:$REPO_ROOT/build/$(cat build/react-native-package-version)"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
 command: |
Expand DownExpand Up@@ -930,7 +931,7 @@ jobs:
 name: Set HERMES_ENGINE_TARBALL_PATH
 command: |
 BUILD_TYPE="<< parameters.flavor >>"
 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 echo "export HERMES_ENGINE_TARBALL_PATH=$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME" >> $BASH_ENV
 - run:
 name: Create iOS template project
Expand All@@ -939,7 +940,7 @@ jobs:
 PACKAGE=$(cat build/react-native-package-version)
 PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
 node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >>
 command: |
Expand DownExpand Up@@ -1205,9 +1206,9 @@ jobs:
 - run:
 name: Download Hermes tarball
 command: |
 node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp sdks/download/* $HERMES_WS_DIR/download/.
 cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
 node packages/react-native/scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp packages/react-native/sdks/download/* $HERMES_WS_DIR/download/.
 cp -r packages/react-native/sdks/hermes/* $HERMES_WS_DIR/hermes/.

 cat /tmp/hermes/hermesversion
 - save_cache:
Expand DownExpand Up@@ -1301,9 +1302,9 @@ jobs:
 - run:
 name: Set up workspace
 command: |
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./sdks/hermes/.
 cp -r ./sdks/hermes-engine/utils ./sdks/hermes/.
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./packages/react-native/sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./packages/react-native/sdks/hermes/.
 cp -r ./packages/react-native/sdks/hermes-engine/utils ./packages/react-native/sdks/hermes/.
 - brew_install:
 package: cmake
 - with_hermes_tarball_cache_span:
Expand All@@ -1315,12 +1316,12 @@ jobs:
 - run:
 name: Build the Hermes Mac frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
 - run:
 name: Build the Hermes iOS frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh
 - run:
 name: Package the Hermes Apple frameworks
Expand All@@ -1330,12 +1331,12 @@ jobs:

 TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)

 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")

 echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"

 TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
 --inputDir ./sdks/hermes \
 TARBALL_OUTPUT_PATH=$(node ./packages/react-native/scripts/hermes/create-tarball.js \
 --inputDir ./packages/react-native/sdks/hermes \
 --buildType "$BUILD_TYPE" \
 --outputDir $TARBALL_OUTPUT_DIR)

Expand DownExpand Up@@ -1497,20 +1498,20 @@ jobs:
 - run:
 name: Copy Hermes binaries
 command: |
 mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
 mkdir -p ./packages/react-native/sdks/hermesc ./packages/react-native/sdks/hermesc/osx-bin ./packages/react-native/sdks/hermesc/win64-bin ./packages/react-native/sdks/hermesc/linux64-bin

 # When build_hermes_macos runs as a matrix, it outputs
 if [[ -d $HERMES_WS_DIR/osx-bin/Release ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./packages/react-native/sdks/hermesc/osx-bin/.
 elif [[ -d $HERMES_WS_DIR/osx-bin/Debug ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./packages/react-native/sdks/hermesc/osx-bin/.
 else
 ls $HERMES_WS_DIR/osx-bin || echo "hermesc macOS artifacts directory missing."
 echo "Could not locate macOS hermesc binary."; exit 1;
 fi

 cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./sdks/hermesc/linux64-bin/.
 cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
 mkdir -p ./ReactAndroid/external-artifacts/artifacts/
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
Expand All@@ -1532,7 +1533,7 @@ jobs:
 - run: node ./scripts/publish-npm.js --<< parameters.release_type >>
 - run:
 name: Zip Hermes Native Symbols
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/packages/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 - store_artifacts:
 path: /tmp/hermes-native-symbols.zip
 - run:
Expand All@@ -1555,8 +1556,10 @@ jobs:
 name: Build release package as a job artifact
 command: |
 mkdir -p build
 FILENAME=$(npm pack)
 mv $FILENAME build/

 FILENAME=$(cd packages/react-native; npm pack | tail -1)
 mv packages/react-native/$FILENAME build/

 echo $FILENAME > build/react-native-package-version
 - store_artifacts:
 path: ~/react-native/build/
Expand Down

6 changes: 3 additions & 3 deletions
.eslintignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
**/main.js
**/staticBundle.js
docs/generatedComponentApiDocs.js
flow/
Libraries/Renderer/*
Libraries/vendor/**/*
packages/react-native/flow/
packages/react-native/Libraries/Renderer/*
packages/react-native/Libraries/vendor/**/*
node_modules/
packages/*/node_modules
packages/react-native-codegen/lib
Expand Down

6 changes: 3 additions & 3 deletions
.eslintrc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ module.exports = {
 },

 {
 files: ['Libraries/**/*.js'],
 files: ['packages/react-native/Libraries/**/*.js'],
 rules: {
 '@react-native/platform-colors': 2,
 '@react-native/specs/react-native-modules': 2,
Expand All@@ -47,7 +47,7 @@ module.exports = {
 },
 },
 {
 files: ['flow-typed/**/*.js'],
 files: ['packages/react-native/flow-typed/**/*.js'],
 rules: {
 'lint/valid-flow-typed-signature': 2,
 'no-unused-vars': 0,
Expand All@@ -59,7 +59,7 @@ module.exports = {
 '**/__fixtures__/**/*.js',
 '**/__mocks__/**/*.js',
 '**/__tests__/**/*.js',
 'jest/**/*.js',
 'packages/react-native/jest/**/*.js',
 'packages/rn-tester/**/*.js',
 ],
 globals: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make react-native-macos a monorepo#1908

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

 Merged

Adam Gleitman (amgleitman)
merged 16 commits into

from

Aug 22, 2023
 Merged


Make react-native-macos a monorepo
#1908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
714b502

| RN Monorepo | Migrate to package (#36434)

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

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

The diff you're trying to view is too large. We only load the first 3000 changed files.


4 changes: 2 additions & 2 deletions
.ado/ado-test-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ THIS_DIR=$PWD
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command\""

COMMAND="$TMPDIR/launchPackager.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./scripts/launchPackager.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; PROJECT_ROOT=packages/rn-tester ./packages/react-native/scripts/launchPackager.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForPackager

COMMAND="$TMPDIR/launchWebSocketServer.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./packages/rn-tester/IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForWebSocketServer

1 change: 1 addition & 0 deletions
.ado/templates/verdaccio-publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ steps:
 - script: |
 npm publish --registry http://localhost:4873
 displayName: Publish react-native-macos to verdaccio
 workingDirectory: packages/react-native

 - script: |
 npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
Expand Down

16 changes: 8 additions & 8 deletions
.circleci/Dockerfiles/Dockerfile.android

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,15 +32,15 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"
ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"

ADD .buckconfig /app/.buckconfig
ADD .buckjavaargs /app/.buckjavaargs
ADD BUCK /app/BUCK
ADD Libraries /app/Libraries
ADD ReactAndroid /app/ReactAndroid
ADD ReactCommon /app/ReactCommon
ADD React /app/React
ADD packages/react-native/Libraries /app/packages/react-native/Libraries
ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
ADD packages/react-native/React /app/packages/react-native/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
Expand All@@ -57,8 +57,8 @@ WORKDIR /app

RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

ADD gradle /app/gradle
ADD gradlew /app/gradlew
Expand All@@ -77,4 +77,4 @@ ADD . /app

RUN yarn

RUN ./gradlew :ReactAndroid:assembleDebug
RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug

2 changes: 1 addition & 1 deletion
.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ function e2e_suite() {
 fi
 fi

 if ! npm pack
 if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
 then
 echo "Failed to pack react-native"
 return 1
Expand Down

77 changes: 40 additions & 37 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ references:
 cache_keys:
 checkout_cache_key: &checkout_cache_key v1-checkout
 gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "packages/react-native/ReactAndroid/gradle.properties" }}
 hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
 hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
 hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
Expand All@@ -73,8 +73,8 @@ references:

 cache_paths:
 hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths
 - ~/react-native/sdks/hermes/build_macosx
 - ~/react-native/sdks/hermes/destroot
 - ~/react-native/packages/react-native/sdks/hermes/build_macosx
 - ~/react-native/packages/react-native/sdks/hermes/destroot
 hermes_tarball_cache_paths: &hermes_tarball_cache_paths
 - *hermes_tarball_artifacts_dir

Expand DownExpand Up@@ -317,7 +317,7 @@ commands:
 - run:
 name: Get React Native version
 command: |
 VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
 VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
 # Save the react native version we are building in a file so we can use that file as part of the cache key.
 echo "$VERSION" > /tmp/react-native-version
 echo "React Native Version is $(cat /tmp/react-native-version)"
Expand DownExpand Up@@ -371,7 +371,7 @@ commands:
 exit 0
 fi

 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME

 echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
Expand All@@ -388,7 +388,7 @@ commands:
 name: Print Hermes version
 command: |
 HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
 if [[ -e $TARBALL_PATH ]]; then
 tar -xf $TARBALL_PATH
Expand DownExpand Up@@ -455,8 +455,8 @@ commands:
 hermesc_artifacts_path=<< parameters.artifacts_dir >>/<< parameters.flavor >>/hermesc

 hermesc_bin_path=bin/hermesc
 hermes_build_dir_macos=$(pwd)/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/sdks/hermes/build_iphoneos
 hermes_build_dir_macos=$(pwd)/packages/react-native/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/packages/react-native/sdks/hermes/build_iphoneos

 function export_hermesc_cmake_path {
 build_dir=$1
Expand DownExpand Up@@ -729,7 +729,7 @@ jobs:
 test_buck:
 executor: reactnativeandroid
 environment:
 KOTLIN_HOME=third-party/kotlin
 KOTLIN_HOME=packages/react-native/third-party/kotlin
 steps:
 - checkout
 - setup_artifacts
Expand All@@ -742,32 +742,33 @@ jobs:
 - run:
 name: Build & Test React Native using Buck
 command: |
 buck build ReactAndroid/src/main/java/com/facebook/react
 buck build ReactAndroid/src/main/java/com/facebook/react/shell
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

 - run:
 name: Run Tests - Android Unit Tests with Buck
 command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
 command: buck test packages/react-native/ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml

 - run:
 name: Build JavaScript Bundle for instrumentation tests
 working_directory: ~/react-native/packages/react-native
 command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js

 - run:
 name: Build Tests - Android Instrumentation Tests with Buck
 # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
 command: |
 if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 if [[ ! -e packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
 fi
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build packages/react-native/ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS

 - run:
 name: Collect Test Results
 command: |
 find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
 find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
 find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 find . -type f -regex ".*/buck-out/gen/packages/react-native/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
 ~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
 fi
Expand DownExpand Up@@ -855,7 +856,7 @@ jobs:
 command: |
 REPO_ROOT=$(pwd)
 node ./scripts/set-rn-template-version.js "file:$REPO_ROOT/build/$(cat build/react-native-package-version)"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
 command: |
Expand DownExpand Up@@ -930,7 +931,7 @@ jobs:
 name: Set HERMES_ENGINE_TARBALL_PATH
 command: |
 BUILD_TYPE="<< parameters.flavor >>"
 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 echo "export HERMES_ENGINE_TARBALL_PATH=$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME" >> $BASH_ENV
 - run:
 name: Create iOS template project
Expand All@@ -939,7 +940,7 @@ jobs:
 PACKAGE=$(cat build/react-native-package-version)
 PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
 node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >>
 command: |
Expand DownExpand Up@@ -1205,9 +1206,9 @@ jobs:
 - run:
 name: Download Hermes tarball
 command: |
 node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp sdks/download/* $HERMES_WS_DIR/download/.
 cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
 node packages/react-native/scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp packages/react-native/sdks/download/* $HERMES_WS_DIR/download/.
 cp -r packages/react-native/sdks/hermes/* $HERMES_WS_DIR/hermes/.

 cat /tmp/hermes/hermesversion
 - save_cache:
Expand DownExpand Up@@ -1301,9 +1302,9 @@ jobs:
 - run:
 name: Set up workspace
 command: |
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./sdks/hermes/.
 cp -r ./sdks/hermes-engine/utils ./sdks/hermes/.
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./packages/react-native/sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./packages/react-native/sdks/hermes/.
 cp -r ./packages/react-native/sdks/hermes-engine/utils ./packages/react-native/sdks/hermes/.
 - brew_install:
 package: cmake
 - with_hermes_tarball_cache_span:
Expand All@@ -1315,12 +1316,12 @@ jobs:
 - run:
 name: Build the Hermes Mac frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
 - run:
 name: Build the Hermes iOS frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh
 - run:
 name: Package the Hermes Apple frameworks
Expand All@@ -1330,12 +1331,12 @@ jobs:

 TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)

 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")

 echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"

 TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
 --inputDir ./sdks/hermes \
 TARBALL_OUTPUT_PATH=$(node ./packages/react-native/scripts/hermes/create-tarball.js \
 --inputDir ./packages/react-native/sdks/hermes \
 --buildType "$BUILD_TYPE" \
 --outputDir $TARBALL_OUTPUT_DIR)

Expand DownExpand Up@@ -1497,20 +1498,20 @@ jobs:
 - run:
 name: Copy Hermes binaries
 command: |
 mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
 mkdir -p ./packages/react-native/sdks/hermesc ./packages/react-native/sdks/hermesc/osx-bin ./packages/react-native/sdks/hermesc/win64-bin ./packages/react-native/sdks/hermesc/linux64-bin

 # When build_hermes_macos runs as a matrix, it outputs
 if [[ -d $HERMES_WS_DIR/osx-bin/Release ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./packages/react-native/sdks/hermesc/osx-bin/.
 elif [[ -d $HERMES_WS_DIR/osx-bin/Debug ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./packages/react-native/sdks/hermesc/osx-bin/.
 else
 ls $HERMES_WS_DIR/osx-bin || echo "hermesc macOS artifacts directory missing."
 echo "Could not locate macOS hermesc binary."; exit 1;
 fi

 cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./sdks/hermesc/linux64-bin/.
 cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
 mkdir -p ./ReactAndroid/external-artifacts/artifacts/
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
Expand All@@ -1532,7 +1533,7 @@ jobs:
 - run: node ./scripts/publish-npm.js --<< parameters.release_type >>
 - run:
 name: Zip Hermes Native Symbols
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/packages/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 - store_artifacts:
 path: /tmp/hermes-native-symbols.zip
 - run:
Expand All@@ -1555,8 +1556,10 @@ jobs:
 name: Build release package as a job artifact
 command: |
 mkdir -p build
 FILENAME=$(npm pack)
 mv $FILENAME build/

 FILENAME=$(cd packages/react-native; npm pack | tail -1)
 mv packages/react-native/$FILENAME build/

 echo $FILENAME > build/react-native-package-version
 - store_artifacts:
 path: ~/react-native/build/
Expand Down

6 changes: 3 additions & 3 deletions
.eslintignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
**/main.js
**/staticBundle.js
docs/generatedComponentApiDocs.js
flow/
Libraries/Renderer/*
Libraries/vendor/**/*
packages/react-native/flow/
packages/react-native/Libraries/Renderer/*
packages/react-native/Libraries/vendor/**/*
node_modules/
packages/*/node_modules
packages/react-native-codegen/lib
Expand Down

6 changes: 3 additions & 3 deletions
.eslintrc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ module.exports = {
 },

 {
 files: ['Libraries/**/*.js'],
 files: ['packages/react-native/Libraries/**/*.js'],
 rules: {
 '@react-native/platform-colors': 2,
 '@react-native/specs/react-native-modules': 2,
Expand All@@ -47,7 +47,7 @@ module.exports = {
 },
 },
 {
 files: ['flow-typed/**/*.js'],
 files: ['packages/react-native/flow-typed/**/*.js'],
 rules: {
 'lint/valid-flow-typed-signature': 2,
 'no-unused-vars': 0,
Expand All@@ -59,7 +59,7 @@ module.exports = {
 '**/__fixtures__/**/*.js',
 '**/__mocks__/**/*.js',
 '**/__tests__/**/*.js',
 'jest/**/*.js',
 'packages/react-native/jest/**/*.js',
 'packages/rn-tester/**/*.js',
 ],
 globals: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make react-native-macos a monorepo#1908

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

 Merged

Adam Gleitman (amgleitman)
merged 16 commits into

from

Aug 22, 2023
 Merged


Make react-native-macos a monorepo
#1908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
714b502

| RN Monorepo | Migrate to package (#36434)

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

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

The diff you're trying to view is too large. We only load the first 3000 changed files.


4 changes: 2 additions & 2 deletions
.ado/ado-test-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ THIS_DIR=$PWD
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command\""

COMMAND="$TMPDIR/launchPackager.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./scripts/launchPackager.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; PROJECT_ROOT=packages/rn-tester ./packages/react-native/scripts/launchPackager.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForPackager

COMMAND="$TMPDIR/launchWebSocketServer.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./packages/rn-tester/IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForWebSocketServer

1 change: 1 addition & 0 deletions
.ado/templates/verdaccio-publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ steps:
 - script: |
 npm publish --registry http://localhost:4873
 displayName: Publish react-native-macos to verdaccio
 workingDirectory: packages/react-native

 - script: |
 npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
Expand Down

16 changes: 8 additions & 8 deletions
.circleci/Dockerfiles/Dockerfile.android

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,15 +32,15 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"
ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"

ADD .buckconfig /app/.buckconfig
ADD .buckjavaargs /app/.buckjavaargs
ADD BUCK /app/BUCK
ADD Libraries /app/Libraries
ADD ReactAndroid /app/ReactAndroid
ADD ReactCommon /app/ReactCommon
ADD React /app/React
ADD packages/react-native/Libraries /app/packages/react-native/Libraries
ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
ADD packages/react-native/React /app/packages/react-native/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
Expand All@@ -57,8 +57,8 @@ WORKDIR /app

RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

ADD gradle /app/gradle
ADD gradlew /app/gradlew
Expand All@@ -77,4 +77,4 @@ ADD . /app

RUN yarn

RUN ./gradlew :ReactAndroid:assembleDebug
RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug

2 changes: 1 addition & 1 deletion
.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ function e2e_suite() {
 fi
 fi

 if ! npm pack
 if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
 then
 echo "Failed to pack react-native"
 return 1
Expand Down

77 changes: 40 additions & 37 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ references:
 cache_keys:
 checkout_cache_key: &checkout_cache_key v1-checkout
 gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "packages/react-native/ReactAndroid/gradle.properties" }}
 hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
 hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
 hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
Expand All@@ -73,8 +73,8 @@ references:

 cache_paths:
 hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths
 - ~/react-native/sdks/hermes/build_macosx
 - ~/react-native/sdks/hermes/destroot
 - ~/react-native/packages/react-native/sdks/hermes/build_macosx
 - ~/react-native/packages/react-native/sdks/hermes/destroot
 hermes_tarball_cache_paths: &hermes_tarball_cache_paths
 - *hermes_tarball_artifacts_dir

Expand DownExpand Up@@ -317,7 +317,7 @@ commands:
 - run:
 name: Get React Native version
 command: |
 VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
 VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
 # Save the react native version we are building in a file so we can use that file as part of the cache key.
 echo "$VERSION" > /tmp/react-native-version
 echo "React Native Version is $(cat /tmp/react-native-version)"
Expand DownExpand Up@@ -371,7 +371,7 @@ commands:
 exit 0
 fi

 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME

 echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
Expand All@@ -388,7 +388,7 @@ commands:
 name: Print Hermes version
 command: |
 HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
 if [[ -e $TARBALL_PATH ]]; then
 tar -xf $TARBALL_PATH
Expand DownExpand Up@@ -455,8 +455,8 @@ commands:
 hermesc_artifacts_path=<< parameters.artifacts_dir >>/<< parameters.flavor >>/hermesc

 hermesc_bin_path=bin/hermesc
 hermes_build_dir_macos=$(pwd)/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/sdks/hermes/build_iphoneos
 hermes_build_dir_macos=$(pwd)/packages/react-native/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/packages/react-native/sdks/hermes/build_iphoneos

 function export_hermesc_cmake_path {
 build_dir=$1
Expand DownExpand Up@@ -729,7 +729,7 @@ jobs:
 test_buck:
 executor: reactnativeandroid
 environment:
 KOTLIN_HOME=third-party/kotlin
 KOTLIN_HOME=packages/react-native/third-party/kotlin
 steps:
 - checkout
 - setup_artifacts
Expand All@@ -742,32 +742,33 @@ jobs:
 - run:
 name: Build & Test React Native using Buck
 command: |
 buck build ReactAndroid/src/main/java/com/facebook/react
 buck build ReactAndroid/src/main/java/com/facebook/react/shell
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

 - run:
 name: Run Tests - Android Unit Tests with Buck
 command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
 command: buck test packages/react-native/ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml

 - run:
 name: Build JavaScript Bundle for instrumentation tests
 working_directory: ~/react-native/packages/react-native
 command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js

 - run:
 name: Build Tests - Android Instrumentation Tests with Buck
 # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
 command: |
 if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 if [[ ! -e packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
 fi
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build packages/react-native/ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS

 - run:
 name: Collect Test Results
 command: |
 find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
 find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
 find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 find . -type f -regex ".*/buck-out/gen/packages/react-native/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
 ~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
 fi
Expand DownExpand Up@@ -855,7 +856,7 @@ jobs:
 command: |
 REPO_ROOT=$(pwd)
 node ./scripts/set-rn-template-version.js "file:$REPO_ROOT/build/$(cat build/react-native-package-version)"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
 command: |
Expand DownExpand Up@@ -930,7 +931,7 @@ jobs:
 name: Set HERMES_ENGINE_TARBALL_PATH
 command: |
 BUILD_TYPE="<< parameters.flavor >>"
 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 echo "export HERMES_ENGINE_TARBALL_PATH=$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME" >> $BASH_ENV
 - run:
 name: Create iOS template project
Expand All@@ -939,7 +940,7 @@ jobs:
 PACKAGE=$(cat build/react-native-package-version)
 PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
 node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >>
 command: |
Expand DownExpand Up@@ -1205,9 +1206,9 @@ jobs:
 - run:
 name: Download Hermes tarball
 command: |
 node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp sdks/download/* $HERMES_WS_DIR/download/.
 cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
 node packages/react-native/scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp packages/react-native/sdks/download/* $HERMES_WS_DIR/download/.
 cp -r packages/react-native/sdks/hermes/* $HERMES_WS_DIR/hermes/.

 cat /tmp/hermes/hermesversion
 - save_cache:
Expand DownExpand Up@@ -1301,9 +1302,9 @@ jobs:
 - run:
 name: Set up workspace
 command: |
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./sdks/hermes/.
 cp -r ./sdks/hermes-engine/utils ./sdks/hermes/.
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./packages/react-native/sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./packages/react-native/sdks/hermes/.
 cp -r ./packages/react-native/sdks/hermes-engine/utils ./packages/react-native/sdks/hermes/.
 - brew_install:
 package: cmake
 - with_hermes_tarball_cache_span:
Expand All@@ -1315,12 +1316,12 @@ jobs:
 - run:
 name: Build the Hermes Mac frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
 - run:
 name: Build the Hermes iOS frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh
 - run:
 name: Package the Hermes Apple frameworks
Expand All@@ -1330,12 +1331,12 @@ jobs:

 TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)

 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")

 echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"

 TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
 --inputDir ./sdks/hermes \
 TARBALL_OUTPUT_PATH=$(node ./packages/react-native/scripts/hermes/create-tarball.js \
 --inputDir ./packages/react-native/sdks/hermes \
 --buildType "$BUILD_TYPE" \
 --outputDir $TARBALL_OUTPUT_DIR)

Expand DownExpand Up@@ -1497,20 +1498,20 @@ jobs:
 - run:
 name: Copy Hermes binaries
 command: |
 mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
 mkdir -p ./packages/react-native/sdks/hermesc ./packages/react-native/sdks/hermesc/osx-bin ./packages/react-native/sdks/hermesc/win64-bin ./packages/react-native/sdks/hermesc/linux64-bin

 # When build_hermes_macos runs as a matrix, it outputs
 if [[ -d $HERMES_WS_DIR/osx-bin/Release ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./packages/react-native/sdks/hermesc/osx-bin/.
 elif [[ -d $HERMES_WS_DIR/osx-bin/Debug ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./packages/react-native/sdks/hermesc/osx-bin/.
 else
 ls $HERMES_WS_DIR/osx-bin || echo "hermesc macOS artifacts directory missing."
 echo "Could not locate macOS hermesc binary."; exit 1;
 fi

 cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./sdks/hermesc/linux64-bin/.
 cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
 mkdir -p ./ReactAndroid/external-artifacts/artifacts/
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
Expand All@@ -1532,7 +1533,7 @@ jobs:
 - run: node ./scripts/publish-npm.js --<< parameters.release_type >>
 - run:
 name: Zip Hermes Native Symbols
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/packages/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 - store_artifacts:
 path: /tmp/hermes-native-symbols.zip
 - run:
Expand All@@ -1555,8 +1556,10 @@ jobs:
 name: Build release package as a job artifact
 command: |
 mkdir -p build
 FILENAME=$(npm pack)
 mv $FILENAME build/

 FILENAME=$(cd packages/react-native; npm pack | tail -1)
 mv packages/react-native/$FILENAME build/

 echo $FILENAME > build/react-native-package-version
 - store_artifacts:
 path: ~/react-native/build/
Expand Down

6 changes: 3 additions & 3 deletions
.eslintignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
**/main.js
**/staticBundle.js
docs/generatedComponentApiDocs.js
flow/
Libraries/Renderer/*
Libraries/vendor/**/*
packages/react-native/flow/
packages/react-native/Libraries/Renderer/*
packages/react-native/Libraries/vendor/**/*
node_modules/
packages/*/node_modules
packages/react-native-codegen/lib
Expand Down

6 changes: 3 additions & 3 deletions
.eslintrc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ module.exports = {
 },

 {
 files: ['Libraries/**/*.js'],
 files: ['packages/react-native/Libraries/**/*.js'],
 rules: {
 '@react-native/platform-colors': 2,
 '@react-native/specs/react-native-modules': 2,
Expand All@@ -47,7 +47,7 @@ module.exports = {
 },
 },
 {
 files: ['flow-typed/**/*.js'],
 files: ['packages/react-native/flow-typed/**/*.js'],
 rules: {
 'lint/valid-flow-typed-signature': 2,
 'no-unused-vars': 0,
Expand All@@ -59,7 +59,7 @@ module.exports = {
 '**/__fixtures__/**/*.js',
 '**/__mocks__/**/*.js',
 '**/__tests__/**/*.js',
 'jest/**/*.js',
 'packages/react-native/jest/**/*.js',
 'packages/rn-tester/**/*.js',
 ],
 globals: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Make react-native-macos a monorepo#1908

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

 Merged

Adam Gleitman (amgleitman)
merged 16 commits into

from

Aug 22, 2023
 Merged


Make react-native-macos a monorepo
#1908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


16 commits


Select commit
Hold shift + click to select a range
714b502

| RN Monorepo | Migrate to package (#36434)

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

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

The diff you're trying to view is too large. We only load the first 3000 changed files.


4 changes: 2 additions & 2 deletions
.ado/ado-test-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ THIS_DIR=$PWD
# osascript -e "tell application \"Terminal\" to do script \"cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command\""

COMMAND="$TMPDIR/launchPackager.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./scripts/launchPackager.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; PROJECT_ROOT=packages/rn-tester ./packages/react-native/scripts/launchPackager.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForPackager

COMMAND="$TMPDIR/launchWebSocketServer.command"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
echo "cd ${THIS_DIR}; export SERVERS_NO_WAIT=1; ./packages/rn-tester/IntegrationTests/launchWebSocketServer.command" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
waitForWebSocketServer

1 change: 1 addition & 0 deletions
.ado/templates/verdaccio-publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ steps:
 - script: |
 npm publish --registry http://localhost:4873
 displayName: Publish react-native-macos to verdaccio
 workingDirectory: packages/react-native

 - script: |
 npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
Expand Down

16 changes: 8 additions & 8 deletions
.circleci/Dockerfiles/Dockerfile.android

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,15 +32,15 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"
ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"

ADD .buckconfig /app/.buckconfig
ADD .buckjavaargs /app/.buckjavaargs
ADD BUCK /app/BUCK
ADD Libraries /app/Libraries
ADD ReactAndroid /app/ReactAndroid
ADD ReactCommon /app/ReactCommon
ADD React /app/React
ADD packages/react-native/Libraries /app/packages/react-native/Libraries
ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
ADD packages/react-native/React /app/packages/react-native/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
Expand All@@ -57,8 +57,8 @@ WORKDIR /app

RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

ADD gradle /app/gradle
ADD gradlew /app/gradlew
Expand All@@ -77,4 +77,4 @@ ADD . /app

RUN yarn

RUN ./gradlew :ReactAndroid:assembleDebug
RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug

2 changes: 1 addition & 1 deletion
.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ function e2e_suite() {
 fi
 fi

 if ! npm pack
 if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
 then
 echo "Failed to pack react-native"
 return 1
Expand Down

77 changes: 40 additions & 37 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ references:
 cache_keys:
 checkout_cache_key: &checkout_cache_key v1-checkout
 gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
 gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "packages/react-native/ReactAndroid/gradle.properties" }}
 hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
 hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
 hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
Expand All@@ -73,8 +73,8 @@ references:

 cache_paths:
 hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths
 - ~/react-native/sdks/hermes/build_macosx
 - ~/react-native/sdks/hermes/destroot
 - ~/react-native/packages/react-native/sdks/hermes/build_macosx
 - ~/react-native/packages/react-native/sdks/hermes/destroot
 hermes_tarball_cache_paths: &hermes_tarball_cache_paths
 - *hermes_tarball_artifacts_dir

Expand DownExpand Up@@ -317,7 +317,7 @@ commands:
 - run:
 name: Get React Native version
 command: |
 VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
 VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
 # Save the react native version we are building in a file so we can use that file as part of the cache key.
 echo "$VERSION" > /tmp/react-native-version
 echo "React Native Version is $(cat /tmp/react-native-version)"
Expand DownExpand Up@@ -371,7 +371,7 @@ commands:
 exit 0
 fi

 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME

 echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
Expand All@@ -388,7 +388,7 @@ commands:
 name: Print Hermes version
 command: |
 HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
 TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_FILENAME=$(node ~/react-native/packages/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
 TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
 if [[ -e $TARBALL_PATH ]]; then
 tar -xf $TARBALL_PATH
Expand DownExpand Up@@ -455,8 +455,8 @@ commands:
 hermesc_artifacts_path=<< parameters.artifacts_dir >>/<< parameters.flavor >>/hermesc

 hermesc_bin_path=bin/hermesc
 hermes_build_dir_macos=$(pwd)/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/sdks/hermes/build_iphoneos
 hermes_build_dir_macos=$(pwd)/packages/react-native/sdks/hermes/build_macosx
 hermes_build_dir_ios=$(pwd)/packages/react-native/sdks/hermes/build_iphoneos

 function export_hermesc_cmake_path {
 build_dir=$1
Expand DownExpand Up@@ -729,7 +729,7 @@ jobs:
 test_buck:
 executor: reactnativeandroid
 environment:
 KOTLIN_HOME=third-party/kotlin
 KOTLIN_HOME=packages/react-native/third-party/kotlin
 steps:
 - checkout
 - setup_artifacts
Expand All@@ -742,32 +742,33 @@ jobs:
 - run:
 name: Build & Test React Native using Buck
 command: |
 buck build ReactAndroid/src/main/java/com/facebook/react
 buck build ReactAndroid/src/main/java/com/facebook/react/shell
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
 buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

 - run:
 name: Run Tests - Android Unit Tests with Buck
 command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
 command: buck test packages/react-native/ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml

 - run:
 name: Build JavaScript Bundle for instrumentation tests
 working_directory: ~/react-native/packages/react-native
 command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js

 - run:
 name: Build Tests - Android Instrumentation Tests with Buck
 # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
 command: |
 if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 if [[ ! -e packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
 echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
 fi
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
 source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build packages/react-native/ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS

 - run:
 name: Collect Test Results
 command: |
 find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
 find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
 find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 find . -type f -regex ".*/buck-out/gen/packages/react-native/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
 if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
 ~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
 fi
Expand DownExpand Up@@ -855,7 +856,7 @@ jobs:
 command: |
 REPO_ROOT=$(pwd)
 node ./scripts/set-rn-template-version.js "file:$REPO_ROOT/build/$(cat build/react-native-package-version)"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
 command: |
Expand DownExpand Up@@ -930,7 +931,7 @@ jobs:
 name: Set HERMES_ENGINE_TARBALL_PATH
 command: |
 BUILD_TYPE="<< parameters.flavor >>"
 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 echo "export HERMES_ENGINE_TARBALL_PATH=$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME" >> $BASH_ENV
 - run:
 name: Create iOS template project
Expand All@@ -939,7 +940,7 @@ jobs:
 PACKAGE=$(cat build/react-native-package-version)
 PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
 node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath $REPO_ROOT --directory "/tmp/$PROJECT_NAME"
 node ./scripts/template/initialize.js --reactNativeRootPath $REPO_ROOT --templateName $PROJECT_NAME --templateConfigPath "$REPO_ROOT/packages/react-native" --directory "/tmp/$PROJECT_NAME"
 - run:
 name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >>
 command: |
Expand DownExpand Up@@ -1205,9 +1206,9 @@ jobs:
 - run:
 name: Download Hermes tarball
 command: |
 node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp sdks/download/* $HERMES_WS_DIR/download/.
 cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
 node packages/react-native/scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
 cp packages/react-native/sdks/download/* $HERMES_WS_DIR/download/.
 cp -r packages/react-native/sdks/hermes/* $HERMES_WS_DIR/hermes/.

 cat /tmp/hermes/hermesversion
 - save_cache:
Expand DownExpand Up@@ -1301,9 +1302,9 @@ jobs:
 - run:
 name: Set up workspace
 command: |
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./sdks/hermes/.
 cp -r ./sdks/hermes-engine/utils ./sdks/hermes/.
 mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./packages/react-native/sdks/hermes
 cp -r $HERMES_WS_DIR/hermes/* ./packages/react-native/sdks/hermes/.
 cp -r ./packages/react-native/sdks/hermes-engine/utils ./packages/react-native/sdks/hermes/.
 - brew_install:
 package: cmake
 - with_hermes_tarball_cache_span:
Expand All@@ -1315,12 +1316,12 @@ jobs:
 - run:
 name: Build the Hermes Mac frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
 - run:
 name: Build the Hermes iOS frameworks
 command: |
 cd ./sdks/hermes || exit 1
 cd ./packages/react-native/sdks/hermes || exit 1
 BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh
 - run:
 name: Package the Hermes Apple frameworks
Expand All@@ -1330,12 +1331,12 @@ jobs:

 TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)

 TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 TARBALL_FILENAME=$(node ./packages/react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")

 echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"

 TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
 --inputDir ./sdks/hermes \
 TARBALL_OUTPUT_PATH=$(node ./packages/react-native/scripts/hermes/create-tarball.js \
 --inputDir ./packages/react-native/sdks/hermes \
 --buildType "$BUILD_TYPE" \
 --outputDir $TARBALL_OUTPUT_DIR)

Expand DownExpand Up@@ -1497,20 +1498,20 @@ jobs:
 - run:
 name: Copy Hermes binaries
 command: |
 mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
 mkdir -p ./packages/react-native/sdks/hermesc ./packages/react-native/sdks/hermesc/osx-bin ./packages/react-native/sdks/hermesc/win64-bin ./packages/react-native/sdks/hermesc/linux64-bin

 # When build_hermes_macos runs as a matrix, it outputs
 if [[ -d $HERMES_WS_DIR/osx-bin/Release ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Release/* ./packages/react-native/sdks/hermesc/osx-bin/.
 elif [[ -d $HERMES_WS_DIR/osx-bin/Debug ]]; then
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./sdks/hermesc/osx-bin/.
 cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./packages/react-native/sdks/hermesc/osx-bin/.
 else
 ls $HERMES_WS_DIR/osx-bin || echo "hermesc macOS artifacts directory missing."
 echo "Could not locate macOS hermesc binary."; exit 1;
 fi

 cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./sdks/hermesc/linux64-bin/.
 cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
 cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
 mkdir -p ./ReactAndroid/external-artifacts/artifacts/
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
 cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
Expand All@@ -1532,7 +1533,7 @@ jobs:
 - run: node ./scripts/publish-npm.js --<< parameters.release_type >>
 - run:
 name: Zip Hermes Native Symbols
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/packages/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
 - store_artifacts:
 path: /tmp/hermes-native-symbols.zip
 - run:
Expand All@@ -1555,8 +1556,10 @@ jobs:
 name: Build release package as a job artifact
 command: |
 mkdir -p build
 FILENAME=$(npm pack)
 mv $FILENAME build/

 FILENAME=$(cd packages/react-native; npm pack | tail -1)
 mv packages/react-native/$FILENAME build/

 echo $FILENAME > build/react-native-package-version
 - store_artifacts:
 path: ~/react-native/build/
Expand Down

6 changes: 3 additions & 3 deletions
.eslintignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
**/main.js
**/staticBundle.js
docs/generatedComponentApiDocs.js
flow/
Libraries/Renderer/*
Libraries/vendor/**/*
packages/react-native/flow/
packages/react-native/Libraries/Renderer/*
packages/react-native/Libraries/vendor/**/*
node_modules/
packages/*/node_modules
packages/react-native-codegen/lib
Expand Down

6 changes: 3 additions & 3 deletions
.eslintrc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ module.exports = {
 },

 {
 files: ['Libraries/**/*.js'],
 files: ['packages/react-native/Libraries/**/*.js'],
 rules: {
 '@react-native/platform-colors': 2,
 '@react-native/specs/react-native-modules': 2,
Expand All@@ -47,7 +47,7 @@ module.exports = {
 },
 },
 {
 files: ['flow-typed/**/*.js'],
 files: ['packages/react-native/flow-typed/**/*.js'],
 rules: {
 'lint/valid-flow-typed-signature': 2,
 'no-unused-vars': 0,
Expand All@@ -59,7 +59,7 @@ module.exports = {
 '**/__fixtures__/**/*.js',
 '**/__mocks__/**/*.js',
 '**/__tests__/**/*.js',
 'jest/**/*.js',
 'packages/react-native/jest/**/*.js',
 'packages/rn-tester/**/*.js',
 ],
 globals: {
Expand Down
Loading