[Draft, for CI] Initial experimenting with new Repo Structure

.circleci/config.yml

@@ -52,7 +52,7 @@ references:
     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" }}
     hermes_cache_key: &hermes_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
-    hermes_sdk_cache_key: &hermes_sdk_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "sdks/.hermes-cache-key-file" }}
+    hermes_sdk_cache_key: &hermes_sdk_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/react-native/sdks/.hermes-cache-key-file" }}
     hermes_windows_cache_key: &hermes_windows_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "tmp/hermes/hermesversion" }}
     pods_cache_key: &pods_cache_key v6-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }}
     windows_yarn_cache_key: &windows_yarn_cache_key v1-win-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
@@ -289,7 +289,7 @@ commands:
       - run:
           name: Setup Hermes cache
           command: |
-            HERMES_CACHE_KEY_FILE="sdks/.hermes-cache-key-file"
+            HERMES_CACHE_KEY_FILE="packages/react-native/sdks/.hermes-cache-key-file"
             if [ ! -f "$HERMES_CACHE_KEY_FILE" ]; then
               git ls-remote https://github.com/facebook/hermes main | cut -f 1 > $HERMES_CACHE_KEY_FILE
             fi
@@ -300,8 +300,8 @@ commands:
       - save_cache:
           key: *hermes_sdk_cache_key
           paths:
-            - sdks/hermesc
-            - sdks/hermes
+            - packages/react-native/sdks/hermesc
+            - packages/react-native/sdks/hermes
 
 # -------------------------
 #          JOBS
@@ -863,7 +863,7 @@ jobs:
       - image: debian:bullseye
     environment:
       - HERMES_WS_DIR: *hermes_workspace_root
-      - HERMES_VERSION_FILE: "sdks/.hermesversion"
+      - HERMES_VERSION_FILE: "packages/react-native/sdks/.hermesversion"
     steps:
       - run:
           name: Install dependencies
@@ -892,8 +892,8 @@ jobs:
           name: Download Hermes tarball
           command: |
             node scripts/hermes/prepare-hermes-for-build
-            cp sdks/download/* $HERMES_WS_DIR/download/.
-            cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
+            cp packages/react-native/sdks/download/* $HERMES_WS_DIR/download/.
+            cp -r packages/react-native/sdks/hermes/* $HERMES_WS_DIR/hermes/.
       - save_cache:
           key: *hermes_cache_key
           paths:
@@ -963,27 +963,27 @@ jobs:
           name: Set up workspace
           command: |
             mkdir -p /tmp/hermes/osx-bin
-            mkdir -p ~/react-native/sdks/hermes
-            cp -r $HERMES_WS_DIR/hermes/* ~/react-native/sdks/hermes/.
+            mkdir -p ~/react-native/packages/react-native/sdks/hermes
+            cp -r $HERMES_WS_DIR/hermes/* ~/react-native/packages/react-native/sdks/hermes/.
       - run:
           name: Install dependencies
           command: |
             brew install cmake
       - run:
           name: Build the Hermes iOS frameworks
           command: |
-            cd ~/react-native/sdks/hermes
+            cd ~/react-native/packages/react-native/sdks/hermes
             ./utils/build-ios-framework.sh
       - run:
           name: Build the Hermes Mac frameworks
           command: |
-            cd ~/react-native/sdks/hermes
+            cd ~/react-native/packages/react-native/sdks/hermes
             ./utils/build-mac-framework.sh
             cp build_macosx/bin/hermesc /tmp/hermes/osx-bin/.
       - run:
           name: Package the Hermes Apple frameworks
           command: |
-            cd ~/react-native/sdks/hermes
+            cd ~/react-native/packages/react-native/sdks/hermes
             . ./utils/build-apple-framework.sh
 
             mkdir -p /tmp/cocoapods-package-root/destroot
@@ -1126,10 +1126,10 @@ jobs:
       - run:
           name: Copy HermesC binaries
           command: |
-            mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
-            cp -r $HERMES_WS_DIR/osx-bin/* ./sdks/hermesc/osx-bin/.
-            cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
-            cp -r $HERMES_WS_DIR/linux64-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
+            cp -r $HERMES_WS_DIR/osx-bin/* ./packages/react-native/sdks/hermesc/osx-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/.
 
       - run_yarn
       - install_buck_tooling

.eslintignore

@@ -2,9 +2,9 @@
 **/staticBundle.js
 bots/node_modules
 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

