ref(dev): Unify typescript config files

.eslintrc.js

@@ -1,3 +1,6 @@
+// Note: All paths are relative to the directory in which eslint is being run, rather than the directory where this file
+// lives
+
 module.exports = {
   root: true,
   env: {
@@ -7,20 +10,18 @@ module.exports = {
     ecmaVersion: 2018,
   },
   extends: ['@sentry-internal/sdk'],
-  ignorePatterns: [
-    'coverage/**',
-    'build/**',
-    'dist/**',
-    'esm/**',
-    'examples/**',
-    'scripts/**',
-    'test/manual/**',
-  ],
+  ignorePatterns: ['coverage/**', 'build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**', 'test/manual/**'],
   overrides: [
     {
       files: ['*.ts', '*.tsx', '*.d.ts'],
       parserOptions: {
-        project: './tsconfig.json',
+        project: ['tsconfig.json'],
+      },
+    },
+    {
+      files: ['test/**/*.ts', 'test/**/*.tsx'],
+      parserOptions: {
+        project: ['tsconfig.test.json'],
       },
     },
     {

packages/angular/package.json

@@ -37,13 +37,15 @@
     "typescript": "3.7.5"
   },
   "scripts": {
-    "build": "run-p build:es5 build:esm",
+    "build": "run-p build:cjs build:esm",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
     "build:dev": "run-s build",
-    "build:es5": "tsc -p tsconfig.build.json",
+    "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
     "build:esm": "tsc -p tsconfig.esm.json",
-    "build:watch": "run-p build:es5:watch build:esm:watch",
+    "build:watch": "run-p build:cjs:watch build:esm:watch",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
     "build:dev:watch": "run-s build:watch",
-    "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
+    "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage",

packages/angular/tsconfig.cjs.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist"
+  }
+}

packages/angular/tsconfig.esm.json

@@ -1,9 +1,8 @@
 {
-  "extends": "../../tsconfig.esm.json",
+  "extends": "./tsconfig.json",
+
   "compilerOptions": {
-    "baseUrl": ".",
-    "outDir": "esm",
-    "experimentalDecorators": true
-  },
-  "include": ["src/**/*"]
+    "module": "es6",
+    "outDir": "esm"
+  }
 }

packages/angular/tsconfig.json

@@ -1,8 +1,10 @@
 {
-  "extends": "./tsconfig.build.json",
-  "include": ["src/**/*.ts"],
-  "exclude": ["dist"],
+  "extends": "../../tsconfig.json",
+
+  "include": ["src/**/*"],
+
   "compilerOptions": {
-    "rootDir": "."
+    // package-specific options
+    "experimentalDecorators": true
   }
 }

packages/angular/tsconfig.test.json

@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+
+  "include": ["test/**/*"],
+
+  "compilerOptions": {
+    // should include all types from `./tsconfig.json` plus types for all test frameworks used
+    "types": ["jest"]
+
+    // other package-specific, test-specific options
+  }
+}

packages/browser/package.json

