@dcloudio/uni-cli-shared 3.0.0-alpha-3061220221207002 → 3.0.0-alpha-3061420221219001

package/dist/easycom.js

@@ -7,6 +7,7 @@ exports.UNI_EASYCOM_EXCLUDE = exports.genResolveEasycomCode = exports.addImportD
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
+const fast_glob_1 = __importDefault(require("fast-glob"));
 const shared_1 = require("@vue/shared");
 const pluginutils_1 = require("@rollup/pluginutils");
 const uni_shared_1 = require("@dcloudio/uni-shared");
@@ -25,6 +26,7 @@ function clearEasycom() {
 }
 function initEasycoms(inputDir, { dirs, platform }) {
     const componentsDir = path_1.default.resolve(inputDir, 'components');
+    const utssdkDir = path_1.default.resolve(inputDir, 'utssdk');
     const uniModulesDir = path_1.default.resolve(inputDir, 'uni_modules');
     const initEasycomOptions = (pagesJson) => {
         // 初始化时，从once中读取缓存，refresh时，实时读取
@@ -36,7 +38,17 @@ function initEasycoms(inputDir, { dirs, platform }) {
                     ...dirs,
                     componentsDir,
                     ...initUniModulesEasycomDirs(uniModulesDir),
-                ],
+                ]
+                    .concat(platform === 'app'
+                    ? initUniModulesUTSSDKDirs(uniModulesDir)
+                    : [])
+                    .concat(platform === 'app' && fs_1.default.existsSync(utssdkDir)
+                    ? fast_glob_1.default.sync('*', {
+                        cwd: utssdkDir,
+                        absolute: true,
+                        onlyDirectories: true,
+                    })
+                    : []),
             rootDir: inputDir,
             autoscan: !!(easycom && easycom.autoscan),
             custom: (easycom && easycom.custom) || {},
@@ -51,6 +63,8 @@ function initEasycoms(inputDir, { dirs, platform }) {
         filter: (0, pluginutils_1.createFilter)([
             'components/*/*.(vue|jsx|tsx)',
             'uni_modules/*/components/*/*.(vue|jsx|tsx)',
+            'utssdk/*/**/*.vue',
+            'uni_modules/*/utssdk/*/*.vue',
         ], [], {
             resolve: inputDir,
         }),
@@ -78,6 +92,20 @@ function initUniModulesEasycomDirs(uniModulesDir) {
     })
         .filter(Boolean);
 }
+function initUniModulesUTSSDKDirs(uniModulesDir) {
+    if (!fs_1.default.existsSync(uniModulesDir)) {
+        return [];
+    }
+    return fs_1.default
+        .readdirSync(uniModulesDir)
+        .map((uniModuleDir) => {
+        const uniModuleComponentsDir = path_1.default.resolve(uniModulesDir, uniModuleDir, 'utssdk');
+        if (fs_1.default.existsSync(uniModuleComponentsDir)) {
+            return uniModuleComponentsDir;
+        }
+    })
+        .filter(Boolean);
+}
 function initEasycom({ dirs, rootDir, custom, extensions = ['.vue', '.jsx', '.tsx'], }) {
     clearEasycom();
     const easycomsObj = Object.create(null);
@@ -133,24 +161,55 @@ function initAutoScanEasycom(dir, rootDir, extensions) {
     if (!fs_1.default.existsSync(dir)) {
         return easycoms;
     }
-    fs_1.default.readdirSync(dir).forEach((name) => {
-        const folder = path_1.default.resolve(dir, name);
-        if (!isDir(folder)) {
-            return;
-        }
-        const importDir = (0, utils_1.normalizePath)(folder);
-        const files = fs_1.default.readdirSync(folder);
-        // 读取文件夹文件列表，比对文件名（fs.existsSync在大小写不敏感的系统会匹配不准确）
-        for (let i = 0; i < extensions.length; i++) {
-            const ext = extensions[i];
-            if (files.includes(name + ext)) {
-                easycoms[`^${name}$`] = `${importDir}/${name}${ext}`;
-                break;
+    const is_uni_modules_utssdk = dir.endsWith('utssdk');
+    const is_ussdk = !is_uni_modules_utssdk && path_1.default.dirname(dir).endsWith('utssdk');
+    if (is_uni_modules_utssdk || is_ussdk) {
+        fast_glob_1.default
+            .sync('**/*.vue', {
+            cwd: dir,
+            absolute: true,
+        })
+            .forEach((file) => {
+            let name = parseVueComponentName(file);
+            if (!name) {
+                if (file.endsWith('index.vue')) {
+                    name = path_1.default.basename(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
+                }
             }
-        }
-    });
+            if (name) {
+                const importDir = (0, utils_1.normalizePath)(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
+                easycoms[`^${name}$`] = `\0${importDir}?uts-proxy`;
+            }
+        });
+    }
+    else {
+        fs_1.default.readdirSync(dir).forEach((name) => {
+            const folder = path_1.default.resolve(dir, name);
+            if (!isDir(folder)) {
+                return;
+            }
+            const importDir = (0, utils_1.normalizePath)(folder);
+            const files = fs_1.default.readdirSync(folder);
+            // 读取文件夹文件列表，比对文件名（fs.existsSync在大小写不敏感的系统会匹配不准确）
+            for (let i = 0; i < extensions.length; i++) {
+                const ext = extensions[i];
+                if (files.includes(name + ext)) {
+                    easycoms[`^${name}$`] = `${importDir}/${name}${ext}`;
+                    break;
+                }
+            }
+        });
+    }
     return easycoms;
 }
+const nameRE = /name\s*:\s*['|"](.*)['|"]/;
+function parseVueComponentName(file) {
+    const content = fs_1.default.readFileSync(file, 'utf8');
+    const matches = content.match(nameRE);
+    if (matches) {
+        return matches[1];
+    }
+}
 function initAutoScanEasycoms(dirs, rootDir, extensions) {
     const conflict = {};
     const res = dirs.reduce((easycoms, dir) => {
@@ -187,7 +246,7 @@ function addImportDeclaration(importDeclarations, local, source, imported) {
 exports.addImportDeclaration = addImportDeclaration;
 function createImportDeclaration(local, source, imported) {
     if (imported) {
-        return `import {${imported} as ${local}} from '${source}';`;
+        return `import { ${imported} as ${local} } from '${source}';`;
     }
     return `import ${local} from '${source}';`;
 }

package/dist/json/mp/pages.js

@@ -114,7 +114,7 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
         }
     }
     ;
-    ['preloadRule', 'workers', 'plugins'].forEach((name) => {
+    ['preloadRule', 'workers', 'plugins', 'entryPagePath'].forEach((name) => {
         if ((0, shared_1.hasOwn)(pagesJson, name)) {
             appJson[name] = pagesJson[name];
         }

package/dist/json/pages.js

@@ -305,7 +305,7 @@ function normalizeNavigationBar(pageStyle) {
     return navigationBar;
 }
 function normalizeNavigationBarButton(btn, type, titleColor) {
-    btn.color = type === 'transparent' ? '#ffffff' : btn.color || titleColor;
+    btn.color = btn.color || titleColor;
     if (!btn.fontSize) {
         btn.fontSize =
             type === 'transparent' || (btn.text && /\\u/.test(btn.text))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3061220221207002",
+  "version": "3.0.0-alpha-3061420221219001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.19.6",
     "@babel/parser": "^7.19.6",
     "@babel/types": "^7.20.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3061220221207002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3061220221207002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3061420221219001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3061420221219001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3061220221207002",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3061420221219001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",