Merge pull request #194 from flexn-io/feat/rnv_update

Upgrade to latest RNV
flexn-io · May 10, 2024 · 141c621 · 141c621
2 parents c6ad7fd + cb4ed5f
commit 141c621
Show file tree

Hide file tree

Showing 161 changed files with 9,390 additions and 13,953 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -12,4 +12,5 @@ packages/**/lib/**
 **/dist/**
 **/platformAssets/**
 **/platformBuilds/**
-packages/template-starter/appConfigs/base/assets/webos/public/webOSTVjs-1.1.1/**
+packages/template-starter/appConfigs/base/assets/webos/public/webOSTVjs-1.1.1/**
+packages/template-starter/build/**
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,99 @@
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+project.xcworkspace
+
+# Android Studio
+#
+*.iml
+
+# node.js
+#
+node_modules/
 dist
 lib
-node_modules
-coverage
 build
-.DS_Store
 
+# NPM
+#
+npm-debug.log
+
+# Yarn
+#
 yarn-error.log
-tsconfig.tsbuildinfo
 
+# Lerna
+#
+lerna-debug.log
+
+# BUCK
+#
+buck-out/
+\.buckd/
+
+# Visual Studio
+#
+.vscode/*
 .vscode
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+
+# Testing
+#
+coverage
+reporting
+coverage-ts
+
+# Expo
+#
+.expo
+
+# Next
+#
+.next
+
+# ReNative
+#
+.rnv
+renative.private.json
+renative.local.json
+renative.local.json
+renative.build.json
+renative.runtime.json
+rnv.private.json
+rnv.local.json
+rnv.build.json
+rnv.runtime.json
+metro.config.local.js
+platformBuilds
+platformAssets
 
-!**/overrides/**/lib
-!**/overrides/**/build
+# Other 
+#
+.binlog
+*.binlog
+.bundle
+vendor
+.watchman-cookie-*
+.rollup.cache
diff --git a/buildHooks/src/git.js b/buildHooks/src/git.js
@@ -1,23 +1,21 @@
 import path from 'path';
-import { FileUtils, Logger } from 'rnv';
+import { logHook, readObjectSync } from '@rnv/core';
 import simpleGit from 'simple-git';
 
-const { readObjectSync } = FileUtils;
-
 export const gitCommit = async (c) => {
     const baseDir = c.paths.project.dir;
 
     const rootPkgFile = readObjectSync(path.join(baseDir, 'lerna.json'));
 
     const { version } = rootPkgFile;
 
-    Logger.logHook(`gitCommitAndTagVersion ${version}`);
+    logHook(`gitCommitAndTagVersion ${version}`);
     const git = simpleGit({ baseDir });
-    Logger.logHook('adding files');
+    logHook('adding files');
     await git.add(`${baseDir}/*`);
-    Logger.logHook('COMMITING...');
+    logHook('COMMITING...');
     await git.commit(`chore(release): publish ${version}`);
-    Logger.logHook('DONE');
+    logHook('DONE');
     return true;
 };
 
@@ -27,7 +25,7 @@ export const gitTag = async (c) => {
     const rootPkgFile = readObjectSync(path.join(baseDir, 'lerna.json'));
     const { version } = rootPkgFile;
 
-    Logger.logHook(`gitTagAndPush ${version}`);
+    logHook(`gitTagAndPush ${version}`);
     const git = simpleGit({ baseDir });
     await git.addTag(`${version}`);
     await git.push();

diff --git a/examples/package.json b/examples/package.json
@@ -23,7 +23,7 @@
         "react-native-linear-gradient": "^2.8.3",
         "react-native-reanimated": "^3.3.0",
         "react-native-safe-area-context": "^4.7.1",
-        "react-native-screens": "3.19.0",
+        "react-native-screens": "3.29.0",
         "react-native-svg": "^13.14.0",
         "react-native-svg-uri": "^1.2.3"
     },
@@ -34,7 +34,7 @@
         "@react-native-community/eslint-config": "^3.2.0",
         "@tsconfig/react-native": "^2.0.2",
         "@types/jest": "^29.2.1",
-        "@types/react": "^18.0.24",
+        "@types/react": "18.2.52",
         "@types/react-test-renderer": "^18.0.0",
         "babel-jest": "^29.2.1",
         "eslint": "^8.19.0",

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0-alpha.2",
+  "version": "1.3.0-feat-rnv-update.19",
   "packages": [
     "packages/*"
   ],

