Merge pull request #1908 from amgleitman/0.72-merge-monorepo

Make react-native-macos a monorepo

Author: amgleitman

.ado/ado-test-setup.sh

@@ -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

.ado/templates/verdaccio-publish.yml

@@ -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

.circleci/Dockerfiles/Dockerfile.android

@@ -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
@@ -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
@@ -77,4 +77,4 @@ ADD . /app
 
 RUN yarn
 
-RUN ./gradlew :ReactAndroid:assembleDebug
+RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug

.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

@@ -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

.circleci/config.yml

@@ -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" }}
@@ -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
 
@@ -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)"
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: |
@@ -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
@@ -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: |
@@ -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:
@@ -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:
@@ -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
@@ -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)
 
@@ -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
@@ -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:
@@ -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/

.eslintignore

@@ -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

.eslintrc.js

@@ -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,
@@ -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,
@@ -59,7 +59,7 @@ module.exports = {
         '**/__fixtures__/**/*.js',
         '**/__mocks__/**/*.js',
         '**/__tests__/**/*.js',
-        'jest/**/*.js',
+        'packages/react-native/jest/**/*.js',
         'packages/rn-tester/**/*.js',
       ],
       globals: {