@dcloudio/uni-cli-shared 3.0.0-alpha-3080520230615001 → 3.0.0-alpha-3080520230616001

package/dist/checkUpdate.d.ts

@@ -1,30 +1,3 @@
-interface CheckUpdateOptions {
-    inputDir: string;
-    compilerVersion: string;
-    versionType: 'a' | 'r';
-}
-interface CheckUpdatePlatform {
-    appid?: string;
-    dev: number;
-    build: number;
-}
-interface CheckUpdateCache {
-    vid: string;
-    lastCheck: number;
-    newVersion?: string;
-    note?: string;
-    [name: string]: CheckUpdatePlatform | undefined | string | number;
-}
-export declare function checkUpdate(options: CheckUpdateOptions): Promise<void>;
-/**
- * 检查本地缓存，返回 false 表示需要执行云端检查，返回 true 表示，无需云端检查，返回 string 表示，无需云端检测，且有更新
- * @param inputDir
- * @param compilerVersion
- * @param interval
- * @returns
- */
-export declare function checkLocalCache(updateCache: CheckUpdateCache, compilerVersion: string, interval?: number): string | boolean;
-export declare function md5(str: string): string;
-export declare function getMac(): string;
-export declare function createPostData({ versionType, compilerVersion }: CheckUpdateOptions, manifestJson: Record<string, any>, updateCache: CheckUpdateCache): string;
+declare function checkUpdate1(options: any): Promise<undefined>;
+export declare const checkUpdate: typeof checkUpdate1;
 export {};

package/dist/checkUpdate.js