diff --git a/package.json b/package.json
@@ -2,8 +2,9 @@
     "name": "@flexn-io/create-monorepo",
     "private": true,
     "scripts": {
-        "bootstrap": "(rnv unlink|| true) && npx lerna bootstrap && npx jetify && yarn build",
-        "bootstrap-clean": "rm -rf ./node_modules; npx lerna clean --yes && yarn bootstrap",
+        "bootstrap": "npx lerna@6 bootstrap && npx jetify && yarn build",
+        "bootstrap-clean": "yarn clean-gitignore && yarn bootstrap",
+        "clean-gitignore": "git clean -f -d -i -X",
         "build": "lerna run build",
         "watch-alt": "npx lerna run compile & npx lerna watch -- lerna run compile",
         "watch": "npx lerna exec yarn watch --parallel",
@@ -66,28 +67,35 @@
         "clean-template-post-nightly": "cd packages/template-starter && npx rnv hooks run -x cleanupPostNightly -c template --only"
     },
     "devDependencies": {
-        "@flexn/eslint-config": "0.1.7",
-        "@flexn/prettier-config": "0.1.7",
+        "@babel/eslint-parser": "7.17.0",
+        "@flexn/eslint-config": "1.0.0",
+        "@flexn/prettier-config": "1.0.0",
         "@flexn/typescript-config": "1.0.0",
-        "@flexn/build-hooks": "0.30.0",
-        "@types/jest": "~27.0.2",
+        "@flexn/build-hooks": "1.0.0-feat-rnv-update.0",
+        "@rnv/core": "1.0.0-rc.17",
+        "@types/jest": "^29.5.12",
         "@types/lodash-es": "~4.17.5",
         "@types/lodash.debounce": "~4.0.6",
         "@types/lodash.throttle": "~4.1.7",
-        "@types/node": "~16.11.7",
-        "@types/react-dom": "~18.2.4",
-        "@types/react-native": "~0.67.2",
+        "@types/node": "^18.15.3",
         "@types/chromecast-caf-receiver": "~6.0.6",
         "@types/react-native-snap-carousel": "~3.8.5",
         "@types/react-native-vector-icons": "6.4.13",
+        "@typescript-eslint/eslint-plugin": "^5.4.0",
+        "@typescript-eslint/parser": "^5.4.0",
+        "husky": "^7.0.0",
+        "jest": "^29.6.3",
+        "jest-environment-jsdom": "29.7.0",
+        "lerna": "^6.6.2",
+        "prettier": "2.8.8",
+        "simple-git": "^3.16.0",
+        "eslint": "8.40.0",
         "eslint-config-prettier": "8.8.0",
-        "husky": "4.2.5",
-        "jest": "27.3.1",
-        "lerna": "6.6.2",
-        "rnv": "0.37.3",
-        "typescript": "4.9.5",
-        "prettier": "2.3.1",
-        "eslint": "8.40.0"
+        "eslint-plugin-react": "7.33.2",
+        "ts-jest": "^27.0.7",
+        "ts-node": "^10.9.1",
+        "typescript": "5.2.2",
+        "typescript-coverage-report": "0.8.0"
     },
     "husky": {
         "hooks": {
@@ -111,7 +119,8 @@
         ]
     },
     "resolutions": {
-        "@types/react": "18.2.6",
+        "@babel/core": "7.24.4",
+        "@types/react": "18.2.52",
         "tslib": "2.5.2"
     }
 }
diff --git a/packages/app-harness/.gitignore b/packages/app-harness/.gitignore
@@ -1,46 +1,3 @@
-# --------------------------------
-# Generated by ReNative
-# --------------------------------
 
-.DS_Store
-node_modules
-npm-debug.log
-yarn-error.log
-.env
-.next
-.expo
-
-#-------------------------------
-# Visual Studio
-#-------------------------------
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-#-------------------------------
-# RENATIVE
-#-------------------------------
-
-platformBuilds
-platformAssets
-buildHooks/dist
-renative.local.json
-renative.private.json
-renative.build.json
-renative.runtime.json
-rnv-config.local.json
-metro.config.local.js
-
-.vercel
-releases
-.tmp
-
-
-dist
-build
-
-reporting
-
-.rollup.cache
+# Special case for rnv template. public folder is generated we don't want to commit it
+public/
diff --git a/packages/app-harness/appConfigs/harness/renative.json b/packages/app-harness/appConfigs/harness/renative.json
@@ -1,4 +1,5 @@
 {
+    "$schema": "../../.rnv/schema/rnv.app.json",
     "extendsTemplate": "@flexn/create-template-starter/appConfigs/base/renative.json",
     "id": "harness",
     "common": {

diff --git a/packages/app-harness/babel.config.js b/packages/app-harness/babel.config.js
@@ -1,3 +1,5 @@
-const { withRNVBabel } = require('rnv');
+const { withRNVBabel } = require('@rnv/adapter');
 
-module.exports = withRNVBabel({});
+module.exports = withRNVBabel({
+    plugins: ['react-native-reanimated/plugin'],
+});
diff --git a/packages/app-harness/metadata.json b/packages/app-harness/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "app-harness",
-    "version": "1.3.0-alpha.2",
+    "version": "1.3.0-feat-rnv-update.19",
     "identifier": "io.flexn.app.harness",
     "icon": "./static/icon.png"
 }
diff --git a/packages/app-harness/metro.config.js b/packages/app-harness/metro.config.js
@@ -1,3 +1,3 @@
-const { withRNVMetro } = require('rnv');
+const { withRNVMetro } = require('@rnv/adapter');
 
 module.exports = withRNVMetro({});
diff --git a/packages/app-harness/next.config.js b/packages/app-harness/next.config.js
@@ -1,3 +1,3 @@
-const { withRNV } = require('@rnv/engine-rn-next');
+const { withRNVNext } = require('@rnv/adapter');
 
-module.exports = withRNV({});
+module.exports = withRNVNext({});