@wevu/compiler 6.14.2 → 6.14.3

package/dist/index.mjs

@@ -412,12 +412,14 @@ function rewriteJsLikeImportsForTempDir(source, fromDir, tempDir) {
 //#endregion
 //#region src/plugins/vue/transform/wevuTempDir.ts
 const PROJECT_WEVU_CONFIG_DIR = path.join(".weapp-vite", "wevu-config");
+/**
+* 优先把临时配置缓存放到项目内，避免宏求值时脱离项目根目录导致包名导入解析异常。
+*/
 function getWevuConfigCacheRoot() {
 	const env = process.env.WEAPP_VITE_WEVU_CONFIG_DIR?.trim();
 	if (env) return path.resolve(env);
-	const cwd = process.cwd();
-	const projectCacheDir = path.join(cwd, PROJECT_WEVU_CONFIG_DIR);
-	if (fs.existsSync(projectCacheDir)) return projectCacheDir;
+	const projectRoot = process.cwd();
+	if (fs.existsSync(projectRoot)) return path.join(projectRoot, PROJECT_WEVU_CONFIG_DIR);
 	return path.join(os.tmpdir(), "weapp-vite", "wevu-config");
 }
 function resolveWevuConfigTempDir(fromDir) {
@@ -2176,18 +2178,19 @@ function createMacroVisitors(program, state) {
 	const setupExposeVisitors = createSetupExposeVisitors(state);
 	const stripTypesVisitors = createStripTypesVisitors(state);
 	const pageMetaVisitors = createPageMetaVisitors(state);
-	return {
+	const mergedVisitors = {
 		...appSetupVisitors,
 		...setupExposeVisitors,
 		...stripTypesVisitors,
-		...pageMetaVisitors,
-		CallExpression(path) {
-			appSetupVisitors.CallExpression?.(path);
-			setupExposeVisitors.CallExpression?.(path);
-			stripTypesVisitors.CallExpression?.(path);
-			if (!path.removed) pageMetaVisitors.CallExpression?.(path);
-		}
+		...pageMetaVisitors
+	};
+	mergedVisitors.CallExpression = (path) => {
+		appSetupVisitors.CallExpression?.(path);
+		setupExposeVisitors.CallExpression?.(path);
+		stripTypesVisitors.CallExpression?.(path);
+		if (!path.removed) pageMetaVisitors.CallExpression?.(path);
 	};
+	return mergedVisitors;
 }
 //#endregion
 //#region src/plugins/vue/transform/classStyleComputedBuilders.ts
@@ -7176,6 +7179,9 @@ async function inlineScriptSetupDefineOptionsArgs(content, filename, lang) {
 const SETUP_CALL_RE = /\bsetup\s*\(/;
 const DEFINE_OPTIONS_CALL_RE = /\bdefineOptions\s*\(/;
 const APP_VUE_FILE_RE = /[\\/]app\.vue$/;
+const TEMPLATE_BLOCK_RE = /<template\b[\s\S]*?<\/template>/g;
+const TEMPLATE_IMPORT_META_RE = /\bimport\.meta\b/g;
+const TEMPLATE_IMPORT_META_PLACEHOLDER = "__im_meta__";
 function resolveSfcScriptLangLabel(lang) {
 	return typeof lang === "string" && lang.length > 0 ? lang : "(default)";
 }
@@ -7203,14 +7209,37 @@ function extractDefineOptionsHash(content) {
 	if (!macroSources.length) return;
 	return createHash("sha256").update(macroSources.join("\n")).digest("hex").slice(0, 12);
 }
+function preprocessTemplateImportMeta(source) {
+	return source.replace(TEMPLATE_BLOCK_RE, (block) => block.replace(TEMPLATE_IMPORT_META_RE, TEMPLATE_IMPORT_META_PLACEHOLDER));
+}
+function restoreTemplateImportMeta(content) {
+	return content.replace(new RegExp(TEMPLATE_IMPORT_META_PLACEHOLDER, "g"), "import.meta");
+}
+function restoreTemplateImportMetaInDescriptor(descriptor) {
+	if (!descriptor.template?.content?.includes(TEMPLATE_IMPORT_META_PLACEHOLDER)) return descriptor;
+	return {
+		...descriptor,
+		template: {
+			...descriptor.template,
+			content: restoreTemplateImportMeta(descriptor.template.content)
+		}
+	};
+}
+function parseSfc(source, filename, ignoreEmpty) {
+	const parsed = parse(preprocessTemplateImportMeta(source), {
+		filename,
+		ignoreEmpty
+	});
+	return {
+		...parsed,
+		descriptor: restoreTemplateImportMetaInDescriptor(parsed.descriptor)
+	};
+}
 async function parseVueFile(source, filename, options) {
 	const normalizedInputSource = normalizeLineEndings(source);
 	const normalizedSource = preprocessScriptSrc(preprocessScriptSetupSrc(normalizedInputSource));
 	let descriptorForCompileSource = normalizedSource;
-	const { descriptor, errors } = parse(normalizedSource, {
-		filename,
-		ignoreEmpty: normalizedSource === normalizedInputSource
-	});
+	const { descriptor, errors } = parseSfc(normalizedSource, filename, normalizedSource === normalizedInputSource);
 	restoreScriptSetupSrc(descriptor);
 	restoreScriptSrc(descriptor);
 	if (errors.length > 0) {
@@ -7258,10 +7287,7 @@ async function parseVueFile(source, filename, options) {
 			const startOffset = setupLoc.start.offset;
 			const endOffset = setupLoc.end.offset;
 			const nextSource = descriptorForCompileSource.slice(0, startOffset) + extracted.stripped + descriptorForCompileSource.slice(endOffset);
-			const { descriptor: nextDescriptor, errors: nextErrors } = parse(nextSource, {
-				filename,
-				ignoreEmpty: false
-			});
+			const { descriptor: nextDescriptor, errors: nextErrors } = parseSfc(nextSource, filename, false);
 			restoreScriptSetupSrc(nextDescriptor);
 			restoreScriptSrc(nextDescriptor);
 			if (nextErrors.length > 0) {
@@ -7298,10 +7324,7 @@ async function parseVueFile(source, filename, options) {
 			const startOffset = setupLoc.start.offset;
 			const endOffset = setupLoc.end.offset;
 			const nextSource = descriptorForCompileSource.slice(0, startOffset) + inlined.code + descriptorForCompileSource.slice(endOffset);
-			const { descriptor: nextDescriptor, errors: nextErrors } = parse(nextSource, {
-				filename,
-				ignoreEmpty: false
-			});
+			const { descriptor: nextDescriptor, errors: nextErrors } = parseSfc(nextSource, filename, false);
 			restoreScriptSetupSrc(nextDescriptor);
 			restoreScriptSrc(nextDescriptor);
 			if (nextErrors.length > 0) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.14.2",
+  "version": "6.14.3",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -50,7 +50,7 @@
     "pathe": "^2.0.3",
     "vue": "^3.5.32",
     "@weapp-core/shared": "3.0.3",
-    "@weapp-vite/ast": "6.14.2",
+    "@weapp-vite/ast": "6.14.3",
     "rolldown-require": "2.0.12"
   },
   "publishConfig": {