Merge pull request #1155 from flexn-io/feat/withRnvRNConfig

added withRnvRNConfig, added missing files to template
flexn-io · Oct 10, 2023 · b61f258 · b61f258
2 parents 9dc8f0e + 1309b75
commit b61f258
Show file tree

Hide file tree

Showing 17 changed files with 154 additions and 147 deletions.
diff --git a/packages/engine-rn-macos/src/adapters/babelAdapter.ts b/packages/engine-rn-macos/src/adapters/babelAdapter.ts
@@ -0,0 +1,18 @@
+export const withRNVBabel = (cnf: any) => {
+    const plugins = cnf?.plugins || [];
+
+    return {
+        retainLines: true,
+        presets: ['module:metro-react-native-babel-preset'],
+        ...cnf,
+        plugins: [
+            [
+                require.resolve('babel-plugin-module-resolver'),
+                {
+                    root: [process.env.RNV_MONO_ROOT || '.'],
+                },
+            ],
+            ...plugins,
+        ],
+    };
+};
diff --git a/packages/engine-rn-macos/src/adapter.ts → ...ine-rn-macos/src/adapters/metroAdapter.ts b/packages/engine-rn-macos/src/adapter.ts → ...ine-rn-macos/src/adapters/metroAdapter.ts
@@ -75,22 +75,3 @@ export const withRNVMetro = (config: any) => {
 
     return cnf;
 };
-
-export const withRNVBabel = (cnf: any) => {
-    const plugins = cnf?.plugins || [];
-
-    return {
-        retainLines: true,
-        presets: ['module:metro-react-native-babel-preset'],
-        ...cnf,
-        plugins: [
-            [
-                require.resolve('babel-plugin-module-resolver'),
-                {
-                    root: [process.env.RNV_MONO_ROOT || '.'],
-                },
-            ],
-            ...plugins,
-        ],
-    };
-};
diff --git a/packages/engine-rn-macos/src/index.ts b/packages/engine-rn-macos/src/index.ts
@@ -1,5 +1,6 @@
 import { generateEngineExtensions, generateEngineTasks, RnvEngine } from '@rnv/core';
-import { withRNVBabel, withRNVMetro } from './adapter';
+import { withRNVMetro } from './adapters/metroAdapter';
+import { withRNVBabel } from './adapters/babelAdapter';
 //@ts-ignore
 import CNF from '../renative.engine.json';
 import taskRnvRun from './tasks/task.rnv.run';
@@ -9,6 +10,7 @@ import taskRnvConfigure from './tasks/task.rnv.configure';
 import taskRnvStart from './tasks/task.rnv.start';
 import taskRnvExport from './tasks/task.rnv.export';
 import taskRnvDeploy from './tasks/task.rnv.deploy';
