refactored dist folder

OfficeDev · Sep 25, 2024 · 890981b · 890981b
1 parent 83a5840
commit 890981b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/apps/typed-dependency-tester/package.json b/apps/typed-dependency-tester/package.json
@@ -6,7 +6,7 @@
   "version": "0.0.1",
   "scripts": {
     "build": "pnpm i && pnpm copy && pnpm tsc && pnpm clean",
-    "copy": "cp ./node_modules/@microsoft/teams-js/dist/MicrosoftTeams.d.ts ./ || xcopy .\\node_modules\\@microsoft\\teams-js\\dist\\MicrosoftTeams.d.ts .\\ /Y",
+    "copy": "cp ./node_modules/@microsoft/teams-js/dist/umd/MicrosoftTeams.d.ts ./ || xcopy .\\node_modules\\@microsoft\\teams-js\\dist\\umd\\MicrosoftTeams.d.ts .\\ /Y",
     "clean": "rimraf node_modules && rimraf MicrosoftTeams.d.ts"
   },
   "dependencies": {},

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

diff --git a/packages/teams-js/rollup.config.mjs b/packages/teams-js/rollup.config.mjs
@@ -13,7 +13,7 @@ import version from './package.json' assert { type: 'json' };
 export default {
   input: './src/index.ts',
   output: {
-    dir: 'dist/',
+    dir: 'dist/esm',
     name: '@microsoft/teams-js',
     format: 'es',
     preserveModules: true,

diff --git a/packages/teams-js/tsconfig.json b/packages/teams-js/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.common.json",
   "compilerOptions": {
-    "outDir": "./dist",
-    "declarationDir": "./dist/packages/teams-js/dts",
+    "outDir": "./dist/esm",
+    "declarationDir": "./dist/esm/packages/teams-js/dts",
     "lib": ["DOM", "ES2015", "ES5"],
     "module": "es6",
     "moduleResolution": "node",

diff --git a/packages/teams-js/webpack.config.cjs b/packages/teams-js/webpack.config.cjs
@@ -23,7 +23,7 @@ module.exports = {
     filename: '[name].js',
     // the following setting is required for SRI to work
     crossOriginLoading: 'anonymous',
-    path: path.resolve(__dirname, 'dist'),
+    path: path.resolve(__dirname, 'dist/umd'),
     library: {
       name: libraryName,
       type: 'umd',
@@ -75,8 +75,8 @@ module.exports = {
 
     new DtsBundleWebpack({
       name: '@microsoft/teams-js',
-      main: './dist/packages/teams-js/dts',
-      out: '~/dist/MicrosoftTeams.d.ts',
+      main: './dist/esm/packages/teams-js/dts',
+      out: '~/dist/umd/MicrosoftTeams.d.ts',
       removeSource: true,
       outputAsModuleFolder: true,
     }),
@@ -98,7 +98,7 @@ module.exports = {
     {
       apply: (compiler) => {
         compiler.hooks.done.tap('wsi-test', () => {
-          const manifest = JSON.parse(readFileSync(join(__dirname, 'dist/MicrosoftTeams-manifest.json'), 'utf-8'));
+          const manifest = JSON.parse(readFileSync(join(__dirname, 'dist/umd/MicrosoftTeams-manifest.json'), 'utf-8'));
           // If for some reason hash was not generated for the assets, this test will fail in build.
           expect(manifest['MicrosoftTeams.min.js'].integrity).toMatch(/sha384-.*/);
         });
@@ -110,7 +110,7 @@ module.exports = {
         onEnd: {
           copy: [
             {
-              source: './dist/MicrosoftTeams.min.js',
+              source: './dist/umd/MicrosoftTeams.min.js',
               destination: '../../apps/blazor-test-app/wwwroot/js/MicrosoftTeams.min.js',
             },
           ],

diff --git a/tools/yaml-templates/build-test-publish.yml b/tools/yaml-templates/build-test-publish.yml
@@ -93,10 +93,9 @@ steps:
 
   - task: CopyFiles@2
     inputs:
-      sourceFolder: 'packages\teams-js\dist'
+      sourceFolder: 'packages\teams-js\dist\umd'
       Contents: |
         **\?(*.js|*.ts|*.map)
-        !**\?(_virtual\**|node_modules\**|packages\**)
       targetFolder: '$(Build.ArtifactStagingDirectory)\CDNFeed\$(package.version)\js'
     displayName: 'Copy TeamsJS Content for CDN'