@dcloudio/uni-cli-shared 3.0.0-alpha-1000920260615733 → 3.0.0-alpha-1000920260626810

package/dist/hbx/index.d.ts

@@ -1,5 +1,5 @@
 export { formatAtFilename, createErrorWithBlockFlag } from './log';
 export * from './env';
 export { initModuleAlias, installHBuilderXPlugin, formatInstallHBuilderXPluginTips, } from './alias';
-export declare function uniHBuilderXConsolePlugin(method?: string): import("vite").Plugin<any>;
+export declare function uniHBuilderXConsolePlugin(method?: string): import("vite/dist/node").Plugin<any>;
 export declare function isEnableConsole(): boolean;

package/dist/i18n.js

@@ -47,36 +47,51 @@ function isUniAppLocaleFile(filepath) {
     return localeJsonRE.test(path_1.default.basename(filepath));
 }
 exports.isUniAppLocaleFile = isUniAppLocaleFile;
+const localeJsonCache = new Map();
 function parseLocaleJson(filepath) {
+    const { mtimeMs, size } = fs_1.default.statSync(filepath);
+    const cached = localeJsonCache.get(filepath);
+    if (cached && cached.mtimeMs === mtimeMs && cached.size === size) {
+        return cached.json;
+    }
     let jsonObj = (0, json_1.parseJson)(fs_1.default.readFileSync(filepath, 'utf8'), false, filepath);
     if (isUniAppLocaleFile(filepath)) {
         jsonObj = jsonObj.common || {};
     }
+    localeJsonCache.set(filepath, { mtimeMs, size, json: jsonObj });
     return jsonObj;
 }
+const localeFilesCache = new Map();
 function getLocaleFiles(cwd) {
-    return (0, fast_glob_1.sync)('*.json', { cwd, absolute: true });
+    let mtimeMs;
+    try {
+        mtimeMs = fs_1.default.statSync(cwd).mtimeMs;
+    }
+    catch {
+        return [];
+    }
+    const cached = localeFilesCache.get(cwd);
+    if (cached && cached.mtimeMs === mtimeMs) {
+        return cached.files;
+    }
+    const files = (0, fast_glob_1.sync)('*.json', { cwd, absolute: true });
+    localeFilesCache.set(cwd, { mtimeMs, files });
+    return files;
 }
 exports.getLocaleFiles = getLocaleFiles;
 function initLocales(dir, withMessages = true) {
-    if (!fs_1.default.existsSync(dir)) {
-        return {};
-    }
-    return fs_1.default.readdirSync(dir).reduce((res, filename) => {
-        if (path_1.default.extname(filename) === '.json') {
-            try {
-                const locale = path_1.default
-                    .basename(filename)
-                    .replace(/(uni-app.)?(.*).json/, '$2');
-                if (withMessages) {
-                    (0, shared_1.extend)(res[locale] || (res[locale] = {}), parseLocaleJson(path_1.default.join(dir, filename)));
-                }
-                else {
-                    res[locale] = {};
-                }
+    return getLocaleFiles(dir).reduce((res, filepath) => {
+        const filename = path_1.default.basename(filepath);
+        try {
+            const locale = filename.replace(/(uni-app.)?(.*).json/, '$2');
+            if (withMessages) {
+                (0, shared_1.extend)(res[locale] || (res[locale] = {}), parseLocaleJson(filepath));
+            }
+            else {
+                res[locale] = {};
             }
-            catch (e) { }
         }
+        catch { }
         return res;
     }, {});
 }

package/dist/logs/console.js

@@ -21,13 +21,24 @@ function rewriteConsoleExpr(method, id, filename, code, sourceMap = false) {
         return {
             code: s.toString(),
             map: sourceMap
-                ? s.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() })
+                ? normalizeSourceMap(s.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() }))
                 : { mappings: '' },
         };
     }
     return { code, map: null };
 }
 exports.rewriteConsoleExpr = rewriteConsoleExpr;
