Merge pull request #1565 from nickgros/SWC-7242

SWC-7242
Sage-Bionetworks · Feb 14, 2025 · d3fcd0b · d3fcd0b
2 parents ed11a14 + 229a580
commit d3fcd0b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/packages/synapse-react-client/vite.config.ts b/packages/synapse-react-client/vite.config.ts
@@ -6,8 +6,13 @@ import { ConfigBuilder } from 'vite-config'
  */
 const config = new ConfigBuilder()
   .setIncludeReactConfig(true)
-  .setIncludeLibraryConfig(true)
-  .setBuildLibEntry(resolve(__dirname, 'src/index.ts'))
+  .setIncludeLibraryConfig(true, {
+    except: [
+      // Include @sage-bionetworks/synapse-types because the local version may drift from the version released on NPM
+      '@sage-bionetworks/synapse-types',
+    ],
+  })
+  .setBuildLibEntry(resolve(__dirname, 'src/umd.index.ts'))
   .setConfigOverrides({
     root: '.',
     build: {

diff --git a/packages/vite-config/src/ConfigBuilder.ts b/packages/vite-config/src/ConfigBuilder.ts
@@ -5,15 +5,14 @@ import viteLibraryConfig from './vite-library-config.js'
 import vitestConfig from './vitest-config.js'
 
 export class ConfigBuilder {
-  private includeReactConfig = false
   private includeLibraryConfig = false
   private buildLibEntry: string | string[] | undefined = undefined
   private includeVitestConfig = false
   private pluginConfigOptions: PluginConfigOptions = {}
   private configOverrides: Record<string, any> | null = null
 
   setIncludeReactConfig(includeReactConfig: boolean): ConfigBuilder {
-    this.includeReactConfig = includeReactConfig
+    this.pluginConfigOptions.includeReactPlugins = includeReactConfig
     return this
   }
 
@@ -27,15 +26,14 @@ export class ConfigBuilder {
     return this
   }
 
-  setIncludeLibraryConfig(includeLibraryConfig: boolean): ConfigBuilder {
-    this.includeLibraryConfig = includeLibraryConfig
-    return this
-  }
-
-  setPluginConfigOptions(
-    pluginConfigOptions: PluginConfigOptions,
+  setIncludeLibraryConfig(
+    includeLibraryConfig: boolean,
+    externalizeDepsOptions?: Parameters<
+      typeof getPluginConfig
+    >[0]['externalizeDepsOptions'],
   ): ConfigBuilder {
-    this.pluginConfigOptions = pluginConfigOptions
+    this.includeLibraryConfig = includeLibraryConfig
+    this.pluginConfigOptions.externalizeDepsOptions = externalizeDepsOptions
     return this
   }
 
@@ -63,7 +61,7 @@ export class ConfigBuilder {
     if (this.pluginConfigOptions) {
       config = mergeConfig(config, {
         plugins: getPluginConfig({
-          includeReactPlugins: this.includeReactConfig,
+          ...this.pluginConfigOptions,
           includeLibraryPlugins: this.includeLibraryConfig,
         }),
       })

diff --git a/packages/vite-config/src/pluginConfig.ts b/packages/vite-config/src/pluginConfig.ts
@@ -8,6 +8,7 @@ import dts from 'vite-plugin-dts'
 export type PluginConfigOptions = {
   includeReactPlugins?: boolean
   includeLibraryPlugins?: boolean
+  externalizeDepsOptions?: Parameters<typeof externalizeDeps>[0]
 }
 
 /**
@@ -34,14 +35,18 @@ const REACT_PLUGINS: PluginOption[] = [
 /**
  * Plugins that libraries that should emit ESM and CJS bundles will use
  */
-const LIBRARY_PLUGINS: PluginOption[] = [
-  // Do not bundle any dependencies; the consumer's bundler will resolve and link them.
-  externalizeDeps(),
-  // Generate a single type definition file for distribution.
-  dts({
-    rollupTypes: true,
-  }),
-]
+function getLibraryPlugins(
+  externalizeDepsOptions?: Parameters<typeof externalizeDeps>[0],
+): PluginOption[] {
+  return [
+    // Do not bundle any dependencies; the consumer's bundler will resolve and link them.
+    externalizeDeps(externalizeDepsOptions),
+    // Generate a single type definition file for distribution.
+    dts({
+      rollupTypes: true,
+    }),
+  ]
+}
 
 /**
  * Get a shared configuration of Vite plugins to use based on the provided options. Note that Vite does not deeply merge
@@ -53,7 +58,7 @@ export function getPluginConfig(options: PluginConfigOptions): PluginOption[] {
     plugins.push(...REACT_PLUGINS)
   }
   if (options.includeLibraryPlugins) {
-    plugins.push(...LIBRARY_PLUGINS)
+    plugins.push(...getLibraryPlugins(options.externalizeDepsOptions))
   }
   return plugins
 }