Simplified build

niemyjski · niemyjski · commit c68287eb5d1e · 2021-02-15T18:03:37.000-06:00
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "version": "2.0.0-pre",
   "license": "Apache-2.0",
   "scripts": {
-    "clean": "rimraf dist packages/*/dist examples/*/dist",
+    "clean": "rimraf packages/*/dist examples/*/dist",
     "build": "lage build --scope @exceptionless/* --no-cache --verbose --no-deps",
     "build:cjs": "lage build:cjs --scope @exceptionless/* --no-cache --verbose --no-deps",
     "build:esm": "lage build:esm --scope @exceptionless/* --no-cache --verbose --no-deps",
diff --git a/packages/angularjs/package.json b/packages/angularjs/package.json
@@ -24,17 +24,15 @@
   },
   "private": true,
   "license": "Apache-2.0",
-  "main": "dist/esm/index.js",
+  "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "types": "dist/index.d.ts",
-  "typings": "dist/index.d.ts",
-  "type": "module",
+  "types": "dist/esm/index.d.ts",
   "scripts": {
     "lint": "eslint --cache --ext .ts",
     "lint:fix": "eslint --fix",
-    "build": "tsc -b",
+    "build": "npm run build:esm && npm run build:cjs",
     "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:esm": "tsc -p tsconfig.json",
     "build:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput"
   },
   "devDependencies": {
diff --git a/packages/angularjs/tsconfig.cjs.json b/packages/angularjs/tsconfig.cjs.json
@@ -1,7 +1,9 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.cjs.json",
   "compilerOptions": {
-    "outDir": "dist/cjs"
+    "outDir": "dist/cjs",
+    "rootDir": "src"
   },
-  "include": ["src"]
+  "include": ["src"],
+  "types": ["angular", "angular-mock"]
 }
diff --git a/packages/angularjs/tsconfig.esm.json b/packages/angularjs/tsconfig.esm.json
diff --git a/packages/angularjs/tsconfig.json b/packages/angularjs/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "dist/esm",
     "rootDir": "src"
   },
   "include": ["src"],
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -24,17 +24,15 @@
   },
   "private": true,
   "license": "Apache-2.0",
-  "main": "dist/esm/index.js",
+  "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "types": "dist/index.d.ts",
-  "typings": "dist/index.d.ts",
-  "type": "module",
+  "types": "dist/esm/index.d.ts",
   "scripts": {
     "lint": "eslint --cache --ext .ts",
     "lint:fix": "eslint --fix",
-    "build": "tsc -b",
+    "build": "npm run build:esm && npm run build:cjs",
     "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:esm": "tsc -p tsconfig.json",
     "build:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "test": "mocha --colors --require ts-node/register ./test --exit"
   },
diff --git a/packages/browser/tsconfig.cjs.json b/packages/browser/tsconfig.cjs.json
@@ -1,8 +1,9 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.cjs.json",
   "compilerOptions": {
     "lib": ["DOM", "ESNext"],
-    "outDir": "dist/cjs"
+    "outDir": "dist/cjs",
+    "rootDir": "src"
   },
   "include": ["src"]
 }
diff --git a/packages/browser/tsconfig.esm.json b/packages/browser/tsconfig.esm.json
diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json
@@ -1,9 +1,8 @@
 {
   "extends": "../../tsconfig.json",
-
   "compilerOptions": {
     "lib": ["DOM", "ESNext"],
-    "outDir": "dist",
+    "outDir": "dist/esm",
     "rootDir": "src"
   },
   "include": ["src"]
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -26,16 +26,14 @@
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",
-  "types": "dist/index.d.ts",
-  "typings": "dist/index.d.ts",
-  "type": "module",
+  "types": "dist/esm/index.d.ts",
   "scripts": {
     "lint": "eslint --cache --ext .ts",
     "lint:fix": "eslint --fix",
-    "build": "tsc -b",
+    "build": "npm run build:esm && npm run build:cjs",
     "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:esm": "tsc -p tsconfig.json",
     "build:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
-    "test": "mocha --colors --require ts-node/register ./test --exit"
+    "test": "mocha --colors --require ts-node/register test/**/*"
   }
 }
diff --git a/packages/core/tsconfig.cjs.json b/packages/core/tsconfig.cjs.json
@@ -1,8 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.cjs.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist/cjs"
+    "outDir": "dist/cjs",
+    "rootDir": "src"
   },
   "include": ["src"]
 }