+function normalizeSourceMap(map) {
+    return {
+        ...map,
+        file: map.file || '',
+        names: map.names || [],
+        sources: map.sources || [],
+        sourcesContent: map.sourcesContent || [],
+        toString: () => map.toString(),
+        toUrl: () => map.toUrl(),
+    };
+}
 function restoreConsoleExpr(code) {
     return code.replace(/(?:uni\.)?__f__\('([^']+)','at ([^:]+):(\d+)',/g, 'console.$1(');
 }

package/dist/mp/imports.d.ts

@@ -1,5 +1,6 @@
-import type { PluginContext } from 'rollup';
 import { type ImportSpecifier } from 'es-module-lexer';
+import type { Rolldown } from 'vite';
+type PluginContext = Rolldown.PluginContext;
 /**
  * 暂时没用
  * @param source
@@ -10,3 +11,4 @@ import { type ImportSpecifier } from 'es-module-lexer';
 export declare function findVueComponentImports(source: string, importer: string, resolve: PluginContext['resolve']): Promise<(ImportSpecifier & {
     i: string;
 })[]>;
+export {};

package/dist/mp/template.d.ts

@@ -1,6 +1,7 @@
-import type { EmittedAsset } from 'rollup';
+import type { Rolldown } from 'vite';
 import type { AttributeNode, DirectiveNode, ElementNode } from '@vue/compiler-core';
 import type { MiniProgramComponentsType } from '../json/mp/types';
+type EmittedAsset = Rolldown.EmittedAsset;
 type LazyElementFn = (node: ElementNode, context: {
     isMiniProgramComponent(name: string): MiniProgramComponentsType | undefined;
 }) => {

package/dist/mp/usingComponents.d.ts

@@ -1,5 +1,6 @@
 import { type ImportDeclaration, type Program } from '@babel/types';
-import type { PluginContext } from 'rollup';
+import type { Rolldown } from 'vite';
+type PluginContext = Rolldown.PluginContext;
 type BindingComponents = Record<string, {
     tag: string;
     type: 'unknown' | 'setup' | 'self';

package/dist/utils.d.ts

@@ -15,7 +15,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 | ("jsx" | "typescript" | "asyncDoExpressions" | "asyncGenerators" | "bigInt" | "classPrivateMethods" | "classPrivateProperties" | "classProperties" | "classStaticBlock" | "decimal" | "decorators-legacy" | "deferredImportEvaluation" | "decoratorAutoAccessors" | "destructuringPrivate" | "doExpressions" | "dynamicImport" | "explicitResourceManagement" | "exportDefaultFrom" | "exportNamespaceFrom" | "flow" | "flowComments" | "functionBind" | "functionSent" | "importMeta" | "logicalAssignment" | "importAssertions" | "importAttributes" | "importReflection" | "moduleBlocks" | "moduleStringNames" | "nullishCoalescingOperator" | "numericSeparator" | "objectRestSpread" | "optionalCatchBinding" | "optionalChaining" | "partialApplication" | "placeholders" | "privateIn" | "regexpUnicodeSets" | "sourcePhaseImports" | "throwExpressions" | "topLevelAwait" | "v8intrinsic" | "decorators" | "estree" | "moduleAttributes" | "optionalChainingAssign" | "pipelineOperator" | "recordAndTuple"))[];
 export declare function pathToGlob(pathString: string, glob: string, options?: {
     windows?: boolean;
     escape?: boolean;

package/dist/vite/cloud.js

@@ -131,18 +131,13 @@ function uniEncryptUniModulesPlugin() {
                     }
                     delete bundle[fileName];
                     const pkg = `uni_modules/${uniModuleId}/package.json`;
-                    bundle[pkg] = {
+                    this.emitFile({
                         type: 'asset',
                         fileName: pkg,
-                        name: pkg,
-                        names: [pkg],
-                        originalFileName: null,
-                        originalFileNames: [],
-                        needsCodeReference: false,
                         source: genUniModulesPackageJson(uniModuleId, process.env.UNI_INPUT_DIR, {
                             env: (0, uni_modules_cloud_1.initCheckEnv)(),
                         }),
-                    };
+                    });
                 }
                 else if (fileName.endsWith('.js')) {
                     if (isMp) {

package/dist/vite/index.d.ts

@@ -1,5 +1,4 @@
-import type { Plugin } from 'vite';
-import type { EmittedAsset } from 'rollup';
+import type { Plugin, Rolldown } from 'vite';
 import type { ParserOptions } from '@vue/compiler-core';
 import type { CompilerOptions, SFCStyleCompileOptions, TemplateCompiler } from '@vue/compiler-sfc';
 import type { UniViteCopyPluginOptions } from './plugins/copy';
@@ -17,7 +16,7 @@ interface UniVitePluginUniOptions {
     styleOptions?: Pick<SFCStyleCompileOptions, 'postcssPlugins'>;
     compilerOptions?: {
         miniProgram?: {
-            emitFile?: (emittedFile: EmittedAsset) => string;
+            emitFile?: (emittedFile: Rolldown.EmittedAsset) => string;
         };
         isNativeTag?: ParserOptions['isNativeTag'];
         isVoidTag?: ParserOptions['isVoidTag'];

package/dist/vite/plugins/console.js

@@ -29,32 +29,35 @@ function uniConsolePlugin(options) {
                 }
             }
         },
-        transform(code, id) {
-            if (dropConsole) {
-                return;
-            }
-            if ((0, filter_1.isRenderjs)(id) || (0, filter_1.isWxs)(id)) {
-                return {
-                    code: (0, console_1.restoreConsoleExpr)(code),
-                    map: null,
-                };
-            }
-            if (!filter(id))
-                return null;
-            if (!(0, utils_1.isJsFile)(id))
-                return null;
-            let { filename } = (0, utils_1.parseVueRequest)(id);
-            if (options.filename) {
-                filename = options.filename(filename);
-            }
-            if (!filename) {
-                return null;
-            }
-            if (!code.includes('console.')) {
-                return null;
-            }
-            debugConsole(id);
-            return (0, console_1.rewriteConsoleExpr)(options.method, id, filename, code, (0, utils_2.withSourcemap)(resolvedConfig));
+        transform: {
+            filter: { code: /console\.|__f__/ },
+            handler(code, id) {
+                if (dropConsole) {
+                    return;
+                }
+                if ((0, filter_1.isRenderjs)(id) || (0, filter_1.isWxs)(id)) {
+                    return {
+                        code: (0, console_1.restoreConsoleExpr)(code),
+                        map: null,
+                    };
+                }
+                if (!filter(id))
+                    return null;
+                if (!(0, utils_1.isJsFile)(id))
+                    return null;
+                let { filename } = (0, utils_1.parseVueRequest)(id);
+                if (options.filename) {
+                    filename = options.filename(filename);
+                }
+                if (!filename) {
+                    return null;
+                }
+                if (!code.includes('console.')) {
+                    return null;
+                }
+                debugConsole(id);
+                return (0, console_1.rewriteConsoleExpr)(options.method, id, filename, code, (0, utils_2.withSourcemap)(resolvedConfig));
+            },
         },
     };
 }

package/dist/vite/plugins/copy.js

@@ -11,6 +11,7 @@ function uniViteCopyPlugin({ targets, }) {
     let isFirstBuild = true;
     return {
         name: 'uni:copy',
+        enforce: 'pre',
         apply: 'build',
         configResolved(config) {
             resolvedConfig = config;

package/dist/vite/plugins/cssScoped.js

@@ -13,6 +13,7 @@ const utils_1 = require("../../utils");
 const utils_2 = require("../../vue/utils");
 const debugScoped = (0, debug_1.default)('uni:scoped');
 const SCOPED_RE = /<style\s[^>]*scoped[^>]*>/i;
+const VUE_SFC_ID_RE = /\.(?:vue|nvue|uvue)(?:$|\?(?!vue(?:&|=|$)))/;
 function addScoped(code) {
     return code.replace(/(<style\b[^><]*)>/gi, (str, $1) => {
         if ($1.includes('scoped')) {
@@ -32,14 +33,18 @@ function uniRemoveCssScopedPlugin(_ = { filter: () => false }) {
     return {
         name: 'uni:css-remove-scoped',
         enforce: 'pre',
-        transform(code, id) {
-            if (!(0, utils_2.isVueSfcFile)(id))
-                return null;
-            debugScoped(id);
-            return {
-                code: removeScoped(code),
-                map: null,
-            };
+        transform: {
+            // 仅 SFC 主模块需要移除 scoped，跳过 script/style/template 等子模块。
+            filter: { id: VUE_SFC_ID_RE },
+            handler(code, id) {
+                if (!(0, utils_2.isVueSfcFile)(id))
+                    return null;
+                debugScoped(id);
+                return {
+                    code: removeScoped(code),
+                    map: null,
+                };
+            },
         },
     };
 }
@@ -49,14 +54,18 @@ function uniCssScopedPlugin({ filter } = { filter: () => false }) {
     return {
         name: 'uni:css-scoped',
         enforce: 'pre',
-        transform(code, id) {
-            if (!filter(id))
-                return null;
-            debugScoped(id);
-            return {
-                code: addScoped(code),
-                map: null,
-            };
+        transform: {
+            // 仅 SFC 主模块需要补 scoped，跳过 script/style/template 等子模块。
+            filter: { id: VUE_SFC_ID_RE },
+            handler(code, id) {
+                if (!filter(id))
+                    return null;
+                debugScoped(id);
+                return {
+                    code: addScoped(code),
+                    map: null,
+                };
+            },
         },
         // 仅 h5
         handleHotUpdate(ctx) {

package/dist/vite/plugins/dynamicImportPolyfill.d.ts

@@ -1,2 +1,9 @@
 import type { Plugin } from 'vite';
-export declare function dynamicImportPolyfill(promise?: boolean): Plugin;
+interface DynamicImportPolyfillPlugin extends Plugin {
+    renderDynamicImport(): {
+        left: string;
+        right: string;
+    };
+}
+export declare function dynamicImportPolyfill(promise?: boolean): DynamicImportPolyfillPlugin;
+export {};

package/dist/vite/plugins/easycom.js

@@ -16,53 +16,56 @@ function uniEasycomPlugin(options) {
     const filter = (0, pluginutils_1.createFilter)(options.include, options.exclude);
     return {
         name: 'uni:app-easycom',
-        transform(code, id) {
-            if (!filter(id)) {
-                return;
-            }
-            const { filename } = (0, url_1.parseVueRequest)(id);
-            if (!constants_1.EXTNAME_VUE_TEMPLATE.includes(path_1.default.extname(filename))) {
-                return;
-            }
-            if (!code.includes('_resolveComponent')) {
-                return;
-            }
-            let i = 0;
-            const importDeclarations = [];
-            code = code.replace(/_resolveComponent\("(.+?)"(, true)?\)/g, (str, name) => {
-                if (name && !name.startsWith('_')) {
-                    const source = (0, easycom_1.matchEasycom)(name);
-                    if (source) {
-                        // 处理easycom组件优先级
-                        return (0, easycom_1.genResolveEasycomCode)(importDeclarations, str, (0, easycom_1.addImportDeclaration)(importDeclarations, `__easycom_${i++}`, source, source.includes('uts-proxy')
-                            ? (0, shared_1.capitalize)((0, shared_1.camelize)(name)) + 'Component'
-                            : source.includes('uni_helpers')
-                                ? (0, shared_1.capitalize)((0, shared_1.camelize)(name))
-                                : ''));
-                    }
-                    else {
-                        const utsCustomElement = (0, uts_1.getUTSCustomElement)(name);
-                        if (utsCustomElement) {
-                            (0, easycom_1.addImportDeclaration)(importDeclarations, '', utsCustomElement.source, '');
-                            return `'${name}'`;
+        transform: {
+            filter: { id: /\.(vue|uvue)(\?|$)/, code: /_resolveComponent/ },
+            handler(code, id) {
+                if (!filter(id)) {
+                    return;
+                }
+                const { filename } = (0, url_1.parseVueRequest)(id);
+                if (!constants_1.EXTNAME_VUE_TEMPLATE.includes(path_1.default.extname(filename))) {
+                    return;
+                }
+                if (!code.includes('_resolveComponent')) {
+                    return;
+                }
+                let i = 0;
+                const importDeclarations = [];
+                code = code.replace(/_resolveComponent\("(.+?)"(, true)?\)/g, (str, name) => {
+                    if (name && !name.startsWith('_')) {
+                        const source = (0, easycom_1.matchEasycom)(name);
+                        if (source) {
+                            // 处理easycom组件优先级
+                            return (0, easycom_1.genResolveEasycomCode)(importDeclarations, str, (0, easycom_1.addImportDeclaration)(importDeclarations, `__easycom_${i++}`, source, source.includes('uts-proxy')
+                                ? (0, shared_1.capitalize)((0, shared_1.camelize)(name)) + 'Component'
+                                : source.includes('uni_helpers')
+                                    ? (0, shared_1.capitalize)((0, shared_1.camelize)(name))
+                                    : ''));
                         }
-                    }
-                    if (process.env.UNI_APP_X === 'true') {
-                        if ((0, uni_shared_1.isAppUVueBuiltInEasyComponent)(name)) {
-                            // 内置easycom组件不传入self参数
-                            return str.replace(', true)', ')');
+                        else {
+                            const utsCustomElement = (0, uts_1.getUTSCustomElement)(name);
+                            if (utsCustomElement) {
+                                (0, easycom_1.addImportDeclaration)(importDeclarations, '', utsCustomElement.source, '');
+                                return `'${name}'`;
+                            }
+                        }
+                        if (process.env.UNI_APP_X === 'true') {
+                            if ((0, uni_shared_1.isAppUVueBuiltInEasyComponent)(name)) {
+                                // 内置easycom组件不传入self参数
+                                return str.replace(', true)', ')');
+                            }
                         }
                     }
+                    return str;
+                });
+                if (importDeclarations.length) {
+                    code = importDeclarations.join('') + code;
                 }
-                return str;
-            });
-            if (importDeclarations.length) {
-                code = importDeclarations.join('') + code;
-            }
-            return {
-                code,
-                map: null,
-            };
+                return {
+                    code,
+                    map: null,
+                };
+            },
         },
     };
 }