Normalize build for examples (microsoft#13596)

## Description Applies the changes from microsoft#10845 to the other examples. This removes the extra typescript build of the examples: since they are not redistributed packages, they do not require both a CommonJS and esnext build. Some of the examples actually just built esnext modules twice (once under "lib: and once under "dist". Now all of them just build once, and its an esnext build under "lib". Excluded from the change to be ESM only are: - examples/data-objects/webflow: uses mocha which has issues with ESM - examples/utils/example-utils: used by the above. - examples/data-objects/table-document: uses mocha which has issues with ESM - examples/hosts/app-integration/external-data: had issues with its start.js script
yann-achard-MS · Jan 17, 2023 · 32b750c · 32b750c
1 parent 7d47c49
commit 32b750c
Show file tree

Hide file tree

Showing 75 changed files with 167 additions and 407 deletions.
diff --git a/examples/apps/collaborative-textarea/package.json b/examples/apps/collaborative-textarea/package.json
@@ -11,13 +11,13 @@
   },
   "license": "MIT",
   "author": "Microsoft and contributors",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
   "module": "lib/index.js",
-  "types": "dist/index.d.ts",
+  "types": "lib/index.d.ts",
   "scripts": {
     "build": "concurrently npm:build:compile npm:lint",
-    "build:compile": "concurrently npm:tsc npm:build:esnext",
-    "build:esnext": "tsc --project ./tsconfig.esnext.json",
+    "build:compile": "npm run build:esnext",
+    "build:esnext": "tsc",
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
@@ -34,7 +34,6 @@
     "test": "npm run test:jest",
     "test:jest": "jest",
     "test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
-    "tsc": "tsc",
     "webpack": "webpack --env production",
     "webpack:dev": "webpack --env development"
   },

diff --git a/examples/apps/collaborative-textarea/tsconfig.esnext.json b/examples/apps/collaborative-textarea/tsconfig.esnext.json
diff --git a/examples/apps/collaborative-textarea/tsconfig.json b/examples/apps/collaborative-textarea/tsconfig.json
@@ -1,12 +1,8 @@
 {
     "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "dist",
-        "node_modules"
-    ],
     "compilerOptions": {
         "module": "esnext",
-        "outDir": "dist",
+        "outDir": "lib",
         "jsx": "react",
         "types": ["jest", "puppeteer", "jest-environment-puppeteer", "expect-puppeteer", "react", "react-dom"],
     },

diff --git a/examples/apps/contact-collection/tsconfig.json b/examples/apps/contact-collection/tsconfig.json
@@ -1,9 +1,5 @@
 {
     "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "lib",
-        "node_modules"
-    ],
     "compilerOptions": {
         "module": "esnext",
         "outDir": "lib",

diff --git a/examples/apps/data-object-grid/package.json b/examples/apps/data-object-grid/package.json
@@ -11,13 +11,14 @@
   },
   "license": "MIT",
   "author": "Microsoft and contributors",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
   "module": "lib/index.js",
-  "types": "dist/index.d.ts",
+  "types": "lib/index.d.ts",
   "scripts": {
     "build": "concurrently npm:build:compile npm:lint",
-    "build:compile": "concurrently npm:tsc npm:build:copy",
-    "build:copy": "copyfiles -u 1 \"src/**/*.css\" dist/",
+    "build:compile": "concurrently npm:build:esnext npm:build:copy",
+    "build:copy": "copyfiles -u 1 \"src/**/*.css\" lib/",
+    "build:esnext": "tsc",
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
@@ -36,7 +37,6 @@
     "test": "npm run test:jest",
     "test:jest": "jest",
     "test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
-    "tsc": "tsc",
     "webpack": "webpack --env production",
     "webpack:dev": "webpack --env development"
   },

