Merge branch 'release/1.0' into fix/add_customization

flexn-io · Dec 20, 2023 · 713192a · 713192a
2 parents 3459de2 + 706bae7
commit 713192a
Show file tree

Hide file tree

Showing 42 changed files with 195 additions and 151 deletions.
diff --git a/buildHooks/src/prePublish.js b/buildHooks/src/prePublish.js
@@ -5,6 +5,7 @@ import fs from 'fs';
 const merge = require('deepmerge');
 
 const VERSIONED_PACKAGES = [
+    'app-harness',
     'rnv',
     'core',
     'build-hooks-git',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flexn/renative-monorepo",
-    "version": "1.0.0-rc.4",
+    "version": "1.0.0-rc.6",
     "description": "🚀🚀🚀 Unified Development Platform. Bootstrap, Develop & Deploy `iOS`, `tvOS`, `Android`, `Android TV`, `Fire TV`, `Android Wear`, `Web`, `Tizen TV`, `Tizen Watch`, `Tizen Mobile`, `LG webOS`, `macOS/OSX`, `Windows`, `KaiOS`, `Linux` and `Chromecast` platforms",
     "keywords": [
         "android tv",
@@ -84,8 +84,8 @@
         "@flexn/eslint-config": "1.0.0",
         "@flexn/prettier-config": "1.0.0",
         "@flexn/typescript-config": "1.0.0",
-        "@rnv/build-hooks-git": "1.0.0-rc.4",
-        "@rnv/core": "1.0.0-rc.4",
+        "@rnv/build-hooks-git": "1.0.0-rc.6",
+        "@rnv/core": "1.0.0-rc.6",
         "@types/jest": "~27.0.2",
         "@types/kill-port": "2.0.0",
         "@types/lodash.get": "4.4.7",

diff --git a/packages/app-harness/package.json b/packages/app-harness/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/app-harness",
-    "version": "1.0.0-feat-pin-cli.6",
+    "version": "1.0.0-rc.6",
     "description": "ReNative Test Harness App",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/renative#readme",
@@ -36,7 +36,7 @@
     },
     "dependencies": {
         "@lightningjs/sdk": "^5.4.1",
-        "@rnv/renative": "1.0.0-rc.4",
+        "@rnv/renative": "1.0.0-rc.6",
         "next": "13.5.2",
         "raf": "3.4.1",
         "react": "18.2.0",
@@ -50,22 +50,22 @@
     "devDependencies": {
         "@flexn/assets-renative-outline": "0.3.2",
         "@flexn/graybox": "1.0.0-feat.12",
-        "@rnv/core": "1.0.0-rc.4",
-        "@rnv/engine-lightning": "1.0.0-rc.4",
-        "@rnv/engine-rn": "1.0.0-rc.4",
-        "@rnv/engine-rn-electron": "1.0.0-rc.4",
-        "@rnv/engine-rn-next": "1.0.0-rc.4",
-        "@rnv/engine-rn-tvos": "1.0.0-rc.4",
-        "@rnv/engine-rn-web": "1.0.0-rc.4",
-        "@rnv/template-starter": "^1.0.0-rc.4",
+        "@rnv/core": "1.0.0-rc.6",
+        "@rnv/engine-lightning": "1.0.0-rc.6",
+        "@rnv/engine-rn": "1.0.0-rc.6",
+        "@rnv/engine-rn-electron": "1.0.0-rc.6",
+        "@rnv/engine-rn-next": "1.0.0-rc.6",
+        "@rnv/engine-rn-tvos": "1.0.0-rc.6",
+        "@rnv/engine-rn-web": "1.0.0-rc.6",
+        "@rnv/template-starter": "1.0.0-rc.6",
         "@types/react": "18.2.22",
         "@types/react-dom": "18.2.7",
         "@types/react-native": "0.72.2",
         "babel-jest": "29.2.1",
         "babel-loader": "9.1.3",
         "detox": "18.20.2",
         "jetifier": "2.0.0",
-        "rnv": "1.0.0-rc.4"
+        "rnv": "1.0.0-rc.6"
     },
     "private": true,
     "browserslist": {

diff --git a/packages/build-hooks-git/package.json b/packages/build-hooks-git/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/build-hooks-git",
-    "version": "1.0.0-rc.4",
+    "version": "1.0.0-rc.6",
     "description": "Build Hooks for Git",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/renative#readme",
@@ -30,7 +30,7 @@
         "simple-git": "^3.16.0"
     },
     "peerDependencies": {
-        "@rnv/core": "^1.0.0-rc.4"
+        "@rnv/core": "^1.0.0-rc.6"
     },
     "publishConfig": {
         "access": "public"

diff --git a/packages/build-hooks-schema/package.json b/packages/build-hooks-schema/package.json
@@ -31,7 +31,7 @@
         "zod-to-json-schema": "3.21.4"
     },
     "peerDependencies": {
-        "@rnv/core": "^1.0.0-rc.4"
+        "@rnv/core": "^1.0.0-rc.6"
     },
     "publishConfig": {
         "access": "public"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/cli",
-    "version": "1.0.0-rc.4",
+    "version": "1.0.0-rc.6",
     "description": "ReNative CLI",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/renative#readme",
@@ -37,7 +37,7 @@
         "inquirer": "8.2.0"
     },
     "peerDependencies": {
-        "@rnv/core": "^1.0.0-rc.4"
+        "@rnv/core": "^1.0.0-rc.6"
     },
     "private": false,
     "publishConfig": {

diff --git a/packages/cli/src/prompt.ts b/packages/cli/src/prompt.ts
@@ -21,23 +21,19 @@ export const inquirerPrompt = async (params: PromptParams): Promise<Record<strin
 
     const msg = params.logMessage || params.warningMessage || params.message;
     if (c.program?.ci) {
-        try {
-            if (
-                Array.isArray(params.choices) &&
-                typeof params.default !== 'undefined' &&
-                params.choices.includes(params.default)
-            ) {
-                logDebug(`defaulting to choice '${params.default}' for prompt '${params.name}'`);
+        if (
+            Array.isArray(params.choices) &&
+            typeof params.default !== 'undefined' &&
+            params.choices.includes(params.default)
+        ) {
+            logDebug(`defaulting to choice '${params.default}' for prompt '${params.name}'`);
 
-                if (params.name) return { [params.name]: params.default };
-            }
-            throw new Error(msg);
-        } catch (error) {
-            logWarning(error instanceof Error ? error.message : error);
+            if (params.name) return { [params.name]: params.default };
         }
+        return Promise.reject(`--ci option does not allow prompts. question: ${msg}.`);
     }
     if (msg && params.logMessage) logTask(msg, chalk().grey);
-    if (msg && params.warningMessage && !c.program.ci) logWarning(msg);
+    if (msg && params.warningMessage) logWarning(msg);
 
     // allow passing in just { type: 'prompt', ... } instead of { type: 'prompt', name: 'prompt', ... }
     const { type, name } = params;

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/core",
-    "version": "1.0.0-rc.4",
+    "version": "1.0.0-rc.6",
     "description": "RNV Core SDK",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/renative#readme",

diff --git a/packages/core/src/configs/configProject.ts b/packages/core/src/configs/configProject.ts
@@ -118,16 +118,33 @@ export const generatePlatformTemplatePaths = (c: RnvContext) => {
                     if (originalPath) {
                         if (!pt[platform]) {
                             const pt1 = getRealPath(c, originalPath, 'platformTemplatesDir', originalPath);
-                            if (pt1) result[platform] = pt1;
+                            if (pt1) {
+                                result[platform] = pt1;
+                            } else {
+                                logWarning(`Cannot resolve originalTemplatePlatformsDir: ${originalPath}. SKIPPING...`);
+                            }
                         } else {
                             const pt2 = getRealPath(c, pt[platform], 'platformTemplatesDir', originalPath);
-                            if (pt2) result[platform] = pt2;
+                            if (pt2) {
+                                result[platform] = pt2;
+                            } else {
+                                logWarning(
+                                    `Cannot resolve platformTemplatesDirs[${platform}] with original path: ${originalPath}. SKIPPING...`
+                                );
+                            }
                         }
                     } else {
                         logWarning(
                             `Platform ${chalk().red(platform)} not supported by any registered engine. SKIPPING...`
                         );
                     }
+                } else if (platform === c.platform && c.runtime.currentEngine) {
+                    //NOTE: only log warning if there is already registered engine but cannot be found by platform
+                    logWarning(
+                        `Could not find active engine for platform: ${chalk().red(
+                            platform
+                        )}. Available engine platforms: ${Object.keys(c.runtime.enginesByPlatform)}`
+                    );
                 }
             }
         });

diff --git a/packages/core/src/context/runtime.ts b/packages/core/src/context/runtime.ts
@@ -52,6 +52,7 @@ export const configureRuntimeDefaults = async (c: RnvContext) => {
         if (c.buildConfig.defaults?.supportedPlatforms) {
             c.runtime.supportedPlatforms = [];
             c.buildConfig.defaults.supportedPlatforms.forEach((platform) => {
+                //TODO: migrate to singular platform engine
                 const engine = getEngineRunnerByPlatform(c, platform);
                 if (engine) {
                     const dir = engine.originalTemplatePlatformsDir;

diff --git a/packages/core/src/platforms/index.ts b/packages/core/src/platforms/index.ts
@@ -57,21 +57,30 @@ export const createPlatformBuild = (c: RnvContext, platform: RnvPlatform) =>
 
         if (!platform || !isPlatformSupportedSync(c, platform, undefined, reject)) return;
 
+        const ptDir = c.paths.project.platformTemplatesDirs[platform];
+        if (!ptDir) {
+            logError(`Cannot create platform build: c.paths.project.platformTemplatesDirs[${platform}] is not defined`);
+            return;
+        }
+
         const pPath = getAppFolder(c);
-        const ptPath = path.join(c.paths.project.platformTemplatesDirs[platform], `${platform}`);
+        const ptPath = path.join(ptDir, `${platform}`);
 
         copyFolderContentsRecursiveSync(
             ptPath,
             pPath,
             false,
             [path.join(ptPath, '_privateConfig')],
             false,
-            [{
-                pattern: '{{PATH_REACT_NATIVE}}',
-                override: doResolve(c.runtime.runtimeExtraProps?.reactNativePackageName || 'react-native', true, {
-                    forceForwardPaths: true,
-                }) || '',
-            }],
+            [
+                {
+                    pattern: '{{PATH_REACT_NATIVE}}',
+                    override:
+                        doResolve(c.runtime.runtimeExtraProps?.reactNativePackageName || 'react-native', true, {
+                            forceForwardPaths: true,
+                        }) || '',
+                },
+            ],
             getTimestampPathsConfig(c, platform),
             c
         );

diff --git a/packages/core/src/projects/npm.ts b/packages/core/src/projects/npm.ts
@@ -28,6 +28,8 @@ export const checkNpxIsInstalled = async () => {
 
 export const areNodeModulesInstalled = () => !!doResolve('resolve', false);
 
+type NpmVersion = { name: string; value: string };
+
 export const listAndSelectNpmVersion = async (c: RnvContext, npmPackage: string) => {
     const templateVersionsStr = await executeAsync(c, `npm view ${npmPackage} versions`);
     const versionArr = templateVersionsStr.replace(/\r?\n|\r|\s|'|\[|\]/g, '').split(',');
@@ -46,9 +48,11 @@ export const listAndSelectNpmVersion = async (c: RnvContext, npmPackage: string)
     });
 
     versionArr.reverse();
-    const validVersions = versionArr.map((v: string) => ({ name: v, value: v }));
+    const validVersions: NpmVersion[] = versionArr.map((v: string) => ({ name: v, value: v }));
 
     let recommendedVersion;
+    const validVersionsStandard: NpmVersion[] = [];
+    const validVersionsHead: NpmVersion[] = [];
     validVersions.forEach((item) => {
         let matchStr = '';
         const matchArr: Array<string> = [];
@@ -58,24 +62,29 @@ export const listAndSelectNpmVersion = async (c: RnvContext, npmPackage: string)
             }
         });
         if (matchArr.length) {
-            matchStr = ` (HEAD: ${matchArr.join(', ')})`;
+            matchStr = ` (@${matchArr.join(', ')})`;
             item.name = `${item.value}${matchStr}`;
             if (matchArr[0] === 'latest') {
                 recommendedVersion = item;
             }
+            validVersionsHead.push(item);
+        } else {
+            validVersionsStandard.push(item);
         }
     });
     if (!recommendedVersion) {
         recommendedVersion = validVersions[0];
     }
 
+    const validVersionsCombined = validVersionsHead.concat(validVersionsStandard);
+
     const { inputTemplateVersion } = await inquirerPrompt({
         name: 'inputTemplateVersion',
         type: 'list',
         message: `What ${npmPackage} version to use?`,
         default: recommendedVersion.value,
         loop: false,
-        choices: validVersions,
+        choices: validVersionsCombined,
     });
 
     return inputTemplateVersion;

diff --git a/packages/engine-core/package.json b/packages/engine-core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/engine-core",
-    "version": "1.0.0-rc.4",
+    "version": "1.0.0-rc.6",
     "description": "ReNative Engine Core",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/renative#readme",
@@ -29,17 +29,17 @@
         "watch": "tsc --watch --preserveWatchOutput"
     },
     "dependencies": {
-        "@rnv/sdk-android": "1.0.0-rc.4",
-        "@rnv/sdk-apple": "1.0.0-rc.4",
-        "@rnv/sdk-kaios": "1.0.0-rc.4",
-        "@rnv/sdk-tizen": "1.0.0-rc.4",
-        "@rnv/sdk-webos": "1.0.0-rc.4",
+        "@rnv/sdk-android": "1.0.0-rc.6",
+        "@rnv/sdk-apple": "1.0.0-rc.6",
+        "@rnv/sdk-kaios": "1.0.0-rc.6",
+        "@rnv/sdk-tizen": "1.0.0-rc.6",
+        "@rnv/sdk-webos": "1.0.0-rc.6",
         "iocane": "4.0.0",
         "kill-port": "1.6.1",
         "tar": "4.4.19"
     },
     "peerDependencies": {
-        "@rnv/core": "^1.0.0-rc.4"
+        "@rnv/core": "^1.0.0-rc.6"
     },
     "private": false,
     "publishConfig": {