@microsoft/teamsfx-core 2.0.8-alpha.2f5decfcc.0 → 2.0.8-alpha.784d957e7.0

package/build/common/constants.d.ts

@@ -49,8 +49,7 @@ export declare class FeatureFlagName {
     static readonly OfficeXMLAddin = "TEAMSFX_OFFICE_XML_ADDIN";
     static readonly CopilotPlugin = "DEVELOP_COPILOT_PLUGIN";
     static readonly ApiCopilotPlugin = "API_COPILOT_PLUGIN";
-    static readonly TeamsSampleConfigBranch = "TEAMSFX_SAMPLE_CONFIG_BRANCH";
-    static readonly OfficeSampleConfigBranch = "TEAMSFX_OFFICE_SAMPLE_CONFIG_BRANCH";
+    static readonly SampleConfigBranch = "TEAMSFX_SAMPLE_CONFIG_BRANCH";
     static readonly TestTool = "TEAMSFX_TEST_TOOL";
     static readonly ApiKey = "API_COPILOT_API_KEY";
     static readonly MultipleParameters = "API_COPILOT_MULTIPLE_PARAMETERS";

package/build/common/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAGA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,YAAY,WAAW;IACvC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,qCAAqC;IAC3E,MAAM,CAAC,QAAQ,CAAC,kBAAkB,wBAAwB;IAC1D,MAAM,CAAC,QAAQ,CAAC,UAAU,eAAe;CAC1C;AAED,qBAAa,SAAS;IACpB,MAAM,CAAC,QAAQ,CAAC,gBAAgB,6CAA6C;IAC7E,MAAM,CAAC,QAAQ,CAAC,WAAW,qCAAqC;IAChE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,gEAAgE;IAClG,MAAM,CAAC,QAAQ,CAAC,YAAY,0CAA0C;CACvE;AAED,qBAAa,sBAAsB;IACjC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,4CAA4C;IAC7E,MAAM,CAAC,QAAQ,CAAC,UAAU,qCAAqC;IAC/D,MAAM,CAAC,QAAQ,CAAC,UAAU,8DAA8D;CACzF;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,aAAa,0CAA0C;IACvE,MAAM,CAAC,QAAQ,CAAC,GAAG,0CAA0C;CAC9D;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;IAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;CAC/D;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;IAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;CAC/D;AACD,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,qBAAqB,sCAAsC;IAE3E,MAAM,CAAC,QAAQ,CAAC,cAAc,+BAA+B;IAC7D,MAAM,CAAC,QAAQ,CAAC,YAAY,oBAAoB;IAChD,MAAM,CAAC,QAAQ,CAAC,cAAc,sBAAsB;IACpD,MAAM,CAAC,QAAQ,CAAC,WAAW,0BAA0B;IACrD,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,eAAe,8BAA8B;IAC7D,MAAM,CAAC,QAAQ,CAAC,OAAO,sBAAsB;IAC7C,MAAM,CAAC,QAAQ,CAAC,UAAU,gCAAgC;IAC1D,MAAM,CAAC,QAAQ,CAAC,cAAc,6BAA6B;IAC3D,MAAM,CAAC,QAAQ,CAAC,OAAO,qBAAqB;IAC5C,MAAM,CAAC,QAAQ,CAAC,SAAS,wBAAwB;IACjD,MAAM,CAAC,QAAQ,CAAC,EAAE,gBAAgB;IAClC,MAAM,CAAC,QAAQ,CAAC,WAAW,0BAA0B;IACrD,MAAM,CAAC,QAAQ,CAAC,WAAW,0BAA0B;IACrD,MAAM,CAAC,QAAQ,CAAC,WAAW,0BAA0B;IACrD,MAAM,CAAC,QAAQ,CAAC,cAAc,8BAA8B;IAC5D,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,wBAAwB;IACxD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,QAAQ,uBAAuB;IAC/C,MAAM,CAAC,QAAQ,CAAC,MAAM,yBAAyB;IAC/C,MAAM,CAAC,QAAQ,CAAC,kBAAkB,qCAAqC;IACvE,MAAM,CAAC,QAAQ,CAAC,iBAAiB,wBAAwB;IACzD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,mCAAmC;IACrE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,cAAc,8BAA8B;IAC5D,MAAM,CAAC,QAAQ,CAAC,QAAQ,gBAAgB;CACzC"}

package/build/common/constants.js

@@ -63,8 +63,7 @@ FeatureFlagName.OfficeAddin = "TEAMSFX_OFFICE_ADDIN";
 FeatureFlagName.OfficeXMLAddin = "TEAMSFX_OFFICE_XML_ADDIN";
 FeatureFlagName.CopilotPlugin = "DEVELOP_COPILOT_PLUGIN";
 FeatureFlagName.ApiCopilotPlugin = "API_COPILOT_PLUGIN";
-FeatureFlagName.TeamsSampleConfigBranch = "TEAMSFX_SAMPLE_CONFIG_BRANCH";
-FeatureFlagName.OfficeSampleConfigBranch = "TEAMSFX_OFFICE_SAMPLE_CONFIG_BRANCH";
+FeatureFlagName.SampleConfigBranch = "TEAMSFX_SAMPLE_CONFIG_BRANCH";
 FeatureFlagName.TestTool = "TEAMSFX_TEST_TOOL";
 FeatureFlagName.ApiKey = "API_COPILOT_API_KEY";
 FeatureFlagName.MultipleParameters = "API_COPILOT_MULTIPLE_PARAMETERS";

package/build/common/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,cAAc;;AAA3B,wCAKC;AAJiB,2BAAY,GAAG,OAAO,CAAC;AACvB,qCAAsB,GAAG,iCAAiC,CAAC;AAC3D,iCAAkB,GAAG,oBAAoB,CAAC;AAC1C,yBAAU,GAAG,WAAW,CAAC;AAG3C,MAAa,SAAS;;AAAtB,8BAKC;AAJiB,0BAAgB,GAAG,yCAAyC,CAAC;AAC7D,qBAAW,GAAG,iCAAiC,CAAC;AAChD,4BAAkB,GAAG,4DAA4D,CAAC;AAClF,sBAAY,GAAG,sCAAsC,CAAC;AAGxE,MAAa,sBAAsB;;AAAnC,wDAIC;AAHiB,wCAAiB,GAAG,wCAAwC,CAAC;AAC7D,iCAAU,GAAG,iCAAiC,CAAC;AAC/C,iCAAU,GAAG,0DAA0D,CAAC;AAG1F,MAAa,aAAa;;AAA1B,sCAGC;AAFiB,2BAAa,GAAG,sCAAsC,CAAC;AACvD,iBAAG,GAAG,sCAAsC,CAAC;AAG/D,MAAa,cAAc;;AAA3B,wCAIC;AAHiB,sBAAO,GAAG,sCAAsC,CAAC;AACjD,mBAAI,GAAG,sCAAsC,CAAC;AAC9C,mBAAI,GAAG,sCAAsC,CAAC;AAGhE,MAAa,eAAe;;AAA5B,0CAIC;AAHiB,uBAAO,GAAG,sCAAsC,CAAC;AACjD,oBAAI,GAAG,sCAAsC,CAAC;AAC9C,oBAAI,GAAG,sCAAsC,CAAC;AAEhE,MAAa,eAAe;;AAA5B,0CA+BC;AA9BiB,qCAAqB,GAAG,kCAAkC,CAAC;AAC3E,gGAAgG;AAChF,8BAAc,GAAG,2BAA2B,CAAC;AAC7C,4BAAY,GAAG,gBAAgB,CAAC;AAChC,8BAAc,GAAG,kBAAkB,CAAC;AACpC,2BAAW,GAAG,sBAAsB,CAAC;AACrC,6BAAa,GAAG,wBAAwB,CAAC;AACzC,+BAAe,GAAG,0BAA0B,CAAC;AAC7C,uBAAO,GAAG,kBAAkB,CAAC;AAC7B,0BAAU,GAAG,4BAA4B,CAAC;AAC1C,8BAAc,GAAG,yBAAyB,CAAC;AAC3C,uBAAO,GAAG,iBAAiB,CAAC;AAC5B,yBAAS,GAAG,oBAAoB,CAAC;AACjC,kBAAE,GAAG,YAAY,CAAC;AAClB,2BAAW,GAAG,sBAAsB,CAAC;AACrC,2BAAW,GAAG,sBAAsB,CAAC;AACrC,2BAAW,GAAG,sBAAsB,CAAC;AACrC,8BAAc,GAAG,0BAA0B,CAAC;AAC5C,6BAAa,GAAG,wBAAwB,CAAC;AACzC,gCAAgB,GAAG,oBAAoB,CAAC;AACxC,uCAAuB,GAAG,8BAA8B,CAAC;AACzD,wCAAwB,GAAG,qCAAqC,CAAC;AACjE,wBAAQ,GAAG,mBAAmB,CAAC;AAC/B,sBAAM,GAAG,qBAAqB,CAAC;AAC/B,kCAAkB,GAAG,iCAAiC,CAAC;AACvD,iCAAiB,GAAG,oBAAoB,CAAC;AACzC,kCAAkB,GAAG,+BAA+B,CAAC;AACrD,kCAAkB,GAAG,8BAA8B,CAAC;AACpD,8BAAc,GAAG,0BAA0B,CAAC;AAC5C,wBAAQ,GAAG,YAAY,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,cAAc;;AAA3B,wCAKC;AAJiB,2BAAY,GAAG,OAAO,CAAC;AACvB,qCAAsB,GAAG,iCAAiC,CAAC;AAC3D,iCAAkB,GAAG,oBAAoB,CAAC;AAC1C,yBAAU,GAAG,WAAW,CAAC;AAG3C,MAAa,SAAS;;AAAtB,8BAKC;AAJiB,0BAAgB,GAAG,yCAAyC,CAAC;AAC7D,qBAAW,GAAG,iCAAiC,CAAC;AAChD,4BAAkB,GAAG,4DAA4D,CAAC;AAClF,sBAAY,GAAG,sCAAsC,CAAC;AAGxE,MAAa,sBAAsB;;AAAnC,wDAIC;AAHiB,wCAAiB,GAAG,wCAAwC,CAAC;AAC7D,iCAAU,GAAG,iCAAiC,CAAC;AAC/C,iCAAU,GAAG,0DAA0D,CAAC;AAG1F,MAAa,aAAa;;AAA1B,sCAGC;AAFiB,2BAAa,GAAG,sCAAsC,CAAC;AACvD,iBAAG,GAAG,sCAAsC,CAAC;AAG/D,MAAa,cAAc;;AAA3B,wCAIC;AAHiB,sBAAO,GAAG,sCAAsC,CAAC;AACjD,mBAAI,GAAG,sCAAsC,CAAC;AAC9C,mBAAI,GAAG,sCAAsC,CAAC;AAGhE,MAAa,eAAe;;AAA5B,0CAIC;AAHiB,uBAAO,GAAG,sCAAsC,CAAC;AACjD,oBAAI,GAAG,sCAAsC,CAAC;AAC9C,oBAAI,GAAG,sCAAsC,CAAC;AAEhE,MAAa,eAAe;;AAA5B,0CA8BC;AA7BiB,qCAAqB,GAAG,kCAAkC,CAAC;AAC3E,gGAAgG;AAChF,8BAAc,GAAG,2BAA2B,CAAC;AAC7C,4BAAY,GAAG,gBAAgB,CAAC;AAChC,8BAAc,GAAG,kBAAkB,CAAC;AACpC,2BAAW,GAAG,sBAAsB,CAAC;AACrC,6BAAa,GAAG,wBAAwB,CAAC;AACzC,+BAAe,GAAG,0BAA0B,CAAC;AAC7C,uBAAO,GAAG,kBAAkB,CAAC;AAC7B,0BAAU,GAAG,4BAA4B,CAAC;AAC1C,8BAAc,GAAG,yBAAyB,CAAC;AAC3C,uBAAO,GAAG,iBAAiB,CAAC;AAC5B,yBAAS,GAAG,oBAAoB,CAAC;AACjC,kBAAE,GAAG,YAAY,CAAC;AAClB,2BAAW,GAAG,sBAAsB,CAAC;AACrC,2BAAW,GAAG,sBAAsB,CAAC;AACrC,2BAAW,GAAG,sBAAsB,CAAC;AACrC,8BAAc,GAAG,0BAA0B,CAAC;AAC5C,6BAAa,GAAG,wBAAwB,CAAC;AACzC,gCAAgB,GAAG,oBAAoB,CAAC;AACxC,kCAAkB,GAAG,8BAA8B,CAAC;AACpD,wBAAQ,GAAG,mBAAmB,CAAC;AAC/B,sBAAM,GAAG,qBAAqB,CAAC;AAC/B,kCAAkB,GAAG,iCAAiC,CAAC;AACvD,iCAAiB,GAAG,oBAAoB,CAAC;AACzC,kCAAkB,GAAG,+BAA+B,CAAC;AACrD,kCAAkB,GAAG,8BAA8B,CAAC;AACpD,8BAAc,GAAG,0BAA0B,CAAC;AAC5C,wBAAQ,GAAG,YAAY,CAAC"}

package/build/common/featureFlags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"AAKA,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AAED;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,IAAI,CAQpD;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C;AAED,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED,wBAAgB,yBAAyB,IAAI,OAAO,CAGnD;AAED,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAED,wBAAgB,eAAe,IAAI,OAAO,CAEzC;AAED,wBAAgB,2BAA2B,IAAI,OAAO,CAErD;AAED,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAED,wBAAgB,0BAA0B,IAAI,OAAO,CAEpD;AAED,wBAAgB,2BAA2B,IAAI,OAAO,CAErD;AAED,wBAAgB,2BAA2B,IAAI,OAAO,CAErD;AAED,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAElD;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C"}
+{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"AAKA,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AAED;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,IAAI,CAMpD;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C;AAED,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED,wBAAgB,yBAAyB,IAAI,OAAO,CAGnD;AAED,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAED,wBAAgB,eAAe,IAAI,OAAO,CAEzC;AAED,wBAAgB,2BAA2B,IAAI,OAAO,CAErD;AAED,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAED,wBAAgB,0BAA0B,IAAI,OAAO,CAEpD;AAED,wBAAgB,2BAA2B,IAAI,OAAO,CAErD;AAED,wBAAgB,2BAA2B,IAAI,OAAO,CAErD;AAED,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAElD;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C"}

