@dcloudio/uni-cli-shared 3.0.0-alpha-4060720250515001 → 3.0.0-alpha-4070120250530001

package/dist/uts.d.ts

@@ -17,6 +17,8 @@ interface UTSComponentMeta {
     source: string;
     kotlinPackage: string;
     swiftModule: string;
+    kotlinNamespace: string;
+    swiftNamespace: string;
 }
 interface UTSCustomElementMeta extends UTSComponentMeta {
     exports: [string][];
@@ -46,6 +48,7 @@ export declare function initUTSCustomElements(inputDir: string, platform: UniApp
 export declare function parseCustomElementExports(filePath: string, unimport?: Unimport): Promise<Import[]>;
 export declare function parseKotlinPackageWithPluginId(id: string, is_uni_modules: boolean): string;
 export declare function parseSwiftPackageWithPluginId(id: string, is_uni_modules: boolean): string;
+export declare function parseSwiftModuleWithPluginId(id: string, is_uni_modules: boolean): string;
 export type UTSTargetLanguage = typeof process.env.UNI_UTS_TARGET_LANGUAGE;
 export declare const parseUniExtApiNamespacesOnce: (platform: typeof process.env.UNI_UTS_PLATFORM, language: UTSTargetLanguage) => Record<string, [string, string]>;
 export declare const parseUniExtApiNamespacesJsOnce: (platform: typeof process.env.UNI_UTS_PLATFORM, language: UTSTargetLanguage) => Record<string, [string, string]>;

package/dist/uts.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.isUniHelpers = exports.isUTSProxy = exports.tscOutDir = exports.uvueOutDir = exports.genUniExtApiDeclarationFileOnce = exports.initUTSSwiftAutoImportsOnce = exports.initUTSKotlinAutoImportsOnce = exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.parseCustomElementExports = exports.initUTSCustomElements = exports.initUTSComponents = exports.parseUTSCustomElement = exports.parseUTSComponent = exports.getUTSCustomElementAutoImports = exports.getUTSComponentAutoImports = exports.getUTSCustomElement = exports.isUTSCustomElement = exports.getUTSPluginCustomElements = exports.getUTSCustomElements = exports.clearUTSCustomElements = exports.isUTSComponent = exports.clearUTSComponents = exports.getUTSCustomElementsExports = exports.resolveUTSCompilerVersion = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+exports.isUniHelpers = exports.isUTSProxy = exports.tscOutDir = exports.uvueOutDir = exports.genUniExtApiDeclarationFileOnce = exports.initUTSSwiftAutoImportsOnce = exports.initUTSKotlinAutoImportsOnce = exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftModuleWithPluginId = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.parseCustomElementExports = exports.initUTSCustomElements = exports.initUTSComponents = exports.parseUTSCustomElement = exports.parseUTSComponent = exports.getUTSCustomElementAutoImports = exports.getUTSComponentAutoImports = exports.getUTSCustomElement = exports.isUTSCustomElement = exports.getUTSPluginCustomElements = exports.getUTSCustomElements = exports.clearUTSCustomElements = exports.isUTSComponent = exports.clearUTSComponents = exports.getUTSCustomElementsExports = exports.resolveUTSCompilerVersion = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
 // 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -259,7 +259,7 @@ exports.getUTSCustomElementAutoImports = getUTSCustomElementAutoImports;
 function parseUTSComponent(name, type) {
     const meta = utsComponents.get(name);
     if (meta) {
-        const namespace = meta[type === 'swift' ? 'swiftModule' : 'kotlinPackage'] || '';
+        const namespace = meta[type === 'swift' ? 'swiftNamespace' : 'kotlinNamespace'] || '';
         const className = (0, utils_1.capitalize)((0, utils_1.camelize)(name)) + 'Component';
         return {
             className,
@@ -272,7 +272,7 @@ exports.parseUTSComponent = parseUTSComponent;
 function parseUTSCustomElement(name, type) {
     const meta = getUTSCustomElement(name);
     if (meta) {
-        const namespace = meta[type === 'swift' ? 'swiftModule' : 'kotlinPackage'] || '';
+        const namespace = meta[type === 'swift' ? 'swiftNamespace' : 'kotlinNamespace'] || '';
         const className = (0, utils_1.capitalize)((0, utils_1.camelize)(name)) + 'Element';
         return {
             className,
@@ -316,10 +316,15 @@ function initUTSComponents(inputDir, platform) {
                         (0, utils_1.normalizePath)(isApp
                             ? path_1.default.relative(inputDir, is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir)
                             : path_1.default.relative(inputDir, file));
+                    const kotlinPackage = parseKotlinPackageWithPluginId(pluginId, is_uni_modules_utssdk);
+                    const swiftModule = parseSwiftModuleWithPluginId(pluginId, is_uni_modules_utssdk);
+                    const swiftNamespace = parseSwiftPackageWithPluginId(pluginId, is_uni_modules_utssdk);
                     easycomsObj[`^${name}$`] = {
                         source: isApp ? `${source}?uts-proxy` : source,
-                        kotlinPackage: parseKotlinPackageWithPluginId(pluginId, is_uni_modules_utssdk),
-                        swiftModule: parseSwiftPackageWithPluginId(pluginId, is_uni_modules_utssdk),
+                        kotlinPackage: kotlinPackage,
+                        swiftModule: swiftModule,
+                        kotlinNamespace: kotlinPackage,
+                        swiftNamespace: swiftNamespace,
                     };
                 }
             });
@@ -337,6 +342,8 @@ function initUTSComponents(inputDir, platform) {
             source: obj.source,
             kotlinPackage: obj.kotlinPackage,
             swiftModule: obj.swiftModule,
+            kotlinNamespace: obj.kotlinPackage,
+            swiftNamespace: obj.swiftNamespace,
         });
     });
     return components;
@@ -381,10 +388,15 @@ function initUTSCustomElements(inputDir, platform) {
                         ? path_1.default.relative(inputDir, path_1.default.dirname(dir))
                         : path_1.default.relative(inputDir, filePath));
                 const importSource = isApp ? `${source}?uts-proxy` : source;
+                const kotlinPackage = parseKotlinPackageWithPluginId(pluginId, true);
+                const swiftModule = parseSwiftModuleWithPluginId(pluginId, true);
+                const swiftNamespace = parseSwiftPackageWithPluginId(pluginId, true);
                 const meta = {
                     source: importSource,
-                    kotlinPackage: parseKotlinPackageWithPluginId(pluginId, true),
-                    swiftModule: parseSwiftPackageWithPluginId(pluginId, true),
+                    kotlinPackage: kotlinPackage,
+                    swiftModule: swiftModule,
+                    kotlinNamespace: kotlinPackage,
+                    swiftNamespace: swiftNamespace,
                 };
                 utsCustomElements.set(name, meta);
                 parseCustomElementExports(filePath, unimport).then((exports_) => {
@@ -460,6 +472,13 @@ function parseSwiftPackageWithPluginId(id, is_uni_modules) {
         (0, utils_1.capitalize)((0, utils_1.camelize)(prefix(id))));
 }
 exports.parseSwiftPackageWithPluginId = parseSwiftPackageWithPluginId;
+function parseSwiftModuleWithPluginId(id, is_uni_modules) {
+    if (!is_uni_modules) {
+        return parseSwiftPackageWithPluginId(id, is_uni_modules);
+    }
+    return `unimodule` + (0, utils_1.capitalize)((0, utils_1.camelize)(prefix(id)));
+}
+exports.parseSwiftModuleWithPluginId = parseSwiftModuleWithPluginId;
 async function parseUniExtApiAutoImports(uniExtApiAutoImports, extApis, parseSource) {
     if (Object.keys(extApis).length) {
         const { parseExportIdentifiers } = resolveUTSCompiler();
@@ -505,7 +524,7 @@ async function parseUniExtApiSwiftAutoImportsOnce(extApis) {
     }
     uniExtApiSwiftAutoImports = {};
     return parseUniExtApiAutoImports(uniExtApiSwiftAutoImports, extApis, (pluginId) => {
-        return parseSwiftPackageWithPluginId(pluginId, true);
+        return parseSwiftModuleWithPluginId(pluginId, true);
     });
 }
 exports.parseUniExtApiNamespacesOnce = once((platform, language) => {
@@ -519,7 +538,7 @@ exports.parseUniExtApiNamespacesOnce = once((platform, language) => {
             source = parseKotlinPackageWithPluginId(pluginId, true);
         }
         else if (language === 'swift') {
-            source = parseSwiftPackageWithPluginId(pluginId, true);
+            source = parseSwiftModuleWithPluginId(pluginId, true);
         }
         namespaces[name] = [source, options[1]];
     });

package/dist/vite/autoImport.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initAutoImportOptions = void 0;
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const uts_1 = require("../uts");
-const uniPreset = {
+const uniLifeCyclePreset = {
     from: '@dcloudio/uni-app',
     imports: [
         // ssr
@@ -95,7 +95,47 @@ const uniMiniProgramPreset = {
     imports: ['UniElement', 'UniElementImpl'],
 };
 const cloudPreset = {
-    '@dcloudio/uni-cloud': ['uniCloud', 'UniCloudError'],
+    from: '@dcloudio/uni-cloud',
+    imports: ['uniCloud', 'UniCloudError'],
+};
+const uniAppLifeCyclePreset = {
+    from: 'vue',
+    imports: [
+        // ssr
+        'ssrRef',
+        'shallowSsrRef',
+        // uni-app lifecycle
+        // App and Page
+        'onShow',
+        'onHide',
+        // App
+        'onLaunch',
+        'onError',
+        'onThemeChange',
+        // onKeyboardHeightChange,
+        'onPageNotFound',
+        'onUnhandledRejection',
+        // onLastPageBackPress,
+        'onExit',
+        // Page
+        'onPageShow',
+        'onPageHide',
+        'onLoad',
+        'onReady',
+        'onUnload',
+        'onResize',
+        'onBackPress',
+        'onPageScroll',
+        'onTabItemTap',
+        'onReachBottom',
+        'onPullDownRefresh',
+        // 其他
+        'onShareTimeline',
+        'onShareAppMessage',
+        // onShareChat, // xhs-share
+        // 辅助，用于自定义render函数时，开发者可以调用此方法渲染组件的slot
+        'renderComponentSlot',
+    ],
 };
 const vuePreset = {
     from: 'vue',
@@ -167,7 +207,18 @@ const vuePreset = {
 };
 function initAutoImportOptions(platform, { imports = [], ...userOptions }) {
     rewriteAutoImportOnce();
-    const autoImport = [uniPreset, cloudPreset, vuePreset];
+    const autoImport = [vuePreset];
+    // 只有app-ios和app-harmony平台特殊处理
+    if (platform === 'app-ios' || platform === 'app-harmony') {
+        autoImport.push(uniAppLifeCyclePreset);
+    }
+    else {
+        autoImport.push(uniLifeCyclePreset);
+    }
+    // 内置框架编译时，不能注入这些内容
+    if (!process.env.UNI_COMPILE_EXT_API_TYPE) {
+        autoImport.push(cloudPreset);
+    }
     if (platform === 'web') {
         autoImport.push(uniH5Preset);
     }

package/dist/vite/extApi.js

@@ -13,7 +13,7 @@ function uniUniModulesExtApiPlugin() {
                 external: ['vue'],
                 output: {
                     format: 'iife',
-                    entryFileNames: 'components.js',
+                    entryFileNames: `${process.env.UNI_COMPILE_EXT_API_OUT_FILE_NAME || 'components'}.js`,
                     globals: {
                         vue: 'Vue',
                         uni: 'uni',

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

@@ -375,7 +375,7 @@ function uniUTSAppUniModulesPlugin(options = {}) {
             },
             async swiftAutoImports() {
                 return (0, uts_1.initUTSSwiftAutoImportsOnce)().then((autoImports) => {
-                    return filterAutoImports(autoImports, (0, uts_1.parseSwiftPackageWithPluginId)(pluginId, true));
+                    return filterAutoImports(autoImports, (0, uts_1.parseSwiftModuleWithPluginId)(pluginId, true));
                 });
             },
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4060720250515001",
+  "version": "3.0.0-alpha-4070120250530001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -68,8 +68,8 @@
     "unimport": "4.1.1",
     "unplugin-auto-import": "19.1.0",
     "xregexp": "3.1.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4060720250515001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4060720250515001"
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4070120250530001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4070120250530001"
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
@@ -89,6 +89,6 @@
     "code-frame": "link:@types/@babel/code-frame",
     "postcss": "^8.4.21",
     "vue": "3.4.21",
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4060720250515001"
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4070120250530001"
   }
 }