Fix Bonanza

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flexn/renative-monorepo",
-    "version": "1.0.0-canary.7",
+    "version": "1.0.0-feat-bonanza.7",
     "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",
@@ -59,9 +59,6 @@
         "bootstrap": "yarn run link:rnv && npx lerna bootstrap && yarn build",
         "bootstrap-clean": "rimraf -I ./node_modules; npx lerna clean --yes && yarn bootstrap",
         "build": "lerna run build",
-        "report-circular": "npx madge --circular --extensions ts --exclude '\\.(d.ts)$' ./packages",
-        "report-ts-coverage": "typescript-coverage-report -p ./packages/core/tsconfig.json  -t 99",
-        "report-jest": "jest --coverage",
         "compile": "npx lerna run compile",
         "deploy:canary": "yarn pre-publish && npx lerna publish from-package --dist-tag canary && git push origin HEAD",
         "deploy:feat": "yarn pre-publish && npx lerna publish from-package --dist-tag feat && git push origin HEAD",
@@ -79,6 +76,9 @@
         "pre-publish": "yarn build && yarn lint && yarn test && rnv hooks run -x prePublish -r && rnv hooks run -x gitCommitAndTag",
         "prettier-write-all": "npx prettier '**/*.{js,jsx,ts,tsx,mjs,cjs,json,md}' --write --config .prettierrc.js",
         "prettier-write-json": "npx prettier '**/{package.json,renative.plugins.json,renative.json}' --write --config .prettierrc.js",
+        "report-circular": "npx madge --circular --extensions ts --exclude '\\.(d.ts)$' ./packages",
+        "report-jest": "jest --coverage",
+        "report-ts-coverage": "typescript-coverage-report -p ./packages/core/tsconfig.json  -t 99",
         "sanity": "yarn compile && yarn lint && yarn test",
         "test": "jest",
         "watch": "npx lerna exec yarn watch --parallel",
@@ -89,8 +89,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-canary.7",
-        "@rnv/core": "1.0.0-canary.7",
+        "@rnv/build-hooks-git": "1.0.0-feat-bonanza.7",
+        "@rnv/core": "1.0.0-feat-bonanza.7",
         "@types/jest": "~27.0.2",
         "@types/kill-port": "2.0.0",
         "@types/lodash.get": "4.4.7",
@@ -147,7 +147,8 @@
             "webpack",
             "mini-css-extract-plugin",
             "execa",
-            "**/@flexn/plugins"
+            "**/@flexn/plugins",
+            "**/@react-native/metro-babel-transformer"
         ]
     },
     "resolutions": {}

packages/app-harness/.watchmanconfig

@@ -22,6 +22,6 @@
         "../sdk-kaios",
         "../sdk-tizen",
         "../sdk-webos",
-        "../sdk-webpak"
+        "../sdk-webpack"
     ]
-}
+}

packages/template-starter/Gemfile.lock → packages/app-harness/Gemfile.lock

@@ -15,12 +15,12 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.1.0)
-    cocoapods (1.13.0)
+    cocoapods (1.14.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.13.0)
+      cocoapods-core (= 1.14.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.6.0, < 2.0)
+      cocoapods-downloader (>= 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -33,7 +33,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.13.0)
+    cocoapods-core (1.14.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -44,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)

packages/app-harness/appConfigs/harness/renative.json

