update to [email protected]

Author: ElenaDiachenko

.gitignore

@@ -36,20 +36,6 @@ build
 #
 npm-debug.log
 
-# Yarn
-#
-yarn-error.log
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
-# nx
-#
-.nx/*
-
 # Lerna
 #
 lerna-debug.log

.prettierignore

@@ -23,5 +23,4 @@ allure-results
 pluginTemplates
 templateFiles/**/*
 !/**/*/*.json
-*.d.ts
-/.nx/workspace-data
+*.d.ts

.yarn/releases/yarn-3.6.4.cjs

@@ -1,6 +1,10 @@
 {
     "version": "independent",
     "npmClient": "yarn",
-    "packages": ["packages/*"],
-    "$schema": "node_modules/lerna/schemas/lerna-schema.json"
+    "useWorkspaces": true,
+    "command": {
+        "bootstrap": {
+            "npmClientArgs": ["--no-package-lock", "--unsafe-perm=true", "--no-optional"]
+        }
+    }
 }

.yarnrc.yml

@@ -56,9 +56,8 @@
         "url": "git://github.com/flexn-io/renative.git"
     },
     "scripts": {
-        "bootstrap": "yarn install && yarn setup",
-        "bootstrap-clean": "yarn clean-gitignore && yarn install && yarn setup",
-        "setup": "yarn build && yarn link:rnv && yarn generateSchema && yarn resetOverrides",
+        "bootstrap": "npx lerna@6 bootstrap && yarn build && yarn link:rnv && yarn generateSchema && yarn resetOverrides",
+        "bootstrap-clean": "yarn clean-gitignore && yarn bootstrap",
         "build": "lerna run build",
         "clean-gitignore": "git clean -f -d -i -X",
         "compile": "npx lerna run compile",
@@ -69,7 +68,7 @@
         "generateSchema": "npx rnv hooks run -x generateSchema && yarn prettier-write-json",
         "link:rnv": "npm r rnv -g && cd packages/rnv && npm link",
         "lint": "npx eslint ./packages",
-        "postinstall": " npx jetify && npx husky install",
+        "postinstall": "npx lerna link --force-local && npx jetify && npx husky install",
         "pre-publish": "yarn build && yarn link:rnv && yarn lint && yarn test && rnv hooks run -x prePublish && rnv hooks run -x gitCommitAndTag && yarn generateSchema",
         "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.json,renative.**.json,rnv.json,rnv.**.json,renative-1.0.schema.json}' --write --config .prettierrc.js",
@@ -82,9 +81,6 @@
         "watch": "npx lerna exec yarn watch --parallel",
         "watch-alt": "npx lerna run compile & npx lerna watch -- lerna run compile"
     },
-    "workspaces": [
-        "packages/*"
-    ],
     "devDependencies": {
         "@babel/eslint-parser": "7.17.0",
         "@flexn/eslint-config": "1.0.0",
@@ -113,7 +109,7 @@
         "jest": "^29.6.3",
         "jest-environment-jsdom": "29.7.0",
         "json-diff": "1.0.6",
-        "lerna": "^8.1.9",
+        "lerna": "^6.6.2",
         "lint-staged": "12.3.4",
         "madge": "6.1.0",
         "prettier": "2.8.8",
@@ -144,5 +140,20 @@
             "eslint"
         ]
     },
-    "packageManager": "[email protected]"
+    "workspaces": {
+        "packages": [
+            "packages/*"
+        ],
+        "nohoist": [
+            "html-webpack-plugin",
+            "html-webpack-harddisk-plugin",
+            "webpack",
+            "mini-css-extract-plugin",
+            "execa",
+            "**/@flexn/graybox",
+            "**/appium-*",
+            "**/@wdio/*",
+            "**/@react-native/metro-babel-transformer"
+        ]
+    }
 }

lerna.json

@@ -29,9 +29,7 @@
         "watch": "tsc --watch --preserveWatchOutput"
     },
     "dependencies": {
-        "babel-plugin-module-resolver": "^5.0.0",
-        "rimraf": "2.6.2",
-        "typescript": "5.2.2"
+        "babel-plugin-module-resolver": "^5.0.0"
     },
     "publishConfig": {
         "access": "public"

nx.json

@@ -52,17 +52,17 @@
         "react": "18.3.1",
         "react-art": "18.3.1",
         "react-dom": "18.3.1",
-        "react-native": "0.76.3",
+        "react-native": "0.76.5",
         "react-native-carplay": "2.3.0",
         "react-native-fs": "2.20.0",
         "react-native-gesture-handler": "2.21.2",
         "react-native-google-cast": "4.8.3",
         "react-native-orientation-locker": "1.7.0",
         "react-native-permissions": "5.2.1",
-        "react-native-photo-editor": "github:AppGyver/react-native-photo-editor#0.1.2",
+        "react-native-photo-editor": "github:AppGyver/react-native-photo-editor#v0.1.2",
         "react-native-safe-area-context": "5.0.0",
         "react-native-splash-screen": "3.3.0",
-        "react-native-tvos": "0.76.3-0",
+        "react-native-tvos": "0.76.5-0",
         "react-native-web": "0.19.12",
         "rn-fetch-blob": "0.12.0"
     },

