@tsrx/vite-plugin-react 0.0.87 → 0.0.89

package/package.json

@@ -3,7 +3,7 @@
   "description": "Vite plugin for @tsrx/react (.tsrx modules)",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -20,8 +20,8 @@
     }
   },
   "dependencies": {
-    "@tsrx/core": "0.1.55",
-    "@tsrx/react": "0.2.55"
+    "@tsrx/react": "0.2.56",
+    "@tsrx/core": "0.1.56"
   },
   "peerDependencies": {
     "vite": "*"

package/src/index.js

@@ -15,7 +15,7 @@
  *   (id: `\0${string}?tsrx-css&lang.css`): string,
  *   (id: string): string | null,
  * }} TsrxReactLoad
- * @typedef {() => {
+ * @typedef {{
  *   optimizeDeps: {
  *     extensions: string[],
  *     rolldownOptions: {
@@ -23,9 +23,13 @@
  *       plugins: [DepScanTransformPlugin],
  *     },
  *   },
- * }} TsrxReactConfigHook
- * @typedef {Omit<Plugin, 'config' | 'transform' | 'resolveId' | 'load'> & {
- *   config: TsrxReactConfigHook,
+ * }} TsrxReactEnvironmentConfig
+ * @typedef {(
+ *   name: string,
+ *   config: import('vite').EnvironmentOptions,
+ * ) => TsrxReactEnvironmentConfig | undefined} TsrxReactConfigEnvironmentHook
+ * @typedef {Omit<Plugin, 'configEnvironment' | 'transform' | 'resolveId' | 'load'> & {
+ *   configEnvironment: TsrxReactConfigEnvironmentHook,
  *   transform: TsrxReactTransform,
  *   resolveId: TsrxReactResolveId,
  *   load: TsrxReactLoad,
@@ -72,24 +76,14 @@ export function tsrxReact(options = {}) {
 		name: '@tsrx/vite-plugin-react',
 		enforce: 'pre',
 
-		config() {
-			return {
-				optimizeDeps: {
-					// The scanner externalizes anything that is not a known JS
-					// type unless its extension is listed here, so without this
-					// entry the dep-scan plugin below never runs.
-					extensions: ['.tsrx'],
-					rolldownOptions: {
-						// The scan runs its own jsx transform over the tsx the
-						// dep-scan plugin hands back, and that transform defaults to
-						// react's runtime. Point it at the configured source, or the
-						// scan fails outright on an unresolvable
-						// `react/jsx-dev-runtime` in a project that has no react.
-						transform: { jsx: { importSource: jsxImportSource } },
-						plugins: [create_dep_scan_plugin(jsxImportSource)],
-					},
-				},
-			};
+		configEnvironment(name, config) {
+			const discovers_dependencies =
+				name === 'client' || config.optimizeDeps?.noDiscovery === false;
+			if (!discovers_dependencies) {
+				return;
+			}
+
+			return create_dep_scan_config(jsxImportSource);
 		},
 
 		resolveId(/** @type {string} */ source) {
@@ -153,6 +147,29 @@ export function tsrxReact(options = {}) {
 	});
 }
 
+/**
+ * @param {string} jsxImportSource
+ * @returns {TsrxReactEnvironmentConfig}
+ */
+function create_dep_scan_config(jsxImportSource) {
+	return {
+		optimizeDeps: {
+			// The scanner externalizes anything that is not a known JS type
+			// unless its extension is listed here, so without this entry the
+			// dep-scan plugin below never runs.
+			extensions: ['.tsrx'],
+			rolldownOptions: {
+				// The scan runs its own jsx transform over the tsx the dep-scan
+				// plugin hands back, and that transform defaults to react's runtime.
+				// Point it at the configured source, or the scan fails outright on
+				// an unresolvable `react/jsx-dev-runtime` in a project without react.
+				transform: { jsx: { importSource: jsxImportSource } },
+				plugins: [create_dep_scan_plugin(jsxImportSource)],
+			},
+		},
+	};
+}
+
 /**
  * @param {string} jsxImportSource
  * @returns {DepScanTransformPlugin}

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from 'vite';
+import type { EnvironmentOptions, Plugin } from 'vite';
 import type { DepScanTransformPlugin } from '@tsrx/core/types/vite/dep-scan';
 
 export interface TsrxReactPluginOptions {
@@ -12,17 +12,22 @@ export interface TsrxReactTransformResult {
 
 export interface TsrxReactPlugin extends Omit<
 	Plugin,
-	'config' | 'transform' | 'resolveId' | 'load'
+	'configEnvironment' | 'transform' | 'resolveId' | 'load'
 > {
-	config: () => {
-		optimizeDeps: {
-			extensions: string[];
-			rolldownOptions: {
-				transform: { jsx: { importSource: string } };
-				plugins: [DepScanTransformPlugin];
-			};
-		};
-	};
+	configEnvironment: (
+		name: string,
+		config: EnvironmentOptions,
+	) =>
+		| {
+				optimizeDeps: {
+					extensions: string[];
+					rolldownOptions: {
+						transform: { jsx: { importSource: string } };
+						plugins: [DepScanTransformPlugin];
+					};
+				};
+		  }
+		| undefined;
 	transform: {
 		(code: string, id: `${string}.tsrx`): Promise<TsrxReactTransformResult>;
 		(code: string, id: string): Promise<TsrxReactTransformResult | null>;