@dcloudio/uni-cli-shared 3.0.0-alpha-3090920231203001 → 3.0.0-alpha-3090920231207001

package/dist/json/index.d.ts

@@ -4,4 +4,4 @@ export * from './json';
 export * from './pages';
 export * from './manifest';
 export * from './theme';
-export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, checkPagesJson, } from './uni-x';
+export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, checkPagesJson, parseUniXFlexDirection, parseUniXSplashScreen, } from './uni-x';

package/dist/json/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkPagesJson = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
+exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.checkPagesJson = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
 __exportStar(require("./mp"), exports);
 __exportStar(require("./app"), exports);
 __exportStar(require("./json"), exports);
@@ -25,3 +25,5 @@ var uni_x_1 = require("./uni-x");
 Object.defineProperty(exports, "normalizeUniAppXAppPagesJson", { enumerable: true, get: function () { return uni_x_1.normalizeUniAppXAppPagesJson; } });
 Object.defineProperty(exports, "normalizeUniAppXAppConfig", { enumerable: true, get: function () { return uni_x_1.normalizeUniAppXAppConfig; } });
 Object.defineProperty(exports, "checkPagesJson", { enumerable: true, get: function () { return uni_x_1.checkPagesJson; } });
+Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return uni_x_1.parseUniXFlexDirection; } });
+Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return uni_x_1.parseUniXSplashScreen; } });

package/dist/json/uni-x/index.d.ts

