From 58e04d0abfc288329e63afcf93050726dfd8b5b5 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 9 Mar 2022 14:57:31 +0800
Subject: [PATCH] chore(nvue): ignore wxs

---
 packages/uni-cli-shared/src/vue/parse.ts                    | 4 ++--
 .../vite-plugin-uni/src/configResolved/plugins/preVue.ts    | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/uni-cli-shared/src/vue/parse.ts b/packages/uni-cli-shared/src/vue/parse.ts
index 7c8bd9ef2..f72b3679f 100644
--- a/packages/uni-cli-shared/src/vue/parse.ts
+++ b/packages/uni-cli-shared/src/vue/parse.ts
@@ -13,7 +13,7 @@ const BLOCK_RE = /<\/block>/
 const WXS_LANG_RE = /lang=["|'](renderjs|wxs)["|']/
 const WXS_ATTRS = ['wxs', 'renderjs']
 
-export function parseVueCode(code: string) {
+export function parseVueCode(code: string, isNVue = false) {
   const hasBlock = BLOCK_RE.test(code)
   const hasWxs = WXS_LANG_RE.test(code)
   if (!hasBlock && !hasWxs) {
@@ -27,7 +27,7 @@ export function parseVueCode(code: string) {
     // 重新解析新的 code
     ast = parseVue(code, errors)
   }
-  if (hasWxs) {
+  if (!isNVue && hasWxs) {
     const wxsNodes = parseWxsNodes(ast)
     code = parseWxsCode(wxsNodes, code)
     // add watch
diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts b/packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts
index 19d684bfc..ded5aab53 100644
--- a/packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts
+++ b/packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts
@@ -11,8 +11,12 @@ import {
 } from '@dcloudio/uni-cli-shared'
 
 export function uniPreVuePlugin(): Plugin {
+  let isNVue = false
   return {
     name: 'uni:pre-vue',
+    config(config) {
+      isNVue = (config as any).nvue
+    },
     async transform(code, id) {
       const { filename, query } = parseVueRequest(id)
       if (query.vue) {
@@ -26,7 +30,7 @@ export function uniPreVuePlugin(): Plugin {
         removeExt(normalizeMiniProgramFilename(id, process.env.UNI_INPUT_DIR))
       )
       return {
-        code: parseVueCode(code).code, // 暂不提供sourcemap,意义不大
+        code: parseVueCode(code, isNVue).code, // 暂不提供sourcemap,意义不大
         map: null,
       }
     },
-- 
GitLab