@@ -54,15 +54,17 @@
     "webpack": "^4.30.0"
   },
   "scripts": {
-    "build": "run-s build:es5 build:esm build:bundle",
+    "build": "run-p build:cjs build:esm build:bundle",
     "build:bundle": "rollup --config",
-    "build:dev": "run-s build:es5 build:esm",
-    "build:es5": "tsc -p tsconfig.build.json",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:dev": "run-p build:cjs build:esm",
+    "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
     "build:esm": "tsc -p tsconfig.esm.json",
-    "build:watch": "run-p build:es5:watch build:esm:watch build:bundle:watch",
+    "build:watch": "run-p build:cjs:watch build:esm:watch build:bundle:watch",
     "build:bundle:watch": "rollup --config --watch",
-    "build:dev:watch": "run-p build:es5:watch build:esm:watch",
-    "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
+    "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
+    "build:dev:watch": "run-p build:cjs:watch build:esm:watch",
     "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage .rpt2_cache",

packages/browser/rollup.config.js

@@ -37,13 +37,13 @@ const paths = {
 
 const plugins = [
   typescript({
-    tsconfig: 'tsconfig.build.json',
+    tsconfig: 'tsconfig.esm.json',
     tsconfigOverride: {
       compilerOptions: {
         declaration: false,
         declarationMap: false,
-        module: 'ES2015',
         paths,
+        baseUrl: '.',
       },
     },
     include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
@@ -103,13 +103,13 @@ export default [
     },
     plugins: [
       typescript({
-        tsconfig: 'tsconfig.build.json',
+        tsconfig: 'tsconfig.esm.json',
         tsconfigOverride: {
           compilerOptions: {
             declaration: false,
             declarationMap: false,
-            module: 'ES2015',
             paths,
+            baseUrl: '.',
             target: 'es6',
           },
         },
@@ -126,13 +126,13 @@ export default [
     },
     plugins: [
       typescript({
-        tsconfig: 'tsconfig.build.json',
+        tsconfig: 'tsconfig.esm.json',
         tsconfigOverride: {
           compilerOptions: {
             declaration: false,
             declarationMap: false,
-            module: 'ES2015',
             paths,
+            baseUrl: '.',
             target: 'es6',
           },
         },

packages/browser/tsconfig.cjs.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist"
+  }
+}

packages/browser/tsconfig.esm.json

@@ -1,8 +1,8 @@
 {
-  "extends": "../../tsconfig.esm.json",
+  "extends": "./tsconfig.json",
+
   "compilerOptions": {
-    "baseUrl": ".",
+    "module": "es6",
     "outDir": "esm"
-  },
-  "include": ["src/**/*"]
+  }
 }

packages/browser/tsconfig.json

@@ -1,9 +1,9 @@
 {
-  "extends": "./tsconfig.build.json",
-  "include": ["src/**/*", "test/**/*"],
-  "exclude": ["dist"],
+  "extends": "../../tsconfig.json",
+
+  "include": ["src/**/*"],
+
   "compilerOptions": {
-    "rootDir": ".",
-    "types": ["node", "mocha", "chai", "sinon", "jest"]
+    // package-specific options
   }
 }

packages/browser/tsconfig.test.json

@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+
+  "include": ["test/**/*"],
+
+  "compilerOptions": {
+    // should include all types from `./tsconfig.json` plus types for all test frameworks used
+    "types": ["node", "mocha", "chai", "sinon", "jest"]
+
+    // other package-specific, test-specific options
+  }
+}

packages/core/package.json

@@ -30,13 +30,15 @@
     "typescript": "3.7.5"
   },
   "scripts": {
-    "build": "run-p build:es5 build:esm",
+    "build": "run-p build:cjs build:esm",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
     "build:dev": "run-s build",
-    "build:es5": "tsc -p tsconfig.build.json",
+    "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
     "build:esm": "tsc -p tsconfig.esm.json",
-    "build:watch": "run-p build:es5:watch build:esm:watch",
+    "build:watch": "run-p build:cjs:watch build:esm:watch",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
     "build:dev:watch": "run-s build:watch",
-    "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
+    "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm coverage",

packages/core/tsconfig.cjs.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist"
+  }
+}

packages/core/tsconfig.esm.json

@@ -1,8 +1,8 @@
 {
-  "extends": "../../tsconfig.esm.json",
+  "extends": "./tsconfig.json",
+
   "compilerOptions": {
-    "baseUrl": ".",
+    "module": "es6",
     "outDir": "esm"
-  },
-  "include": ["src/**/*"]
+  }
 }

packages/core/tsconfig.json

@@ -1,9 +1,9 @@
 {
-  "extends": "./tsconfig.build.json",
-  "include": ["src/**/*.ts", "test/**/*.ts"],
-  "exclude": ["dist"],
+  "extends": "../../tsconfig.json",
+
+  "include": ["src/**/*"],
+
   "compilerOptions": {
-    "rootDir": ".",
-    "types": ["node", "jest"]
+    // package-specific options
   }
 }

packages/core/tsconfig.test.json

@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+
+  "include": ["test/**/*"],
+
+  "compilerOptions": {
+    // should include all types from `./tsconfig.json` plus types for all test frameworks used
+    "types": ["node", "jest"]
+
+    // other package-specific, test-specific options
+  }
+}

packages/gatsby/package.json

@@ -44,13 +44,15 @@
     "typescript": "3.7.5"
   },
   "scripts": {
-    "build": "run-p build:es5 build:esm",
+    "build": "run-p build:cjs build:esm",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
     "build:dev": "run-s build",
-    "build:es5": "tsc -p tsconfig.build.json",
+    "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***",
     "build:esm": "tsc -p tsconfig.esm.json",
-    "build:watch": "run-p build:es5:watch build:esm:watch",
+    "build:watch": "run-p build:cjs:watch build:esm:watch",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
     "build:dev:watch": "run-s build:watch",
-    "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
+    "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf dist esm build coverage",

packages/gatsby/tsconfig.cjs.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist"
+  }
+}

packages/gatsby/tsconfig.esm.json

@@ -1,10 +1,8 @@
 {
-  "extends": "../../tsconfig.esm.json",
+  "extends": "./tsconfig.json",
+
   "compilerOptions": {
-    "esModuleInterop": true,
-    "baseUrl": ".",
-    "outDir": "esm",
-    "jsx": "react"
-  },
-  "include": ["src/**/*"]
+    "module": "es6",
+    "outDir": "esm"
+  }
 }