feat(cli): Compatible with hbx

packages/uni-app-vite/dist/plugin.js

@@ -17,15 +17,14 @@ exports.UniAppPlugin = {
     config() {
         return {
             build: {
-                lib: {
-                    name: 'AppService',
-                    entry: uni_cli_shared_1.resolveMainPathOnce(process.env.UNI_INPUT_DIR),
-                    formats: ['iife'],
-                },
                 rollupOptions: {
+                    input: uni_cli_shared_1.resolveMainPathOnce(process.env.UNI_INPUT_DIR),
                     external: ['vue'],
                     output: {
+                        name: 'AppService',
+                        format: 'iife',
                         entryFileNames: 'app-service.js',
+                        manualChunks: undefined,
                         globals: {
                             vue: 'Vue',
                         },

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

@@ -25,15 +25,14 @@ export const UniAppPlugin: UniVitePlugin = {
   config() {
     return {
       build: {
-        lib: {
-          name: 'AppService',
-          entry: resolveMainPathOnce(process.env.UNI_INPUT_DIR),
-          formats: ['iife'],
-        },
         rollupOptions: {
+          input: resolveMainPathOnce(process.env.UNI_INPUT_DIR),
           external: ['vue'],
           output: {
+            name: 'AppService',
+            format: 'iife',
             entryFileNames: 'app-service.js',
+            manualChunks: undefined,
             globals: {
               vue: 'Vue',
             },

packages/uni-cli-shared/src/hbx.ts

-import slash from 'slash'
+import path from 'path'
+
 import { once } from '@dcloudio/uni-shared'
 
+process.env.UNI_HBUILDERX_PLUGINS =
+  process.env.UNI_HBUILDERX_PLUGINS ||
+  path.resolve(__dirname, '../../../../../')
+
 export const isInHBuilderX = once(() => {
-  const { UNI_HBUILDERX_PLUGINS, UNI_CLI_CONTEXT } = process.env
-  if (!UNI_HBUILDERX_PLUGINS || !UNI_CLI_CONTEXT) {
+  const { UNI_HBUILDERX_PLUGINS } = process.env
+  if (!UNI_HBUILDERX_PLUGINS) {
     return false
   }
-  return slash(UNI_CLI_CONTEXT).startsWith(slash(UNI_HBUILDERX_PLUGINS))
+  try {
+    const { name } = require(path.resolve(
+      UNI_HBUILDERX_PLUGINS,
+      'about/package.json'
+    ))
+    return name === 'about'
+  } catch (e) {
+    // console.error(e)
+  }
+  return false
 })
 
 export const runByHBuilderX = once(() => {

packages/vite-plugin-uni/src/cli/build.ts

@@ -2,15 +2,17 @@ import fs from 'fs-extra'
 import path from 'path'
 import { build as buildByVite, BuildOptions } from 'vite'
 import { CliOptions } from '.'
-import { cleanOptions } from './utils'
+import { addConfigFile, cleanOptions } from './utils'
 
 export async function build(options: CliOptions) {
-  await buildByVite({
-    root: process.env.VITE_ROOT_DIR,
-    logLevel: options.logLevel,
-    clearScreen: options.clearScreen,
-    build: cleanOptions(options) as BuildOptions,
-  })
+  await buildByVite(
+    addConfigFile({
+      root: process.env.VITE_ROOT_DIR,
+      logLevel: options.logLevel,
+      clearScreen: options.clearScreen,
+      build: cleanOptions(options) as BuildOptions,
+    })
+  )
 }
 
 export async function buildSSR(options: CliOptions) {
@@ -21,12 +23,14 @@ export async function buildSSR(options: CliOptions) {
   ssrBuildClientOptions.ssrManifest = true
   ssrBuildClientOptions.outDir = process.env.UNI_OUTPUT_DIR
   process.env.UNI_SSR_CLIENT = 'true'
-  await buildByVite({
-    root: process.env.VITE_ROOT_DIR,
-    logLevel: options.logLevel,
-    clearScreen: options.clearScreen,
-    build: ssrBuildClientOptions,
-  })
+  await buildByVite(
+    addConfigFile({
+      root: process.env.VITE_ROOT_DIR,
+      logLevel: options.logLevel,
+      clearScreen: options.clearScreen,
+      build: ssrBuildClientOptions,
+    })
+  )
   const ssrServerDir = path.resolve(outputDir, 'server')
   process.env.UNI_OUTPUT_DIR = ssrServerDir
   const ssrBuildServerOptions: BuildOptions = cleanOptions(options)
@@ -49,12 +53,14 @@ export async function buildSSR(options: CliOptions) {
   }
   process.env.UNI_SSR_CLIENT = ''
   process.env.UNI_SSR_SERVER = 'true'
-  await buildByVite({
-    root: process.env.VITE_ROOT_DIR,
-    logLevel: options.logLevel,
-    clearScreen: options.clearScreen,
-    build: ssrBuildServerOptions,
-  })
+  await buildByVite(
+    addConfigFile({
+      root: process.env.VITE_ROOT_DIR,
+      logLevel: options.logLevel,
+      clearScreen: options.clearScreen,
+      build: ssrBuildServerOptions,
+    })
+  )
   // copy ssr-manfiest.json to server
   const assets = ['ssr-manifest.json', 'index.html']
   assets.forEach((asset) => {

packages/vite-plugin-uni/src/cli/server.ts

@@ -11,15 +11,17 @@ import express from 'express'
 import { hasOwn } from '@vue/shared'
 import { parseManifestJson } from '@dcloudio/uni-cli-shared'
 import { CliOptions } from '.'
-import { cleanOptions } from './utils'
+import { addConfigFile, cleanOptions } from './utils'
 
 export async function createServer(options: CliOptions & ServerOptions) {
-  const server = await createViteServer({
-    root: process.env.VITE_ROOT_DIR,
-    logLevel: options.logLevel,
-    clearScreen: options.clearScreen,
-    server: cleanOptions(options) as ServerOptions,
-  })
+  const server = await createViteServer(
+    addConfigFile({
+      root: process.env.VITE_ROOT_DIR,
+      logLevel: options.logLevel,
+      clearScreen: options.clearScreen,
+      server: cleanOptions(options) as ServerOptions,
+    })
+  )
   await server.listen()
 }
 
@@ -28,20 +30,22 @@ export async function createSSRServer(options: CliOptions & ServerOptions) {
   /**
    * @type {import('vite').ViteDevServer}
    */
-  const vite = await createViteServer({
-    root: process.env.VITE_ROOT_DIR,
-    logLevel: options.logLevel,
-    clearScreen: options.clearScreen,
-    server: {
-      middlewareMode: true,
-      watch: {
-        // During tests we edit the files too fast and sometimes chokidar
-        // misses change events, so enforce polling for consistency
-        usePolling: true,
-        interval: 100,
+  const vite = await createViteServer(
+    addConfigFile({
+      root: process.env.VITE_ROOT_DIR,
+      logLevel: options.logLevel,
+      clearScreen: options.clearScreen,
+      server: {
+        middlewareMode: true,
+        watch: {
+          // During tests we edit the files too fast and sometimes chokidar
+          // misses change events, so enforce polling for consistency
+          usePolling: true,
+          interval: 100,
+        },
       },
-    },
-  })
+    })
+  )
   // use vite's connect instance as middleware
   app.use(vite.middlewares)
 

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

+import fs from 'fs'
 import path from 'path'
-import { BuildOptions } from 'vite'
+import { BuildOptions, InlineConfig } from 'vite'
+
+import { isInHBuilderX } from '@dcloudio/uni-cli-shared'
+
 import { CliOptions } from '.'
 
 export const PLATFORMS = [
@@ -14,6 +18,26 @@ export const PLATFORMS = [
   'quickapp-webview-union',
 ]
 
+function resolveConfigFile() {
+  const viteConfigJs = path.resolve(process.env.UNI_INPUT_DIR, 'vite.config.js')
+  const viteConfigTs = path.resolve(process.env.UNI_INPUT_DIR, 'vite.config.ts')
+
+  if (fs.existsSync(viteConfigTs)) {
+    return viteConfigTs
+  }
+  if (fs.existsSync(viteConfigJs)) {
+    return viteConfigJs
+  }
+  return path.resolve(process.env.UNI_CLI_CONTEXT, 'vite.config.js')
+}
+
+export function addConfigFile(inlineConfig: InlineConfig) {
+  if (isInHBuilderX()) {
+    inlineConfig.configFile = resolveConfigFile()
+  }
+  return inlineConfig
+}
+
 export function initEnv(type: 'dev' | 'build', options: CliOptions) {
   if (type === 'dev') {
     process.env.NODE_ENV = 'development'
@@ -25,7 +49,9 @@ export function initEnv(type: 'dev' | 'build', options: CliOptions) {
     }
   }
 
-  process.env.UNI_CLI_CONTEXT = process.cwd() // TODO HBuilderX
+  process.env.UNI_CLI_CONTEXT = isInHBuilderX()
+    ? path.resolve(process.env.UNI_HBUILDERX_PLUGINS!, 'uniapp-cli-vite')
+    : process.cwd()
 
   process.env.UNI_PLATFORM = options.platform as UniApp.PLATFORM