Merge pull request #1191 from flexn-io/feat/extend-platform

[feat] extend platform
flexn-io · Oct 20, 2023 · e18df59 · e18df59
2 parents ce134e7 + ba6b7fc
commit e18df59
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/packages/core/jsonSchema/rnv.project.json b/packages/core/jsonSchema/rnv.project.json
@@ -3814,8 +3814,7 @@
         "workspaceID",
         "projectName",
         "templates",
-        "currentTemplate",
-        "isNew"
+        "currentTemplate"
       ],
       "additionalProperties": false
     }

diff --git a/packages/core/src/configs/buildConfig.ts b/packages/core/src/configs/buildConfig.ts
@@ -14,6 +14,7 @@ import { getContext } from '../context/provider';
 import type { RnvContext } from '../context/types';
 import { ConfigFileBuildConfig } from '../schema/configFiles/buildConfig';
 import { FileUtilsPropConfig } from '../system/types';
+import { PlatformKey } from '../schema/types';
 
 const _arrayMergeOverride = (_destinationArray: Array<string>, sourceArray: Array<string>) => sourceArray;
 
@@ -150,6 +151,18 @@ export const generateBuildConfig = (_c?: RnvContext) => {
     };
     c.buildConfig = sanitizeDynamicProps(c.buildConfig, propConfig);
 
+    //Merge extendPlatform
+    const platforms = c.buildConfig.platforms || {};
+    (Object.keys(platforms) as PlatformKey[]).forEach((k) => {
+        const plat = platforms[k];
+        if (plat?.extendPlatform) {
+            const extPlat = platforms[plat?.extendPlatform];
+            if (extPlat) {
+                platforms[k] = merge(plat, extPlat);
+            }
+        }
+    });
+
     logDebug('BUILD_CONFIG', Object.keys(c.buildConfig));
 
     if (c.runtime.appId) {

diff --git a/packages/core/src/schema/configFiles/project.ts b/packages/core/src/schema/configFiles/project.ts
@@ -248,6 +248,7 @@ const RootProjectBaseFragment = {
         ),
     isNew: z
         .string()
+        .optional()
         .describe('Marker indicating that this project has just been bootstrapped. this prop is managed by rnv'),
 };
 

diff --git a/packages/template-starter/renative.json b/packages/template-starter/renative.json
@@ -71,6 +71,7 @@
             "version": "^1.0.0-canary.7"
         }
     },
+    "currentTemplate": "@rnv/template-starter",
     "platforms": {
         "android": {
             "minSdkVersion": 26,