@dcloudio/uni-cli-shared 3.0.0-alpha-3040520220408002 → 3.0.0-alpha-3040620220415001

package/dist/easycom.js

@@ -88,7 +88,7 @@ function initEasycom({ dirs, rootDir, custom, extensions = ['.vue', '.jsx', '.ts
         Object.keys(custom).forEach((name) => {
             const componentPath = custom[name];
             easycomsObj[name] = componentPath.startsWith('@/')
-                ? (0, utils_1.normalizePath)(path_1.default.join(rootDir, componentPath.substr(2)))
+                ? (0, utils_1.normalizePath)(path_1.default.join(rootDir, componentPath.slice(2)))
                 : componentPath;
         });
     }

package/dist/hbx/log.d.ts

@@ -1,4 +1,4 @@
-import { LogErrorOptions } from 'vite';
+import type { LogErrorOptions } from 'vite';
 import { Formatter } from '../logs/format';
 export declare function formatAtFilename(filename: string, line?: number, column?: number): string;
 export declare const h5ServeFormatter: Formatter;

package/dist/hbx/log.js

@@ -4,9 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = exports.formatAtFilename = void 0;
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("picocolors"));
 const utils_1 = require("../utils");
+const constants_1 = require("../constants");
+const ast_1 = require("../vite/utils/ast");
+const utils_2 = require("../vite/plugins/vitejs/utils");
 const SIGNAL_H5_LOCAL = ' > Local:';
 const SIGNAL_H5_NETWORK = ' > Network:';
 const networkLogs = [];
@@ -75,6 +79,23 @@ 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 &&
+            err.hook === 'transform' &&
+            err.plugin === 'rollup-plugin-dynamic-import-variables' &&
+            err.id &&
+            constants_1.EXTNAME_VUE_RE.test(err.id)) {
+            try {
+                const ast = (0, ast_1.parseVue)(fs_1.default.readFileSync(err.id, 'utf8'), []);
+                const scriptNode = ast.children.find((node) => node.type === 1 /* ELEMENT */ && node.tag === 'script');
+                if (scriptNode) {
+                    const scriptLoc = scriptNode.loc;
+                    args.push(picocolors_1.default.yellow(pad((0, utils_2.generateCodeFrame)(scriptLoc.source, err.loc))));
+                    // correct error location
+                    err.loc.line = scriptLoc.start.line + err.loc.line - 1;
+                }
+            }
+            catch (e) { }
+        }
     }
     else {
         args.push(picocolors_1.default.red(err.message));

package/dist/resolve.d.ts

@@ -3,4 +3,5 @@ export declare function relativeFile(from: string, to: string): string;
 export declare const resolveMainPathOnce: (inputDir: string) => string;
 export declare function getBuiltInPaths(): string[];
 export declare function resolveBuiltIn(path: string): string;
+export declare function resolveVueI18nRuntime(): string;
 export declare function resolveComponentsLibPath(): string;

package/dist/resolve.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveComponentsLibPath = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
+exports.resolveComponentsLibPath = exports.resolveVueI18nRuntime = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
@@ -46,7 +46,7 @@ function resolveNodeModulePath(modulePath) {
     }
     const index = modulePath.lastIndexOf('node_modules');
     if (index > -1) {
-        nodeModulesPaths.push(path_1.default.join(modulePath.substr(0, index), 'node_modules'));
+        nodeModulesPaths.push(path_1.default.join(modulePath.slice(0, index), 'node_modules'));
     }
     return nodeModulesPaths;
 }
@@ -87,6 +87,10 @@ function resolveBuiltIn(path) {
     return require.resolve(path, { paths: getBuiltInPaths() });
 }
 exports.resolveBuiltIn = resolveBuiltIn;
