@dcloudio/uni-cli-shared 3.0.0-alpha-3041520220610001 → 3.0.0-alpha-3041820220617001

package/dist/checkUpdate.js

@@ -149,7 +149,7 @@ function getMac() {
             }
             if (
             // Node < v18
-            typeof item.family === 'string' &&
+            (0, shared_1.isString)(item.family) &&
                 (item.family === 'IPv4' || item.family === 'IPv6')) {
                 mac = item.mac;
                 break;

package/dist/hbx/log.js

@@ -7,6 +7,7 @@ exports.errorFormatter = exports.removeWarnFormatter = exports.removeInfoFormatt
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("picocolors"));
+const shared_1 = require("@vue/shared");
 const utils_1 = require("../utils");
 const constants_1 = require("../constants");
 const ast_1 = require("../vite/utils/ast");
@@ -52,7 +53,7 @@ const REMOVED_MSGS = [
 ];
 exports.removeInfoFormatter = {
     test(msg) {
-        return !!REMOVED_MSGS.find((m) => typeof m === 'string' ? msg.includes(m) : m(msg));
+        return !!REMOVED_MSGS.find((m) => ((0, shared_1.isString)(m) ? msg.includes(m) : m(msg)));
     },
     format() {
         return '';

package/dist/json/mp/pages.js

@@ -16,15 +16,18 @@ function parseMiniProgramPagesJson(jsonStr, platform, options = { subpackages: f
     return parsePagesJson(jsonStr, platform, options);
 }
 exports.parseMiniProgramPagesJson = parseMiniProgramPagesJson;
+const NON_APP_JSON_KEYS = [
+    'unipush',
+    'usingComponents',
+    'optimization',
+    'scopedSlotsCompiler',
+    'usingComponents',
+    'uniStatistics',
+];
 function mergeMiniProgramAppJson(appJson, platformJson = {}) {
     Object.keys(platformJson).forEach((name) => {
         if (!(0, project_1.isMiniProgramProjectJsonKey)(name) &&
-            ![
-                'unipush',
-                'usingComponents',
-                'optimization',
-                'scopedSlotsCompiler',
-            ].includes(name)) {
+            !NON_APP_JSON_KEYS.includes(name)) {
             appJson[name] = platformJson[name];
         }
     });

package/dist/json/pages.js

@@ -103,7 +103,7 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
 }
 exports.normalizePagesJson = normalizePagesJson;
 function validatePages(pagesJson, jsonStr) {
-    if (!Array.isArray(pagesJson.pages)) {
+    if (!(0, shared_1.isArray)(pagesJson.pages)) {
         pagesJson.pages = [];
         throw new Error(`[uni-app] Error: pages.json->pages parse failed.`);
     }
@@ -140,7 +140,7 @@ function normalizePages(pages, platform) {
 }
 function normalizeSubpackages(subpackages) {
     const pages = [];
-    if (Array.isArray(subpackages)) {
+    if ((0, shared_1.isArray)(subpackages)) {
         subpackages.forEach(({ root, pages: subPages }) => {
             if (root && subPages.length) {
                 subPages.forEach((subPage) => {

package/dist/logs/format.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatWarnMsg = exports.formatInfoMsg = exports.removeNVueInfoFormatter = exports.formatErrMsg = void 0;
 const uni_shared_1 = require("@dcloudio/uni-shared");
+const shared_1 = require("@vue/shared");
 const env_1 = require("../hbx/env");
 const alias_1 = require("../hbx/alias");
 const log_1 = require("../hbx/log");
@@ -45,7 +46,7 @@ const REMOVED_NVUE_MSGS = [
 ];
 exports.removeNVueInfoFormatter = {
     test(msg) {
-        return !!REMOVED_NVUE_MSGS.find((m) => typeof m === 'string' ? msg.includes(m) : m(msg));
+        return !!REMOVED_NVUE_MSGS.find((m) => (0, shared_1.isString)(m) ? msg.includes(m) : m(msg));
     },
     format() {
         return '';
@@ -56,6 +57,9 @@ const initNVueInfoFormattersOnce = (0, uni_shared_1.once)(() => {
     nvueInfoFormatters.push(exports.removeNVueInfoFormatter);
 });
 function formatInfoMsg(msg, options) {
+    if (options && (0, env_1.isInHBuilderX)()) {
+        options.timestamp = false;
+    }
     initInfoFormattersOnce();
     const formatter = infoFormatters.find(({ test }) => test(msg, options));
     if (formatter) {

package/dist/vite/plugins/inject.js

@@ -74,7 +74,7 @@ function uniViteInjectPlugin(name, options) {
                     if (mods.length === 2) {
                         mod = namespaceModulesMap.get(mods[0] + '.');
                         if (mod) {
-                            if (Array.isArray(mod)) {
+                            if ((0, shared_1.isArray)(mod)) {
                                 const testFn = mod[1];
                                 if (testFn(mods[1])) {
                                     mod = [mod[0], mods[1]];
@@ -90,7 +90,7 @@ function uniViteInjectPlugin(name, options) {
                     }
                 }
                 if (mod && !imports.has(name) && !scope.contains(name)) {
-                    if (typeof mod === 'string')
+                    if ((0, shared_1.isString)(mod))
                         mod = [mod, 'default'];
                     if (mod[0] === id)
                         return false;
@@ -188,7 +188,7 @@ const flatten = (startNode) => {
 };
 function normalizeModulesMap(modulesMap) {
     modulesMap.forEach((mod, key) => {
-        modulesMap.set(key, Array.isArray(mod)
+        modulesMap.set(key, (0, shared_1.isArray)(mod)
             ? [mod[0].split(path_1.sep).join('/'), mod[1]]
             : mod.split(path_1.sep).join('/'));
     });

package/dist/vite/plugins/vitejs/plugins/asset.js

@@ -35,6 +35,7 @@ const magic_string_1 = __importDefault(require("magic-string"));
 const crypto_1 = require("crypto");
 const utils_1 = require("../utils");
 const utils_2 = require("../../../../vite/utils/utils");
+const shared_1 = require("@vue/shared");
 exports.assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g;
 // urls in JS must be quoted as strings, so when replacing them we need
 // a different regex
@@ -178,17 +179,17 @@ function assetFileNamesToFileName(assetFileNames, file, contentHash, content) {
     const ext = extname.substring(1);
     const name = basename.slice(0, -extname.length);
     const hash = contentHash;
-    if (typeof assetFileNames === 'function') {
+    if ((0, shared_1.isFunction)(assetFileNames)) {
         assetFileNames = assetFileNames({
             name: file,
             source: content,
             type: 'asset',
         });
-        if (typeof assetFileNames !== 'string') {
+        if (!(0, shared_1.isString)(assetFileNames)) {
             throw new TypeError('assetFileNames must return a string');
         }
     }
-    else if (typeof assetFileNames !== 'string') {
+    else if (!(0, shared_1.isString)(assetFileNames)) {
         throw new TypeError('assetFileNames must be a string or a function');
     }
     const fileName = assetFileNames.replace(/\[\w+\]/g, (placeholder) => {

package/dist/vite/plugins/vitejs/plugins/css.js

@@ -40,6 +40,7 @@ const esbuild_1 = require("esbuild");
 const preprocess_1 = require("../../../../preprocess");
 const constants_1 = require("../../../../constants");
 const cleanString_1 = require("../cleanString");
+const shared_1 = require("@vue/shared");
 const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 exports.cssLangRE = new RegExp(cssLangs);
 const cssModuleRE = new RegExp(`\\.module${cssLangs}`);
@@ -341,7 +342,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
-                if (modulesOptions && typeof modulesOptions.getJSON === 'function') {
+                if (modulesOptions && (0, shared_1.isFunction)(modulesOptions.getJSON)) {
                     modulesOptions.getJSON(cssFileName, _modules, outputFileName);
                 }
             },
@@ -369,15 +370,19 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         ...postcssOptions,
         to: id,
         from: id,
-        map: {
-            inline: false,
-            annotation: false,
-            // postcss may return virtual files
-            // we cannot obtain content of them, so this needs to be enabled
-            sourcesContent: true,
-            // when "prev: preprocessorMap", the result map may include duplicate filename in `postcssResult.map.sources`
-            // prev: preprocessorMap,
-        },
+        ...(devSourcemap
+            ? {
+                map: {
+                    inline: false,
+                    annotation: false,
+                    // postcss may return virtual files
+                    // we cannot obtain content of them, so this needs to be enabled
+                    sourcesContent: true,
+                    // when "prev: preprocessorMap", the result map may include duplicate filename in `postcssResult.map.sources`
+                    // prev: preprocessorMap,
+                },
+            }
+            : {}),
     });
     // record CSS dependencies from @imports
     for (const message of postcssResult.messages) {
@@ -490,7 +495,7 @@ async function resolvePostcssConfig(config) {
         };
     }
     else {
-        const searchPath = typeof inlineOptions === 'string' ? inlineOptions : config.root;
+        const searchPath = (0, shared_1.isString)(inlineOptions) ? inlineOptions : config.root;
         try {
             // @ts-ignore
             result = await (0, postcss_load_config_1.default)({}, searchPath);
@@ -706,7 +711,7 @@ const scss = async (source, root, options, resolvers, isNVue) => {
     };
     const importer = [internalImporter];
     if (options.importer) {
-        Array.isArray(options.importer)
+        (0, shared_1.isArray)(options.importer)
             ? importer.push(...options.importer)
             : importer.push(options.importer);
     }
@@ -794,7 +799,7 @@ async function rebaseUrls(file, rootFile, alias, isNVue = false) {
             return url;
         // match alias, no need to rewrite
         for (const { find } of alias) {
-            const matches = typeof find === 'string' ? url.startsWith(find) : find.test(url);
+            const matches = (0, shared_1.isString)(find) ? url.startsWith(find) : find.test(url);
             if (matches) {
                 return url;
             }
@@ -959,9 +964,9 @@ function formatStylusSourceMap(mapBefore, root) {
 async function getSource(source, filename, additionalData, enableSourcemap, sep = '') {
     if (!additionalData)
         return { content: source };
-    if (typeof additionalData === 'function') {
+    if ((0, shared_1.isFunction)(additionalData)) {
         const newContent = await additionalData(source, filename);
-        if (typeof newContent === 'string') {
+        if ((0, shared_1.isString)(newContent)) {
             return { content: newContent };
         }
         return newContent;

package/dist/vite/utils/plugin.js

@@ -31,7 +31,7 @@ function replacePlugins(plugins, config) {
 }
 exports.replacePlugins = replacePlugins;
 function removePlugins(plugins, config) {
-    if (!Array.isArray(plugins)) {
+    if (!(0, shared_1.isArray)(plugins)) {
         plugins = [plugins];
     }
     plugins.forEach((name) => {

package/dist/watcher.js

@@ -7,9 +7,10 @@ exports.FileWatcher = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const chokidar_1 = require("chokidar");
+const shared_1 = require("@vue/shared");
 class FileWatcher {
     constructor({ src, dest, transform, verbose }) {
-        this.src = !Array.isArray(src) ? [src] : src;
+        this.src = !(0, shared_1.isArray)(src) ? [src] : src;
         this.dest = dest;
         this.transform = transform;
         this.verbose = verbose;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3041520220610001",
+  "version": "3.0.0-alpha-3041820220617001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,17 +22,17 @@
     "@babel/core": "^7.17.9",
     "@babel/parser": "^7.17.9",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3041520220610001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3041520220610001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3041820220617001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3041820220617001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
     "@rollup/pluginutils": "^4.2.0",
-    "@vue/compiler-core": "3.2.33",
-    "@vue/compiler-dom": "3.2.33",
-    "@vue/compiler-sfc": "3.2.33",
-    "@vue/server-renderer": "3.2.33",
-    "@vue/shared": "3.2.33",
+    "@vue/compiler-core": "3.2.37",
+    "@vue/compiler-dom": "3.2.37",
+    "@vue/compiler-sfc": "3.2.37",
+    "@vue/server-renderer": "3.2.37",
+    "@vue/shared": "3.2.37",
     "autoprefixer": "^10.4.7",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",
@@ -72,6 +72,6 @@
     "@types/sass": "^1.43.1",
     "@types/stylus": "^0.48.36",
     "postcss": "^8.4.13",
-    "vue": "3.2.33"
+    "vue": "3.2.37"
   }
 }