@dcloudio/uni-cli-shared 3.0.0-alpha-3061520221220001 → 3.0.0-alpha-3061620221230002

package/dist/hbx/log.js

@@ -107,7 +107,6 @@ exports.errorFormatter = {
     },
 };
 function buildErrorMessage(err, args = [], includeStack = true) {
-    var _a, _b;
     if (err.plugin) {
         args.push(`${picocolors_1.default.magenta('[plugin:' + err.plugin + ']')} ${picocolors_1.default.red(err.message)}`);
         if (err.loc &&
@@ -132,7 +131,7 @@ function buildErrorMessage(err, args = [], includeStack = true) {
         args.push(picocolors_1.default.red(err.message));
     }
     if (err.id) {
-        args.push(formatAtFilename(err.id, (_a = err.loc) === null || _a === void 0 ? void 0 : _a.line, (_b = err.loc) === null || _b === void 0 ? void 0 : _b.column));
+        args.push(formatAtFilename(err.id, err.loc?.line, err.loc?.column));
     }
     if (err.frame) {
         args.push(picocolors_1.default.yellow(pad(err.frame)));

package/dist/json/app/manifest/arguments.js

@@ -9,7 +9,6 @@ function initArguments(manifestJson, pagesJson) {
 }
 exports.initArguments = initArguments;
 function parseArguments(pagesJson) {
-    var _a;
     if (process.env.NODE_ENV !== 'development') {
         return;
     }
@@ -21,7 +20,7 @@ function parseArguments(pagesJson) {
         });
     }
     const condition = pagesJson.condition;
-    if (condition && ((_a = condition.list) === null || _a === void 0 ? void 0 : _a.length)) {
+    if (condition && condition.list?.length) {
         const list = condition.list;
         let current = condition.current || 0;
         if (current < 0) {

package/dist/json/app/manifest/confusion.js

@@ -23,10 +23,9 @@ function isConfusionFile(filename) {
 }
 exports.isConfusionFile = isConfusionFile;
 function hasConfusionFile(inputDir) {
-    var _a, _b;
     if (inputDir) {
         const manifestJson = (0, manifest_1.parseManifestJsonOnce)(inputDir);
-        const resources = (_b = (_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.confusion) === null || _b === void 0 ? void 0 : _b.resources;
+        const resources = manifestJson['app-plus']?.confusion?.resources;
         if (resources && parseConfusion(resources)[1].length) {
             return true;
         }
@@ -64,9 +63,8 @@ function parseConfusion(resources) {
     return [res, dynamicJsFiles];
 }
 function initConfusion(manifestJson) {
-    var _a;
     dynamicConfusionJsFiles.length = 0;
-    if (!((_a = manifestJson.plus.confusion) === null || _a === void 0 ? void 0 : _a.resources)) {
+    if (!manifestJson.plus.confusion?.resources) {
         return;
     }
     const resources = manifestJson.plus.confusion.resources;

package/dist/json/app/manifest/env.js

@@ -10,15 +10,13 @@ function getAppRenderer(manifestJson) {
 }
 exports.getAppRenderer = getAppRenderer;
 function getAppCodeSpliting(manifestJson) {
-    var _a, _b;
-    if (((_b = (_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.optimization) === null || _b === void 0 ? void 0 : _b.codeSpliting) === true) {
+    if (manifestJson['app-plus']?.optimization?.codeSpliting === true) {
         return true;
     }
     return false;
 }
 exports.getAppCodeSpliting = getAppCodeSpliting;
 function getAppStyleIsolation(manifestJson) {
-    var _a, _b, _c;
-    return ((_c = (_b = (_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.optimization) === null || _b === void 0 ? void 0 : _b.styleIsolation) !== null && _c !== void 0 ? _c : 'apply-shared');
+    return (manifestJson['app-plus']?.optimization?.styleIsolation ?? 'apply-shared');
 }
 exports.getAppStyleIsolation = getAppStyleIsolation;

package/dist/json/app/manifest/launchwebview.js

@@ -21,7 +21,7 @@ function initLaunchwebview(manifestJson, pagesJson) {
     });
     // 首页为nvue
     const entryPage = pagesJson.pages.find((p) => p.path === entryPagePath);
-    if (entryPage === null || entryPage === void 0 ? void 0 : entryPage.style.isNVue) {
+    if (entryPage?.style.isNVue) {
         manifestJson.plus.launchwebview.uniNView = { path: entryPagePath + '.js' };
     }
     else {

package/dist/json/app/manifest/nvue.js

@@ -30,9 +30,8 @@ function getNVueStyleCompiler(manifestJson) {
 exports.getNVueStyleCompiler = getNVueStyleCompiler;
 const flexDirs = ['row', 'row-reverse', 'column', 'column-reverse'];
 function getNVueFlexDirection(manifestJson) {
-    var _a, _b;
     let flexDir = 'column';
-    if ((_b = (_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.nvue) === null || _b === void 0 ? void 0 : _b['flex-direction']) {
+    if (manifestJson['app-plus']?.nvue?.['flex-direction']) {
         flexDir = manifestJson['app-plus'].nvue['flex-direction'];
         if (flexDirs.indexOf(flexDir) === -1) {
             flexDir = 'column';

package/dist/json/app/manifest/plus.js

@@ -14,7 +14,6 @@ const wxPageOrientationMapping = {
     landscape: ['landscape-primary', 'landscape-secondary'],
 };
 function initPlus(manifestJson, pagesJson) {
-    var _a;
     initUniStatistics(manifestJson);
     // 转换为老版本配置
     if (manifestJson.plus.modules) {
@@ -50,7 +49,7 @@ function initPlus(manifestJson, pagesJson) {
         manifestJson.screenOrientation = manifestJson.plus.screenOrientation;
         delete manifestJson.plus.screenOrientation;
     }
-    else if ((_a = pagesJson.globalStyle) === null || _a === void 0 ? void 0 : _a.pageOrientation) {
+    else if (pagesJson.globalStyle?.pageOrientation) {
         // 兼容微信小程序
         const pageOrientationValue = wxPageOrientationMapping[pagesJson.globalStyle
             .pageOrientation];
@@ -93,7 +92,6 @@ function initPlus(manifestJson, pagesJson) {
 }
 exports.initPlus = initPlus;
 function initUniStatistics(manifestJson) {
-    var _a;
     // 根节点配置了统计
     if (manifestJson.uniStatistics) {
         manifestJson.plus.uniStatistics = (0, merge_1.recursive)(true, manifestJson.uniStatistics, manifestJson.plus.uniStatistics);
@@ -114,7 +112,7 @@ function initUniStatistics(manifestJson) {
     if (!space) {
         return;
     }
-    const uniStatistics = (_a = manifestJson.plus) === null || _a === void 0 ? void 0 : _a.uniStatistics;
+    const uniStatistics = manifestJson.plus?.uniStatistics;
     if (!uniStatistics) {
         return;
     }

package/dist/json/app/manifest/safearea.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initSafearea = void 0;
 function initSafearea(manifestJson, pagesJson) {
-    var _a, _b;
-    if ((_b = (_a = pagesJson.tabBar) === null || _a === void 0 ? void 0 : _a.list) === null || _b === void 0 ? void 0 : _b.length) {
+    if (pagesJson.tabBar?.list?.length) {
         // 安全区配置 仅包含 tabBar 的时候才配置
         if (!manifestJson.plus.safearea) {
             manifestJson.plus.safearea = {

package/dist/json/app/manifest/splashscreen.js

@@ -34,8 +34,7 @@ function initSplashscreen(manifestJson, userManifestJson) {
 }
 exports.initSplashscreen = initSplashscreen;
 function getSplashscreen(manifestJson) {
-    var _a;
-    const splashscreenOptions = ((_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.splashscreen) || {};
+    const splashscreenOptions = manifestJson['app-plus']?.splashscreen || {};
     return {
         autoclose: splashscreenOptions.autoclose !== false,
         alwaysShowBeforeRender: splashscreenOptions.alwaysShowBeforeRender !== false,

package/dist/json/app/manifest/tabBar.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initTabBar = void 0;
 const uni_shared_1 = require("@dcloudio/uni-shared");
 function initTabBar(entryPagePath, manifestJson, pagesJson) {
-    var _a, _b;
-    if (!((_b = (_a = pagesJson.tabBar) === null || _a === void 0 ? void 0 : _a.list) === null || _b === void 0 ? void 0 : _b.length)) {
+    if (!pagesJson.tabBar?.list?.length) {
         return;
     }
     const tabBar = JSON.parse(JSON.stringify(pagesJson.tabBar));

package/dist/json/app/pages/uniConfig.js

@@ -12,7 +12,6 @@ const arguments_1 = require("../manifest/arguments");
 const splashscreen_1 = require("../manifest/splashscreen");
 const theme_1 = require("../../theme");
 function normalizeAppUniConfig(pagesJson, manifestJson) {
-    var _a;
     const { autoclose, alwaysShowBeforeRender } = (0, splashscreen_1.getSplashscreen)(manifestJson);
     const platformConfig = (0, manifest_1.getPlatformManifestJsonOnce)();
     const config = {
@@ -23,7 +22,7 @@ function normalizeAppUniConfig(pagesJson, manifestJson) {
             styleCompiler: (0, manifest_2.getNVueStyleCompiler)(manifestJson),
             'flex-direction': (0, manifest_2.getNVueFlexDirection)(manifestJson),
         },
-        renderer: ((_a = manifestJson['app-plus']) === null || _a === void 0 ? void 0 : _a.renderer) === 'native' ? 'native' : 'auto',
+        renderer: manifestJson['app-plus']?.renderer === 'native' ? 'native' : 'auto',
         appname: manifestJson.name || '',
         splashscreen: {
             alwaysShowBeforeRender,
@@ -42,7 +41,6 @@ function normalizeAppUniConfig(pagesJson, manifestJson) {
 }
 exports.normalizeAppUniConfig = normalizeAppUniConfig;
 function parseEntryPagePath(pagesJson) {
-    var _a;
     const res = {
         entryPagePath: '',
         entryPageQuery: '',
@@ -62,7 +60,7 @@ function parseEntryPagePath(pagesJson) {
                 res.entryPagePath = entryPagePath;
                 res.entryPageQuery = args.query ? '?' + args.query : '';
                 // non tabBar page
-                if (!(((_a = pagesJson.tabBar) === null || _a === void 0 ? void 0 : _a.list) || []).find((page) => page.pagePath === entryPagePath)) {
+                if (!(pagesJson.tabBar?.list || []).find((page) => page.pagePath === entryPagePath)) {
                     res.realEntryPagePath = realEntryPagePath;
                 }
             }

package/dist/json/manifest.js

@@ -44,17 +44,19 @@ function normalizeNetworkTimeout(networkTimeout) {
 exports.normalizeNetworkTimeout = normalizeNetworkTimeout;
 function getUniStatistics(inputDir, platform) {
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
+    if (platform === 'app') {
+        platform = 'app-plus';
+    }
     return (0, shared_1.extend)({}, manifest.uniStatistics, manifest[platform] && manifest[platform].uniStatistics);
 }
 exports.getUniStatistics = getUniStatistics;
 function isEnableUniPushV1(inputDir, platform) {
-    var _a, _b, _c;
     if (isEnableUniPushV2(inputDir, platform)) {
         return false;
     }
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
     if (platform === 'app') {
-        const push = (_c = (_b = (_a = manifest['app-plus']) === null || _a === void 0 ? void 0 : _a.distribute) === null || _b === void 0 ? void 0 : _b.sdkConfigs) === null || _c === void 0 ? void 0 : _c.push;
+        const push = manifest['app-plus']?.distribute?.sdkConfigs?.push;
         if (push && (0, shared_1.hasOwn)(push, 'unipush')) {
             return true;
         }
@@ -63,44 +65,38 @@ function isEnableUniPushV1(inputDir, platform) {
 }
 exports.isEnableUniPushV1 = isEnableUniPushV1;
 function isEnableUniPushV2(inputDir, platform) {
-    var _a, _b, _c, _d, _e, _f, _g;
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
     if (platform === 'app') {
-        return (((_e = (_d = (_c = (_b = (_a = manifest['app-plus']) === null || _a === void 0 ? void 0 : _a.distribute) === null || _b === void 0 ? void 0 : _b.sdkConfigs) === null || _c === void 0 ? void 0 : _c.push) === null || _d === void 0 ? void 0 : _d.unipush) === null || _e === void 0 ? void 0 : _e.version) ==
+        return (manifest['app-plus']?.distribute?.sdkConfigs?.push?.unipush?.version ==
             '2');
     }
-    return ((_g = (_f = manifest[platform]) === null || _f === void 0 ? void 0 : _f.unipush) === null || _g === void 0 ? void 0 : _g.enable) === true;
+    return manifest[platform]?.unipush?.enable === true;
 }
 exports.isEnableUniPushV2 = isEnableUniPushV2;
 function isEnableSecureNetwork(inputDir, platform) {
-    var _a, _b, _c, _d;
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
     if (platform === 'app') {
-        return !!((_b = (_a = manifest['app-plus']) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.SecureNetwork);
+        return !!manifest['app-plus']?.modules?.SecureNetwork;
     }
-    return ((_d = (_c = manifest[platform]) === null || _c === void 0 ? void 0 : _c.secureNetwork) === null || _d === void 0 ? void 0 : _d.enable) === true;
+    return manifest[platform]?.secureNetwork?.enable === true;
 }
 exports.isEnableSecureNetwork = isEnableSecureNetwork;
 function isUniPushOffline(inputDir) {
-    var _a, _b, _c, _d, _e;
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
-    return (((_e = (_d = (_c = (_b = (_a = manifest['app-plus']) === null || _a === void 0 ? void 0 : _a.distribute) === null || _b === void 0 ? void 0 : _b.sdkConfigs) === null || _c === void 0 ? void 0 : _c.push) === null || _d === void 0 ? void 0 : _d.unipush) === null || _e === void 0 ? void 0 : _e.offline) ===
+    return (manifest['app-plus']?.distribute?.sdkConfigs?.push?.unipush?.offline ===
         true);
 }
 exports.isUniPushOffline = isUniPushOffline;
 function getRouterOptions(manifestJson) {
-    var _a;
-    return (0, shared_1.extend)({}, (_a = manifestJson.h5) === null || _a === void 0 ? void 0 : _a.router);
+    return (0, shared_1.extend)({}, manifestJson.h5?.router);
 }
 exports.getRouterOptions = getRouterOptions;
 function isEnableTreeShaking(manifestJson) {
-    var _a, _b, _c;
-    return ((_c = (_b = (_a = manifestJson.h5) === null || _a === void 0 ? void 0 : _a.optimization) === null || _b === void 0 ? void 0 : _b.treeShaking) === null || _c === void 0 ? void 0 : _c.enable) !== false;
+    return manifestJson.h5?.optimization?.treeShaking?.enable !== false;
 }
 exports.isEnableTreeShaking = isEnableTreeShaking;
 function getDevServerOptions(manifestJson) {
-    var _a;
-    return (0, shared_1.extend)({}, (_a = manifestJson.h5) === null || _a === void 0 ? void 0 : _a.devServer);
+    return (0, shared_1.extend)({}, manifestJson.h5?.devServer);
 }
 exports.getDevServerOptions = getDevServerOptions;
 function getPlatformManifestJsonOnce() {

package/dist/json/mp/jsonFile.js

@@ -53,7 +53,6 @@ exports.normalizeJsonFilename = normalizeJsonFilename;
 function findChangedJsonFiles(supportGlobalUsingComponents = true) {
     const changedJsonFiles = new Map();
     function findChangedFile(filename, json) {
-        var _a;
         const newJson = JSON.parse(JSON.stringify(json));
         if (!newJson.usingComponents) {
             newJson.usingComponents = {};
@@ -63,7 +62,7 @@ function findChangedJsonFiles(supportGlobalUsingComponents = true) {
         // app.json mp-baidu 在 win 不支持相对路径。所有平台改用绝对路径
         if (filename !== 'app') {
             let usingComponents = newJson.usingComponents;
-            const globalUsingComponents = (_a = appJsonCache === null || appJsonCache === void 0 ? void 0 : appJsonCache.usingComponents) !== null && _a !== void 0 ? _a : {};
+            const globalUsingComponents = appJsonCache?.usingComponents ?? {};
             // 如果小程序不支持 global 的 usingComponents
             if (!supportGlobalUsingComponents) {
                 // 从 appJsonCache 中读取全局的 usingComponents 并补充到子组件 usingComponents 中

package/dist/json/mp/pages.js

@@ -26,6 +26,7 @@ const NON_APP_JSON_KEYS = [
     'scopedSlotsCompiler',
     'usingComponents',
     'uniStatistics',
+    'mergeVirtualHostAttributes',
 ];
 function mergeMiniProgramAppJson(appJson, platformJson = {}) {
     Object.keys(platformJson).forEach((name) => {

package/dist/json/pages.js

@@ -408,8 +408,7 @@ function normalizePagesRoute(pagesJson) {
 }
 exports.normalizePagesRoute = normalizePagesRoute;
 function isEnablePullDownRefresh(pageStyle) {
-    var _a;
-    return pageStyle.enablePullDownRefresh || ((_a = pageStyle.pullToRefresh) === null || _a === void 0 ? void 0 : _a.support);
+    return pageStyle.enablePullDownRefresh || pageStyle.pullToRefresh?.support;
 }
 function normalizePullToRefresh(pageStyle) {
     return pageStyle.pullToRefresh;

package/dist/logs/format.js

@@ -65,7 +65,7 @@ function formatInfoMsg(msg, options) {
     if (formatter) {
         return formatter.format(msg, options);
     }
-    if (options === null || options === void 0 ? void 0 : options.nvue) {
+    if (options?.nvue) {
         initNVueInfoFormattersOnce();
         const formatter = nvueInfoFormatters.find(({ test }) => test(msg, options));
         if (formatter) {

package/dist/mp/ast.d.ts

@@ -1,4 +1,5 @@
+import type { Program } from '@babel/types';
 import { ParserPlugin } from '@babel/parser';
 export declare function parseProgram(code: string, importer: string, { babelParserPlugins }: {
     babelParserPlugins?: ParserPlugin[];
-}): import("@babel/types").Program;
+}): Program;

package/dist/postcss/plugins/uniapp.js

@@ -57,9 +57,8 @@ function walkDecls(rpx2unit) {
     };
 }
 function filterPrefersColorScheme(root) {
-    var _a;
     if (process.env.VUE_APP_DARK_MODE !== 'true') {
-        const filePath = (_a = root.source) === null || _a === void 0 ? void 0 : _a.input.file;
+        const filePath = root.source?.input.file;
         if (filePath && filePath.includes('@dcloudio')) {
             root.walkAtRules((rule) => {
                 if (rule.params.includes('prefers-color-scheme')) {

package/dist/scripts.js

@@ -7,17 +7,16 @@ exports.parseScripts = void 0;
 const shared_1 = require("@vue/shared");
 const fs_1 = __importDefault(require("fs"));
 function parseScripts(name, pkgPath) {
-    var _a, _b;
     if (!fs_1.default.existsSync(pkgPath)) {
         return;
     }
     const pkg = JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf8'));
-    const scripts = ((_a = pkg['uni-app']) === null || _a === void 0 ? void 0 : _a.scripts) || {};
+    const scripts = pkg['uni-app']?.scripts || {};
     const options = scripts[name];
     if (!options) {
         return;
     }
-    if (!((_b = options.env) === null || _b === void 0 ? void 0 : _b.UNI_PLATFORM)) {
+    if (!options.env?.UNI_PLATFORM) {
         console.error(`package.json->uni-app->scripts->${name}->env->UNI_PLATFORM is required`);
         process.exit(0);
     }

package/dist/uni_modules.js

@@ -14,7 +14,6 @@ function parseUniExtApis(vite = true) {
     }
     const injects = {};
     fs_extra_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
-        var _a, _b;
         // 必须以 uni- 开头
         if (!uniModuleDir.startsWith('uni-')) {
             return;
@@ -24,7 +23,8 @@ function parseUniExtApis(vite = true) {
             return;
         }
         try {
-            const exports = (_b = (_a = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))) === null || _a === void 0 ? void 0 : _a.uni_modules) === null || _b === void 0 ? void 0 : _b['uni-ext-api'];
+            const exports = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))
+                ?.uni_modules?.['uni-ext-api'];
             if (exports) {
                 Object.assign(injects, parseInjects(vite, process.env.UNI_PLATFORM === 'h5'
                     ? 'web'

package/dist/utils.d.ts

@@ -11,7 +11,7 @@ export declare function normalizePagePath(pagePath: string, platform: UniApp.PLA
 export declare function removeExt(str: string): string;
 export declare function normalizeNodeModules(str: string): string;
 export declare function normalizeMiniProgramFilename(filename: string, inputDir?: string): string;
-export declare function normalizeParsePlugins(importer: string, babelParserPlugins?: ParserPlugin[]): ParserPlugin[];
+export declare function normalizeParsePlugins(importer: string, babelParserPlugins?: ParserPlugin[]): (import("@babel/parser").ParserPluginWithOptions | ("asyncDoExpressions" | "asyncGenerators" | "bigInt" | "classPrivateMethods" | "classPrivateProperties" | "classProperties" | "classStaticBlock" | "decimal" | "decorators-legacy" | "decoratorAutoAccessors" | "destructuringPrivate" | "doExpressions" | "dynamicImport" | "explicitResourceManagement" | "exportDefaultFrom" | "exportNamespaceFrom" | "flow" | "flowComments" | "functionBind" | "functionSent" | "importMeta" | "jsx" | "logicalAssignment" | "importAssertions" | "importReflection" | "moduleBlocks" | "moduleStringNames" | "nullishCoalescingOperator" | "numericSeparator" | "objectRestSpread" | "optionalCatchBinding" | "optionalChaining" | "partialApplication" | "placeholders" | "privateIn" | "regexpUnicodeSets" | "throwExpressions" | "topLevelAwait" | "v8intrinsic" | "decorators" | "estree" | "moduleAttributes" | "pipelineOperator" | "recordAndTuple" | "typescript"))[];
 export declare function pathToGlob(pathString: string, glob: string, options?: {
     windows?: boolean;
     escape?: boolean;

package/dist/utils.js

@@ -17,7 +17,7 @@ exports.version = require('../package.json').version;
 try {
     exports.isRunningWithYarnPnp = Boolean(require('pnpapi'));
 }
-catch (_a) { }
+catch { }
 exports.isWindows = os_1.default.platform() === 'win32';
 function normalizePath(id) {
     return exports.isWindows ? id.replace(/\\/g, '/') : id;

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

@@ -145,8 +145,7 @@ function fileToUrl(id, config, ctx, canInline = false) {
 }
 exports.fileToUrl = fileToUrl;
 function getAssetFilename(hash, config) {
-    var _a;
-    return (_a = assetHashToFilenameMap.get(config)) === null || _a === void 0 ? void 0 : _a.get(hash);
+    return assetHashToFilenameMap.get(config)?.get(hash);
 }
 exports.getAssetFilename = getAssetFilename;
 /**
@@ -227,7 +226,6 @@ function sanitizeFileName(name) {
  * and returns the resolved public URL
  */
 function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false, canInline = false) {
-    var _a, _b, _c, _d;
     if (!skipPublicCheck && checkPublicFile(id, config)) {
         return config.base + id.slice(1);
     }
@@ -248,15 +246,16 @@ function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false, canI
         const contentHash = getAssetHash(content);
         const { search, hash } = (0, url_1.parse)(id);
         const postfix = (search || '') + (hash || '');
-        const output = (_b = (_a = config.build) === null || _a === void 0 ? void 0 : _a.rollupOptions) === null || _b === void 0 ? void 0 : _b.output;
+        const output = config.build?.rollupOptions?.output;
         const defaultAssetFileNames = path_1.default.posix.join(config.build.assetsDir, '[name].[hash][extname]');
         // Steps to determine which assetFileNames will be actually used.
         // First, if output is an object or string, use assetFileNames in it.
         // And a default assetFileNames as fallback.
-        let assetFileNames = (_c = (output && !Array.isArray(output) ? output.assetFileNames : undefined)) !== null && _c !== void 0 ? _c : defaultAssetFileNames;
+        let assetFileNames = (output && !Array.isArray(output) ? output.assetFileNames : undefined) ??
+            defaultAssetFileNames;
         if (output && Array.isArray(output)) {
             // Second, if output is an array, adopt assetFileNames in the first object.
-            assetFileNames = (_d = output[0].assetFileNames) !== null && _d !== void 0 ? _d : assetFileNames;
+            assetFileNames = output[0].assetFileNames ?? assetFileNames;
         }
         const inputDir = (0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR);
         let fileName = file.startsWith(inputDir) && file.includes('/static/')

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

@@ -37,7 +37,6 @@ const utils_1 = require("../utils");
 const asset_1 = require("./asset");
 const magic_string_1 = __importDefault(require("magic-string"));
 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)($|\\?)`;
@@ -108,34 +107,6 @@ function cssPlugin(config) {
     };
 }
 exports.cssPlugin = cssPlugin;
-function findCssModuleIds(moduleId, cssModuleIds, seen) {
-    if (!cssModuleIds) {
-        cssModuleIds = new Set();
-    }
-    if (!seen) {
-        seen = new Set();
-    }
-    if (seen.has(moduleId)) {
-        return cssModuleIds;
-    }
-    seen.add(moduleId);
-    const moduleInfo = this.getModuleInfo(moduleId);
-    if (moduleInfo) {
-        moduleInfo.importedIds.forEach((id) => {
-            if (id.includes(constants_1.PAGES_JSON_JS)) {
-                // 查询main.js时，需要忽略pages.json.js，否则会把所有页面样式加进来
-                return;
-            }
-            if (exports.cssLangRE.test(id) && !exports.commonjsProxyRE.test(id)) {
-                cssModuleIds.add(id);
-            }
-            else {
-                findCssModuleIds.call(this, id, cssModuleIds, seen);
-            }
-        });
-    }
-    return cssModuleIds;
-}
 /**
  * Plugin applied after user plugins
  */
@@ -164,14 +135,18 @@ function cssPostPlugin(config, { chunkCssFilename, chunkCssCode, }) {
                 moduleSideEffects: 'no-treeshake',
             };
         },
-        async generateBundle() {
-            const moduleIds = Array.from(this.getModuleIds());
-            moduleIds.forEach((id) => {
+        async renderChunk(_code, chunk, _opts) {
+            const id = chunk.facadeModuleId;
+            if (id) {
                 const filename = chunkCssFilename(id);
                 if (filename) {
-                    cssChunks.set(filename, findCssModuleIds.call(this, id));
+                    const ids = Object.keys(chunk.modules).filter((id) => styles.has(id));
+                    cssChunks.set(filename, ids);
                 }
-            });
+            }
+            return null;
+        },
+        async generateBundle() {
             if (!cssChunks.size) {
                 return;
             }
@@ -254,7 +229,6 @@ function getCssResolversKeys(resolvers) {
     return Object.keys(resolvers);
 }
 async function compileCSS(id, code, config, urlReplacer, atImportResolvers, server) {
-    var _a;
     const { modules: modulesOptions, preprocessorOptions, devSourcemap, } = config.css || {};
     const isModule = modulesOptions !== false && cssModuleRE.test(id);
     // although at serve time it can work without processing, we do need to
@@ -262,7 +236,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
     const needInlineImport = code.includes('@import');
     const hasUrl = exports.cssUrlRE.test(code) || cssImageSetRE.test(code);
     const postcssConfig = await resolvePostcssConfig(config);
-    const lang = (_a = id.match(exports.cssLangRE)) === null || _a === void 0 ? void 0 : _a[1];
+    const lang = id.match(exports.cssLangRE)?.[1];
     // 1. plain css that needs no processing
     if (lang === 'css' &&
         !postcssConfig &&
@@ -299,7 +273,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         }
         // important: set this for relative import resolving
         opts.filename = (0, utils_1.cleanUrl)(id);
-        opts.enableSourcemap = devSourcemap !== null && devSourcemap !== void 0 ? devSourcemap : false;
+        opts.enableSourcemap = devSourcemap ?? false;
         const preprocessResult = await preProcessor(code, config.root, opts, atImportResolvers, !!config.nvue);
         if (preprocessResult.errors.length) {
             throw preprocessResult.errors[0];
@@ -494,13 +468,12 @@ function combineSourcemapsIfExists(filename, map1, map2) {
         : map1;
 }
 async function resolvePostcssConfig(config) {
-    var _a;
     let result = postcssConfigCache.get(config);
     if (result !== undefined) {
         return result;
     }
     // inline postcss config via vite config
-    const inlineOptions = (_a = config.css) === null || _a === void 0 ? void 0 : _a.postcss;
+    const inlineOptions = config.css?.postcss;
     if ((0, utils_1.isObject)(inlineOptions)) {
         const options = { ...inlineOptions };
         delete options.plugins;
@@ -552,8 +525,7 @@ const UrlRewritePostcssPlugin = (opts) => {
                 const isCssImageSet = cssImageSetRE.test(declaration.value);
                 if (isCssUrl || isCssImageSet) {
                     const replacerForDeclaration = (rawUrl) => {
-                        var _a;
-                        const importer = (_a = declaration.source) === null || _a === void 0 ? void 0 : _a.input.file;
+                        const importer = declaration.source?.input.file;
                         return opts.replacer(rawUrl, importer);
                     };
                     const rewriterToUse = isCssImageSet
@@ -700,14 +672,13 @@ async function hoistAtRules(css) {
 exports.hoistAtRules = hoistAtRules;
 const loadedPreprocessors = {};
 function loadPreprocessor(lang, root) {
-    var _a, _b;
     if (lang in loadedPreprocessors) {
         return loadedPreprocessors[lang];
     }
     try {
         // Search for the preprocessor in the root directory first, and fall back
         // to the default require paths.
-        const fallbackPaths = ((_b = (_a = require.resolve).paths) === null || _b === void 0 ? void 0 : _b.call(_a, lang)) || [];
+        const fallbackPaths = require.resolve.paths?.(lang) || [];
         const resolved = require.resolve(lang, { paths: [root, ...fallbackPaths] });
         return (loadedPreprocessors[lang] = require(resolved));
     }
@@ -722,11 +693,11 @@ const scss = async (source, root, options, resolvers, isNVue) => {
         resolvers.sass(url, importer).then((resolved) => {
             if (resolved) {
                 rebaseUrls(resolved, options.filename, options.alias, isNVue)
-                    .then((data) => done === null || done === void 0 ? void 0 : done(data))
-                    .catch((data) => done === null || done === void 0 ? void 0 : done(data));
+                    .then((data) => done?.(data))
+                    .catch((data) => done?.(data));
             }
             else {
-                done === null || done === void 0 ? void 0 : done(null);
+                done?.(null);
             }
         });
     };
@@ -937,14 +908,13 @@ function createViteLessPlugin(less, rootFile, alias, resolvers, isNVue) {
 }
 // .styl
 const styl = async (source, root, options) => {
-    var _a;
     const nodeStylus = loadPreprocessor("stylus" /* PreprocessLang.stylus */, root);
     // Get source with preprocessor options.additionalData. Make sure a new line separator
     // is added to avoid any render error, as added stylus content may not have semi-colon separators
     const { content, map: additionalMap } = await getSource(source, options.filename, options.additionalData, options.enableSourcemap, '\n');
     // Get preprocessor options.imports dependencies as stylus
     // does not return them with its builtin `.deps()` method
-    const importsDeps = ((_a = options.imports) !== null && _a !== void 0 ? _a : []).map((dep) => path_1.default.resolve(dep));
+    const importsDeps = (options.imports ?? []).map((dep) => path_1.default.resolve(dep));
     try {
         const ref = nodeStylus(content, options);
         if (options.enableSourcemap) {

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

@@ -113,7 +113,7 @@ async function processSrcSet(srcs, replacer) {
         const [url] = imageSetUrlRE.exec(src) || [];
         return {
             url: url,
-            descriptor: src === null || src === void 0 ? void 0 : src.slice(url.length).trim(),
+            descriptor: src?.slice(url.length).trim(),
         };
     })
         .filter(({ url }) => !!url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3061520221220001",
+  "version": "3.0.0-alpha-3061620221230002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "@ampproject/remapping": "^2.1.2",
-    "@babel/core": "^7.19.6",
-    "@babel/parser": "^7.19.6",
-    "@babel/types": "^7.20.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3061520221220001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3061520221220001",
+    "@babel/core": "^7.20.5",
+    "@babel/parser": "^7.20.5",
+    "@babel/types": "^7.20.7",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3061620221230002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3061620221230002",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -42,13 +42,13 @@
     "compare-versions": "^3.6.0",
     "debug": "^4.3.3",
     "es-module-lexer": "^0.9.3",
-    "esbuild": "^0.15.9",
+    "esbuild": "^0.16.3",
     "estree-walker": "^2.0.2",
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
     "hash-sum": "^2.0.0",
     "jsonc-parser": "^3.0.0",
-    "magic-string": "^0.26.7",
+    "magic-string": "^0.27.0",
     "merge": "^2.1.1",
     "mime": "^3.0.0",
     "module-alias": "^2.2.2",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3061520221220001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3061620221230002",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",