@@ -1,254 +1,61 @@
+/* eslint-disable */
+// @ts-ignore
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPostData = exports.getMac = exports.md5 = exports.checkLocalCache = exports.checkUpdate = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const debug_1 = __importDefault(require("debug"));
-const crypto_1 = __importDefault(require("crypto"));
-const https_1 = require("https");
-const compare_versions_1 = __importDefault(require("compare-versions"));
-const shared_1 = require("@vue/shared");
-const json_1 = require("./json");
-const hbx_1 = require("./hbx");
-const debugCheckUpdate = (0, debug_1.default)('uni:check-update');
-const INTERVAL = 1000 * 60 * 60 * 24;
-async function checkUpdate(options) {
-    if (process.env.CI) {
-        debugCheckUpdate('isInCI');
-        return;
-    }
-    if ((0, hbx_1.isInHBuilderX)()) {
-        debugCheckUpdate('isInHBuilderX');
-        return;
-    }
-    const { inputDir, compilerVersion } = options;
-    const updateCache = readCheckUpdateCache(inputDir);
-    debugCheckUpdate('read.cache', updateCache);
-    const res = checkLocalCache(updateCache, compilerVersion);
-    if (res) {
-        if ((0, shared_1.isString)(res)) {
-            console.log();
-            console.log(res);
-        }
-    }
-    else {
-        await checkVersion(options, normalizeUpdateCache(updateCache, (0, json_1.parseManifestJsonOnce)(inputDir)));
-    }
-    writeCheckUpdateCache(inputDir, statUpdateCache(normalizeUpdateCache(updateCache)));
-}
-exports.checkUpdate = checkUpdate;
-function normalizeUpdateCache(updateCache, manifestJson) {
-    const platform = process.env.UNI_PLATFORM;
-    if (!updateCache[platform]) {
-        updateCache[platform] = {
-            appid: '',
-            dev: 0,
-            build: 0,
-        };
-    }
-    if (manifestJson) {
-        const platformOptions = manifestJson[platform === 'app' ? 'app-plus' : platform];
-        updateCache[platform].appid = platformOptions
-            ? platformOptions.appid || platformOptions.package || ''
-            : '';
-    }
-    return updateCache;
-}
-function statUpdateCache(updateCache) {
-    debugCheckUpdate('stat.before', updateCache);
-    const platform = process.env.UNI_PLATFORM;
-    const type = process.env.NODE_ENV === 'production' ? 'build' : 'dev';
-    const platformOptions = updateCache[platform];
-    platformOptions[type] = (platformOptions[type] || 0) + 1;
-    debugCheckUpdate('stat.after', updateCache);
-    return updateCache;
-}
-function getFilepath(inputDir, filename) {
-    return path_1.default.resolve(os_1.default.tmpdir(), 'uni-app-cli', md5(inputDir), filename);
-}
-function getCheckUpdateFilepath(inputDir) {
-    return getFilepath(inputDir, 'check-update.json');
-}
-function generateVid() {
-    let result = '';
-    for (let i = 0; i < 4; i++) {
-        result += ((65536 * (1 + Math.random())) | 0).toString(16).substring(1);
-    }
-    return 'UNI_' + result.toUpperCase();
-}
-function createCheckUpdateCache(vid = generateVid()) {
-    return {
-        vid: generateVid(),
-        lastCheck: 0,
-    };
-}
-function readCheckUpdateCache(inputDir) {
-    const updateFilepath = getCheckUpdateFilepath(inputDir);
-    debugCheckUpdate('read:', updateFilepath);
-    if (fs_extra_1.default.existsSync(updateFilepath)) {
-        try {
-            return require(updateFilepath);
-        }
-        catch (e) {
-            debugCheckUpdate('read.error', e);
-        }
-    }
-    return createCheckUpdateCache();
-}
-/**
- * 检查本地缓存，返回 false 表示需要执行云端检查，返回 true 表示，无需云端检查，返回 string 表示，无需云端检测，且有更新
- * @param inputDir
- * @param compilerVersion
- * @param interval
- * @returns
- */
-function checkLocalCache(updateCache, compilerVersion, interval = INTERVAL) {
-    if (!updateCache.lastCheck) {
-        debugCheckUpdate('cache: lastCheck not found');
-        return false;
-    }
-    if (Date.now() - updateCache.lastCheck > interval) {
-        debugCheckUpdate('cache: lastCheck > interval');
-        return false;
-    }
-    if (updateCache.newVersion &&
-        (0, compare_versions_1.default)(updateCache.newVersion, compilerVersion) > 0) {
-        debugCheckUpdate('cache: find new version');
-        return updateCache.note;
-    }
-    return true;
-}
-exports.checkLocalCache = checkLocalCache;
-function writeCheckUpdateCache(inputDir, updateCache) {
-    const filepath = getCheckUpdateFilepath(inputDir);
-    debugCheckUpdate('write:', filepath, updateCache);
+exports.checkUpdate = void 0;
+var __importDefault = this && this.__importDefault || function (mod) { return mod && mod.__esModule ? mod : { default: mod }; };
+Object.defineProperty(exports, "__esModule", { value: !0 }), exports.createPostData = exports.getMac = exports.md5 = exports.checkLocalCache = exports.checkUpdate1 = void 0;
+const fs_extra_1 = __importDefault(require("fs-extra")), os_1 = __importDefault(require("os")), path_1 = __importDefault(require("path")), debug_1 = __importDefault(require("debug")), crypto_1 = __importDefault(require("crypto")), https_1 = require("https"), compare_versions_1 = __importDefault(require("compare-versions")), shared_1 = require("@vue/shared"), json_1 = require("./json"), hbx_1 = require("./hbx"), debugCheckUpdate = (0, debug_1.default)("uni:check-update"), INTERVAL = 864e5;
+async function checkUpdate1(options) { if (process.env.CI)
+    return void debugCheckUpdate("isInCI"); if ((0, hbx_1.isInHBuilderX)())
+    return void debugCheckUpdate("isInHBuilderX"); const { inputDir: inputDir, compilerVersion: compilerVersion } = options, updateCache = readCheckUpdateCache(inputDir); debugCheckUpdate("read.cache", updateCache); const res = checkLocalCache(updateCache, compilerVersion); res ? (0, shared_1.isString)(res) && (console.log(), console.log(res)) : await checkVersion(options, normalizeUpdateCache(updateCache, (0, json_1.parseManifestJsonOnce)(inputDir))), writeCheckUpdateCache(inputDir, statUpdateCache(normalizeUpdateCache(updateCache))); }
+function normalizeUpdateCache(updateCache, manifestJson) { const platform = process.env.UNI_PLATFORM; if (updateCache[platform] || (updateCache[platform] = { appid: "", dev: 0, build: 0 }), manifestJson) {
+    const platformOptions = manifestJson["app" === platform ? "app-plus" : platform];
+    updateCache[platform].appid = platformOptions && (platformOptions.appid || platformOptions.package) || "";
+} return updateCache; }
+function statUpdateCache(updateCache) { debugCheckUpdate("stat.before", updateCache); const platform = process.env.UNI_PLATFORM, type = "production" === process.env.NODE_ENV ? "build" : "dev", platformOptions = updateCache[platform]; return platformOptions[type] = (platformOptions[type] || 0) + 1, debugCheckUpdate("stat.after", updateCache), updateCache; }
+function getFilepath(inputDir, filename) { return path_1.default.resolve(os_1.default.tmpdir(), "uni-app-cli", md5(inputDir), filename); }
+function getCheckUpdateFilepath(inputDir) { return getFilepath(inputDir, "check-update.json"); }
+function generateVid() { let result = ""; for (let i = 0; i < 4; i++)
+    result += (65536 * (1 + Math.random()) | 0).toString(16).substring(1); return "UNI_" + result.toUpperCase(); }
+function createCheckUpdateCache(vid = generateVid()) { return { vid: generateVid(), lastCheck: 0 }; }
+function readCheckUpdateCache(inputDir) { const updateFilepath = getCheckUpdateFilepath(inputDir); if (debugCheckUpdate("read:", updateFilepath), fs_extra_1.default.existsSync(updateFilepath))
     try {
-        fs_extra_1.default.outputFileSync(filepath, JSON.stringify(updateCache));
+        return require(updateFilepath);
     }
     catch (e) {
-        debugCheckUpdate('write.error', e);
-    }
-}
-function md5(str) {
-    return crypto_1.default.createHash('md5').update(str).digest('hex');
-}
-exports.md5 = md5;
-function getMac() {
-    let mac = '';
-    const network = os_1.default.networkInterfaces();
-    for (const key in network) {
-        const array = network[key];
-        for (let i = 0; i < array.length; i++) {
-            const item = array[i];
-            if (!item.family || (item.mac && item.mac === '00:00:00:00:00:00')) {
-                continue;
-            }
-            if (
-            // Node < v18
-            (0, shared_1.isString)(item.family) &&
-                (item.family === 'IPv4' || item.family === 'IPv6')) {
+        debugCheckUpdate("read.error", e);
+    } return createCheckUpdateCache(); }
+function checkLocalCache(updateCache, compilerVersion, interval = INTERVAL) { return updateCache.lastCheck ? Date.now() - updateCache.lastCheck > interval ? (debugCheckUpdate("cache: lastCheck > interval"), !1) : !(updateCache.newVersion && (0, compare_versions_1.default)(updateCache.newVersion, compilerVersion) > 0) || (debugCheckUpdate("cache: find new version"), updateCache.note) : (debugCheckUpdate("cache: lastCheck not found"), !1); }
+function writeCheckUpdateCache(inputDir, updateCache) { const filepath = getCheckUpdateFilepath(inputDir); debugCheckUpdate("write:", filepath, updateCache); try {
+    fs_extra_1.default.outputFileSync(filepath, JSON.stringify(updateCache));
+}
+catch (e) {
+    debugCheckUpdate("write.error", e);
+} }
+function md5(str) { return crypto_1.default.createHash("md5").update(str).digest("hex"); }
+function getMac() { let mac = ""; const network = os_1.default.networkInterfaces(); for (const key in network) {
+    const array = network[key];
+    for (let i = 0; i < array.length; i++) {
+        const item = array[i];
+        if (item.family && (!item.mac || "00:00:00:00:00:00" !== item.mac)) {
+            if ((0, shared_1.isString)(item.family) && ("IPv4" === item.family || "IPv6" === item.family)) {
                 mac = item.mac;
                 break;
             }
-            else if (
-            // Node >= v18
-            typeof item.family === 'number' &&
-                // @ts-ignore
-                (item.family === 4 || item.family === 6)) {
+            if ("number" == typeof item.family && (4 === item.family || 6 === item.family)) {
                 mac = item.mac;
                 break;
             }
         }
     }
-    return mac;
-}
-exports.getMac = getMac;
-function createPostData({ versionType, compilerVersion }, manifestJson, updateCache) {
-    const data = {
-        vv: 3,
-        device: md5(getMac()),
-        vtype: versionType,
-        vcode: compilerVersion,
-    };
-    if (manifestJson.appid) {
-        data.appid = manifestJson.appid;
-    }
-    else {
-        data.vid = updateCache.vid;
-    }
-    Object.keys(updateCache).forEach((name) => {
-        const value = updateCache[name];
-        if ((0, shared_1.isPlainObject)(value) &&
-            ((0, shared_1.hasOwn)(value, 'dev') || (0, shared_1.hasOwn)(value, 'build'))) {
-            data[name] = value;
-        }
-    });
-    return JSON.stringify(data);
-}
-exports.createPostData = createPostData;
-function handleCheckVersion({ code, isUpdate, newVersion, note }, updateCache) {
-    if (code !== 0) {
-        return;
-    }
-    // clear
-    Object.keys(updateCache).forEach((key) => {
-        if (key !== 'vid')
-            delete updateCache[key];
-    });
-    updateCache.lastCheck = Date.now();
-    if (isUpdate) {
-        updateCache.note = note;
-        updateCache.newVersion = newVersion;
-    }
-    else {
-        delete updateCache.note;
-        delete updateCache.newVersion;
-    }
-}
-const HOSTNAME = 'uniapp.dcloud.net.cn';
-const PATH = '/update/cli';
-function checkVersion(options, updateCache) {
-    return new Promise((resolve) => {
-        const postData = JSON.stringify({
-            id: createPostData(options, (0, json_1.parseManifestJsonOnce)(options.inputDir), updateCache),
-        });
-        let responseData = '';
-        const req = (0, https_1.request)({
-            hostname: HOSTNAME,
-            path: PATH,
-            port: 443,
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'Content-Length': postData.length,
-            },
-        }, (res) => {
-            res.setEncoding('utf8');
-            res.on('data', (chunk) => {
-                responseData += chunk;
-            });
-            res.on('end', () => {
-                debugCheckUpdate('response: ', responseData);
-                try {
-                    handleCheckVersion(JSON.parse(responseData), updateCache);
-                }
-                catch (e) { }
-                resolve(true);
-            });
-            res.on('error', (e) => {
-                debugCheckUpdate('response.error:', e);
-                resolve(false);
-            });
-        }).on('error', (e) => {
-            debugCheckUpdate('request.error:', e);
-            resolve(false);
-        });
-        debugCheckUpdate('request: ', postData);
-        req.write(postData);
-        req.end();
-    });
+} return mac; }
+function createPostData({ versionType: versionType, compilerVersion: compilerVersion }, manifestJson, updateCache) { const data = { vv: 3, device: md5(getMac()), vtype: versionType, vcode: compilerVersion }; return manifestJson.appid ? data.appid = manifestJson.appid : data.vid = updateCache.vid, Object.keys(updateCache).forEach((name => { const value = updateCache[name]; (0, shared_1.isPlainObject)(value) && ((0, shared_1.hasOwn)(value, "dev") || (0, shared_1.hasOwn)(value, "build")) && (data[name] = value); })), JSON.stringify(data); }
+function handleCheckVersion({ code: code, isUpdate: isUpdate, newVersion: newVersion, note: note }, updateCache) { 0 === code && (Object.keys(updateCache).forEach((key => { "vid" !== key && delete updateCache[key]; })), updateCache.lastCheck = Date.now(), isUpdate ? (updateCache.note = note, updateCache.newVersion = newVersion) : (delete updateCache.note, delete updateCache.newVersion)); }
+exports.checkUpdate1 = checkUpdate1, exports.checkLocalCache = checkLocalCache, exports.md5 = md5, exports.getMac = getMac, exports.createPostData = createPostData;
+const HOSTNAME = "uniapp.dcloud.net.cn", PATH = "/update/cli";
+function checkVersion(options, updateCache) { return new Promise((resolve => { const postData = JSON.stringify({ id: createPostData(options, (0, json_1.parseManifestJsonOnce)(options.inputDir), updateCache) }); let responseData = ""; const req = (0, https_1.request)({ hostname: HOSTNAME, path: PATH, port: 443, method: "POST", headers: { "Content-Type": "application/json", "Content-Length": postData.length } }, (res => { res.setEncoding("utf8"), res.on("data", (chunk => { responseData += chunk; })), res.on("end", (() => { debugCheckUpdate("response: ", responseData); try {
+    handleCheckVersion(JSON.parse(responseData), updateCache);
 }
+catch (e) { } resolve(!0); })), res.on("error", (e => { debugCheckUpdate("response.error:", e), resolve(!1); })); })).on("error", (e => { debugCheckUpdate("request.error:", e), resolve(!1); })); debugCheckUpdate("request: ", postData), req.write(postData), req.end(); })); }
+exports.checkUpdate = checkUpdate1;

package/dist/index.js

@@ -44,5 +44,6 @@ Object.defineProperty(exports, "parseInjects", { enumerable: true, get: function
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);
+// @ts-ignore
 var checkUpdate_1 = require("./checkUpdate");
 Object.defineProperty(exports, "checkUpdate", { enumerable: true, get: function () { return checkUpdate_1.checkUpdate; } });

package/dist/json/mp/jsonFile.d.ts

@@ -3,7 +3,7 @@ export declare function isMiniProgramPageFile(file: string, inputDir?: string):
 export declare function isMiniProgramPageSfcFile(file: string, inputDir?: string): boolean;
 export declare function hasJsonFile(filename: string): boolean;
 export declare function getComponentJsonFilenames(): string[];
-export declare function findJsonFile(filename: string): ComponentJson | PageWindowOptions | Record<string, any> | undefined;
+export declare function findJsonFile(filename: string): Record<string, any> | ComponentJson | PageWindowOptions | undefined;
 export declare function findUsingComponents(filename: string): UsingComponents | undefined;
 export declare function normalizeJsonFilename(filename: string): string;
 export declare function findChangedJsonFiles(supportGlobalUsingComponents?: boolean): Map<string, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3080520230615001",
+  "version": "3.0.0-alpha-3080520230616001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.21.3",
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230615001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230615001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230616001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230616001",
     "@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-3080520230615001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3080520230616001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",