chore: Let the different tsconfig share the paths (#1980)

Except for reflect-server which cannot reference replicache because then
we end up pulling in DOM types that are not present on the server.

apps/zeppliear/tsconfig.json

@@ -3,15 +3,7 @@
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "noEmit": true,
-    "jsx": "react-jsx",
-    "paths": {
-      "@rocicorp/zql": ["../../packages/zql/src/mod.ts"],
-      "@rocicorp/zql/src/*": ["../../packages/zql/src/*"],
-      "shared/src/*": ["../../packages/shared/src/*"],
-      "zero-client": ["../../packages/zero-client/src/mod.ts"],
-      "replicache": ["../../packages/replicache/src/mod.ts"],
-      "replicache/src/*": ["../../packages/replicache/src/*"]
-    }
+    "jsx": "react-jsx"
   },
   "references": [{"path": "./tsconfig.node.json"}],
   "include": ["src"]

apps/zeppliear/vite.config.ts

@@ -1,10 +1,11 @@
-import {defineConfig} from 'vite';
 import react from '@vitejs/plugin-react';
+import {defineConfig} from 'vite';
 import svgr from 'vite-plugin-svgr';
+import tsconfigPaths from 'vite-tsconfig-paths';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [svgr(), react()],
+  plugins: [tsconfigPaths(), svgr(), react()],
   build: {
     target: 'esnext',
   },

packages/datadog/package.json

@@ -20,12 +20,7 @@
     "check-types": "tsc --noEmit",
     "format": "prettier --write *",
     "check-format": "prettier --check *",
-    "lint": "eslint --ext .ts,.tsx,.js,.jsx src/",
-    "build": "tsc"
-  },
-  "exports": {
-    ".": "./out/mod.js",
-    "./src/mod.js": "./out/mod.js"
+    "lint": "eslint --ext .ts,.tsx,.js,.jsx src/"
   },
   "eslintConfig": {
     "extends": "@rocicorp/eslint-config"

packages/reflect-client/tsconfig.json

@@ -1,18 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "lib": ["dom", "es2022"],
-    "paths": {
-      "replicache": ["../replicache/src/mod.ts"],
-      "replicache/src/*": ["../replicache/src/*"],
-      "shared/src/*": ["../shared/src/*"],
-      "reflect-shared": ["../reflect-shared/src/mod.ts"],
-      "reflect-shared/src/*": ["../reflect-shared/src/*"],
-      "datadog": ["../datadog/src/mod.ts"],
-      "datadog/src/*": ["../datadog/src/*"],
-      "reflect-protocol": ["../reflect-protocol/src/mod.ts"],
-      "reflect-protocol/src/*": ["../reflect-protocol/src/*"]
-    }
+    "lib": ["dom", "es2022"]
   },
   "include": ["src/**/*.ts"]
 }

packages/reflect-react/rollup.config.js

@@ -1,3 +1,6 @@
 import {makeInputOptions} from 'shared/src/tool/rollup-dts.js';
 
-export default makeInputOptions('out/.dts/mod.d.ts', 'out/reflect-react.d.ts');
+export default makeInputOptions(
+  'out/.dts/reflect-react/src/mod.d.ts',
+  'out/reflect-react.d.ts',
+);

packages/reflect-server/rollup.config.js

@@ -1,6 +1,6 @@
 import {makeInputOptions} from 'shared/src/tool/rollup-dts.js';
 
 export default makeInputOptions(
-  'out/.dts/src/mod.d.ts',
+  'out/.dts/reflect-server/src/mod.d.ts',
   'out/reflect-server.d.ts',
 );

packages/reflect-server/tsconfig.json

@@ -2,7 +2,16 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "lib": ["es2022"],
-    "types": ["@cloudflare/workers-types"]
+    "types": ["@cloudflare/workers-types"],
+    "baseUrl": "../",
+    "paths": {
+      "cf-shared/src/*": ["cf-shared/src/*"],
+      "datadog": ["datadog/src/mod.ts"],
+      "reflect-shared/src/*": ["reflect-shared/src/*"],
+      "reflect-protocol": ["reflect-protocol/src/mod.ts"],
+      "reflect-protocol/src/*": ["reflect-protocol/src/*"],
+      "shared/src/*": ["shared/src/*"]
+    }
   },
   "include": ["**/*.ts"]
 }

packages/reflect-shared/tsconfig.json

@@ -1,10 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "paths": {
-      "replicache": ["../replicache/src/mod.ts"],
-      "replicache/src/*": ["../replicache/src/*"]
-    }
-  },
   "include": ["src/**/*.ts", "src/**/*.js"]
 }

packages/replicache/tsconfig.json

