Merge pull request #779 from millerds/update-json-manifest-package

[patch] Update json manifest package
OfficeDev · Jun 2, 2023 · d68be42 · d68be42
2 parents f4763de + 40a567b
commit d68be42
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/packages/office-addin-manifest/package-lock.json b/packages/office-addin-manifest/package-lock.json
diff --git a/packages/office-addin-manifest/package.json b/packages/office-addin-manifest/package.json
@@ -22,7 +22,7 @@
     "Office Add-in"
   ],
   "dependencies": {
-    "@microsoft/teams-manifest": "^0.0.9",
+    "@microsoft/teams-manifest": "^0.1.0",
     "adm-zip": "^0.5.9",
     "chalk": "^2.4.2",
     "commander": "^6.2.0",

diff --git a/packages/office-addin-manifest/src/export.ts b/packages/office-addin-manifest/src/export.ts
@@ -2,7 +2,7 @@ import * as fs from "fs";
 import * as fsExtra from "fs-extra";
 import * as AdmZip from "adm-zip";
 import * as path from "path";
-import { ManifestUtil, TeamsAppManifest } from "@microsoft/teams-manifest";
+import { ManifestUtil, devPreview } from "@microsoft/teams-manifest";
 
 /* global console */
 
@@ -28,7 +28,7 @@ async function createZip(manifestPath: string): Promise<AdmZip> {
     throw new Error(`The file '${manifestPath}' does not exist`);
   }
 
-  const manifest: TeamsAppManifest = await ManifestUtil.loadFromPath(manifestPath);
+  const manifest: devPreview.DevPreviewSchema = await ManifestUtil.loadFromPath(manifestPath);
   addIconFile(manifest.icons?.color, manifestDir, zip);
   addIconFile(manifest.icons?.outline, manifestDir, zip);
 

diff --git a/packages/office-addin-manifest/src/manifestHandler/manifestHandlerJson.ts b/packages/office-addin-manifest/src/manifestHandler/manifestHandlerJson.ts
@@ -1,16 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { devPreview, ManifestUtil, TeamsAppManifest } from "@microsoft/teams-manifest";
+import { devPreview, ManifestUtil } from "@microsoft/teams-manifest";
 import { v4 as uuidv4 } from "uuid";
 import { ManifestInfo } from "../manifestInfo";
 import { ManifestHandler } from "./manifestHandler";
 
 export class ManifestHandlerJson extends ManifestHandler {
   /* eslint-disable @typescript-eslint/no-unused-vars */
-  async modifyManifest(guid?: string, displayName?: string): Promise<TeamsAppManifest> {
+  async modifyManifest(guid?: string, displayName?: string): Promise<devPreview.DevPreviewSchema> {
     try {
-      const appManifest: TeamsAppManifest = await ManifestUtil.loadFromPath(this.manifestPath);
+      const appManifest: devPreview.DevPreviewSchema = await ManifestUtil.loadFromPath(this.manifestPath);
 
       if (typeof guid !== "undefined") {
         if (!guid || guid === "random") {
@@ -60,7 +60,7 @@ export class ManifestHandlerJson extends ManifestHandler {
     return manifestInfo;
   }
 
-  async writeManifestData(manifestData: TeamsAppManifest): Promise<void> {
+  async writeManifestData(manifestData: devPreview.DevPreviewSchema): Promise<void> {
     await ManifestUtil.writeToPath(this.manifestPath, manifestData);
   }
   /* eslint-enable @typescript-eslint/no-unused-vars */

diff --git a/packages/office-addin-manifest/src/validate.ts b/packages/office-addin-manifest/src/validate.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import { createReadStream } from "fs";
-import { ManifestUtil, TeamsAppManifest } from "@microsoft/teams-manifest";
+import { ManifestUtil, devPreview } from "@microsoft/teams-manifest";
 import fetch from "node-fetch";
 import { OfficeAddinManifest } from "./manifestOperations";
 import { usageDataObject } from "./defaults";
@@ -74,7 +74,7 @@ export async function validateManifest(
     await OfficeAddinManifest.readManifestFile(manifestPath);
 
     if (manifestPath.endsWith(".json")) {
-      const manifest: TeamsAppManifest = await ManifestUtil.loadFromPath(manifestPath);
+      const manifest: devPreview.DevPreviewSchema = await ManifestUtil.loadFromPath(manifestPath);
       const validationResult: string[] = await ManifestUtil.validateManifest(manifest);
       if (validationResult.length !== 0) {
         // There are errors