@dcloudio/uni-cli-shared 3.0.0-alpha-4010820240529001 → 3.0.0-alpha-4010820240529002

package/dist/json/uni-x/uniConfig.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeAppXUniConfig = void 0;
 const uniConfig_1 = require("../app/pages/uniConfig");
+// app-config.js 内容
 function normalizeAppXUniConfig(pagesJson, manifestJson) {
     const config = {
         pages: [],
@@ -16,6 +17,10 @@ function normalizeAppXUniConfig(pagesJson, manifestJson) {
         config.conditionUrl = config.entryPagePath;
         config.entryPagePath = config.realEntryPagePath;
     }
+    // darkmode
+    if (pagesJson.themeConfig) {
+        config.themeConfig = pagesJson.themeConfig;
+    }
     // TODO 待支持分包
     return JSON.stringify(config);
 }

package/dist/uni_modules.d.ts

@@ -70,15 +70,15 @@ export declare const capitalize: (str: string) => string;
  * @returns
  */
 export declare function parseUTSModuleDeps(deps: string[], inputDir: string): string[];
-export declare function genEncryptEasyComModuleIndex(components: string[]): string;
-export declare function parseUniModulesWithComponents(inputDir: string): Record<string, string[]>;
+export declare function genEncryptEasyComModuleIndex(components: Record<string, '.vue' | '.uvue'>): string;
+export declare function parseUniModulesWithComponents(inputDir: string): Record<string, Record<string, ".vue" | ".uvue">>;
 /**
  * 解析 easyCom 组件列表
  * @param pluginId
  * @param inputDir
  * @returns
  */
-export declare function parseEasyComComponents(pluginId: string, inputDir: string, detectBinary?: boolean): string[];
+export declare function parseEasyComComponents(pluginId: string, inputDir: string, detectBinary?: boolean): Record<string, ".vue" | ".uvue">;
 export declare function findEncryptUniModules(inputDir: string, cacheDir?: string): Record<string, EncryptPackageJson | undefined>;
 export declare function findUploadEncryptUniModulesFiles(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string): Record<string, string[]>;
 export declare function packUploadEncryptUniModules(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string, cacheDir: string): {

package/dist/uni_modules.js

@@ -255,9 +255,9 @@ exports.parseUTSModuleDeps = parseUTSModuleDeps;
 function genEncryptEasyComModuleIndex(components) {
     const imports = [];
     const ids = [];
-    components.forEach((component) => {
+    Object.keys(components).forEach((component) => {
         const id = (0, exports.capitalize)((0, exports.camelize)(component));
-        imports.push(`import ${id} from './components/${component}/${component}.vue'`);
+        imports.push(`import ${id} from './components/${component}/${component}${components[component]}'`);
         ids.push(id);
     });
     return `
@@ -291,11 +291,11 @@ exports.parseUniModulesWithComponents = parseUniModulesWithComponents;
  */
 function parseEasyComComponents(pluginId, inputDir, detectBinary = true) {
     const componentsDir = path_1.default.resolve(inputDir, 'uni_modules', pluginId, 'components');
-    const components = [];
+    const components = {};
     if (fs_extra_1.default.existsSync(componentsDir)) {
         fs_extra_1.default.readdirSync(componentsDir).forEach((componentDir) => {
             const componentFile = path_1.default.resolve(componentsDir, componentDir, componentDir);
-            if (['.vue', '.uvue'].some((extname) => {
+            const extname = ['.vue', '.uvue'].find((extname) => {
                 const filename = componentFile + extname;
                 // 探测 filename 是否是二进制文件
                 if (fs_extra_1.default.existsSync(filename)) {
@@ -309,8 +309,9 @@ function parseEasyComComponents(pluginId, inputDir, detectBinary = true) {
                         return true;
                     }
                 }
-            })) {
-                components.push(componentDir);
+            });
+            if (extname) {
+                components[componentDir] = extname;
             }
         });
     }

package/dist/vite/cloud.js

@@ -216,13 +216,14 @@ function initEncryptUniModulesBuildOptions(inputDir) {
     // 生成入口文件
     const input = {};
     moduleNames.forEach((module) => {
-        const indexEncryptFile = path_1.default.resolve(inputDir, 'uni_modules', module, 'index.module.uts');
+        const moduleDir = path_1.default.resolve(inputDir, 'uni_modules', module);
+        const indexEncryptFile = path_1.default.resolve(moduleDir, 'index.module.uts');
         const codes = [];
-        if (hasIndexFile(path_1.default.resolve(inputDir, 'uni_modules', module))) {
+        if (hasIndexFile(moduleDir)) {
             codes.push(`export * from './index'`);
         }
         // easyCom
-        if (modules[module].length) {
+        if (modules[module] && Object.keys(modules[module]).length) {
             codes.push((0, uni_modules_1.genEncryptEasyComModuleIndex)(modules[module]));
         }
         if (codes.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4010820240529001",
+  "version": "3.0.0-alpha-4010820240529002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,8 +26,8 @@
     "@babel/core": "^7.23.3",
     "@babel/parser": "^7.23.9",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4010820240529001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4010820240529001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4010820240529002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4010820240529002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -71,7 +71,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4010820240529001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4010820240529002",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",