Merge branch 'main' into chore/migrate-repack-to-turbo-modules

callstack · Jan 8, 2024 · 5f77968 · 5f77968
2 parents 31e119f + 1d9a1bb
commit 5f77968
Show file tree

Hide file tree

Showing 48 changed files with 3,513 additions and 1,435 deletions.
diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
@@ -0,0 +1,21 @@
+name: Close Stale Issues
+on:
+  schedule:
+    - cron: '0 0 * * *'  # Run every day at midnight
+jobs:
+  close_stale_prs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close stale pull requests
+        uses: actions/stale@v5
+        with:
+          days-before-stale: 30
+          days-before-pr-close: 60
+          days-before-close: 14
+          stale-issue-message: 'This issue has been marked as stale because it has been inactive for 30 days. Please update this issue or it will be automatically closed in 14 days.'
+          stale-pr-message: 'This pull request has been marked as stale because it has been inactive for 60 days. Please update this pull request or it will be automatically closed in 14 days.'
+          close-issue-message: 'This issue has been automatically closed because it has been inactive for more than 14 days. Please reopen if you want to add more context.'
+          close-pr-message: 'This pull request has been automatically closed because it has been inactive for more than 14 days. Please reopen if you still intend to submit this pull request.'
+          stale-pr-label: stale
+          stape-issue-label: stale
+
diff --git a/packages/TesterApp/.node-version b/packages/TesterApp/.node-version
diff --git a/packages/TesterApp/CHANGELOG.md b/packages/TesterApp/CHANGELOG.md
@@ -1,5 +1,27 @@
 # testerapp
 