package/build/common/featureFlags.js

@@ -24,8 +24,6 @@ function initializePreviewFeatureFlags() {
     process.env[constants_1.FeatureFlagName.AadManifest] = "true";
     process.env[constants_1.FeatureFlagName.ApiConnect] = "true";
     process.env[constants_1.FeatureFlagName.DeployManifest] = "true";
-    process.env[constants_1.FeatureFlagName.OfficeXMLAddin] = "true";
-    process.env[constants_1.FeatureFlagName.OfficeAddin] = "false";
 }
 exports.initializePreviewFeatureFlags = initializePreviewFeatureFlags;
 function isCLIDotNetEnabled() {
@@ -89,4 +87,49 @@ function isApiMeSSOEnabled() {
     return isFeatureFlagEnabled(constants_1.FeatureFlagName.ApiMeSSO, false);
 }
 exports.isApiMeSSOEnabled = isApiMeSSOEnabled;
+///////////////////////////////////////////////////////////////////////////////
+// Notes for Office Addin Feature flags:
+// Case 1: TEAMSFX_OFFICE_ADDIN = false, TEAMSFX_OFFICE_XML_ADDIN = false
+//   1.1 project-type option: `outlook-addin-type`
+//   1.2 addin-host: not show but use `outlook` internally
+//   1.3 capabilities options: [`jason-taskpane`, `outlook-addin-import`]
+//   1.4 programming-language options: [`typescript`] (skip in UI)
+//   1.5 office-addin-framework-type: not show question but use `default_old` internally
+//   1.6 generator class: OfficeAddinGenerator
+//   1.7 template link: config.json.json-taskpane.default_old.typescript
+// Case 2: TEAMSFX_OFFICE_ADDIN = false AND TEAMSFX_OFFICE_XML_ADDIN = true
+//   2.1 project-type option: `office-xml-addin-type`
+//   2.2 addin-host options: [`outlook`, `word`, `excel`, `powerpoint`]
+//   2.3 capabilities options:
+//     if (addin-host == `outlook`) then [`json-taskpane`, `outlook-addin-import`]
+//     else if (addin-host == `word`) then [`word-taskpane`, `word-xxx`, ...]
+//     else if (addin-host == `excel`) then [`excel-taskpane`, `excel-xxx`, ...]
+//     else if (addin-host === `powerpoint`) then [`powerpoint-taskpane`, `powerpoint-xxx`, ...]
+//   2.4 programming-language options:
+//     if (addin-host == `outlook`) then [`typescript`] (skip in UI)
+//     else two options: [`typescript`, `javascript`]
+//   2.5 office-addin-framework-type options: not show but use `default` internally
+//   2.6 generator class:
+//     if (addin-host == `outlook`) then OfficeAddinGenerator
+//     else OfficeXMLAddinGenerator
+//   2.7 template link:
+//     if (addin-host == `outlook`) config.json.json-taskpane.default.[programming-language]
+//     else config[addin-host].[capabilities].default.[programming-language]
+// Case 3: TEAMSFX_OFFICE_ADDIN = true AND TEAMSFX_OFFICE_XML_ADDIN = true
+//     3.1 project-type option: `office-addin-type`
+//   3.2 addin-host: not show but will use `wxpo` internally
+//   3.3 capabilities options: [`json-taskpane`, `office-addin-import`]
+//   3.4 programming-language options: [`typescript`, `javascript`]
+//   3.5 office-addin-framework-type options: [`default`, `react`]
+//   3.6 generator class: OfficeAddinGenerator
+//   3.7 template link: config.json.json-taskpane.[office-addin-framework-type].[programming-language]
+// case 4: TEAMSFX_OFFICE_ADDIN = true AND TEAMSFX_OFFICE_XML_ADDIN = fasle
+//   4.1 project-type option: `office-addin-type`
+//   4.2 addin-host: not show but will use `wxpo` internally
+//   4.3 capabilities options: [`jason-taskpane`, `office-addin-import`]
+//   4.4 programming-language options: [`typescript`, `javascript`]
+//   4.5 office-addin-framework-type options: [`default`, `react`]
+//   4.6 generator class: OfficeAddinGenerator
+//   4.7 template link: config.json.json-taskpane.[office-addin-framework-type].[programming-language]
+///////////////////////////////////////////////////////////////////////////////////////////////////////
 //# sourceMappingURL=featureFlags.js.map

package/build/common/featureFlags.js.map

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

package/build/common/projectSettingsHelper.d.ts

@@ -1,8 +1,13 @@
+export declare enum OfficeManifestType {
+    XmlAddIn = 0,
+    MetaOsAddIn = 1
+}
 export declare function validateProjectSettings(projectSettings: any): string | undefined;
 export declare function isValidProject(workspacePath?: string): boolean;
 export declare function isValidOfficeAddInProject(workspacePath?: string): boolean;
-export declare function fetchManifestList(workspacePath?: string): string[] | undefined;
-export declare function isOfficeAddInManifest(inputFileName: string): boolean;
+export declare function fetchManifestList(workspacePath?: string, officeManifestType?: OfficeManifestType): string[] | undefined;
+export declare function isOfficeXmlAddInManifest(inputFileName: string): boolean;
+export declare function isOfficeMetaOsAddInManifest(inputFileName: string): boolean;
 export declare function isValidProjectV3(workspacePath: string): boolean;
 export declare function isValidProjectV2(workspacePath: string): boolean;
 export declare function isVSProject(projectSettings?: any): boolean;

package/build/common/projectSettingsHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsHelper.ts"],"names":[],"mappings":"AAOA,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAsBhF;AAqBD,wBAAgB,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAO9D;AAED,wBAAgB,yBAAyB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAWzE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAK9E;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAKpE;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAO/D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAS/D;AAED,wBAAgB,WAAW,CAAC,eAAe,CAAC,EAAE,GAAG,GAAG,OAAO,CAE1D"}
+{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsHelper.ts"],"names":[],"mappings":"AAOA,oBAAY,kBAAkB;IAC5B,QAAQ,IAAA;IACR,WAAW,IAAA;CACZ;AAED,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAsBhF;AAqBD,wBAAgB,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAO9D;AAED,wBAAgB,yBAAyB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAgBzE;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,CAAC,EAAE,MAAM,EACtB,kBAAkB,CAAC,EAAE,kBAAkB,GACtC,MAAM,EAAE,GAAG,SAAS,CAStB;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAKvE;AAED,wBAAgB,2BAA2B,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAK1E;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAU/D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAS/D;AAED,wBAAgB,WAAW,CAAC,eAAe,CAAC,EAAE,GAAG,GAAG,OAAO,CAE1D"}

package/build/common/projectSettingsHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVSProject = exports.isValidProjectV2 = exports.isValidProjectV3 = exports.isOfficeAddInManifest = exports.fetchManifestList = exports.isValidOfficeAddInProject = exports.isValidProject = exports.validateProjectSettings = void 0;
+exports.isVSProject = exports.isValidProjectV2 = exports.isValidProjectV3 = exports.isOfficeMetaOsAddInManifest = exports.isOfficeXmlAddInManifest = exports.fetchManifestList = exports.isValidOfficeAddInProject = exports.isValidProject = exports.validateProjectSettings = exports.OfficeManifestType = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -8,6 +8,11 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
 const versionMetadata_1 = require("./versionMetadata");
+var OfficeManifestType;
+(function (OfficeManifestType) {
+    OfficeManifestType[OfficeManifestType["XmlAddIn"] = 0] = "XmlAddIn";
+    OfficeManifestType[OfficeManifestType["MetaOsAddIn"] = 1] = "MetaOsAddIn";
+})(OfficeManifestType = exports.OfficeManifestType || (exports.OfficeManifestType = {}));
 function validateProjectSettings(projectSettings) {
     var _a;
     if (!projectSettings)
@@ -63,9 +68,12 @@ function isValidProject(workspacePath) {
 }
 exports.isValidProject = isValidProject;
 function isValidOfficeAddInProject(workspacePath) {
-    const manifestList = fetchManifestList(workspacePath);
+    const xmlManifestList = fetchManifestList(workspacePath, OfficeManifestType.XmlAddIn);
+    const metaOsManifestList = fetchManifestList(workspacePath, OfficeManifestType.MetaOsAddIn);
     try {
-        if (manifestList && manifestList.length > 0) {
+        if (xmlManifestList &&
+            xmlManifestList.length > 0 &&
+            (!metaOsManifestList || metaOsManifestList.length == 0)) {
             return true;
         }
         else {
@@ -77,20 +85,30 @@ function isValidOfficeAddInProject(workspacePath) {
     }
 }
 exports.isValidOfficeAddInProject = isValidOfficeAddInProject;
-function fetchManifestList(workspacePath) {
+function fetchManifestList(workspacePath, officeManifestType) {
     if (!workspacePath)
         return undefined;
     const list = fs_extra_1.default.readdirSync(workspacePath);
-    const manifestList = list.filter((fileName) => isOfficeAddInManifest(fileName));
+    const manifestList = list.filter((fileName) => officeManifestType == OfficeManifestType.XmlAddIn
+        ? isOfficeXmlAddInManifest(fileName)
+        : isOfficeMetaOsAddInManifest(fileName));
     return manifestList;
 }
 exports.fetchManifestList = fetchManifestList;
-function isOfficeAddInManifest(inputFileName) {
+function isOfficeXmlAddInManifest(inputFileName) {
     return (inputFileName.toLocaleLowerCase().indexOf("manifest") != -1 &&
         inputFileName.toLocaleLowerCase().endsWith(".xml"));
 }
-exports.isOfficeAddInManifest = isOfficeAddInManifest;
+exports.isOfficeXmlAddInManifest = isOfficeXmlAddInManifest;
+function isOfficeMetaOsAddInManifest(inputFileName) {
+    return (inputFileName.toLocaleLowerCase().indexOf("manifest") != -1 &&
+        inputFileName.toLocaleLowerCase().endsWith(".json"));
+}
+exports.isOfficeMetaOsAddInManifest = isOfficeMetaOsAddInManifest;
 function isValidProjectV3(workspacePath) {
+    if (isValidOfficeAddInProject(workspacePath)) {
+        return false;
+    }
     const ymlFilePath = path.join(workspacePath, versionMetadata_1.MetadataV3.configFile);
     const localYmlPath = path.join(workspacePath, versionMetadata_1.MetadataV3.localConfigFile);
     if (fs_extra_1.default.pathExistsSync(ymlFilePath) || fs_extra_1.default.pathExistsSync(localYmlPath)) {

package/build/common/projectSettingsHelper.js.map

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

package/build/common/samples.d.ts

@@ -1,6 +1,5 @@
 import { SampleUrlInfo } from "../component/generator/utils";
-export declare const TeamsSampleConfigTag = "v2.4.0";
-export declare const OfficeSampleConfigTag = "v0.0.1";
+export declare const SampleConfigTag = "v2.4.0";
 export declare const SampleConfigBranchForPrerelease = "main";
 export interface SampleConfig {
     id: string;

package/build/common/samples.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAA0B,MAAM,8BAA8B,CAAC;AAYrF,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAE9C,eAAO,MAAM,+BAA+B,SAAS,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IAExB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,aAAa,CAAC;CAChC;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,aAAa,EAAE;QACb,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;CACH;AAOD,cAAM,cAAc;IAClB,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,IAAW,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAKvD;IAEY,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;YAiD/C,uBAAuB;IAmErC,OAAO,CAAC,uBAAuB;IAiDlB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YA2BzD,mBAAmB;CAuBlC;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
+{"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAA0B,MAAM,8BAA8B,CAAC;AAUrF,eAAO,MAAM,eAAe,WAAW,CAAC;AAExC,eAAO,MAAM,+BAA+B,SAAS,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IAExB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,aAAa,CAAC;CAChC;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,aAAa,EAAE;QACb,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;CACH;AAOD,cAAM,cAAc;IAClB,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,IAAW,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAKvD;IAEY,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;YAM/C,uBAAuB;IAsCrC,OAAO,CAAC,uBAAuB;IA4ClB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YA2BzD,mBAAmB;CAiBlC;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}

package/build/common/samples.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sampleProvider = exports.SampleConfigBranchForPrerelease = exports.OfficeSampleConfigTag = exports.TeamsSampleConfigTag = void 0;
+exports.sampleProvider = exports.SampleConfigBranchForPrerelease = exports.SampleConfigTag = void 0;
 const tslib_1 = require("tslib");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const hooks_1 = require("@feathersjs/hooks");
@@ -12,12 +12,9 @@ const common_1 = require("../error/common");
 const constants_1 = require("./constants");
 const packageJson = require("../../package.json");
 const SampleConfigOwner = "OfficeDev";
-const TeamsSampleConfigRepo = "TeamsFx-Samples";
-const TeamsSampleConfigFile = ".config/samples-config-v3.json";
-const OfficeSampleConfigRepo = "Office-Samples";
-const OfficeSampleConfigFile = ".config/samples-config-v1.json";
-exports.TeamsSampleConfigTag = "v2.4.0";
-exports.OfficeSampleConfigTag = "v0.0.1";
+const SampleConfigRepo = "TeamsFx-Samples";
+const SampleConfigFile = ".config/samples-config-v3.json";
+exports.SampleConfigTag = "v2.4.0";
 // prerelease tag is always using a branch.
 exports.SampleConfigBranchForPrerelease = "main";
 class SampleProvider {
@@ -28,94 +25,51 @@ class SampleProvider {
         return Promise.resolve(this.sampleCollection);
     }
     async refreshSampleConfig() {
-        const teamsRet = await this.fetchOnlineSampleConfig(TeamsSampleConfigRepo, TeamsSampleConfigFile);
-        const teamsSampleCollection = await this.parseOnlineSampleConfig(SampleConfigOwner, TeamsSampleConfigRepo, teamsRet.samplesConfig, teamsRet.ref);
-        const officeRet = await this.fetchOnlineSampleConfig(OfficeSampleConfigRepo, OfficeSampleConfigFile);
-        const officeSampleCollection = await this.parseOnlineSampleConfig(SampleConfigOwner, OfficeSampleConfigRepo, officeRet.samplesConfig, officeRet.ref);
-        // merge samples from TeamsFx-Samples and Office-Samples
-        // use Set to remove duplicates
-        this.sampleCollection = {
-            samples: [...teamsSampleCollection.samples, ...officeSampleCollection.samples],
-            filterOptions: {
-                capabilities: Array.from(new Set([
-                    ...teamsSampleCollection.filterOptions.capabilities,
-                    ...officeSampleCollection.filterOptions.capabilities,
-                ])),
-                languages: Array.from(new Set([
-                    ...teamsSampleCollection.filterOptions.languages,
-                    ...officeSampleCollection.filterOptions.languages,
-                ])),
-                technologies: Array.from(new Set([
-                    ...teamsSampleCollection.filterOptions.technologies,
-                    ...officeSampleCollection.filterOptions.technologies,
-                ])),
-            },
-        };
+        const { samplesConfig, ref } = await this.fetchOnlineSampleConfig();
+        this.sampleCollection = this.parseOnlineSampleConfig(samplesConfig, ref);
         return this.sampleCollection;
     }
-    async fetchOnlineSampleConfig(configRepo, configFile) {
-        const getRef = (configRepo, version) => {
-            if (configRepo === TeamsSampleConfigRepo) {
-                // Set default value for branchOrTag
-                if (version.includes("alpha")) {
-                    // daily build version always use 'dev' branch
-                    return "dev";
-                }
-                else if (version.includes("beta")) {
-                    // prerelease build version always use branch head for prerelease.
-                    return exports.SampleConfigBranchForPrerelease;
-                }
-                else if (version.includes("rc")) {
-                    // if there is a breaking change, the tag is not used by any stable version.
-                    return exports.TeamsSampleConfigTag;
-                }
-                else {
-                    // stable version uses the head of branch defined by feature flag when available
-                    return exports.TeamsSampleConfigTag;
-                }
-            }
-            else {
-                // Office Samples
-                if (version.includes("alpha")) {
-                    return "dev";
-                }
-                else if (version.includes("beta")) {
-                    return exports.SampleConfigBranchForPrerelease;
-                }
-                else if (version.includes("rc")) {
-                    return exports.OfficeSampleConfigTag;
-                }
-                else {
-                    return exports.OfficeSampleConfigTag;
-                }
-                // return "dev";
-            }
-        };
+    async fetchOnlineSampleConfig() {
         const version = packageJson.version;
-        const configBranchInEnv = process.env[configRepo === TeamsSampleConfigRepo
-            ? constants_1.FeatureFlagName.TeamsSampleConfigBranch
-            : constants_1.FeatureFlagName.OfficeSampleConfigBranch];
+        const configBranchInEnv = process.env[constants_1.FeatureFlagName.SampleConfigBranch];
         let samplesConfig;
-        let ref = getRef(configRepo, version);
+        let ref = exports.SampleConfigTag;
+        // Set default value for branchOrTag
+        if (version.includes("alpha")) {
+            // daily build version always use 'dev' branch
+            ref = "dev";
+        }
+        else if (version.includes("beta")) {
+            // prerelease build version always use branch head for prerelease.
+            ref = exports.SampleConfigBranchForPrerelease;
+        }
+        else if (version.includes("rc")) {
+            // if there is a breaking change, the tag is not used by any stable version.
+            ref = exports.SampleConfigTag;
+        }
+        else {
+            // stable version uses the head of branch defined by feature flag when available
+            ref = exports.SampleConfigTag;
+        }
         // Set branchOrTag value if branch in env is valid
         if (configBranchInEnv) {
             try {
-                const data = await this.fetchRawFileContent(SampleConfigOwner, configRepo, configBranchInEnv, configFile);
+                const data = await this.fetchRawFileContent(configBranchInEnv);
                 ref = configBranchInEnv;
                 samplesConfig = data;
             }
             catch (e) { }
         }
         if (samplesConfig === undefined) {
-            samplesConfig = (await this.fetchRawFileContent(SampleConfigOwner, configRepo, ref, configFile));
+            samplesConfig = (await this.fetchRawFileContent(ref));
         }
         return { samplesConfig, ref };
     }
-    parseOnlineSampleConfig(samplesOnwer, samplesRepo, samplesConfig, ref) {
+    parseOnlineSampleConfig(samplesConfig, ref) {
         const samples = (samplesConfig === null || samplesConfig === void 0 ? void 0 : samplesConfig.samples.map((sample) => {
             const isExternal = sample["downloadUrlInfo"] ? true : false;
             let gifUrl = sample["gifPath"] !== undefined
-                ? `https://raw.githubusercontent.com/${samplesOnwer}/${samplesRepo}/${ref}/${sample["id"]}/${sample["gifPath"]}`
+                ? `https://raw.githubusercontent.com/${SampleConfigOwner}/${SampleConfigRepo}/${ref}/${sample["id"]}/${sample["gifPath"]}`
                 : undefined;
             if (isExternal) {
                 const info = sample["downloadUrlInfo"];
@@ -128,19 +82,19 @@ class SampleProvider {
                     ? sample["downloadUrlInfo"]
                     : {
                         owner: SampleConfigOwner,
-                        repository: samplesRepo,
+                        repository: SampleConfigRepo,
                         ref: ref,
                         dir: sample["id"],
                     }, gifUrl: gifUrl });
         })) || [];
-        return Promise.resolve({
+        return {
             samples,
             filterOptions: {
                 capabilities: (samplesConfig === null || samplesConfig === void 0 ? void 0 : samplesConfig.filterOptions["capabilities"]) || [],
                 languages: (samplesConfig === null || samplesConfig === void 0 ? void 0 : samplesConfig.filterOptions["languages"]) || [],
                 technologies: (samplesConfig === null || samplesConfig === void 0 ? void 0 : samplesConfig.filterOptions["technologies"]) || [],
             },
-        });
+        };
     }
     async getSampleReadmeHtml(sample) {
         const urlInfo = sample.downloadUrlInfo;
@@ -165,8 +119,8 @@ class SampleProvider {
             throw new common_1.AccessGithubError(url, "SampleProvider", e);
         }
     }
-    async fetchRawFileContent(configOwner, configRepo, branchOrTag, configFile) {
-        const url = `https://raw.githubusercontent.com/${configOwner}/${configRepo}/${branchOrTag}/${configFile}`;
+    async fetchRawFileContent(branchOrTag) {
+        const url = `https://raw.githubusercontent.com/${SampleConfigOwner}/${SampleConfigRepo}/${branchOrTag}/${SampleConfigFile}`;
         try {
             const fileResponse = await utils_1.sendRequestWithTimeout(async () => {
                 return await axios_1.default.get(url, { responseType: "json" });
@@ -183,8 +137,8 @@ class SampleProvider {
 tslib_1.__decorate([
     hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "SampleProvider" })]),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, Object, String]),
-    tslib_1.__metadata("design:returntype", Promise)
+    tslib_1.__metadata("design:paramtypes", [Object, String]),
+    tslib_1.__metadata("design:returntype", Object)
 ], SampleProvider.prototype, "parseOnlineSampleConfig", null);
 exports.sampleProvider = new SampleProvider();
 //# sourceMappingURL=samples.js.map

package/build/common/samples.js.map

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

package/build/common/templates-config.json

@@ -1,6 +1,6 @@
 {
     "version": "~4.1",
-    "localVersion": "4.2.1-alpha.2f5decfcc.0",
+    "localVersion": "4.2.1-alpha.784d957e7.0",
     "tagPrefix": "templates@",
     "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",

package/build/component/configManager/validator.js

@@ -8,7 +8,7 @@ const ajv_1 = tslib_1.__importDefault(require("ajv"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const folder_1 = require("../../folder");
-const supportedVersions = ["1.0.0", "1.1.0", "v1.2", "v1.3", "v1.4"];
+const supportedVersions = ["1.0.0", "1.1.0", "v1.2", "v1.3", "v1.4", "v1.5"];
 class Validator {
     constructor() {
         this.impl = new Map();

package/build/component/configManager/validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/component/configManager/validator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,sDAA4C;AAC5C,gEAA0B;AAC1B,wDAAwB;AACxB,yCAAiD;AAGjD,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAErE,MAAa,SAAS;IAGpB;QACE,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE;YAC9C,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SAC3B;IACH,CAAC;IAEO,WAAW,CAAC,OAAe;QACjC,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,0BAAiB,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,kBAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACrB,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,OAAe;QAChC,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,iBAAiB;QACf,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,sBAAsB;QAC5B,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,QAAQ,CAAC,GAA4B,EAAE,OAAgB;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,KAAK,CAAC;SACd;QACD,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;CACF;AAxCD,8BAwCC"}
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/component/configManager/validator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,sDAA4C;AAC5C,gEAA0B;AAC1B,wDAAwB;AACxB,yCAAiD;AAGjD,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE7E,MAAa,SAAS;IAGpB;QACE,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE;YAC9C,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SAC3B;IACH,CAAC;IAEO,WAAW,CAAC,OAAe;QACjC,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,0BAAiB,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,kBAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACrB,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,OAAe;QAChC,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,iBAAiB;QACf,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,sBAAsB;QAC5B,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,QAAQ,CAAC,GAA4B,EAAE,OAAgB;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,KAAK,CAAC;SACd;QACD,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;CACF;AAxCD,8BAwCC"}

package/build/component/coordinator/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/coordinator/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/coordinator/index.ts"],"names":[],"mappings":"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"}