@@ -1,3 +1,4 @@
+export { parseUniXFlexDirection, parseUniXSplashScreen } from './manifest';
 export declare function checkPagesJson(jsonStr: string, inputDir: string): boolean;
 export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;
 /**

package/dist/json/uni-x/index.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.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = exports.checkPagesJson = void 0;
+exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = exports.checkPagesJson = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -14,6 +14,9 @@ const utils_1 = require("../../utils");
 const uniRoutes_1 = require("../app/pages/uniRoutes");
 const uniConfig_1 = require("./uniConfig");
 const utils_2 = require("../../vite/plugins/vitejs/utils");
+var manifest_1 = require("./manifest");
+Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return manifest_1.parseUniXFlexDirection; } });
+Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return manifest_1.parseUniXSplashScreen; } });
 function checkPagesJson(jsonStr, inputDir) {
     if (!inputDir) {
         return false;

package/dist/json/uni-x/manifest.d.ts

@@ -0,0 +1,2 @@
+export declare function parseUniXFlexDirection(manifestJson: Record<string, any>): any;
+export declare function parseUniXSplashScreen(manifestJson: Record<string, any>): false | object;

package/dist/json/uni-x/manifest.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
+const shared_1 = require("@vue/shared");
+const flexDirs = ['row', 'row-reverse', 'column', 'column-reverse'];
+function parseUniXFlexDirection(manifestJson) {
+    const flexDir = manifestJson?.['uni-app-x']?.['flex-direction'];
+    if (flexDir && flexDirs.includes(flexDir)) {
+        return flexDir;
+    }
+    return 'column';
+}
+exports.parseUniXFlexDirection = parseUniXFlexDirection;
+function parseUniXSplashScreen(manifestJson) {
+    const splashScreen = manifestJson?.['app']?.['splashScreen'];
+    if ((0, shared_1.isPlainObject)(splashScreen)) {
+        return splashScreen;
+    }
+    return false;
+}
+exports.parseUniXSplashScreen = parseUniXSplashScreen;

package/dist/utils.d.ts

@@ -21,3 +21,5 @@ export declare function resolveSourceMapPath(outputDir?: string, platform?: UniA
 export declare function installDepTips(type: 'dependencies' | 'devDependencies', module: string, version?: string): string;
 export declare function isAppVue(filename: string): boolean;
 export declare function resolveAppVue(inputDir: string): string;
+export declare function parseImporter(importer: string): string;
+export declare function createResolveErrorMsg(source: string, importer: string): string;

package/dist/utils.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.resolveAppVue = exports.isAppVue = exports.installDepTips = exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.isArray = exports.capitalize = exports.camelize = exports.version = exports.hash = void 0;
+exports.createResolveErrorMsg = exports.parseImporter = exports.resolveAppVue = exports.isAppVue = exports.installDepTips = exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.isArray = exports.capitalize = exports.camelize = exports.version = exports.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -129,3 +129,15 @@ function resolveAppVue(inputDir) {
     return normalizePath(path_1.default.resolve(inputDir, 'App.vue'));
 }
 exports.resolveAppVue = resolveAppVue;
+function parseImporter(importer) {
+    importer = importer.split('?')[0];
+    if (path_1.default.isAbsolute(importer)) {
+        return normalizePath(path_1.default.relative(process.env.UNI_INPUT_DIR, importer));
+    }
+    return importer;
+}
+exports.parseImporter = parseImporter;
+function createResolveErrorMsg(source, importer) {
+    return `Could not resolve "${source}" from "${parseImporter(importer)}"`;
+}
+exports.createResolveErrorMsg = createResolveErrorMsg;

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

@@ -9,4 +9,4 @@ export * from './uts/uni_modules';
 export * from './uts/uvue';
 export { assetPlugin, parseAssets, getAssetHash } from './vitejs/plugins/asset';
 export { isCSSRequest, cssPlugin, cssPostPlugin, minifyCSS, cssLangRE, commonjsProxyRE, } from './vitejs/plugins/css';
-export { generateCodeFrame, locToStartAndEnd } from './vitejs/utils';
+export { generateCodeFrame, locToStartAndEnd, offsetToStartAndEnd, } from './vitejs/utils';

package/dist/vite/plugins/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.locToStartAndEnd = exports.generateCodeFrame = exports.commonjsProxyRE = exports.cssLangRE = exports.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.parseAssets = exports.assetPlugin = void 0;
+exports.offsetToStartAndEnd = exports.locToStartAndEnd = exports.generateCodeFrame = exports.commonjsProxyRE = exports.cssLangRE = exports.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.parseAssets = exports.assetPlugin = void 0;
 __exportStar(require("./cssScoped"), exports);
 __exportStar(require("./copy"), exports);
 __exportStar(require("./inject"), exports);
@@ -38,3 +38,4 @@ Object.defineProperty(exports, "commonjsProxyRE", { enumerable: true, get: funct
 var utils_1 = require("./vitejs/utils");
 Object.defineProperty(exports, "generateCodeFrame", { enumerable: true, get: function () { return utils_1.generateCodeFrame; } });
 Object.defineProperty(exports, "locToStartAndEnd", { enumerable: true, get: function () { return utils_1.locToStartAndEnd; } });
+Object.defineProperty(exports, "offsetToStartAndEnd", { enumerable: true, get: function () { return utils_1.offsetToStartAndEnd; } });

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

@@ -2,6 +2,7 @@ import { ExistingRawSourceMap, RollupError } from 'rollup';
 import { Plugin } from '../plugin';
 import { ResolvedConfig } from '../config';
 import * as Postcss from 'postcss';
+import { SFCDescriptor } from '@vue/compiler-sfc';
 export interface CSSOptions {
     /**
      * https://github.com/css-modules/postcss-modules
@@ -32,6 +33,7 @@ export declare const isDirectCSSRequest: (request: string) => boolean;
  */
 export declare function cssPlugin(config: ResolvedConfig, options?: {
     isAppX: boolean;
+    getDescriptor?(filename: string): SFCDescriptor | undefined;
 }): Plugin;
 /**
  * Plugin applied after user plugins

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

@@ -37,11 +37,15 @@ const utils_1 = require("../utils");
 const asset_1 = require("./asset");
 const magic_string_1 = __importDefault(require("magic-string"));
 const Postcss = __importStar(require("postcss"));
+const shared_1 = require("@vue/shared");
 const preprocess_1 = require("../../../../preprocess");
 const uniapp_1 = require("../../../../postcss/plugins/uniapp");
 const cleanString_1 = require("../cleanString");
-const shared_1 = require("@vue/shared");
 const constants_1 = require("../../../../constants");
+const utils_2 = require("../../../utils/utils");
+const compiler_core_1 = require("@vue/compiler-core");
+const utils_3 = require("../../../../utils");
+const utils_4 = require("../../../utils");
 const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 exports.cssLangRE = new RegExp(cssLangs);
 const cssModuleRE = new RegExp(`\\.module${cssLangs}`);
@@ -54,10 +58,46 @@ const isDirectCSSRequest = (request) => exports.cssLangRE.test(request) && direc
 exports.isDirectCSSRequest = isDirectCSSRequest;
 const cssModulesCache = new WeakMap();
 const postcssConfigCache = new WeakMap();
+function wrapResolve(resolve, code, source, getDescriptor) {
+    if (!source) {
+        return resolve;
+    }
+    return async (id, importer, aliasOnly, ssr) => {
+        try {
+            return await resolve(id, importer, aliasOnly, ssr);
+        }
+        catch (e) {
+            if (importer && getDescriptor) {
+                const { filename, query } = (0, utils_4.parseVueRequest)(importer);
+                // 仅处理 vue | uvue
+                if (query.vue &&
+                    query.type === 'style' &&
+                    'index' in query &&
+                    /\.[u]vue/.test(filename)) {
+                    const descriptor = getDescriptor(importer.split('?')[0]);
+                    if (descriptor) {
+                        const styleBlock = descriptor.styles[query.index];
+                        if (styleBlock) {
+                            code = descriptor.source;
+                            const offsetLine = styleBlock.loc.start.line - 1;
+                            source.start.line = source.start.line + offsetLine;
+                            source.end.line = source.end.line + offsetLine;
+                        }
+                    }
+                }
+            }
+            const error = (0, utils_2.createRollupError)('', importer || '', (0, compiler_core_1.createCompilerError)(0, { start: source.start, end: source.end, source: '' }, { 0: (0, utils_3.createResolveErrorMsg)(id, importer) }), code);
+            error.line = source.start.line;
+            error.column = source.start.column;
+            throw error;
+        }
+        return;
+    };
+}
 /**
  * Plugin applied before user plugins
  */
