wip(uts): buildUniModules 支持 transformVueFile

packages/uni-app-uts/src/extApiComponents.ts

@@ -11,7 +11,7 @@ import { parse } from '@dcloudio/uni-nvue-styler'
 
 import { transformMain as transformAndroid } from './plugins/android/uvue/sfc/main'
 
-export async function transformExtApiComponent(
+export async function transformExtApiVueFile(
   platform: 'app-android' | 'app-ios', // | 'app-harmony',
   vueFileName: string
 ) {
@@ -41,7 +41,7 @@ async function transformAppAndroidExtApiComponent(
     classNamePrefix: 'Uni',
     genDefaultAs: '__sfc__',
     sourceMap: false,
-    componentType: 'app',
+    componentType: 'component',
   })
   if (!result) {
     return null

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

@@ -10,4 +10,4 @@ export { genUTSClassName as genClassName } from '@dcloudio/uni-cli-shared'
 
 export { transformMain as transformVue } from './plugins/android/uvue/sfc/main'
 
-export { transformExtApiComponent } from './extApiComponents'
+export { transformExtApiVueFile } from './extApiComponents'

packages/uni-cli-shared/src/vite/plugins/uts/uni_modules.ts

@@ -64,7 +64,7 @@ function createUniModulesSyncFilePreprocessor(
     return preprocess(htmlCode, preContext, { type: 'html' })
   }
 
-  return (content, fileName) => {
+  return async (content, fileName) => {
     const extname = path.extname(fileName)
     if (extname === '.json') {
       return dataToEsm(JSON.parse(preJs(content)), {

packages/uni-uts-v1/__tests__/tsc.spec.ts

@@ -24,7 +24,7 @@ describe('uni_modules', () => {
           platform === 'app-android'
             ? createUniXKotlinCompilerOnce()
             : createUniXSwiftCompilerOnce(),
-          (content) => {
+          async (content) => {
             return content
           }
         )

packages/uni-uts-v1/src/index.ts

@@ -1,5 +1,5 @@
 import { extend, isArray } from '@vue/shared'
-import { join, relative, resolve } from 'path'
+import { extname, join, relative, resolve } from 'path'
 
 import { resolveAndroidDepFiles } from './kotlin'
 import { resolveIOSDepFiles } from './swift'
@@ -43,6 +43,7 @@ import { getCompiler } from './compiler'
 import { uvueOutDir } from './uvue/index'
 import {
   type SyncUniModulesFilePreprocessor,
+  type UniXCompilerPlatform,
   compileUniModuleWithTsc,
   createUniXArkTSCompilerOnce,
   createUniXKotlinCompilerOnce,
@@ -656,6 +657,7 @@ function emptyDir(dir: string) {
 
 /**
  * 发行模式(会自动清理临时目录)
+ * 目前仅 ext-api 框架的地方使用了
  * @param platform
  * @param pluginDir
  * @param param2
@@ -664,18 +666,28 @@ function emptyDir(dir: string) {
 export async function buildUniModules(
   platform: 'app' | 'app-android' | 'app-ios' | 'app-harmony',
   pluginDir: string,
-  {
-    syncUniModulesFilePreprocessors,
-  }: {
+  options: {
     syncUniModulesFilePreprocessors: {
       android: SyncUniModulesFilePreprocessor
       ios: SyncUniModulesFilePreprocessor
       harmony: SyncUniModulesFilePreprocessor
     }
+    transformVueFile?: (
+      platform: UniXCompilerPlatform,
+      fileName: string
+    ) => Promise<string>
   },
   compilerOptions: UTSPluginCompilerOptions
 ) {
   const inputDir = process.env.UNI_INPUT_DIR
+
+  const syncUniModulesFilePreprocessors = options.transformVueFile
+    ? patchSyncUniModulesFilePreprocessors(
+        options.syncUniModulesFilePreprocessors,
+        options.transformVueFile
+      )
+    : options.syncUniModulesFilePreprocessors
+
   if (platform === 'app-android' || platform === 'app') {
     const platform = 'app-android'
     emptyCacheDir(platform, inputDir, pluginDir)
@@ -709,4 +721,51 @@ export async function buildUniModules(
   return compile(pluginDir, compilerOptions)
 }
 
+function patchSyncUniModulesFilePreprocessors(
+  syncUniModulesFilePreprocessors: {
+    android: SyncUniModulesFilePreprocessor
+    ios: SyncUniModulesFilePreprocessor
+    harmony: SyncUniModulesFilePreprocessor
+  },
+  transformVueFile: (
+    platform: UniXCompilerPlatform,
+    fileName: string
+  ) => Promise<string>
+) {
+  return {
+    android: patchSyncUniModulesFilePreprocessor(
+      'app-android',
+      syncUniModulesFilePreprocessors.android,
+      transformVueFile
+    ),
+    ios: patchSyncUniModulesFilePreprocessor(
+      'app-ios',
+      syncUniModulesFilePreprocessors.ios,
+      transformVueFile
+    ),
+    harmony: patchSyncUniModulesFilePreprocessor(
+      'app-harmony',
+      syncUniModulesFilePreprocessors.harmony,
+      transformVueFile
+    ),
+  }
+}
+
+function patchSyncUniModulesFilePreprocessor(
+  platform: UniXCompilerPlatform,
+  preprocessor: SyncUniModulesFilePreprocessor,
+  transformVueFile: (
+    platform: UniXCompilerPlatform,
+    fileName: string
+  ) => Promise<string>
+) {
+  return async (content: string, fileName: string) => {
+    const fileExtname = extname(fileName)
+    if (['.vue', '.uvue'].includes(fileExtname)) {
+      return transformVueFile(platform, fileName)
+    }
+    return preprocessor(content, fileName)
+  }
+}
+
 export * from './uni_modules'

packages/uni-uts-v1/src/uni_modules.ts

@@ -199,6 +199,7 @@ function resolveUniModuleGlobs() {
     // test-uts/common/**/*
     `common/**/*${extname}`,
     `utssdk/**/*${extname}`,
+    `components/**/*`,
   ]
   return globs
 }
@@ -304,7 +305,7 @@ async function syncUniModulesFiles(
 export type SyncUniModulesFilePreprocessor = (
   code: string,
   fileName: string
-) => string
+) => Promise<string>
 
 async function syncUniModulesFile(
   relativeFileName: string,
@@ -316,7 +317,7 @@ async function syncUniModulesFile(
   const src = path.resolve(pluginDir, relativeFileName)
   if (rename) {
     const extname = path.extname(relativeFileName)
-    if (['.uts', '.json'].includes(extname)) {
+    if (['.uts', '.json', '.vue', '.uvue'].includes(extname)) {
       // test.uts => test.uts.ts
       // test.json => test.json.ts
       return writeFile(
@@ -342,7 +343,9 @@ async function writeFile(
     return
   }
   utsModuleFileCaches.set(key, stat.mtimeMs)
-  return fs.outputFile(dest, preprocessor(fs.readFileSync(src, 'utf-8'), src))
+  return preprocessor(fs.readFileSync(src, 'utf-8'), src).then((content) =>
+    fs.outputFile(dest, content)
+  )
 }
 
 async function copyFile(src: string, dest: string) {