package.json

@@ -222,7 +222,7 @@
                 "disabled": true
             },
             "pluginDependencies": null,
-            "version": "github:AppGyver/react-native-photo-editor#0.1.2"
+            "version": "github:AppGyver/react-native-photo-editor#v0.1.2"
         },
         "react-native-permissions": {
             "ios": {

packages/adapter/package.json

@@ -28,8 +28,7 @@
     },
     "dependencies": {
         "rimraf": "2.6.2",
-        "simple-git": "3.24.0",
-        "typescript": "5.2.2"
+        "simple-git": "3.24.0"
     },
     "peerDependencies": {
         "@rnv/core": "^1.9.0-rc.0"

packages/app-harness/package.json

@@ -27,8 +27,6 @@
         "watch": "tsc --watch --preserveWatchOutput"
     },
     "dependencies": {
-        "rimraf": "2.6.2",
-        "typescript": "5.2.2",
         "zod": "3.23.8",
         "zod-to-json-schema": "3.23.0"
     },

packages/app-harness/renative.json

@@ -37,9 +37,7 @@
         "chalk": "4.1.0",
         "commander": "12.1.0",
         "inquirer": "8.2.0",
-        "inquirer-autocomplete-prompt": "2.0.1",
-        "rimraf": "2.6.2",
-        "typescript": "5.2.2"
+        "inquirer-autocomplete-prompt": "2.0.1"
     },
     "devDependencies": {
         "@types/inquirer-autocomplete-prompt": "^3.0.3"

packages/build-hooks-git/package.json

@@ -454,7 +454,7 @@
             "version": "0.5.9"
         },
         "@react-native-community/cli": {
-            "disableNpm": false,
+            "disableNpm": true,
             "version": "15.0.1",
             "supportedPlatforms": ["tvos", "ios"]
         },
@@ -1560,7 +1560,7 @@
                 "URL_NAME": "",
                 "URL_SCHEME": ""
             },
-            "version": "0.76.3"
+            "version": "0.76.5"
         },
         "react-native-actionsheet": {
             "version": "2.4.2"
@@ -3363,7 +3363,7 @@
             }
         },
         "react-native-tvos": {
-            "version": "0.76.3-0",
+            "version": "0.76.5-0",
             "supportedPlatforms": ["tvos", "firetv", "androidtv"]
         },
         "react-native-tvos-controller": {

packages/build-hooks-schema/package.json

@@ -58,6 +58,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "title": "ReNative Core SDK",
-    "packageManager": "[email protected]"
+    "title": "ReNative Core SDK"
 }

packages/cli/package.json

@@ -12,13 +12,13 @@ import { isOfflineMode } from './utils';
 export const checkIfProjectAndNodeModulesExists = async () => {
     logDefault('checkIfProjectAndNodeModulesExists');
 
-    // const c = getContext();
+    const c = getContext();
 
-    // if (c.paths.project.configExists && !fsExistsSync(c.paths.project.nodeModulesDir)) {
-    //     c._requiresNpmInstall = false;
-    //     logInfo('node_modules folder is missing. INSTALLING...');
-    //     await installPackageDependencies();
-    // }
+    if (c.paths.project.configExists && !fsExistsSync(c.paths.project.nodeModulesDir)) {
+        c._requiresNpmInstall = false;
+        logInfo('node_modules folder is missing. INSTALLING...');
+        await installPackageDependencies();
+    }
 };
 
 export const checkNpxIsInstalled = async () => {

packages/config-templates/renative.templates.json

@@ -10,5 +10,4 @@ export const DEFAULTS = {
     author: 'Unknown',
     certificateProfile: 'RNVanillaCert',
     signingConfig: 'Debug',
-    yarnVersion: '3.6.4',
 };

packages/core/package.json

@@ -34,7 +34,6 @@
         "iocane": "4.0.0",
         "kill-port": "1.6.1",
         "lodash": "4.17.21",
-        "rimraf": "2.6.2",
         "tar": "6.2.1",
         "typescript": "5.2.2"
     },

packages/core/src/projects/npm.ts

@@ -24,7 +24,7 @@ import bookmarkTemplate from '../questions/bookmarkTemplate';
 import configTemplates from '../questions/configTemplates';
 import projectFolder from '../questions/projectFolder';
 import installProject from '../questions/installProject';