@@ -8,7 +8,7 @@
         "title": "ReNative",
         "description": "Cross-platform application project based on ReNative",
         "buildSchemes": {
-            "debug": {    
+            "debug": {
                 "id": "renative.helloworld.debug",
                 "title": "ReNative Debug"
             },

packages/app-harness/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rnv/app-harness",
-    "version": "1.0.0-canary.7",
+    "version": "1.0.0-feat-pin-cli.6",
     "description": "ReNative Test Harness App",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/renative#readme",
@@ -30,30 +30,31 @@
         "watch": "tsc --watch --preserveWatchOutput --noEmit"
     },
     "dependencies": {
+        "@lightningjs/sdk": "^5.4.1",
+        "@react-native-community/cli": "^11.3.8",
+        "@rnv/renative": "1.0.0-feat-bonanza.7",
         "next": "13.5.2",
         "raf": "3.4.1",
-        "@lightningjs/sdk": "^5.4.1",
         "react": "18.2.0",
         "react-art": "18.2.0",
         "react-dom": "18.2.0",
         "react-native": "0.72.4",
         "react-native-gesture-handler": "2.13.1",
         "react-native-tvos": "0.72.4-0",
-        "react-native-web": "0.19.9",
-        "@rnv/renative": "1.0.0-canary.7"
+        "react-native-web": "0.19.9"
     },
     "devDependencies": {
         "@flexn/assets-renative-outline": "0.3.2",
         "@flexn/graybox": "0.21.1",
         "@flexn/typescript-config": "1.0.0",
-        "@react-native/metro-config": "^0.73.1",
-        "@rnv/engine-lightning": "1.0.0-canary.7",
-        "@rnv/engine-rn": "1.0.0-canary.7",
-        "@rnv/engine-rn-electron": "1.0.0-canary.7",
-        "@rnv/engine-rn-next": "1.0.0-canary.7",
-        "@rnv/engine-rn-tvos": "1.0.0-canary.7",
-        "@rnv/engine-rn-web": "1.0.0-canary.7",
-        "@rnv/core": "1.0.0-canary.7",
+        "@rnv/core": "1.0.0-feat-bonanza.7",
+        "@rnv/engine-lightning": "1.0.0-feat-bonanza.7",
+        "@rnv/engine-rn": "1.0.0-feat-bonanza.7",
+        "@rnv/engine-rn-electron": "1.0.0-feat-bonanza.7",
+        "@rnv/engine-rn-next": "1.0.0-feat-bonanza.7",
+        "@rnv/engine-rn-tvos": "1.0.0-feat-bonanza.7",
+        "@rnv/engine-rn-web": "1.0.0-feat-bonanza.7",
+        "@rnv/template-starter": "1.0.0-feat-bonanza.7",
         "@types/react": "18.2.22",
         "@types/react-dom": "18.2.7",
         "@types/react-native": "0.72.2",
@@ -62,7 +63,7 @@
         "detox": "18.20.2",
         "jetifier": "1.6.5",
         "metro-react-native-babel-preset": "0.76.8",
-        "rnv": "1.0.0-canary.7",
+        "rnv": "1.0.0-feat-bonanza.7",
         "xcode": "2.1.0"
     },
     "private": true

packages/app-harness/renative.json

@@ -1,5 +1,7 @@
 {
     "$schema": "../../.rnv/schema/rnv.project.json",
     "extendsTemplate": "@rnv/template-starter/renative.json",
-    "plugins": {}
+    "plugins": {
+        "@react-native-community/cli": "^11.3.8"
+    }
 }

packages/build-hooks-git/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rnv/build-hooks-git",
-    "version": "1.0.0-canary.7",
+    "version": "1.0.0-feat-bonanza.7",
     "description": "Build Hooks for Git",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/renative#readme",
@@ -30,10 +30,11 @@
         "simple-git": "^3.16.0"
     },
     "peerDependencies": {
-        "@rnv/core": "^1.0.0-canary.7"
+        "@rnv/core": "^1.0.0-feat-bonanza.7"
     },
     "publishConfig": {
         "access": "public"
     },
-    "types": "lib/index"
+    "types": "lib/index",
+    "gitHead": "48ef244c6ec2e206cbfd72fe8770d8dc03387591"
 }

packages/build-hooks-schema/package.json

@@ -27,14 +27,14 @@
         "watch": "tsc --watch --preserveWatchOutput"
     },
     "dependencies": {
-        "zod-to-json-schema": "3.21.4",
-        "zod": "3.22.4"
+        "zod": "3.22.4",
+        "zod-to-json-schema": "3.21.4"
     },
     "peerDependencies": {
-        "@rnv/core": "^1.0.0-canary.7"
+        "@rnv/core": "^1.0.0-feat-bonanza.7"
     },
     "publishConfig": {
         "access": "public"
     },
     "types": "lib/index"
-}
+}

packages/build-hooks-schema/src/schema.ts