+## 0.1.7
+
+### Patch Changes
+
+- [#476](https://github.com/callstack/repack/pull/476) [`c60d88a`](https://github.com/callstack/repack/commit/c60d88ac95105b39222eb3062cc40c0afde73496) Thanks [@szymonrybczak](https://github.com/szymonrybczak)! - Upgraded TesterApp to react-native@0.73.0
+
+* [#479](https://github.com/callstack/repack/pull/479) [`b1ad518`](https://github.com/callstack/repack/commit/b1ad518a7ff76e5ffe95a9af02469cc74b99584e) Thanks [@ambar](https://github.com/ambar)! - Added the ability to fully leverage the webpack built-in caching mechanism to optimise cold build times.
+
+* Updated dependencies [[`e1476e6`](https://github.com/callstack/repack/commit/e1476e644c1da9cee5bc933b32219027248bd5af), [`b1ad518`](https://github.com/callstack/repack/commit/b1ad518a7ff76e5ffe95a9af02469cc74b99584e)]:
+  - @callstack/repack@3.7.0
+
+## 0.1.6
+
+### Patch Changes
+
+- [#460](https://github.com/callstack/repack/pull/460) [`8992399`](https://github.com/callstack/repack/commit/8992399278b2fb4f17d92a1c25c502dfb4dc7a45) Thanks [@jbroma](https://github.com/jbroma)! - Force light theme in TesterApp
+
+* [#458](https://github.com/callstack/repack/pull/458) [`8e174dd`](https://github.com/callstack/repack/commit/8e174dd8b7e11c5318ba3b6fc10e8aff94483202) Thanks [@jbroma](https://github.com/jbroma)! - Upgraded TesterApp to react-native@0.72.6
+
+* Updated dependencies [[`74de630`](https://github.com/callstack/repack/commit/74de630d4a27215580e6f835b6204757f2998a5a)]:
+  - @callstack/repack@3.6.0
+
 ## 0.1.5
 
 ### Patch Changes

diff --git a/packages/TesterApp/Gemfile b/packages/TesterApp/Gemfile
@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby '>= 2.6.10'
 
-gem 'cocoapods', '>= 1.11.3'
+gem 'cocoapods', '~> 1.13'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
diff --git a/packages/TesterApp/Gemfile.lock b/packages/TesterApp/Gemfile.lock
@@ -1,41 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
       rexml
-    activesupport (6.1.7)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.1.0)
-    cocoapods (1.11.3)
+    cocoapods (1.14.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.3)
+      cocoapods-core (= 1.14.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.3)
-      activesupport (>= 5.0, < 7)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.14.2)
+      activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -45,7 +44,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -54,49 +53,49 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.15.5)
+    ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    minitest (5.16.3)
+    json (2.6.3)
+    minitest (5.20.0)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     public_suffix (4.0.7)
-    rexml (3.2.5)
+    rexml (3.2.6)
     ruby-macho (2.5.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.23.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.6.6)
 
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   ruby
 
 DEPENDENCIES
-  cocoapods (>= 1.11.3)
+  activesupport (>= 6.1.7.3, < 7.1.0)
+  cocoapods (~> 1.13)
 
 RUBY VERSION
    ruby 2.7.6p219
 
 BUNDLED WITH
-   2.4.7
+   2.4.20
diff --git a/packages/TesterApp/__tests__/start.test.ts b/packages/TesterApp/__tests__/start.test.ts
@@ -29,6 +29,7 @@ beforeAll(async () => {
     port,
     silent: true,
     logFile: path.join(TMP_DIR, 'server.log'),
+    webpackConfig: path.join(__dirname, './webpack.config.mjs'),
   };
 
   const { stop } = await start.func([], config as Config, args as Args);

diff --git a/packages/TesterApp/__tests__/webpack.config.mjs b/packages/TesterApp/__tests__/webpack.config.mjs
@@ -6,5 +6,9 @@ export default async (env) => {
       ...config.output,
       path: process.env.TEST_WEBPACK_OUTPUT_DIR,
     },
+    experiments: {
+      ...config.output.experiments,
+      lazyCompilation: false,
+    },
   };
 };
diff --git a/packages/TesterApp/android/app/build.gradle b/packages/TesterApp/android/app/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 
-import com.android.build.OutputFile	
-
 /**
  * This is the configuration block to customize your React Native Android app.
  * By default you don't need to apply any configuration, just uncomment the lines you need.
@@ -13,8 +12,8 @@ react {
     // root = file("../")
     //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
     // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
-    // codegenDir = file("../node_modules/react-native-codegen")
+    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
+    // codegenDir = file("../node_modules/@react-native/codegen")
     //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
     // cliFile = file("../node_modules/react-native/cli.js")
 
@@ -52,14 +51,6 @@ react {
     // hermesFlags = ["-O", "-output-source-map"]
 }
 
-/**
- * Set this to true to create four separate APKs instead of one,
- * one for each native architecture. This is useful if you don't
- * use App Bundles (https://developer.android.com/guide/app-bundle/)
- * and want to have separate APKs to upload to the Play Store.
- */
-def enableSeparateBuildPerCPUArchitecture = false
-
 /**
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
@@ -78,20 +69,11 @@ def enableProguardInReleaseBuilds = false
  */
 def jscFlavor = 'org.webkit:android-jsc:+'
 
-/**
- * Private function to get the list of Native Architectures you want to build.
- * This reads the value from reactNativeArchitectures in your gradle.properties
- * file and works together with the --active-arch-only flag of react-native run-android.
- */
-def reactNativeArchitectures() {
-    def value = project.getProperties().get("reactNativeArchitectures")
-    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
 android {
     ndkVersion rootProject.ext.ndkVersion
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     namespace "com.testerapp"
     defaultConfig {
@@ -101,15 +83,6 @@ android {
         versionCode 1
         versionName "1.0"
     }
-
-    splits {
-        abi {
-            reset()
-            enable enableSeparateBuildPerCPUArchitecture
-            universalApk false  // If true, also generate a universal APK
-            include (*reactNativeArchitectures())
-        }
-    }
     signingConfigs {
         debug {
             storeFile file('debug.keystore')
@@ -130,37 +103,12 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
-
-    // applicationVariants are e.g. debug, release
-    applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            // For each separate APK per architecture, set a unique version code as described here:
-            // https://developer.android.com/studio/build/configure-apk-splits.html
-            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
-            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
-            def abi = output.getFilter(OutputFile.ABI)
-            if (abi != null) {  // null for the universal-debug, universal-release variants
-                output.versionCodeOverride =
-                        defaultConfig.versionCode * 1000 + versionCodes.get(abi)
-            }
-
-        }
-    }
 }
 
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
-
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
-
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {

diff --git a/packages/TesterApp/android/app/src/debug/java/com/testerapp/ReactNativeFlipper.java b/packages/TesterApp/android/app/src/debug/java/com/testerapp/ReactNativeFlipper.java