Merge branch 'main' into jeklouda/release_2.31.0_proxy

apps/teams-test-app/e2e-test-data/authentication.json

@@ -19,19 +19,19 @@
       "expectedTestAppValue": "Success: {\"oid\":\"mockoid\",\"tid\":\"mocktid\",\"upn\":\"mockupn\",\"loginHint\":\"mockLoginHint\",\"displayName\":\"mockName\",\"dataResidency\":\"public\"}"
     },
     {
-      "title": "getUser API Call - Failure (Not full trust)",
+      "title": "getUser API Call - Failure (Not microsoft owned)",
       "version": ">2.25.0",
       "hostSdkVersion": {
         "web": "<=3.0.2"
       },
       "type": "callResponse",
       "platformsExcluded": ["iOS"],
       "boxSelector": "#box_getUser",
-      "testUrlParams": [["appDefOverrides", "{\"isFullTrustApp\": false}"]],
+      "testUrlParams": [["appDefOverrides", "{\"isFullTrustApp\": false, \"isMicrosoftOwned\": false}"]],
       "expectedTestAppValue": "Error: Error: Error returned, code = 500, message = App does not have the required permissions for this operation"
     },
     {
-      "title": "getUser API Call - Failure (Not full trust and not Microsoft owned)",
+      "title": "getUser API Call - Failure (Not Microsoft owned)",
       "version": ">2.25.0",
       "hostSdkVersion": {
         "web": ">3.0.2"
@@ -43,7 +43,7 @@
       "expectedTestAppValue": "Error: Error: Error returned, code = 500, message = App does not have the required permissions for this operation"
     },
     {
-      "title": "getUser API Call - Success (Full trust app)",
+      "title": "getUser API Call - Success (Full trust app - backwards compatibility)",
       "version": ">2.25.0",
       "hostSdkVersion": {
         "web": ">3.0.2"
@@ -55,7 +55,7 @@
       "expectedTestAppValue": "{\"oid\":\"mockoid\",\"tid\":\"mocktid\",\"upn\":\"mockupn\",\"loginHint\":\"mockLoginHint\",\"displayName\":\"mockName\",\"dataResidency\":\"public\"}"
     },
     {
-      "title": "getUser API Call - Success (Full trust and Microsoft owned app)",
+      "title": "getUser API Call - Success (Microsoft owned app)",
       "version": ">2.25.0",
       "hostSdkVersion": {
         "web": ">3.0.2"

apps/teams-test-app/e2e-test-data/files.json

@@ -57,13 +57,13 @@
       "expectedTestAppValue": "[{\"id\":\"testId\",\"title\":\"testTitle\",\"folderId\":\"testFolderId\",\"providerType\":2,\"providerCode\":\"GOOGLEDRIVE\",\"ownerDisplayName\":\"testOwnerDisplayName\"}]"
     },
     {
-      "title": "getCloudStorageFolders API Call - Failure (Not Full Trust)",
+      "title": "getCloudStorageFolders API Call - Failure (Not microsoft owned)",
       "type": "callResponse",
       "platformsExcluded": ["iOS"],
       "version": ">2.0.0-beta.5",
       "boxSelector": "#box_getCloudStorageFolders2",
       "inputValue": "testChannelId",
-      "testUrlParams": [["appDefOverrides", "{\"isFullTrustApp\": false}"]],
+      "testUrlParams": [["appDefOverrides", "{\"isFullTrustApp\": false, \"isMicrosoftOwned\": false}"]],
       "expectedTestAppValue": "{\"errorCode\":500,\"message\":\"App does not have the required permissions for this operation\"}"
     },
     {

apps/typed-dependency-tester/package.json

@@ -5,8 +5,8 @@
   "description": "A tester to check if types in the dependency array will cause errors",
   "version": "0.0.1",
   "scripts": {
-    "build": "pnpm i && pnpm copy && pnpm tsc && pnpm clean",
-    "copy": "cp ./node_modules/@microsoft/teams-js/dist/umd/MicrosoftTeams.d.ts ./ || xcopy .\\node_modules\\@microsoft\\teams-js\\dist\\umd\\MicrosoftTeams.d.ts .\\ /Y",
+    "build": "pnpm i && pnpm copy && pnpm clean",
+    "copy": "cp -r ./node_modules/@microsoft/teams-js/dist/esm/packages/teams-js/dts ./ || xcopy .\\node_modules\\@microsoft\\teams-js\\dist\\esm\\packages\\teams-js\\dts .\\ /s /Y",
     "clean": "rimraf node_modules && rimraf MicrosoftTeams.d.ts"
   },
   "dependencies": {},

change/@microsoft-teams-js-424ccfee-e9f3-4b6b-bf1b-5e861422eb1b.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fixed bugs regarding `EduType`not being exported, and enum typings",
+  "packageName": "@microsoft/teams-js",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@microsoft-teams-js-4a860473-7a5b-481e-890b-4132b304af2e.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fixed a bug causing `buffer` polyfill to stil be included",
+  "packageName": "@microsoft/teams-js",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

package.json

@@ -86,7 +86,6 @@
     "prettier": "^3.3.2",
     "rimraf": "^5.0.7",
     "rollup": "^4.24.4",
-    "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-polyfill-node": "^0.13.0",
     "shx": "^0.3.4",
     "style-loader": "^3.3.4",

packages/teams-js/package.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/OfficeDev/microsoft-teams-library-js"
   },
   "main": "./dist/umd/MicrosoftTeams.min.js",
-  "typings": "./dist/umd/MicrosoftTeams.d.ts",
+  "typings": "./dist/esm/packages/teams-js/dts/index.d.ts",
   "module": "./dist/esm/packages/teams-js/src/index.js",
   "scripts": {
     "build": "pnpm clean && pnpm lint && pnpm build-rollup && pnpm build-webpack && pnpm docs:validate",

packages/teams-js/rollup.config.mjs

@@ -7,7 +7,6 @@ import replace from '@rollup/plugin-replace';
 import terser from '@rollup/plugin-terser';
 import typescript from '@rollup/plugin-typescript';
 import { readFileSync } from 'fs';
-import dts from 'rollup-plugin-dts';
 import nodePolyfills from 'rollup-plugin-polyfill-node';
 
 const packageJson = JSON.parse(readFileSync('./package.json', 'utf-8'));
@@ -43,7 +42,7 @@ export default [
       typescript(),
       json(),
       commonjs(),
-      nodePolyfills(),
+      nodePolyfills({ exclude: ['node_modules/**'] }),
     ],
     treeshake: {
       moduleSideEffects: [
@@ -59,13 +58,4 @@ export default [
       ],
     },
   },
-  {
-    input: './dist/esm/packages/teams-js/dts/index.d.ts',
-    output: {
-      file: 'dist/umd/MicrosoftTeams.d.ts',
-      format: 'es',
-      sourcemap: false,
-    },
-    plugins: [dts()],
-  },
 ];

packages/teams-js/src/public/index.ts

@@ -21,6 +21,7 @@ export {
   DeepLinkParameters,
   DialogInfo,
   DialogSize,
+  EduType,
   ErrorCode,
   FileOpenPreference,
   FrameContext,