@tsrx/rspack-plugin-vue 0.0.22 → 0.0.24

package/package.json

@@ -3,7 +3,7 @@
   "description": "Rspack plugin for @tsrx/vue",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -21,18 +21,18 @@
   },
   "dependencies": {
     "source-map": "^0.7.6",
-    "@tsrx/vue": "0.1.10"
+    "@tsrx/vue": "0.1.12"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0",
     "vue": ">=3.5",
-    "vue-jsx-vapor": ">=3.2.12"
+    "vue-jsx-vapor": ">=3.2.14"
   },
   "devDependencies": {
     "@rspack/core": "^1.6.0",
     "typescript": "^5.9.3",
-    "vue": "3.6.0-beta.10",
-    "vue-jsx-vapor": "^3.2.12"
+    "vue": "3.6.0-beta.12",
+    "vue-jsx-vapor": "^3.2.14"
   },
   "files": [
     "src",

package/src/index.js

@@ -9,9 +9,11 @@ const __dirname = path.dirname(__filename);
 const JS_LOADER = path.join(__dirname, 'js-loader.js');
 const VAPOR_LOADER = path.join(__dirname, 'vapor-loader.js');
 const CSS_LOADER = path.join(__dirname, 'css-loader.js');
+const INTEROP_LOADER = path.join(__dirname, 'interop-loader.js');
 
 const TSRX_EXTENSION_PATTERN = /\.tsrx$/;
 const CSS_QUERY_PATTERN = /tsrx-css/;
+const SOURCE_EXTENSION_PATTERN = /\.[cm]?[jt]sx?$/;
 
 /**
  * Rspack plugin for `.tsrx` files that compiles them via `@tsrx/vue`, runs the
@@ -24,7 +26,7 @@ const CSS_QUERY_PATTERN = /tsrx-css/;
  */
 export class TsrxVueRspackPlugin {
 	/**
-	 * @param {{ vapor?: { interop?: boolean, macros?: boolean | object, compiler?: { runtimeModuleName?: string } } }} [options]
+	 * @param {{ vapor?: { macros?: boolean | object, compiler?: { runtimeModuleName?: string } } }} [options]
 	 */
 	constructor(options = {}) {
 		this.options = {
@@ -50,6 +52,15 @@ export class TsrxVueRspackPlugin {
 		}
 
 		compiler.options.module.rules.unshift(
+			{
+				test: SOURCE_EXTENSION_PATTERN,
+				exclude: /node_modules/,
+				use: [
+					{
+						loader: INTEROP_LOADER,
+					},
+				],
+			},
 			{
 				test: TSRX_EXTENSION_PATTERN,
 				resourceQuery: { not: CSS_QUERY_PATTERN },

package/src/interop-loader.js

@@ -0,0 +1,9 @@
+import { addVaporInteropToCreateVaporApp } from '@tsrx/vue/interop';
+
+/**
+ * @param {string} source
+ * @returns {string}
+ */
+export default function interopLoader(source) {
+	return addVaporInteropToCreateVaporApp(source);
+}

package/src/vapor-loader.js

@@ -66,7 +66,7 @@ async function composeSourceMaps(inputMap, outputMap) {
  * Runs the compiled TSX through `vue-jsx-vapor`'s public transform API, then
  * composes its sourcemap with the upstream tsrx compile map when available.
  *
- * @this {LoaderContext<{ vapor?: { interop?: boolean, macros?: boolean | object, compiler?: { runtimeModuleName?: string } } }>}
+ * @this {LoaderContext<{ vapor?: { macros?: boolean | object, compiler?: { runtimeModuleName?: string } } }>}
  * @param {string} source
  * @param {unknown} inputMap
  * @returns {void}
@@ -74,12 +74,16 @@ async function composeSourceMaps(inputMap, outputMap) {
 export default function vaporLoader(source, inputMap) {
 	const callback = this.async();
 	const options = this.getOptions?.() ?? {};
+	const { interop: _interop, ...vapor_options } =
+		/** @type {{ interop?: boolean, macros?: boolean | object, compiler?: { runtimeModuleName?: string } }} */ (
+			options.vapor ?? {}
+		);
 	const vapor = {
 		...DEFAULT_VAPOR_OPTIONS,
-		...options.vapor,
+		...vapor_options,
 		compiler: {
 			...DEFAULT_VAPOR_OPTIONS.compiler,
-			...options.vapor?.compiler,
+			...vapor_options.compiler,
 		},
 	};
 

package/types/index.d.ts

@@ -1,7 +1,6 @@
 import type { Compiler, RspackPluginInstance } from '@rspack/core';
 
 export interface TsrxVueRspackVaporOptions {
-	interop?: boolean;
 	macros?: boolean | object;
 	compiler?: {
 		runtimeModuleName?: string;