@dcloudio/uni-cli-shared 3.0.0-alpha-3040920220508001 → 3.0.0-alpha-3040820220424004

package/dist/checkUpdate.js

@@ -147,7 +147,17 @@ function getMac() {
             if (!item.family || (item.mac && item.mac === '00:00:00:00:00:00')) {
                 continue;
             }
-            if (item.family === 'IPv4' || item.family === 'IPv6') {
+            if (
+            // Node < v18
+            typeof item.family === 'string' &&
+                (item.family === 'IPv4' || item.family === 'IPv6')) {
+                mac = item.mac;
+                break;
+            }
+            else if (
+            // Node >= v18
+            typeof item.family === 'number' &&
+                (item.family === 4 || item.family === 6)) {
                 mac = item.mac;
                 break;
             }

package/dist/env/define.d.ts

@@ -3,7 +3,10 @@ export declare function initDefine(stringifyBoolean?: boolean): {
     'process.env.UNI_DEBUG': string | boolean;
     'process.env.UNI_APP_ID': string;
     'process.env.UNI_APP_NAME': string;
+    'process.env.UNI_APP_VERSION_NAME': string;
+    'process.env.UNI_APP_VERSION_CODE': string;
     'process.env.UNI_PLATFORM': string;
+    'process.env.UNI_SUB_PLATFORM': string;
     'process.env.UNI_MP_PLUGIN': string;
     'process.env.UNI_SUBPACKAGE': string;
     'process.env.UNI_COMPILER_VERSION': string;

package/dist/env/define.js

@@ -15,7 +15,10 @@ function initDefine(stringifyBoolean = false) {
             : isDebug,
         'process.env.UNI_APP_ID': JSON.stringify(manifestJson.appid || ''),
         'process.env.UNI_APP_NAME': JSON.stringify(manifestJson.name || ''),
+        'process.env.UNI_APP_VERSION_NAME': JSON.stringify(manifestJson.versionName || ''),
+        'process.env.UNI_APP_VERSION_CODE': JSON.stringify(manifestJson.versionCode || ''),
         'process.env.UNI_PLATFORM': JSON.stringify(process.env.UNI_PLATFORM),
+        'process.env.UNI_SUB_PLATFORM': JSON.stringify(process.env.UNI_SUB_PLATFORM),
         'process.env.UNI_MP_PLUGIN': JSON.stringify(process.env.UNI_MP_PLUGIN),
         'process.env.UNI_SUBPACKAGE': JSON.stringify(process.env.UNI_SUBPACKAGE),
         'process.env.UNI_COMPILER_VERSION': JSON.stringify(process.env.UNI_COMPILER_VERSION),

package/dist/vite/plugins/vitejs/cleanString.d.ts

@@ -0,0 +1 @@
+export declare function emptyCssComments(raw: string): string;

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

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.emptyCssComments = void 0;
+const utils_1 = require("./utils");
+const blankReplacer = (s) => ' '.repeat(s.length);
+function emptyCssComments(raw) {
+    return raw.replace(utils_1.multilineCommentsRE, blankReplacer);
+}
+exports.emptyCssComments = emptyCssComments;

package/dist/vite/plugins/vitejs/plugins/asset.d.ts

@@ -36,5 +36,5 @@ export declare function getAssetFilename(hash: string, config: ResolvedConfig):
  * @returns output filename
  */
 export declare function assetFileNamesToFileName(assetFileNames: Exclude<OutputOptions['assetFileNames'], undefined>, file: string, contentHash: string, content: string | Buffer): string;
-export declare function getAssetHash(content: Buffer): string;
+export declare function getAssetHash(content: Buffer | string): string;
 export declare function urlToBuiltUrl(url: string, importer: string, config: ResolvedConfig, pluginContext: PluginContext): string;

package/dist/vite/plugins/vitejs/plugins/css.d.ts

@@ -1,4 +1,4 @@
-import { RollupError } from 'rollup';
+import { ExistingRawSourceMap, RollupError } from 'rollup';
 import { Plugin } from '../plugin';
 import { ResolvedConfig } from '../config';
 import * as Postcss from 'postcss';
@@ -38,12 +38,14 @@ export declare function cssPostPlugin(config: ResolvedConfig, { chunkCssFilename
     chunkCssFilename: (id: string) => string | void;
     chunkCssCode: (filename: string, cssCode: string) => Promise<string> | string;
 }): Plugin;
+export declare function formatPostcssSourceMap(rawMap: ExistingRawSourceMap, file: string): ExistingRawSourceMap;
 export declare const cssUrlRE: RegExp;
 export declare function minifyCSS(css: string, config: ResolvedConfig): Promise<string>;
 export declare function hoistAtRules(css: string): Promise<string>;
 export interface StylePreprocessorResults {
     code: string;
-    map?: object;
+    map?: ExistingRawSourceMap | undefined;
+    additionalMap?: ExistingRawSourceMap | undefined;
     errors: RollupError[];
     deps: string[];
 }

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

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hoistAtRules = exports.minifyCSS = exports.cssUrlRE = exports.cssPostPlugin = exports.cssPlugin = exports.isDirectCSSRequest = exports.isCSSRequest = exports.commonjsProxyRE = exports.cssLangRE = void 0;
+exports.hoistAtRules = exports.minifyCSS = exports.cssUrlRE = exports.formatPostcssSourceMap = exports.cssPostPlugin = exports.cssPlugin = exports.isDirectCSSRequest = exports.isCSSRequest = exports.commonjsProxyRE = exports.cssLangRE = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
@@ -39,11 +39,13 @@ const magic_string_1 = __importDefault(require("magic-string"));
 const esbuild_1 = require("esbuild");
 const preprocess_1 = require("../../../../preprocess");
 const constants_1 = require("../../../../constants");
+const cleanString_1 = require("../cleanString");
 const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 exports.cssLangRE = new RegExp(cssLangs);
 const cssModuleRE = new RegExp(`\\.module${cssLangs}`);
 const directRequestRE = /(\?|&)direct\b/;
 exports.commonjsProxyRE = /\?commonjs-proxy/;
+const varRE = /^var\(/i;
 const isCSSRequest = (request) => exports.cssLangRE.test(request) && !directRequestRE.test(request);
 exports.isCSSRequest = isCSSRequest;
 const isDirectCSSRequest = (request) => exports.cssLangRE.test(request) && directRequestRE.test(request);
@@ -253,7 +255,7 @@ function getCssResolversKeys(resolvers) {
 }
 async function compileCSS(id, code, config, urlReplacer, atImportResolvers, server) {
     var _a;
-    const { modules: modulesOptions, preprocessorOptions } = config.css || {};
+    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
     // crawl them in order to register watch dependencies.
@@ -267,9 +269,9 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         !isModule &&
         !needInlineImport &&
         !hasUrl) {
-        return { code };
+        return { code, map: null };
     }
-    let map;
+    let preprocessorMap;
     let modules;
     const deps = new Set();
     // 2. pre-processors: sass etc.
@@ -297,12 +299,13 @@ 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;
         const preprocessResult = await preProcessor(code, config.root, opts, atImportResolvers, !!config.nvue);
         if (preprocessResult.errors.length) {
             throw preprocessResult.errors[0];
         }
         code = preprocessResult.code;
-        map = preprocessResult.map;
+        preprocessorMap = combineSourcemapsIfExists(opts.filename, preprocessResult.map, preprocessResult.additionalMap);
         if (preprocessResult.deps) {
             preprocessResult.deps.forEach((dep) => {
                 // sometimes sass registers the file itself as a dep
@@ -318,6 +321,10 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
     if (needInlineImport) {
         postcssPlugins.unshift((await Promise.resolve().then(() => __importStar(require('postcss-import')))).default({
             async resolve(id, basedir) {
+                // const publicFile = checkPublicFile(id, config)
+                // if (publicFile) {
+                //   return publicFile
+                // }
                 const resolved = await atImportResolvers.css(id, path_1.default.join(basedir, '*'));
                 if (resolved) {
                     return path_1.default.resolve(resolved);
@@ -352,7 +359,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
     if (!postcssPlugins.length) {
         return {
             code,
-            map,
+            map: preprocessorMap,
         };
     }
     // postcss is an unbundled dep and should be lazy imported
@@ -365,13 +372,17 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         map: {
             inline: false,
             annotation: false,
-            prev: map,
+            // 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) {
         if (message.type === 'dependency') {
-            deps.add(message.file);
+            deps.add((0, utils_1.normalizePath)(message.file));
         }
         else if (message.type === 'dir-dependency') {
             // https://github.com/postcss/postcss/blob/main/docs/guidelines/plugin.md#3-dependencies
@@ -410,14 +421,58 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
             config.logger.warn(picocolors_1.default.yellow(msg));
         }
     }
+    if (!devSourcemap) {
+        return {
+            ast: postcssResult,
+            code: postcssResult.css,
+            map: { mappings: '' },
+            modules,
+            deps,
+        };
+    }
+    const rawPostcssMap = postcssResult.map.toJSON();
+    const postcssMap = formatPostcssSourceMap(
+    // version property of rawPostcssMap is declared as string
+    // but actually it is a number
+    rawPostcssMap, (0, utils_1.cleanUrl)(id));
     return {
         ast: postcssResult,
         code: postcssResult.css,
-        map: postcssResult.map,
+        map: combineSourcemapsIfExists((0, utils_1.cleanUrl)(id), postcssMap, preprocessorMap),
         modules,
         deps,
     };
 }
+function formatPostcssSourceMap(rawMap, file) {
+    const inputFileDir = path_1.default.dirname(file);
+    const sources = rawMap.sources.map((source) => {
+        const cleanSource = (0, utils_1.cleanUrl)(decodeURIComponent(source));
+        // postcss returns virtual files
+        if (/^<.+>$/.test(cleanSource)) {
+            return `\0${cleanSource}`;
+        }
+        return (0, utils_1.normalizePath)(path_1.default.resolve(inputFileDir, cleanSource));
+    });
+    return {
+        file,
+        mappings: rawMap.mappings,
+        names: rawMap.names,
+        sources,
+        sourcesContent: rawMap.sourcesContent,
+        version: rawMap.version,
+    };
+}
+exports.formatPostcssSourceMap = formatPostcssSourceMap;
+function combineSourcemapsIfExists(filename, map1, map2) {
+    return map1 && map2
+        ? (0, utils_1.combineSourcemaps)(filename, [
+            // type of version property of ExistingRawSourceMap is number
+            // but it is always 3
+            map1,
+            map2,
+        ])
+        : map1;
+}
 async function resolvePostcssConfig(config) {
     var _a;
     let result = postcssConfigCache.get(config);
@@ -435,14 +490,23 @@ async function resolvePostcssConfig(config) {
         };
     }
     else {
+        const searchPath = typeof inlineOptions === 'string' ? inlineOptions : config.root;
         try {
-            const searchPath = typeof inlineOptions === 'string' ? inlineOptions : config.root;
             // @ts-ignore
             result = await (0, postcss_load_config_1.default)({}, searchPath);
         }
         catch (e) {
             if (!/No PostCSS Config found/.test(e.message)) {
-                throw e;
+                if (e instanceof Error) {
+                    const { name, message, stack } = e;
+                    e.name = 'Failed to load PostCSS config';
+                    e.message = `Failed to load PostCSS config (searchPath: ${searchPath}): [${name}] ${message}\n${stack}`;
+                    e.stack = ''; // add stack to message to retain stack
+                    throw e;
+                }
+                else {
+                    throw new Error(`Failed to load PostCSS config: ${e}`);
+                }
             }
             result = null;
         }
@@ -452,7 +516,7 @@ async function resolvePostcssConfig(config) {
 }
 // https://drafts.csswg.org/css-syntax-3/#identifier-code-point
 exports.cssUrlRE = /(?<=^|[^\w\-\u0080-\uffff])url\(\s*('[^']+'|"[^"]+"|[^'")]+)\s*\)/;
-const cssImageSetRE = /image-set\(([^)]+)\)/;
+const cssImageSetRE = /(?<=image-set\()((?:[\w\-]+\([^\)]*\)|[^)])*)(?=\))/;
 const UrlRewritePostcssPlugin = (opts) => {
     if (!opts) {
         throw new Error('base or replace is required');
@@ -470,7 +534,9 @@ const UrlRewritePostcssPlugin = (opts) => {
                         const importer = (_a = declaration.source) === null || _a === void 0 ? void 0 : _a.input.file;
                         return opts.replacer(rawUrl, importer);
                     };
-                    const rewriterToUse = isCssUrl ? rewriteCssUrls : rewriteCssImageSet;
+                    const rewriterToUse = isCssImageSet
+                        ? rewriteCssImageSet
+                        : rewriteCssUrls;
                     promises.push(rewriterToUse(declaration.value, replacerForDeclaration).then((url) => {
                         declaration.value = url;
                     }));
@@ -484,9 +550,16 @@ const UrlRewritePostcssPlugin = (opts) => {
 };
 UrlRewritePostcssPlugin.postcss = true;
 function rewriteCssUrls(css, replacer) {
-    return (0, utils_1.asyncReplace)(css, exports.cssUrlRE, async (match) => {
-        const [matched, rawUrl] = match;
-        return await doUrlReplace(rawUrl, matched, replacer);
+    return (0, utils_1.asyncReplace)(css, cssImageSetRE, async (match) => {
+        const [, rawUrl] = match;
+        const url = await (0, utils_1.processSrcSet)(rawUrl, async ({ url }) => {
+            // the url maybe url(...)
+            if (exports.cssUrlRE.test(url)) {
+                return await rewriteCssUrls(url, replacer);
+            }
+            return await doUrlReplace(url, url, replacer);
+        });
+        return url;
     });
 }
 function rewriteCssImageSet(css, replacer) {
@@ -503,7 +576,10 @@ async function doUrlReplace(rawUrl, matched, replacer) {
         wrap = first;
         rawUrl = rawUrl.slice(1, -1);
     }
-    if ((0, utils_1.isExternalUrl)(rawUrl) || (0, utils_1.isDataUrl)(rawUrl) || rawUrl.startsWith('#')) {
+    if ((0, utils_1.isExternalUrl)(rawUrl) ||
+        (0, utils_1.isDataUrl)(rawUrl) ||
+        rawUrl.startsWith('#') ||
+        varRE.test(rawUrl)) {
         return matched;
     }
     return `url(${wrap}${await replacer(rawUrl)}${wrap})`;
@@ -533,24 +609,29 @@ async function minifyCSS(css, config) {
 exports.minifyCSS = minifyCSS;
 async function hoistAtRules(css) {
     const s = new magic_string_1.default(css);
+    const cleanCss = (0, cleanString_1.emptyCssComments)(css);
+    let match;
     // #1845
     // CSS @import can only appear at top of the file. We need to hoist all @import
     // to top when multiple files are concatenated.
     // match until semicolon that's not in quotes
-    s.replace(/@import\s*(?:url\([^\)]*\)|"[^"]*"|'[^']*'|[^;]*).*?;/gm, (match) => {
-        s.appendLeft(0, match);
-        return '';
-    });
+    const atImportRE = /@import\s*(?:url\([^\)]*\)|"([^"]|(?<=\\)")*"|'([^']|(?<=\\)')*'|[^;]*).*?;/gm;
+    while ((match = atImportRE.exec(cleanCss))) {
+        s.remove(match.index, match.index + match[0].length);
+        // Use `appendLeft` instead of `prepend` to preserve original @import order
+        s.appendLeft(0, match[0]);
+    }
     // #6333
     // CSS @charset must be the top-first in the file, hoist the first to top
+    const atCharsetRE = /@charset\s*(?:"([^"]|(?<=\\)")*"|'([^']|(?<=\\)')*'|[^;]*).*?;/gm;
     let foundCharset = false;
-    s.replace(/@charset\s*(?:"[^"]*"|'[^']*'|[^;]*).*?;/gm, (match) => {
+    while ((match = atCharsetRE.exec(cleanCss))) {
+        s.remove(match.index, match.index + match[0].length);
         if (!foundCharset) {
-            s.prepend(match);
+            s.prepend(match[0]);
             foundCharset = true;
         }
-        return '';
-    });
+    }
     return s.toString();
 }
 exports.hoistAtRules = hoistAtRules;
@@ -577,10 +658,12 @@ const scss = async (source, root, options, resolvers, isNVue) => {
     const internalImporter = (url, importer, done) => {
         resolvers.sass(url, importer).then((resolved) => {
             if (resolved) {
-                rebaseUrls(resolved, options.filename, options.alias, isNVue).then(done);
+                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));
             }
             else {
-                done && done(null);
+                done === null || done === void 0 ? void 0 : done(null);
             }
         });
     };
@@ -590,12 +673,20 @@ const scss = async (source, root, options, resolvers, isNVue) => {
             ? importer.push(...options.importer)
             : importer.push(options.importer);
     }
+    const { content: data, map: additionalMap } = await getSource(source, options.filename, options.additionalData, options.enableSourcemap);
     const finalOptions = {
         ...options,
-        data: await getSource(source, options.filename, options.additionalData),
+        data,
         file: options.filename,
         outFile: options.filename,
         importer,
+        ...(options.enableSourcemap
+            ? {
+                sourceMap: true,
+                omitSourceMapUrl: true,
+                sourceMapRoot: path_1.default.dirname(options.filename),
+            }
+            : {}),
     };
     try {
         const result = await new Promise((resolve, reject) => {
@@ -609,8 +700,13 @@ const scss = async (source, root, options, resolvers, isNVue) => {
             });
         });
         const deps = result.stats.includedFiles;
+        const map = result.map
+            ? JSON.parse(result.map.toString())
+            : undefined;
         return {
             code: result.css.toString(),
+            map,
+            additionalMap,
             errors: [],
             deps,
         };
@@ -673,12 +769,20 @@ async function rebaseUrls(file, rootFile, alias, isNVue = false) {
 const less = async (source, root, options, resolvers, isNVue) => {
     const nodeLess = loadPreprocessor("less" /* less */, root);
     const viteResolverPlugin = createViteLessPlugin(nodeLess, options.filename, options.alias, resolvers, isNVue);
-    source = await getSource(source, options.filename, options.additionalData);
+    const { content, map: additionalMap } = await getSource(source, options.filename, options.additionalData, options.enableSourcemap);
     let result;
     try {
-        result = await nodeLess.render(source, {
+        result = await nodeLess.render(content, {
             ...options,
             plugins: [viteResolverPlugin, ...(options.plugins || [])],
+            ...(options.enableSourcemap
+                ? {
+                    sourceMap: {
+                        outputSourceFiles: true,
+                        sourceMapFileInline: false,
+                    },
+                }
+                : {}),
         });
     }
     catch (e) {
@@ -692,8 +796,14 @@ const less = async (source, root, options, resolvers, isNVue) => {
         };
         return { code: '', errors: [normalizedError], deps: [] };
     }
+    const map = result.map && JSON.parse(result.map);
+    if (map) {
+        delete map.sourcesContent;
+    }
     return {
         code: result.css.toString(),
+        map,
+        additionalMap,
         deps: result.imports,
         errors: [],
     };
@@ -752,29 +862,70 @@ const styl = async (source, root, options) => {
     const nodeStylus = loadPreprocessor("stylus" /* 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
-    source = await getSource(source, options.filename, options.additionalData, '\n');
+    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));
     try {
-        const ref = nodeStylus(source, options);
-        // if (map) ref.set('sourcemap', { inline: false, comment: false })
+        const ref = nodeStylus(content, options);
+        if (options.enableSourcemap) {
+            ref.set('sourcemap', {
+                comment: false,
+                inline: false,
+                basePath: root,
+            });
+        }
         const result = ref.render();
         // Concat imports deps with computed deps
         const deps = [...ref.deps(), ...importsDeps];
-        return { code: result, errors: [], deps };
+        // @ts-expect-error sourcemap exists
+        const map = ref.sourcemap;
+        return {
+            code: result,
+            map: formatStylusSourceMap(map, root),
+            additionalMap,
+            errors: [],
+            deps,
+        };
     }
     catch (e) {
         return { code: '', errors: [e], deps: [] };
     }
 };
-function getSource(source, filename, additionalData, sep = '') {
+function formatStylusSourceMap(mapBefore, root) {
+    if (!mapBefore)
+        return undefined;
+    const map = { ...mapBefore };
+    const resolveFromRoot = (p) => (0, utils_1.normalizePath)(path_1.default.resolve(root, p));
+    if (map.file) {
+        map.file = resolveFromRoot(map.file);
+    }
+    map.sources = map.sources.map(resolveFromRoot);
+    return map;
+}
+async function getSource(source, filename, additionalData, enableSourcemap, sep = '') {
     if (!additionalData)
-        return source;
+        return { content: source };
     if (typeof additionalData === 'function') {
-        return additionalData(source, filename);
+        const newContent = await additionalData(source, filename);
+        if (typeof newContent === 'string') {
+            return { content: newContent };
+        }
+        return newContent;
+    }
+    if (!enableSourcemap) {
+        return { content: additionalData + sep + source };
     }
-    return additionalData + sep + source;
+    const ms = new magic_string_1.default(source);
+    ms.appendLeft(0, sep);
+    ms.appendLeft(0, additionalData);
+    const map = ms.generateMap({ hires: true });
+    map.file = filename;
+    map.sources = [filename];
+    return {
+        content: ms.toString(),
+        map,
+    };
 }
 const preProcessors = Object.freeze({
     ["less" /* less */]: less,

package/dist/vite/plugins/vitejs/utils.d.ts

@@ -1,3 +1,4 @@
+import type { DecodedSourceMap, RawSourceMap } from '@ampproject/remapping';
 export declare function slash(p: string): string;
 export declare const bareImportRE: RegExp;
 export declare const deepImportRE: RegExp;
@@ -10,6 +11,7 @@ export declare const externalRE: RegExp;
 export declare const isExternalUrl: (url: string) => boolean;
 export declare const dataUrlRE: RegExp;
 export declare const isDataUrl: (url: string) => boolean;
+export declare const multilineCommentsRE: RegExp;
 export declare function asyncReplace(input: string, re: RegExp, replacer: (match: RegExpExecArray) => string | Promise<string>): Promise<string>;
 export declare function isObject(value: unknown): value is Record<string, any>;
 export declare function pad(source: string, n?: number): string;
@@ -26,4 +28,5 @@ interface ImageCandidate {
     descriptor: string;
 }
 export declare function processSrcSet(srcs: string, replacer: (arg: ImageCandidate) => Promise<string>): Promise<string>;
+export declare function combineSourcemaps(filename: string, sourcemapList: Array<DecodedSourceMap | RawSourceMap>, excludeContent?: boolean): RawSourceMap;
 export {};

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

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processSrcSet = exports.generateCodeFrame = exports.posToNumber = exports.pad = exports.isObject = exports.asyncReplace = exports.isDataUrl = exports.dataUrlRE = exports.isExternalUrl = exports.externalRE = exports.cleanUrl = exports.hashRE = exports.queryRE = exports.normalizePath = exports.isWindows = exports.deepImportRE = exports.bareImportRE = exports.slash = void 0;
+exports.combineSourcemaps = exports.processSrcSet = exports.generateCodeFrame = exports.posToNumber = exports.pad = exports.isObject = exports.asyncReplace = exports.multilineCommentsRE = exports.isDataUrl = exports.dataUrlRE = exports.isExternalUrl = exports.externalRE = exports.cleanUrl = exports.hashRE = exports.queryRE = exports.normalizePath = exports.isWindows = exports.deepImportRE = exports.bareImportRE = exports.slash = void 0;
 /**
  * https://github.com/vitejs/vite/blob/main/packages/vite/src/node/utils.ts
  */
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const remapping_1 = __importDefault(require("@ampproject/remapping"));
 function slash(p) {
     return p.replace(/\\/g, '/');
 }
@@ -30,6 +31,7 @@ exports.isExternalUrl = isExternalUrl;
 exports.dataUrlRE = /^\s*data:/i;
 const isDataUrl = (url) => exports.dataUrlRE.test(url);
 exports.isDataUrl = isDataUrl;
+exports.multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm;
 async function asyncReplace(input, re, replacer) {
     let match;
     let remaining = input;
@@ -102,15 +104,17 @@ function generateCodeFrame(source, start = 0, end) {
 }
 exports.generateCodeFrame = generateCodeFrame;
 const escapedSpaceCharacters = /( |\\t|\\n|\\f|\\r)+/g;
+const imageSetUrlRE = /^(?:[\w\-]+\(.*?\)|'.*?'|".*?"|\S*)/;
 async function processSrcSet(srcs, replacer) {
     const imageCandidates = srcs
         .split(',')
         .map((s) => {
-        const [url, descriptor] = s
-            .replace(escapedSpaceCharacters, ' ')
-            .trim()
-            .split(' ', 2);
-        return { url, descriptor };
+        const src = s.replace(escapedSpaceCharacters, ' ').trim();
+        const [url] = imageSetUrlRE.exec(src) || [];
+        return {
+            url,
+            descriptor: src === null || src === void 0 ? void 0 : src.slice(url.length).trim(),
+        };
     })
         .filter(({ url }) => !!url);
     const ret = await Promise.all(imageCandidates.map(async ({ url, descriptor }) => {
@@ -127,3 +131,71 @@ async function processSrcSet(srcs, replacer) {
     return url;
 }
 exports.processSrcSet = processSrcSet;
+function escapeToLinuxLikePath(path) {
+    if (/^[A-Z]:/.test(path)) {
+        return path.replace(/^([A-Z]):\//, '/windows/$1/');
+    }
+    if (/^\/[^/]/.test(path)) {
+        return `/linux${path}`;
+    }
+    return path;
+}
+function unescapeToLinuxLikePath(path) {
+    if (path.startsWith('/linux/')) {
+        return path.slice('/linux'.length);
+    }
+    if (path.startsWith('/windows/')) {
+        return path.replace(/^\/windows\/([A-Z])\//, '$1:/');
+    }
+    return path;
+}
+// based on https://github.com/sveltejs/svelte/blob/abf11bb02b2afbd3e4cac509a0f70e318c306364/src/compiler/utils/mapped_code.ts#L221
+const nullSourceMap = {
+    names: [],
+    sources: [],
+    mappings: '',
+    version: 3,
+};
+function combineSourcemaps(filename, sourcemapList, excludeContent = true) {
+    if (sourcemapList.length === 0 ||
+        sourcemapList.every((m) => m.sources.length === 0)) {
+        return { ...nullSourceMap };
+    }
+    // hack for parse broken with normalized absolute paths on windows (C:/path/to/something).
+    // escape them to linux like paths
+    // also avoid mutation here to prevent breaking plugin's using cache to generate sourcemaps like vue (see #7442)
+    sourcemapList = sourcemapList.map((sourcemap) => {
+        const newSourcemaps = { ...sourcemap };
+        newSourcemaps.sources = sourcemap.sources.map((source) => source ? escapeToLinuxLikePath(source) : null);
+        if (sourcemap.sourceRoot) {
+            newSourcemaps.sourceRoot = escapeToLinuxLikePath(sourcemap.sourceRoot);
+        }
+        return newSourcemaps;
+    });
+    const escapedFilename = escapeToLinuxLikePath(filename);
+    // We don't declare type here so we can convert/fake/map as RawSourceMap
+    let map; //: SourceMap
+    let mapIndex = 1;
+    const useArrayInterface = sourcemapList.slice(0, -1).find((m) => m.sources.length !== 1) === undefined;
+    if (useArrayInterface) {
+        map = (0, remapping_1.default)(sourcemapList, () => null, excludeContent);
+    }
+    else {
+        map = (0, remapping_1.default)(sourcemapList[0], function loader(sourcefile) {
+            if (sourcefile === escapedFilename && sourcemapList[mapIndex]) {
+                return sourcemapList[mapIndex++];
+            }
+            else {
+                return null;
+            }
+        }, excludeContent);
+    }
+    if (!map.file) {
+        delete map.file;
+    }
+    // unescape the previous hack
+    map.sources = map.sources.map((source) => source ? unescapeToLinuxLikePath(source) : source);
+    map.file = filename;
+    return map;
+}
+exports.combineSourcemaps = combineSourcemaps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3040920220508001",
+  "version": "3.0.0-alpha-3040820220424004",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,11 +18,12 @@
     "url": "https://github.com/dcloudio/uni-app/issues"
   },
   "dependencies": {
+    "@ampproject/remapping": "^2.1.2",
     "@babel/core": "^7.17.9",
     "@babel/parser": "^7.17.9",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3040920220508001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3040920220508001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3040820220424004",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3040820220424004",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -32,7 +33,7 @@
     "@vue/compiler-sfc": "3.2.33",
     "@vue/server-renderer": "3.2.33",
     "@vue/shared": "3.2.33",
-    "autoprefixer": "^10.4.5",
+    "autoprefixer": "^10.4.7",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",
     "compare-versions": "^3.6.0",
@@ -59,13 +60,18 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
+    "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
+    "@types/estree": "^0.0.51",
     "@types/fs-extra": "^9.0.13",
     "@types/hash-sum": "^1.0.0",
     "@types/less": "^3.0.3",
     "@types/mime": "^2.0.3",
     "@types/module-alias": "^2.0.1",
+    "@types/resolve": "^1.20.2",
+    "@types/sass": "^1.43.1",
     "@types/stylus": "^0.48.36",
-    "postcss": "^8.4.12"
+    "postcss": "^8.4.13",
+    "vue": "3.2.33"
   }
 }