Skip to content

Commit b9f8da6

Browse files
authored
Remove rnw/cli dependency on rnc/cli (#14727)
* Remove rnw/cli dependency on rnc/cli * Change files
1 parent d2316b1 commit b9f8da6

File tree

16 files changed

+37
-55
lines changed

16 files changed

+37
-55
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Remove rnw/cli dependency on rnc/cli",
4+
"packageName": "@react-native-windows/cli",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/@react-native-windows/cli/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"chalk": "^4.1.0",
2626
"cli-spinners": "^2.2.0",
2727
"envinfo": "^7.5.0",
28+
"execa": "^5.0.0",
2829
"find-up": "^4.1.0",
2930
"glob": "^7.1.1",
3031
"lodash": "^4.17.15",

packages/@react-native-windows/cli/src/commands/autolinkWindows/autolinkWindows.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ import {XMLSerializer} from '@xmldom/xmldom';
1717
import {Ora} from 'ora';
1818
const formatter = require('xml-formatter');
1919

20-
import {
20+
import type {
2121
Command,
2222
Config,
2323
DependencyConfig,
2424
ProjectConfig,
2525
} from '@react-native-community/cli-types';
2626
import {Telemetry, CodedError} from '@react-native-windows/telemetry';
27-
import {AutoLinkOptions, autolinkOptions} from './autolinkWindowsOptions';
27+
import type {AutoLinkOptions} from './autolinkWindowsOptions';
28+
import {autolinkOptions} from './autolinkWindowsOptions';
2829

2930
import {
3031
newSpinner,
@@ -39,11 +40,11 @@ import {
3940
startTelemetrySession,
4041
endTelemetrySession,
4142
} from '../../utils/telemetryHelpers';
42-
import {
43+
import type {
4344
WindowsDependencyConfig,
4445
ProjectDependency,
4546
} from '../config/dependencyConfig';
46-
import {Project, WindowsProjectConfig} from '../config/projectConfig';
47+
import type {Project, WindowsProjectConfig} from '../config/projectConfig';
4748

4849
export class AutoLinkWindows {
4950
private changesNecessary: boolean;

packages/@react-native-windows/cli/src/commands/autolinkWindows/autolinkWindowsOptions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @format
55
*/
66

7-
import {CommandOption} from '@react-native-community/cli-types';
7+
import type {CommandOption} from '@react-native-community/cli-types';
88

99
export interface AutoLinkOptions {
1010
logging?: boolean;

packages/@react-native-windows/cli/src/commands/codegenWindows/codegenWindows.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import chalk from 'chalk';
99
import {performance} from 'perf_hooks';
1010
import {Ora} from 'ora';
1111

12-
import {Command, Config} from '@react-native-community/cli-types';
12+
import type {Command, Config} from '@react-native-community/cli-types';
1313
import {Telemetry, CodedError} from '@react-native-windows/telemetry';
14-
import {
14+
import type {
1515
CodeGenOptions as RnwCodeGenOptions,
1616
CppStringTypes,
17-
runCodeGen,
1817
} from '@react-native-windows/codegen';
18+
import {runCodeGen} from '@react-native-windows/codegen';
1919

2020
import {
2121
newSpinner,
@@ -26,7 +26,8 @@ import {
2626
startTelemetrySession,
2727
endTelemetrySession,
2828
} from '../../utils/telemetryHelpers';
29-
import {CodeGenOptions, codegenOptions} from './codegenWindowsOptions';
29+
import type {CodeGenOptions} from './codegenWindowsOptions';
30+
import {codegenOptions} from './codegenWindowsOptions';
3031

3132
export class CodeGenWindows {
3233
private changesNecessary: boolean;

packages/@react-native-windows/cli/src/commands/codegenWindows/codegenWindowsOptions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @format
55
*/
66

7-
import {CommandOption} from '@react-native-community/cli-types';
7+
import type {CommandOption} from '@react-native-community/cli-types';
88

99
export interface CodeGenOptions {
1010
logging?: boolean;

packages/@react-native-windows/cli/src/commands/healthCheck/healthChecks.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ import path from 'path';
88

99
import * as pathHelpers from '../../utils/pathHelpers';
1010

11-
const rnDir = pathHelpers.resolveRnRoot(process.cwd());
12-
const cliDir = pathHelpers.resolveRnCliRoot(rnDir);
13-
14-
const execaPath = require.resolve('execa', {paths: [cliDir]});
15-
const execa = require(execaPath);
11+
import execa from 'execa';
1612

1713
import type {
1814
HealthCheckCategory,

packages/@react-native-windows/cli/src/commands/initWindows/initWindows.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import util from 'util';
1515

1616
const glob = util.promisify(globFunc);
1717

18-
import {Command, Config} from '@react-native-community/cli-types';
18+
import type {Command, Config} from '@react-native-community/cli-types';
1919
import {CodedError, Telemetry} from '@react-native-windows/telemetry';
2020

2121
import {
@@ -30,7 +30,8 @@ import {
3030
} from '../../utils/telemetryHelpers';
3131
import {copyAndReplaceWithChangedCallback} from '../../generator-common';
3232
import * as nameHelpers from '../../utils/nameHelpers';
33-
import {InitOptions, initOptions} from './initWindowsOptions';
33+
import type {InitOptions} from './initWindowsOptions';
34+
import {initOptions} from './initWindowsOptions';
3435

3536
export interface TemplateFileMapping {
3637
from: string;

packages/@react-native-windows/cli/src/commands/initWindows/initWindowsOptions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @format
55
*/
66

7-
import {CommandOption} from '@react-native-community/cli-types';
7+
import type {CommandOption} from '@react-native-community/cli-types';
88

99
export interface InitOptions {
1010
logging?: boolean;

packages/@react-native-windows/cli/src/commands/runWindows/runWindows.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import fs from '@react-native-windows/fs';
88
import path from 'path';
99

1010
import {Telemetry, CodedError} from '@react-native-windows/telemetry';
11-
import {Command, Config} from '@react-native-community/cli-types';
11+
import type {Command, Config} from '@react-native-community/cli-types';
1212

1313
import * as build from '../../utils/build';
1414
import chalk from 'chalk';
@@ -27,9 +27,10 @@ import {
2727
import * as pathHelpers from '../../utils/pathHelpers';
2828
import * as info from '../../utils/info';
2929
import MSBuildTools from '../../utils/msbuildtools';
30-
import {runWindowsOptions, RunWindowsOptions} from './runWindowsOptions';
30+
import type {RunWindowsOptions} from './runWindowsOptions';
31+
import {runWindowsOptions} from './runWindowsOptions';
3132
import {autolinkWindowsInternal} from '../autolinkWindows/autolinkWindows';
32-
import {AutoLinkOptions} from '../autolinkWindows/autolinkWindowsOptions';
33+
import type {AutoLinkOptions} from '../autolinkWindows/autolinkWindowsOptions';
3334

3435
/**
3536
* Sanitizes the given option for telemetry.

0 commit comments

Comments
 (0)