-import inquiryYarnVersion from '../questions/configureYarnVersion';
+import inquiryHandlePeerDepsNpm from '../questions/resolvePeerDepsNPM';
 
 jest.mock('@rnv/core');
 jest.mock('lodash/set');
@@ -48,7 +48,7 @@ jest.mock('../questions/projectFolder');
 jest.mock('../questions/installProject');
 jest.mock('../questionHelpers');
 jest.mock('../questions/appConfigs');
-jest.mock('../questions/configureYarnVersion');
+jest.mock('../questions/resolvePeerDepsNPM');
 
 beforeEach(() => {
     createRnvContext();
@@ -115,6 +115,6 @@ describe('taskNew tests', () => {
         expect(configTemplates).toHaveBeenCalled();
         expect(projectFolder).toHaveBeenCalled();
         expect(installProject).toHaveBeenCalled();
-        expect(inquiryYarnVersion).toHaveBeenCalled();
+        expect(inquiryHandlePeerDepsNpm).toHaveBeenCalled();
     });
 });

packages/core/src/schema/defaults.ts

@@ -0,0 +1,22 @@
+import { getContext, inquirerPrompt, isYarnInstalled, writeFileSync } from '@rnv/core';
+import path from 'path';
+
+const Question = async () => {
+    if (isYarnInstalled()) return;
+    const c = getContext();
+    const content = 'legacy-peer-deps=true';
+
+    const { confirmCreateNpmrc } = await inquirerPrompt({
+        name: 'confirmCreateNpmrc',
+        type: 'confirm',
+        message: `To avoid the issue with the resolving peer dependencies .npmrc file with content: "${content}" will be added to your project`,
+    });
+
+    if (confirmCreateNpmrc) {
+        const npmrcPath = path.join(c.paths.project.dir, '.npmrc');
+
+        writeFileSync(npmrcPath, content);
+    }
+};
+
+export default Question;

packages/engine-core/package.json

@@ -24,7 +24,7 @@ import inquiryBookmarkTemplate from './questions/bookmarkTemplate';
 import inquiryAppConfigs from './questions/appConfigs';
 import inquiryConfigTemplates from './questions/configTemplates';
 import inquiryProjectInstall from './questions/installProject';
-import inquiryYarnVersion from './questions/configureYarnVersion';
+import inquiryHandlePeerDepsNpm from './questions/resolvePeerDepsNPM.ts';
 import inquiryInstallEngines from './questions/installEngines';
 import {
     configureConfigOverrides,
@@ -48,7 +48,6 @@ export default createTask({
         await inquiryHasNodeModules(payload);
         await inquiryWorkspace(payload);
         await saveProgressIntoProjectConfig(payload);
-        await inquiryYarnVersion(payload);
         // Switch execution context to new directory
         await processChdirToProject();
         // Install template only (this avoids whole npm project install)
@@ -76,6 +75,7 @@ export default createTask({
         await configureTemplateFiles();
         await generateLocalJsonSchemas();
         await inquiryAppConfigs(payload);
+        await inquiryHandlePeerDepsNpm();
         await inquiryInstallEngines(payload);
         // Telementry
         await telemetryNewProject(payload);

packages/engine-core/src/tasks/bootstrap/__tests__/taskNew.test.ts

@@ -36,9 +36,7 @@
         "@lightningjs/sdk": "5.5.1",
         "@rnv/sdk-tizen": "1.9.0-rc.0",
         "@rnv/sdk-utils": "1.9.0-rc.0",
-        "@rnv/sdk-webos": "1.9.0-rc.0",
-        "rimraf": "2.6.2",
-        "typescript": "5.2.2"
+        "@rnv/sdk-webos": "1.9.0-rc.0"
     },
     "peerDependencies": {
         "@rnv/core": "^1.9.0-rc.0"

packages/engine-core/src/tasks/bootstrap/questions/configureYarnVersion.ts

@@ -33,17 +33,15 @@
         "watch": "tsc --watch --preserveWatchOutput"
     },
     "dependencies": {
-        "@react-native/babel-preset": "0.76.3",
+        "@react-native/babel-preset": "0.76.5",
         "@rnv/adapter": "1.9.0-rc.0",
         "@rnv/sdk-react-native": "1.9.0-rc.0",
         "@rnv/sdk-utils": "1.9.0-rc.0",
         "@rnv/sdk-webpack": "1.9.0-rc.0",
         "electron": "26.3.0",
         "electron-builder": "24.13.3",
         "electron-notarize": "1.2.2",
-        "metro-react-native-babel-preset": "0.76.8",
-        "rimraf": "2.6.2",
-        "typescript": "5.2.2"
+        "metro-react-native-babel-preset": "0.76.8"
     },
     "peerDependencies": {
         "@rnv/core": "^1.9.0-rc.0"