wip(uts): compiler

packages/uni-app-plus/__tests__/uts.spec.ts

 import {
   normalizeArg,
-  initUtsProxyFunction,
-  initUtsProxyClass,
+  initUTSProxyFunction,
+  initUTSProxyClass,
 } from '../src/service/api/plugin/uts'
 
 describe('uts-module', () => {
@@ -39,7 +39,7 @@ describe('uts-module', () => {
   })
   test(`initProxyFunction`, () => {
     ;[true, false].forEach((async) => {
-      const preparePermission = initUtsProxyFunction(async, {
+      const preparePermission = initUTSProxyFunction(async, {
         package: 'uts.modules.TestPlugin',
         class: 'TestKt',
         name: 'preparePermission',
@@ -73,14 +73,14 @@ describe('uts-module', () => {
 
       const errMsg = 'xx插件编译失败，无法使用'
       expect(
-        initUtsProxyFunction(async, {
+        initUTSProxyFunction(async, {
           errMsg,
         } as any)
       ).toThrowError(errMsg)
     })
   })
   test(`initProxyClass`, () => {
-    const WifiManager = initUtsProxyClass({
+    const WifiManager = initUTSProxyClass({
       package: 'uni.modules.TestPlugin',
       class: 'WifiManager',
       constructor: {
@@ -110,7 +110,7 @@ describe('uts-module', () => {
     WifiManager.staticPreparePermission(1)
 
     const errMsg = 'xx插件编译失败，无法使用'
-    const WifiManagerError = initUtsProxyClass({
+    const WifiManagerError = initUTSProxyClass({
       errMsg,
       staticMethods: {
         staticPreparePermission: {

packages/uni-app-plus/dist/uni.runtime.esm.js

@@ -17267,7 +17267,7 @@ function normalizeArg(arg) {
     }
     return arg;
 }
-function initUtsInstanceMethod(async, opts, instanceId) {
+function initUTSInstanceMethod(async, opts, instanceId) {
     return initProxyFunction(async, opts, instanceId);
 }
 function getProxy() {
@@ -17338,7 +17338,7 @@ function initProxyFunction(async, { package: pkg, class: cls, name: propOrMethod
         return resolveSyncResult(getProxy().invokeSync(invokeArgs, invokeCallback));
     };
 }
-function initUtsStaticMethod(async, opts) {
+function initUTSStaticMethod(async, opts) {
     if (opts.main && !opts.method) {
         if (typeof plus !== 'undefined' && plus.os.name === 'iOS') {
             opts.method = 's_' + opts.name;
@@ -17346,14 +17346,14 @@ function initUtsStaticMethod(async, opts) {
     }
     return initProxyFunction(async, opts, 0);
 }
-const initUtsProxyFunction = initUtsStaticMethod;
-function initUtsProxyClass({ package: pkg, class: cls, constructor: { params: constructorParams }, methods, props, staticProps, staticMethods, errMsg, }) {
+const initUTSProxyFunction = initUTSStaticMethod;
+function initUTSProxyClass({ package: pkg, class: cls, constructor: { params: constructorParams }, methods, props, staticProps, staticMethods, errMsg, }) {
     const baseOptions = {
         package: pkg,
         class: cls,
         errMsg,
     };
-    const ProxyClass = class UtsClass {
+    const ProxyClass = class UTSClass {
         constructor(...params) {
             if (errMsg) {
                 throw new Error(errMsg);
@@ -17370,7 +17370,7 @@ function initUtsProxyClass({ package: pkg, class: cls, constructor: { params: co
                         //实例方法
                         if (hasOwn$1(methods, name)) {
                             const { async, params } = methods[name];
-                            target[name] = initUtsInstanceMethod(!!async, extend({
+                            target[name] = initUTSInstanceMethod(!!async, extend({
                                 name,
                                 params,
                             }, baseOptions), instanceId);
@@ -17396,7 +17396,7 @@ function initUtsProxyClass({ package: pkg, class: cls, constructor: { params: co
                 if (!staticMethodCache[name]) {
                     const { async, params } = staticMethods[name];
                     // 静态方法
-                    staticMethodCache[name] = initUtsStaticMethod(!!async, extend({ name, companion: true, params }, baseOptions));
+                    staticMethodCache[name] = initUTSStaticMethod(!!async, extend({ name, companion: true, params }, baseOptions));
                 }
                 return staticMethodCache[name];
             }
@@ -17408,19 +17408,19 @@ function initUtsProxyClass({ package: pkg, class: cls, constructor: { params: co
         },
     });
 }
-function initUtsPackageName(name, is_uni_modules) {
+function initUTSPackageName(name, is_uni_modules) {
     if (typeof plus !== 'undefined' && plus.os.name === 'Android') {
         return 'uts.sdk.' + (is_uni_modules ? 'modules.' : '') + name;
     }
     return '';
 }
-function initUtsIndexClassName(moduleName, is_uni_modules) {
+function initUTSIndexClassName(moduleName, is_uni_modules) {
     if (typeof plus === 'undefined') {
         return '';
     }
-    return initUtsClassName(moduleName, plus.os.name === 'iOS' ? 'IndexSwift' : 'IndexKt', is_uni_modules);
+    return initUTSClassName(moduleName, plus.os.name === 'iOS' ? 'IndexSwift' : 'IndexKt', is_uni_modules);
 }
-function initUtsClassName(moduleName, className, is_uni_modules) {
+function initUTSClassName(moduleName, className, is_uni_modules) {
     if (typeof plus === 'undefined') {
         return '';
     }
@@ -19562,11 +19562,11 @@ var uni$1 = {
   onHostEventReceive: onHostEventReceive,
   onNativeEventReceive: onNativeEventReceive,
   __log__: __log__,
-  initUtsProxyClass: initUtsProxyClass,
-  initUtsProxyFunction: initUtsProxyFunction,
-  initUtsIndexClassName: initUtsIndexClassName,
-  initUtsClassName: initUtsClassName,
-  initUtsPackageName: initUtsPackageName,
+  initUTSProxyClass: initUTSProxyClass,
+  initUTSProxyFunction: initUTSProxyFunction,
+  initUTSIndexClassName: initUTSIndexClassName,
+  initUTSClassName: initUTSClassName,
+  initUTSPackageName: initUTSPackageName,
   requireUTSPlugin: requireUTSPlugin,
   registerUTSPlugin: registerUTSPlugin,
   navigateTo: navigateTo,

packages/uni-app-plus/src/service/api/index.ts

@@ -85,11 +85,11 @@ export {
 export { __log__ } from './plugin/log'
 // 内部使用
 export {
-  initUtsProxyClass,
-  initUtsProxyFunction,
-  initUtsIndexClassName,
-  initUtsClassName,
-  initUtsPackageName,
+  initUTSProxyClass,
+  initUTSProxyFunction,
+  initUTSIndexClassName,
+  initUTSClassName,
+  initUTSPackageName,
   requireUTSPlugin,
   registerUTSPlugin,
 } from './plugin/uts'

packages/uni-app-plus/src/service/api/plugin/uts.js

@@ -18,7 +18,7 @@ function normalizeArg(arg) {
     }
     return arg;
 }
-function initUtsInstanceMethod(async, opts, instanceId) {
+function initUTSInstanceMethod(async, opts, instanceId) {
     return initProxyFunction(async, opts, instanceId);
 }
 function getProxy() {
@@ -89,7 +89,7 @@ function initProxyFunction(async, { package: pkg, class: cls, name: propOrMethod
         return resolveSyncResult(getProxy().invokeSync(invokeArgs, invokeCallback));
     };
 }
-function initUtsStaticMethod(async, opts) {
+function initUTSStaticMethod(async, opts) {
     if (opts.main && !opts.method) {
         if (typeof plus !== 'undefined' && plus.os.name === 'iOS') {
             opts.method = 's_' + opts.name;
@@ -97,14 +97,14 @@ function initUtsStaticMethod(async, opts) {
     }
     return initProxyFunction(async, opts, 0);
 }
-const initUtsProxyFunction = initUtsStaticMethod;
-function initUtsProxyClass({ package: pkg, class: cls, constructor: { params: constructorParams }, methods, props, staticProps, staticMethods, errMsg, }) {
+const initUTSProxyFunction = initUTSStaticMethod;
+function initUTSProxyClass({ package: pkg, class: cls, constructor: { params: constructorParams }, methods, props, staticProps, staticMethods, errMsg, }) {
     const baseOptions = {
         package: pkg,
         class: cls,
         errMsg,
     };
-    const ProxyClass = class UtsClass {
+    const ProxyClass = class UTSClass {
         constructor(...params) {
             if (errMsg) {
                 throw new Error(errMsg);
@@ -121,7 +121,7 @@ function initUtsProxyClass({ package: pkg, class: cls, constructor: { params: co
                         //实例方法
                         if (hasOwn(methods, name)) {
                             const { async, params } = methods[name];
-                            target[name] = initUtsInstanceMethod(!!async, extend({
+                            target[name] = initUTSInstanceMethod(!!async, extend({
                                 name,
                                 params,
                             }, baseOptions), instanceId);
@@ -147,7 +147,7 @@ function initUtsProxyClass({ package: pkg, class: cls, constructor: { params: co
                 if (!staticMethodCache[name]) {
                     const { async, params } = staticMethods[name];
                     // 静态方法
-                    staticMethodCache[name] = initUtsStaticMethod(!!async, extend({ name, companion: true, params }, baseOptions));
+                    staticMethodCache[name] = initUTSStaticMethod(!!async, extend({ name, companion: true, params }, baseOptions));
                 }
                 return staticMethodCache[name];
             }
@@ -159,19 +159,19 @@ function initUtsProxyClass({ package: pkg, class: cls, constructor: { params: co
         },
     });
 }
-function initUtsPackageName(name, is_uni_modules) {
+function initUTSPackageName(name, is_uni_modules) {
     if (typeof plus !== 'undefined' && plus.os.name === 'Android') {
         return 'uts.sdk.' + (is_uni_modules ? 'modules.' : '') + name;
     }
     return '';
 }
-function initUtsIndexClassName(moduleName, is_uni_modules) {
+function initUTSIndexClassName(moduleName, is_uni_modules) {
     if (typeof plus === 'undefined') {
         return '';
     }
-    return initUtsClassName(moduleName, plus.os.name === 'iOS' ? 'IndexSwift' : 'IndexKt', is_uni_modules);
+    return initUTSClassName(moduleName, plus.os.name === 'iOS' ? 'IndexSwift' : 'IndexKt', is_uni_modules);
 }
-function initUtsClassName(moduleName, className, is_uni_modules) {
+function initUTSClassName(moduleName, className, is_uni_modules) {
     if (typeof plus === 'undefined') {
         return '';
     }
@@ -198,4 +198,4 @@ function requireUTSPlugin(name) {
     return define;
 }
 
-export { initUtsClassName, initUtsIndexClassName, initUtsPackageName, initUtsProxyClass, initUtsProxyFunction, normalizeArg, registerUTSPlugin, requireUTSPlugin };
+export { initUTSClassName, initUTSIndexClassName, initUTSPackageName, initUTSProxyClass, initUTSProxyFunction, normalizeArg, registerUTSPlugin, requireUTSPlugin };

packages/uni-app-plus/src/service/api/plugin/uts.ts

@@ -20,7 +20,7 @@ export function normalizeArg(arg: unknown) {
   return arg
 }
 
-function initUtsInstanceMethod(
+function initUTSInstanceMethod(
   async: boolean,
   opts: ProxyFunctionOptions,
   instanceId: number
@@ -248,7 +248,7 @@ function initProxyFunction(
   }
 }
 
-function initUtsStaticMethod(async: boolean, opts: ProxyFunctionOptions) {
+function initUTSStaticMethod(async: boolean, opts: ProxyFunctionOptions) {
   if (opts.main && !opts.method) {
     if (typeof plus !== 'undefined' && plus.os.name === 'iOS') {
       opts.method = 's_' + opts.name
@@ -257,9 +257,9 @@ function initUtsStaticMethod(async: boolean, opts: ProxyFunctionOptions) {
   return initProxyFunction(async, opts, 0)
 }
 
-export const initUtsProxyFunction = initUtsStaticMethod
+export const initUTSProxyFunction = initUTSStaticMethod
 
-export function initUtsProxyClass({
+export function initUTSProxyClass({
   package: pkg,
   class: cls,
   constructor: { params: constructorParams },
@@ -274,7 +274,7 @@ export function initUtsProxyClass({
     class: cls,
     errMsg,
   }
-  const ProxyClass = class UtsClass {
+  const ProxyClass = class UTSClass {
     constructor(...params: unknown[]) {
       if (errMsg) {
         throw new Error(errMsg)
@@ -295,7 +295,7 @@ export function initUtsProxyClass({
             //实例方法
             if (hasOwn(methods, name)) {
               const { async, params } = methods[name]
-              target[name] = initUtsInstanceMethod(
+              target[name] = initUTSInstanceMethod(
                 !!async,
                 extend(
                   {
@@ -327,7 +327,7 @@ export function initUtsProxyClass({
         if (!staticMethodCache[name as string]) {
           const { async, params } = staticMethods[name]
           // 静态方法
-          staticMethodCache[name] = initUtsStaticMethod(
+          staticMethodCache[name] = initUTSStaticMethod(
             !!async,
             extend({ name, companion: true, params }, baseOptions)
           )
@@ -345,28 +345,28 @@ export function initUtsProxyClass({
   })
 }
 
-export function initUtsPackageName(name: string, is_uni_modules: boolean) {
+export function initUTSPackageName(name: string, is_uni_modules: boolean) {
   if (typeof plus !== 'undefined' && plus.os.name === 'Android') {
     return 'uts.sdk.' + (is_uni_modules ? 'modules.' : '') + name
   }
   return ''
 }
 
-export function initUtsIndexClassName(
+export function initUTSIndexClassName(
   moduleName: string,
   is_uni_modules: boolean
 ) {
   if (typeof plus === 'undefined') {
     return ''
   }
-  return initUtsClassName(
+  return initUTSClassName(
     moduleName,
     plus.os.name === 'iOS' ? 'IndexSwift' : 'IndexKt',
     is_uni_modules
   )
 }
 
-export function initUtsClassName(
+export function initUTSClassName(
   moduleName: string,
   className: string,
   is_uni_modules: boolean

packages/uni-app-vite/src/plugins/uts.ts

@@ -14,7 +14,12 @@ function isUTSProxy(id: string) {
 
 const utsModuleCaches = new Map<
   string,
-  () => Promise<void | { code: string; deps: string[]; encrypt: boolean }>
+  () => Promise<void | {
+    code: string
+    deps: string[]
+    encrypt: boolean
+    meta?: any
+  }>
 >()
 export function uniUtsV1Plugin(): Plugin {
   return {
@@ -61,6 +66,7 @@ export function uniUtsV1Plugin(): Plugin {
             return {
               code: result.code,
               syntheticNamedExports: result.encrypt,
+              meta: result.meta,
             }
           }
         })
@@ -77,6 +83,7 @@ export function uniUtsV1Plugin(): Plugin {
         return {
           code: result.code,
           syntheticNamedExports: result.encrypt,
+          meta: result.meta,
         }
       }
     },

packages/uni-uts-v1/__tests__/__snapshots__/code.spec.ts.snap

@@ -2,35 +2,33 @@
 
 exports[`code genProxyCode 1`] = `
 "
-import { initUtsProxyClass, initUtsProxyFunction, initUtsPackageName, initUtsIndexClassName, initUtsClassName } from '@dcloudio/uni-app'
-// const { initUtsProxyClass, initUtsProxyFunction, initUtsPackageName, initUtsIndexClassName, initUtsClassName } = uni
+const { initUTSProxyClass, initUTSProxyFunction, initUTSPackageName, initUTSIndexClassName, initUTSClassName } = uni
 const name = 'test-uts'
 const errMsg = \`\`
 const is_uni_modules = false
-const pkg = initUtsPackageName(name, is_uni_modules)
-const cls = initUtsIndexClassName(name, is_uni_modules)
+const pkg = initUTSPackageName(name, is_uni_modules)
+const cls = initUTSIndexClassName(name, is_uni_modules)
 
-export const onMemoryWarning = initUtsProxyFunction(false, { errMsg, main: true, package: pkg, class: cls, name: 'onMemoryWarning', params: [{"name":"callback","type":"UTSCallback"}]})
-export const offMemoryWarning = initUtsProxyFunction(false, { errMsg, main: true, package: pkg, class: cls, name: 'offMemoryWarning', params: [{"name":"callback","type":"UTSCallback","default":"UTSNull"}]})
-export default initUtsProxyClass(Object.assign({ errMsg, package: pkg, class: initUtsClassName(name, 'User', is_uni_modules) }, {"constructor":{"params":[]},"methods":{},"staticMethods":{},"props":[],"staticProps":[]} ))
+export const onMemoryWarning = initUTSProxyFunction(false, { errMsg, main: true, package: pkg, class: cls, name: 'onMemoryWarning', params: [{"name":"callback","type":"UTSCallback"}]})
+export const offMemoryWarning = initUTSProxyFunction(false, { errMsg, main: true, package: pkg, class: cls, name: 'offMemoryWarning', params: [{"name":"callback","type":"UTSCallback","default":"UTSNull"}]})
+export default initUTSProxyClass(Object.assign({ errMsg, package: pkg, class: initUTSClassName(name, 'User', is_uni_modules) }, {"constructor":{"params":[]},"methods":{},"staticMethods":{},"props":[],"staticProps":[]} ))
 export const a = 1
 "
 `;
 
 exports[`code genProxyCode cjs 1`] = `
 "
-import { initUtsProxyClass, initUtsProxyFunction, initUtsPackageName, initUtsIndexClassName, initUtsClassName } from '@dcloudio/uni-app'
-// const { initUtsProxyClass, initUtsProxyFunction, initUtsPackageName, initUtsIndexClassName, initUtsClassName } = uni
+const { initUTSProxyClass, initUTSProxyFunction, initUTSPackageName, initUTSIndexClassName, initUTSClassName } = uni
 const name = 'test-uts'
 const errMsg = \`\`
 const is_uni_modules = false
-const pkg = initUtsPackageName(name, is_uni_modules)
-const cls = initUtsIndexClassName(name, is_uni_modules)
+const pkg = initUTSPackageName(name, is_uni_modules)
+const cls = initUTSIndexClassName(name, is_uni_modules)
 
 const exports = {}
-exports.onMemoryWarning = initUtsProxyFunction(false, { errMsg, main: true, package: pkg, class: cls, name: 'onMemoryWarning', params: [{"name":"callback","type":"UTSCallback"}]})
-exports.offMemoryWarning = initUtsProxyFunction(false, { errMsg, main: true, package: pkg, class: cls, name: 'offMemoryWarning', params: [{"name":"callback","type":"UTSCallback","default":"UTSNull"}]})
-exports.default = initUtsProxyClass(Object.assign({ errMsg, package: pkg, class: initUtsClassName(name, 'User', is_uni_modules) }, {"constructor":{"params":[]},"methods":{},"staticMethods":{},"props":[],"staticProps":[]} ))
+exports.onMemoryWarning = initUTSProxyFunction(false, { errMsg, main: true, package: pkg, class: cls, name: 'onMemoryWarning', params: [{"name":"callback","type":"UTSCallback"}]})
+exports.offMemoryWarning = initUTSProxyFunction(false, { errMsg, main: true, package: pkg, class: cls, name: 'offMemoryWarning', params: [{"name":"callback","type":"UTSCallback","default":"UTSNull"}]})
+exports.default = initUTSProxyClass(Object.assign({ errMsg, package: pkg, class: initUTSClassName(name, 'User', is_uni_modules) }, {"constructor":{"params":[]},"methods":{},"staticMethods":{},"props":[],"staticProps":[]} ))
 const a = 1
 exports.a = a
 uni.registerUTSPlugin('utssdk/test-uts', exports)

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

@@ -41,12 +41,12 @@ export async function genProxyCode(
 ) {
   const { name, is_uni_modules, format } = options
   return `
-const { initUtsProxyClass, initUtsProxyFunction, initUtsPackageName, initUtsIndexClassName, initUtsClassName } = uni
+const { initUTSProxyClass, initUTSProxyFunction, initUTSPackageName, initUTSIndexClassName, initUTSClassName } = uni
 const name = '${name}'
 const errMsg = \`${ERR_MSG_PLACEHOLDER}\`
 const is_uni_modules = ${is_uni_modules}
-const pkg = initUtsPackageName(name, is_uni_modules)
-const cls = initUtsIndexClassName(name, is_uni_modules)
+const pkg = initUTSPackageName(name, is_uni_modules)
+const cls = initUTSIndexClassName(name, is_uni_modules)
 ${genComponentsCode(
   options.androidComponents || {},
   options.iosComponents || {}
@@ -129,7 +129,7 @@ function genModuleCode(
     if (decl.type === 'Class') {
       if (decl.isDefault) {
         codes.push(
-          `${exportDefault}initUtsProxyClass(Object.assign({ errMsg, package: pkg, class: initUtsClassName(name, '${
+          `${exportDefault}initUTSProxyClass(Object.assign({ errMsg, package: pkg, class: initUTSClassName(name, '${
             decl.cls
           }', is_uni_modules) }, ${JSON.stringify(decl.options)} ))`
         )
@@ -137,7 +137,7 @@ function genModuleCode(
         codes.push(
           `${exportConst}${
             decl.cls
-          } = initUtsProxyClass(Object.assign({ errMsg, package: pkg, class: initUtsClassName(name, '${
+          } = initUTSProxyClass(Object.assign({ errMsg, package: pkg, class: initUTSClassName(name, '${
             decl.cls
           }', is_uni_modules) }, ${JSON.stringify(decl.options)} ))`
         )
@@ -145,7 +145,7 @@ function genModuleCode(
     } else if (decl.type === 'FunctionDeclaration') {
       if (decl.isDefault) {
         codes.push(
-          `${exportDefault}nitUtsProxyFunction(${
+          `${exportDefault}initUTSProxyFunction(${
             decl.async
           }, { errMsg, main: true, package: pkg, class: cls, name: '${
             decl.method
@@ -153,7 +153,7 @@ function genModuleCode(
         )
       } else {
         codes.push(
-          `${exportConst}${decl.method} = initUtsProxyFunction(${
+          `${exportConst}${decl.method} = initUTSProxyFunction(${
             decl.async
           }, { errMsg, main: true, package: pkg, class: cls, name: '${
             decl.method

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

@@ -12,16 +12,18 @@ export async function compileEncrypt(pluginDir: string) {
   const outputDir = process.env.UNI_OUTPUT_DIR
   const utsPlatform = process.env.UNI_UTS_PLATFORM as APP_PLATFORM
   const pluginRelativeDir = relative(inputDir, pluginDir)
+  const code = `
+  Object.defineProperty(exports, '__esModule', { value: true })      
+  module.exports = uni.requireUTSPlugin('${normalizePath(pluginRelativeDir)}')
+  `
   if (process.env.NODE_ENV !== 'development') {
     // 复制插件目录
     fs.copySync(pluginDir, join(outputDir, pluginRelativeDir))
     return {
-      code: `
-Object.defineProperty(exports, '__esModule', { value: true })      
-module.exports = uni.requireUTSPlugin('${normalizePath(pluginRelativeDir)}')
-`,
+      code,
       deps: [] as string[],
       encrypt: true,
+      meta: { commonjs: { isCommonJS: true } },
     }
   }
   // 读取缓存目录的 js code
@@ -37,9 +39,10 @@ module.exports = uni.requireUTSPlugin('${normalizePath(pluginRelativeDir)}')
     )
   }
   return {
-    code: fs.readFileSync(indexJsPath, 'utf-8'),
+    code: fs.readFileSync(indexJsPath, 'utf-8') + code,
     deps: [] as string[],
     encrypt: true,
+    meta: { commonjs: { isCommonJS: true } },
   }
 }
 

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

@@ -69,7 +69,29 @@ function warn(msg: string) {
   console.warn(`提示：${msg}`)
 }
 
-export async function compile(pluginDir: string) {
+export interface CompileResult {
+  code: string
+  deps: string[]
+  encrypt: boolean
+  meta?: any
+}
+
+function createResult(
+  errMsg: string,
+  code: string,
+  deps: string[]
+): CompileResult {
+  return {
+    code: parseErrMsg(code, errMsg),
+    deps,
+    encrypt: false,
+    meta: {},
+  }
+}
+
+export async function compile(
+  pluginDir: string
+): Promise<CompileResult | void> {
   const pkg = resolvePackage(pluginDir)
   if (!pkg) {
     return
@@ -176,20 +198,12 @@ export async function compile(pluginDir: string) {
     if (utsPlatform === 'app-ios') {
       if (isWindows) {
         process.env.UNI_UTS_TIPS = `iOS手机在windows上真机运行时uts插件代码修改需提交云端打包自定义基座才能生效`
-        return {
-          code: parseErrMsg(code, errMsg),
-          deps,
-          encrypt: false,
-        }
+        return createResult(errMsg, code, deps)
       }
       // ios 模拟器不支持
       if (process.env.HX_RUN_DEVICE_TYPE === 'ios_simulator') {
         process.env.UNI_UTS_TIPS = `iOS手机在模拟器运行暂不支持uts插件，如需调用uts插件请使用自定义基座`
-        return {
-          code: parseErrMsg(code, compileErrMsg(pkg.id)),
-          deps,
-          encrypt: false,
-        }
+        return createResult(compileErrMsg(pkg.id), code, deps)
       }
     }
     if (utsPlatform === 'app-android' || utsPlatform === 'app-ios') {
@@ -250,13 +264,12 @@ export async function compile(pluginDir: string) {
           if (versionTips) {
             warn(versionTips)
           }
-
-          return {
-            code: parseErrMsg(code, errMsg),
-            // 所有文件加入依赖
-            deps: res.files.map((name) => join(pluginDir, name)),
-            encrypt: false,
-          }
+          // 所有文件加入依赖
+          return createResult(
+            errMsg,
+            code,
+            res.files.map((name) => join(pluginDir, name))
+          )
         }
       }
       let filename =
@@ -371,11 +384,7 @@ export async function compile(pluginDir: string) {
       }
     }
   }
-  return {
-    code: parseErrMsg(code, errMsg),
-    deps,
-    encrypt: false,
-  }
+  return createResult(errMsg, code, deps)
 }
 
 function getCompiler(type: 'kotlin' | 'swift') {

packages/uts-linux-x64-musl/package.json

+{
+  "name": "@dcloudio/uts-linux-x64-musl",
+  "version": "3.0.0-alpha-3070020230117001",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "main": "uts.linux-x64-musl.node",
+  "files": [
+    "uts.linux-x64-musl.node"
+  ],
+  "libc": [
+    "musl"
+  ],
+  "engines": {
+    "node": ">=10"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/dcloudio/uni-app.git",
+    "directory": "packages/uts-linux-x64-musl"
+  }
+}
\ No newline at end of file

packages/uts-win32-ia32-msvc/package.json

@@ -17,6 +17,6 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dcloudio/uni-app.git",
-    "directory": "packages/uts.win32-ia32-msvc"
+    "directory": "packages/uts-win32-ia32-msvc"
   }
 }

packages/uts/package.json

@@ -16,7 +16,8 @@
   "optionalDependencies": {
     "@dcloudio/uts-darwin-arm64": "3.0.0-alpha-3070020230117001",
     "@dcloudio/uts-darwin-x64": "3.0.0-alpha-3070020230117001",
+    "@dcloudio/uts-linux-x64-musl": "3.0.0-alpha-3070020230117001",
     "@dcloudio/uts-win32-ia32-msvc": "3.0.0-alpha-3070020230117001",
     "@dcloudio/uts-win32-x64-msvc": "3.0.0-alpha-3070020230117001"
   }
-}
+}
\ No newline at end of file

pnpm-lock.yaml

@@ -880,11 +880,13 @@ importers:
     specifiers:
       '@dcloudio/uts-darwin-arm64': 3.0.0-alpha-3070020230117001
       '@dcloudio/uts-darwin-x64': 3.0.0-alpha-3070020230117001
+      '@dcloudio/uts-linux-x64-musl': 3.0.0-alpha-3070020230117001
       '@dcloudio/uts-win32-ia32-msvc': 3.0.0-alpha-3070020230117001
       '@dcloudio/uts-win32-x64-msvc': 3.0.0-alpha-3070020230117001
     optionalDependencies:
       '@dcloudio/uts-darwin-arm64': link:../uts-darwin-arm64
       '@dcloudio/uts-darwin-x64': link:../uts-darwin-x64
+      '@dcloudio/uts-linux-x64-musl': link:../uts-linux-x64-musl
       '@dcloudio/uts-win32-ia32-msvc': link:../uts-win32-ia32-msvc
       '@dcloudio/uts-win32-x64-msvc': link:../uts-win32-x64-msvc
 
@@ -894,6 +896,9 @@ importers:
   packages/uts-darwin-x64:
     specifiers: {}
 
+  packages/uts-linux-x64-musl:
+    specifiers: {}
+
   packages/uts-win32-ia32-msvc:
     specifiers: {}
 

scripts/checkVersion.js

@@ -37,7 +37,7 @@ const pkgs = {
     latest: '3.0.2',
   },
   '@dcloudio/types': {
-    latest: '3.2.7',
+    latest: '3.2.10',
   },
   autoprefixer: {
     latest: '10.4.13',
@@ -46,7 +46,7 @@ const pkgs = {
     latest: '3.4.0',
   },
   typescript: {
-    latest: '4.9.4',
+    latest: '4.9.5',
   },
 }