diff --git a/packages/core/tsconfig.esm.json b/packages/core/tsconfig.esm.json
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "dist/esm",
     "rootDir": "src"
   },
   "include": ["src"]
diff --git a/packages/node-submit-sync/package.json b/packages/node-submit-sync/package.json
@@ -24,17 +24,15 @@
   },
   "private": true,
   "license": "Apache-2.0",
-  "main": "dist/esm/index.js",
+  "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "types": "dist/index.d.ts",
-  "typings": "dist/index.d.ts",
-  "type": "module",
+  "types": "dist/esm/index.d.ts",
   "scripts": {
     "lint": "eslint --cache --ext .ts",
     "lint:fix": "eslint --fix",
-    "build": "tsc -b",
+    "build": "npm run build:esm && npm run build:cjs",
     "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:esm": "tsc -p tsconfig.json",
     "build:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput"
   },
   "devDependencies": {
diff --git a/packages/node-submit-sync/tsconfig.cjs.json b/packages/node-submit-sync/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.cjs.json",
   "compilerOptions": {
     "outDir": "dist/cjs"
   },
diff --git a/packages/node-submit-sync/tsconfig.esm.json b/packages/node-submit-sync/tsconfig.esm.json
diff --git a/packages/node-submit-sync/tsconfig.json b/packages/node-submit-sync/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "dist/esm",
     "rootDir": "src"
   },
   "include": ["src"]
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -24,17 +24,15 @@
   },
   "private": true,
   "license": "Apache-2.0",
-  "main": "dist/esm/index.js",
+  "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "types": "dist/index.d.ts",
-  "typings": "dist/index.d.ts",
-  "type": "module",
+  "types": "dist/esm/index.d.ts",
   "scripts": {
     "lint": "eslint --cache --ext .ts",
     "lint:fix": "eslint --fix",
-    "build": "tsc -b",
+    "build": "npm run build:esm && npm run build:cjs",
     "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:esm": "tsc -p tsconfig.json",
     "build:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "test": "mocha --colors --require ts-node/register ./test --exit"
   },
diff --git a/packages/node/tsconfig.cjs.json b/packages/node/tsconfig.cjs.json
@@ -1,7 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.cjs.json",
   "compilerOptions": {
-    "outDir": "dist/cjs"
+    "outDir": "dist/cjs",
+    "rootDir": "src"
   },
   "include": ["src"]
 }
diff --git a/packages/node/tsconfig.esm.json b/packages/node/tsconfig.esm.json
diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "dist/esm",
     "rootDir": "src"
   },
   "include": ["src"]
diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "ES6"
+    "module": "CommonJS",
+    "target": "ES5"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -8,7 +8,7 @@
     "inlineSources": true,
     "importHelpers": true,
     "lib": ["ES2015"],
-    "module": "CommonJS",
+    "module": "ES6",
     "moduleResolution": "Node",
     "noImplicitReturns": true,
     "noUnusedLocals": false,
@@ -18,6 +18,6 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": false,
-    "target": "ES5"
+    "target": "ES2015"
   }
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`{`
`2`		`- "extends": "../../tsconfig.json",`
	`2`	`+ "extends": "../../tsconfig.cjs.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "outDir": "dist/cjs"`
	`4`	`+ "outDir": "dist/cjs",`
	`5`	`+ "rootDir": "src"`
`5`	`6`	`},`
`6`		`- "include": ["src"]`
	`7`	`+ "include": ["src"],`
	`8`	`+ "types": ["angular", "angular-mock"]`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "../../tsconfig.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "outDir": "dist",`
	`4`	`+ "outDir": "dist/esm",`
`5`	`5`	`"rootDir": "src"`
`6`	`6`	`},`
`7`	`7`	`"include": ["src"],`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`{`
`2`		`- "extends": "../../tsconfig.json",`
	`2`	`+ "extends": "../../tsconfig.cjs.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"lib": ["DOM", "ESNext"],`
`5`		`- "outDir": "dist/cjs"`
	`5`	`+ "outDir": "dist/cjs",`
	`6`	`+ "rootDir": "src"`
`6`	`7`	`},`
`7`	`8`	`"include": ["src"]`
`8`	`9`	`}`