-function cssPlugin(config, options) {
+function cssPlugin(config, options = { isAppX: false }) {
     let server;
     let moduleCache;
     const resolveUrl = config.createResolver({
@@ -80,12 +120,12 @@ function cssPlugin(config, options) {
             if (!exports.cssLangRE.test(id) || exports.commonjsProxyRE.test(id)) {
                 return;
             }
-            const urlReplacer = async (url, importer) => {
+            const urlReplacer = async (url, importer, source) => {
                 if (url.startsWith('/') && !url.startsWith('//')) {
                     // /static/logo.png => @/static/logo.png
                     url = '@' + url;
                 }
-                const resolved = await resolveUrl(url, importer);
+                const resolved = await wrapResolve(resolveUrl, source?.input.css || raw, source, options.getDescriptor)(url, importer);
                 if (resolved) {
                     return (0, asset_1.fileToUrl)(resolved, config, options?.isAppX
                         ? {
@@ -602,7 +642,7 @@ const UrlRewritePostcssPlugin = (opts) => {
                 if (isCssUrl || isCssImageSet) {
                     const replacerForDeclaration = (rawUrl) => {
                         const importer = declaration.source?.input.file;
-                        return opts.replacer(rawUrl, importer);
+                        return opts.replacer(rawUrl, importer, declaration.source);
                     };
                     const rewriterToUse = isCssImageSet
                         ? rewriteCssImageSet

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

@@ -1,4 +1,5 @@
 import type { DecodedSourceMap, RawSourceMap } from '@ampproject/remapping';
+import { SourceLocation } from '@vue/compiler-core';
 export declare function slash(p: string): string;
 export declare const bareImportRE: RegExp;
 export declare const deepImportRE: RegExp;
@@ -15,6 +16,7 @@ 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;
+export declare function offsetToStartAndEnd(source: string, startOffset: number, endOffset: number): SourceLocation;
 export declare function offsetToLineColumn(source: string, offset: number): {
     line: number;
     column: number;

package/dist/vite/plugins/vitejs/utils.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.combineSourcemaps = exports.processSrcSet = exports.generateCodeFrame = exports.locToStartAndEnd = exports.posToNumber = exports.offsetToLineColumn = 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;
+exports.combineSourcemaps = exports.processSrcSet = exports.generateCodeFrame = exports.locToStartAndEnd = exports.posToNumber = exports.offsetToLineColumn = exports.offsetToStartAndEnd = 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
  */
@@ -56,22 +56,30 @@ function pad(source, n = 2) {
     return lines.map((l) => ` `.repeat(n) + l).join(`\n`);
 }
 exports.pad = pad;
-function offsetToLineColumn(source, offset) {
+function offsetToStartAndEnd(source, startOffset, endOffset) {
     const lines = source.split(splitRE);
-    let line = 1;
-    let column = 0;
+    return {
+        start: offsetToLineColumnByLines(lines, startOffset),
+        end: offsetToLineColumnByLines(lines, endOffset),
+        source: '',
+    };
+}
+exports.offsetToStartAndEnd = offsetToStartAndEnd;
+function offsetToLineColumnByLines(lines, offset) {
+    let currentOffset = 0;
     for (let i = 0; i < lines.length; i++) {
-        const lineLength = lines[i].length + 1;
-        if (offset <= lineLength) {
-            column = offset;
-            break;
-        }
-        else {
-            offset -= lineLength;
-            line++;
+        const lineLength = lines[i].length + 1; // Adding 1 for the newline character
+        if (currentOffset + lineLength > offset) {
+            const line = i + 1; // Line numbers start from 1
+            const column = offset - currentOffset; // Column numbers start from 0
+            return { line, column, offset };
         }
+        currentOffset += lineLength;
     }
-    return { line, column };
+    return { line: lines.length, column: lines[lines.length - 1].length, offset };
+}
+function offsetToLineColumn(source, offset) {
+    return offsetToLineColumnByLines(source.split(splitRE), offset);
 }
 exports.offsetToLineColumn = offsetToLineColumn;
 function posToNumber(source, pos) {
@@ -97,14 +105,22 @@ function locToStartAndEnd(source, loc) {
     return { start, end };
 }
 exports.locToStartAndEnd = locToStartAndEnd;
-function generateCodeFrame(source, start = 0, end) {
+function generateCodeFrame(source, start = 0, end = source.length) {
     start = posToNumber(source, start);
-    end = end || start;
-    const lines = source.split(splitRE);
+    // Split the content into individual lines but capture the newline sequence
+    // that separated each line. This is important because the actual sequence is
+    // needed to properly take into account the full line length for offset
+    // comparison
+    let lines = source.split(/(\r?\n)/);
+    // Separate the lines and newline sequences into separate arrays for easier referencing
+    const newlineSequences = lines.filter((_, idx) => idx % 2 === 1);
+    lines = lines.filter((_, idx) => idx % 2 === 0);
     let count = 0;
     const res = [];
     for (let i = 0; i < lines.length; i++) {
-        count += lines[i].length + 1;
+        count +=
+            lines[i].length +
+                ((newlineSequences[i] && newlineSequences[i].length) || 0);
         if (count >= start) {
             for (let j = i - range; j <= i + range || end > count; j++) {
                 if (j < 0 || j >= lines.length)
@@ -112,9 +128,10 @@ function generateCodeFrame(source, start = 0, end) {
                 const line = j + 1;
                 res.push(`${line}${' '.repeat(Math.max(3 - String(line).length, 0))}|  ${lines[j]}`);
                 const lineLength = lines[j].length;
+                const newLineSeqLength = (newlineSequences[j] && newlineSequences[j].length) || 0;
                 if (j === i) {
                     // push underline
-                    const pad = start - (count - lineLength) + 1;
+                    const pad = start - (count - (lineLength + newLineSeqLength));
                     const length = Math.max(1, end > count ? lineLength - pad : end - start);
                     res.push(`   |  ` + ' '.repeat(pad) + '^'.repeat(length));
                 }
@@ -123,7 +140,7 @@ function generateCodeFrame(source, start = 0, end) {
                         const length = Math.max(Math.min(end - count, lineLength), 1);
                         res.push(`   |  ` + '^'.repeat(length));
                     }
-                    count += lineLength + 1;
+                    count += lineLength + newLineSeqLength;
                 }
             }
             break;

package/dist/vite/utils/utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRollupError = exports.isSsr = exports.isInHybridNVue = exports.withSourcemap = void 0;
 const utils_1 = require("../plugins/vitejs/utils");
+const shared_1 = require("@vue/shared");
 function withSourcemap(config) {
     if (config.command === 'serve') {
         return true;
@@ -25,13 +26,12 @@ function isSsr(command, config) {
 exports.isSsr = isSsr;
 function createRollupError(plugin, id, error, source) {
     const { message, name, stack } = error;
-    const rollupError = {
+    const rollupError = (0, shared_1.extend)(new Error(message), {
         id,
         plugin,
-        message,
         name,
         stack,
-    };
+    });
     if ('code' in error && error.loc) {
         rollupError.loc = {
             file: id,
@@ -48,6 +48,15 @@ function createRollupError(plugin, id, error, source) {
             }
         }
     }
+    if (id) {
+        // 指定了id后，不让后续的rollup重写
+        Object.defineProperty(rollupError, 'id', {
+            get() {
+                return id;
+            },
+            set(_v) { },
+        });
+    }
     return rollupError;
 }
 exports.createRollupError = createRollupError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3090920231203001",
+  "version": "3.0.0-alpha-3090920231207001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.21.3",
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3090920231203001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3090920231207001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3090920231207001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3090920231203001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3090920231207001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",