@dcloudio/uni-cli-shared 3.0.0-4000820240401001 → 3.0.0-4010420240430002

package/dist/uts.js

@@ -3,15 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genUTSClassName = exports.matchUTSComponent = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.isUTSComponent = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.isUTSComponent = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+// 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const hbx_1 = require("./hbx");
 const utils_1 = require("./utils");
-const easycom_1 = require("./easycom");
 const uni_modules_1 = require("./uni_modules");
-// 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
 function once(fn, ctx = null) {
     let res;
     return ((...args) => {
@@ -36,6 +35,15 @@ function resolveUTSAppModule(id, importer, includeUTSSDK = true) {
         if (parentDir === 'uni_modules' ||
             (includeUTSSDK && parentDir === 'utssdk')) {
             const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
+            if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+                // js engine
+                if (parentDir === 'uni_modules') {
+                    const appJsIndex = path_1.default.resolve(id, basedir, 'app-js', 'index.uts');
+                    if (fs_1.default.existsSync(appJsIndex)) {
+                        return appJsIndex;
+                    }
+                }
+            }
             if (fs_1.default.existsSync(path_1.default.resolve(id, basedir, 'index.uts'))) {
                 return id;
             }
@@ -104,8 +112,18 @@ function resolveUTSCompiler() {
             });
         }
         catch (e) {
-            let utsCompilerVersion = utils_1.version;
-            if (utils_1.version.startsWith('2.0.')) {
+            let utsCompilerVersion = '';
+            try {
+                utsCompilerVersion = require('../package.json').version;
+            }
+            catch (e) {
+                try {
+                    // vue2
+                    utsCompilerVersion = require('../../package.json').version;
+                }
+                catch (e) { }
+            }
+            if (utsCompilerVersion.startsWith('2.0.')) {
                 utsCompilerVersion = '^3.0.0-alpha-3060920221117001';
             }
             console.error((0, utils_1.installDepTips)('devDependencies', '@dcloudio/uni-uts-v1', utsCompilerVersion));
@@ -254,42 +272,10 @@ exports.parseUniExtApiNamespacesJsOnce = once((platform, language) => {
     });
     return namespaces;
 });
-function matchUTSComponent(tag) {
-    const source = (0, easycom_1.matchEasycom)(tag);
-    return !!(source && source.includes('uts-proxy'));
-}
-exports.matchUTSComponent = matchUTSComponent;
-function genUTSClassName(fileName, prefix = 'Gen') {
-    return (prefix +
-        (0, utils_1.capitalize)((0, utils_1.camelize)(verifySymbol((0, utils_1.removeExt)((0, utils_1.normalizeNodeModules)(fileName)
-            .replace(/[\/|_]/g, '-')
-            .replace(/-+/g, '-'))))));
-}
-exports.genUTSClassName = genUTSClassName;
-function isValidStart(c) {
-    return !!c.match(/^[A-Za-z_-]$/);
-}
-function isValidContinue(c) {
-    return !!c.match(/^[A-Za-z0-9_-]$/);
-}
-function verifySymbol(s) {
-    const chars = Array.from(s);
-    if (isValidStart(chars[0]) && chars.slice(1).every(isValidContinue)) {
-        return s;
-    }
-    const buf = [];
-    let hasStart = false;
-    for (const c of chars) {
-        if (!hasStart && isValidStart(c)) {
-            hasStart = true;
-            buf.push(c);
-        }
-        else if (isValidContinue(c)) {
-            buf.push(c);
-        }
-    }
-    if (buf.length === 0) {
-        buf.push('_');
+function resolveUniTypeScript() {
+    if ((0, hbx_1.isInHBuilderX)()) {
+        return require(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uniapp-uts-v1', 'node_modules', '@dcloudio', 'uni-uts-v1', 'lib', 'typescript'));
     }
-    return buf.join('');
+    return require('@dcloudio/uni-uts-v1/lib/typescript');
 }
+exports.resolveUniTypeScript = resolveUniTypeScript;

package/dist/utsUtils.d.ts

@@ -0,0 +1,2 @@
+export declare function matchUTSComponent(tag: string): boolean;
+export declare function genUTSClassName(fileName: string, prefix?: string): string;

package/dist/utsUtils.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genUTSClassName = exports.matchUTSComponent = void 0;
+const easycom_1 = require("./easycom");
+const utils_1 = require("./utils");
+function matchUTSComponent(tag) {
+    const source = (0, easycom_1.matchEasycom)(tag);
+    return !!(source && source.includes('uts-proxy'));
+}
+exports.matchUTSComponent = matchUTSComponent;
+function genUTSClassName(fileName, prefix = 'Gen') {
+    return (prefix +
+        (0, utils_1.capitalize)((0, utils_1.camelize)(verifySymbol((0, utils_1.removeExt)((0, utils_1.normalizeNodeModules)(fileName)
+            .replace(/[\/|_]/g, '-')
+            .replace(/-+/g, '-'))))));
+}
+exports.genUTSClassName = genUTSClassName;
+function isValidStart(c) {
+    return !!c.match(/^[A-Za-z_-]$/);
+}
+function isValidContinue(c) {
+    return !!c.match(/^[A-Za-z0-9_-]$/);
+}
+function verifySymbol(s) {
+    const chars = Array.from(s);
+    if (isValidStart(chars[0]) && chars.slice(1).every(isValidContinue)) {
+        return s;
+    }
+    const buf = [];
+    let hasStart = false;
+    for (const c of chars) {
+        if (!hasStart && isValidStart(c)) {
+            hasStart = true;
+            buf.push(c);
+        }
+        else if (isValidContinue(c)) {
+            buf.push(c);
+        }
+    }
+    if (buf.length === 0) {
+        buf.push('_');
+    }
+    return buf.join('');
+}

package/dist/vite/autoImport.d.ts

@@ -1,3 +1,3 @@
-import { Options } from 'unplugin-auto-import/types';
+import type { Options } from 'unplugin-auto-import/types';
 export type AutoImportOptions = Options;
 export declare function initAutoImportOptions(platform: typeof process.env.UNI_UTS_PLATFORM, { imports, ...userOptions }: AutoImportOptions): AutoImportOptions;

package/dist/vite/autoImport.js

@@ -132,6 +132,7 @@ const vuePreset = {
         'provide',
         'useCssModule',
         'createApp',
+        'hasInjectionContext',
         // effect scope
         'effectScope',
         'EffectScope',

package/dist/vite/features.d.ts

@@ -11,6 +11,7 @@ interface InitFeaturesOptions {
 export declare function initFeatures(options: InitFeaturesOptions): {
     __VUE_OPTIONS_API__: boolean;
     __VUE_PROD_DEVTOOLS__: boolean;
+    __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: boolean;
     __UNI_FEATURE_WX__: boolean;
     __UNI_FEATURE_WXS__: boolean;
     __UNI_FEATURE_RPX__: boolean;

package/dist/vite/features.js

@@ -128,6 +128,7 @@ function initManifestFeature({ manifestJson, command, platform, }) {
         routerMode: '"hash"',
         vueOptionsApi: true,
         vueProdDevTools: false,
+        vueProdHydrationMismatchDetails: false,
     };
     if (command === 'build') {
         // TODO 需要预编译一遍？
@@ -143,38 +144,40 @@ function initManifestFeature({ manifestJson, command, platform, }) {
     return features;
 }
 function initFeatures(options) {
-    const { wx, wxs, rpx, nvue, uniCloud, i18nEn, i18nEs, i18nFr, i18nZhHans, i18nZhHant, i18nLocale, vueOptionsApi, vueProdDevTools, pages, tabBar, tabBarMidButton, promise, longpress, routerMode, topWindow, leftWindow, rightWindow, navigationBar, pullDownRefresh, navigationBarButtons, navigationBarSearchInput, navigationBarTransparent, } = (0, shared_1.extend)(initManifestFeature(options), initPagesFeature(options), initProjectFeature(options));
+    const { wx, wxs, rpx, nvue, uniCloud, i18nEn, i18nEs, i18nFr, i18nZhHans, i18nZhHant, i18nLocale, vueOptionsApi, vueProdDevTools, vueProdHydrationMismatchDetails, pages, tabBar, tabBarMidButton, promise, longpress, routerMode, topWindow, leftWindow, rightWindow, navigationBar, pullDownRefresh, navigationBarButtons, navigationBarSearchInput, navigationBarTransparent, } = (0, shared_1.extend)(initManifestFeature(options), initPagesFeature(options), initProjectFeature(options));
+    // uni-app-x运行时可调用$setPageStyle，需启用相关特性方可支持。否则$setPageStyle无效果
     const features = {
         // vue
-        __VUE_OPTIONS_API__: vueOptionsApi,
-        __VUE_PROD_DEVTOOLS__: vueProdDevTools,
+        __VUE_OPTIONS_API__: vueOptionsApi, // enable/disable Options API support, default: true
+        __VUE_PROD_DEVTOOLS__: vueProdDevTools, // enable/disable devtools support in production, default: false
+        __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: vueProdHydrationMismatchDetails,
         // uni
-        __UNI_FEATURE_WX__: wx,
-        __UNI_FEATURE_WXS__: wxs,
-        __UNI_FEATURE_RPX__: rpx,
-        __UNI_FEATURE_PROMISE__: promise,
-        __UNI_FEATURE_LONGPRESS__: longpress,
-        __UNI_FEATURE_I18N_EN__: i18nEn,
-        __UNI_FEATURE_I18N_ES__: i18nEs,
-        __UNI_FEATURE_I18N_FR__: i18nFr,
-        __UNI_FEATURE_I18N_ZH_HANS__: i18nZhHans,
-        __UNI_FEATURE_I18N_ZH_HANT__: i18nZhHant,
+        __UNI_FEATURE_WX__: wx, // 是否启用小程序的组件实例 API，如：selectComponent 等（uni-core/src/service/plugin/appConfig）
+        __UNI_FEATURE_WXS__: wxs, // 是否启用 wxs 支持，如：getComponentDescriptor 等（uni-core/src/view/plugin/appConfig）
+        __UNI_FEATURE_RPX__: rpx, // 是否启用运行时 rpx 支持
+        __UNI_FEATURE_PROMISE__: promise, // 是否启用旧版本的 promise 支持（即返回[err,res]的格式）,默认返回标准
+        __UNI_FEATURE_LONGPRESS__: longpress, // 是否启用longpress
+        __UNI_FEATURE_I18N_EN__: i18nEn, // 是否启用en
+        __UNI_FEATURE_I18N_ES__: i18nEs, // 是否启用es
+        __UNI_FEATURE_I18N_FR__: i18nFr, // 是否启用fr
+        __UNI_FEATURE_I18N_ZH_HANS__: i18nZhHans, // 是否启用zh_Hans
+        __UNI_FEATURE_I18N_ZH_HANT__: i18nZhHant, // 是否启用zh_Hant
         // 以下特性，编译器已自动识别是否需要启用
-        __UNI_FEATURE_UNI_CLOUD__: uniCloud,
-        __UNI_FEATURE_I18N_LOCALE__: i18nLocale,
-        __UNI_FEATURE_NVUE__: nvue,
-        __UNI_FEATURE_ROUTER_MODE__: routerMode,
-        __UNI_FEATURE_PAGES__: pages,
-        __UNI_FEATURE_TABBAR__: tabBar,
-        __UNI_FEATURE_TABBAR_MIDBUTTON__: tabBarMidButton,
-        __UNI_FEATURE_TOPWINDOW__: topWindow,
-        __UNI_FEATURE_LEFTWINDOW__: leftWindow,
-        __UNI_FEATURE_RIGHTWINDOW__: rightWindow,
-        __UNI_FEATURE_RESPONSIVE__: topWindow || leftWindow || rightWindow,
-        __UNI_FEATURE_NAVIGATIONBAR__: navigationBar,
-        __UNI_FEATURE_PULL_DOWN_REFRESH__: pullDownRefresh,
-        __UNI_FEATURE_NAVIGATIONBAR_BUTTONS__: navigationBarButtons,
-        __UNI_FEATURE_NAVIGATIONBAR_SEARCHINPUT__: navigationBarSearchInput,
+        __UNI_FEATURE_UNI_CLOUD__: uniCloud, // 是否启用uniCloud
+        __UNI_FEATURE_I18N_LOCALE__: i18nLocale, // 是否启用i18n
+        __UNI_FEATURE_NVUE__: nvue, // 是否启用nvue
+        __UNI_FEATURE_ROUTER_MODE__: routerMode, // 路由模式
+        __UNI_FEATURE_PAGES__: pages, // 是否多页面
+        __UNI_FEATURE_TABBAR__: tabBar, // 是否包含tabBar
+        __UNI_FEATURE_TABBAR_MIDBUTTON__: tabBarMidButton, // 是否包含midButton
+        __UNI_FEATURE_TOPWINDOW__: topWindow, // 是否包含topWindow
+        __UNI_FEATURE_LEFTWINDOW__: leftWindow, // 是否包含leftWindow
+        __UNI_FEATURE_RIGHTWINDOW__: rightWindow, // 是否包含rightWindow
+        __UNI_FEATURE_RESPONSIVE__: topWindow || leftWindow || rightWindow, // 是否启用响应式
+        __UNI_FEATURE_NAVIGATIONBAR__: navigationBar, // 是否启用标题栏
+        __UNI_FEATURE_PULL_DOWN_REFRESH__: pullDownRefresh, // 是否启用下拉刷新
+        __UNI_FEATURE_NAVIGATIONBAR_BUTTONS__: navigationBarButtons, // 是否启用标题栏按钮
+        __UNI_FEATURE_NAVIGATIONBAR_SEARCHINPUT__: navigationBarSearchInput, // 是否启用标题栏搜索框
         __UNI_FEATURE_NAVIGATIONBAR_TRANSPARENT__: navigationBarTransparent, // 是否启用透明标题栏
     };
     // ssr nodejs features

package/dist/vite/index.d.ts

@@ -2,7 +2,7 @@ import type { Plugin } from 'vite';
 import type { EmittedAsset } from 'rollup';
 import type { ParserOptions } from '@vue/compiler-core';
 import type { CompilerOptions, SFCStyleCompileOptions, TemplateCompiler } from '@vue/compiler-sfc';
-import { UniViteCopyPluginOptions } from './plugins/copy';
+import type { UniViteCopyPluginOptions } from './plugins/copy';
 export declare const cssTarget = "chrome53";
 export interface CopyOptions {
     /**
@@ -22,6 +22,7 @@ interface UniVitePluginUniOptions {
         isCustomElement?: ParserOptions['isCustomElement'];
         directiveTransforms?: CompilerOptions['directiveTransforms'];
         nodeTransforms?: CompilerOptions['nodeTransforms'];
+        whitespace?: CompilerOptions['whitespace'];
     };
     jsxOptions?: {
         babelPlugins?: any[];

package/dist/vite/plugins/console.d.ts

@@ -1,5 +1,5 @@
-import { Plugin } from 'vite';
-import { FilterPattern } from '@rollup/pluginutils';
+import type { Plugin } from 'vite';
+import { type FilterPattern } from '@rollup/pluginutils';
 export interface ConsoleOptions {
     method: string;
     filename?: (filename: string) => string;

package/dist/vite/plugins/copy.d.ts

@@ -1,6 +1,6 @@
 import type { WatchOptions } from 'chokidar';
 import type { Plugin } from 'vite';
-import { FileWatcherOptions } from '../../watcher';
+import { type FileWatcherOptions } from '../../watcher';
 export type UniViteCopyPluginTarget = Omit<FileWatcherOptions, 'verbose'> & {
     watchOptions?: WatchOptions;
 };

package/dist/vite/plugins/easycom.d.ts

@@ -1,5 +1,5 @@
-import { Plugin } from 'vite';
-import { FilterPattern } from '@rollup/pluginutils';
+import type { Plugin } from 'vite';
+import { type FilterPattern } from '@rollup/pluginutils';
 interface UniEasycomPluginOptions {
     include?: FilterPattern;
     exclude?: FilterPattern;

package/dist/vite/plugins/index.d.ts

@@ -9,6 +9,7 @@ export * from './uts/uni_modules';
 export * from './uts/uvue';
 export * from './uts/ext-api';
 export * from './easycom';
+export { uniViteSfcSrcImportPlugin } from './sfc';
 export { assetPlugin, parseAssets, getAssetHash } from './vitejs/plugins/asset';
 export { isCSSRequest, cssPlugin, cssPostPlugin, minifyCSS, cssLangRE, commonjsProxyRE, rewriteScssReadFileSync, } from './vitejs/plugins/css';
 export { generateCodeFrame, locToStartAndEnd, offsetToStartAndEnd, } from './vitejs/utils';

package/dist/vite/plugins/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.offsetToStartAndEnd = exports.locToStartAndEnd = exports.generateCodeFrame = exports.rewriteScssReadFileSync = exports.commonjsProxyRE = exports.cssLangRE = exports.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.parseAssets = exports.assetPlugin = void 0;
+exports.offsetToStartAndEnd = exports.locToStartAndEnd = exports.generateCodeFrame = exports.rewriteScssReadFileSync = exports.commonjsProxyRE = exports.cssLangRE = exports.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.parseAssets = exports.assetPlugin = exports.uniViteSfcSrcImportPlugin = void 0;
 __exportStar(require("./cssScoped"), exports);
 __exportStar(require("./copy"), exports);
 __exportStar(require("./inject"), exports);
@@ -26,6 +26,8 @@ __exportStar(require("./uts/uni_modules"), exports);
 __exportStar(require("./uts/uvue"), exports);
 __exportStar(require("./uts/ext-api"), exports);
 __exportStar(require("./easycom"), exports);
+var sfc_1 = require("./sfc");
+Object.defineProperty(exports, "uniViteSfcSrcImportPlugin", { enumerable: true, get: function () { return sfc_1.uniViteSfcSrcImportPlugin; } });
 var asset_1 = require("./vitejs/plugins/asset");
 Object.defineProperty(exports, "assetPlugin", { enumerable: true, get: function () { return asset_1.assetPlugin; } });
 Object.defineProperty(exports, "parseAssets", { enumerable: true, get: function () { return asset_1.parseAssets; } });

package/dist/vite/plugins/inject.d.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from 'vite';
-import { FilterPattern } from '@rollup/pluginutils';
+import { type FilterPattern } from '@rollup/pluginutils';
 type Injectment = string | [string, string];
 export interface InjectOptions {
     enforce?: 'pre' | 'post';

package/dist/vite/plugins/inject.js

@@ -12,7 +12,7 @@ const shared_1 = require("@vue/shared");
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
 const debugInject = (0, debug_1.default)('uni:inject');
-const debugInjectTry = (0, debug_1.default)('uni:inject-try');
+// const debugInjectTry = debug('uni:inject-try')
 function uniViteInjectPlugin(name, options) {
     if (!options)
         throw new Error('Missing options');
@@ -49,7 +49,7 @@ function uniViteInjectPlugin(name, options) {
                 return null;
             if (!(0, utils_1.isJsFile)(id))
                 return null;
-            debugInjectTry(id);
+            // debugInjectTry(id)
             if (code.search(firstpass) === -1)
                 return null;
             if (path_1.sep !== '/')

package/dist/vite/plugins/jsonJs.d.ts

@@ -1,3 +1,3 @@
-import { CreateUniViteFilterPlugin } from '../utils/plugin';
-export declare const defineUniPagesJsonPlugin: (createVitePlugin: CreateUniViteFilterPlugin) => import("vite").Plugin;
-export declare const defineUniManifestJsonPlugin: (createVitePlugin: CreateUniViteFilterPlugin) => import("vite").Plugin;
+import type { CreateUniViteFilterPlugin } from '../utils/plugin';
+export declare const defineUniPagesJsonPlugin: (createVitePlugin: CreateUniViteFilterPlugin) => import("vite").Plugin<any>;
+export declare const defineUniManifestJsonPlugin: (createVitePlugin: CreateUniViteFilterPlugin) => import("vite").Plugin<any>;

package/dist/vite/plugins/mainJs.d.ts

@@ -1,2 +1,2 @@
-import { CreateUniViteFilterPlugin } from '../utils/plugin';
-export declare function defineUniMainJsPlugin(createUniMainJsPlugin: CreateUniViteFilterPlugin): import("vite").Plugin;
+import type { CreateUniViteFilterPlugin } from '../utils/plugin';
+export declare function defineUniMainJsPlugin(createUniMainJsPlugin: CreateUniViteFilterPlugin): import("vite").Plugin<any>;

package/dist/vite/plugins/sfc.d.ts

@@ -0,0 +1,6 @@
+import type { Plugin } from 'vite';
+export declare function isSrcImport(code: string): boolean;
+export declare function isSrcImportVue(code: string): boolean;
+export declare function uniViteSfcSrcImportPlugin({ onlyVue }?: {
+    onlyVue: boolean;
+}): Plugin;

package/dist/vite/plugins/sfc.js

@@ -0,0 +1,136 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniViteSfcSrcImportPlugin = exports.isSrcImportVue = exports.isSrcImport = void 0;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const magic_string_1 = __importDefault(require("magic-string"));
+const vue_1 = require("../../vue");
+const utils_1 = require("../utils");
+const preprocess_1 = require("../../preprocess");
+const SRC_IMPORT_RE = /<(template|script|style)[^>]*src\s*=\s*["']([^"']+)["'][^>]*>/;
+const SRC_IMPORT_VUE_RE = /<(template|script|style)[^>]*src\s*=\s*["'](.*\.uvue|.*\.vue)["'][^>]*>/;
+function isSrcImport(code) {
+    return SRC_IMPORT_RE.test(code);
+}
+exports.isSrcImport = isSrcImport;
+function isSrcImportVue(code) {
+    return SRC_IMPORT_VUE_RE.test(code);
+}
+exports.isSrcImportVue = isSrcImportVue;
+function uniViteSfcSrcImportPlugin({ onlyVue } = { onlyVue: true }) {
+    const { parse } = require('@vue/compiler-sfc');
+    const hasImport = onlyVue ? isSrcImportVue : isSrcImport;
+    const isValidSrc = onlyVue ? vue_1.isVueSfcFile : () => true;
+    return {
+        name: 'uni:sfc-src-import',
+        async transform(code, id) {
+            if (!(0, vue_1.isVueSfcFile)(id)) {
+                return;
+            }
+            if (!hasImport(code)) {
+                return;
+            }
+            const s = new magic_string_1.default(code);
+            const sourceMap = process.env.NODE_ENV === 'development';
+            const createDescriptor = (filename, code, from) => {
+                if (from === 'vue' || (0, vue_1.isVueSfcFile)(filename)) {
+                    const { descriptor, errors } = parse(code, {
+                        filename,
+                        sourceMap,
+                    });
+                    errors.forEach((error) => this.error((0, utils_1.createRollupError)('', filename, error, code)));
+                    return descriptor;
+                }
+                else {
+                    const descriptor = {
+                        filename,
+                        source: fs_extra_1.default.readFileSync(filename, 'utf-8'),
+                        template: null,
+                        script: null,
+                        scriptSetup: null,
+                        styles: [],
+                        customBlocks: [],
+                    };
+                    if (from === 'template') {
+                        descriptor.template = {
+                            content: descriptor.source,
+                        };
+                    }
+                    else if (from === 'script') {
+                        descriptor.script = {
+                            content: descriptor.source,
+                        };
+                    }
+                    else if (from === 'style') {
+                        descriptor.styles = [
+                            {
+                                content: descriptor.source,
+                            },
+                        ];
+                    }
+                    return descriptor;
+                }
+            };
+            const descriptor = createDescriptor(id, code, 'vue');
+            const cache = new Map();
+            const getSrcDescriptor = async (src, from) => {
+                if (cache.has(src)) {
+                    return cache.get(src);
+                }
+                const resolved = await this.resolve(src, descriptor.filename);
+                if (resolved) {
+                    const filename = resolved.id;
+                    const srcDescriptor = createDescriptor(filename, (0, preprocess_1.preUVueJs)((0, preprocess_1.preUVueHtml)(fs_extra_1.default.readFileSync(filename, 'utf-8'))), from);
+                    cache.set(src, srcDescriptor);
+                    this.addWatchFile(filename);
+                    return srcDescriptor;
+                }
+            };
+            if (descriptor.template?.src && isValidSrc(descriptor.template.src)) {
+                const srcDescriptor = await getSrcDescriptor(descriptor.template.src, 'template');
+                if (srcDescriptor && srcDescriptor.template?.content) {
+                    overwriteContent(s, descriptor.template.loc, srcDescriptor.template.content);
+                }
+            }
+            if (descriptor.script?.src && isValidSrc(descriptor.script.src)) {
+                const srcDescriptor = await getSrcDescriptor(descriptor.script.src, 'script');
+                if (srcDescriptor && srcDescriptor.script?.content) {
+                    overwriteContent(s, descriptor.script.loc, srcDescriptor.script.content);
+                }
+            }
+            for (const style of descriptor.styles) {
+                if (style.src && isValidSrc(style.src)) {
+                    const srcDescriptor = await getSrcDescriptor(style.src, 'style');
+                    if (srcDescriptor && srcDescriptor.styles[0]) {
+                        overwriteContent(s, style.loc, srcDescriptor.styles[0].content);
+                    }
+                }
+            }
+            if (!s.hasChanged()) {
+                return;
+            }
+            // 移除所有的 src 属性
+            const regex = /(<(template|script|style)[^>]*)src\s*=\s*["']([^"']+)["']([^>]*>)/g;
+            let match;
+            while ((match = regex.exec(code))) {
+                const [_, start, _tag, _src, end] = match;
+                s.overwrite(match.index, match.index + _.length, `${start}${end}`);
+            }
+            return {
+                code: s.toString(),
+                map: sourceMap ? s.generateMap({ hires: true }) : { mappings: '' },
+            };
+        },
+    };
+}
+exports.uniViteSfcSrcImportPlugin = uniViteSfcSrcImportPlugin;
+function overwriteContent(s, loc, content) {
+    if (loc.start.offset === loc.end.offset) {
+        s.appendRight(loc.start.offset, content);
+    }
+    else {
+        s.overwrite(loc.start.offset, loc.end.offset, content);
+    }
+}

package/dist/vite/plugins/uts/ext-api.d.ts

@@ -1,5 +1,6 @@
 import type { Plugin } from 'vite';
-import { Injects } from '../../../uni_modules';
+import { type Injects, parseUniExtApis } from '../../../uni_modules';
+export declare const parseUniExtApisOnce: typeof parseUniExtApis;
 export declare function uniUTSExtApiReplace(): Plugin;
 /**
  * { 'uni.getBatteryInfo': ['@/uni_modules/uni-getbatteryinfo/utssdk/web/index.uts','getBatteryInfo'] }

package/dist/vite/plugins/uts/ext-api.js

@@ -3,16 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectsToAutoImports = exports.uniUTSExtApiReplace = void 0;
+exports.injectsToAutoImports = exports.uniUTSExtApiReplace = exports.parseUniExtApisOnce = void 0;
 const shared_1 = require("@vue/shared");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const vite_1 = __importDefault(require("unplugin-auto-import/vite"));
 const uni_modules_1 = require("../../../uni_modules");
 const url_1 = require("../../utils/url");
 const escape = (str) => str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
-const parseUniExtApisOnce = (0, uni_shared_1.once)(uni_modules_1.parseUniExtApis);
+exports.parseUniExtApisOnce = (0, uni_shared_1.once)(uni_modules_1.parseUniExtApis);
 function uniUTSExtApiReplace() {
-    const injects = parseUniExtApisOnce(true, process.env.UNI_UTS_PLATFORM, 'javascript');
+    const injects = (0, exports.parseUniExtApisOnce)(true, process.env.UNI_UTS_PLATFORM, process.env.UNI_UTS_TARGET_LANGUAGE);
     const injectApis = Object.keys(injects);
     const firstPass = new RegExp(`(?:${injectApis.map(escape).join('|')})`, 'g');
     return {
@@ -20,13 +20,12 @@ function uniUTSExtApiReplace() {
         configResolved(config) {
             const index = config.plugins.findIndex((p) => p.name === 'uts');
             if (index > -1) {
-                const injects = parseUniExtApisOnce(true, process.env.UNI_UTS_PLATFORM, 'javascript');
                 if (Object.keys(injects).length) {
                     // @ts-expect-error
                     config.plugins.splice(index, 0, (0, vite_1.default)({
                         include: [/\.[u]?ts$/, /\.[u]?vue/],
                         exclude: [/[\\/]\.git[\\/]/],
-                        imports: injectsToAutoImports(parseUniExtApisOnce(true, process.env.UNI_UTS_PLATFORM, 'javascript')),
+                        imports: injectsToAutoImports(injects),
                         dts: false,
                     }));
                 }

package/dist/vite/plugins/uts/uni_modules.d.ts

@@ -6,7 +6,7 @@ interface UniUTSPluginOptions {
 }
 export declare const utsPlugins: Set<string>;
 export declare function uniUTSUniModulesPlugin(options?: UniUTSPluginOptions): Plugin;
-export declare function buildUniExtApiProviders(): Promise<void>;
+export declare function buildUniExtApis(): Promise<void>;
 export declare function resolveExtApiProvider(pkg: Record<string, any>): {
     name?: string | undefined;
     plugin?: string | undefined;

package/dist/vite/plugins/uts/uni_modules.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveExtApiProvider = exports.buildUniExtApiProviders = exports.uniUTSUniModulesPlugin = exports.utsPlugins = void 0;
+exports.resolveExtApiProvider = exports.buildUniExtApis = exports.uniUTSUniModulesPlugin = exports.utsPlugins = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
@@ -19,7 +19,7 @@ exports.utsPlugins = new Set();
 let uniExtApiCompiler = async () => { };
 function uniUTSUniModulesPlugin(options = {}) {
     process.env.UNI_UTS_USING_ROLLUP = 'true';
-    const compilePlugin = (pluginDir) => {
+    const compilePlugin = async (pluginDir) => {
         exports.utsPlugins.add(path_1.default.basename(pluginDir));
         const pkgJson = require(path_1.default.join(pluginDir, 'package.json'));
         const extApiProvider = resolveExtApiProvider(pkgJson);
@@ -30,12 +30,21 @@ function uniUTSUniModulesPlugin(options = {}) {
                 uniExtApiProviderServicePlugin = extApiProvider.servicePlugin;
             }
         }
-        return (0, uts_1.resolveUTSCompiler)().compile(pluginDir, {
+        const compiler = (0, uts_1.resolveUTSCompiler)();
+        // 处理依赖的 uts 插件
+        const deps = (0, uni_modules_1.parseUTSModuleDeps)(pkgJson.uni_modules?.dependencies || [], process.env.UNI_INPUT_DIR);
+        if (deps.length) {
+            for (const dep of deps) {
+                await compilePlugin(path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules', dep));
+            }
+        }
+        return compiler.compile(pluginDir, {
             isX: !!options.x,
             isSingleThread: !!options.isSingleThread,
             isPlugin: true,
             extApis: options.extApis,
             sourceMap: process.env.NODE_ENV === 'development',
+            uni_modules: deps,
             transform: {
                 uniExtApiProviderName: extApiProvider?.name,
                 uniExtApiProviderService: extApiProvider?.service,
@@ -44,8 +53,8 @@ function uniUTSUniModulesPlugin(options = {}) {
         });
     };
     uniExtApiCompiler = async () => {
-        // 获取 provider 扩展
-        const plugins = (0, uni_modules_1.getUniExtApiProviders)().filter((provider) => !exports.utsPlugins.has(provider.plugin));
+        // 获取 provider 扩展(编译所有uni)
+        const plugins = (0, uni_modules_1.getUniExtApiPlugins)().filter((provider) => !exports.utsPlugins.has(provider.plugin));
         for (const plugin of plugins) {
             const result = await compilePlugin(path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules', plugin.plugin));
             if (result) {
@@ -66,6 +75,10 @@ function uniUTSUniModulesPlugin(options = {}) {
             }
             const module = (0, uts_1.resolveUTSAppModule)(id, importer ? path_1.default.dirname(importer) : process.env.UNI_INPUT_DIR, options.x !== true);
             if (module) {
+                // app-js 会直接返回 index.uts 路径，不需要 uts-proxy
+                if (module.endsWith('.uts')) {
+                    return module;
+                }
                 // prefix the polyfill id with \0 to tell other plugins not to try to load or transform it
                 return module + '?uts-proxy';
             }
@@ -124,10 +137,10 @@ function uniUTSUniModulesPlugin(options = {}) {
     };
 }
 exports.uniUTSUniModulesPlugin = uniUTSUniModulesPlugin;
-async function buildUniExtApiProviders() {
+async function buildUniExtApis() {
     await uniExtApiCompiler();
 }
-exports.buildUniExtApiProviders = buildUniExtApiProviders;
+exports.buildUniExtApis = buildUniExtApis;
 function resolveExtApiProvider(pkg) {
     const provider = pkg.uni_modules?.['uni-ext-api']?.provider;
     if (provider?.service) {