wip(app): nvue

packages/uni-app-vite/src/vue/index.ts

@@ -42,7 +42,7 @@ export function initVuePlugins() {
     uniMainJsPlugin(),
     uniManifestJsonPlugin(),
     uniPagesJsonPlugin(),
-    uniViteInjectPlugin(initAppProvide()),
+    uniViteInjectPlugin('uni:app-inject', initAppProvide()),
     uniRenderjsPlugin(),
     uniTemplatePlugin(),
     uniStatsPlugin(),

packages/uni-app/dist/uni.compiler.js

 'use strict';
 
-var index = [
+var index = () => [
     /* eslint-disable no-restricted-globals */
-    ...require('@dcloudio/uni-cloud/lib/uni.plugin.js').default,
+    ...require('@dcloudio/uni-cloud/lib/uni.plugin.js').default(),
     /* eslint-disable no-restricted-globals */
-    ...require('@dcloudio/uni-stat/lib/uni.plugin.js'),
+    ...require('@dcloudio/uni-stat/lib/uni.plugin.js')(),
 ];
 
 module.exports = index;

packages/uni-app/src/compiler/index.ts

-export default [
+export default () => [
   /* eslint-disable no-restricted-globals */
-  ...require('@dcloudio/uni-cloud/lib/uni.plugin.js').default,
+  ...require('@dcloudio/uni-cloud/lib/uni.plugin.js').default(),
   /* eslint-disable no-restricted-globals */
-  ...require('@dcloudio/uni-stat/lib/uni.plugin.js'),
+  ...require('@dcloudio/uni-stat/lib/uni.plugin.js')(),
 ]

packages/uni-cli-shared/__tests__/inject.spec.ts

@@ -18,7 +18,7 @@ describe('inject', () => {
     parse: (code: string) => parse(code).program,
   } as unknown as TransformPluginContext
   test(`basic`, () => {
-    const plugin = uniViteInjectPlugin(injectOptions)
+    const plugin = uniViteInjectPlugin('uni:inject', injectOptions)
     expect(
       (
         plugin.transform!.call(
@@ -30,7 +30,7 @@ describe('inject', () => {
     ).toMatchSnapshot()
   })
   test(`reassignment`, () => {
-    const plugin = uniViteInjectPlugin(injectOptions)
+    const plugin = uniViteInjectPlugin('uni:inject', injectOptions)
     expect(
       (
         plugin.transform!.call(

packages/uni-cli-shared/src/vite/plugins/inject.ts

@@ -42,7 +42,10 @@ export interface InjectOptions {
 const debugInject = debug('uni:inject')
 const debugInjectTry = debug('uni:inject-try')
 
-export function uniViteInjectPlugin(options: InjectOptions): Plugin {
+export function uniViteInjectPlugin(
+  name: string,
+  options: InjectOptions
+): Plugin {
   if (!options) throw new Error('Missing options')
 
   const filter = createFilter(options.include, options.exclude)
@@ -76,7 +79,7 @@ export function uniViteInjectPlugin(options: InjectOptions): Plugin {
   const sourceMap = options.sourceMap !== false
   const callback = options.callback
   return {
-    name: 'uni:inject',
+    name,
     // 确保在 commonjs 之后，否则会混合 es6 module 与 cjs 的代码，导致 commonjs 失效
     enforce: 'post',
     transform(code, id) {

packages/uni-cli-shared/src/vite/utils/utils.ts

-import type { ResolvedConfig } from 'vite'
+import type { ResolvedConfig, UserConfig } from 'vite'
 
 export function withSourcemap(config: ResolvedConfig) {
   if (config.command === 'serve') {
@@ -6,3 +6,7 @@ export function withSourcemap(config: ResolvedConfig) {
   }
   return !!config.build.sourcemap
 }
+
+export function isInHybridNVue(config: UserConfig | ResolvedConfig): boolean {
+  return (config as any).nvue && process.env.UNI_RENDERER !== 'native'
+}

packages/uni-cloud/lib/uni.plugin.js

@@ -5,51 +5,57 @@ const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared");
 const validateFunction_1 = require("./validateFunction");
 process.env.UNI_CLOUD_PROVIDER = JSON.stringify([]);
 const uniCloudSpaces = [];
-initUniCloudEnv();
+const initUniCloudEnvOnce = (0, uni_shared_1.once)(initUniCloudEnv);
+initUniCloudEnvOnce();
 /**
  * @type {import('vite').Plugin}
  */
-const UniCloudPlugin = {
-    name: 'uni:cloud',
-    config(config) {
-        const silent = config.build && config.build.ssr ? true : false;
-        if (silent) {
-            return;
-        }
-        const len = uniCloudSpaces.length;
-        if (!len) {
-            return;
-        }
-        if (len === 1) {
-            console.log(`本项目的uniCloud使用的默认服务空间spaceId为：${uniCloudSpaces[0].id}`);
-        }
-        if (process.env.UNI_PLATFORM === 'h5' &&
-            !process.env.UNI_SUB_PLATFORM &&
-            process.env.NODE_ENV === 'production') {
-            console.warn('发布H5，需要在uniCloud后台操作，绑定安全域名，否则会因为跨域问题而无法访问。教程参考：https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5');
-        }
-        return {};
-    },
-    configureServer(server) {
-        if (server.httpServer) {
-            server.httpServer.on('listening', () => {
-                process.nextTick(() => {
-                    initUniCloudWarningOnce();
+function uniCloudPlugin() {
+    return {
+        name: 'uni:cloud',
+        config(config) {
+            const silent = config.build && config.build.ssr ? true : false;
+            if (silent) {
+                return;
+            }
+            const len = uniCloudSpaces.length;
+            if (!len) {
+                return;
+            }
+            if ((0, uni_cli_shared_1.isInHybridNVue)(config)) {
+                return;
+            }
+            if (len === 1) {
+                console.log(`本项目的uniCloud使用的默认服务空间spaceId为：${uniCloudSpaces[0].id}`);
+            }
+            if (process.env.UNI_PLATFORM === 'h5' &&
+                !process.env.UNI_SUB_PLATFORM &&
+                process.env.NODE_ENV === 'production') {
+                console.warn('发布H5，需要在uniCloud后台操作，绑定安全域名，否则会因为跨域问题而无法访问。教程参考：https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5');
+            }
+            return {};
+        },
+        configureServer(server) {
+            if (server.httpServer) {
+                server.httpServer.on('listening', () => {
+                    process.nextTick(() => {
+                        initUniCloudWarningOnce();
+                    });
                 });
-            });
-        }
-        else {
-            initUniCloudWarningOnce();
-        }
-    },
-    closeBundle() {
-        if (process.env.UNI_PLATFORM === 'h5' && !process.env.UNI_SSR_CLIENT) {
-            console.log();
-            console.log('欢迎将H5站部署到uniCloud前端网页托管平台，高速、免费、安全、省心，详见：');
-            console.log('https://uniapp.dcloud.io/uniCloud/hosting');
-        }
-    },
-};
+            }
+            else {
+                initUniCloudWarningOnce();
+            }
+        },
+        closeBundle() {
+            if (process.env.UNI_PLATFORM === 'h5' && !process.env.UNI_SSR_CLIENT) {
+                console.log();
+                console.log('欢迎将H5站部署到uniCloud前端网页托管平台，高速、免费、安全、省心，详见：');
+                console.log('https://uniapp.dcloud.io/uniCloud/hosting');
+            }
+        },
+    };
+}
 const initUniCloudWarningOnce = (0, uni_shared_1.once)(() => {
     uniCloudSpaces.length &&
         console.warn('当前项目使用了uniCloud，为避免云函数调用跨域问题，建议在HBuilderX内置浏览器里调试，如使用外部浏览器需处理跨域，详见：https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5');
@@ -85,9 +91,9 @@ function initUniCloudEnv() {
     }
     catch (e) { }
 }
-exports.default = [
-    UniCloudPlugin,
-    (0, uni_cli_shared_1.uniViteInjectPlugin)({
+exports.default = () => [
+    uniCloudPlugin(),
+    (0, uni_cli_shared_1.uniViteInjectPlugin)('uni:cloud-inject', {
         exclude: [...uni_cli_shared_1.COMMON_EXCLUDE],
         uniCloud: ['@dcloudio/uni-cloud', 'default'],
     }),

packages/uni-cloud/src/uni.plugin.ts

 import { once } from '@dcloudio/uni-shared'
 import {
   COMMON_EXCLUDE,
+  isInHybridNVue,
   uniViteInjectPlugin,
   UniVitePlugin,
 } from '@dcloudio/uni-cli-shared'
@@ -17,58 +18,65 @@ const uniCloudSpaces: {
   apiEndpoint?: string
 }[] = []
 
-initUniCloudEnv()
+const initUniCloudEnvOnce = once(initUniCloudEnv)
+
+initUniCloudEnvOnce()
 
 /**
  * @type {import('vite').Plugin}
  */
-const UniCloudPlugin: UniVitePlugin = {
-  name: 'uni:cloud',
-  config(config) {
-    const silent = config.build && config.build.ssr ? true : false
-    if (silent) {
-      return
-    }
-    const len = uniCloudSpaces.length
-    if (!len) {
-      return
-    }
-    if (len === 1) {
-      console.log(
-        `本项目的uniCloud使用的默认服务空间spaceId为：${uniCloudSpaces[0].id}`
-      )
-    }
-    if (
-      process.env.UNI_PLATFORM === 'h5' &&
-      !process.env.UNI_SUB_PLATFORM &&
-      process.env.NODE_ENV === 'production'
-    ) {
-      console.warn(
-        '发布H5，需要在uniCloud后台操作，绑定安全域名，否则会因为跨域问题而无法访问。教程参考：https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
-      )
-    }
-    return {}
-  },
-  configureServer(server) {
-    if (server.httpServer) {
-      server.httpServer.on('listening', () => {
-        process.nextTick(() => {
-          initUniCloudWarningOnce()
+function uniCloudPlugin(): UniVitePlugin {
+  return {
+    name: 'uni:cloud',
+    config(config) {
+      const silent = config.build && config.build.ssr ? true : false
+      if (silent) {
+        return
+      }
+      const len = uniCloudSpaces.length
+      if (!len) {
+        return
+      }
+      if (isInHybridNVue(config)) {
+        return
+      }
+      if (len === 1) {
+        console.log(
+          `本项目的uniCloud使用的默认服务空间spaceId为：${uniCloudSpaces[0].id}`
+        )
+      }
+      if (
+        process.env.UNI_PLATFORM === 'h5' &&
+        !process.env.UNI_SUB_PLATFORM &&
+        process.env.NODE_ENV === 'production'
+      ) {
+        console.warn(
+          '发布H5，需要在uniCloud后台操作，绑定安全域名，否则会因为跨域问题而无法访问。教程参考：https://uniapp.dcloud.io/uniCloud/quickstart?id=useinh5'
+        )
+      }
+      return {}
+    },
+    configureServer(server) {
+      if (server.httpServer) {
+        server.httpServer.on('listening', () => {
+          process.nextTick(() => {
+            initUniCloudWarningOnce()
+          })
         })
-      })
-    } else {
-      initUniCloudWarningOnce()
-    }
-  },
-  closeBundle() {
-    if (process.env.UNI_PLATFORM === 'h5' && !process.env.UNI_SSR_CLIENT) {
-      console.log()
-      console.log(
-        '欢迎将H5站部署到uniCloud前端网页托管平台，高速、免费、安全、省心，详见：'
-      )
-      console.log('https://uniapp.dcloud.io/uniCloud/hosting')
-    }
-  },
+      } else {
+        initUniCloudWarningOnce()
+      }
+    },
+    closeBundle() {
+      if (process.env.UNI_PLATFORM === 'h5' && !process.env.UNI_SSR_CLIENT) {
+        console.log()
+        console.log(
+          '欢迎将H5站部署到uniCloud前端网页托管平台，高速、免费、安全、省心，详见：'
+        )
+        console.log('https://uniapp.dcloud.io/uniCloud/hosting')
+      }
+    },
+  }
 }
 
 const initUniCloudWarningOnce = once(() => {
@@ -110,9 +118,9 @@ function initUniCloudEnv() {
   } catch (e) {}
 }
 
-export default [
-  UniCloudPlugin,
-  uniViteInjectPlugin({
+export default () => [
+  uniCloudPlugin(),
+  uniViteInjectPlugin('uni:cloud-inject', {
     exclude: [...COMMON_EXCLUDE],
     uniCloud: ['@dcloudio/uni-cloud', 'default'],
   }),

packages/uni-h5-vite/src/index.ts

@@ -25,7 +25,10 @@ export default [
   }),
   uniResolveIdPlugin(),
   ...(process.env.UNI_H5_BROWSER === 'builtin'
-    ? [uniViteInjectPlugin(initH5Provide()), uniHBuilderXConsolePlugin()]
+    ? [
+        uniViteInjectPlugin('uni:h5-inject-hbx', initH5Provide()),
+        uniHBuilderXConsolePlugin(),
+      ]
     : []),
   uniMainJsPlugin(),
   uniManifestJsonPlugin(),

packages/uni-h5-vite/src/plugins/inject.ts

@@ -68,6 +68,7 @@ export function uniInjectPlugin(): Plugin {
         delete uniInjectPluginOptions['uni.']
       }
       injectPlugin = uniViteInjectPlugin(
+        'uni:h5-inject',
         extend(uniInjectPluginOptions, {
           callback,
         })

packages/uni-mp-vite/src/index.ts

@@ -31,7 +31,7 @@ export default (options: UniMiniProgramPluginOptions) => {
     uniManifestJsonPlugin(options),
     uniPagesJsonPlugin(options),
     uniEntryPlugin(options),
-    uniViteInjectPlugin(extend({}, options.vite.inject)),
+    uniViteInjectPlugin('uni:mp-inject', extend({}, options.vite.inject)),
     uniRenderjsPlugin({ lang: options.template.filter?.lang }),
     uniRuntimeHooksPlugin(),
     uniMiniProgramPlugin(options),

packages/uni-stat/lib/uni.plugin.js

@@ -7,9 +7,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var debug__default = /*#__PURE__*/_interopDefaultLegacy(debug);
 
-var index = [
+var index = () => [
     uniCliShared.defineUniMainJsPlugin((opts) => {
         let isEnable = false;
+        let isNVue = false;
         return {
             name: 'uni:stat',
             enforce: 'pre',
@@ -17,6 +18,7 @@ var index = [
                 if (isSsr(env.command, config)) {
                     return;
                 }
+                isNVue = config.nvue;
                 const inputDir = process.env.UNI_INPUT_DIR;
                 const platform = process.env.UNI_PLATFORM;
                 isEnable = uniCliShared.getUniStatistics(inputDir, platform).enable === true;
@@ -55,7 +57,7 @@ var index = [
                 };
             },
             transform(code, id) {
-                if (isEnable && opts.filter(id)) {
+                if (isEnable && !isNVue && opts.filter(id)) {
                     return {
                         code: code + `;import '@dcloudio/uni-stat';`,
                         map: null,

packages/uni-stat/src/plugin/index.ts

@@ -8,9 +8,10 @@ import {
   parsePagesJson,
 } from '@dcloudio/uni-cli-shared'
 
-export default [
+export default () => [
   defineUniMainJsPlugin((opts) => {
     let isEnable = false
+    let isNVue = false
     return {
       name: 'uni:stat',
       enforce: 'pre',
@@ -18,6 +19,7 @@ export default [
         if (isSsr(env.command, config)) {
           return
         }
+        isNVue = (config as any).nvue
         const inputDir = process.env.UNI_INPUT_DIR!
         const platform = process.env.UNI_PLATFORM!
         isEnable = getUniStatistics(inputDir, platform).enable === true
@@ -54,7 +56,7 @@ export default [
         }
       },
       transform(code, id) {
-        if (isEnable && opts.filter(id)) {
+        if (isEnable && !isNVue && opts.filter(id)) {
           return {
             code: code + `;import '@dcloudio/uni-stat';`,
             map: null,

packages/vite-plugin-uni/src/configResolved/index.ts

@@ -6,6 +6,7 @@ import {
   formatErrMsg,
   formatInfoMsg,
   formatWarnMsg,
+  isInHybridNVue,
 } from '@dcloudio/uni-cli-shared'
 import { VitePluginUniResolvedOptions } from '..'
 
@@ -16,11 +17,16 @@ import { customResolver } from '../config/resolve'
 
 export function createConfigResolved(options: VitePluginUniResolvedOptions) {
   return ((config) => {
-    initEnv(config)
+    // 如果是混合编译且是 nvue 时，部分逻辑无需执行
+    if (!isInHybridNVue(config)) {
+      initEnv(config)
+    }
     initLogger(config)
     initOptions(options, config)
     initPlugins(config, options)
-    initCheckUpdate()
+    if (!isInHybridNVue(config)) {
+      initCheckUpdate()
+    }
     if (isWindows) {
       // TODO 等 https://github.com/vitejs/vite/issues/3331 修复后，可以移除下列代码
       const item = config.resolve.alias.find((item) =>

packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts

@@ -30,8 +30,12 @@ const WXS_LANG_RE = /lang=["|'](renderjs|wxs)["|']/
 const WXS_ATTRS = ['wxs', 'renderjs']
 
 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) {
@@ -45,7 +49,8 @@ export function uniPreVuePlugin(): Plugin {
         removeExt(normalizeMiniProgramFilename(id, process.env.UNI_INPUT_DIR))
       )
       const hasBlock = BLOCK_RE.test(code)
-      const hasWxs = WXS_LANG_RE.test(code)
+      // nvue 不支持 renderjs，wxs
+      const hasWxs = !isNVue && WXS_LANG_RE.test(code)
       if (!hasBlock && !hasWxs) {
         return
       }
@@ -55,10 +60,12 @@ export function uniPreVuePlugin(): Plugin {
       let ast = parseVue(code, errors)
       if (hasBlock) {
         code = parseBlockCode(ast, code)
-        // 重新解析新的 code
-        ast = parseVue(code, errors)
       }
       if (hasWxs) {
+        if (hasBlock) {
+          // 重新解析新的 code
+          ast = parseVue(code, errors)
+        }
         const wxsNodes = parseWxsNodes(ast)
         code = parseWxsCode(wxsNodes, code)
         // add watch

packages/vite-plugin-uni/src/index.ts

@@ -136,12 +136,18 @@ export default function uniPlugin(
     vuePlugin(initPluginVueOptions(options, uniPlugins, uniPluginOptions))
   )
 
-  plugins.push(
-    uniCopyPlugin({
-      outputDir: process.env.UNI_OUTPUT_DIR,
-      copyOptions: options.copyOptions,
-    })
-  )
+  // 混合编译时，nvue 下，不需要 copy
+  if (
+    process.env.UNI_RENDERER === 'native' ||
+    process.env.UNI_COMPILER === 'vue'
+  ) {
+    plugins.push(
+      uniCopyPlugin({
+        outputDir: process.env.UNI_OUTPUT_DIR,
+        copyOptions: options.copyOptions,
+      })
+    )
+  }
 
   return plugins
 }