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 ceaf0ae..f9d89e2 100644 --- a/packages/plugin-sdk/tsdown.config.ts +++ b/packages/plugin-sdk/tsdown.config.ts @@ -11,6 +11,7 @@ export default mergeConfig( define: { __VERSION__: JSON.stringify(packageJson.version), }, + format: { umd: { deps: { @@ -21,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 c3e1107..580f5c0 100644 --- a/packages/plugin-sdk/vitest.config.ts +++ b/packages/plugin-sdk/vitest.config.ts @@ -1,15 +1,18 @@ -import { defineConfig, mergeConfig } from 'vitest/config'; +import { 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 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 d84730c..d54a2a8 100644 --- a/vitest.base.ts +++ b/vitest.base.ts @@ -5,15 +5,9 @@ export default defineConfig({ define: { __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(),