diff --git a/examples/apps/data-object-grid/tsconfig.json b/examples/apps/data-object-grid/tsconfig.json
@@ -1,13 +1,9 @@
 {
     "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "dist",
-        "node_modules"
-    ],
     "compilerOptions": {
+        "module": "esnext",
         "target": "es6",
-        "declarationDir": "./dist",
-        "outDir": "./dist",
+        "outDir": "lib",
         "jsx": "react",
         "types": [
             "jest",

diff --git a/examples/apps/odspsnapshotfetch-perftestapp/package.json b/examples/apps/odspsnapshotfetch-perftestapp/package.json
@@ -15,7 +15,8 @@
   "types": "dist/expressApp.d.ts",
   "scripts": {
     "build": "concurrently npm:build:compile npm:lint",
-    "build:compile": "npm run tsc",
+    "build:compile": "npm run build:esnext",
+    "build:esnext": "tsc",
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
@@ -28,7 +29,6 @@
     "start": "npm run start:spo-df",
     "start:spo": "node dist/expressApp.js --env mode=spo",
     "start:spo-df": "node dist/expressApp.js --env mode=spo-df",
-    "tsc": "tsc",
     "webpack": "webpack --env production",
     "webpack:dev": "webpack --env development"
   },

diff --git a/examples/apps/odspsnapshotfetch-perftestapp/tsconfig.esnext.json b/examples/apps/odspsnapshotfetch-perftestapp/tsconfig.esnext.json
diff --git a/examples/apps/odspsnapshotfetch-perftestapp/tsconfig.json b/examples/apps/odspsnapshotfetch-perftestapp/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "dist",
-        "node_modules"
-    ],
     "compilerOptions": {
+        "module": "esnext",
         "rootDir": "./src",
-        "outDir": "./dist",
+        "outDir": "lib",
         "jsx": "react",
         "composite": true,
         "types": ["node"]
     },
     "include": [
         "src/**/*"
     ]
-}
+}
diff --git a/examples/apps/view-framework-sampler/package.json b/examples/apps/view-framework-sampler/package.json
@@ -11,13 +11,13 @@
   },
   "license": "MIT",
   "author": "Microsoft and contributors",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
   "module": "lib/index.js",
-  "types": "dist/index.d.ts",
+  "types": "lib/index.d.ts",
   "scripts": {
     "build": "concurrently npm:build:compile npm:lint",
-    "build:compile": "concurrently npm:tsc npm:build:esnext",
-    "build:esnext": "tsc --project ./tsconfig.esnext.json",
+    "build:compile": "npm run build:esnext",
+    "build:esnext": "tsc",
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
@@ -34,7 +34,6 @@
     "test": "npm run test:jest",
     "test:jest": "jest",
     "test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
-    "tsc": "tsc",
     "webpack": "webpack --env production",
     "webpack:dev": "webpack --env development"
   },

diff --git a/examples/apps/view-framework-sampler/tsconfig.esnext.json b/examples/apps/view-framework-sampler/tsconfig.esnext.json
diff --git a/examples/apps/view-framework-sampler/tsconfig.json b/examples/apps/view-framework-sampler/tsconfig.json
@@ -1,12 +1,8 @@
 {
     "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "dist",
-        "node_modules"
-    ],
     "compilerOptions": {
         "module": "esnext",
-        "outDir": "dist",
+        "outDir": "lib",
         "jsx": "react",
         "types": [
             "jest",

diff --git a/examples/data-objects/canvas/package.json b/examples/data-objects/canvas/package.json
@@ -11,13 +11,13 @@
   },
   "license": "MIT",
   "author": "Microsoft and contributors",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
   "module": "lib/index.js",
-  "types": "dist/index.d.ts",
+  "types": "lib/index.d.ts",
   "scripts": {
     "build": "concurrently npm:build:compile npm:lint",
-    "build:compile": "concurrently npm:tsc npm:build:esnext",
-    "build:esnext": "tsc --project ./tsconfig.esnext.json",
+    "build:compile": "npm run build:esnext",
+    "build:esnext": "tsc",
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
@@ -38,7 +38,6 @@
     "test": "npm run test:jest",
     "test:jest": "jest",
     "test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
-    "tsc": "tsc",
     "webpack": "webpack --env production",
     "webpack:dev": "webpack --env development"
   },

diff --git a/examples/data-objects/canvas/tsconfig.esnext.json b/examples/data-objects/canvas/tsconfig.esnext.json
diff --git a/examples/data-objects/canvas/tsconfig.json b/examples/data-objects/canvas/tsconfig.json
@@ -1,11 +1,8 @@
 {
     "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "dist",
-        "node_modules"
-    ],
     "compilerOptions": {
-        "outDir": "dist",
+        "module": "esnext",
+        "outDir": "lib",
         "jsx": "react",
         "types": ["jest", "puppeteer", "jest-environment-puppeteer", "expect-puppeteer", "react", "react-dom"],
     },

diff --git a/examples/data-objects/clicker/package.json b/examples/data-objects/clicker/package.json
@@ -11,13 +11,13 @@
   },
   "license": "MIT",
   "author": "Microsoft and contributors",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
   "module": "lib/index.js",