+function resolveVueI18nRuntime() {
+    return path_1.default.resolve(__dirname, '../lib/vue-i18n/dist/vue-i18n.runtime.esm-bundler.js');
+}
+exports.resolveVueI18nRuntime = resolveVueI18nRuntime;
 let componentsLibPath = '';
 function resolveComponentsLibPath() {
     if (!componentsLibPath) {

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

@@ -40,6 +40,7 @@ export declare function cssPostPlugin(config: ResolvedConfig, { chunkCssFilename
 }): Plugin;
 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;

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.minifyCSS = exports.cssUrlRE = exports.cssPostPlugin = exports.cssPlugin = exports.isDirectCSSRequest = exports.isCSSRequest = exports.commonjsProxyRE = exports.cssLangRE = void 0;
+exports.hoistAtRules = exports.minifyCSS = exports.cssUrlRE = 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"));
@@ -35,6 +35,7 @@ const postcss_load_config_1 = __importDefault(require("postcss-load-config"));
 const pluginutils_1 = require("@rollup/pluginutils");
 const utils_1 = require("../utils");
 const asset_1 = require("./asset");
+const magic_string_1 = __importDefault(require("magic-string"));
 const esbuild_1 = require("esbuild");
 const preprocess_1 = require("../../../../preprocess");
 const constants_1 = require("../../../../constants");
@@ -179,6 +180,11 @@ function cssPostPlugin(config, { chunkCssFilename, chunkCssCode, }) {
                 css = css.replace(asset_1.assetUrlRE, (_, fileHash, postfix = '') => {
                     return (0, utils_1.normalizePath)(path_1.default.relative(path_1.default.dirname(filename), (0, asset_1.getAssetFilename)(fileHash, config) + postfix));
                 });
+                // only external @imports and @charset should exist at this point
+                // hoist them to the top of the CSS chunk per spec (#1845 and #6333)
+                if (css.includes('@import') || css.includes('@charset')) {
+                    css = await hoistAtRules(css);
+                }
                 if (minify && config.build.minify) {
                     css = await minifyCSS(css, config);
                 }
@@ -503,34 +509,51 @@ async function doUrlReplace(rawUrl, matched, replacer) {
     return `url(${wrap}${await replacer(rawUrl)}${wrap})`;
 }
 async function minifyCSS(css, config) {
-    const { code, warnings } = await (0, esbuild_1.transform)(css, {
-        loader: 'css',
-        minify: true,
-        target: config.build.cssTarget || undefined,
-    });
-    if (warnings.length) {
-        const msgs = await (0, esbuild_1.formatMessages)(warnings, { kind: 'warning' });
-        config.logger.warn(picocolors_1.default.yellow(`warnings when minifying css:\n${msgs.join('\n')}`));
+    try {
+        const { code, warnings } = await (0, esbuild_1.transform)(css, {
+            loader: 'css',
+            minify: true,
+            target: config.build.cssTarget || undefined,
+        });
+        if (warnings.length) {
+            const msgs = await (0, esbuild_1.formatMessages)(warnings, { kind: 'warning' });
+            config.logger.warn(picocolors_1.default.yellow(`warnings when minifying css:\n${msgs.join('\n')}`));
+        }
+        return code;
+    }
+    catch (e) {
+        if (e.errors) {
+            const msgs = await (0, esbuild_1.formatMessages)(e.errors, { kind: 'error' });
+            e.frame = '\n' + msgs.join('\n');
+            e.loc = e.errors[0].location;
+        }
+        throw e;
     }
-    return code;
 }
 exports.minifyCSS = minifyCSS;
-const AtImportHoistPlugin = () => {
-    return {
-        postcssPlugin: 'vite-hoist-at-imports',
-        Once(root) {
-            const imports = [];
-            root.walkAtRules((rule) => {
-                if (rule.name === 'import') {
-                    // record in reverse so that can simply prepend to preserve order
-                    imports.unshift(rule);
-                }
-            });
-            imports.forEach((i) => root.prepend(i));
-        },
-    };
-};
-AtImportHoistPlugin.postcss = true;
+async function hoistAtRules(css) {
+    const s = new magic_string_1.default(css);
+    // #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 '';
+    });
+    // #6333
+    // CSS @charset must be the top-first in the file, hoist the first to top
+    let foundCharset = false;
+    s.replace(/@charset\s*(?:"[^"]*"|'[^']*'|[^;]*).*?;/gm, (match) => {
+        if (!foundCharset) {
+            s.prepend(match);
+            foundCharset = true;
+        }
+        return '';
+    });
+    return s.toString();
+}
+exports.hoistAtRules = hoistAtRules;
 const loadedPreprocessors = {};
 function loadPreprocessor(lang, root) {
     var _a, _b;