From f640036c935c6bdfe9e23069c8e5f21b6cc26813 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 22 May 2026 00:44:10 +0000 Subject: [PATCH 1/2] Move __VERSION__ define into root base configs The root package.json and all workspace packages share the same version, so defining __VERSION__ once in tsdown.base.ts and vitest.base.ts removes the per-package override boilerplate. --- packages/plugin-sdk/tsdown.config.ts | 5 ----- packages/plugin-sdk/vitest.config.ts | 13 +------------ vitest.base.ts | 3 +++ 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/packages/plugin-sdk/tsdown.config.ts b/packages/plugin-sdk/tsdown.config.ts index ceaf0ae..67bd5b1 100644 --- a/packages/plugin-sdk/tsdown.config.ts +++ b/packages/plugin-sdk/tsdown.config.ts @@ -3,14 +3,9 @@ import { defineConfig, mergeConfig } from 'tsdown'; // @ts-ignore - base config is defined outside of this package import baseConfig from '../../tsdown.base.ts'; -import packageJson from './package.json' with { type: 'json' }; - export default mergeConfig( baseConfig, defineConfig({ - define: { - __VERSION__: JSON.stringify(packageJson.version), - }, format: { umd: { deps: { diff --git a/packages/plugin-sdk/vitest.config.ts b/packages/plugin-sdk/vitest.config.ts index c3e1107..32121e0 100644 --- a/packages/plugin-sdk/vitest.config.ts +++ b/packages/plugin-sdk/vitest.config.ts @@ -1,15 +1,4 @@ -import { defineConfig, mergeConfig } from 'vitest/config'; - // @ts-ignore - base config is defined outside of this package import baseConfig from '../../vitest.base.ts'; -import packageJson from './package.json' with { type: 'json' }; - -export default mergeConfig( - baseConfig, - defineConfig({ - define: { - __VERSION__: JSON.stringify(packageJson.version), - }, - }), -); +export default baseConfig; diff --git a/vitest.base.ts b/vitest.base.ts index d84730c..a3de5fd 100644 --- a/vitest.base.ts +++ b/vitest.base.ts @@ -1,8 +1,11 @@ import { playwright } from '@vitest/browser-playwright'; import { defineConfig } from 'vitest/config'; +import packageJson from './package.json' with { type: 'json' }; + export default defineConfig({ define: { + __VERSION__: JSON.stringify(packageJson.version), __VITEST_BROWSER__: true.toString(), }, oxc: { From c6d4f3f7aa02876275fbe53f7cb5abc84b4a2c31 Mon Sep 17 00:00:00 2001 From: Pearce Ropion Date: Sat, 23 May 2026 09:12:39 -0700 Subject: [PATCH 2/2] Cleanup shared configs --- packages/plugin-sdk/tsconfig.app.json | 6 ++++-- packages/plugin-sdk/tsdown.config.ts | 19 +++++++++++++++++++ packages/plugin-sdk/vitest.config.ts | 16 +++++++++++++++- tsconfig.app.json | 5 ++--- tsdown.base.ts | 13 ------------- vitest.base.ts | 11 +---------- 6 files changed, 41 insertions(+), 29 deletions(-) diff --git a/packages/plugin-sdk/tsconfig.app.json b/packages/plugin-sdk/tsconfig.app.json index 2ed40b8..7c5d328 100644 --- a/packages/plugin-sdk/tsconfig.app.json +++ b/packages/plugin-sdk/tsconfig.app.json @@ -1,7 +1,9 @@ { "extends": "../../tsconfig.app.json", "compilerOptions": { - "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo" + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", + + "jsx": "react", }, - "include": ["src"] + "include": ["src"], } diff --git a/packages/plugin-sdk/tsdown.config.ts b/packages/plugin-sdk/tsdown.config.ts index 67bd5b1..f9d89e2 100644 --- a/packages/plugin-sdk/tsdown.config.ts +++ b/packages/plugin-sdk/tsdown.config.ts @@ -3,9 +3,15 @@ import { defineConfig, mergeConfig } from 'tsdown'; // @ts-ignore - base config is defined outside of this package import baseConfig from '../../tsdown.base.ts'; +import packageJson from './package.json' with { type: 'json' }; + export default mergeConfig( baseConfig, defineConfig({ + define: { + __VERSION__: JSON.stringify(packageJson.version), + }, + format: { umd: { deps: { @@ -16,6 +22,19 @@ export default mergeConfig( // or TS will throw a type error. skipNodeModulesBundle: false, }, + outputOptions: { + entryFileNames: 'sigmacomputing-plugin.umd.js', + globals: { + react: 'React', + }, + name: 'SigmaPlugin', + }, + }, + }, + + inputOptions: { + transform: { + jsx: 'react', }, }, }), diff --git a/packages/plugin-sdk/vitest.config.ts b/packages/plugin-sdk/vitest.config.ts index 32121e0..580f5c0 100644 --- a/packages/plugin-sdk/vitest.config.ts +++ b/packages/plugin-sdk/vitest.config.ts @@ -1,4 +1,18 @@ +import { mergeConfig } from 'vitest/config'; + // @ts-ignore - base config is defined outside of this package import baseConfig from '../../vitest.base.ts'; -export default baseConfig; +import packageJson from './package.json' with { type: 'json' }; + +export default mergeConfig(baseConfig, { + define: { + __VERSION__: JSON.stringify(packageJson.version), + }, + optimizeDeps: { + include: ['react/jsx-dev-runtime'], + }, + oxc: { + jsx: { runtime: 'automatic' }, + }, +}); diff --git a/tsconfig.app.json b/tsconfig.app.json index 15eb924..8d5db5e 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -5,7 +5,6 @@ "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", "lib": ["DOM", "ESNext"], - "jsx": "react", - "types": ["vitest/globals"] - } + "types": ["vitest/globals"], + }, } diff --git a/tsdown.base.ts b/tsdown.base.ts index 4b21087..5b1ee62 100644 --- a/tsdown.base.ts +++ b/tsdown.base.ts @@ -1,7 +1,5 @@ import { defineConfig } from 'tsdown'; -import packageJson from './package.json' with { type: 'json' }; - export default defineConfig({ clean: true, failOnWarn: true, @@ -23,26 +21,15 @@ export default defineConfig({ umd: { outputOptions: { dir: './dist/umd', - entryFileNames: 'sigmacomputing-plugin.umd.js', - globals: { - react: 'React', - }, minify: true, - name: 'SigmaPlugin', }, }, }, - inputOptions: { - transform: { - jsx: 'react', - }, - }, platform: 'browser', sourcemap: true, tsconfig: './tsconfig.app.json', define: { - __VERSION__: JSON.stringify(packageJson.version), __VITEST_BROWSER__: false.toString(), }, diff --git a/vitest.base.ts b/vitest.base.ts index a3de5fd..d54a2a8 100644 --- a/vitest.base.ts +++ b/vitest.base.ts @@ -1,22 +1,13 @@ import { playwright } from '@vitest/browser-playwright'; import { defineConfig } from 'vitest/config'; -import packageJson from './package.json' with { type: 'json' }; - export default defineConfig({ define: { - __VERSION__: JSON.stringify(packageJson.version), __VITEST_BROWSER__: true.toString(), }, - oxc: { - jsx: { runtime: 'automatic' }, - }, - optimizeDeps: { - include: ['react/jsx-dev-runtime'], - }, test: { globals: true, - include: ['src/**/*.test.{js,jsx,ts,tsx}'], + include: ['src/**/*.test.{ts,tsx}'], browser: { enabled: true, provider: playwright(),