@@ -12,7 +12,7 @@
   "overrides": [
     {
       "files": [
-        "Libraries/**/*.js",
+        "packages/react-native/Libraries/**/*.js",
       ],
       "rules": {
         "@react-native-community/no-haste-imports": 2,
@@ -23,7 +23,7 @@
     },
     {
       "files": [
-        "flow-typed/**/*.js",
+        "packages/react-native/flow-typed/**/*.js",
       ],
       "rules": {
         quotes: 0
@@ -34,7 +34,7 @@
         "**/__fixtures__/**/*.js",
         "**/__mocks__/**/*.js",
         "**/__tests__/**/*.js",
-        "jest/**/*.js",
+        "packages/react-native/jest/**/*.js",
         "packages/rn-tester/**/*.js",
       ],
       "globals": {

.flowconfig

@@ -25,8 +25,9 @@
 .*/node_modules/.*
 
 [libs]
-interface.js
-flow/
+packages/react-native/interface.js
+packages/react-native/flow/
+packages/react-native/flow-typed/
 
 [options]
 emoji=true
@@ -41,9 +42,9 @@ module.file_ext=.ios.js
 
 munge_underscores=true
 
-module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/index.js'
-module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/\1'
-module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/Libraries/Image/RelativeImageStub'
+module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
+module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native/\1'
+module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe

.flowconfig.android

@@ -25,8 +25,9 @@
 .*/node_modules/.*
 
 [libs]
-interface.js
-flow/
+packages/react-native/interface.js
+packages/react-native/flow/
+packages/react-native/flow-typed/
 
 [options]
 emoji=true
@@ -41,9 +42,9 @@ module.file_ext=.android.js
 
 munge_underscores=true
 
-module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/index.js'
-module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/\1'
-module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/Libraries/Image/RelativeImageStub'
+module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
+module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native/\1'
+module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe

.gitignore

@@ -31,23 +31,23 @@ project.xcworkspace
 /packages/rn-tester/android/app/gradle/
 /packages/rn-tester/android/app/gradlew
 /packages/rn-tester/android/app/gradlew.bat
-/ReactAndroid/build/
-/ReactAndroid/.cxx/
-/ReactAndroid/gradle/
-/ReactAndroid/gradlew
-/ReactAndroid/gradlew.bat
-/ReactAndroid/hermes-engine/build/
-/ReactAndroid/hermes-engine/.cxx/
-/template/android/app/build/
-/template/android/build/
+/packages/react-native/ReactAndroid/build/
+/packages/react-native/ReactAndroid/.cxx/
+/packages/react-native/ReactAndroid/gradle/
+/packages/react-native/ReactAndroid/gradlew
+/packages/react-native/ReactAndroid/gradlew.bat
+/packages/react-native/ReactAndroid/hermes-engine/build/
+/packages/react-native/ReactAndroid/hermes-engine/.cxx/
+/packages/react-native/template/android/app/build/
+/packages/react-native/template/android/build/
 
 # Buck
 .buckd
 buck-out
 /.lsp.buckd
 /.lsp-buck-out
-/ReactAndroid/src/main/jni/prebuilt/lib/
-/ReactAndroid/src/main/gen
+/packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/
+/packages/react-native/ReactAndroid/src/main/gen
 
 # Android Studio
 .project
@@ -75,7 +75,7 @@ package-lock.json
 .DS_Store
 
 # Test generated files
-/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
+/packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
 *.js.meta
 
 /coverage
@@ -85,39 +85,39 @@ package-lock.json
 /*.xcodeproj
 
 # ReactCommon subdir shouldn't have Xcode project
-/ReactCommon/**/*.xcodeproj
+/packages/react-native/ReactCommon/**/*.xcodeproj
 
 # Libs that shouldn't have Xcode project
-/Libraries/FBLazyVector/**/*.xcodeproj
-/Libraries/RCTRequired/**/*.xcodeproj
-/React/CoreModules/**/*.xcodeproj
-/React/FBReactNativeSpec/**/*.xcodeproj
+/packages/react-native/Libraries/FBLazyVector/**/*.xcodeproj
+/packages/react-native/Libraries/RCTRequired/**/*.xcodeproj
+/packages/react-native/React/CoreModules/**/*.xcodeproj
+/packages/react-native/React/FBReactNativeSpec/**/*.xcodeproj
 /packages/react-native-codegen/**/*.xcodeproj
 
 # Ruby Gems (Bundler)
 /vendor
-/template/vendor
+/packages/react-native/template/vendor
 
 # iOS / CocoaPods
-/template/ios/build/
-/template/ios/Pods/
-/template/ios/Podfile.lock
+/packages/react-native/template/ios/build/
+/packages/react-native/template/ios/Pods/
+/packages/react-native/template/ios/Podfile.lock
 /packages/rn-tester/Gemfile.lock
 
 # Ignore RNTester specific Pods, but keep the __offline_mirrors__ here.
 /packages/rn-tester/Pods/*
 !/packages/rn-tester/Pods/__offline_mirrors__
 
 # react-native-codegen
-/React/FBReactNativeSpec/FBReactNativeSpec
+/packages/react-native/React/FBReactNativeSpec/FBReactNativeSpec
 /packages/react-native-codegen/lib
-/ReactCommon/react/renderer/components/rncore/
+/packages/react-native/ReactCommon/react/renderer/components/rncore/
 /packages/rn-tester/NativeModuleExample/ScreenshotManagerSpec*
 
 # Additional SDKs
-/sdks/download
-/sdks/hermes
-/sdks/hermesc
+/packages/react-native/sdks/download
+/packages/react-native/sdks/hermes
+/packages/react-native/sdks/hermesc
 
 # Visual studio
 .vscode

build.gradle.kts

@@ -44,14 +44,14 @@ tasks.register("cleanAll", Delete::class.java) {
     description = "Remove all the build files and intermediate build outputs"
     dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":clean"))
     delete(allprojects.map { it.buildDir })
-    delete(rootProject.file("./ReactAndroid/.cxx"))
-    delete(rootProject.file("./ReactAndroid/hermes-engine/.cxx"))
+    delete(rootProject.file("./packages/react-native/ReactAndroid/.cxx"))
+    delete(rootProject.file("./packages/react-native/ReactAndroid/hermes-engine/.cxx"))
     delete(rootProject.file("./sdks/download/"))
     delete(rootProject.file("./sdks/hermes/"))
-    delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/arm64-v8a/"))
-    delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/"))
-    delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86/"))
-    delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86_64/"))
+    delete(rootProject.file("./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/arm64-v8a/"))
+    delete(rootProject.file("./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/"))
+    delete(rootProject.file("./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/x86/"))
+    delete(rootProject.file("./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/x86_64/"))
     delete(rootProject.file("./packages/react-native-codegen/lib"))
     delete(rootProject.file("./packages/rn-tester/android/app/.cxx"))
 }

jest.config.js

@@ -12,16 +12,16 @@
 module.exports = {
   transform: {
     '^.+\\.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$':
-      '<rootDir>/jest/assetFileTransformer.js',
-    '.*': './jest/private/preprocessor.js',
+      '<rootDir>/packages/react-native/jest/assetFileTransformer.js',
+    '.*': './packages/react-native/jest/private/preprocessor.js',
   },
-  setupFiles: ['./jest/setup.js'],
+  setupFiles: ['./packages/react-native/jest/setup.js'],
   timers: 'fake',
   testRegex: '/__tests__/.*-test\\.js$',
   testPathIgnorePatterns: [
     '/node_modules/',
     '<rootDir>/template',
-    'Libraries/Renderer',
+    'packages/react-native/Libraries/Renderer',
     'packages/rn-tester/e2e',
   ],
   transformIgnorePatterns: ['node_modules/(?!@react-native/)'],
@@ -42,6 +42,6 @@ module.exports = {
   coveragePathIgnorePatterns: [
     '/__tests__/',
     '/vendor/',
-    '<rootDir>/Libraries/react-native/',
+    '<rootDir>/packages/react-native/Libraries/react-native/',
   ],
 };

metro.config.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const getPolyfills = require('./rn-get-polyfills');
+const getPolyfills = require('react-native/rn-get-polyfills');
 
 /**
  * This cli config is needed for development purposes, e.g. for running