npm - @microsoft/teamsfx-core - Versions diffs - 1.16.1 → 1.16.3-alpha.311dfaffe.0 - Mend

@microsoft/teamsfx-core 1.16.1 → 1.16.3-alpha.311dfaffe.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (758) hide show

package/build/core/generateAadManifestTemplate.js CHANGED Viewed

@@ -5,21 +5,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateAadManifestTemplate = void 0;
 const tslib_1 = require("tslib");
 const folder_1 = require("../folder");
-const constants_1 = require("../plugins/resource/aad/constants");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const os = tslib_1.__importStar(require("os"));
 const tools_1 = require("../common/tools");
-const constants_2 = require("../component/constants");
+const constants_1 = require("../component/constants");
 const workflow_1 = require("../component/workflow");
 const projectSettingsHelper_1 = require("../common/local/projectSettingsHelper");
-const common_1 = require("../common");
+const projectSettingsHelper_2 = require("../common/projectSettingsHelper");
+const constants_2 = require("../component/resource/aadApp/constants");
 async function generateAadManifestTemplate(projectFolder, projectSettings, requiredResourceAccess = undefined, updateCapabilities = false) {
     const templatesFolder = folder_1.getTemplatesFolder();
     const appDir = await tools_1.getAppDirectory(projectFolder);
-    const aadManifestTemplate = `${templatesFolder}/${constants_1.Constants.aadManifestTemplateFolder}/${constants_1.Constants.aadManifestTemplateName}`;
+    const aadManifestTemplate = `${templatesFolder}/${constants_2.Constants.aadManifestTemplateFolder}/${constants_2.Constants.aadManifestTemplateName}`;
     await fs.ensureDir(appDir);
-    const isVs = common_1.isVSProject(projectSettings);
-    const aadManifestPath = `${appDir}/${constants_1.Constants.aadManifestTemplateName}`;
+    const isVs = projectSettingsHelper_2.isVSProject(projectSettings);
+    const aadManifestPath = `${appDir}/${constants_2.Constants.aadManifestTemplateName}`;
     let aadJson;
     if (await fs.pathExists(aadManifestPath)) {
         aadJson = await fs.readJSON(aadManifestPath);
@@ -33,9 +33,6 @@ async function generateAadManifestTemplate(projectFolder, projectSettings, requi
     if (requiredResourceAccess) {
         aadJson.requiredResourceAccess = requiredResourceAccess;
     }
-    // if (isV3()) {
-    //   updateRedirectUrlV3(aadJson, projectSettings);
-    // } else {
     const hasTab = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
     if (hasTab) {
         const tabRedirectUrl1 = "{{state.fx-resource-aad-app-for-teams.frontendEndpoint}}/auth-end.html";
@@ -82,16 +79,16 @@ async function generateAadManifestTemplate(projectFolder, projectSettings, requi
             !projectSettings.solutionSettings.capabilities.includes("BotSSO")) {
             projectSettings.solutionSettings.capabilities.push("BotSSO");
         }
-        const tabConfig = workflow_1.getComponent(projectSettings, constants_2.ComponentNames.TeamsTab);
+        const tabConfig = workflow_1.getComponent(projectSettings, constants_1.ComponentNames.TeamsTab);
         if (tabConfig) {
             tabConfig.sso = true;
         }
-        const botConfig = workflow_1.getComponent(projectSettings, constants_2.ComponentNames.TeamsTab);
+        const botConfig = workflow_1.getComponent(projectSettings, constants_1.ComponentNames.TeamsTab);
         if (botConfig) {
             botConfig.sso = true;
         }
     }
-    await fs.writeJSON(`${appDir}/${constants_1.Constants.aadManifestTemplateName}`, aadJson, {
+    await fs.writeJSON(`${appDir}/${constants_2.Constants.aadManifestTemplateName}`, aadJson, {
         spaces: 4,
         EOL: os.EOL,
     });
@@ -101,7 +98,7 @@ function isRedirectUrlExist(replyUrls, url, type) {
     return (replyUrls.filter((item) => item.url === url && item.type === type).length > 0);
 }
 function updateRedirectUrlV3(aadJson, projectSetting) {
-    const teamsTabComponent = workflow_1.getComponent(projectSetting, constants_2.ComponentNames.TeamsTab);
+    const teamsTabComponent = workflow_1.getComponent(projectSetting, constants_1.ComponentNames.TeamsTab);
     if (teamsTabComponent) {
         const tabRedirectUrl1 = "{{state.aad-app.frontendEndpoint}}/auth-end.html";
         if (!isRedirectUrlExist(aadJson.replyUrlsWithType, tabRedirectUrl1, "Web")) {
@@ -125,7 +122,7 @@ function updateRedirectUrlV3(aadJson, projectSetting) {
             });
         }
     }
-    const teamsBotComponent = workflow_1.getComponent(projectSetting, constants_2.ComponentNames.TeamsBot);
+    const teamsBotComponent = workflow_1.getComponent(projectSetting, constants_1.ComponentNames.TeamsBot);
     if (teamsBotComponent) {
         const botRedirectUrl = "{{state.aad-app.botEndpoint}}/auth-end.html";
         if (!isRedirectUrlExist(aadJson.replyUrlsWithType, botRedirectUrl, "Web")) {

package/build/core/generateAadManifestTemplate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generateAadManifestTemplate.js","sourceRoot":"","sources":["../../src/core/generateAadManifestTemplate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,sCAA+C;AAC/C,~~iEAA8D;AAC9D,~~qDAA+B;AAC/B,+CAAyB;~~AAMzB~~,2CAAkD;AAClD,sDAAwD;AACxD,oDAAqD;AACrD,iFAA8E;AAC9E,~~sCAAwC~~;~~AAQjC~~,KAAK,UAAU,2BAA2B,CAC/C,aAAqB,EACrB,eAAoB,EACpB,yBAA+D,SAAS,EACxE,kBAAkB,GAAG,KAAK;IAE1B,MAAM,eAAe,GAAG,2BAAkB,EAAE,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,uBAAe,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,mBAAmB,GAAG,GAAG,eAAe,IAAI,qBAAS,CAAC,yBAAyB,IAAI,qBAAS,CAAC,uBAAuB,EAAE,CAAC;IAC7H,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAE3B,MAAM,IAAI,GAAG,~~oBAAW~~,CAAC,eAAe,CAAC,CAAC;IAE1C,MAAM,eAAe,GAAG,GAAG,MAAM,IAAI,qBAAS,CAAC,uBAAuB,EAAE,CAAC;IAEzE,IAAI,OAAO,CAAC;IAEZ,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;QACxC,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;KAC9C;SAAM;QACL,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;KAClD;IAED,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;QAC9B,OAAO,CAAC,iBAAiB,GAAG,EAAE,CAAC;KAChC;IAED,IAAI,sBAAsB,EAAE;QAC1B,OAAO,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;KACzD;IAED,~~gBAAgB;IAChB,mDAAmD;IACnD,WAAW;IACX,~~MAAM,MAAM,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IACtE,IAAI,MAAM,EAAE;QACV,MAAM,eAAe,GACnB,wEAAwE,CAAC;QAE3E,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE;YAC1E,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC7B,GAAG,EAAE,eAAe;gBACpB,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;SACJ;QAED,MAAM,eAAe,GACnB,kIAAkI,CAAC;QAErI,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE;YAC1E,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC7B,GAAG,EAAE,eAAe;gBACpB,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;SACJ;QAED,MAAM,eAAe,GACnB,8EAA8E,CAAC;QAEjF,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE;YAC1E,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC7B,GAAG,EAAE,eAAe;gBACpB,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;SACJ;KACF;IACD,MAAM,MAAM,GAAG,6CAAqB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACjE,IAAI,MAAM,EAAE;QACV,MAAM,cAAc,GAAG,IAAI;YACzB,CAAC,CAAC,uEAAuE;YACzE,CAAC,CAAC,mEAAmE,CAAC;QAExE,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE;YACzE,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC7B,GAAG,EAAE,cAAc;gBACnB,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;SACJ;KACF;IACD,IAAI;IACJ,IAAI,kBAAkB,EAAE;QACtB,IACE,eAAe,CAAC,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC7D,CAAC,eAAe,CAAC,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACjE;YACA,eAAe,CAAC,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC9D;QACD,IACE,eAAe,CAAC,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC7D,CAAC,eAAe,CAAC,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACjE;YACA,eAAe,CAAC,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC9D;QACD,MAAM,SAAS,GAAG,uBAAY,CAAC,eAAe,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;QACzE,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC;SACtB;QACD,MAAM,SAAS,GAAG,uBAAY,CAAC,eAAe,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;QACzE,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC;SACtB;KACF;IAED,MAAM,EAAE,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI,qBAAS,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE;QAC5E,MAAM,EAAE,CAAC;QACT,GAAG,EAAE,EAAE,CAAC,GAAG;KACZ,CAAC,CAAC;AACL,CAAC;~~AA3GD~~,~~kEA2GC~~;AAED,SAAS,kBAAkB,CAAC,SAA8B,EAAE,GAAW,EAAE,IAAY;IACnF,OAAO,CACL,SAAS,CAAC,MAAM,CAAC,CAAC,IAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CACjG,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAY,EAAE,cAAmB;IAC5D,MAAM,iBAAiB,GAAG,uBAAY,CAAC,cAAc,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;IAChF,IAAI,iBAAiB,EAAE;QACrB,MAAM,eAAe,GAAG,kDAAkD,CAAC;QAE3E,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE;YAC1E,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC7B,GAAG,EAAE,eAAe;gBACpB,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;SACJ;QAED,MAAM,eAAe,GACnB,sFAAsF,CAAC;QAEzF,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE;YAC1E,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC7B,GAAG,EAAE,eAAe;gBACpB,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;SACJ;QAED,MAAM,eAAe,GAAG,wDAAwD,CAAC;QAEjF,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE;YAC1E,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC7B,GAAG,EAAE,eAAe;gBACpB,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;SACJ;KACF;IAED,MAAM,iBAAiB,GAAG,uBAAY,CAAC,cAAc,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;IAChF,IAAI,iBAAiB,EAAE;QACrB,MAAM,cAAc,GAAG,6CAA6C,CAAC;QAErE,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,iBAAiB,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE;YACzE,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC7B,GAAG,EAAE,cAAc;gBACnB,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;SACJ;KACF;AACH,CAAC"}
1	+ {"version":3,"file":"generateAadManifestTemplate.js","sourceRoot":"","sources":["../../src/core/generateAadManifestTemplate.ts"],"names":[],"mappings":"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"}

package/build/core/globalVars.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 import { LogProvider, Stage, Tools } from "@microsoft/teamsfx-api";
-export declare function isV3(): boolean;
 export declare function isVsCallingCli(): boolean;
 export declare let Logger: LogProvider;
 export declare let currentStage: Stage;

package/build/core/globalVars.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"globalVars.d.ts","sourceRoot":"","sources":["../../src/core/globalVars.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAYnE,wBAAgB,~~IAAI,IAAI,OAAO,CAE9B;AAED,wBAAgB,~~cAAc,IAAI,OAAO,CAExC;AAED,eAAO,IAAI,MAAM,EAAE,WAAW,CAAC;AAC/B,eAAO,IAAI,YAAY,EAAE,KAAK,CAAC;AAC/B,eAAO,IAAI,KAAK,EAAE,KAAK,CAAC;AACxB,eAAO,IAAI,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;AACtC,eAAO,MAAM,IAAI,QAAQ,CAAC;AAC1B,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAG3C;AACD,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAE/C;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAElD;AACD,qBAAa,UAAU;IACrB,IAAI,CAAC,EAAE,OAAO,CAAS;IACvB,UAAU,SAAM;IAChB,YAAY,SAAM;CACnB;AACD,eAAO,MAAM,UAAU,YAAmB,CAAC"}
1	+ {"version":3,"file":"globalVars.d.ts","sourceRoot":"","sources":["../../src/core/globalVars.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAYnE,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAED,eAAO,IAAI,MAAM,EAAE,WAAW,CAAC;AAC/B,eAAO,IAAI,YAAY,EAAE,KAAK,CAAC;AAC/B,eAAO,IAAI,KAAK,EAAE,KAAK,CAAC;AACxB,eAAO,IAAI,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;AACtC,eAAO,MAAM,IAAI,QAAQ,CAAC;AAC1B,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAG3C;AACD,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAE/C;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAElD;AACD,qBAAa,UAAU;IACrB,IAAI,CAAC,EAAE,OAAO,CAAS;IACvB,UAAU,SAAM;IAChB,YAAY,SAAM;CACnB;AACD,eAAO,MAAM,UAAU,YAAmB,CAAC"}

package/build/core/globalVars.js CHANGED Viewed

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globalVars = exports.GlobalVars = exports.setCurrentStage = exports.setLocale = exports.setTools = exports.isVS = exports.Locale = exports.TOOLS = exports.currentStage = exports.Logger = exports.isVsCallingCli = exports.isV3 = void 0;
+exports.globalVars = exports.GlobalVars = exports.setCurrentStage = exports.setLocale = exports.setTools = exports.isVS = exports.Locale = exports.TOOLS = exports.currentStage = exports.Logger = exports.isVsCallingCli = void 0;
 const constants_1 = require("../common/constants");
 function featureFlagEnabled(flagName) {
     const flag = process.env[flagName];
@@ -13,10 +13,6 @@ function featureFlagEnabled(flagName) {
         return false;
     }
 }
-function isV3() {
-    return process.env[constants_1.FeatureFlagName.APIV3] === "false" ? false : true;
-}
-exports.isV3 = isV3;
 function isVsCallingCli() {
     return featureFlagEnabled(constants_1.FeatureFlagName.VSCallingCLI);
 }

package/build/core/globalVars.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"globalVars.js","sourceRoot":"","sources":["../../src/core/globalVars.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,mDAAsD;AAEtD,SAAS,kBAAkB,CAAC,QAAgB;IAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE;QACvD,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAgB,~~IAAI;IAClB,OAAO,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AACvE,CAAC;AAFD,oBAEC;AAED,SAAgB,~~cAAc;IAC5B,OAAO,kBAAkB,CAAC,2BAAe,CAAC,YAAY,CAAC,CAAC;AAC1D,CAAC;AAFD,wCAEC;AAMY,QAAA,IAAI,GAAG,KAAK,CAAC;AAC1B,SAAgB,QAAQ,CAAC,KAAY;IACnC,aAAK,GAAG,KAAK,CAAC;IACd,cAAM,GAAG,KAAK,CAAC,WAAW,CAAC;AAC7B,CAAC;AAHD,4BAGC;AACD,SAAgB,SAAS,CAAC,MAAe;IACvC,cAAM,GAAG,MAAM,CAAC;AAClB,CAAC;AAFD,8BAEC;AACD,SAAgB,eAAe,CAAC,KAAY;IAC1C,oBAAY,GAAG,KAAK,CAAC;AACvB,CAAC;AAFD,0CAEC;AACD,MAAa,UAAU;IAAvB;QACE,SAAI,GAAa,KAAK,CAAC;QACvB,eAAU,GAAG,EAAE,CAAC;QAChB,iBAAY,GAAG,EAAE,CAAC;IACpB,CAAC;CAAA;AAJD,gCAIC;AACY,QAAA,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC"}
1	+ {"version":3,"file":"globalVars.js","sourceRoot":"","sources":["../../src/core/globalVars.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,mDAAsD;AAEtD,SAAS,kBAAkB,CAAC,QAAgB;IAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE;QACvD,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAgB,cAAc;IAC5B,OAAO,kBAAkB,CAAC,2BAAe,CAAC,YAAY,CAAC,CAAC;AAC1D,CAAC;AAFD,wCAEC;AAMY,QAAA,IAAI,GAAG,KAAK,CAAC;AAC1B,SAAgB,QAAQ,CAAC,KAAY;IACnC,aAAK,GAAG,KAAK,CAAC;IACd,cAAM,GAAG,KAAK,CAAC,WAAW,CAAC;AAC7B,CAAC;AAHD,4BAGC;AACD,SAAgB,SAAS,CAAC,MAAe;IACvC,cAAM,GAAG,MAAM,CAAC;AAClB,CAAC;AAFD,8BAEC;AACD,SAAgB,eAAe,CAAC,KAAY;IAC1C,oBAAY,GAAG,KAAK,CAAC;AACvB,CAAC;AAFD,0CAEC;AACD,MAAa,UAAU;IAAvB;QACE,SAAI,GAAa,KAAK,CAAC;QACvB,eAAU,GAAG,EAAE,CAAC;QAChB,iBAAY,GAAG,EAAE,CAAC;IACpB,CAAC;CAAA;AAJD,gCAIC;AACY,QAAA,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC"}

package/build/core/index.d.ts CHANGED Viewed

@@ -1,6 +1 @@
-export * from "./downloadSample";
-export * from "./error";
-export * from "./FxCore";
-export * from "./globalVars";
-export * from "./types";
 //# sourceMappingURL=index.d.ts.map

package/build/core/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"~~AAMA,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC~~"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":""}

package/build/core/index.js CHANGED Viewed

@@ -1,14 +1,7 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 // TODO: For package.json,
 // use require instead of import because of core building/packaging method.
 // Using import will cause the build folder structure to change.
 require("../../package.json");
-tslib_1.__exportStar(require("./downloadSample"), exports);
-tslib_1.__exportStar(require("./error"), exports);
-tslib_1.__exportStar(require("./FxCore"), exports);
-tslib_1.__exportStar(require("./globalVars"), exports);
-tslib_1.__exportStar(require("./types"), exports);
 //# sourceMappingURL=index.js.map

package/build/core/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AAAA,uCAAuC~~;;;~~AAEvC,0BAA0B;AAC1B,2EAA2E;AAC3E,gEAAgE;AAChE,OAAO,CAAC,oBAAoB,CAAC,CAAC~~;AAC9B,2DAAiC;AACjC,kDAAwB;AACxB,mDAAyB;AACzB,uDAA6B;AAC7B,kDAAwB~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AAEvC,0BAA0B;AAC1B,2EAA2E;AAC3E,gEAAgE;AAChE,OAAO,CAAC,oBAAoB,CAAC,CAAC"}

package/build/core/middleware/MigrationUtils.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { CoreHookContext } from "../types";
-import { RequiredResourceAccess } from "../../plugins/resource/aad/interfaces/AADManifest";
+import { RequiredResourceAccess } from "../../component/resource/aadApp/interfaces/AADManifest";
 export interface Permission {
     resource: string;
     delegated: string[];

package/build/core/middleware/MigrationUtils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MigrationUtils.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/MigrationUtils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;~~AAG3C~~,OAAO,EAAE,sBAAsB,EAAE,MAAM,~~mDAAmD~~,CAAC;~~AAK3F~~,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,UAAU,EAAE,GACxB,sBAAsB,EAAE,GAAG,SAAS,CAuBtC;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,GAAG,GACvB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CA8CrF"}
1	+ {"version":3,"file":"MigrationUtils.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/MigrationUtils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAEhG,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,UAAU,EAAE,GACxB,sBAAsB,EAAE,GAAG,SAAS,CAuBtC;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,GAAG,GACvB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CA8CrF"}

package/build/core/middleware/MigrationUtils.js CHANGED Viewed

@@ -7,10 +7,10 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const tools_1 = require("../../common/tools");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const plugins_1 = require("../../plugins");
 const localizeUtils_1 = require("../../common/localizeUtils");
 const globalVars_1 = require("../globalVars");
 const generateAadManifestTemplate_1 = require("../generateAadManifestTemplate");
+const constants_1 = require("../../plugins/solution/fx-solution/constants");
 function permissionsToRequiredResourceAccess(permissions) {
     const result = [];
     try {
@@ -68,7 +68,7 @@ async function needMigrateToAadManifest(ctx) {
             return false;
         }
         const projectSettingsJson = await fs_extra_1.default.readJson(path_1.default.join(inputs.projectPath, ".fx", "configs", "projectSettings.json"));
-        const aadPluginIsActive = (_b = (_a = projectSettingsJson.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.includes(plugins_1.PluginNames.AAD);
+        const aadPluginIsActive = (_b = (_a = projectSettingsJson.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.includes(constants_1.PluginNames.AAD);
         if (!aadPluginIsActive) {
             return false;
         }

package/build/core/middleware/MigrationUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MigrationUtils.js","sourceRoot":"","sources":["../../../src/core/middleware/MigrationUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,wDAAwB;AACxB,8CAA0D;AAE1D,gEAA0B;AAC1B,~~2CAA4C;AAE5C,~~8DAAgE;AAChE,8CAAsC;AACtC,gFAA6E;~~AAQ7E~~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~~qBAAW~~,CAAC,GAAG,CAChB,CAAC;QAEF,IAAI,CAAC,iBAAiB,EAAE;YACtB,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AA9CD,4DA8CC"}
1	+ {"version":3,"file":"MigrationUtils.js","sourceRoot":"","sources":["../../../src/core/middleware/MigrationUtils.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/consolidateLocalRemote.js CHANGED Viewed

@@ -20,7 +20,7 @@ const folder_1 = require("../../folder");
 const projectSettingsLoader_1 = require("./projectSettingsLoader");
 const projectMigrator_1 = require("./projectMigrator");
 const util = tslib_1.__importStar(require("util"));
-const constants_1 = require("../../plugins/resource/spfx/utils/constants");
+const constants_1 = require("../../component/resource/spfx/utils/constants");
 const MigrationUtils_1 = require("./MigrationUtils");
 const upgradeButton = "Upgrade";
 const LearnMore = "Learn More";

package/build/core/middleware/consolidateLocalRemote.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/envInfoLoader.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"envInfoLoader.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/envInfoLoader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAIL,OAAO,EACP,MAAM,EACN,IAAI,EAEJ,eAAe,EACf,SAAS,EACT,MAAM,EACN,cAAc,EACd,eAAe,EACf,KAAK,EAIN,MAAM,wBAAwB,CAAC;AAuBhC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;~~AAO3C~~,eAAO,IAAI,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;AAE3C,oBAAY,kBAAkB,GAAG;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,~~CAuDzD~~;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,eAAe,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA4BlC;AAyBD,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,aAAa,CAAC,EAAE,MAAM,EACtB,aAAa,UAAQ,GACpB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAiD3C;AAED,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,cAAc,GAAG,IAAI,EACrC,eAAe,EAAE,eAAe,QAcjC;AAED,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,cAAc,GAAG,IAAI,EACrC,eAAe,EAAE,eAAe,QAejC;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA8BlC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAkCzC;AAED,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAsBlC;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAsBjD"}
1	+ {"version":3,"file":"envInfoLoader.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/envInfoLoader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAIL,OAAO,EACP,MAAM,EACN,IAAI,EAEJ,eAAe,EACf,SAAS,EACT,MAAM,EACN,cAAc,EACd,eAAe,EACf,KAAK,EAIN,MAAM,wBAAwB,CAAC;AAuBhC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,eAAO,IAAI,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;AAE3C,oBAAY,kBAAkB,GAAG;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,CAqDzD;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,eAAe,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA4BlC;AAyBD,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,aAAa,CAAC,EAAE,MAAM,EACtB,aAAa,UAAQ,GACpB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAiD3C;AAED,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,cAAc,GAAG,IAAI,EACrC,eAAe,EAAE,eAAe,QAcjC;AAED,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,cAAc,GAAG,IAAI,EACrC,eAAe,EAAE,eAAe,QAejC;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA8BlC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAkCzC;AAED,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAsBlC;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAsBjD"}

package/build/core/middleware/envInfoLoader.js CHANGED Viewed

@@ -15,7 +15,6 @@ const permissionRequest_1 = require("../permissionRequest");
 const utils4v2_1 = require("../../plugins/resource/utils4v2");
 const tools_1 = require("../../common/tools");
 const constants_2 = require("../../component/constants");
-const constants_3 = require("../../plugins/solution/fx-solution/v3/constants");
 const newTargetEnvNameOption = "+ new environment";
 const lastUsedMark = " (last used)";
 function EnvInfoLoaderMW(skip) {
@@ -54,9 +53,7 @@ function EnvInfoLoaderMW(skip) {
         const state = legacySolutionConfig2EnvState(envInfo.state);
         ctx.envInfoV2 = { envName: envInfo.envName, config: envInfo.config, state };
         // set globalVars for teamsAppId and m365TenantId
-        const appManifestKey = globalVars_1.isV3()
-            ? constants_2.ComponentNames.AppManifest
-            : constants_3.BuiltInFeaturePluginNames.appStudio;
+        const appManifestKey = constants_2.ComponentNames.AppManifest;
         globalVars_1.globalVars.teamsAppId = (_b = (_a = ctx.envInfoV2.state) === null || _a === void 0 ? void 0 : _a[appManifestKey]) === null || _b === void 0 ? void 0 : _b.teamsAppId;
         globalVars_1.globalVars.m365TenantId = (_d = (_c = ctx.envInfoV2.state) === null || _c === void 0 ? void 0 : _c[appManifestKey]) === null || _d === void 0 ? void 0 : _d.m365TenantId;
         await next();

package/build/core/middleware/envInfoLoader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"envInfoLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/envInfoLoader.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"envInfoLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/envInfoLoader.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/envInfoLoaderV3.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"envInfoLoaderV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/envInfoLoaderV3.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAEL,OAAO,EAGP,eAAe,EACf,MAAM,EAEN,EAAE,EACF,EAAE,EACH,MAAM,wBAAwB,CAAC;~~AAehC~~,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,~~CAmD5D~~;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,eAAe,EAAE,eAAe,EAChC,aAAa,CAAC,EAAE,MAAM,EACtB,aAAa,UAAQ,GACpB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAyBxC"}
1	+ {"version":3,"file":"envInfoLoaderV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/envInfoLoaderV3.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAEL,OAAO,EAGP,eAAe,EACf,MAAM,EAEN,EAAE,EACF,EAAE,EACH,MAAM,wBAAwB,CAAC;AAchC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,CAiD5D;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,eAAe,EAAE,eAAe,EAChC,aAAa,CAAC,EAAE,MAAM,EACtB,aAAa,UAAQ,GACpB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAyBxC"}

package/build/core/middleware/envInfoLoaderV3.js CHANGED Viewed

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadEnvInfoV3 = exports.EnvInfoLoaderMW_V3 = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("../../component/constants");
-const constants_2 = require("../../plugins/solution/fx-solution/v3/constants");
 const crypto_1 = require("../crypto");
 const environment_1 = require("../environment");
 const error_1 = require("../error");
@@ -46,9 +45,7 @@ function EnvInfoLoaderMW_V3(skip) {
         envInfoLoader_1.upgradeProgrammingLanguage(ctx.envInfoV3.state, ctx.projectSettings);
         envInfoLoader_1.upgradeDefaultFunctionName(ctx.envInfoV3.state, ctx.projectSettings);
         // set globalVars for teamsAppId and m365TenantId
-        const appManifestKey = globalVars_1.isV3()
-            ? constants_1.ComponentNames.AppManifest
-            : constants_2.BuiltInFeaturePluginNames.appStudio;
+        const appManifestKey = constants_1.ComponentNames.AppManifest;
         globalVars_1.globalVars.teamsAppId = (_b = (_a = ctx.envInfoV3.state) === null || _a === void 0 ? void 0 : _a[appManifestKey]) === null || _b === void 0 ? void 0 : _b.teamsAppId;
         globalVars_1.globalVars.m365TenantId = (_d = (_c = ctx.envInfoV3.state) === null || _c === void 0 ? void 0 : _c[appManifestKey]) === null || _d === void 0 ? void 0 : _d.m365TenantId;
         await next();

package/build/core/middleware/envInfoLoaderV3.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"envInfoLoaderV3.js","sourceRoot":"","sources":["../../../src/core/middleware/envInfoLoaderV3.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wDAUgC;AAChC,yDAA2D;AAC3D~~,+EAA4F;AAC5F~~,sCAAwC;AACxC,gDAAkE;AAClE,oCAA+E;AAC/E,~~8CAAiD~~;~~AAEjD~~,mDAIyB;AACzB,mEAAwD;AAExD,SAAgB,kBAAkB,CAAC,IAAa;IAC9C,OAAO,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;;QACxD,IAAI,qCAAa,CAAC,GAAG,CAAC,EAAE;YACtB,MAAM,IAAI,EAAE,CAAC;YACb,OAAO;SACR;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;QACjE,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE;YACxB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,qCAA6B,EAAE,CAAC,CAAC;YAClD,OAAO;SACR;QAED,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,IAAI,4BAAoB,EAAE,CAAC,CAAC;YAC7C,OAAO;SACR;QAED,iEAAiE;QACjE,IAAI,MAAM,CAAC,KAAK,KAAK,mBAAK,CAAC,KAAK;YAAE,MAAM,CAAC,aAAa,GAAG,KAAK,CAAC,CAAC,oDAAoD;QACpH,MAAM,MAAM,GAAG,MAAM,gCAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,OAAO;SACR;QACD,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC;QAE1B,MAAM,MAAM,GAAG,MAAM,aAAa,CAChC,MAAkC,EAClC,GAAG,CAAC,eAAe,EACnB,MAAM,CAAC,GAAG,EACV,IAAI,IAAI,MAAM,CAAC,aAAa,CAC7B,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,OAAO;SACR;QAED,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;QAE7B,0CAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;QACrE,0CAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;QAErE,iDAAiD;QACjD,MAAM,cAAc,GAAG,~~iBAAI,EAAE;YAC3B,CAAC,CAAC,~~0BAAc,CAAC,WAAW~~;YAC5B~~,CAAC~~,CAAC,qCAAyB,CAAC,SAAS,CAAC~~;~~QACxC~~,uBAAU,CAAC,UAAU,GAAG,MAAA,MAAA,GAAG,CAAC,SAAS,CAAC,KAAK,0CAAG,cAAc,CAAC,0CAAE,UAAU,CAAC;QAC1E,uBAAU,CAAC,YAAY,GAAG,MAAA,MAAA,GAAG,CAAC,SAAS,CAAC,KAAK,0CAAG,cAAc,CAAC,0CAAE,YAAY,CAAC;QAC9E,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;~~AAnDD~~,~~gDAmDC~~;AAEM,KAAK,UAAU,aAAa,CACjC,MAAgC,EAChC,eAAgC,EAChC,aAAsB,EACtB,aAAa,GAAG,KAAK;IAErB,MAAM,cAAc,GAAG,IAAI,oBAAW,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IAElE,IAAI,OAAqB,CAAC;IAC1B,mDAAmD;IACnD,IAAI,aAAa,EAAE;QACjB,OAAO,GAAG,0BAAY,EAAE,CAAC;QACzB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;SAAM;QACL,kCAAkC;QAClC,6DAA6D;QAC7D,4GAA4G;QAC5G,MAAM,aAAa,GAAG,MAAM,gCAAkB,CAAC,WAAW,CACxD,MAAM,CAAC,WAAW,EAClB,cAAc,EACd,aAAa,EACb,IAAI,CACL,CAAC;QAEF,IAAI,aAAa,CAAC,KAAK,EAAE,EAAE;YACzB,OAAO,iBAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,OAAO,GAAG,aAAa,CAAC,KAAqB,CAAC;KAC/C;IACD,OAAO,gBAAE,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AA9BD,sCA8BC"}
1	+ {"version":3,"file":"envInfoLoaderV3.js","sourceRoot":"","sources":["../../../src/core/middleware/envInfoLoaderV3.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/projectMigrator.js CHANGED Viewed

@@ -26,8 +26,8 @@ const constants_4 = require("../../plugins/resource/appstudio/constants");
 const utils_1 = require("../../plugins/resource/appstudio/utils/utils");
 const telemetry_1 = require("../../common/telemetry");
 const dotenv = tslib_1.__importStar(require("dotenv"));
-const constants_5 = require("../../plugins/resource/spfx/utils/constants");
-const utils_2 = require("../../plugins/resource/spfx/utils/utils");
+const constants_5 = require("../../component/resource/spfx/utils/constants");
+const utils_2 = require("../../component/resource/spfx/utils/utils");
 const adaptor_1 = require("../../plugins/solution/fx-solution/v2/adaptor");
 const utils_3 = require("../../plugins/solution/fx-solution/v2/utils");
 const localEnvProvider_1 = require("../../common/local/localEnvProvider");