From 25bdad0b9c3e147a705f48708bd9154631943923 Mon Sep 17 00:00:00 2001 From: Darren Miller Date: Thu, 1 Jun 2023 13:10:39 -0700 Subject: [PATCH 1/2] Update the version of teams-manifest package --- packages/office-addin-manifest/package-lock.json | 14 +++++++------- packages/office-addin-manifest/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/office-addin-manifest/package-lock.json b/packages/office-addin-manifest/package-lock.json index 9962b099e..9caded1ac 100644 --- a/packages/office-addin-manifest/package-lock.json +++ b/packages/office-addin-manifest/package-lock.json @@ -9,7 +9,7 @@ "version": "1.12.4", "license": "MIT", "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", @@ -416,9 +416,9 @@ } }, "node_modules/@microsoft/teams-manifest": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/@microsoft/teams-manifest/-/teams-manifest-0.0.9.tgz", - "integrity": "sha512-cf7UYn8JxdhL83qshEAnc8vdk+KY4uKJqtlAvPSONVdzJZwO1iPxoyzdo0lTSCB+givg2Ipt4aLob2pCkg0r7w==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/teams-manifest/-/teams-manifest-0.1.0.tgz", + "integrity": "sha512-aM62USGjG3q1tKKs12R2toHDdfs5oDbhOT6N4fKveLi0ZIi8rNPqeyxsHWcdm0LzHnmGmALxlMAd6avnYqBoog==", "dependencies": { "ajv": "^8.5.0", "ajv-draft-04": "^1.0.0", @@ -5189,9 +5189,9 @@ } }, "@microsoft/teams-manifest": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/@microsoft/teams-manifest/-/teams-manifest-0.0.9.tgz", - "integrity": "sha512-cf7UYn8JxdhL83qshEAnc8vdk+KY4uKJqtlAvPSONVdzJZwO1iPxoyzdo0lTSCB+givg2Ipt4aLob2pCkg0r7w==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@microsoft/teams-manifest/-/teams-manifest-0.1.0.tgz", + "integrity": "sha512-aM62USGjG3q1tKKs12R2toHDdfs5oDbhOT6N4fKveLi0ZIi8rNPqeyxsHWcdm0LzHnmGmALxlMAd6avnYqBoog==", "requires": { "ajv": "^8.5.0", "ajv-draft-04": "^1.0.0", diff --git a/packages/office-addin-manifest/package.json b/packages/office-addin-manifest/package.json index f9468f92f..bac1486cb 100644 --- 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", From 40a567bfa8973fc1d7e0868fcccd62bc527e3bae Mon Sep 17 00:00:00 2001 From: Darren Miller Date: Thu, 1 Jun 2023 13:11:08 -0700 Subject: [PATCH 2/2] Change the type for json manifest handling --- packages/office-addin-manifest/src/export.ts | 4 ++-- .../src/manifestHandler/manifestHandlerJson.ts | 8 ++++---- packages/office-addin-manifest/src/validate.ts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/office-addin-manifest/src/export.ts b/packages/office-addin-manifest/src/export.ts index ba440326f..002e41a14 100644 --- 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 { 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 index f4ddafb9e..eb2c5f533 100644 --- 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 { + async modifyManifest(guid?: string, displayName?: string): Promise { 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 { + async writeManifestData(manifestData: devPreview.DevPreviewSchema): Promise { 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 index 62164dc26..32b796be9 100644 --- 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