@vizejs/vite-plugin 0.0.1-alpha.70 → 0.0.1-alpha.72

package/dist/index.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import fs from "node:fs";
 import { glob } from "tinyglobby";
-import { createRequire } from "node:module";
+import * as native from "@vizejs/native";
 import { createHash } from "node:crypto";
 
 //#region src/hmr.ts
@@ -118,35 +118,12 @@ ${output}`;
 
 //#endregion
 //#region src/compiler.ts
-const require = createRequire(import.meta.url);
-let compileSfc = null;
-let compileSfcBatchWithResults = null;
-function loadNative() {
-	if (compileSfc) return compileSfc;
-	try {
-		const native = require("@vizejs/native");
-		compileSfc = native.compileSfc;
-		return compileSfc;
-	} catch (e) {
-		throw new Error(`Failed to load @vizejs/native. Make sure it's installed and built:\n${String(e)}`);
-	}
-}
-function loadNativeBatch() {
-	if (compileSfcBatchWithResults) return compileSfcBatchWithResults;
-	try {
-		const native = require("@vizejs/native");
-		compileSfcBatchWithResults = native.compileSfcBatchWithResults;
-		return compileSfcBatchWithResults;
-	} catch (e) {
-		throw new Error(`Failed to load @vizejs/native. Make sure it's installed and built:\n${String(e)}`);
-	}
-}
+const { compileSfc, compileSfcBatchWithResults } = native;
 function compileFile(filePath, cache, options, source) {
-	const compile = loadNative();
 	const content = source ?? fs.readFileSync(filePath, "utf-8");
 	const scopeId = generateScopeId(filePath);
 	const hasScoped = /<style[^>]*\bscoped\b/.test(content);
-	const result = compile(content, {
+	const result = compileSfc(content, {
 		filename: filePath,
 		sourceMap: options.sourceMap,
 		ssr: options.ssr,
@@ -173,12 +150,11 @@ function compileFile(filePath, cache, options, source) {
 * Returns per-file results with content hashes for HMR.
 */
 function compileBatch(files, cache, options) {
-	const compile = loadNativeBatch();
 	const inputs = files.map((f) => ({
 		path: f.path,
 		source: f.source
 	}));
-	const result = compile(inputs, { ssr: options.ssr });
+	const result = compileSfcBatchWithResults(inputs, { ssr: options.ssr });
 	for (const fileResult of result.results) {
 		if (fileResult.errors.length === 0) cache.set(fileResult.path, {
 			code: fileResult.code,
@@ -306,9 +282,11 @@ function vize(options = {}) {
 		else if (id.startsWith("/") && !fs.existsSync(id)) resolved = path.resolve(root, id.slice(1));
 		else if (path.isAbsolute(id)) resolved = id;
 		else if (importer) {
-			const realImporter = importer.startsWith(VIRTUAL_PREFIX) ? virtualToReal.get(importer) ?? importer.slice(VIRTUAL_PREFIX.length) : importer;
+			let realImporter = importer.startsWith(VIRTUAL_PREFIX) ? virtualToReal.get(importer) ?? importer.slice(VIRTUAL_PREFIX.length) : importer;
+			if (realImporter.endsWith(".vue.ts")) realImporter = realImporter.slice(0, -3);
 			resolved = path.resolve(path.dirname(realImporter), id);
 		} else resolved = path.resolve(root, id);
+		if (!path.isAbsolute(resolved)) resolved = path.resolve(root, resolved);
 		return path.normalize(resolved);
 	}
 	return {
@@ -370,6 +348,14 @@ function vize(options = {}) {
 			logger.log("Cache keys:", [...cache.keys()].slice(0, 3));
 		},
 		async resolveId(id, importer) {
+			if (id.startsWith("\0")) return null;
+			if (id.startsWith("vize:")) {
+				let realPath = id.slice(5);
+				if (realPath.endsWith(".ts")) realPath = realPath.slice(0, -3);
+				logger.log(`resolveId: redirecting stale vize: ID to ${realPath}`);
+				if (realPath.includes("node_modules")) return realPath;
+				return this.resolve(realPath, importer, { skipSelf: true });
+			}
 			if (id === VIRTUAL_CSS_MODULE) return RESOLVED_CSS_MODULE;
 			if (id.includes("?vue&type=style")) return id;
 			if (importer?.startsWith(VIRTUAL_PREFIX)) {
@@ -404,7 +390,19 @@ function vize(options = {}) {
 				}
 			}
 			if (id.endsWith(".vue")) {
+				if (id.includes("node_modules")) {
+					logger.log(`resolveId: skipping node_modules import ${id}`);
+					return null;
+				}
 				const resolved = resolveVuePath(id, importer);
+				if (resolved.includes("node_modules")) {
+					logger.log(`resolveId: skipping node_modules path ${resolved}`);
+					return null;
+				}
+				if (!filter(resolved)) {
+					logger.log(`resolveId: skipping filtered path ${resolved}`);
+					return null;
+				}
 				const hasCache = cache.has(resolved);
 				const fileExists = fs.existsSync(resolved);
 				logger.log(`resolveId: id=${id}, resolved=${resolved}, hasCache=${hasCache}, fileExists=${fileExists}, importer=${importer ?? "none"}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizejs/vite-plugin",
-  "version": "0.0.1-alpha.70",
+  "version": "0.0.1-alpha.72",
   "description": "High-performance native Vite plugin for Vue SFC compilation powered by Vize",
   "publishConfig": {
     "provenance": true,
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "tinyglobby": "^0.2.0",
-    "@vizejs/native": "0.0.1-alpha.70"
+    "@vizejs/native": "0.0.1-alpha.72"
   },
   "scripts": {
     "build": "tsdown",