conflicts

flexn-io · Aug 10, 2023 · eaad254 · eaad254
2 parents b8b0d98 + 71bee73
commit eaad254
Show file tree

Hide file tree

Showing 24 changed files with 1,419 additions and 1,123 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flexn/renative-monorepo",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "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`, `FirefoxOS`, `Firefox TV`, `Linux` and `Chromecast` platforms",
     "keywords": [
         "android tv",
@@ -112,7 +112,7 @@
         "lint-staged": "12.3.4",
         "prettier": "2.3.1",
         "pretty-quick": "1.11.0",
-        "rnv": "0.37.2-feat-dependencies.1",
+        "rnv": "0.37.2",
         "simple-git": "3.12.0",
         "ts-jest": "^27.0.7",
         "ttab": "^0.7.2",
@@ -168,4 +168,4 @@
         "ejs": "3.1.7",
         "shell-quote": "1.7.3"
     }
-}
+}
diff --git a/packages/engine-lightning/package.json b/packages/engine-lightning/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/engine-lightning",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "description": "ReNative Engine to build lightning based apps.",
     "keywords": [
         "lightning"
@@ -32,9 +32,9 @@
         "watch": "tsc --watch --preserveWatchOutput --allowJs"
     },
     "dependencies": {
-        "@lightningjs/cli": "2.11.0",
-        "@lightningjs/sdk": "5.2.0",
-        "babel-loader": "8.0.5",
+        "@lightningjs/cli": "2.8.0",
+        "@lightningjs/sdk": "4.8.3",
+        "babel-loader": "8.3.0",
         "html-webpack-harddisk-plugin": "1.0.2",
         "html-webpack-plugin": "5.5.0"
     },
@@ -47,11 +47,11 @@
         "@babel/preset-env": "7.8.7"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}
diff --git a/packages/engine-rn-electron/package.json b/packages/engine-rn-electron/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/engine-rn-electron",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "description": "ReNative Engine to build electron based platforms with react native support.",
     "keywords": [
         "electron",
@@ -34,12 +34,12 @@
     },
     "dependencies": {
         "@babel/preset-react": "7.16.0",
-        "@rnv/sdk-webpack": "0.37.2-feat-dependencies.1",
-        "babel-loader": "8.0.5",
-        "babel-preset-expo": "9.0.2",
+        "@rnv/sdk-webpack": "0.37.2",
+        "babel-loader": "8.3.0",
+        "babel-preset-expo": "9.5.0",
         "better-opn": "1.0.0",
         "electron": "19.0.4",
-        "electron-builder": "23.0.3",
+        "electron-builder": "24.0.0",
         "electron-notarize": "1.0.0",
         "html-webpack-harddisk-plugin": "1.0.2",
         "html-webpack-plugin": "4.5.1",
@@ -54,11 +54,11 @@
         "@babel/preset-env": "7.8.7"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}
diff --git a/packages/engine-rn-macos/package.json b/packages/engine-rn-macos/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/engine-rn-macos",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "description": "ReNative Engine to build react-native macOS platform.",
     "keywords": [
         "react-native-macos"
@@ -32,7 +32,7 @@
         "watch": "tsc --watch --preserveWatchOutput --allowJs"
     },
     "dependencies": {
-        "@rnv/sdk-apple": "0.37.2-feat-dependencies.1"
+        "@rnv/sdk-apple": "0.37.2"
     },
     "devDependencies": {
         "@babel/cli": "7.17.6",
@@ -43,11 +43,11 @@
         "@babel/preset-env": "7.8.7"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}
diff --git a/packages/engine-rn-next/package.json b/packages/engine-rn-next/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/engine-rn-next",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "description": "ReNative Engine to build next based platforms with react native support.",
     "keywords": [
         "nextjs",
@@ -33,7 +33,8 @@
         "watch": "tsc --watch --preserveWatchOutput --allowJs"
     },
     "dependencies": {
-        "@expo/next-adapter": "3.1.12",
+        "@expo/config": "8.1.2",
+        "@expo/next-adapter": "4.0.13",
         "ally.js": "1.4.1",
         "better-opn": "1.0.0",
         "next": "12.1.6",
@@ -52,11 +53,12 @@
         "@babel/preset-env": "7.8.7"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "next": ">=12.0.8",
+        "rnv": "^0.37.2"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}
diff --git a/packages/engine-rn-tvos/package.json b/packages/engine-rn-tvos/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/engine-rn-tvos",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "description": "ReNative Engine to build react-native tvos platform.",
     "keywords": [
         "react-native"
@@ -32,9 +32,8 @@
         "watch": "tsc --watch --preserveWatchOutput --allowJs"
     },
     "dependencies": {
-        "@rnv/sdk-android": "0.37.2-feat-dependencies.1",
-        "@rnv/sdk-apple": "0.37.2-feat-dependencies.1",
-        "react-native-tvos": "0.66.3-1"
+        "@rnv/sdk-android": "0.37.2",
+        "@rnv/sdk-apple": "0.37.2"
     },
     "devDependencies": {
         "@babel/cli": "7.17.6",
@@ -46,11 +45,11 @@
     },
     "peerDependencies": {
         "metro-cache": "^0.66.2",
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}
diff --git a/packages/engine-rn-web/package.json b/packages/engine-rn-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/engine-rn-web",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "description": "ReNative Engine to build web based platforms with react native support.",
     "keywords": [
         "react-native"
@@ -33,9 +33,9 @@
     },
     "dependencies": {
         "@babel/preset-react": "7.16.0",
-        "@rnv/sdk-webpack": "0.37.2-feat-dependencies.1",
-        "babel-loader": "8.0.5",
-        "babel-preset-expo": "9.0.2",
+        "@rnv/sdk-webpack": "0.37.2",
+        "babel-loader": "8.3.0",
+        "babel-preset-expo": "9.5.0",
         "better-opn": "1.0.0",
         "html-webpack-harddisk-plugin": "1.0.2",
         "html-webpack-plugin": "4.5.1",
@@ -52,11 +52,11 @@
         "@babel/preset-env": "^7.16.0"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}
diff --git a/packages/engine-rn-windows/package.json b/packages/engine-rn-windows/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/engine-rn-windows",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "description": "ReNative Engine to build for Windows platform with react native support.",
     "keywords": [
         "react-native",
@@ -33,7 +33,7 @@
         "watch": "tsc --watch --preserveWatchOutput --allowJs"
     },
     "dependencies": {
-        "@xmldom/xmldom": "0.7.0",
+        "@xmldom/xmldom": "0.7.7",
         "react-native-windows": "0.69.4"
     },
     "devDependencies": {
@@ -44,16 +44,16 @@
         "@babel/plugin-proposal-optional-chaining": "7.8.3",
         "@babel/preset-env": "7.8.7",
         "@react-native-windows/cli": "0.67.1",
-        "metro": "0.59.0"
+        "metro": "0.67.0"
     },
     "peerDependencies": {
         "@react-native-community/cli": "*",
         "react-native": "*",
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}
diff --git a/packages/engine-rn/package.json b/packages/engine-rn/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/engine-rn",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "description": "ReNative Engine to build react-native based platforms.",
     "keywords": [
         "react-native"
@@ -31,8 +31,8 @@
         "watch": "tsc --watch --preserveWatchOutput --allowJs"
     },
     "dependencies": {
-        "@rnv/sdk-android": "0.37.2-feat-dependencies.1",
-        "@rnv/sdk-apple": "0.37.2-feat-dependencies.1"
+        "@rnv/sdk-android": "0.37.2",
+        "@rnv/sdk-apple": "0.37.2"
     },
     "devDependencies": {
         "@babel/cli": "7.17.6",
@@ -43,11 +43,11 @@
         "@babel/preset-env": "7.8.7"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}
diff --git a/packages/engine-roku/package.json b/packages/engine-roku/package.json
@@ -41,10 +41,10 @@
         "@babel/preset-env": "7.8.7"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "private": false,
     "publishConfig": {
         "access": "public"
     }
-}
+}
diff --git a/packages/integration-docker/package.json b/packages/integration-docker/package.json
@@ -41,9 +41,9 @@
         "@babel/preset-env": "7.8.7"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "publishConfig": {
         "access": "public"
     }
-}
+}
diff --git a/packages/integration-ftp/package.json b/packages/integration-ftp/package.json
@@ -42,9 +42,9 @@
         "@babel/preset-env": "7.6.0"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "publishConfig": {
         "access": "public"
     }
-}
+}
diff --git a/packages/integration-terraform/package.json b/packages/integration-terraform/package.json
@@ -39,9 +39,9 @@
         "@babel/preset-env": "7.6.0"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "publishConfig": {
         "access": "public"
     }
-}
+}
diff --git a/packages/integration-vercel/package.json b/packages/integration-vercel/package.json
@@ -41,9 +41,9 @@
         "@babel/preset-env": "7.6.0"
     },
     "peerDependencies": {
-        "rnv": "^0.37.2-feat-dependencies.1"
+        "rnv": "^0.37.2"
     },
     "publishConfig": {
         "access": "public"
     }
-}
+}
diff --git a/packages/renative/package.json b/packages/renative/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rnv/renative",
-    "version": "0.37.2-feat-dependencies.1",
+    "version": "0.37.2",
     "description": "🚀🚀🚀 Unified Development Platform. Bootstrap, Develop & Deploy `iOS`, `tvOS`, `Android`, `Android TV`, `FireTV`, `Android Wear`, `Web`, `Tizen TV`, `Tizen Watch`, `LG webOS`, `macOS/OSX`, `Windows`, `KaiOS`, `FirefoxOS`, `Linux` and `Firefox TV` platforms",
     "keywords": [
         "android tv",
@@ -74,4 +74,4 @@
         }
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}