@react-native-windows/cli 0.0.0-canary.1 → 0.0.0-canary.102

package/lib-commonjs/runWindows/utils/vstools.js

@@ -4,15 +4,20 @@
  * 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.addProjectToSolution = void 0;
-const fs = require("fs");
-const path = require("path");
-const chalk = require("chalk");
+exports.addProjectToSolution = exports.dotNetCoreProjectTypeGuid = void 0;
+const fs_1 = __importDefault(require("@react-native-windows/fs"));
+const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
+const telemetry_1 = require("@react-native-windows/telemetry");
 const projectTypeGuidsByLanguage = {
     cpp: '{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}',
     cs: '{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}',
 };
+exports.dotNetCoreProjectTypeGuid = '{9A19103F-16F7-4668-BE54-9A1E7A4F7556}';
 /**
  * Checks is the given block of lines exists within an array of lines.
  * @param lines The array of lines to search.
@@ -21,7 +26,7 @@ const projectTypeGuidsByLanguage = {
  */
 function linesContainsBlock(lines, block) {
     if (block.length > 0) {
-        var startIndex = lines.indexOf(block[0]);
+        const startIndex = lines.indexOf(block[0]);
         if (startIndex >= 0) {
             for (let i = 1; i < block.length; i++) {
                 if (lines[startIndex + i] !== block[i]) {
@@ -74,18 +79,25 @@ function getBlockContentsFromLines(lines, startLine, endLine, includeStartEnd =
  * @return Whether any changes were necessary.
  */
 function addProjectToSolution(slnFile, project, verbose = false, checkMode = false) {
+    if (project.projectLang === null) {
+        throw new telemetry_1.CodedError('AddProjectToSolution', 'Unable to add project to solution, projectLang is null');
+    }
+    if (project.projectGuid === null) {
+        throw new telemetry_1.CodedError('AddProjectToSolution', 'Unable to add project to solution, projectGuid is null');
+    }
     if (verbose) {
-        console.log(`Processing ${chalk.bold(path.basename(project.projectFile))}...`);
+        console.log(`Processing ${chalk_1.default.bold(path_1.default.basename(project.projectFile))}...`);
     }
-    let slnLines = fs
-        .readFileSync(slnFile)
-        .toString()
-        .split('\r\n');
+    const originalSlnContents = fs_1.default.readFileSync(slnFile).toString();
+    const isCRLF = originalSlnContents.includes('\r\n');
+    const slnLines = originalSlnContents.split(isCRLF ? '\r\n' : '\n');
     let contentsChanged = false;
     // Check for the project entry block
-    const slnDir = path.dirname(slnFile);
-    const relProjectFile = path.relative(slnDir, project.projectFile);
-    const projectTypeGuid = projectTypeGuidsByLanguage[project.projectLang];
+    const slnDir = path_1.default.dirname(slnFile);
+    const relProjectFile = path_1.default.relative(slnDir, project.projectFile);
+    const projectTypeGuid = 'projectTypeGuid' in project
+        ? project.projectTypeGuid
+        : projectTypeGuidsByLanguage[project.projectLang];
     const projectGuid = project.projectGuid.toUpperCase();
     const projectEntryBlock = [
         `Project("${projectTypeGuid}") = "${project.projectName}", "${relProjectFile}", "${projectGuid}"`,
@@ -93,24 +105,31 @@ function addProjectToSolution(slnFile, project, verbose = false, checkMode = fal
     ];
     if (!linesContainsBlock(slnLines, projectEntryBlock)) {
         if (verbose) {
-            console.log(chalk.yellow('Missing project entry block.'));
+            console.log(chalk_1.default.yellow('Missing project entry block.'));
         }
         const globalIndex = slnLines.indexOf('Global');
         insertBlockIntoLines(slnLines, projectEntryBlock, globalIndex);
         contentsChanged = true;
     }
     // Check for the project configuration platforms
-    const slnConfigs = getBlockContentsFromLines(slnLines, '\tGlobalSection(SolutionConfigurationPlatforms) = preSolution', '\tEndGlobalSection', false).map(line => line.match(/\s+([\w|]+)\s=/)[1]);
-    let projectConfigLines = [];
+    const slnConfigs = getBlockContentsFromLines(slnLines, '\tGlobalSection(SolutionConfigurationPlatforms) = preSolution', '\tEndGlobalSection', false).map(line => line.match(/\s+([\w\s|]+)\s=/)[1]);
+    const projectConfigLines = [];
     slnConfigs.forEach(slnConfig => {
-        projectConfigLines.push(`\t\t${projectGuid}.${slnConfig}.ActiveCfg = ${slnConfig.replace('x86', 'Win32')}`);
-        projectConfigLines.push(`\t\t${projectGuid}.${slnConfig}.Build.0 = ${slnConfig.replace('x86', 'Win32')}`);
+        if (!slnConfig.endsWith('|Any CPU')) {
+            projectConfigLines.push(`\t\t${projectGuid}.${slnConfig}.ActiveCfg = ${project.projectLang === 'cpp'
+                ? slnConfig.replace('x86', 'Win32')
+                : slnConfig}`);
+            projectConfigLines.push(`\t\t${projectGuid}.${slnConfig}.Build.0 = ${project.projectLang === 'cpp'
+                ? slnConfig.replace('x86', 'Win32')
+                : slnConfig}`);
+        }
     });
     const projectConfigStartIndex = slnLines.indexOf('\tGlobalSection(ProjectConfigurationPlatforms) = postSolution');
     projectConfigLines.forEach(projectConfigLine => {
-        if (slnLines.indexOf(projectConfigLine) < 0) {
+        if (!slnLines.includes(projectConfigLine)) {
             if (verbose) {
-                console.log(chalk.yellow('Missing project config block.'));
+                const configLine = projectConfigLine.substr(projectConfigLine.indexOf('= ') + 2);
+                console.log(chalk_1.default.yellow(`Missing ${configLine} config block.`));
             }
             const projectConfigEndIndex = slnLines.indexOf('\tEndGlobalSection', projectConfigStartIndex);
             slnLines.splice(projectConfigEndIndex, 0, projectConfigLine);
@@ -120,14 +139,14 @@ function addProjectToSolution(slnFile, project, verbose = false, checkMode = fal
     // Write out new solution file if there were changes
     if (contentsChanged) {
         if (verbose) {
-            console.log(chalk.yellow(`${chalk.bold(path.basename(slnFile))} needs to be updated.`));
+            console.log(chalk_1.default.yellow(`${chalk_1.default.bold(path_1.default.basename(slnFile))} needs to be updated.`));
         }
         if (!checkMode) {
             if (verbose) {
-                console.log(`Writing changes to ${chalk.bold(path.basename(slnFile))}...`);
+                console.log(`Writing changes to ${chalk_1.default.bold(path_1.default.basename(slnFile))}...`);
             }
-            const slnContents = slnLines.join('\r\n');
-            fs.writeFileSync(slnFile, slnContents, {
+            const slnContents = slnLines.join(isCRLF ? '\r\n' : '\n');
+            fs_1.default.writeFileSync(slnFile, slnContents, {
                 encoding: 'utf8',
                 flag: 'w',
             });
@@ -135,7 +154,7 @@ function addProjectToSolution(slnFile, project, verbose = false, checkMode = fal
     }
     else {
         if (verbose) {
-            console.log(`No changes to ${chalk.bold(path.basename(slnFile))}.`);
+            console.log(`No changes to ${chalk_1.default.bold(path_1.default.basename(slnFile))}.`);
         }
     }
     return contentsChanged;

package/lib-commonjs/runWindows/utils/vstools.js.map

@@ -1 +1 @@
-{"version":3,"file":"vstools.js","sourceRoot":"","sources":["../../../src/runWindows/utils/vstools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vstools.js","sourceRoot":"","sources":["../../../src/runWindows/utils/vstools.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation. All rights reserved.\n * Licensed under the MIT License.\n * @format\n */\n\nimport fs from '@react-native-windows/fs';\nimport path from 'path';\nimport chalk from 'chalk';\nimport {Project} from '../../config/projectConfig';\nimport {CodedError} from '@react-native-windows/telemetry';\n\nconst projectTypeGuidsByLanguage = {\n  cpp: '{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}',\n  cs: '{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}',\n};\n\nexport const dotNetCoreProjectTypeGuid =\n  '{9A19103F-16F7-4668-BE54-9A1E7A4F7556}';\n\n/**\n * Checks is the given block of lines exists within an array of lines.\n * @param lines The array of lines to search.\n * @param block The block of lines to search for.\n * @return True if the block of lines does exist within lines.\n */\nfunction linesContainsBlock(lines: string[], block: string[]): boolean {\n  if (block.length > 0) {\n    const startIndex = lines.indexOf(block[0]);\n\n    if (startIndex >= 0) {\n      for (let i = 1; i < block.length; i++) {\n        if (lines[startIndex + i] !== block[i]) {\n          return false;\n        }\n      }\n      return true;\n    }\n  }\n\n  return false;\n}\n\n/**\n * Insert the given block of lines into an array of lines.\n * @param lines The array of lines to insert into.\n * @param block The block of lines to insert.\n * @param index The index to perform the insert.\n */\nfunction insertBlockIntoLines(lines: string[], block: string[], index: number) {\n  for (let i = 0; i < block.length; i++) {\n    lines.splice(index + i, 0, block[i]);\n  }\n}\n\n/**\n * Search through an array of lines for a block of lines starting with startLine and ending with endLine.\n * @param lines The array of lines to search.\n * @param startLine The first line of the block.\n * @param endLine The last line of the block.\n * @param includeStartEnd Include the start and end lines in the result.\n * @return The found block of lines, if found.\n */\nfunction getBlockContentsFromLines(\n  lines: string[],\n  startLine: string,\n  endLine: string,\n  includeStartEnd: boolean = true,\n): string[] {\n  const startIndex = lines.indexOf(startLine);\n  const endIndex = lines.indexOf(endLine, startIndex);\n\n  if (startIndex >= 0 && startIndex < endIndex) {\n    if (includeStartEnd) {\n      return lines.slice(startIndex, endIndex + 1);\n    } else if (startIndex + 1 < endIndex) {\n      return lines.slice(startIndex + 1, endIndex);\n    }\n  }\n\n  return [];\n}\n\n/**\n * Adds the necessary info from a VS project into a VS solution file so that it will build.\n * @param slnFile The Absolute path to the target VS solution file.\n * @param project The object representing the project info.\n * @param verbose If true, enable verbose logging.\n * @param checkMode It true, don't make any changes.\n * @return Whether any changes were necessary.\n */\nexport function addProjectToSolution(\n  slnFile: string,\n  project: Project,\n  verbose: boolean = false,\n  checkMode: boolean = false,\n): boolean {\n  if (project.projectLang === null) {\n    throw new CodedError(\n      'AddProjectToSolution',\n      'Unable to add project to solution, projectLang is null',\n    );\n  }\n\n  if (project.projectGuid === null) {\n    throw new CodedError(\n      'AddProjectToSolution',\n      'Unable to add project to solution, projectGuid is null',\n    );\n  }\n\n  if (verbose) {\n    console.log(\n      `Processing ${chalk.bold(path.basename(project.projectFile))}...`,\n    );\n  }\n\n  const originalSlnContents = fs.readFileSync(slnFile).toString();\n\n  const isCRLF = originalSlnContents.includes('\\r\\n');\n\n  const slnLines = originalSlnContents.split(isCRLF ? '\\r\\n' : '\\n');\n\n  let contentsChanged = false;\n\n  // Check for the project entry block\n\n  const slnDir = path.dirname(slnFile);\n  const relProjectFile = path.relative(slnDir, project.projectFile);\n\n  const projectTypeGuid =\n    'projectTypeGuid' in project\n      ? project.projectTypeGuid!\n      : projectTypeGuidsByLanguage[project.projectLang];\n\n  const projectGuid = project.projectGuid.toUpperCase();\n\n  const projectEntryBlock = [\n    `Project(\"${projectTypeGuid}\") = \"${project.projectName}\", \"${relProjectFile}\", \"${projectGuid}\"`,\n    'EndProject',\n  ];\n\n  if (!linesContainsBlock(slnLines, projectEntryBlock)) {\n    if (verbose) {\n      console.log(chalk.yellow('Missing project entry block.'));\n    }\n\n    const globalIndex = slnLines.indexOf('Global');\n    insertBlockIntoLines(slnLines, projectEntryBlock, globalIndex);\n    contentsChanged = true;\n  }\n\n  // Check for the project configuration platforms\n\n  const slnConfigs = getBlockContentsFromLines(\n    slnLines,\n    '\\tGlobalSection(SolutionConfigurationPlatforms) = preSolution',\n    '\\tEndGlobalSection',\n    false,\n  ).map(line => line.match(/\\s+([\\w\\s|]+)\\s=/)![1]);\n\n  const projectConfigLines: string[] = [];\n\n  slnConfigs.forEach(slnConfig => {\n    if (!slnConfig.endsWith('|Any CPU')) {\n      projectConfigLines.push(\n        `\\t\\t${projectGuid}.${slnConfig}.ActiveCfg = ${\n          project.projectLang === 'cpp'\n            ? slnConfig.replace('x86', 'Win32')\n            : slnConfig\n        }`,\n      );\n      projectConfigLines.push(\n        `\\t\\t${projectGuid}.${slnConfig}.Build.0 = ${\n          project.projectLang === 'cpp'\n            ? slnConfig.replace('x86', 'Win32')\n            : slnConfig\n        }`,\n      );\n    }\n  });\n\n  const projectConfigStartIndex = slnLines.indexOf(\n    '\\tGlobalSection(ProjectConfigurationPlatforms) = postSolution',\n  );\n\n  projectConfigLines.forEach(projectConfigLine => {\n    if (!slnLines.includes(projectConfigLine)) {\n      if (verbose) {\n        const configLine = projectConfigLine.substr(\n          projectConfigLine.indexOf('= ') + 2,\n        );\n        console.log(chalk.yellow(`Missing ${configLine} config block.`));\n      }\n\n      const projectConfigEndIndex = slnLines.indexOf(\n        '\\tEndGlobalSection',\n        projectConfigStartIndex,\n      );\n\n      slnLines.splice(projectConfigEndIndex, 0, projectConfigLine);\n      contentsChanged = true;\n    }\n  });\n\n  // Write out new solution file if there were changes\n  if (contentsChanged) {\n    if (verbose) {\n      console.log(\n        chalk.yellow(\n          `${chalk.bold(path.basename(slnFile))} needs to be updated.`,\n        ),\n      );\n    }\n\n    if (!checkMode) {\n      if (verbose) {\n        console.log(\n          `Writing changes to ${chalk.bold(path.basename(slnFile))}...`,\n        );\n      }\n\n      const slnContents = slnLines.join(isCRLF ? '\\r\\n' : '\\n');\n      fs.writeFileSync(slnFile, slnContents, {\n        encoding: 'utf8',\n        flag: 'w',\n      });\n    }\n  } else {\n    if (verbose) {\n      console.log(`No changes to ${chalk.bold(path.basename(slnFile))}.`);\n    }\n  }\n\n  return contentsChanged;\n}\n"]}

package/lib-commonjs/runWindows/utils/winappdeploytool.d.ts

@@ -7,13 +7,13 @@ declare class DeviceInfo {
     readonly name: string;
     readonly guid: string;
     readonly ip: string;
-    private index;
-    private type;
+    private readonly index;
+    private readonly type;
     constructor(name: string, guid: string, ip: string, index: number, type: string);
     toString(): string;
 }
 export default class WinAppDeployTool {
-    private path;
+    private readonly path;
     constructor();
     get isAvailable(): boolean;
     findDevice(target: string): DeviceInfo;

package/lib-commonjs/runWindows/utils/winappdeploytool.js

@@ -4,11 +4,15 @@
  * 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 });
-const fs = require("fs");
-const path = require("path");
+const fs_1 = __importDefault(require("@react-native-windows/fs"));
+const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const commandWithProgress_1 = require("./commandWithProgress");
+const telemetry_1 = require("@react-native-windows/telemetry");
 function sortDevices(l, r) {
     return l.toString().length - r.toString().length;
 }
@@ -27,21 +31,20 @@ class DeviceInfo {
 class WinAppDeployTool {
     constructor() {
         const programFilesPath = process.env['ProgramFiles(x86)'] || process.env.ProgramFiles;
-        this.path = path.join(programFilesPath, 'Windows Kits', '10', 'bin', 'x86', 'WinAppDeployCmd.exe');
+        this.path = path_1.default.join(programFilesPath, 'Windows Kits', '10', 'bin', 'x86', 'WinAppDeployCmd.exe');
     }
     get isAvailable() {
-        return fs.existsSync(this.path);
+        return fs_1.default.existsSync(this.path);
     }
     findDevice(target) {
         const devices = this.enumerateDevices();
         if (devices.length === 0) {
-            throw new Error('No devices found');
+            throw new telemetry_1.CodedError('NoDevice', 'No devices found');
         }
         if (target === 'emulator') {
             const sortedList = devices.sort(sortDevices);
-            for (let i = 0; i < sortedList.length; i++) {
-                const sortedItem = sortedList[i];
-                if (sortedItem.toString().indexOf(target) > -1) {
+            for (const sortedItem of sortedList) {
+                if (sortedItem.toString().includes(target)) {
                     return sortedItem;
                 }
             }
@@ -54,7 +57,7 @@ class WinAppDeployTool {
             return candidateList[0];
         }
         else {
-            throw new Error('No devices found');
+            throw new telemetry_1.CodedError('NoDevice', 'No devices found');
         }
     }
     enumerateDevices() {
@@ -63,13 +66,13 @@ class WinAppDeployTool {
         // [(line), '127.0.0.1', '00000015-b21e-0da9-0000-000000000000', 'Lumia 1520 (RM-940)']
         // The expansion is: IP address, spaces, GUID, spaces, text name
         const LINE_TEST = /^([\d\.]+?)\s+([\da-fA-F\-]+?)\s+(.+)$/m; // eslint-disable-line no-useless-escape
-        const result = child_process_1.execSync(`"${this.path}" devices`).toString();
+        const result = (0, child_process_1.execSync)(`"${this.path}" devices`).toString();
         const lines = result.split('\r\n');
         const matchedLines = lines.filter(line => LINE_TEST.test(line));
         const devices = matchedLines.map((line, arrayIndex) => {
             const match = line.match(LINE_TEST);
             if (!match) {
-                throw new Error('Unexpected format of "devices" output');
+                throw new telemetry_1.CodedError('InvalidDevicesOutput', 'Unexpected format of "devices" output');
             }
             const ip = match[1];
             const guid = match[2];
@@ -83,7 +86,7 @@ class WinAppDeployTool {
     async installAppPackage(pathToAppxPackage, targetDevice, shouldLaunch, shouldUpdate, pin, verbose = false) {
         const text = `Installing app to ${targetDevice.name}`;
         if (shouldLaunch) {
-            commandWithProgress_1.newWarn('Cannot launch app with current version of Windows 10 SDK tools.  You will have to launch the app after installation is completed.');
+            (0, commandWithProgress_1.newWarn)('Cannot launch app with current version of Windows 10 SDK tools.  You will have to launch the app after installation is completed.');
         }
         const args = [
             shouldUpdate ? 'update' : 'install',
@@ -95,11 +98,11 @@ class WinAppDeployTool {
         if (pin) {
             args.push('-pin', pin.toString());
         }
-        await commandWithProgress_1.commandWithProgress(commandWithProgress_1.newSpinner(text), text, this.path, args, verbose);
+        await (0, commandWithProgress_1.commandWithProgress)((0, commandWithProgress_1.newSpinner)(text), text, this.path, args, verbose, 'InstallAppToDeviceFailure');
     }
     async uninstallAppPackage(appName, targetDevice, verbose) {
         const text = `Uninstalling app from ${targetDevice.name}`;
-        await commandWithProgress_1.commandWithProgress(commandWithProgress_1.newSpinner(text), text, this.path, `uninstall -package ${appName} -ip {$targetDevice.ip}`.split(' '), verbose);
+        await (0, commandWithProgress_1.commandWithProgress)((0, commandWithProgress_1.newSpinner)(text), text, this.path, `uninstall -package ${appName} -ip {$targetDevice.ip}`.split(' '), verbose, 'UninstallAppOnDeviceFailure');
     }
 }
 exports.default = WinAppDeployTool;

package/lib-commonjs/runWindows/utils/winappdeploytool.js.map

@@ -1 +1 @@
-{"version":3,"file":"winappdeploytool.js","sourceRoot":"","sources":["../../../src/runWindows/utils/winappdeploytool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"winappdeploytool.js","sourceRoot":"","sources":["../../../src/runWindows/utils/winappdeploytool.ts"],"names":[],"mappings":"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","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';\nimport {execSync} from 'child_process';\nimport {newSpinner, commandWithProgress, newWarn} from './commandWithProgress';\nimport {CodedError} from '@react-native-windows/telemetry';\n\nfunction sortDevices(l: DeviceInfo, r: DeviceInfo): number {\n  return l.toString().length - r.toString().length;\n}\n\nclass DeviceInfo {\n  constructor(\n    public readonly name: string,\n    public readonly guid: string,\n    public readonly ip: string,\n\n    private readonly index: number,\n    private readonly type: string,\n  ) {}\n\n  toString() {\n    return `${this.index}. ${this.name} (${this.type})`;\n  }\n}\n\nexport default class WinAppDeployTool {\n  private readonly path: string;\n\n  constructor() {\n    const programFilesPath =\n      process.env['ProgramFiles(x86)'] || process.env.ProgramFiles;\n    this.path = path.join(\n      programFilesPath!,\n      'Windows Kits',\n      '10',\n      'bin',\n      'x86',\n      'WinAppDeployCmd.exe',\n    );\n  }\n\n  get isAvailable() {\n    return fs.existsSync(this.path);\n  }\n\n  findDevice(target: string): DeviceInfo {\n    const devices = this.enumerateDevices();\n\n    if (devices.length === 0) {\n      throw new CodedError('NoDevice', 'No devices found');\n    }\n\n    if (target === 'emulator') {\n      const sortedList = devices.sort(sortDevices);\n      for (const sortedItem of sortedList) {\n        if (sortedItem.toString().includes(target)) {\n          return sortedItem;\n        }\n      }\n    }\n\n    if (target === 'device') {\n      return devices[0];\n    }\n\n    const candidateList = devices.filter(device => device.guid === target);\n\n    if (candidateList.length > 0) {\n      return candidateList[0];\n    } else {\n      throw new CodedError('NoDevice', 'No devices found');\n    }\n  }\n\n  enumerateDevices(): DeviceInfo[] {\n    // 127.0.0.1   00000015-b21e-0da9-0000-000000000000    Lumia 1520 (RM-940)\\r\n    //  maps to\n    // [(line), '127.0.0.1', '00000015-b21e-0da9-0000-000000000000', 'Lumia 1520 (RM-940)']\n    // The expansion is: IP address, spaces, GUID, spaces, text name\n    const LINE_TEST = /^([\\d\\.]+?)\\s+([\\da-fA-F\\-]+?)\\s+(.+)$/m; // eslint-disable-line no-useless-escape\n\n    const result = execSync(`\"${this.path}\" devices`).toString();\n    const lines = result.split('\\r\\n');\n    const matchedLines = lines.filter(line => LINE_TEST.test(line));\n\n    const devices = matchedLines.map((line, arrayIndex) => {\n      const match = line.match(LINE_TEST);\n      if (!match) {\n        throw new CodedError(\n          'InvalidDevicesOutput',\n          'Unexpected format of \"devices\" output',\n        );\n      }\n\n      const ip = match[1];\n      const guid = match[2];\n      const name = match[3];\n      const type = 'device';\n\n      const deviceInfo = new DeviceInfo(name, guid, ip, arrayIndex, type);\n      return deviceInfo;\n    });\n\n    return devices;\n  }\n\n  async installAppPackage(\n    pathToAppxPackage: string,\n    targetDevice: DeviceInfo,\n    shouldLaunch: boolean,\n    shouldUpdate: boolean,\n    pin: boolean,\n    verbose: boolean = false,\n  ) {\n    const text = `Installing app to ${targetDevice.name}`;\n\n    if (shouldLaunch) {\n      newWarn(\n        'Cannot launch app with current version of Windows 10 SDK tools.  You will have to launch the app after installation is completed.',\n      );\n    }\n\n    const args = [\n      shouldUpdate ? 'update' : 'install',\n      '-file',\n      pathToAppxPackage,\n      '-ip',\n      targetDevice.ip,\n    ];\n\n    if (pin) {\n      args.push('-pin', pin.toString());\n    }\n    await commandWithProgress(\n      newSpinner(text),\n      text,\n      this.path,\n      args,\n      verbose,\n      'InstallAppToDeviceFailure',\n    );\n  }\n\n  async uninstallAppPackage(\n    appName: string,\n    targetDevice: DeviceInfo,\n    verbose: boolean,\n  ) {\n    const text = `Uninstalling app from ${targetDevice.name}`;\n    await commandWithProgress(\n      newSpinner(text),\n      text,\n      this.path,\n      `uninstall -package ${appName} -ip {$targetDevice.ip}`.split(' '),\n      verbose,\n      'UninstallAppOnDeviceFailure',\n    );\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-windows/cli",
-  "version": "0.0.0-canary.1",
+  "version": "0.0.0-canary.102",
   "license": "MIT",
   "main": "lib-commonjs/index.js",
   "repository": {
@@ -9,51 +9,63 @@
     "directory": "packages/@react-native-windows/cli"
   },
   "scripts": {
-    "build": "just-scripts build",
-    "clean": "just-scripts clean",
-    "lint": "just-scripts lint",
-    "lint:fix": "just-scripts lint:fix",
-    "watch": "just-scripts watch"
+    "build": "rnw-scripts build",
+    "clean": "rnw-scripts clean",
+    "lint": "rnw-scripts lint",
+    "lint:fix": "rnw-scripts lint:fix",
+    "test": "rnw-scripts test",
+    "watch": "rnw-scripts watch"
   },
   "dependencies": {
-    "chalk": "^3.0.0",
+    "@react-native-windows/fs": "^1.0.0",
+    "@react-native-windows/package-utils": "^0.0.0-canary.23",
+    "@react-native-windows/telemetry": "^0.0.0-canary.27",
+    "@xmldom/xmldom": "^0.7.5",
+    "chalk": "^4.1.0",
     "cli-spinners": "^2.2.0",
     "envinfo": "^7.5.0",
+    "find-up": "^4.1.0",
     "glob": "^7.1.1",
-    "inquirer": "^3.0.6",
+    "lodash": "^4.17.15",
     "mustache": "^4.0.1",
-    "nuget-exe": "4.9.2",
     "ora": "^3.4.0",
-    "semver": "^7.1.3",
-    "shelljs": "^0.7.8",
+    "prompts": "^2.4.1",
+    "semver": "^7.3.2",
+    "shelljs": "^0.8.4",
     "username": "^5.1.0",
     "uuid": "^3.3.2",
-    "xmldom": "^0.3.0",
+    "xml-formatter": "^2.4.0",
     "xml-parser": "^1.2.1",
     "xpath": "^0.0.27"
   },
   "devDependencies": {
-    "@react-native-community/cli-types": "^4.10.1",
-    "@rnw-scripts/eslint-config": "0.0.2",
-    "@rnw-scripts/just-task": "0.0.2",
-    "@rnw-scripts/ts-config": "0.1.0",
+    "@react-native-community/cli-types": "^5.0.1-alpha.0",
+    "@rnw-scripts/eslint-config": "1.1.9",
+    "@rnw-scripts/jest-unittest-config": "1.2.4",
+    "@rnw-scripts/just-task": "2.2.1",
+    "@rnw-scripts/ts-config": "2.0.1",
     "@types/chalk": "^2.2.0",
-    "@types/inquirer": "^6.5.0",
-    "@types/mustache": "^4.0.1",
+    "@types/jest": "^26.0.20",
+    "@types/lodash": "^4.14.168",
+    "@types/mustache": "^4.1.1",
+    "@types/node": "^14.14.22",
     "@types/ora": "^3.2.0",
-    "@types/semver": "^7.3.1",
+    "@types/prompts": "2.0.10",
+    "@types/semver": "^7.3.3",
     "@types/shelljs": "^0.8.8",
-    "@types/uuid": "^8.0.0",
-    "@types/xmldom": "^0.1.29",
+    "@types/uuid": "^8.3.0",
     "@types/xml-parser": "^1.2.29",
-    "eslint": "6.7.0",
-    "just-scripts": "^0.36.1",
-    "typescript": "^3.8.3"
+    "@types/xmldom": "^0.1.30",
+    "babel-jest": "^26.3.0",
+    "eslint": "7.12.0",
+    "jest": "^26.6.3",
+    "just-scripts": "^1.3.3",
+    "prettier": "1.19.1",
+    "typescript": "^4.4.4"
   },
   "files": [
     "lib-commonjs",
-    "powershell",
-    "templates"
+    "powershell"
   ],
   "beachball": {
     "defaultNpmTag": "canary",
@@ -63,5 +75,9 @@
       "patch"
     ]
   },
-  "promoteRelease": true
+  "promoteRelease": true,
+  "windowsOnly": true,
+  "engines": {
+    "node": ">= 12.0.0"
+  }
 }

package/powershell/Add-AppDevPackage.ps1

@@ -107,10 +107,10 @@ function PrintMessageAndExit($ErrorMessage, $ReturnCode)
     {
         # Log telemetry data regarding the use of the script if possible.
         # There are three ways that this can be disabled:
-        #   1. If the "TelemetryDependencies" folder isn't present.  This can be excluded at build time by setting the MSBuild property AppxLogTelemetryFromSideloadingScript to false
+        #   1. If the "TelDeps" folder isn't present.  This can be excluded at build time by setting the MSBuild property AppxLogTelemetryFromSideloadingScript to false
         #   2. If the SkipLoggingTelemetry switch is passed to this script.
         #   3. If Visual Studio telemetry is disabled via the registry.
-        $TelemetryAssembliesFolder = (Join-Path $PSScriptRoot "TelemetryDependencies")
+        $TelemetryAssembliesFolder = (Join-Path $PSScriptRoot "TelDeps")
         if (!$SkipLoggingTelemetry -And (Test-Path $TelemetryAssembliesFolder))
         {
             $job = Start-Job -FilePath (Join-Path $TelemetryAssembliesFolder "LogSideloadingTelemetry.ps1") -ArgumentList $TelemetryAssembliesFolder, "VS/DesignTools/SideLoadingScript/AddAppDevPackage", $ReturnCode, $ProcessorArchitecture

package/powershell/WindowsStoreAppUtils.ps1

@@ -143,7 +143,17 @@ function CheckIfNeedInstallCertificate
     )
 
     $PackagePath = Get-ChildItem (Join-Path $ScriptDir "*.appx") | Where-Object { $_.Mode -NotMatch "d" }
+    if ($PackagePath -eq $null)
+    {
+        $PackagePath = Get-ChildItem (Join-Path $ScriptDir "*.msix") | Where-Object { $_.Mode -NotMatch "d" }
+    }
+
     $BundlePath = Get-ChildItem (Join-Path $ScriptDir "*.appxbundle") | Where-Object { $_.Mode -NotMatch "d" }
+    if ($BundlePath -eq $null)
+    {
+        $BundlePath = Get-ChildItem (Join-Path $ScriptDir "*.msixbundle") | Where-Object { $_.Mode -NotMatch "d" }
+    }
+
     # There must be exactly 1 package/bundle
     if (($PackagePath.Count + $BundlePath.Count) -lt 1)
     {
@@ -254,7 +264,7 @@ function Install-AppDependencies {
     $xml=[xml] (gc $AppxManifestPath);
     $packageNamesToInstall = $xml.Package.Dependencies.PackageDependency | 
         Where-Object { 
-            $installed = Get-AppxPackage $_.Name;
+            $installed = Get-AppxPackage $_.Name | Where-Object -Property Architecture -EQ -Value $Architecture;
             $installed -eq $null -or $installed.Version -lt $_.MinVersion 
         } | 
         % { $_.Name };

package/CHANGELOG.json

@@ -1,20 +0,0 @@
-{
-  "name": "@react-native-windows/cli",
-  "entries": [
-    {
-      "date": "Tue, 28 Jul 2020 05:05:33 GMT",
-      "tag": "@react-native-windows/cli_v0.0.0-canary.1",
-      "version": "0.0.0-canary.1",
-      "comments": {
-        "prerelease": [
-          {
-            "comment": "Separate local-cli into its own package",
-            "author": "ngerlem@microsoft.com",
-            "commit": "fbb4352a015533ebaa77a8d3ea497850a0f67c3f",
-            "package": "@react-native-windows/cli"
-          }
-        ]
-      }
-    }
-  ]
-}

package/CHANGELOG.md

@@ -1,13 +0,0 @@
-# Change Log - @react-native-windows/cli
-
-This log was last generated on Tue, 28 Jul 2020 05:05:33 GMT and should not be manually modified.
-
-<!-- Start content -->
-
-## 0.0.0-canary.1
-
-Tue, 28 Jul 2020 05:05:33 GMT
-
-### Changes
-
-- Separate local-cli into its own package (ngerlem@microsoft.com)

package/templates/_gitignore

@@ -1,92 +0,0 @@
-*AppPackages*
-*BundleArtifacts*
-
-#OS junk files
-[Tt]humbs.db
-*.DS_Store
-
-#Visual Studio files
-*.[Oo]bj
-*.user
-*.aps
-*.pch
-*.vspscc
-*.vssscc
-*_i.c
-*_p.c
-*.ncb
-*.suo
-*.tlb
-*.tlh
-*.bak
-*.[Cc]ache
-*.ilk
-*.log
-*.lib
-*.sbr
-*.sdf
-*.opensdf
-*.opendb
-*.unsuccessfulbuild
-ipch/
-[Oo]bj/
-[Bb]in
-[Dd]ebug*/
-[Rr]elease*/
-Ankh.NoLoad
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-#MonoDevelop
-*.pidb
-*.userprefs
-
-#Tooling
-_ReSharper*/
-*.resharper
-[Tt]est[Rr]esult*
-*.sass-cache
-
-#Project files
-[Bb]uild/
-
-#Subversion files
-.svn
-
-# Office Temp Files
-~$*
-
-# vim Temp Files
-*~
-
-#NuGet
-packages/
-*.nupkg
-
-#ncrunch
-*ncrunch*
-*crunch*.local.xml
-
-# visual studio database projects
-*.dbmdl
-
-#Test files
-*.testsettings
-
-#Other files
-*.DotSettings
-.vs/
-*project.lock.json
-
-#Files generated by the VS build
-**/Generated Files/**
-

package/templates/b_gitignore

@@ -1 +0,0 @@
-/Bundle