From 0bee80d8e1cf4f28d0bda9a5ebcb18c830f344a6 Mon Sep 17 00:00:00 2001 From: Damian Tarnawski Date: Wed, 1 Jan 2025 18:34:10 +0100 Subject: [PATCH] Revert "build: Add custom export condition for source files for typescript" This reverts commit 1a9c0e53e7c8bc48cbdd4a976846c14df7ecf449. --- extension/tsconfig.json | 7 +------ packages/debugger/package.json | 15 +++++++++------ packages/frontend/package.json | 10 ---------- packages/logger/package.json | 1 - packages/main/package.json | 4 ---- packages/overlay/package.json | 1 - packages/shared/package.json | 26 +++++++++++++++++++++----- tsconfig.json | 4 ---- 8 files changed, 31 insertions(+), 37 deletions(-) diff --git a/extension/tsconfig.json b/extension/tsconfig.json index 76966da0..8e598771 100644 --- a/extension/tsconfig.json +++ b/extension/tsconfig.json @@ -3,10 +3,5 @@ "compilerOptions": { "outDir": "dist", }, - "include": ["src/**/*"], - "references": [ - {"path": "../packages/shared"}, - {"path": "../packages/frontend"}, - {"path": "../packages/debugger"}, - ], + "include": ["src/**/*"] } diff --git a/packages/debugger/package.json b/packages/debugger/package.json index dab124c6..932a0cc6 100644 --- a/packages/debugger/package.json +++ b/packages/debugger/package.json @@ -27,24 +27,27 @@ "types": "./dist/index.d.ts", "exports": { ".": { - "@solid-devtools/source": "./src/index.ts", "import": { "types": "./dist/index.d.ts", "default": "./dist/index.js" } }, "./bundled": { - "@solid-devtools/source": "./src/index.ts", "import": { "types": "./dist/index.d.ts", "default": "./dist/bundled.js" } }, - "./*": { - "@solid-devtools/source": "./src/*.ts", + "./types": { "import": { - "types": "./dist/*.d.ts", - "default": "./dist/*.js" + "types": "./dist/types.d.ts", + "default": "./dist/types.js" + } + }, + "./setup": { + "import": { + "types": "./dist/setup.d.ts", + "default": "./dist/setup.js" } } }, diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 3ea98ea3..80c70bf5 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -28,16 +28,6 @@ "main": "dist/index.js", "module": "dist/index.js", "types": "dist/index.d.ts", - "exports": { - ".": { - "@solid-devtools/source": "./src/index.tsx", - "import": { - "types": "./dist/index.d.ts", - "default": "./dist/index.js" - } - }, - "./dist/styles.css": "./dist/styles.css" - }, "dependencies": { "@nothing-but/utils": "~0.17.0", "@solid-devtools/debugger": "workspace:^", diff --git a/packages/logger/package.json b/packages/logger/package.json index a2027fff..647b23ae 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -26,7 +26,6 @@ "module": "./dist/server.js", "types": "./dist/index.d.ts", "exports": { - "@solid-devtools/source": "./src/index.ts", "browser": { "development": { "import": "./dist/index.js", diff --git a/packages/main/package.json b/packages/main/package.json index bb2d7bcd..3cd2c040 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -27,7 +27,6 @@ "types": "./dist/index.d.ts", "exports": { ".": { - "@solid-devtools/source": "./src/index.ts", "browser": { "development": { "import": { @@ -46,7 +45,6 @@ } }, "./setup": { - "@solid-devtools/source": "./src/setup.ts", "browser": { "development": { "import": { @@ -65,14 +63,12 @@ } }, "./vite": { - "@solid-devtools/source": "./src/vite.ts", "import": { "types": "./dist/vite.d.ts", "default": "./dist/vite.js" } }, "./babel": { - "@solid-devtools/source": "./src/babel.ts", "import": { "types": "./dist/babel.d.ts", "default": "./dist/babel.js" diff --git a/packages/overlay/package.json b/packages/overlay/package.json index 5af6c309..11d7a5f6 100644 --- a/packages/overlay/package.json +++ b/packages/overlay/package.json @@ -30,7 +30,6 @@ "module": "./dist/index_noop.js", "types": "./dist/index.d.ts", "exports": { - "@solid-devtools/source": "./src/index.tsx", "browser": { "development": { "types": "./dist/index.d.ts", diff --git a/packages/shared/package.json b/packages/shared/package.json index a09e7079..4c27a07b 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -26,16 +26,32 @@ "exports": { ".": { "import": { - "@solid-devtools/source": "./src/index.ts", "types": "./dist/index.d.ts", "default": "./dist/index.js" } }, - "./*": { + "./detect": { "import": { - "@solid-devtools/source": "./src/*.ts", - "types": "./dist/*.d.ts", - "default": "./dist/*.js" + "types": "./dist/detect.d.ts", + "default": "./dist/detect.js" + } + }, + "./primitives": { + "import": { + "types": "./dist/primitives.d.ts", + "default": "./dist/primitives.js" + } + }, + "./utils": { + "import": { + "types": "./dist/utils.d.ts", + "default": "./dist/utils.js" + } + }, + "./theme": { + "import": { + "types": "./dist/theme.d.ts", + "default": "./dist/theme.js" } } }, diff --git a/tsconfig.json b/tsconfig.json index 28fdf384..3a5193e6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -29,10 +29,6 @@ "lib": ["DOM", "DOM.Iterable", "DOM.AsyncIterable", "ESNext"], "jsx": "preserve", "jsxImportSource": "solid-js", - /* - Use source files locally - */ - "customConditions": ["@solid-devtools/source"], /* Checking */