chore: Rework rollup externals (#5519)

lachlancollins · web-flow · commit 79484074d80d · 2023-06-03T10:40:59.000+10:00
diff --git a/package.json b/package.json
@@ -81,6 +81,7 @@
     "react-dom": "^18.2.0",
     "rimraf": "^5.0.1",
     "rollup": "^3.23.0",
+    "rollup-plugin-node-externals": "^6.1.0",
     "rollup-plugin-preserve-directives": "^0.2.0",
     "rollup-plugin-visualizer": "^5.9.0",
     "rollup-preset-solid": "^2.0.1",
diff --git a/packages/query-async-storage-persister/rollup.config.mjs b/packages/query-async-storage-persister/rollup.config.mjs
@@ -9,8 +9,5 @@ export default defineConfig(
     jsName: 'QueryAsyncStoragePersister',
     outputFile: 'index',
     entryFile: './src/index.ts',
-    globals: {
-      '@tanstack/query-persist-client-core': 'QueryPersistClientCore',
-    },
   }),
 )
diff --git a/packages/query-broadcast-client-experimental/rollup.config.mjs b/packages/query-broadcast-client-experimental/rollup.config.mjs
@@ -9,9 +9,5 @@ export default defineConfig(
     jsName: 'QueryBroadcastClient',
     outputFile: 'index',
     entryFile: './src/index.ts',
-    globals: {
-      '@tanstack/query-core': 'QueryCore',
-      'broadcast-channel': 'BroadcastChannel',
-    },
   }),
 )
diff --git a/packages/query-core/rollup.config.mjs b/packages/query-core/rollup.config.mjs
@@ -9,6 +9,5 @@ export default defineConfig(
     jsName: 'QueryCore',
     outputFile: 'index',
     entryFile: './src/index.ts',
-    globals: {},
   }),
 )
diff --git a/packages/query-persist-client-core/rollup.config.mjs b/packages/query-persist-client-core/rollup.config.mjs
@@ -9,8 +9,5 @@ export default defineConfig(
     jsName: 'QueryPersistClientCore',
     outputFile: 'index',
     entryFile: './src/index.ts',
-    globals: {
-      '@tanstack/query-core': 'QueryCore',
-    },
   }),
 )
diff --git a/packages/query-sync-storage-persister/rollup.config.mjs b/packages/query-sync-storage-persister/rollup.config.mjs
@@ -9,8 +9,5 @@ export default defineConfig(
     jsName: 'QuerySyncStoragePersister',
     outputFile: 'index',
     entryFile: './src/index.ts',
-    globals: {
-      '@tanstack/query-persist-client-core': 'QueryPersistClientCore',
-    },
   }),
 )
diff --git a/packages/react-query-devtools/rollup.config.mjs b/packages/react-query-devtools/rollup.config.mjs
@@ -9,25 +9,12 @@ export default defineConfig([
     jsName: 'ReactQueryDevtools',
     outputFile: 'index',
     entryFile: './src/index.ts',
-    globals: {
-      react: 'React',
-      'react-dom': 'ReactDOM',
-      '@tanstack/react-query': 'ReactQuery',
-      '@tanstack/query-devtools': 'TanstackQueryDevtools',
-    },
   }),
   buildConfigs({
     name: 'react-query-devtools-prod',
     jsName: 'ReactQueryDevtools',
     outputFile: 'index.prod',
     entryFile: './src/index.ts',
-    globals: {
-      react: 'React',
-      'react-dom': 'ReactDOM',
-      '@tanstack/react-query': 'ReactQuery',
-      '@tanstack/match-sorter-utils': 'MatchSorterUtils',
-      superjson: 'SuperJson',
-    },
     forceDevEnv: true,
     forceBundle: true,
   }),
diff --git a/packages/react-query-persist-client/rollup.config.mjs b/packages/react-query-persist-client/rollup.config.mjs
@@ -9,10 +9,5 @@ export default defineConfig(
     jsName: 'ReactQueryPersistClient',
     outputFile: 'index',
     entryFile: './src/index.ts',
-    globals: {
-      react: 'React',
-      '@tanstack/query-persist-client-core': 'QueryPersistClientCore',
-      '@tanstack/react-query': 'ReactQuery',
-    },
   }),
 )