+import { withRNVRNConfig } from "@rnv/sdk-react-native";
 // import taskRnvLog from './tasks/task.rnv.log';
 
 const Engine: RnvEngine = {
@@ -45,6 +47,6 @@ const Engine: RnvEngine = {
 // Backward compatibility
 const withRNV = withRNVMetro;
 
-export { withRNV, withRNVMetro, withRNVBabel };
+export { withRNV, withRNVMetro, withRNVBabel, withRNVRNConfig };
 
 export default Engine;
diff --git a/packages/engine-rn-next/src/adapters/babelAdapter.ts b/packages/engine-rn-next/src/adapters/babelAdapter.ts
@@ -0,0 +1,18 @@
+export const withRNVBabel = (cnf: any) => {
+    const plugins = cnf?.plugins || [];
+
+    return {
+        retainLines: true,
+        presets: ['module:babel-preset-expo'],
+        ...cnf,
+        plugins: [
+            [
+                require.resolve('babel-plugin-module-resolver'),
+                {
+                    root: [process.env.RNV_MONO_ROOT || '.'],
+                },
+            ],
+            ...plugins,
+        ],
+    };
+};
diff --git a/packages/engine-rn-next/src/adapter.ts → ...ngine-rn-next/src/adapters/nextAdapter.ts b/packages/engine-rn-next/src/adapter.ts → ...ngine-rn-next/src/adapters/nextAdapter.ts
@@ -99,22 +99,3 @@ export const withRNVNext = (config: any, opts: any) => {
 
     return cnf1;
 };
-
-export const withRNVBabel = (cnf: any) => {
-    const plugins = cnf?.plugins || [];
-
-    return {
-        retainLines: true,
-        presets: ['module:babel-preset-expo'],
-        ...cnf,
-        plugins: [
-            [
-                require.resolve('babel-plugin-module-resolver'),
-                {
-                    root: [process.env.RNV_MONO_ROOT || '.'],
-                },
-            ],
-            ...plugins,
-        ],
-    };
-};
diff --git a/packages/engine-rn-next/src/index.ts b/packages/engine-rn-next/src/index.ts
@@ -1,5 +1,6 @@
 import { generateEngineExtensions, generateEngineTasks, RnvEngine } from '@rnv/core';
-import { withRNVNext, withRNVBabel } from './adapter';
+import { withRNVNext } from './adapters/nextAdapter';
+import { withRNVBabel } from './adapters/babelAdapter';
 //@ts-ignore
 import CNF from '../renative.engine.json';
 import taskRnvRun from './tasks/task.rnv.run';

diff --git a/packages/engine-rn-tvos/src/index.ts b/packages/engine-rn-tvos/src/index.ts
@@ -16,6 +16,7 @@ import taskRnvLog from './tasks/task.rnv.log';
 import CNF from '../renative.engine.json';
 import { withRNVBabel } from './adapters/babelAdapter';
 import { withRNVMetro } from './adapters/metroAdapter';
+import { withRNVRNConfig } from "@rnv/sdk-react-native";
 
 const Engine: RnvEngine = {
     // initializeRuntimeConfig: (c) => Context.initializeConfig(c),
@@ -68,6 +69,6 @@ const Engine: RnvEngine = {
 
 const withRNV = withRNVMetro;
 
-export { withRNVMetro, withRNV, withRNVBabel };
+export { withRNVMetro, withRNV, withRNVBabel, withRNVRNConfig };
 
 export default Engine;
diff --git a/packages/engine-rn-windows/src/adapters/babelAdapter.ts b/packages/engine-rn-windows/src/adapters/babelAdapter.ts
@@ -0,0 +1,18 @@
+export const withRNVBabel = (cnf: any) => {
+    const plugins = cnf?.plugins || [];
+
+    return {
+        retainLines: true,
+        presets: ['module:metro-react-native-babel-preset'],
+        ...cnf,
+        plugins: [
+            [
+                require.resolve('babel-plugin-module-resolver'),
+                {
+                    root: [process.env.RNV_MONO_ROOT || '.'],
+                },
+            ],
+            ...plugins,
+        ],
+    };
+};
diff --git a/packages/engine-rn-windows/src/adapter.ts → ...e-rn-windows/src/adapters/metroAdapter.ts b/packages/engine-rn-windows/src/adapter.ts → ...e-rn-windows/src/adapters/metroAdapter.ts
@@ -83,21 +83,3 @@ export const withRNVMetro = (config: any) => {
     return cnf;
 };
 
-export const withRNVBabel = (cnf: any) => {
-    const plugins = cnf?.plugins || [];
-
-    return {
-        retainLines: true,
-        presets: ['module:metro-react-native-babel-preset'],
-        ...cnf,
-        plugins: [
-            [
-                require.resolve('babel-plugin-module-resolver'),
-                {
-                    root: [process.env.RNV_MONO_ROOT || '.'],
-                },
-            ],
-            ...plugins,
-        ],
-    };
-};
diff --git a/packages/engine-rn-windows/src/index.ts b/packages/engine-rn-windows/src/index.ts
@@ -1,5 +1,6 @@
 import { RnvEngine, generateEngineTasks, generateEngineExtensions } from '@rnv/core';
-import { withRNVBabel, withRNVMetro } from './adapter';
+import { withRNVMetro } from './adapters/metroAdapter';
+import { withRNVBabel } from './adapters/babelAdapter';
 //@ts-ignore
 import CNF from '../renative.engine.json';
 import taskRnvBuild from './tasks/task.rnv.build';
@@ -10,6 +11,7 @@ import taskRnvExport from './tasks/task.rnv.export';
 import taskRnvPackage from './tasks/task.rnv.package';
 import taskRnvRun from './tasks/task.rnv.run';
 import taskRnvStart from './tasks/task.rnv.start';
+import { withRNVRNConfig } from "@rnv/sdk-react-native";
 
 const Engine: RnvEngine = {
     // initializeRuntimeConfig: (c) => Context.initializeConfig(c),
@@ -43,6 +45,6 @@ const Engine: RnvEngine = {
 // Backward compatibility
 const withRNV = withRNVMetro;
 
-export { withRNV, withRNVMetro, withRNVBabel };
+export { withRNV, withRNVMetro, withRNVBabel, withRNVRNConfig };
 
 export default Engine;
diff --git a/packages/engine-rn/src/index.ts b/packages/engine-rn/src/index.ts
@@ -18,6 +18,7 @@ import taskRnvCryptoInstallProfiles from './tasks/task.rnv.crypto.installProfile
 import taskRnvLog from './tasks/task.rnv.log';
 import taskRnvEject from './tasks/task.rnv.eject';
 import { generateEngineExtensions, generateEngineTasks, RnvEngine } from '@rnv/core';
+import { withRNVRNConfig } from "@rnv/sdk-react-native";
 
 const Engine: RnvEngine = {
     // initializeRuntimeConfig: (c) => Context.initializeConfig(c),
@@ -95,4 +96,4 @@ export default Engine;
 // Backward compatibility
 const withRNV = withRNVMetro;
 
-export { withRNV, withRNVMetro, withRNVBabel };
+export { withRNV, withRNVMetro, withRNVBabel, withRNVRNConfig };
diff --git a/packages/rnv/src/adapter/index.ts b/packages/rnv/src/adapter/index.ts
@@ -43,3 +43,14 @@ export const withRNVMetro = (cnf: any) => {
 
     return cnf;
 };
+
+export const withRNVRNConfig = (cnf: any) => {
+    if (process.env.RNV_ENGINE_PATH) {
+        const engine = require(process.env.RNV_ENGINE_PATH);
+        if (engine.withRNVRNConfig) {
+            return engine.withRNVRNConfig(cnf);
+        }
+    }
+
+    return cnf;
+};
diff --git a/packages/sdk-react-native/src/adapters.ts b/packages/sdk-react-native/src/adapters.ts
@@ -0,0 +1,64 @@
+import merge from 'deepmerge';
+
+const getApplicationId = () => {
+    const appId = process.env.RNV_APP_ID;
+    return appId;
+};
+
+const getAppFolderRelative = () => {
+    const pth = process.env.RNV_APP_BUILD_DIR;
+    if (pth) {
+        return pth;
+    } else {
+        const cwd = process.cwd();
+        if (cwd.includes('platformBuilds/')) {
+            const dir = process.cwd().split('platformBuilds/')[1];
+
+            return `platformBuilds/${dir}`;
+        } else {
+            return undefined;
+        }
+    }
+};
+
+const getReactNativePathRelative = () => {
+    const rnPath = process.env.RNV_REACT_NATIVE_PATH;
+    return rnPath;
+};
+
+const getProjectRoot = () => {
+    //env: PROJECT_ROOT
+    const rnPath = process.env.RNV_PROJECT_ROOT;
+    return rnPath;
+};
+
+export const withRNVRNConfig = (config: any) => {
+    const cnfRnv = {
+        root: getProjectRoot(),
+        //Required to support 2 react native instances
+        reactNativePath: getReactNativePathRelative(),
+        dependencies: {
+            // Required for Expo CLI to be used with platforms (such as Apple TV) that are not supported in Expo SDK
+            expo: {
+                platforms: {
+                    android: null,
+                    ios: null,
+                    macos: null,
+                },
+            },
+        },
+        project: {
+            ios: {
+                sourceDir: getAppFolderRelative(),
+            },
+            android: {
+                appName: 'app',
+                sourceDir: getAppFolderRelative(),
+                packageName: getApplicationId(),
+            },
+        },
+    };
+
+    const cnf = merge(cnfRnv, config);
+    return cnf;
+};
diff --git a/packages/sdk-react-native/src/index.ts b/packages/sdk-react-native/src/index.ts
@@ -1,3 +1,4 @@
 export * from './common';
 export * from './androidRunner';
 export * from './iosRunner';
+export * from './adapters';
diff --git a/packages/template-starter/Gemfile.lock b/packages/template-starter/Gemfile.lock
@@ -89,6 +89,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (~> 7.0, <= 7.0.8)
   cocoapods (~> 1.12)
 
 RUBY VERSION

diff --git a/packages/template-starter/package.json b/packages/template-starter/package.json
@@ -53,7 +53,11 @@
         "renative.template.json",
         "src",
         "static",
-        "tsconfig.json"
+        "tsconfig.json",
+        "Gemfile",
+        "metro.config.js",
+        "react-native.config.js",
+        "next-env.d.ts"
     ],
     "repository": {
         "type": "git",
@@ -121,4 +125,4 @@
             "last 1 safari version"
         ]
     }
-}
+}