nx-react-native-cli 1.0.15 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx-react-native-cli",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "A react native starter (with NX) cli script",
   "type": "module",
   "files": [
@@ -17,7 +17,10 @@
     "build": "rm -rf lib && esbuild src/index.js --format=cjs --platform=node --bundle --outfile=lib/index.cjs --minify --analyze",
     "prepublish": "npm run build",
     "example": "npx nxrn create example",
-    "relink": "npm unlink nxrn && npm run prepublish && npm link nxrn",
+    "example-fresh": "npx nxrn create example-fresh --fresh",
+    "generate-diff": "./generate-diff.sh",
+    "show-diff": "npx diff2html -s side --sc --hc --cs light -i file -o preview -F diff.html -- diff.diff && open diff.html",
+    "relink": "npm unlink nxrn && npm run prepublish && npm link",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": {
@@ -33,6 +36,7 @@
     "prettier": "^3.3.3"
   },
   "devDependencies": {
+    "diff2html-cli": "^5.2.15",
     "esbuild": "^0.23.0"
   }
 }

package/templates/.nvmrc

@@ -1 +1 @@
-v18.17.0
+v18.20.3

package/templates/apps/mobile/android/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 
 /**
@@ -9,12 +10,12 @@ react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
     // 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 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")
+    //   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 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")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -36,7 +37,7 @@ react {
     // bundleAssetName = "MyApplication.android.bundle"
     //
     //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    // entryFile = file("../js/MyApplication.android.js")
+    entryFile = file("../../src/main.tsx")
     //
     //   A list of extra flags to pass to the 'bundle' commands.
     //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
@@ -48,7 +49,6 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
-    entryFile = file("../../src/main.tsx")
 }
 
 /**
@@ -71,7 +71,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
     namespace "com.appsmobile"
     flavorDimensions "default"
 
@@ -92,18 +93,24 @@ android {
             storePassword 'development'
             keyAlias 'dev'
             keyPassword 'development'
+            v1SigningEnabled true
+            v2SigningEnabled true
         }
         dev {
             storeFile file('dev.keystore')
             storePassword 'development'
             keyAlias 'dev'
             keyPassword 'development'
+            v1SigningEnabled true
+            v2SigningEnabled true
         }
         production {
             storeFile file('production.keystore')
             storePassword System.getenv("STORE_PASSWORD")
             keyAlias System.getenv("KEY_ALIAS")
             keyPassword System.getenv("KEY_PASSWORD")
+            v1SigningEnabled true
+            v2SigningEnabled true
         }
     }
 
@@ -133,27 +140,14 @@ android {
             // see https://reactnative.dev/docs/signed-apk-android.
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            
-            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
-            
         }
     }
 }
 
 dependencies {
-    
-    androidTestImplementation('com.wix:detox:+')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
-    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 {
@@ -161,4 +155,4 @@ dependencies {
     }
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: file("../../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

package/templates/apps/mobile/android/build.gradle

@@ -1,15 +1,11 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext {
-        buildToolsVersion = "33.0.0"
-        minSdkVersion = 24
+        buildToolsVersion = "34.0.0"
+        minSdkVersion = 23
         compileSdkVersion = 34
         targetSdkVersion = 34
-        kotlinVersion = "1.8.20"
-
-        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-        ndkVersion = "23.1.7779620"
+        ndkVersion = "26.1.10909125"
+        kotlinVersion = "1.9.22"
     }
     repositories {
         google()
@@ -18,17 +14,8 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }
 }
 
-allprojects {
-    repositories {
-        
-        maven {
-            // https://wix.github.io/Detox/docs/introduction/project-setup
-            url("$rootDir/../node_modules/detox/Detox-android")
-        }
-        
-    }
-}
+apply plugin: "com.facebook.react.rootproject"

package/templates/apps/mobile/babel.config.json

@@ -1,6 +1,7 @@
 {
-  "presets": ["module:metro-react-native-babel-preset"],
+  "presets": ["module:@react-native/babel-preset"],
   "plugins": [
+    "babel-plugin-transform-flow-enums",
     [
       "module:react-native-dotenv",
       {

package/templates/apps/mobile/export-node-binary.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cat << EOF > ./ios/.xcode.env.local
+export NODE_BINARY=$(which node)
+export ENTRY_FILE="\${PROJECT_DIR}/../src/main.tsx"
+EOF

package/templates/apps/mobile/fastlane/Fastfile

@@ -1,7 +1,7 @@
 
 require 'fileutils'
 
-def app_name = ""
+def app_name = "AppsMobile"
 
 def delete_gradle_temp()
     UI.message("Deleting Gradle Temp...")
@@ -291,10 +291,10 @@ platform :ios do
     lane :prod do 
         begin  
             build_number = setup_ios()
-            ios_build_ipa("Release", "Release")
+            ios_build_ipa("Release", app_name)
             # (Optional) Uncomment if you want to upload dSYM to Firebase Crashlytics
             # upload_dysm("Release", "Prod")
-            publish_ipa(build_number, "Release")
+            publish_ipa(build_number, app_name)
         rescue => exception
             UI.error(exception)
         end

package/templates/apps/mobile/jest.config.ts

@@ -0,0 +1,12 @@
+module.exports = {
+    displayName: 'mobile',
+    preset: 'react-native',
+    resolver: '@nx/jest/plugins/resolver',
+    moduleFileExtensions: ['ts', 'js', 'html', 'tsx', 'jsx'],
+    setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
+    moduleNameMapper: {
+      '\\.svg$': '@nx/react-native/plugins/jest/svg-mock',
+    },
+    coverageDirectory: '../../coverage/apps/mobile',
+  };
+  

package/templates/apps/mobile/package.json

@@ -3,6 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
+    
     "android:connect": "adb reverse tcp:8081 tcp:8081",
     "start": "npx nx start mobile --skip-nx-cache",
     "run-ios": "npx nx run-ios mobile --skip-nx-cache --scheme=Dev --simulator='iPhone 13 (A96A9251-28D7-48B1-8F6A-20B6CCB8810B)'",
@@ -10,11 +11,13 @@
     "ensure-symlink": "npx nx ensure-symlink mobile",
     "sync-deps": "npx nx sync-deps mobile",
     "pod-install": "npx nx pod-install mobile",
-    "bundle:pod-install": "cd ios && bundle install && bundle exec pod install --repo-update",
+    "export-node-binary": "./export-node-binary.sh",
+    "bundle:pod-install": "cd ios && bundle install && bundle exec pod install --repo-update && npm run export-node-binary",
     "pre-build": "npm run ensure-symlink && npm run sync-deps && npm run pod-install",
     "list:ios-configurations": "cd ios && xcodebuild -list",
     "list:ios-devices": "xcrun xctrace list devices",
     "xcode": "open ios/AppsMobile.xcworkspace",
+    "touch-xcode": "cd ios && touch .xcode.env",
     "check-env:mobile": "cd ../.. && npm run check-env:mobile",
     "setup-fastlane": "rbenv local && bundle install && bundle update",
     "deploy-android:dev": "bundle exec fastlane android dev --env development",

package/templates/apps/mobile/project.json

@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/mobile/src",
   "projectType": "application",
+  "tags": [],
+  "// targets": "to see all targets run: nx show project mobile --web",
   "targets": {
     "check-env": {
       "executor": "nx:run-script",
@@ -42,7 +44,10 @@
     "run-android": {
       "executor": "@nx/react-native:run-android",
       "dependsOn": ["ensure-symlink"],
-      "options": {}
+      "options": {
+        "mode": "debug",
+        "tasks": "installDevDebug"
+      }
     },
     "build-android": {
       "executor": "@nx/react-native:build-android",
@@ -97,6 +102,5 @@
         "jestConfig": "apps/mobile/jest.config.ts"
       }
     }
-  },
-  "tags": []
+  }
 }

package/templates/apps/mobile/src/app/index.tsx

@@ -18,14 +18,8 @@ LogBox.ignoreLogs(['VirtualizedLists', 'onAnimatedValueUpdate']);
 
 enableFreeze(true);
 
-const MS_IN_S = 1000;
-const S_IN_A_MIN = 60;
-const MIN_IN_AN_HOUR = 60;
-const HOURS_IN_A_DAY = 24;
-const MS_IN_DAYS = MS_IN_S * S_IN_A_MIN * MIN_IN_AN_HOUR * HOURS_IN_A_DAY;
-
-const CACHE_TIME = MS_IN_DAYS * 1;
-const STALE_TIME = MS_IN_S * S_IN_A_MIN * MIN_IN_AN_HOUR; // 5 minutes
+const CACHE_TIME = 0;
+const STALE_TIME = 0;
 
 const queryClient = new QueryClient({
   defaultOptions: {

package/templates/apps/mobile/src/routes/screen-options.ts

@@ -1,9 +1,5 @@
-import CONFIG from '../config';
-
-const areGesturesEnabled = CONFIG.IS_IOS;
 
 export const screenOptions = {
-  gestureEnabled: areGesturesEnabled,
-  gestureResponseDistance: 350,
+  gestureEnabled: true,
   headerShown: false,
 };

package/templates/apps/mobile/test-setup.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-native/extend-expect';

package/templates/apps/mobile/tsconfig.spec.json

@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}