diff --git a/packages/react-query/rollup.config.mjs b/packages/react-query/rollup.config.mjs
@@ -9,11 +9,5 @@ export default defineConfig(
     jsName: 'ReactQuery',
     outputFile: 'index',
     entryFile: './src/index.ts',
-    globals: {
-      react: 'React',
-      'react-dom': 'ReactDOM',
-      '@tanstack/query-core': 'QueryCore',
-      'react-native': 'ReactNative',
-    },
   }),
 )
diff --git a/packages/vue-query/rollup.config.mjs b/packages/vue-query/rollup.config.mjs
@@ -9,12 +9,5 @@ export default defineConfig(
     jsName: 'VueQuery',
     outputFile: 'index',
     entryFile: './src/index.ts',
-    globals: {
-      '@tanstack/query-core': 'QueryCore',
-      vue: 'Vue',
-      'vue-demi': 'Vue',
-      '@tanstack/match-sorter-utils': 'MatchSorter',
-      '@vue/devtools-api': 'DevtoolsApi',
-    },
   }),
 )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/getRollupConfig.mjs b/scripts/getRollupConfig.mjs
@@ -6,6 +6,7 @@ import { visualizer } from 'rollup-plugin-visualizer'
 import replace from '@rollup/plugin-replace'
 import { nodeResolve } from '@rollup/plugin-node-resolve'
 import commonJS from '@rollup/plugin-commonjs'
+import externals from 'rollup-plugin-node-externals'
 import withSolid from 'rollup-preset-solid'
 import preserveDirectives from 'rollup-plugin-preserve-directives'
 import { rootDir } from './config.mjs'
@@ -33,14 +34,12 @@ const babelPlugin = () =>
  * @param {string} opts.jsName - The JavaScript name.
  * @param {string} opts.outputFile - The output file.
  * @param {string} opts.entryFile - The entry file.
- * @param {Record<string, string>} opts.globals - The globals record.
  * @param {boolean} [opts.forceDevEnv] - Flag indicating whether to force development environment.
  * @param {boolean} [opts.forceBundle] - Flag indicating whether to force bundling.
  * @returns {import('rollup').RollupOptions}
  */
 export function buildConfigs(opts) {
   const input = [opts.entryFile]
-  const externalDeps = Object.keys(opts.globals)
   const forceDevEnv = opts.forceDevEnv || false
   const forceBundle = opts.forceBundle || false
 
@@ -81,12 +80,17 @@ export function buildConfigs(opts) {
   return {
     input,
     output: forceBundle ? bundleOutput : normalOutput,
-    external: (moduleName) => externalDeps.includes(moduleName),
     plugins: [
       commonJS(),
       babelPlugin(),
       nodeResolve({ extensions: ['.ts', '.tsx', '.native.ts'] }),
       forceDevEnv ? forceEnvPlugin('development') : undefined,
+      externals({
+        packagePath: './package.json',
+        deps: true,
+        devDeps: true,
+        peerDeps: true,
+      }),
       preserveDirectives(),
       visualizer({
         filename: `./build/stats-html.html`,

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,5 @@ export default defineConfig(`
`9`	`9`	`jsName: 'QueryAsyncStoragePersister',`
`10`	`10`	`outputFile: 'index',`
`11`	`11`	`entryFile: './src/index.ts',`
`12`		`- globals: {`
`13`		`- '@tanstack/query-persist-client-core': 'QueryPersistClientCore',`
`14`		`- },`
`15`	`12`	`}),`
`16`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,5 @@ export default defineConfig(`
`9`	`9`	`jsName: 'QueryCore',`
`10`	`10`	`outputFile: 'index',`
`11`	`11`	`entryFile: './src/index.ts',`
`12`		`- globals: {},`
`13`	`12`	`}),`
`14`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,5 @@ export default defineConfig(`
`9`	`9`	`jsName: 'QueryPersistClientCore',`
`10`	`10`	`outputFile: 'index',`
`11`	`11`	`entryFile: './src/index.ts',`
`12`		`- globals: {`
`13`		`- '@tanstack/query-core': 'QueryCore',`
`14`		`- },`
`15`	`12`	`}),`
`16`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,5 @@ export default defineConfig(`
`9`	`9`	`jsName: 'QuerySyncStoragePersister',`
`10`	`10`	`outputFile: 'index',`
`11`	`11`	`entryFile: './src/index.ts',`
`12`		`- globals: {`
`13`		`- '@tanstack/query-persist-client-core': 'QueryPersistClientCore',`
`14`		`- },`
`15`	`12`	`}),`
`16`	`13`	`)`