@react-native-windows/cli 0.0.0-canary.2 → 0.0.0-canary.200

package/lib-commonjs/index.js

@@ -4,15 +4,47 @@
  * Licensed under the MIT License.
  * @format
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectConfig = exports.dependencyConfig = exports.commands = exports.generateWindows = void 0;
-const fs = require("fs");
-const path = require("path");
+const fs_1 = __importDefault(require("@react-native-windows/fs"));
+const path_1 = __importDefault(require("path"));
 const generator_windows_1 = require("./generator-windows");
-const autolink_1 = require("./runWindows/utils/autolink");
-const runWindows_1 = require("./runWindows/runWindows");
-const dependencyConfig_1 = require("./config/dependencyConfig");
-const projectConfig_1 = require("./config/projectConfig");
+const pathHelpers = __importStar(require("./utils/pathHelpers"));
+const autolinkWindows_1 = require("./commands/autolinkWindows/autolinkWindows");
+const codegenWindows_1 = require("./commands/codegenWindows/codegenWindows");
+const initWindows_1 = require("./commands/initWindows/initWindows");
+const runWindows_1 = require("./commands/runWindows/runWindows");
+const dependencyConfig_1 = require("./commands/config/dependencyConfig");
+const projectConfig_1 = require("./commands/config/projectConfig");
 /**
  * Simple utility for running the Windows generator.
  *
@@ -22,17 +54,25 @@ const projectConfig_1 = require("./config/projectConfig");
  * @param  options    command line options container
  */
 async function generateWindows(projectDir, name, ns, options) {
-    if (!fs.existsSync(projectDir)) {
-        fs.mkdirSync(projectDir);
+    if (!fs_1.default.existsSync(projectDir)) {
+        fs_1.default.mkdirSync(projectDir);
     }
-    generator_windows_1.installDependencies(options);
-    await generator_windows_1.copyProjectTemplateAndReplace(path.join(__dirname, '..', 'templates'), projectDir, name, ns, options);
+    await (0, generator_windows_1.installScriptsAndDependencies)(options);
+    const rnwPackage = pathHelpers.resolveRnwRoot(projectDir);
+    const templateRoot = path_1.default.join(rnwPackage, 'template');
+    await (0, generator_windows_1.copyProjectTemplateAndReplace)(templateRoot, projectDir, name, ns, options);
 }
 exports.generateWindows = generateWindows;
 // Assert the interface here doesn't change for the reasons above
 const assertStableInterface = true;
 assertStableInterface;
-exports.commands = [autolink_1.autoLinkCommand, runWindows_1.runWindowsCommand];
+exports.commands = [
+    autolinkWindows_1.autolinkCommand,
+    codegenWindows_1.codegenCommand,
+    initWindows_1.initCommand,
+    runWindows_1.runWindowsCommand,
+];
 exports.dependencyConfig = dependencyConfig_1.dependencyConfigWindows;
 exports.projectConfig = projectConfig_1.projectConfigWindows;
+__exportStar(require("./commands/healthCheck/healthChecks"), exports);
 //# sourceMappingURL=index.js.map

package/lib-commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,yBAAyB;AACzB,6BAA6B;AAC7B,2DAG6B;AAE7B,0DAA4D;AAC5D,wDAA0D;AAC1D,gEAAkE;AAClE,0DAA4D;AA6B5D;;;;;;;GAOG;AACI,KAAK,UAAU,eAAe,CACnC,UAAkB,EAClB,IAAY,EACZ,EAAU,EACV,OAAwB;IAExB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC9B,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;KAC1B;IAED,uCAAmB,CAAC,OAAO,CAAC,CAAC;IAE7B,MAAM,iDAA6B,CACjC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,EACvC,UAAU,EACV,IAAI,EACJ,EAAE,EACF,OAAO,CACR,CAAC;AACJ,CAAC;AAnBD,0CAmBC;AAED,iEAAiE;AACjE,MAAM,qBAAqB,GAOf,IAAI,CAAC;AACjB,qBAAqB,CAAC;AAET,QAAA,QAAQ,GAAG,CAAC,0BAAe,EAAE,8BAAiB,CAAC,CAAC;AAChD,QAAA,gBAAgB,GAAG,0CAAuB,CAAC;AAC3C,QAAA,aAAa,GAAG,oCAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,kEAA0C;AAC1C,gDAAwB;AAExB,2DAG6B;AAE7B,iEAAmD;AAEnD,gFAA2E;AAC3E,6EAAwE;AACxE,oEAA+D;AAC/D,iEAAmE;AACnE,yEAA2E;AAC3E,mEAAqE;AAiCrE;;;;;;;GAOG;AACI,KAAK,UAAU,eAAe,CACnC,UAAkB,EAClB,IAAY,EACZ,EAAU,EACV,OAAwB;IAExB,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC9B,YAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;KAC1B;IAED,MAAM,IAAA,iDAA6B,EAAC,OAAO,CAAC,CAAC;IAE7C,MAAM,UAAU,GAAG,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACvD,MAAM,IAAA,iDAA6B,EACjC,YAAY,EACZ,UAAU,EACV,IAAI,EACJ,EAAE,EACF,OAAO,CACR,CAAC;AACJ,CAAC;AArBD,0CAqBC;AAED,iEAAiE;AACjE,MAAM,qBAAqB,GAOf,IAAI,CAAC;AACjB,qBAAqB,CAAC;AAET,QAAA,QAAQ,GAAG;IACtB,iCAAe;IACf,+BAAc;IACd,yBAAW;IACX,8BAAiB;CAClB,CAAC;AACW,QAAA,gBAAgB,GAAG,0CAAuB,CAAC;AAC3C,QAAA,aAAa,GAAG,oCAAoB,CAAC;AAClD,sEAAoD","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\nimport fs from '@react-native-windows/fs';\nimport path from 'path';\n\nimport {\n  copyProjectTemplateAndReplace,\n  installScriptsAndDependencies,\n} from './generator-windows';\n\nimport * as pathHelpers from './utils/pathHelpers';\n\nimport {autolinkCommand} from './commands/autolinkWindows/autolinkWindows';\nimport {codegenCommand} from './commands/codegenWindows/codegenWindows';\nimport {initCommand} from './commands/initWindows/initWindows';\nimport {runWindowsCommand} from './commands/runWindows/runWindows';\nimport {dependencyConfigWindows} from './commands/config/dependencyConfig';\nimport {projectConfigWindows} from './commands/config/projectConfig';\n\n/**\n * Project generation options\n *\n *      _\n *     | |\n *   __| | __ _ _ __   __ _  ___ _ __\n *  / _` |/ _` | '_ \\ / _` |/ _ \\ '__|\n * | (_| | (_| | | | | (_| |  __/ |\n *  \\__,_|\\__,_|_| |_|\\__, |\\___|_|\n *                     __/ |\n *                    |___/\n *\n *\n * Properties on this interface must remain stable, as new versions of\n * react-native-windows-init may be used with local-cli dating back to 0.61.\n * All existing arguments must work correctly when changing this interface.\n */\nexport interface GenerateOptions {\n  overwrite: boolean;\n  language: 'cpp' | 'cs';\n  projectType: 'app' | 'lib';\n  experimentalNuGetDependency: boolean;\n  nuGetTestVersion?: string;\n  nuGetTestFeed?: string;\n  useWinUI3: boolean;\n  useHermes: boolean;\n  useDevMode: boolean;\n  verbose: boolean;\n  telemetry: boolean;\n}\n\n/**\n * Simple utility for running the Windows generator.\n *\n * @param  projectDir root project directory (i.e. contains index.js)\n * @param  name       name of the root JS module for this app\n * @param  ns         namespace for the project\n * @param  options    command line options container\n */\nexport async function generateWindows(\n  projectDir: string,\n  name: string,\n  ns: string,\n  options: GenerateOptions,\n) {\n  if (!fs.existsSync(projectDir)) {\n    fs.mkdirSync(projectDir);\n  }\n\n  await installScriptsAndDependencies(options);\n\n  const rnwPackage = pathHelpers.resolveRnwRoot(projectDir);\n  const templateRoot = path.join(rnwPackage, 'template');\n  await copyProjectTemplateAndReplace(\n    templateRoot,\n    projectDir,\n    name,\n    ns,\n    options,\n  );\n}\n\n// Assert the interface here doesn't change for the reasons above\nconst assertStableInterface: typeof generateWindows extends (\n  projectDir: string,\n  name: string,\n  ns: string,\n  options: GenerateOptions,\n) => Promise<void>\n  ? true\n  : never = true;\nassertStableInterface;\n\nexport const commands = [\n  autolinkCommand,\n  codegenCommand,\n  initCommand,\n  runWindowsCommand,\n];\nexport const dependencyConfig = dependencyConfigWindows;\nexport const projectConfig = projectConfigWindows;\nexport * from './commands/healthCheck/healthChecks';\n"]}

package/lib-commonjs/{runWindows/utils → utils}/build.d.ts

@@ -4,10 +4,9 @@
  * @format
  */
 import MSBuildTools from './msbuildtools';
-import { RunWindowsOptions, BuildConfig, BuildArch } from '../runWindowsOptions';
+import { RunWindowsOptions, BuildConfig, BuildArch } from '../commands/runWindows/runWindowsOptions';
 import { Config } from '@react-native-community/cli-types';
-export declare function buildSolution(buildTools: MSBuildTools, slnFile: string, buildType: BuildConfig, buildArch: BuildArch, msBuildProps: Record<string, string>, verbose: boolean, target?: string, buildLogDirectory?: string): Promise<void>;
-export declare function restoreNuGetPackages(slnFile: string, buildTools: MSBuildTools, verbose: boolean): Promise<void>;
+export declare function buildSolution(buildTools: MSBuildTools, slnFile: string, buildType: BuildConfig, buildArch: BuildArch, msBuildProps: Record<string, string>, verbose: boolean, target: 'build' | 'deploy', buildLogDirectory?: string, singleproc?: boolean): Promise<void>;
 export declare function getAppSolutionFile(options: RunWindowsOptions, config: Config): string | null;
 export declare function getAppProjectFile(options: RunWindowsOptions, config: Config): string | null;
 export declare function parseMsBuildProps(options: RunWindowsOptions): Record<string, string>;

package/lib-commonjs/{runWindows/utils → utils}/build.js

@@ -4,86 +4,79 @@
  * Licensed under the MIT License.
  * @format
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMsBuildProps = exports.getAppProjectFile = exports.getAppSolutionFile = exports.restoreNuGetPackages = exports.buildSolution = void 0;
-const path = require("path");
-const msbuildtools_1 = require("./msbuildtools");
-const version_1 = require("./version");
+exports.parseMsBuildProps = exports.getAppProjectFile = exports.getAppSolutionFile = exports.buildSolution = void 0;
+const path_1 = __importDefault(require("path"));
+const msbuildtools_1 = __importDefault(require("./msbuildtools"));
+const version_1 = __importDefault(require("./version"));
 const commandWithProgress_1 = require("./commandWithProgress");
-async function buildSolution(buildTools, slnFile, buildType, buildArch, msBuildProps, verbose, target, buildLogDirectory) {
-    const minVersion = new version_1.default(10, 0, 18362, 0);
+const telemetry_1 = require("@react-native-windows/telemetry");
+async function buildSolution(buildTools, slnFile, buildType, buildArch, msBuildProps, verbose, target, buildLogDirectory, singleproc) {
+    const minVersion = new version_1.default(10, 0, 19041, 0);
     const allVersions = msbuildtools_1.default.getAllAvailableUAPVersions();
     if (!allVersions.some(v => v.gte(minVersion))) {
-        throw new Error('Must have a minimum Windows SDK version 10.0.18362.0 installed');
+        throw new telemetry_1.CodedError('MinSDKVersionNotMet', 'Must have a minimum Windows SDK version 10.0.19041.0 installed');
     }
-    await buildTools.buildProject(slnFile, buildType, buildArch, msBuildProps, verbose, target, buildLogDirectory);
+    await buildTools.buildProject(slnFile, buildType, buildArch, msBuildProps, verbose, target, buildLogDirectory, singleproc);
 }
 exports.buildSolution = buildSolution;
-async function restoreNuGetPackages(slnFile, buildTools, verbose) {
-    const text = 'Restoring NuGet packages ';
-    const spinner = commandWithProgress_1.newSpinner(text);
-    await commandWithProgress_1.commandWithProgress(spinner, text, require.resolve('nuget-exe'), [
-        'restore',
-        `${slnFile}`,
-        '-NonInteractive',
-        '-Verbosity',
-        verbose ? 'normal' : 'quiet',
-        '-MSBuildVersion',
-        buildTools.installationVersion,
-    ], verbose);
-}
-exports.restoreNuGetPackages = restoreNuGetPackages;
 const configErrorString = 'Error: ';
 function getAppSolutionFile(options, config) {
     // Use the solution file if specified
     if (options.sln) {
-        return path.join(options.root, options.sln);
+        return path_1.default.join(options.root, options.sln);
     }
     // Check the answer from react-native config
     const windowsAppConfig = config.project.windows;
+    if (!windowsAppConfig) {
+        throw new telemetry_1.CodedError('NoWindowsConfig', "Couldn't determine Windows app config");
+    }
     const configSolutionFile = windowsAppConfig.solutionFile;
     if (configSolutionFile.startsWith(configErrorString)) {
-        commandWithProgress_1.newError(configSolutionFile.substr(configErrorString.length) +
+        (0, commandWithProgress_1.newError)(configSolutionFile.substr(configErrorString.length) +
             ' Optionally, use --sln {slnFile}.');
         return null;
     }
     else {
-        return path.join(windowsAppConfig.folder, windowsAppConfig.sourceDir, configSolutionFile);
+        return path_1.default.join(windowsAppConfig.folder, windowsAppConfig.sourceDir, configSolutionFile);
     }
 }
 exports.getAppSolutionFile = getAppSolutionFile;
 function getAppProjectFile(options, config) {
     // Use the project file if specified
     if (options.proj) {
-        return path.join(options.root, options.proj);
+        return path_1.default.join(options.root, options.proj);
     }
     // Check the answer from react-native config
     const windowsAppConfig = config.project.windows;
     const configProject = windowsAppConfig.project;
     if (typeof configProject === 'string' &&
         configProject.startsWith(configErrorString)) {
-        commandWithProgress_1.newError(configProject.substr(configErrorString.length) +
+        (0, commandWithProgress_1.newError)(configProject.substr(configErrorString.length) +
             ' Optionally, use --proj {projFile}.');
         return null;
     }
     else {
         const configProjectFile = configProject.projectFile;
         if (configProjectFile.startsWith(configErrorString)) {
-            commandWithProgress_1.newError(configProjectFile.substr(configErrorString.length) +
+            (0, commandWithProgress_1.newError)(configProjectFile.substr(configErrorString.length) +
                 ' Optionally, use --proj {projFile}.');
             return null;
         }
-        return path.join(windowsAppConfig.folder, windowsAppConfig.sourceDir, configProjectFile);
+        return path_1.default.join(windowsAppConfig.folder, windowsAppConfig.sourceDir, configProjectFile);
     }
 }
 exports.getAppProjectFile = getAppProjectFile;
 function parseMsBuildProps(options) {
-    let result = {};
+    const result = {};
     if (options.msbuildprops) {
         const props = options.msbuildprops.split(',');
-        for (let i = 0; i < props.length; i++) {
-            const prop = props[i].split('=');
-            result[prop[0]] = prop[1];
+        for (const prop of props) {
+            const propAssignment = prop.split('=');
+            result[propAssignment[0]] = propAssignment[1];
         }
     }
     return result;

package/lib-commonjs/utils/build.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/utils/build.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\nimport path from 'path';\n\nimport MSBuildTools from './msbuildtools';\nimport Version from './version';\nimport {newError} from './commandWithProgress';\nimport {\n  RunWindowsOptions,\n  BuildConfig,\n  BuildArch,\n} from '../commands/runWindows/runWindowsOptions';\nimport {Config} from '@react-native-community/cli-types';\nimport {CodedError} from '@react-native-windows/telemetry';\n\nexport async function buildSolution(\n  buildTools: MSBuildTools,\n  slnFile: string,\n  buildType: BuildConfig,\n  buildArch: BuildArch,\n  msBuildProps: Record<string, string>,\n  verbose: boolean,\n  target: 'build' | 'deploy',\n  buildLogDirectory?: string,\n  singleproc?: boolean,\n) {\n  const minVersion = new Version(10, 0, 19041, 0);\n  const allVersions = MSBuildTools.getAllAvailableUAPVersions();\n  if (!allVersions.some(v => v.gte(minVersion))) {\n    throw new CodedError(\n      'MinSDKVersionNotMet',\n      'Must have a minimum Windows SDK version 10.0.19041.0 installed',\n    );\n  }\n\n  await buildTools.buildProject(\n    slnFile,\n    buildType,\n    buildArch,\n    msBuildProps,\n    verbose,\n    target,\n    buildLogDirectory,\n    singleproc,\n  );\n}\n\nconst configErrorString = 'Error: ';\n\nexport function getAppSolutionFile(options: RunWindowsOptions, config: Config) {\n  // Use the solution file if specified\n  if (options.sln) {\n    return path.join(options.root, options.sln);\n  }\n\n  // Check the answer from react-native config\n  const windowsAppConfig = config.project.windows;\n  if (!windowsAppConfig) {\n    throw new CodedError(\n      'NoWindowsConfig',\n      \"Couldn't determine Windows app config\",\n    );\n  }\n  const configSolutionFile = windowsAppConfig.solutionFile;\n\n  if (configSolutionFile.startsWith(configErrorString)) {\n    newError(\n      configSolutionFile.substr(configErrorString.length) +\n        ' Optionally, use --sln {slnFile}.',\n    );\n    return null;\n  } else {\n    return path.join(\n      windowsAppConfig.folder,\n      windowsAppConfig.sourceDir,\n      configSolutionFile,\n    );\n  }\n}\n\nexport function getAppProjectFile(options: RunWindowsOptions, config: Config) {\n  // Use the project file if specified\n  if (options.proj) {\n    return path.join(options.root, options.proj);\n  }\n\n  // Check the answer from react-native config\n  const windowsAppConfig = config.project.windows;\n  const configProject = windowsAppConfig.project;\n\n  if (\n    typeof configProject === 'string' &&\n    configProject.startsWith(configErrorString)\n  ) {\n    newError(\n      configProject.substr(configErrorString.length) +\n        ' Optionally, use --proj {projFile}.',\n    );\n    return null;\n  } else {\n    const configProjectFile = configProject.projectFile;\n    if (configProjectFile.startsWith(configErrorString)) {\n      newError(\n        configProjectFile.substr(configErrorString.length) +\n          ' Optionally, use --proj {projFile}.',\n      );\n      return null;\n    }\n    return path.join(\n      windowsAppConfig.folder,\n      windowsAppConfig.sourceDir,\n      configProjectFile,\n    );\n  }\n}\n\nexport function parseMsBuildProps(\n  options: RunWindowsOptions,\n): Record<string, string> {\n  const result: Record<string, string> = {};\n  if (options.msbuildprops) {\n    const props = options.msbuildprops.split(',');\n    for (const prop of props) {\n      const propAssignment = prop.split('=');\n      result[propAssignment[0]] = propAssignment[1];\n    }\n  }\n  return result;\n}\n"]}

package/lib-commonjs/{runWindows/utils → utils}/checkRequirements.js

@@ -4,12 +4,16 @@
  * Licensed under the MIT License.
  * @format
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isWinSdkPresent = void 0;
+const telemetry_1 = require("@react-native-windows/telemetry");
 const child_process_1 = require("child_process");
-const path = require("path");
-const shell = require("shelljs");
-const version_1 = require("./version");
+const path_1 = __importDefault(require("path"));
+const shelljs_1 = __importDefault(require("shelljs"));
+const version_1 = __importDefault(require("./version"));
 const REQUIRED_VERSIONS = {
     '10.0': {
         os: new version_1.default(6, 3),
@@ -30,7 +34,7 @@ function getInstalledWindowsSdks() {
     const execString = 'reg query "HKLM\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows" /s /v InstallationFolder /reg:32';
     let output;
     try {
-        output = child_process_1.execSync(execString).toString();
+        output = (0, child_process_1.execSync)(execString).toString();
     }
     catch (e) {
         return installedSdks;
@@ -39,10 +43,10 @@ function getInstalledWindowsSdks() {
     let match;
     while ((match = re.exec(output))) {
         const sdkPath = match[2];
-        if (shell.test('-e', path.join(sdkPath, 'SDKManifest.xml'))) {
+        if (shelljs_1.default.test('-e', path_1.default.join(sdkPath, 'SDKManifest.xml'))) {
             const sdkVersion = version_1.default.tryParse(match[1]);
             if (!sdkVersion) {
-                throw new Error(`Unexpected SDK version format for '${match[1]}'`);
+                throw new telemetry_1.CodedError('BadSDKVersionFormat', `Unexpected SDK version format for '${match[1]}'`);
             }
             installedSdks.push(sdkVersion);
         }
@@ -57,7 +61,7 @@ function checkWinSdk(windowsTargetVersion) {
         return shortenVersion(requiredVersion);
     }
     const shortenedVersion = shortenVersion(requiredVersion);
-    throw new Error(`Windows SDK not found. Ensure that you have installed Windows ${shortenedVersion} SDK along with Visual Studio or install Windows ${shortenedVersion} SDK separately from https://dev.windows.com/en-us/downloads`);
+    throw new telemetry_1.CodedError('NoSDK', `Windows SDK not found. Ensure that you have installed Windows ${shortenedVersion} SDK along with Visual Studio or install Windows ${shortenedVersion} SDK separately from https://dev.windows.com/en-us/downloads`);
 }
 function isWinSdkPresent(target) {
     return checkWinSdk(target);

package/lib-commonjs/utils/checkRequirements.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkRequirements.js","sourceRoot":"","sources":["../../src/utils/checkRequirements.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;AAEH,+DAA2D;AAC3D,iDAAuC;AACvC,gDAAwB;AACxB,sDAA4B;AAC5B,wDAAgC;AAShC,MAAM,iBAAiB,GAAiD;IACtE,MAAM,EAAE;QACN,EAAE,EAAE,IAAI,iBAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QACrB,OAAO,EAAE,IAAI,iBAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3B,YAAY,EAAE,IAAI,iBAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAChC,UAAU,EAAE,IAAI,iBAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9B,QAAQ,EAAE,IAAI,iBAAO,CAAC,EAAE,EAAE,CAAC,CAAC;KAC7B;CACF,CAAC;AAEF,SAAS,cAAc,CAAC,OAAgB;IACtC,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAE,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,4BAA4B,CACnC,WAAwB,EACxB,oBAAoD;IAEpD,OAAO,iBAAiB,CAAC,oBAAoB,CAAC,CAAC,WAAW,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,uBAAuB;IAC9B,MAAM,aAAa,GAAc,EAAE,CAAC;IAEpC,MAAM,UAAU,GACd,iGAAiG,CAAC;IACpG,IAAI,MAAc,CAAC;IACnB,IAAI;QACF,MAAM,GAAG,IAAA,wBAAQ,EAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,aAAa,CAAC;KACtB;IAED,MAAM,EAAE,GACN,gFAAgF,CAAC;IACnF,IAAI,KAA6B,CAAC;IAClC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE;QAChC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,iBAAK,CAAC,IAAI,CAAC,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,EAAE;YAC3D,MAAM,UAAU,GAAG,iBAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,IAAI,sBAAU,CAClB,qBAAqB,EACrB,sCAAsC,KAAK,CAAC,CAAC,CAAC,GAAG,CAClD,CAAC;aACH;YACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAChC;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAS,WAAW,CAAC,oBAA4B;IAC/C,MAAM,aAAa,GAAG,uBAAuB,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,4BAA4B,CAClD,YAAY,EACZ,oBAAoB,CACrB,CAAC;IACF,MAAM,eAAe,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CACxD,YAAY,CAAC,EAAE,CAAC,eAAe,CAAC,CACjC,CAAC;IAEF,IAAI,eAAe,EAAE;QACnB,OAAO,cAAc,CAAC,eAAe,CAAC,CAAC;KACxC;IAED,MAAM,gBAAgB,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;IACzD,MAAM,IAAI,sBAAU,CAClB,OAAO,EACP,iEAAiE,gBAAgB,oDAAoD,gBAAgB,8DAA8D,CACpN,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAAC,MAAc;IAC5C,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAFD,0CAEC","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\nimport {CodedError} from '@react-native-windows/telemetry';\nimport {execSync} from 'child_process';\nimport path from 'path';\nimport shell from 'shelljs';\nimport Version from './version';\n\ntype Requirement =\n  | 'os'\n  | 'msbuild'\n  | 'visualstudio'\n  | 'windowssdk'\n  | 'phonesdk';\n\nconst REQUIRED_VERSIONS: Record<string, Record<Requirement, Version>> = {\n  '10.0': {\n    os: new Version(6, 3),\n    msbuild: new Version(14, 0),\n    visualstudio: new Version(14, 0),\n    windowssdk: new Version(10, 0),\n    phonesdk: new Version(10, 0),\n  },\n};\n\nfunction shortenVersion(version: Version): string {\n  return /^(\\d+(?:\\.\\d+)?)/.exec(version.toString())![1];\n}\n\nfunction getMinimalRequiredVersionFor(\n  requirement: Requirement,\n  windowsTargetVersion: keyof typeof REQUIRED_VERSIONS,\n): Version {\n  return REQUIRED_VERSIONS[windowsTargetVersion][requirement];\n}\n\nfunction getInstalledWindowsSdks(): Version[] {\n  const installedSdks: Version[] = [];\n\n  const execString =\n    'reg query \"HKLM\\\\SOFTWARE\\\\Microsoft\\\\Microsoft SDKs\\\\Windows\" /s /v InstallationFolder /reg:32';\n  let output: string;\n  try {\n    output = execSync(execString).toString();\n  } catch (e) {\n    return installedSdks;\n  }\n\n  const re =\n    /\\\\Microsoft SDKs\\\\Windows\\\\v(\\d+\\.\\d+)\\s*InstallationFolder\\s+REG_SZ\\s+(.*)/gim;\n  let match: RegExpExecArray | null;\n  while ((match = re.exec(output))) {\n    const sdkPath = match[2];\n    if (shell.test('-e', path.join(sdkPath, 'SDKManifest.xml'))) {\n      const sdkVersion = Version.tryParse(match[1]);\n      if (!sdkVersion) {\n        throw new CodedError(\n          'BadSDKVersionFormat',\n          `Unexpected SDK version format for '${match[1]}'`,\n        );\n      }\n      installedSdks.push(sdkVersion);\n    }\n  }\n\n  return installedSdks;\n}\n\nfunction checkWinSdk(windowsTargetVersion: string): string {\n  const installedSdks = getInstalledWindowsSdks();\n  const requiredVersion = getMinimalRequiredVersionFor(\n    'windowssdk',\n    windowsTargetVersion,\n  );\n  const hasSdkInstalled = installedSdks.some(installedSdk =>\n    installedSdk.eq(requiredVersion),\n  );\n\n  if (hasSdkInstalled) {\n    return shortenVersion(requiredVersion);\n  }\n\n  const shortenedVersion = shortenVersion(requiredVersion);\n  throw new CodedError(\n    'NoSDK',\n    `Windows SDK not found. Ensure that you have installed Windows ${shortenedVersion} SDK along with Visual Studio or install Windows ${shortenedVersion} SDK separately from https://dev.windows.com/en-us/downloads`,\n  );\n}\n\nexport function isWinSdkPresent(target: string): string {\n  return checkWinSdk(target);\n}\n"]}

package/lib-commonjs/{runWindows/utils → utils}/commandWithProgress.d.ts

@@ -3,11 +3,19 @@
  * Licensed under the MIT License.
  * @format
  */
-import * as ora from 'ora';
+import ora from 'ora';
+import { CodedErrorType } from '@react-native-windows/telemetry';
 export declare function newSpinner(text: string): ora.Ora;
-export declare function runPowerShellScriptFunction(taskDescription: string, script: string | null, funcName: string, verbose: boolean): Promise<void>;
-export declare function commandWithProgress(spinner: ora.Ora, taskDoingName: string, command: string, args: string[], verbose: boolean): Promise<unknown>;
+export declare const powershell: string;
+export declare function runPowerShellScriptFunction(taskDescription: string, script: string | null, funcName: string, verbose: boolean, errorCategory: CodedErrorType): Promise<void>;
+export declare function commandWithProgress(spinner: ora.Ora, taskDoingName: string, command: string, args: string[], verbose: boolean, errorCategory: CodedErrorType): Promise<void>;
 export declare function newError(text: string): void;
 export declare function newWarn(text: string): void;
 export declare function newSuccess(text: string): void;
 export declare function newInfo(text: string): void;
+/**
+ * Sets the process exit code and offers some information at the end of a CLI command.
+ * @param loggingIsEnabled Is verbose logging enabled.
+ * @param error The error caught during the process, if any.
+ */
+export declare function setExitProcessWithError(loggingIsEnabled?: boolean, error?: Error): void;

package/lib-commonjs/utils/commandWithProgress.js

@@ -0,0 +1,150 @@
+"use strict";
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ * @format
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setExitProcessWithError = exports.newInfo = exports.newSuccess = exports.newWarn = exports.newError = exports.commandWithProgress = exports.runPowerShellScriptFunction = exports.powershell = exports.newSpinner = void 0;
+const child_process_1 = require("child_process");
+const ora_1 = __importDefault(require("ora"));
+const cli_spinners_1 = __importDefault(require("cli-spinners"));
+const chalk_1 = __importDefault(require("chalk"));
+const telemetry_1 = require("@react-native-windows/telemetry");
+function setSpinnerText(spinner, prefix, text) {
+    text = prefix + spinnerString(text);
+    spinner.text = text.length > 45 ? text.slice(0, 110) + '...' : text;
+}
+function spinnerString(msg) {
+    msg = msg.trim();
+    const lastLineIndex = msg.lastIndexOf('\n');
+    if (lastLineIndex > 0) {
+        msg = msg.slice(lastLineIndex + 1);
+    }
+    msg = msg.trim();
+    return msg;
+}
+function newSpinner(text) {
+    const options = {
+        text: text,
+        indent: 1,
+        // ora turns off emoji rendering by default on windows, since the default terminal
+        // doesn't render them.  Turn them back on when running in the new windows terminal
+        ...(process.env.WT_SESSION && { spinner: cli_spinners_1.default.dots }),
+        // By default, ora process.stderr as the output stream, however,the VS Code debugger
+        // Uses stdout to match success patterns
+        stream: process.stdout,
+    };
+    return (0, ora_1.default)(options).start();
+}
+exports.newSpinner = newSpinner;
+exports.powershell = `${process.env.SystemRoot}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
+async function runPowerShellScriptFunction(taskDescription, script, funcName, verbose, errorCategory) {
+    try {
+        const printException = verbose ? '$_;' : '';
+        const importScript = script ? `Import-Module "${script}"; ` : '';
+        await commandWithProgress(newSpinner(taskDescription), taskDescription, exports.powershell, [
+            '-NoProfile',
+            '-ExecutionPolicy',
+            'RemoteSigned',
+            `${importScript}try { ${funcName} -ErrorAction Stop; $lec = $LASTEXITCODE; } catch { $lec = 1; ${printException} }; exit $lec`,
+        ], verbose, errorCategory);
+    }
+    catch (_a) {
+        // The error output from the process will be shown if verbose is set.
+        // We don't capture the process output if verbose is set, but at least we have the task name in text, so throw that.
+        throw new telemetry_1.CodedError(errorCategory, taskDescription);
+    }
+}
+exports.runPowerShellScriptFunction = runPowerShellScriptFunction;
+function commandWithProgress(spinner, taskDoingName, command, args, verbose, errorCategory) {
+    return new Promise((resolve, reject) => {
+        const spawnOptions = verbose ? { stdio: 'inherit' } : {};
+        if (verbose) {
+            spinner.stop();
+        }
+        const cp = (0, child_process_1.spawn)(command, args, spawnOptions);
+        let firstErrorLine = null;
+        if (!verbose) {
+            cp.stdout.on('data', chunk => {
+                const text = chunk.toString();
+                setSpinnerText(spinner, taskDoingName + ': ', text);
+            });
+            cp.stderr.on('data', chunk => {
+                const text = chunk.toString();
+                if (!firstErrorLine) {
+                    firstErrorLine = text;
+                }
+                if (text) {
+                    setSpinnerText(spinner, taskDoingName + ': ERROR: ', firstErrorLine);
+                }
+                reject(new telemetry_1.CodedError(errorCategory, firstErrorLine, {
+                    taskName: taskDoingName,
+                }));
+            });
+        }
+        cp.on('error', e => {
+            if (verbose) {
+                console.error(chalk_1.default.red(e.toString()));
+            }
+            spinner.fail(e.toString());
+            const ce = new telemetry_1.CodedError(errorCategory, e.message);
+            ce.stack = e.stack;
+            reject(ce);
+        }).on('close', code => {
+            if (code === 0) {
+                spinner.succeed(taskDoingName);
+                resolve();
+            }
+            else {
+                spinner.fail();
+                reject(new telemetry_1.CodedError(errorCategory, `${taskDoingName} - exit error code ${code}`, {
+                    taskName: taskDoingName,
+                    taskExitCode: code,
+                }));
+            }
+        });
+    });
+}
+exports.commandWithProgress = commandWithProgress;
+function newError(text) {
+    newSpinner(text).fail(text);
+}
+exports.newError = newError;
+function newWarn(text) {
+    newSpinner(text).warn(text);
+}
+exports.newWarn = newWarn;
+function newSuccess(text) {
+    newSpinner(text).succeed(text);
+}
+exports.newSuccess = newSuccess;
+function newInfo(text) {
+    newSpinner(text).info(text);
+}
+exports.newInfo = newInfo;
+/**
+ * Sets the process exit code and offers some information at the end of a CLI command.
+ * @param loggingIsEnabled Is verbose logging enabled.
+ * @param error The error caught during the process, if any.
+ */
+function setExitProcessWithError(loggingIsEnabled, error) {
+    if (error) {
+        const errorType = error instanceof telemetry_1.CodedError ? error.type : 'Unknown';
+        process.exitCode = telemetry_1.CodedErrors[errorType];
+        if (loggingIsEnabled) {
+            console.log(`Command failed with error ${chalk_1.default.bold(errorType)}: ${error.message}`);
+            if (telemetry_1.Telemetry.isEnabled()) {
+                console.log(`Your telemetry sessionId was ${chalk_1.default.bold(telemetry_1.Telemetry.getSessionId())}`);
+            }
+        }
+        else {
+            console.log(`Command failed. Re-run the command with ${chalk_1.default.bold('--logging')} for more information.`);
+        }
+    }
+}
+exports.setExitProcessWithError = setExitProcessWithError;
+//# sourceMappingURL=commandWithProgress.js.map

package/lib-commonjs/utils/commandWithProgress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commandWithProgress.js","sourceRoot":"","sources":["../../src/utils/commandWithProgress.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\nimport {spawn, SpawnOptions} from 'child_process';\nimport ora from 'ora';\nimport spinners from 'cli-spinners';\nimport chalk from 'chalk';\nimport {\n  Telemetry,\n  CodedError,\n  CodedErrors,\n  CodedErrorType,\n} from '@react-native-windows/telemetry';\n\nfunction setSpinnerText(spinner: ora.Ora, prefix: string, text: string) {\n  text = prefix + spinnerString(text);\n  spinner.text = text.length > 45 ? text.slice(0, 110) + '...' : text;\n}\n\nfunction spinnerString(msg: string) {\n  msg = msg.trim();\n  const lastLineIndex = msg.lastIndexOf('\\n');\n  if (lastLineIndex > 0) {\n    msg = msg.slice(lastLineIndex + 1);\n  }\n  msg = msg.trim();\n  return msg;\n}\n\nexport function newSpinner(text: string) {\n  const options: ora.Options = {\n    text: text,\n    indent: 1,\n\n    // ora turns off emoji rendering by default on windows, since the default terminal\n    // doesn't render them.  Turn them back on when running in the new windows terminal\n    ...(process.env.WT_SESSION && {spinner: spinners.dots}),\n\n    // By default, ora process.stderr as the output stream, however,the VS Code debugger\n    // Uses stdout to match success patterns\n    stream: process.stdout,\n  };\n\n  return ora(options).start();\n}\n\nexport const powershell = `${process.env.SystemRoot}\\\\System32\\\\WindowsPowerShell\\\\v1.0\\\\powershell.exe`;\n\nexport async function runPowerShellScriptFunction(\n  taskDescription: string,\n  script: string | null,\n  funcName: string,\n  verbose: boolean,\n  errorCategory: CodedErrorType,\n) {\n  try {\n    const printException = verbose ? '$_;' : '';\n    const importScript = script ? `Import-Module \"${script}\"; ` : '';\n    await commandWithProgress(\n      newSpinner(taskDescription),\n      taskDescription,\n      powershell,\n      [\n        '-NoProfile',\n        '-ExecutionPolicy',\n        'RemoteSigned',\n        `${importScript}try { ${funcName} -ErrorAction Stop; $lec = $LASTEXITCODE; } catch { $lec = 1; ${printException} }; exit $lec`,\n      ],\n      verbose,\n      errorCategory,\n    );\n  } catch {\n    // The error output from the process will be shown if verbose is set.\n    // We don't capture the process output if verbose is set, but at least we have the task name in text, so throw that.\n    throw new CodedError(errorCategory, taskDescription);\n  }\n}\n\nexport function commandWithProgress(\n  spinner: ora.Ora,\n  taskDoingName: string,\n  command: string,\n  args: string[],\n  verbose: boolean,\n  errorCategory: CodedErrorType,\n) {\n  return new Promise<void>((resolve, reject) => {\n    const spawnOptions: SpawnOptions = verbose ? {stdio: 'inherit'} : {};\n\n    if (verbose) {\n      spinner.stop();\n    }\n\n    const cp = spawn(command, args, spawnOptions);\n    let firstErrorLine: string | null = null;\n    if (!verbose) {\n      cp.stdout!.on('data', chunk => {\n        const text = chunk.toString();\n        setSpinnerText(spinner, taskDoingName + ': ', text);\n      });\n      cp.stderr!.on('data', chunk => {\n        const text: string = chunk.toString();\n        if (!firstErrorLine) {\n          firstErrorLine = text;\n        }\n        if (text) {\n          setSpinnerText(spinner, taskDoingName + ': ERROR: ', firstErrorLine);\n        }\n        reject(\n          new CodedError(errorCategory, firstErrorLine, {\n            taskName: taskDoingName,\n          }),\n        );\n      });\n    }\n    cp.on('error', e => {\n      if (verbose) {\n        console.error(chalk.red(e.toString()));\n      }\n      spinner.fail(e.toString());\n      const ce = new CodedError(errorCategory, e.message);\n      ce.stack = e.stack;\n      reject(ce);\n    }).on('close', code => {\n      if (code === 0) {\n        spinner.succeed(taskDoingName);\n        resolve();\n      } else {\n        spinner.fail();\n        reject(\n          new CodedError(\n            errorCategory,\n            `${taskDoingName} - exit error code ${code}`,\n            {\n              taskName: taskDoingName,\n              taskExitCode: code,\n            },\n          ),\n        );\n      }\n    });\n  });\n}\n\nexport function newError(text: string) {\n  newSpinner(text).fail(text);\n}\n\nexport function newWarn(text: string) {\n  newSpinner(text).warn(text);\n}\n\nexport function newSuccess(text: string) {\n  newSpinner(text).succeed(text);\n}\n\nexport function newInfo(text: string) {\n  newSpinner(text).info(text);\n}\n\n/**\n * Sets the process exit code and offers some information at the end of a CLI command.\n * @param loggingIsEnabled Is verbose logging enabled.\n * @param error The error caught during the process, if any.\n */\nexport function setExitProcessWithError(\n  loggingIsEnabled?: boolean,\n  error?: Error,\n): void {\n  if (error) {\n    const errorType =\n      error instanceof CodedError ? (error as CodedError).type : 'Unknown';\n\n    process.exitCode = CodedErrors[errorType];\n\n    if (loggingIsEnabled) {\n      console.log(\n        `Command failed with error ${chalk.bold(errorType)}: ${error.message}`,\n      );\n      if (Telemetry.isEnabled()) {\n        console.log(\n          `Your telemetry sessionId was ${chalk.bold(\n            Telemetry.getSessionId(),\n          )}`,\n        );\n      }\n    } else {\n      console.log(\n        `Command failed. Re-run the command with ${chalk.bold(\n          '--logging',\n        )} for more information.`,\n      );\n    }\n  }\n}\n"]}

package/lib-commonjs/{runWindows/utils → utils}/deploy.d.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  * @format
  */
-import { BuildConfig, RunWindowsOptions } from '../runWindowsOptions';
+import { BuildConfig, RunWindowsOptions } from '../commands/runWindows/runWindowsOptions';
 import MSBuildTools from './msbuildtools';
 import { Config } from '@react-native-community/cli-types';
 export declare function getBuildConfiguration(options: RunWindowsOptions): BuildConfig;
-export declare function deployToDevice(options: RunWindowsOptions, verbose: boolean): Promise<void>;
+export declare function deployToDevice(options: RunWindowsOptions, verbose: boolean, config: Config): Promise<void>;
 export declare function deployToDesktop(options: RunWindowsOptions, verbose: boolean, config: Config, buildTools: MSBuildTools): Promise<void>;
 export declare function startServerInNewWindow(options: RunWindowsOptions, verbose: boolean): Promise<void>;