-  "types": "dist/index.d.ts",
+  "types": "lib/index.d.ts",
   "scripts": {
     "build": "concurrently npm:build:compile npm:lint",
-    "build:compile": "concurrently npm:tsc npm:build:esnext",
-    "build:esnext": "tsc --project ./tsconfig.esnext.json",
+    "build:compile": "npm run build:esnext",
+    "build:esnext": "tsc",
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
@@ -38,7 +38,6 @@
     "test": "npm run test:jest",
     "test:jest": "jest",
     "test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
-    "tsc": "tsc",
     "webpack": "webpack --env production",
     "webpack:dev": "webpack --env development"
   },

diff --git a/examples/data-objects/clicker/tsconfig.esnext.json b/examples/data-objects/clicker/tsconfig.esnext.json
diff --git a/examples/data-objects/clicker/tsconfig.json b/examples/data-objects/clicker/tsconfig.json
@@ -1,12 +1,8 @@
 {
     "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "dist",
-        "node_modules"
-    ],
     "compilerOptions": {
         "module": "esnext",
-        "outDir": "dist",
+        "outDir": "lib",
         "jsx": "react",
         "types": ["jest", "puppeteer", "jest-environment-puppeteer", "expect-puppeteer", "react", "react-dom"],
     },

diff --git a/examples/data-objects/codemirror/package.json b/examples/data-objects/codemirror/package.json
@@ -11,13 +11,14 @@
   },
   "license": "MIT",
   "author": "Microsoft and contributors",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
   "module": "lib/index.js",
-  "types": "dist/index.d.ts",
+  "types": "lib/index.d.ts",
   "scripts": {
     "build": "concurrently npm:build:compile npm:lint",
-    "build:compile": "concurrently npm:tsc npm:build:copy",
-    "build:copy": "copyfiles -u 1 \"src/**/*.css\" dist/",
+    "build:compile": "concurrently npm:build:esnext npm:build:copy",
+    "build:copy": "copyfiles -u 1 \"src/**/*.css\" lib/",
+    "build:esnext": "tsc",
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
@@ -36,7 +37,6 @@
     "start:spo": "webpack serve --config webpack.config.js --env mode=spo",
     "start:spo-df": "webpack serve --config webpack.config.js --env mode=spo-df",
     "start:tinylicious": "webpack serve --config webpack.config.js --env mode=tinylicious",
-    "tsc": "tsc",
     "webpack": "webpack --env production",
     "webpack:dev": "webpack --env development"
   },

diff --git a/examples/data-objects/codemirror/tsconfig.json b/examples/data-objects/codemirror/tsconfig.json
@@ -1,13 +1,9 @@
 {
     "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "dist",
-        "node_modules"
-    ],
     "compilerOptions": {
         "target": "es6",
         "module": "esnext",
-        "outDir": "dist",
+        "outDir": "lib",
         "jsx": "react",
         "types": [
             "node"

diff --git a/examples/data-objects/diceroller/package.json b/examples/data-objects/diceroller/package.json
@@ -11,13 +11,13 @@
   },
   "license": "MIT",
   "author": "Microsoft and contributors",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
   "module": "lib/index.js",
-  "types": "dist/index.d.ts",
+  "types": "lib/index.d.ts",
   "scripts": {
     "build": "concurrently npm:build:compile npm:lint",
-    "build:compile": "concurrently npm:tsc npm:build:esnext",
-    "build:esnext": "tsc --project ./tsconfig.esnext.json",
+    "build:compile": "npm run build:esnext",
+    "build:esnext": "tsc",
     "build:full": "concurrently npm:build npm:webpack",
     "build:full:compile": "concurrently npm:build:compile npm:webpack",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
@@ -38,7 +38,6 @@
     "test": "npm run test:jest",
     "test:jest": "jest",
     "test:jest:verbose": "cross-env FLUID_TEST_VERBOSE=1 jest",
-    "tsc": "tsc",
     "webpack": "webpack --env production",
     "webpack:dev": "webpack --env development"
   },

diff --git a/examples/data-objects/diceroller/tsconfig.esnext.json b/examples/data-objects/diceroller/tsconfig.esnext.json
diff --git a/examples/data-objects/diceroller/tsconfig.json b/examples/data-objects/diceroller/tsconfig.json
@@ -1,11 +1,8 @@
 {
     "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "dist",
-        "node_modules"
-    ],
     "compilerOptions": {
-        "outDir": "dist",
+        "module": "esnext",
+        "outDir": "lib",
         "jsx": "react",
         "types": ["react", "react-dom", "jest", "puppeteer", "jest-environment-puppeteer", "expect-puppeteer"]
     },