@@ -42,12 +42,21 @@ const _generateSchemaFile = (opts: { schema: z.ZodObject<any>; schemaId: string
 
     jsonSchema.definitions[schemaId].properties['$schema'] = {
         type: 'string',
-        description: 'schema definition',
+        description: 'schema definition', 
     };
 
-    const destPath = path.join(ctx.paths.project.dir, `packages/core/jsonSchema/${schemaId}.json`);
+    const destFolder = path.join(ctx.paths.project.dir, `packages/core/jsonSchema`);
+    if (!fs.existsSync(destFolder)) {
+        fs.mkdirSync(destFolder, { recursive: true });
+    }
+    const destPath = path.join(destFolder, `${schemaId}.json`);
     fs.writeFileSync(destPath, JSON.stringify(jsonSchema, null, 2));
 
-    const destPath2 = path.join(ctx.paths.project.dir, `.rnv/schema/${schemaId}.json`);
+    const destFolder2 = path.join(ctx.paths.project.dir, `.rnv/schema`);
+    if (!fs.existsSync(destFolder2)) {
+        fs.mkdirSync(destFolder2, { recursive: true });
+    }
+    const destPath2 = path.join(destFolder2, `${schemaId}.json`);
+
     fs.writeFileSync(destPath2, JSON.stringify(jsonSchema, null, 2));
 };

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rnv/cli",
-    "version": "1.0.0-canary.7",
+    "version": "1.0.0-feat-bonanza.7",
     "description": "ReNative CLI",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/renative#readme",
@@ -37,10 +37,11 @@
         "inquirer": "8.2.0"
     },
     "peerDependencies": {
-        "@rnv/core": "^1.0.0-canary.7"
+        "@rnv/core": "^1.0.0-feat-bonanza.7"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
-    }
-}
+    },
+    "gitHead": "48ef244c6ec2e206cbfd72fe8770d8dc03387591"
+}

packages/cli/src/index.ts

@@ -9,6 +9,20 @@ import Logger from './logger';
 //IMPORTANT: Using require instead of import here to avoid circular dependency issue rnv => @rnv/cli => rnv
 const { executeRnv } = require('rnv');
 
+const terminateProcesses = (): void => {
+    const { runningProcesses } = getContext();
+    try {
+        runningProcesses.forEach((p) => {
+            p.kill();
+        });
+    } catch (e) {
+        console.log(e);
+    }
+    runningProcesses.length = 0;
+
+    process.exit(0);
+};
+
 export const run = () => {
     const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json')).toString());
     let cmdValue = '';
@@ -41,7 +55,14 @@ export const run = () => {
 
     program.parse(process.argv);
 
+    process.on('SIGINT', () => {
+        terminateProcesses();
+    });
+
     executeRnv({ cmd: cmdValue, subCmd: cmdOption, program, process, spinner: Spinner, prompt: Prompt, logger: Logger })
         .then(() => logComplete(!getContext().runtime.keepSessionActive))
-        .catch((e: unknown) => logError(e, true));
+        .catch((e: unknown) => {
+            logError(e);
+            terminateProcesses();
+        });
 };

packages/cli/src/logger/index.ts

@@ -214,7 +214,7 @@ export const logSummary = (header = 'SUMMARY') => {
     let str = printBoxStart(`${ICN_ROCKET}  ${header} ${timeString}`, getCurrentCommand());
 
     str += printIntoBox(`ReNative Version: ${_highlightColor(ctx.rnvVersion)}`);
-    if (ctx.files?.project?.package) {
+    if (ctx.files?.project?.package?.name && ctx.files?.project?.package?.version) {
         str += printIntoBox(`Project Name ($package.name): ${_highlightColor(ctx.files.project.package.name)}`);
         str += printIntoBox(
             `Project Version ($package.version): ${_highlightColor(ctx.files.project.package.version)}`

packages/core/jsonSchema/rnv.engine.json

@@ -15,6 +15,10 @@
           "type": "string",
           "description": "Engine extension ised by rnv during compilation"
         },
+        "extends": {
+          "type": "string",
+          "description": "ID of engine to extend. Not being used yet"
+        },
         "overview": {
           "type": "string",
           "description": "Overview description of engine"

packages/core/jsonSchema/rnv.project.json

@@ -8,6 +8,9 @@
           "type": "string",
           "description": "Workspace ID your project belongs to. This will mach same folder name in the root of your user directory. ie `~/` on macOS"
         },
+        "projectVersion": {
+          "type": "string"
+        },
         "projectName": {
           "type": "string",
           "description": "Name of the project which will be used in workspace as folder name. this will also be used as part of the KEY in crypto env var generator"
@@ -3886,6 +3889,7 @@
       },
       "required": [
         "workspaceID",
+        "projectVersion",
         "projectName",
         "templates",
         "currentTemplate"

packages/core/jsonSchema/rnv.template.json

@@ -209,14 +209,14 @@
                 },
                 "name": {
                   "type": "string"
+                },
+                "version": {
+                  "type": "string"
                 }
               },
               "additionalProperties": false
             }
           },
-          "required": [
-            "bootstrapQuestions"
-          ],
           "additionalProperties": false,
           "description": "Used in `renative.template.json` allows you to define template behaviour."
         },

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rnv/core",
-    "version": "1.0.0-canary.7",
+    "version": "1.0.0-feat-bonanza.7",
     "description": "RNV Core SDK",
     "keywords": [],
     "homepage": "https://github.com/flexn-io/renative#readme",