@@ -1,10 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "lib": ["dom", "es2022"],
-    "paths": {
-      "shared/src/*": ["../shared/src/*"]
-    }
+    "lib": ["dom", "es2022"]
   },
   "include": ["src/**/*.ts"]
 }

packages/shared/package.json

@@ -26,6 +26,7 @@
     "@vitest/browser": "^1.5.2",
     "fast-check": "^3.18.0",
     "rollup-plugin-dts": "^5.3.0",
+    "rollup-plugin-tsconfig-paths": "^1.5.2",
     "typescript": "^5.4.2",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.5.2"

packages/shared/src/tool/jest-config.js

@@ -24,6 +24,8 @@ export const jestConfig = {
   },
   moduleNameMapper: {
     '^cf-shared/(.*)\\.js$': '<rootDir>/../../packages/cf-shared/$1',
+    '^datadog$': '<rootDir>/../../packages/datadog/src/mod.ts',
+    '^datadog/(.*)\\.js$': '<rootDir>/../../packages/datadog/$1',
     '^shared/(.*)\\.js$': '<rootDir>/../../packages/shared/$1',
     '^reflect-shared/(.*)\\.js$': '<rootDir>/../../packages/reflect-shared/$1',
     '^reflect-protocol/(.*)\\.js$':

packages/shared/src/tool/rollup-dts.js

@@ -2,6 +2,7 @@
 
 import {nodeResolve} from '@rollup/plugin-node-resolve';
 import dts from 'rollup-plugin-dts';
+import tsConfigPaths from 'rollup-plugin-tsconfig-paths';
 
 // We only use rollup for creating a bundled d.ts file.
 // We use esbuild for building the actual code.
@@ -20,6 +21,7 @@ export function makeInputOptions(input, outputFile) {
     },
     external: ['@rocicorp/lock', '@rocicorp/logger', '@rocicorp/resolver'],
     plugins: [
+      tsConfigPaths(),
       nodeResolve(),
       dts({
         respectExternal: true,

packages/zero-client/package.json

@@ -45,7 +45,7 @@
     "out"
   ],
   "exports": {
-    ".": "./out/zero-client.js"
+    ".": "./src/mod.ts"
   },
   "eslintConfig": {
     "extends": "@rocicorp/eslint-config"

packages/zero-client/tsconfig.json

@@ -1,17 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "lib": ["dom", "esnext"],
-    "paths": {
-      "@rocicorp/zql": ["../zql/src/mod.ts"],
-      "@rocicorp/zql/src/*": ["../zql/src/*"],
-      "datadog": ["../datadog/src/mod.ts"],
-      "replicache": ["../replicache/src/mod.ts"],
-      "replicache/src/*": ["../replicache/src/*"],
-      "shared/src/*": ["../shared/src/*"],
-      "zero-protocol": ["../zero-protocol/src/mod.ts"],
-      "zero-protocol/src/*": ["../zero-protocol/src/*"]
-    }
+    "lib": ["dom", "esnext"]
   },
   "include": ["src/**/*.ts"]
 }

packages/zql/tsconfig.json

@@ -1,12 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "lib": ["ESNext.Array", "ESNext", "DOM"],
-    "paths": {
-      "zero-client/src/*": ["../zero-client/src/*"],
-      "replicache": ["../replicache/src/mod.ts"],
-      "replicache/src/*": ["../replicache/src/*"]
-    }
+    "lib": ["ESNext.Array", "ESNext", "DOM"]
   },
   "include": ["src/**/*.ts"]
 }

tsconfig.json

@@ -21,6 +21,26 @@
     "resolveJsonModule": true,
     "incremental": true,
     "ignoreDeprecations": "5.0",
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "baseUrl": "./packages/",
+    "paths": {
+      "@rocicorp/zql": ["zql/src/mod.ts"],
+      "@rocicorp/zql/src/*": ["zql/src/*"],
+      "cf-shared/src/*": ["../cf-shared/src/*"],
+      "datadog": ["datadog/src/mod.ts"],
+      "datadog/src/*": ["datadog/src/*"],
+      "reflect-protocol": ["reflect-protocol/src/mod.ts"],
+      "reflect-protocol/src/*": ["reflect-protocol/src/*"],
+      "reflect-react": ["reflect-react/src/mod.ts"],
+      "reflect-shared": ["reflect-shared/src/mod.ts"],
+      "reflect-shared/src/*": ["reflect-shared/src/*"],
+      "replicache": ["replicache/src/mod.ts"],
+      "replicache/src/*": ["replicache/src/*"],
+      "shared/src/*": ["shared/src/*"],
+      "zero-client": ["zero-client/src/mod.ts"],
+      "zero-client/src/*": ["zero-client/src/*"],
+      "zero-protocol": ["zero-protocol/src/mod.ts"],
+      "zero-protocol/src/*": ["zero-protocol/src/*"]
+    }
   }
 }