fix: update cli package name from @microsoft/teamsfx-cli to @microsoft/teamsapp-cli (#10324)

* fix: rename cli package name

* test: ut

Author: jayzhang

.github/workflows/e2e-test.yml

@@ -177,7 +177,7 @@ jobs:
       - name: Update CLI and legacy-peer-deps for PR cases
         if: ${{  github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name == 'teamsfx-bot/TeamsFx'  }}
         run: |
-          npm install -g @microsoft/teamsfx-cli@latest
+          npm install -g @microsoft/teamsapp-cli@latest
           npm config set legacy-peer-deps false
 
       - name: print system info

README.md

@@ -25,7 +25,7 @@ Pick your preferred tool to get started:
 
 - For JavaScript and TypeScript developers, install [Teams Toolkit for Visual Studio Code](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals#install-teams-toolkit-for-visual-studio-code).
 - For .NET developers, install [Teams Toolkit for Visual Studio](https://docs.microsoft.com/microsoftteams/platform/toolkit/visual-studio-overview#install-teams-toolkit-for-visual-studio).
-- For command line users, install [Teams Toolkit CLI](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-cli#get-started): `npm install -g @microsoft/teamsfx-cli`
+- For command line users, install [Teams Toolkit CLI](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-cli#get-started): `npm install -g @microsoft/teamsapp-cli`
 
 Visit [Microsoft Teams developer documentation](https://aka.ms/teamsfx-docs) to get started with building apps with Teams Toolkit today.
 

docs/cicd/README.md

@@ -207,9 +207,9 @@ You can follow the pre-defined example bash scripts to build and customize CI/CD
 * [CD Scripts](https://github.com/OfficeDev/TeamsFx/blob/main/docs/cicd/others-script-cd-template.sh)
 The scripts are pretty straightforward and most parts of them are cross-platform CLI, so it's easy to transform them to other types of script, for example, powershell.
 
-The scripts are based on a cross-platform TeamsFx command line tool [TeamsFx-CLI](https://www.npmjs.com/package/@microsoft/teamsfx-cli). You can install it with `npm install -g @microsoft/teamsfx-cli` and follow the [documentation](https://github.com/OfficeDev/TeamsFx/blob/dev/docs/cli/user-manual.md) to customize the scripts.
+The scripts are based on a cross-platform TeamsFx command line tool [TeamsFx-CLI](https://www.npmjs.com/package/@microsoft/teamsapp-cli). You can install it with `npm install -g @microsoft/teamsapp-cli` and follow the [documentation](https://github.com/OfficeDev/TeamsFx/blob/dev/docs/cli/user-manual.md) to customize the scripts.
 
-> Note: To enable `@microsoft/teamsfx-cli` running in CI mode, turn on `CI_ENABLED` by `export CI_ENABLED=true`. In CI mode, `@microsoft/teamsfx-cli` is friendly for CI/CD.
+> Note: To enable `@microsoft/teamsapp-cli` running in CI mode, turn on `CI_ENABLED` by `export CI_ENABLED=true`. In CI mode, `@microsoft/teamsapp-cli` is friendly for CI/CD.
 
 Please keep in mind that you need to set Azure and M365 credentials in your environment variables safely. For example if you are using Github as your source code repository, you can use the [Github Secrets](https://docs.github.com/en/actions/reference/encrypted-secrets) to securely store your environment variables.
 

docs/cicd_insider/README.md

@@ -198,15 +198,15 @@ You can follow the pre-defined example bash scripts to build and customize CI/CD
 * [CD Scripts](https://github.com/OfficeDev/TeamsFx/blob/main/docs/cicd_insider/others-script-cd-template.sh)
 The scripts are pretty straightforward and most parts of them are cross-platform CLI, so it's easy to transform them to other types of script, for example, powershell.
 
-The scripts are based on a cross-platform TeamsFx command line tool [TeamsFx-CLI](https://www.npmjs.com/package/@microsoft/teamsfx-cli). You can install it with `npm install -g @microsoft/teamsfx-cli` and follow the [documentation](https://github.com/OfficeDev/TeamsFx/blob/dev/docs/cli/user-manual.md) to customize the scripts.
+The scripts are based on a cross-platform TeamsFx command line tool [TeamsFx-CLI](https://www.npmjs.com/package/@microsoft/teamsapp-cli). You can install it with `npm install -g @microsoft/teamsapp-cli` and follow the [documentation](https://github.com/OfficeDev/TeamsFx/blob/dev/docs/cli/user-manual.md) to customize the scripts.
 
 > Note: To enable M365 account login by non-interactive mode, turn on `CI_ENABLED` by `export CI_ENABLED=true`.
 
-> Note: To enable `@microsoft/teamsfx-cli` running in non-interactive mode, set a global config like below:
+> Note: To enable `@microsoft/teamsapp-cli` running in non-interactive mode, set a global option like below:
 ```
-teamsfx config set -g interactive false
+teamsapp xxx --interactive false
 ```
-In non-interactive mode, `@microsoft/teamsfx-cli` will not ask questions for inputs interactively. And, if you'd like to use non-interactive mode by command, please add an option `--interactive false` by command.
+In non-interactive mode, `@microsoft/teamsapp-cli` will not ask questions for inputs interactively. And, if you'd like to use non-interactive mode by command, please add an option `--interactive false` by command.
 
 Please keep in mind that you must store Azure and M365 credentials in your environment variables securely. For example if you are using Github as your source code repository, you can use the [Github Secrets](https://docs.github.com/en/actions/reference/encrypted-secrets) to securely store your credentials.
 

docs/cli/user-manual.md

@@ -3,15 +3,15 @@
 TeamsFx CLI is a text-based command line interface that accelerates Teams application development. It aims you to provide keyboard-centric experience when building Teams applications. It also enables CI/CD scenario where CLI can be easily integrated in scripts for automation.
 
 * [Source code](https://github.com/OfficeDev/TeamsFx/tree/dev/packages/cli) 
-* [Package (NPM)](https://www.npmjs.com/package/@microsoft/teamsfx-cli)
+* [Package (NPM)](https://www.npmjs.com/package/@microsoft/teamsapp-cli)
 
 ## Get Started
 
 Let's start by installing `teamsfx-cli` from `npm` and run `teamsfx -h` to check all available commands:
 
 ```bash
-  npm install -g @microsoft/teamsfx-cli
-  teamsfx -h
+  npm install -g @microsoft/teamsapp-cli
+  teamsapp -h
 ```
 
 ## Supported Commands

packages/cli/README.md

@@ -7,7 +7,7 @@ TeamsFx CLI a text-based command line interface that can help scaffold, validate
 Let's start by installing `teamsfx-cli` from NPM and run `teamsfx -h` to check all available commands:
 
 ```powershell
-$ npm install -g @microsoft/teamsfx-cli
+$ npm install -g @microsoft/teamsapp-cli
 $ teamsfx -h
 ```
 

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@microsoft/teamsfx-cli",
-  "version": "2.0.2",
+  "name": "@microsoft/teamsapp-cli",
+  "version": "3.0.0-alpha",
   "author": "Microsoft Corporation",
   "description": "",
   "license": "MIT",
@@ -18,8 +18,6 @@
     "package": "rimraf lib && node --max-old-space-size=4096 node_modules/webpack/bin/webpack.js --mode production --config ./webpack.config.js",
     "prepack": "npm run package",
     "test:unit": "nyc --no-clean mocha \"tests/unit/**/*.tests.ts\" ",
-    "test:ui": "nyc --no-clean mocha \"tests/unit/ui.tests.ts\" ",
-    "test:ui2": "nyc --no-clean mocha \"tests/unit/ui2.tests.ts\" ",
     "test:helper": "nyc --no-clean mocha \"tests/unit/helper.tests.ts\" ",
     "test:engine": "nyc --no-clean mocha \"tests/unit/engine.tests.ts\" ",
     "test:cmds": "nyc --no-clean mocha \"tests/unit/cmds/**/*.tests.ts\" ",
@@ -36,7 +34,9 @@
   },
   "keywords": [
     "teamsfx",
-    "teamsfx-cli"
+    "teamsfx-cli",
+    "teamsapp-cli",
+    "teamsapp"
   ],
   "preferGlobal": true,
   "bin": {
@@ -139,4 +139,4 @@
       "npx eslint --cache --fix --quiet"
     ]
   }
-}
+}

packages/cli/tests/unit/utils.tests.ts

@@ -216,7 +216,7 @@ projectId: 00000000-0000-0000-0000-000000000000`;
               configuration: "",
               gifPath: "",
               suggested: false,
-              minimumCliVersion: "2.1.0",
+              minimumCliVersion: "3.1.0",
             },
           ],
         };

packages/fx-core/resource/package.nls.json

@@ -34,7 +34,7 @@
   "core.migrationV3.manifestInvalid": "templates/appPackage/manifest.template.json is invalid.",
   "core.migrationV3.abandonedProject": "This project is only for previewing and will not be supported by Teams Toolkit. Please try Teams Toolkit by creating a new project",
   "core.migrationV3.notAllowedMigration": "Teams Toolkit's Pre-Release version supports new project configuration and is incompatible with previous versions. Try it by creating a new project or run \"teamsfx upgrade\" to upgrade your project first.",
-  "core.projectVersionChecker.cliUseNewVersion": "Your TeamFx CLI version is old and it doesn't support current project, please upgrade to the latest version using command below:\nnpm install -g @microsoft/teamsfx-cli@latest",
+  "core.projectVersionChecker.cliUseNewVersion": "Your TeamFx CLI version is old and it doesn't support current project, please upgrade to the latest version using command below:\nnpm install -g @microsoft/teamsapp-cli@latest",
   "core.projectVersionChecker.incompatibleProject": "The current project is incompatible with the installed version of Teams Toolkit.",
   "core.projectVersionChecker.vs.incompatibleProject": "The project in the solution is created with Teams Toolkit preview feature - Teams App Configuration Improvements. You can turn on the preview feature to continue.",
   "core.deployArmTemplates.ActionSuccess": "Successfully deployed ARM templates. Resource group name: %s. Deployment name: %s",

packages/tests/README.md

@@ -13,7 +13,7 @@ A UI Test Project based on [Vscode Extension Tester](https://github.com/redhat-d
 
 ### Setup
 
-- (**Required**) Run `npm install @microsoft/teamsfx-cli@alpha` to download latest CLI
+- (**Required**) Run `npm install @microsoft/teamsapp-cli@alpha` to download latest CLI
 - (**Required**) Run `pnpm install`
 - (**Required**) Run `npm run build`
 - (**Required**) Login your m365 account via TeamsFx extension

packages/tests/package.json

@@ -70,7 +70,7 @@
     "@azure/identity": "^3.1.3",
     "@azure/msal-node": "1.17.3",
     "@microsoft/teamsfx-api": "^0.22.5",
-    "@microsoft/teamsfx-cli": "^2.0.2",
+    "@microsoft/teamsapp-cli": "^3.0.0-alpha",
     "@types/semver": "^7.3.8",
     "axios": "^0.21.1",
     "azure-arm-resource": "^7.4.0",

packages/tests/src/commonlib/aadManager.ts

@@ -7,7 +7,7 @@ import axios, { AxiosInstance } from "axios";
 
 import { M365TokenProvider } from "@microsoft/teamsfx-api";
 
-import MockM365TokenProvider from "@microsoft/teamsfx-cli/src/commonlib/m365LoginUserPassword";
+import MockM365TokenProvider from "@microsoft/teamsapp-cli/src/commonlib/m365LoginUserPassword";
 import { GraphScopes } from "@microsoft/teamsfx-core/build/common/tools";
 
 interface IAadAppInfo {

packages/tests/src/commonlib/aadValidate.ts

@@ -8,7 +8,7 @@ import axios from "axios";
 
 import { M365TokenProvider } from "@microsoft/teamsfx-api";
 
-import MockM365TokenProvider from "@microsoft/teamsfx-cli/src/commonlib/m365LoginUserPassword";
+import MockM365TokenProvider from "@microsoft/teamsapp-cli/src/commonlib/m365LoginUserPassword";
 import {
   IAADDefinition,
   IAadObject,

packages/tests/src/commonlib/appStudioValidator.ts

@@ -4,7 +4,7 @@
 import axios, { AxiosInstance } from "axios";
 import * as chai from "chai";
 
-import MockM365TokenProvider from "@microsoft/teamsfx-cli/src/commonlib/m365LoginUserPassword";
+import MockM365TokenProvider from "@microsoft/teamsapp-cli/src/commonlib/m365LoginUserPassword";
 import { M365TokenProvider } from "@microsoft/teamsfx-api";
 import { IAppStudioObject } from "./interfaces/IAADDefinition";
 import { AppStudioScopes } from "@microsoft/teamsfx-core/build/common/tools";

packages/tests/src/commonlib/azureHelper.ts

@@ -3,7 +3,7 @@
 
 import { ResourceGroup, ResourceManagementClient } from "@azure/arm-resources";
 import { UsernamePasswordCredential } from "@azure/identity";
-import * as azureConfig from "@microsoft/teamsfx-cli/src/commonlib/common/userPasswordConfig";
+import * as azureConfig from "@microsoft/teamsapp-cli/src/commonlib/common/userPasswordConfig";
 import { strings } from "../utils/constants";
 
 const tenantId = azureConfig.AZURE_TENANT_ID || "";

packages/tests/src/commonlib/botValidator.ts

@@ -7,7 +7,7 @@ import * as chai from "chai";
 import * as fs from "fs";
 import * as path from "path";
 
-import MockAzureAccountProvider from "@microsoft/teamsfx-cli/src/commonlib/azureLoginUserPassword";
+import MockAzureAccountProvider from "@microsoft/teamsapp-cli/src/commonlib/azureLoginUserPassword";
 import { getActivePluginsFromProjectSetting } from "../e2e/commonUtils";
 import { EnvConstants, PluginId, StateConfigKey } from "./constants";
 

packages/tests/src/commonlib/frontendValidator.ts

@@ -6,7 +6,7 @@ import axios from "axios";
 import * as chai from "chai";
 import * as fs from "fs";
 import path from "path";
-import MockAzureAccountProvider from "@microsoft/teamsfx-cli/src/commonlib/azureLoginUserPassword";
+import MockAzureAccountProvider from "@microsoft/teamsapp-cli/src/commonlib/azureLoginUserPassword";
 import {
   getResourceGroupNameFromResourceId,
   getSubscriptionIdFromResourceId,

packages/tests/src/commonlib/functionValidator.ts

@@ -6,7 +6,7 @@ import axios from "axios";
 import * as chai from "chai";
 import glob from "glob";
 import path from "path";
-import MockAzureAccountProvider from "@microsoft/teamsfx-cli/src/commonlib/azureLoginUserPassword";
+import MockAzureAccountProvider from "@microsoft/teamsapp-cli/src/commonlib/azureLoginUserPassword";
 import { StateConfigKey, PluginId, EnvConstants } from "./constants";
 import {
   getSubscriptionIdFromResourceId,

packages/tests/src/commonlib/index.ts

@@ -3,7 +3,7 @@
 
 "use strict";
 
-export * as cfg from "@microsoft/teamsfx-cli/src/commonlib/common/userPasswordConfig";
+export * as cfg from "@microsoft/teamsapp-cli/src/commonlib/common/userPasswordConfig";
 export * from "./aadValidate";
 export * from "./simpleAuthValidator";
 export * from "./aadManager";

packages/tests/src/commonlib/keyVaultValidator.ts

@@ -6,7 +6,7 @@ import axios from "axios";
 import * as chai from "chai";
 import MockAzureAccountProvider, {
   AzureAccountProviderUserPassword,
-} from "@microsoft/teamsfx-cli/src/commonlib/azureLoginUserPassword";
+} from "@microsoft/teamsapp-cli/src/commonlib/azureLoginUserPassword";
 import {
   getActivePluginsFromProjectSetting,
   getAzureAccountObjectId,

packages/tests/src/commonlib/m365TitleHelper.ts

@@ -3,7 +3,7 @@
 
 import { M365TokenProvider } from "@microsoft/teamsfx-api";
 import axios, { AxiosInstance } from "axios";
-import MockM365TokenProvider from "@microsoft/teamsfx-cli/src/commonlib/m365LoginUserPassword";
+import MockM365TokenProvider from "@microsoft/teamsapp-cli/src/commonlib/m365LoginUserPassword";
 
 const sideloadingServiceEndpoint =
   process.env.SIDELOADING_SERVICE_ENDPOINT ??

packages/tests/src/commonlib/resourceGroupManager.ts

@@ -6,7 +6,7 @@
 import { UsernamePasswordCredential } from "@azure/identity";
 import { ResourceManagementClient } from "@azure/arm-resources";
 
-import * as azureConfig from "@microsoft/teamsfx-cli/src/commonlib/common/userPasswordConfig";
+import * as azureConfig from "@microsoft/teamsapp-cli/src/commonlib/common/userPasswordConfig";
 
 const tenantId = azureConfig.AZURE_TENANT_ID || "";
 const clientId = azureConfig.client_id;

packages/tests/src/commonlib/sharepointValidator.ts

@@ -4,7 +4,7 @@
 import axios, { AxiosInstance } from "axios";
 import * as chai from "chai";
 
-import MockM365TokenProvider from "@microsoft/teamsfx-cli/src/commonlib/m365LoginUserPassword";
+import MockM365TokenProvider from "@microsoft/teamsapp-cli/src/commonlib/m365LoginUserPassword";
 import { M365TokenProvider } from "@microsoft/teamsfx-api";
 import {
   getSPFxTenant,

packages/tests/src/commonlib/simpleAuthValidator.ts

@@ -3,7 +3,7 @@
 
 import { AzureScopes } from "@microsoft/teamsfx-core/build/common/tools";
 import * as chai from "chai";
-import MockAzureAccountProvider from "@microsoft/teamsfx-cli/src/commonlib/azureLoginUserPassword";
+import MockAzureAccountProvider from "@microsoft/teamsapp-cli/src/commonlib/azureLoginUserPassword";
 import {
   getActivePluginsFromProjectSetting,
   getProvisionParameterValueByKey,

packages/tests/src/commonlib/teamsAppHelper.ts

@@ -4,7 +4,7 @@
 import { M365TokenProvider } from "@microsoft/teamsfx-api";
 import { AppStudioScopes } from "@microsoft/teamsfx-core";
 import axios, { AxiosInstance } from "axios";
-import MockM365TokenProvider from "@microsoft/teamsfx-cli/src/commonlib/m365LoginUserPassword";
+import MockM365TokenProvider from "@microsoft/teamsapp-cli/src/commonlib/m365LoginUserPassword";
 
 function delay(ms: number) {
   // tslint:disable-next-line no-string-based-set-timeout

packages/tests/src/e2e/README.md

@@ -8,7 +8,7 @@
 
    ```bash
    # download test version
-   npm install -g @microsoft/teamsfx-cli@VERSION
+   npm install -g @microsoft/teamsapp-cli@VERSION
    ```
 
 2. Download Teamsfx Project
@@ -150,7 +150,7 @@ import {
 import { AadValidator, BotValidator } from "../../commonlib";
 import { TemplateProject } from "../../commonlib/constants";
 import { CliHelper } from "../../commonlib/cliHelper";
-import m365Login from "@microsoft/teamsfx-cli/src/commonlib/m365Login";
+import m365Login from "@microsoft/teamsapp-cli/src/commonlib/m365Login";
 import { environmentNameManager } from "@microsoft/teamsfx-core";
 
 describe("teamsfx new sample", function () {

packages/tests/src/e2e/caseFactory.ts

@@ -29,7 +29,7 @@ import {
   BotValidator,
   FunctionValidator,
 } from "../commonlib";
-import m365Login from "@microsoft/teamsfx-cli/src/commonlib/m365Login";
+import m365Login from "@microsoft/teamsapp-cli/src/commonlib/m365Login";
 
 export abstract class CaseFactory {
   public capability: Capability;

packages/tests/src/e2e/commonUtils.ts

@@ -19,8 +19,8 @@ import path from "path";
 import { promisify } from "util";
 import { v4 as uuidv4 } from "uuid";
 import { YAMLMap, YAMLSeq, parseDocument } from "yaml";
-import MockAzureAccountProvider from "@microsoft/teamsfx-cli/src/commonlib/azureLoginUserPassword";
-import m365Login from "@microsoft/teamsfx-cli/src/commonlib/m365Login";
+import MockAzureAccountProvider from "@microsoft/teamsapp-cli/src/commonlib/azureLoginUserPassword";
+import m365Login from "@microsoft/teamsapp-cli/src/commonlib/m365Login";
 import {
   AadManager,
   AadValidator,

packages/tests/src/e2e/debug/utility.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import m365Provider from "@microsoft/teamsfx-cli/src/commonlib/m365LoginUserPassword";
+import m365Provider from "@microsoft/teamsapp-cli/src/commonlib/m365LoginUserPassword";
 import { AppStudioScopes, GraphScopes } from "@microsoft/teamsfx-core";
 import axios, { AxiosInstance } from "axios";
 

packages/tests/src/e2e/frontend/BasicTabHappyPath.tests.ts

@@ -27,7 +27,7 @@ import {
   getSiteNameFromResourceId,
   getWebappSettings,
 } from "../../commonlib/utilities";
-import MockAzureAccountProvider from "@microsoft/teamsfx-cli/src/commonlib/azureLoginUserPassword";
+import MockAzureAccountProvider from "@microsoft/teamsapp-cli/src/commonlib/azureLoginUserPassword";
 import axios from "axios";
 
 describe("Basic Tab", function () {

packages/tests/src/e2e/frontend/BlazorAppHappyPath.tests.ts

@@ -13,7 +13,7 @@ import * as chai from "chai";
 import fs from "fs-extra";
 import { describe } from "mocha";
 import path from "path";
-import MockAzureAccountProvider from "@microsoft/teamsfx-cli/src/commonlib/azureLoginUserPassword";
+import MockAzureAccountProvider from "@microsoft/teamsapp-cli/src/commonlib/azureLoginUserPassword";
 import { FrontendWebAppConfig } from "../../commonlib";
 import { CliHelper } from "../../commonlib/cliHelper";
 import { EnvConstants } from "../../commonlib/constants";

packages/tests/src/e2e/frontend/CanDeployToCustomizedRg.tests.ts

@@ -10,7 +10,7 @@ import path from "path";
 import { it } from "@microsoft/extra-shot-mocha";
 import { environmentNameManager } from "@microsoft/teamsfx-core";
 import { describe } from "mocha";
-import M365Login from "@microsoft/teamsfx-cli/src/commonlib/m365Login";
+import M365Login from "@microsoft/teamsapp-cli/src/commonlib/m365Login";
 import { AadValidator, FrontendValidator } from "../../commonlib";
 import { CliHelper } from "../../commonlib/cliHelper";
 import { Capability } from "../../utils/constants";

packages/tests/src/e2e/frontend/TestCreateTab.tests.ts

@@ -12,7 +12,7 @@ import { assert } from "chai";
 import fs from "fs-extra";
 import { describe } from "mocha";
 import path from "path";
-import M365Login from "@microsoft/teamsfx-cli/src/commonlib/m365Login";
+import M365Login from "@microsoft/teamsapp-cli/src/commonlib/m365Login";
 import { AadValidator, FrontendValidator } from "../../commonlib";
 import { CliHelper } from "../../commonlib/cliHelper";
 import { Capability } from "../../utils/constants";

packages/tests/src/e2e/m365/DeployOboTab.tests.ts

@@ -11,7 +11,7 @@ import * as path from "path";
 
 import { it } from "@microsoft/extra-shot-mocha";
 
-import m365Provider from "@microsoft/teamsfx-cli/src/commonlib/m365LoginUserPassword";
+import m365Provider from "@microsoft/teamsapp-cli/src/commonlib/m365LoginUserPassword";
 import { AadValidator } from "../../commonlib/aadValidate";
 import { CliHelper } from "../../commonlib/cliHelper";
 import { Capability } from "../../utils/constants";