diff --git a/.eslintignore b/.eslintignore index faa3ec17a..493f79c7f 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,6 +1,5 @@ node_modules/ debugger-ui/ templates/ -global-cli/ build/ coverage/ diff --git a/.gitignore b/.gitignore index b69765758..c6980aef9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,4 @@ build/ .cache .watchmanconfig coverage -!packages/platform-ios/src/config/__fixtures__/native_modules/node_modules \ No newline at end of file +!packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd1738b6d..9520a63cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,13 +11,6 @@ All work on React Native CLI happens directly on GitHub. Contributors send pull 1. Run `yarn watch` to automatically build the changed files. 1. Now you are ready to do the changes. -## Repository - -This repository is split into two packages: - -- `cli` - Historically, it was included in `react-native` package. Contains all the commands code. -- `global-cli` - Historically, it was a `react-native-cli` package and the only reason this package existed was to initialize an empty project. - ## Testing your changes > Please make sure the version of React Native matches the one present in devDependencies of the CLI. Otherwise, you may get unexpected errors. diff --git a/README.md b/README.md index 9efcb8171..fd9554920 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,17 @@ _Note: CLI has been extracted from core `react-native` as a part of "[Lean Core] Our release cycle is independent of `react-native`. We follow semver and here is the compatibility table: -| `@react-native-community/cli` | `react-native` | -| ---------------------------------------------------------------- | ----------------------- | -| [^8.0.0](https://github.com/react-native-community/cli/tree/8.x) | ^0.69.0 | -| [^7.0.0](https://github.com/react-native-community/cli/tree/7.x) | ^0.68.0 | -| [^6.0.0](https://github.com/react-native-community/cli/tree/6.x) | ^0.65.0,^0.66.0,^0.67.0 | -| [^5.0.0](https://github.com/react-native-community/cli/tree/5.x) | ^0.64.0 | -| [^4.0.0](https://github.com/react-native-community/cli/tree/4.x) | ^0.62.0,^0.63.0 | -| [^3.0.0](https://github.com/react-native-community/cli/tree/3.x) | ^0.61.0 | -| [^2.0.0](https://github.com/react-native-community/cli/tree/2.x) | ^0.60.0 | -| [^1.0.0](https://github.com/react-native-community/cli/tree/1.x) | ^0.59.0 | +| `@react-native-community/cli` | `react-native` | +| ----------------------------------------------------------------- | ----------------------- | +| [^9.0.0](https://github.com/react-native-community/cli/tree/main) | ^0.70.0 | +| [^8.0.0](https://github.com/react-native-community/cli/tree/8.x) | ^0.69.0 | +| [^7.0.0](https://github.com/react-native-community/cli/tree/7.x) | ^0.68.0 | +| [^6.0.0](https://github.com/react-native-community/cli/tree/6.x) | ^0.65.0,^0.66.0,^0.67.0 | +| [^5.0.0](https://github.com/react-native-community/cli/tree/5.x) | ^0.64.0 | +| [^4.0.0](https://github.com/react-native-community/cli/tree/4.x) | ^0.62.0,^0.63.0 | +| [^3.0.0](https://github.com/react-native-community/cli/tree/3.x) | ^0.61.0 | +| [^2.0.0](https://github.com/react-native-community/cli/tree/2.x) | ^0.60.0 | +| [^1.0.0](https://github.com/react-native-community/cli/tree/1.x) | ^0.59.0 | ## Documentation @@ -46,26 +47,11 @@ Our release cycle is independent of `react-native`. We follow semver and here is ## About -This repository contains tools and helpers for React Native projects in form of a command line tool. There's been quite some confusion around that since the extraction from React Native core. Let's clear them up: - -- There are currently two CLIs: - - [`@react-native-community/cli`](./packages/cli) – **the one used directly by `react-native`**. That makes it a transitive dependency of your project. - - [`react-native-cli`](./packages/global-cli) – an optional global convenience package, which is a proxy to [`@react-native-community/cli`](./packages/cli) and global installation helper. **Please consider it legacy, because it's not necessary anymore**. -- When we say "the CLI" we mean `@react-native-community/cli`. -- We update the CLI independently of React Native itself. Please see [how to use the latest version](#updating-the-cli). -- This is a monorepo to keep stuff organized. - -We're actively working to make any indirections gone. +This monorepository contains tools and helpers for React Native projects in form of a Command Line Tool (or CLI). This CLI is used directly by the `react-native` package and is not intended for use directly. We update it independently of React Native itself. ## Creating a new React Native project -There are two ways to start a React Native project. - -### Using `npx` (_recommended_) - -> Available since `react-native@0.60` - -This method is preferred if you don't want to install global packages. +Run the following command in your terminal prompt: ```sh npx react-native init MyApp @@ -81,8 +67,6 @@ Example running `start` command in terminal: yarn react-native start # or: npx react-native start -# or -node ./node_modules/.bin/react-native start ``` You can also add npm scripts to call it with whichever package manager you use: diff --git a/packages/cli-clean/tsconfig.json b/packages/cli-clean/tsconfig.json index 227855158..9ef455b81 100644 --- a/packages/cli-clean/tsconfig.json +++ b/packages/cli-clean/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "build" }, "references": [ - {"path": "../tools"}, + {"path": "../cli-tools"}, {"path": "../cli-types"}, {"path": "../cli-config"} ] diff --git a/packages/cli-config/tsconfig.json b/packages/cli-config/tsconfig.json index 1ec7ea396..9d695b056 100644 --- a/packages/cli-config/tsconfig.json +++ b/packages/cli-config/tsconfig.json @@ -4,5 +4,5 @@ "rootDir": "src", "outDir": "build" }, - "references": [{"path": "../tools"}, {"path": "../cli-types"}] + "references": [{"path": "../cli-tools"}, {"path": "../cli-types"}] } diff --git a/packages/debugger-ui/.babelrc b/packages/cli-debugger-ui/.babelrc similarity index 100% rename from packages/debugger-ui/.babelrc rename to packages/cli-debugger-ui/.babelrc diff --git a/packages/debugger-ui/CHANGELOG.md b/packages/cli-debugger-ui/CHANGELOG.md similarity index 100% rename from packages/debugger-ui/CHANGELOG.md rename to packages/cli-debugger-ui/CHANGELOG.md diff --git a/packages/debugger-ui/package.json b/packages/cli-debugger-ui/package.json similarity index 100% rename from packages/debugger-ui/package.json rename to packages/cli-debugger-ui/package.json diff --git a/packages/debugger-ui/src/middleware/index.ts b/packages/cli-debugger-ui/src/middleware/index.ts similarity index 100% rename from packages/debugger-ui/src/middleware/index.ts rename to packages/cli-debugger-ui/src/middleware/index.ts diff --git a/packages/debugger-ui/src/ui/assets/blue-icon.png b/packages/cli-debugger-ui/src/ui/assets/blue-icon.png similarity index 100% rename from packages/debugger-ui/src/ui/assets/blue-icon.png rename to packages/cli-debugger-ui/src/ui/assets/blue-icon.png diff --git a/packages/debugger-ui/src/ui/assets/gray-icon.png b/packages/cli-debugger-ui/src/ui/assets/gray-icon.png similarity index 100% rename from packages/debugger-ui/src/ui/assets/gray-icon.png rename to packages/cli-debugger-ui/src/ui/assets/gray-icon.png diff --git a/packages/debugger-ui/src/ui/assets/orange-icon.png b/packages/cli-debugger-ui/src/ui/assets/orange-icon.png similarity index 100% rename from packages/debugger-ui/src/ui/assets/orange-icon.png rename to packages/cli-debugger-ui/src/ui/assets/orange-icon.png diff --git a/packages/debugger-ui/src/ui/assets/priority.wav b/packages/cli-debugger-ui/src/ui/assets/priority.wav similarity index 100% rename from packages/debugger-ui/src/ui/assets/priority.wav rename to packages/cli-debugger-ui/src/ui/assets/priority.wav diff --git a/packages/debugger-ui/src/ui/debuggerWorker.js b/packages/cli-debugger-ui/src/ui/debuggerWorker.js similarity index 87% rename from packages/debugger-ui/src/ui/debuggerWorker.js rename to packages/cli-debugger-ui/src/ui/debuggerWorker.js index ab739d911..90b5bcafa 100644 --- a/packages/debugger-ui/src/ui/debuggerWorker.js +++ b/packages/cli-debugger-ui/src/ui/debuggerWorker.js @@ -9,11 +9,11 @@ /* global __fbBatchedBridge, self, importScripts, postMessage, onmessage: true */ /* eslint no-unused-vars: 0 */ -onmessage = (function() { +onmessage = (function () { var visibilityState; - var showVisibilityWarning = (function() { + var showVisibilityWarning = (function () { var hasWarned = false; - return function() { + return function () { // Wait until `YellowBox` gets initialized before displaying the warning. if (hasWarned || console.warn.toString().includes('[native code]')) { return; @@ -28,7 +28,7 @@ onmessage = (function() { })(); var messageHandlers = { - executeApplicationScript: function(message, sendReply) { + executeApplicationScript: function (message, sendReply) { for (var key in message.inject) { self[key] = JSON.parse(message.inject[key]); } @@ -40,19 +40,19 @@ onmessage = (function() { } sendReply(null /* result */, error); }, - setDebuggerVisibility: function(message) { + setDebuggerVisibility: function (message) { visibilityState = message.visibilityState; }, }; - return function(message) { + return function (message) { if (visibilityState === 'hidden') { showVisibilityWarning(); } var object = message.data; - var sendReply = function(result, error) { + var sendReply = function (result, error) { postMessage({replyID: object.id, result: result, error: error}); }; diff --git a/packages/debugger-ui/src/ui/index.css b/packages/cli-debugger-ui/src/ui/index.css similarity index 100% rename from packages/debugger-ui/src/ui/index.css rename to packages/cli-debugger-ui/src/ui/index.css diff --git a/packages/debugger-ui/src/ui/index.html b/packages/cli-debugger-ui/src/ui/index.html similarity index 100% rename from packages/debugger-ui/src/ui/index.html rename to packages/cli-debugger-ui/src/ui/index.html diff --git a/packages/debugger-ui/src/ui/index.js b/packages/cli-debugger-ui/src/ui/index.js similarity index 95% rename from packages/debugger-ui/src/ui/index.js rename to packages/cli-debugger-ui/src/ui/index.js index f224365db..8c3083339 100644 --- a/packages/debugger-ui/src/ui/index.js +++ b/packages/cli-debugger-ui/src/ui/index.js @@ -14,14 +14,14 @@ import orangeIcon from './assets/orange-icon.png'; const isMacLike = /(Mac|iPhone|iPod|iPad)/i.test(navigator.platform); const refreshShortcut = isMacLike ? '⌘R' : 'Ctrl R'; -window.onload = function() { +window.onload = function () { if (!isMacLike) { document.getElementById('shortcut').innerHTML = 'Ctrl⇧J'; } Page.render(); }; -window.onReloadClicked = function() { +window.onReloadClicked = function () { var xhr = new XMLHttpRequest(); xhr.open('GET', `${window.location.origin}/reload`, true); xhr.send(); @@ -119,10 +119,10 @@ function connectToDebuggerProxy() { // making sure that it's run in an environment without a global // document, to make it consistent with the JSC executor environment. worker = new Worker('./debuggerWorker.js'); - worker.onmessage = function(message) { + worker.onmessage = function (message) { ws.send(JSON.stringify(message.data)); }; - window.onbeforeunload = function() { + window.onbeforeunload = function () { return ( 'If you reload this page, it is going to break the debugging session. ' + 'Press ' + @@ -151,11 +151,11 @@ function connectToDebuggerProxy() { Page.setState({visibilityState: document.visibilityState}); } - ws.onopen = function() { + ws.onopen = function () { Page.setState({status: {type: 'connecting'}}); }; - ws.onmessage = async function(message) { + ws.onmessage = async function (message) { if (!message.data) { return; } @@ -186,7 +186,7 @@ function connectToDebuggerProxy() { } }; - ws.onclose = function(error) { + ws.onclose = function (error) { shutdownJSRuntime(); Page.setState({status: {type: 'error', error}}); if (error.reason) { diff --git a/packages/debugger-ui/tsconfig.json b/packages/cli-debugger-ui/tsconfig.json similarity index 100% rename from packages/debugger-ui/tsconfig.json rename to packages/cli-debugger-ui/tsconfig.json diff --git a/packages/cli-doctor/tsconfig.json b/packages/cli-doctor/tsconfig.json index e0605db36..be7722869 100644 --- a/packages/cli-doctor/tsconfig.json +++ b/packages/cli-doctor/tsconfig.json @@ -5,9 +5,9 @@ "outDir": "build" }, "references": [ - {"path": "../tools"}, + {"path": "../cli-tools"}, {"path": "../cli-types"}, {"path": "../cli-config"}, - {"path": "../platform-ios"} + {"path": "../cli-platform-ios"} ] } diff --git a/packages/cli-hermes/tsconfig.json b/packages/cli-hermes/tsconfig.json index 1544a66ab..616a8bc7d 100644 --- a/packages/cli-hermes/tsconfig.json +++ b/packages/cli-hermes/tsconfig.json @@ -5,8 +5,8 @@ "outDir": "build" }, "references": [ - {"path": "../tools"}, + {"path": "../cli-tools"}, {"path": "../cli-types"}, - {"path": "../platform-android"} + {"path": "../cli-platform-android"} ] } diff --git a/packages/platform-android/CHANGELOG.md b/packages/cli-platform-android/CHANGELOG.md similarity index 100% rename from packages/platform-android/CHANGELOG.md rename to packages/cli-platform-android/CHANGELOG.md diff --git a/packages/platform-android/native_modules.gradle b/packages/cli-platform-android/native_modules.gradle similarity index 100% rename from packages/platform-android/native_modules.gradle rename to packages/cli-platform-android/native_modules.gradle diff --git a/packages/platform-android/package.json b/packages/cli-platform-android/package.json similarity index 100% rename from packages/platform-android/package.json rename to packages/cli-platform-android/package.json diff --git a/packages/platform-android/src/commands/index.ts b/packages/cli-platform-android/src/commands/index.ts similarity index 100% rename from packages/platform-android/src/commands/index.ts rename to packages/cli-platform-android/src/commands/index.ts diff --git a/packages/platform-android/src/commands/logAndroid/index.ts b/packages/cli-platform-android/src/commands/logAndroid/index.ts similarity index 100% rename from packages/platform-android/src/commands/logAndroid/index.ts rename to packages/cli-platform-android/src/commands/logAndroid/index.ts diff --git a/packages/platform-android/src/commands/runAndroid/__mocks__/tryLaunchEmulator.ts b/packages/cli-platform-android/src/commands/runAndroid/__mocks__/tryLaunchEmulator.ts similarity index 100% rename from packages/platform-android/src/commands/runAndroid/__mocks__/tryLaunchEmulator.ts rename to packages/cli-platform-android/src/commands/runAndroid/__mocks__/tryLaunchEmulator.ts diff --git a/packages/platform-android/src/commands/runAndroid/__tests__/runOnAllDevices.test.ts b/packages/cli-platform-android/src/commands/runAndroid/__tests__/runOnAllDevices.test.ts similarity index 100% rename from packages/platform-android/src/commands/runAndroid/__tests__/runOnAllDevices.test.ts rename to packages/cli-platform-android/src/commands/runAndroid/__tests__/runOnAllDevices.test.ts diff --git a/packages/platform-android/src/commands/runAndroid/adb.ts b/packages/cli-platform-android/src/commands/runAndroid/adb.ts similarity index 100% rename from packages/platform-android/src/commands/runAndroid/adb.ts rename to packages/cli-platform-android/src/commands/runAndroid/adb.ts diff --git a/packages/platform-android/src/commands/runAndroid/getAdbPath.ts b/packages/cli-platform-android/src/commands/runAndroid/getAdbPath.ts similarity index 100% rename from packages/platform-android/src/commands/runAndroid/getAdbPath.ts rename to packages/cli-platform-android/src/commands/runAndroid/getAdbPath.ts diff --git a/packages/platform-android/src/commands/runAndroid/index.ts b/packages/cli-platform-android/src/commands/runAndroid/index.ts similarity index 100% rename from packages/platform-android/src/commands/runAndroid/index.ts rename to packages/cli-platform-android/src/commands/runAndroid/index.ts diff --git a/packages/platform-android/src/commands/runAndroid/runOnAllDevices.ts b/packages/cli-platform-android/src/commands/runAndroid/runOnAllDevices.ts similarity index 100% rename from packages/platform-android/src/commands/runAndroid/runOnAllDevices.ts rename to packages/cli-platform-android/src/commands/runAndroid/runOnAllDevices.ts diff --git a/packages/platform-android/src/commands/runAndroid/tryLaunchAppOnDevice.ts b/packages/cli-platform-android/src/commands/runAndroid/tryLaunchAppOnDevice.ts similarity index 100% rename from packages/platform-android/src/commands/runAndroid/tryLaunchAppOnDevice.ts rename to packages/cli-platform-android/src/commands/runAndroid/tryLaunchAppOnDevice.ts diff --git a/packages/platform-android/src/commands/runAndroid/tryLaunchEmulator.ts b/packages/cli-platform-android/src/commands/runAndroid/tryLaunchEmulator.ts similarity index 100% rename from packages/platform-android/src/commands/runAndroid/tryLaunchEmulator.ts rename to packages/cli-platform-android/src/commands/runAndroid/tryLaunchEmulator.ts diff --git a/packages/platform-android/src/commands/runAndroid/tryRunAdbReverse.ts b/packages/cli-platform-android/src/commands/runAndroid/tryRunAdbReverse.ts similarity index 100% rename from packages/platform-android/src/commands/runAndroid/tryRunAdbReverse.ts rename to packages/cli-platform-android/src/commands/runAndroid/tryRunAdbReverse.ts diff --git a/packages/platform-android/src/config/__fixtures__/android.ts b/packages/cli-platform-android/src/config/__fixtures__/android.ts similarity index 100% rename from packages/platform-android/src/config/__fixtures__/android.ts rename to packages/cli-platform-android/src/config/__fixtures__/android.ts diff --git a/packages/platform-android/src/config/__fixtures__/files/AndroidManifest-debug.xml b/packages/cli-platform-android/src/config/__fixtures__/files/AndroidManifest-debug.xml similarity index 100% rename from packages/platform-android/src/config/__fixtures__/files/AndroidManifest-debug.xml rename to packages/cli-platform-android/src/config/__fixtures__/files/AndroidManifest-debug.xml diff --git a/packages/platform-android/src/config/__fixtures__/files/AndroidManifest.xml b/packages/cli-platform-android/src/config/__fixtures__/files/AndroidManifest.xml similarity index 100% rename from packages/platform-android/src/config/__fixtures__/files/AndroidManifest.xml rename to packages/cli-platform-android/src/config/__fixtures__/files/AndroidManifest.xml diff --git a/packages/platform-android/src/config/__fixtures__/files/Main.java b/packages/cli-platform-android/src/config/__fixtures__/files/Main.java similarity index 100% rename from packages/platform-android/src/config/__fixtures__/files/Main.java rename to packages/cli-platform-android/src/config/__fixtures__/files/Main.java diff --git a/packages/platform-android/src/config/__fixtures__/files/ReactPackage.java b/packages/cli-platform-android/src/config/__fixtures__/files/ReactPackage.java similarity index 100% rename from packages/platform-android/src/config/__fixtures__/files/ReactPackage.java rename to packages/cli-platform-android/src/config/__fixtures__/files/ReactPackage.java diff --git a/packages/platform-android/src/config/__fixtures__/files/ReactPackage.kt b/packages/cli-platform-android/src/config/__fixtures__/files/ReactPackage.kt similarity index 100% rename from packages/platform-android/src/config/__fixtures__/files/ReactPackage.kt rename to packages/cli-platform-android/src/config/__fixtures__/files/ReactPackage.kt diff --git a/packages/platform-android/src/config/__fixtures__/files/build.gradle b/packages/cli-platform-android/src/config/__fixtures__/files/build.gradle similarity index 100% rename from packages/platform-android/src/config/__fixtures__/files/build.gradle rename to packages/cli-platform-android/src/config/__fixtures__/files/build.gradle diff --git a/packages/platform-android/src/config/__fixtures__/files/package.json b/packages/cli-platform-android/src/config/__fixtures__/files/package.json similarity index 100% rename from packages/platform-android/src/config/__fixtures__/files/package.json rename to packages/cli-platform-android/src/config/__fixtures__/files/package.json diff --git a/packages/platform-android/src/config/__fixtures__/files/project.pbxproj b/packages/cli-platform-android/src/config/__fixtures__/files/project.pbxproj similarity index 100% rename from packages/platform-android/src/config/__fixtures__/files/project.pbxproj rename to packages/cli-platform-android/src/config/__fixtures__/files/project.pbxproj diff --git a/packages/platform-android/src/config/__fixtures__/projects.ts b/packages/cli-platform-android/src/config/__fixtures__/projects.ts similarity index 100% rename from packages/platform-android/src/config/__fixtures__/projects.ts rename to packages/cli-platform-android/src/config/__fixtures__/projects.ts diff --git a/packages/platform-android/src/config/__tests__/__snapshots__/getProjectConfig.test.ts.snap b/packages/cli-platform-android/src/config/__tests__/__snapshots__/getProjectConfig.test.ts.snap similarity index 100% rename from packages/platform-android/src/config/__tests__/__snapshots__/getProjectConfig.test.ts.snap rename to packages/cli-platform-android/src/config/__tests__/__snapshots__/getProjectConfig.test.ts.snap diff --git a/packages/platform-android/src/config/__tests__/extractComponentDescriptors.test.ts b/packages/cli-platform-android/src/config/__tests__/extractComponentDescriptors.test.ts similarity index 100% rename from packages/platform-android/src/config/__tests__/extractComponentDescriptors.test.ts rename to packages/cli-platform-android/src/config/__tests__/extractComponentDescriptors.test.ts diff --git a/packages/platform-android/src/config/__tests__/findAndroidDir.test.ts b/packages/cli-platform-android/src/config/__tests__/findAndroidDir.test.ts similarity index 100% rename from packages/platform-android/src/config/__tests__/findAndroidDir.test.ts rename to packages/cli-platform-android/src/config/__tests__/findAndroidDir.test.ts diff --git a/packages/platform-android/src/config/__tests__/findLibraryName.test.ts b/packages/cli-platform-android/src/config/__tests__/findLibraryName.test.ts similarity index 100% rename from packages/platform-android/src/config/__tests__/findLibraryName.test.ts rename to packages/cli-platform-android/src/config/__tests__/findLibraryName.test.ts diff --git a/packages/platform-android/src/config/__tests__/findManifest.test.ts b/packages/cli-platform-android/src/config/__tests__/findManifest.test.ts similarity index 100% rename from packages/platform-android/src/config/__tests__/findManifest.test.ts rename to packages/cli-platform-android/src/config/__tests__/findManifest.test.ts diff --git a/packages/platform-android/src/config/__tests__/findPackageClassName.test.ts b/packages/cli-platform-android/src/config/__tests__/findPackageClassName.test.ts similarity index 100% rename from packages/platform-android/src/config/__tests__/findPackageClassName.test.ts rename to packages/cli-platform-android/src/config/__tests__/findPackageClassName.test.ts diff --git a/packages/platform-android/src/config/__tests__/getDependencyConfig.test.ts b/packages/cli-platform-android/src/config/__tests__/getDependencyConfig.test.ts similarity index 100% rename from packages/platform-android/src/config/__tests__/getDependencyConfig.test.ts rename to packages/cli-platform-android/src/config/__tests__/getDependencyConfig.test.ts diff --git a/packages/platform-android/src/config/__tests__/getProjectConfig.test.ts b/packages/cli-platform-android/src/config/__tests__/getProjectConfig.test.ts similarity index 100% rename from packages/platform-android/src/config/__tests__/getProjectConfig.test.ts rename to packages/cli-platform-android/src/config/__tests__/getProjectConfig.test.ts diff --git a/packages/platform-android/src/config/extractComponentDescriptors.ts b/packages/cli-platform-android/src/config/extractComponentDescriptors.ts similarity index 100% rename from packages/platform-android/src/config/extractComponentDescriptors.ts rename to packages/cli-platform-android/src/config/extractComponentDescriptors.ts diff --git a/packages/platform-android/src/config/findAndroidDir.ts b/packages/cli-platform-android/src/config/findAndroidDir.ts similarity index 100% rename from packages/platform-android/src/config/findAndroidDir.ts rename to packages/cli-platform-android/src/config/findAndroidDir.ts diff --git a/packages/platform-android/src/config/findComponentDescriptors.ts b/packages/cli-platform-android/src/config/findComponentDescriptors.ts similarity index 100% rename from packages/platform-android/src/config/findComponentDescriptors.ts rename to packages/cli-platform-android/src/config/findComponentDescriptors.ts diff --git a/packages/platform-android/src/config/findLibraryName.ts b/packages/cli-platform-android/src/config/findLibraryName.ts similarity index 100% rename from packages/platform-android/src/config/findLibraryName.ts rename to packages/cli-platform-android/src/config/findLibraryName.ts diff --git a/packages/platform-android/src/config/findManifest.ts b/packages/cli-platform-android/src/config/findManifest.ts similarity index 100% rename from packages/platform-android/src/config/findManifest.ts rename to packages/cli-platform-android/src/config/findManifest.ts diff --git a/packages/platform-android/src/config/findPackageClassName.ts b/packages/cli-platform-android/src/config/findPackageClassName.ts similarity index 100% rename from packages/platform-android/src/config/findPackageClassName.ts rename to packages/cli-platform-android/src/config/findPackageClassName.ts diff --git a/packages/platform-android/src/config/getAndroidProject.ts b/packages/cli-platform-android/src/config/getAndroidProject.ts similarity index 100% rename from packages/platform-android/src/config/getAndroidProject.ts rename to packages/cli-platform-android/src/config/getAndroidProject.ts diff --git a/packages/platform-android/src/config/index.ts b/packages/cli-platform-android/src/config/index.ts similarity index 100% rename from packages/platform-android/src/config/index.ts rename to packages/cli-platform-android/src/config/index.ts diff --git a/packages/platform-android/src/index.ts b/packages/cli-platform-android/src/index.ts similarity index 100% rename from packages/platform-android/src/index.ts rename to packages/cli-platform-android/src/index.ts diff --git a/packages/platform-android/tsconfig.json b/packages/cli-platform-android/tsconfig.json similarity index 61% rename from packages/platform-android/tsconfig.json rename to packages/cli-platform-android/tsconfig.json index 1ec7ea396..9d695b056 100644 --- a/packages/platform-android/tsconfig.json +++ b/packages/cli-platform-android/tsconfig.json @@ -4,5 +4,5 @@ "rootDir": "src", "outDir": "build" }, - "references": [{"path": "../tools"}, {"path": "../cli-types"}] + "references": [{"path": "../cli-tools"}, {"path": "../cli-types"}] } diff --git a/packages/platform-ios/CHANGELOG.md b/packages/cli-platform-ios/CHANGELOG.md similarity index 100% rename from packages/platform-ios/CHANGELOG.md rename to packages/cli-platform-ios/CHANGELOG.md diff --git a/packages/platform-ios/native_modules.rb b/packages/cli-platform-ios/native_modules.rb similarity index 100% rename from packages/platform-ios/native_modules.rb rename to packages/cli-platform-ios/native_modules.rb diff --git a/packages/platform-ios/package.json b/packages/cli-platform-ios/package.json similarity index 100% rename from packages/platform-ios/package.json rename to packages/cli-platform-ios/package.json diff --git a/packages/platform-ios/src/commands/index.ts b/packages/cli-platform-ios/src/commands/index.ts similarity index 100% rename from packages/platform-ios/src/commands/index.ts rename to packages/cli-platform-ios/src/commands/index.ts diff --git a/packages/platform-ios/src/commands/logIOS/index.ts b/packages/cli-platform-ios/src/commands/logIOS/index.ts similarity index 100% rename from packages/platform-ios/src/commands/logIOS/index.ts rename to packages/cli-platform-ios/src/commands/logIOS/index.ts diff --git a/packages/platform-ios/src/commands/runIOS/__tests__/findMatchingSimulator.test.ts b/packages/cli-platform-ios/src/commands/runIOS/__tests__/findMatchingSimulator.test.ts similarity index 100% rename from packages/platform-ios/src/commands/runIOS/__tests__/findMatchingSimulator.test.ts rename to packages/cli-platform-ios/src/commands/runIOS/__tests__/findMatchingSimulator.test.ts diff --git a/packages/platform-ios/src/commands/runIOS/__tests__/parseIOSDevicesList.test.ts b/packages/cli-platform-ios/src/commands/runIOS/__tests__/parseIOSDevicesList.test.ts similarity index 100% rename from packages/platform-ios/src/commands/runIOS/__tests__/parseIOSDevicesList.test.ts rename to packages/cli-platform-ios/src/commands/runIOS/__tests__/parseIOSDevicesList.test.ts diff --git a/packages/platform-ios/src/commands/runIOS/__tests__/parseXctraceIOSDevicesList.test.ts b/packages/cli-platform-ios/src/commands/runIOS/__tests__/parseXctraceIOSDevicesList.test.ts similarity index 100% rename from packages/platform-ios/src/commands/runIOS/__tests__/parseXctraceIOSDevicesList.test.ts rename to packages/cli-platform-ios/src/commands/runIOS/__tests__/parseXctraceIOSDevicesList.test.ts diff --git a/packages/platform-ios/src/commands/runIOS/findMatchingSimulator.ts b/packages/cli-platform-ios/src/commands/runIOS/findMatchingSimulator.ts similarity index 100% rename from packages/platform-ios/src/commands/runIOS/findMatchingSimulator.ts rename to packages/cli-platform-ios/src/commands/runIOS/findMatchingSimulator.ts diff --git a/packages/platform-ios/src/commands/runIOS/index.ts b/packages/cli-platform-ios/src/commands/runIOS/index.ts similarity index 100% rename from packages/platform-ios/src/commands/runIOS/index.ts rename to packages/cli-platform-ios/src/commands/runIOS/index.ts diff --git a/packages/platform-ios/src/commands/runIOS/parseIOSDevicesList.ts b/packages/cli-platform-ios/src/commands/runIOS/parseIOSDevicesList.ts similarity index 100% rename from packages/platform-ios/src/commands/runIOS/parseIOSDevicesList.ts rename to packages/cli-platform-ios/src/commands/runIOS/parseIOSDevicesList.ts diff --git a/packages/platform-ios/src/commands/runIOS/parseXctraceIOSDevicesList.ts b/packages/cli-platform-ios/src/commands/runIOS/parseXctraceIOSDevicesList.ts similarity index 100% rename from packages/platform-ios/src/commands/runIOS/parseXctraceIOSDevicesList.ts rename to packages/cli-platform-ios/src/commands/runIOS/parseXctraceIOSDevicesList.ts diff --git a/packages/platform-ios/src/config/__fixtures__/files/project.pbxproj b/packages/cli-platform-ios/src/config/__fixtures__/files/project.pbxproj similarity index 100% rename from packages/platform-ios/src/config/__fixtures__/files/project.pbxproj rename to packages/cli-platform-ios/src/config/__fixtures__/files/project.pbxproj diff --git a/packages/platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-and-macos-dep/ios-and-macos-dep.podspec b/packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-and-macos-dep/ios-and-macos-dep.podspec similarity index 100% rename from packages/platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-and-macos-dep/ios-and-macos-dep.podspec rename to packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-and-macos-dep/ios-and-macos-dep.podspec diff --git a/packages/platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-dep/ios-dep.podspec b/packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-dep/ios-dep.podspec similarity index 100% rename from packages/platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-dep/ios-dep.podspec rename to packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-dep/ios-dep.podspec diff --git a/packages/platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-dep/some_shell_script.sh b/packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-dep/some_shell_script.sh similarity index 100% rename from packages/platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-dep/some_shell_script.sh rename to packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules/ios-dep/some_shell_script.sh diff --git a/packages/platform-ios/src/config/__fixtures__/native_modules/node_modules/macos-dep/macos-dep.podspec b/packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules/macos-dep/macos-dep.podspec similarity index 100% rename from packages/platform-ios/src/config/__fixtures__/native_modules/node_modules/macos-dep/macos-dep.podspec rename to packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules/macos-dep/macos-dep.podspec diff --git a/packages/platform-ios/src/config/__fixtures__/projects.ts b/packages/cli-platform-ios/src/config/__fixtures__/projects.ts similarity index 100% rename from packages/platform-ios/src/config/__fixtures__/projects.ts rename to packages/cli-platform-ios/src/config/__fixtures__/projects.ts diff --git a/packages/platform-ios/src/config/__tests__/__snapshots__/findPodfilePath.test.ts.snap b/packages/cli-platform-ios/src/config/__tests__/__snapshots__/findPodfilePath.test.ts.snap similarity index 100% rename from packages/platform-ios/src/config/__tests__/__snapshots__/findPodfilePath.test.ts.snap rename to packages/cli-platform-ios/src/config/__tests__/__snapshots__/findPodfilePath.test.ts.snap diff --git a/packages/platform-ios/src/config/__tests__/findPodfilePath.test.ts b/packages/cli-platform-ios/src/config/__tests__/findPodfilePath.test.ts similarity index 100% rename from packages/platform-ios/src/config/__tests__/findPodfilePath.test.ts rename to packages/cli-platform-ios/src/config/__tests__/findPodfilePath.test.ts diff --git a/packages/platform-ios/src/config/__tests__/findPodspec.test.ts b/packages/cli-platform-ios/src/config/__tests__/findPodspec.test.ts similarity index 100% rename from packages/platform-ios/src/config/__tests__/findPodspec.test.ts rename to packages/cli-platform-ios/src/config/__tests__/findPodspec.test.ts diff --git a/packages/platform-ios/src/config/__tests__/findXcodeProject.test.ts b/packages/cli-platform-ios/src/config/__tests__/findXcodeProject.test.ts similarity index 100% rename from packages/platform-ios/src/config/__tests__/findXcodeProject.test.ts rename to packages/cli-platform-ios/src/config/__tests__/findXcodeProject.test.ts diff --git a/packages/platform-ios/src/config/__tests__/getProjectConfig.test.ts b/packages/cli-platform-ios/src/config/__tests__/getProjectConfig.test.ts similarity index 100% rename from packages/platform-ios/src/config/__tests__/getProjectConfig.test.ts rename to packages/cli-platform-ios/src/config/__tests__/getProjectConfig.test.ts diff --git a/packages/platform-ios/src/config/__tests__/native_modules.test.ts b/packages/cli-platform-ios/src/config/__tests__/native_modules.test.ts similarity index 100% rename from packages/platform-ios/src/config/__tests__/native_modules.test.ts rename to packages/cli-platform-ios/src/config/__tests__/native_modules.test.ts diff --git a/packages/platform-ios/src/config/findAllPodfilePaths.ts b/packages/cli-platform-ios/src/config/findAllPodfilePaths.ts similarity index 100% rename from packages/platform-ios/src/config/findAllPodfilePaths.ts rename to packages/cli-platform-ios/src/config/findAllPodfilePaths.ts diff --git a/packages/platform-ios/src/config/findPodfilePath.ts b/packages/cli-platform-ios/src/config/findPodfilePath.ts similarity index 100% rename from packages/platform-ios/src/config/findPodfilePath.ts rename to packages/cli-platform-ios/src/config/findPodfilePath.ts diff --git a/packages/platform-ios/src/config/findPodspec.ts b/packages/cli-platform-ios/src/config/findPodspec.ts similarity index 100% rename from packages/platform-ios/src/config/findPodspec.ts rename to packages/cli-platform-ios/src/config/findPodspec.ts diff --git a/packages/platform-ios/src/config/findXcodeProject.ts b/packages/cli-platform-ios/src/config/findXcodeProject.ts similarity index 100% rename from packages/platform-ios/src/config/findXcodeProject.ts rename to packages/cli-platform-ios/src/config/findXcodeProject.ts diff --git a/packages/platform-ios/src/config/index.ts b/packages/cli-platform-ios/src/config/index.ts similarity index 100% rename from packages/platform-ios/src/config/index.ts rename to packages/cli-platform-ios/src/config/index.ts diff --git a/packages/platform-ios/src/index.ts b/packages/cli-platform-ios/src/index.ts similarity index 100% rename from packages/platform-ios/src/index.ts rename to packages/cli-platform-ios/src/index.ts diff --git a/packages/platform-ios/src/types.ts b/packages/cli-platform-ios/src/types.ts similarity index 100% rename from packages/platform-ios/src/types.ts rename to packages/cli-platform-ios/src/types.ts diff --git a/packages/platform-ios/tsconfig.json b/packages/cli-platform-ios/tsconfig.json similarity index 67% rename from packages/platform-ios/tsconfig.json rename to packages/cli-platform-ios/tsconfig.json index bd36878c1..604a72878 100644 --- a/packages/platform-ios/tsconfig.json +++ b/packages/cli-platform-ios/tsconfig.json @@ -5,5 +5,5 @@ "outDir": "build", "typeRoots": ["definitions"] }, - "references": [{"path": "../tools"}, {"path": "../cli-types"}] + "references": [{"path": "../cli-tools"}, {"path": "../cli-types"}] } diff --git a/packages/cli-plugin-metro/tsconfig.json b/packages/cli-plugin-metro/tsconfig.json index fe00046e2..bc964d301 100644 --- a/packages/cli-plugin-metro/tsconfig.json +++ b/packages/cli-plugin-metro/tsconfig.json @@ -7,6 +7,6 @@ "references": [ {"path": "../cli-types"}, {"path": "../cli-server-api"}, - {"path": "../tools"}, + {"path": "../cli-tools"}, ] } diff --git a/packages/cli-server-api/tsconfig.json b/packages/cli-server-api/tsconfig.json index 8b5ecd686..c1cbb74a9 100644 --- a/packages/cli-server-api/tsconfig.json +++ b/packages/cli-server-api/tsconfig.json @@ -4,5 +4,5 @@ "rootDir": "src", "outDir": "build" }, - "references": [{"path": "../tools"}, {"path": "../debugger-ui"}] + "references": [{"path": "../cli-tools"}, {"path": "../cli-debugger-ui"}] } diff --git a/packages/tools/CHANGELOG.md b/packages/cli-tools/CHANGELOG.md similarity index 100% rename from packages/tools/CHANGELOG.md rename to packages/cli-tools/CHANGELOG.md diff --git a/packages/tools/package.json b/packages/cli-tools/package.json similarity index 100% rename from packages/tools/package.json rename to packages/cli-tools/package.json diff --git a/packages/tools/src/__tests__/findProjectRoot-test.ts b/packages/cli-tools/src/__tests__/findProjectRoot-test.ts similarity index 100% rename from packages/tools/src/__tests__/findProjectRoot-test.ts rename to packages/cli-tools/src/__tests__/findProjectRoot-test.ts diff --git a/packages/tools/src/__tests__/groupFilesByType.test.ts b/packages/cli-tools/src/__tests__/groupFilesByType.test.ts similarity index 100% rename from packages/tools/src/__tests__/groupFilesByType.test.ts rename to packages/cli-tools/src/__tests__/groupFilesByType.test.ts diff --git a/packages/tools/src/errors.ts b/packages/cli-tools/src/errors.ts similarity index 100% rename from packages/tools/src/errors.ts rename to packages/cli-tools/src/errors.ts diff --git a/packages/tools/src/fetch.ts b/packages/cli-tools/src/fetch.ts similarity index 100% rename from packages/tools/src/fetch.ts rename to packages/cli-tools/src/fetch.ts diff --git a/packages/tools/src/findProjectRoot.ts b/packages/cli-tools/src/findProjectRoot.ts similarity index 100% rename from packages/tools/src/findProjectRoot.ts rename to packages/cli-tools/src/findProjectRoot.ts diff --git a/packages/tools/src/getDefaultUserTerminal.ts b/packages/cli-tools/src/getDefaultUserTerminal.ts similarity index 100% rename from packages/tools/src/getDefaultUserTerminal.ts rename to packages/cli-tools/src/getDefaultUserTerminal.ts diff --git a/packages/tools/src/groupFilesByType.ts b/packages/cli-tools/src/groupFilesByType.ts similarity index 100% rename from packages/tools/src/groupFilesByType.ts rename to packages/cli-tools/src/groupFilesByType.ts diff --git a/packages/tools/src/hookStdout.ts b/packages/cli-tools/src/hookStdout.ts similarity index 100% rename from packages/tools/src/hookStdout.ts rename to packages/cli-tools/src/hookStdout.ts diff --git a/packages/tools/src/index.ts b/packages/cli-tools/src/index.ts similarity index 100% rename from packages/tools/src/index.ts rename to packages/cli-tools/src/index.ts diff --git a/packages/tools/src/isPackagerRunning.ts b/packages/cli-tools/src/isPackagerRunning.ts similarity index 100% rename from packages/tools/src/isPackagerRunning.ts rename to packages/cli-tools/src/isPackagerRunning.ts diff --git a/packages/tools/src/launchDebugger.ts b/packages/cli-tools/src/launchDebugger.ts similarity index 100% rename from packages/tools/src/launchDebugger.ts rename to packages/cli-tools/src/launchDebugger.ts diff --git a/packages/tools/src/launchDefaultBrowser.ts b/packages/cli-tools/src/launchDefaultBrowser.ts similarity index 100% rename from packages/tools/src/launchDefaultBrowser.ts rename to packages/cli-tools/src/launchDefaultBrowser.ts diff --git a/packages/tools/src/launchEditor.ts b/packages/cli-tools/src/launchEditor.ts similarity index 100% rename from packages/tools/src/launchEditor.ts rename to packages/cli-tools/src/launchEditor.ts diff --git a/packages/tools/src/loader.ts b/packages/cli-tools/src/loader.ts similarity index 100% rename from packages/tools/src/loader.ts rename to packages/cli-tools/src/loader.ts diff --git a/packages/tools/src/logger.ts b/packages/cli-tools/src/logger.ts similarity index 100% rename from packages/tools/src/logger.ts rename to packages/cli-tools/src/logger.ts diff --git a/packages/tools/src/releaseChecker/getLatestRelease.ts b/packages/cli-tools/src/releaseChecker/getLatestRelease.ts similarity index 100% rename from packages/tools/src/releaseChecker/getLatestRelease.ts rename to packages/cli-tools/src/releaseChecker/getLatestRelease.ts diff --git a/packages/tools/src/releaseChecker/index.ts b/packages/cli-tools/src/releaseChecker/index.ts similarity index 100% rename from packages/tools/src/releaseChecker/index.ts rename to packages/cli-tools/src/releaseChecker/index.ts diff --git a/packages/tools/src/releaseChecker/printNewRelease.ts b/packages/cli-tools/src/releaseChecker/printNewRelease.ts similarity index 100% rename from packages/tools/src/releaseChecker/printNewRelease.ts rename to packages/cli-tools/src/releaseChecker/printNewRelease.ts diff --git a/packages/tools/src/releaseChecker/releaseCacheManager.ts b/packages/cli-tools/src/releaseChecker/releaseCacheManager.ts similarity index 100% rename from packages/tools/src/releaseChecker/releaseCacheManager.ts rename to packages/cli-tools/src/releaseChecker/releaseCacheManager.ts diff --git a/packages/tools/src/resolveNodeModuleDir.ts b/packages/cli-tools/src/resolveNodeModuleDir.ts similarity index 100% rename from packages/tools/src/resolveNodeModuleDir.ts rename to packages/cli-tools/src/resolveNodeModuleDir.ts diff --git a/packages/tools/src/throwIfNonHttpProtocol.ts b/packages/cli-tools/src/throwIfNonHttpProtocol.ts similarity index 100% rename from packages/tools/src/throwIfNonHttpProtocol.ts rename to packages/cli-tools/src/throwIfNonHttpProtocol.ts diff --git a/packages/tools/tsconfig.json b/packages/cli-tools/tsconfig.json similarity index 100% rename from packages/tools/tsconfig.json rename to packages/cli-tools/tsconfig.json diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 8f34cc135..c11f08bbe 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -12,7 +12,7 @@ {"path": "../cli-plugin-metro"}, {"path": "../cli-server-api"}, {"path": "../cli-types"}, - {"path": "../debugger-ui"}, - {"path": "../tools"} + {"path": "../cli-debugger-ui"}, + {"path": "../cli-tools"} ] } diff --git a/scripts/linkPackages.js b/scripts/linkPackages.js index 4b2bc3c65..407ffb0d0 100644 --- a/scripts/linkPackages.js +++ b/scripts/linkPackages.js @@ -3,10 +3,7 @@ const chalk = require('chalk'); const path = require('path'); const glob = require('glob'); -const projects = glob - .sync('packages/*/package.json') - // We don't want to deal with global-cli at the moment - .filter((name) => !name.includes('global-cli')); +const projects = glob.sync('packages/*/package.json'); projects.forEach((project) => { const cwd = path.dirname(project);