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

package/dist/hbx/log.js

@@ -43,7 +43,8 @@ if (typeof console !== 'undefined') {
     // overridedConsole('error', console.error, ZERO_WIDTH_CHAR.ERROR)
 }
 function formatAtFilename(filename, line, column) {
-    return `at ${picocolors_1.default.cyan((0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename.replace('\x00', '').split('?')[0])) +
+    const file = path_1.default.relative(process.env.UNI_INPUT_DIR, filename.replace('\x00', '').split('?')[0]);
+    return `at ${picocolors_1.default.cyan((0, utils_1.normalizePath)(file === 'pages-json-uts' ? 'pages.json' : file) +
         ':' +
         (line || 1) +
         ':' +

package/dist/json/app/pages/uniConfig.d.ts

@@ -1 +1,6 @@
 export declare function normalizeAppUniConfig(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;
+export declare function parseEntryPagePath(pagesJson: UniApp.PagesJson): {
+    entryPagePath: string;
+    entryPageQuery: string;
+    realEntryPagePath: string;
+};

package/dist/json/app/pages/uniConfig.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.normalizeAppUniConfig = void 0;
+exports.parseEntryPagePath = exports.normalizeAppUniConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const i18n_1 = require("../../../i18n");
 const manifest_1 = require("../../manifest");
@@ -70,3 +70,4 @@ function parseEntryPagePath(pagesJson) {
     }
     return res;
 }
+exports.parseEntryPagePath = parseEntryPagePath;

package/dist/json/index.d.ts

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

package/dist/json/index.js

@@ -14,12 +14,14 @@ 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.normalizeUniAppXAppPagesJson = void 0;
+exports.checkPagesJson = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
 __exportStar(require("./mp"), exports);
 __exportStar(require("./app"), exports);
 __exportStar(require("./json"), exports);
 __exportStar(require("./pages"), exports);
 __exportStar(require("./manifest"), exports);
 __exportStar(require("./theme"), exports);
-var uniAppX_1 = require("./uniAppX");
-Object.defineProperty(exports, "normalizeUniAppXAppPagesJson", { enumerable: true, get: function () { return uniAppX_1.normalizeUniAppXAppPagesJson; } });
+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; } });

package/dist/json/mp/pages.js

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

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

@@ -0,0 +1,9 @@
+export declare function checkPagesJson(jsonStr: string, inputDir: string): boolean;
+export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;
+/**
+ * TODO 应该闭包，通过globalThis赋值？
+ * @param pagesJson
+ * @param manifestJson
+ * @returns
+ */
+export declare function normalizeUniAppXAppConfig(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;

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

@@ -0,0 +1,206 @@
+"use strict";
+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;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const shared_1 = require("@vue/shared");
+const jsonc_parser_1 = require("jsonc-parser");
+const json_1 = require("../json");
+const pages_1 = require("../pages");
+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");
+function checkPagesJson(jsonStr, inputDir) {
+    if (!inputDir) {
+        return false;
+    }
+    const errors = [];
+    const root = (0, jsonc_parser_1.parseTree)(jsonStr, errors);
+    if (!root) {
+        if (errors.length) {
+            for (const error of errors) {
+                const { line, column } = (0, utils_2.offsetToLineColumn)(jsonStr, error.offset);
+                throw {
+                    name: 'SyntaxError',
+                    code: error.error,
+                    message: (0, jsonc_parser_1.printParseErrorCode)(error.error),
+                    loc: {
+                        start: { line, column },
+                    },
+                    offsetStart: error.offset,
+                    offsetEnd: error.offset + error.length,
+                };
+            }
+        }
+        return false;
+    }
+    const pagePathNodes = walkNodes(findRootNode(root, ['pages']));
+    findRootNode(root, ['subPackages', 'subpackages']).forEach((node) => {
+        const subPackageRoot = findSubPackageRoot(node);
+        if (subPackageRoot) {
+            findRootNode(node, ['pages']).forEach((subNode) => {
+                walkNodes(subNode.children ?? []).forEach((node) => {
+                    pagePathNodes.push({
+                        ...node,
+                        value: (0, utils_1.normalizePath)(path_1.default.join(subPackageRoot, node.value)),
+                    });
+                });
+            });
+        }
+    });
+    if (pagePathNodes.length) {
+        for (const node of pagePathNodes) {
+            const pagePath = node.value ?? '';
+            if (fs_1.default.existsSync(path_1.default.join(inputDir, pagePath + '.uvue')) ||
+                fs_1.default.existsSync(path_1.default.join(inputDir, pagePath + '.vue'))) {
+                continue;
+            }
+            const { line, column } = (0, utils_2.offsetToLineColumn)(jsonStr, node.offset);
+            throw {
+                name: 'CompilerError',
+                code: 'CompilerError',
+                message: `The page path "${pagePath}" does not exist`,
+                loc: {
+                    start: { line, column },
+                },
+                offsetStart: node.offset,
+                offsetEnd: node.offset + node.length,
+            };
+        }
+    }
+    return true;
+}
+exports.checkPagesJson = checkPagesJson;
+function findSubPackageRoot(node) {
+    const child = node.children?.find((child) => child.type === 'property' &&
+        child.children &&
+        child.children.find((child) => child.type === 'string' && child.value === 'root'));
+    if (child && child.children?.length === 2) {
+        return child.children[1].value;
+    }
+    return '';
+}
+function findRootNode(node, property) {
+    const { type, children } = node;
+    if (type === 'object' && children) {
+        const child = children.find((child) => child.type === 'property' &&
+            child.children &&
+            child.children.find((child) => child.type === 'string' && property.includes(child.value)));
+        if (child) {
+            const node = child.children.find((child) => child.type === 'array');
+            return node?.children ?? [];
+        }
+    }
+    return [];
+}
+function walkNodes(node) {
+    const pagePathNodes = [];
+    node.forEach((node) => walkNode(node, pagePathNodes));
+    return pagePathNodes;
+}
+function walkNode(node, pagePathNodes) {
+    const { type, children } = node;
+    if (type === 'property' && children && children.length === 2) {
+        const maybePagePathNode = children[0];
+        const maybePagePathValueNode = children[1];
+        if (maybePagePathNode.type === 'string' &&
+            maybePagePathNode.value === 'path' &&
+            maybePagePathValueNode.type === 'string' &&
+            (0, shared_1.isString)(maybePagePathValueNode.value)) {
+            pagePathNodes.push(maybePagePathValueNode);
+        }
+    }
+    if (children) {
+        children.forEach((node) => walkNode(node, pagePathNodes));
+    }
+}
+function normalizeUniAppXAppPagesJson(jsonStr) {
+    checkPagesJson(jsonStr, process.env.UNI_INPUT_DIR);
+    const pagesJson = {
+        pages: [],
+        globalStyle: {},
+    };
+    let userPagesJson = {
+        pages: [],
+        globalStyle: {},
+    };
+    // preprocess
+    try {
+        userPagesJson = (0, json_1.parseJson)(jsonStr, true);
+    }
+    catch (e) {
+        console.error(`[vite] Error: pages.json parse failed.\n`, jsonStr, e);
+    }
+    // pages
+    (0, pages_1.validatePages)(userPagesJson, jsonStr);
+    userPagesJson.subPackages =
+        userPagesJson.subPackages || userPagesJson.subpackages;
+    // subPackages
+    if (userPagesJson.subPackages) {
+        userPagesJson.pages.push(...normalizeSubPackages(userPagesJson.subPackages));
+    }
+    pagesJson.pages = userPagesJson.pages;
+    // pageStyle
+    normalizePages(pagesJson.pages);
+    // globalStyle
+    pagesJson.globalStyle = normalizePageStyle(userPagesJson.globalStyle);
+    // tabBar
+    if (userPagesJson.tabBar) {
+        pagesJson.tabBar = userPagesJson.tabBar;
+    }
+    // condition
+    if (userPagesJson.condition) {
+        pagesJson.condition = userPagesJson.condition;
+    }
+    // uniIdRouter
+    if (userPagesJson.uniIdRouter) {
+        pagesJson.uniIdRouter = userPagesJson.uniIdRouter;
+    }
+    return pagesJson;
+}
+exports.normalizeUniAppXAppPagesJson = normalizeUniAppXAppPagesJson;
+function normalizeSubPackages(subPackages) {
+    const pages = [];
+    if ((0, shared_1.isArray)(subPackages)) {
+        subPackages.forEach(({ root, pages: subPages }) => {
+            if (root && subPages.length) {
+                subPages.forEach((subPage) => {
+                    subPage.path = (0, utils_1.normalizePath)(path_1.default.join(root, subPage.path));
+                    subPage.style = subPage.style;
+                    pages.push(subPage);
+                });
+            }
+        });
+    }
+    return pages;
+}
+function normalizePages(pages) {
+    pages.forEach((page) => {
+        page.style = normalizePageStyle(page.style);
+    });
+}
+function normalizePageStyle(pageStyle) {
+    if (pageStyle) {
+        (0, shared_1.extend)(pageStyle, pageStyle['app']);
+        (0, pages_1.removePlatformStyle)(pageStyle);
+        return pageStyle;
+    }
+    return {};
+}
+/**
+ * TODO 应该闭包，通过globalThis赋值？
+ * @param pagesJson
+ * @param manifestJson
+ * @returns
+ */
+function normalizeUniAppXAppConfig(pagesJson, manifestJson) {
+    return `const __uniConfig = ${(0, uniConfig_1.normalizeAppXUniConfig)(pagesJson, manifestJson)};
+const __uniRoutes = ${(0, uniRoutes_1.normalizeAppUniRoutes)(pagesJson)}.map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+
+`;
+}
+exports.normalizeUniAppXAppConfig = normalizeUniAppXAppConfig;

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

@@ -0,0 +1 @@
+export declare function normalizeAppXUniConfig(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeAppXUniConfig = void 0;
+const uniConfig_1 = require("../app/pages/uniConfig");
+function normalizeAppXUniConfig(pagesJson, manifestJson) {
+    const config = {
+        pages: [],
+        globalStyle: pagesJson.globalStyle,
+        appname: manifestJson.name || '',
+        compilerVersion: process.env.UNI_COMPILER_VERSION,
+        ...(0, uniConfig_1.parseEntryPagePath)(pagesJson),
+        tabBar: pagesJson.tabBar,
+        fallbackLocale: manifestJson.fallbackLocale,
+    };
+    // TODO 待支持分包
+    return JSON.stringify(config);
+}
+exports.normalizeAppXUniConfig = normalizeAppXUniConfig;

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

@@ -15,6 +15,10 @@ 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 offsetToLineColumn(source: string, offset: number): {
+    line: number;
+    column: number;
+};
 export declare function posToNumber(source: string, pos: number | {
     line: number;
     column: number;
@@ -30,7 +34,7 @@ export declare function locToStartAndEnd(source: string, loc: {
     };
 }): {
     start: number;
-    end: number;
+    end: number | undefined;
 };
 export declare function generateCodeFrame(source: string, start?: number | {
     line: 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.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.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,6 +56,24 @@ function pad(source, n = 2) {
     return lines.map((l) => ` `.repeat(n) + l).join(`\n`);
 }
 exports.pad = pad;
+function offsetToLineColumn(source, offset) {
+    const lines = source.split(splitRE);
+    let line = 1;
+    let column = 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++;
+        }
+    }
+    return { line, column };
+}
+exports.offsetToLineColumn = offsetToLineColumn;
 function posToNumber(source, pos) {
     if (typeof pos === 'number')
         return pos;
@@ -73,7 +91,9 @@ function posToNumberByLines(lines, line, column) {
 function locToStartAndEnd(source, loc) {
     const lines = source.split(splitRE);
     const start = posToNumberByLines(lines, loc.start.line, loc.start.column);
-    const end = posToNumberByLines(lines, loc.end.line, loc.end.column);
+    const end = loc.end
+        ? posToNumberByLines(lines, loc.end.line, loc.end.column)
+        : undefined;
     return { start, end };
 }
 exports.locToStartAndEnd = locToStartAndEnd;

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

@@ -1,4 +1,7 @@
 import type { ConfigEnv, ResolvedConfig, UserConfig } from 'vite';
+import { RollupError } from 'rollup';
+import { CompilerError } from '@vue/compiler-sfc';
 export declare function withSourcemap(config: ResolvedConfig): boolean;
 export declare function isInHybridNVue(config: UserConfig | ResolvedConfig): boolean;
 export declare function isSsr(command: ConfigEnv['command'], config: UserConfig | ResolvedConfig): boolean;
+export declare function createRollupError(plugin: string, id: string, error: CompilerError | SyntaxError, source?: string): RollupError;

package/dist/vite/utils/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSsr = exports.isInHybridNVue = exports.withSourcemap = void 0;
+exports.createRollupError = exports.isSsr = exports.isInHybridNVue = exports.withSourcemap = void 0;
+const utils_1 = require("../plugins/vitejs/utils");
 function withSourcemap(config) {
     if (config.command === 'serve') {
         return true;
@@ -22,3 +23,31 @@ function isSsr(command, config) {
     return false;
 }
 exports.isSsr = isSsr;
+function createRollupError(plugin, id, error, source) {
+    const { message, name, stack } = error;
+    const rollupError = {
+        id,
+        plugin,
+        message,
+        name,
+        stack,
+    };
+    if ('code' in error && error.loc) {
+        rollupError.loc = {
+            file: id,
+            line: error.loc.start.line,
+            column: error.loc.start.column,
+        };
+        if (source && source.length > 0) {
+            if ('offsetStart' in error && 'offsetEnd' in error) {
+                rollupError.frame = (0, utils_1.generateCodeFrame)(source, error.offsetStart, error.offsetEnd).replace(/\t/g, ' ');
+            }
+            else {
+                const { start, end } = (0, utils_1.locToStartAndEnd)(source, error.loc);
+                rollupError.frame = (0, utils_1.generateCodeFrame)(source, start, end).replace(/\t/g, ' ');
+            }
+        }
+    }
+    return rollupError;
+}
+exports.createRollupError = createRollupError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3090820231120001",
+  "version": "3.0.0-alpha-3090920231203001",
   "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-3090820231120001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3090820231120001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3090920231203001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3090920231203001",
     "@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-3090820231120001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3090920231203001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",

package/dist/json/uniAppX.d.ts

@@ -1 +0,0 @@
-export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;

package/dist/json/uniAppX.js

@@ -1,79 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeUniAppXAppPagesJson = void 0;
-const path_1 = __importDefault(require("path"));
-const shared_1 = require("@vue/shared");
-const json_1 = require("./json");
-const pages_1 = require("./pages");
-const utils_1 = require("../utils");
-function normalizeUniAppXAppPagesJson(jsonStr) {
-    const pagesJson = {
-        pages: [],
-        globalStyle: {},
-    };
-    let userPagesJson = {
-        pages: [],
-        globalStyle: {},
-    };
-    // preprocess
-    try {
-        userPagesJson = (0, json_1.parseJson)(jsonStr, true);
-    }
-    catch (e) {
-        console.error(`[vite] Error: pages.json parse failed.\n`, jsonStr, e);
-    }
-    // pages
-    (0, pages_1.validatePages)(userPagesJson, jsonStr);
-    userPagesJson.subPackages =
-        userPagesJson.subPackages || userPagesJson.subpackages;
-    // subPackages
-    if (userPagesJson.subPackages) {
-        userPagesJson.pages.push(...normalizeSubPackages(userPagesJson.subPackages));
-    }
-    pagesJson.pages = userPagesJson.pages;
-    // pageStyle
-    normalizePages(pagesJson.pages);
-    // globalStyle
-    pagesJson.globalStyle = normalizePageStyle(userPagesJson.globalStyle);
-    // tabBar
-    if (userPagesJson.tabBar) {
-        pagesJson.tabBar = userPagesJson.tabBar;
-    }
-    // condition
-    if (userPagesJson.condition) {
-        pagesJson.condition = userPagesJson.condition;
-    }
-    return pagesJson;
-}
-exports.normalizeUniAppXAppPagesJson = normalizeUniAppXAppPagesJson;
-function normalizeSubPackages(subPackages) {
-    const pages = [];
-    if ((0, shared_1.isArray)(subPackages)) {
-        subPackages.forEach(({ root, pages: subPages }) => {
-            if (root && subPages.length) {
-                subPages.forEach((subPage) => {
-                    subPage.path = (0, utils_1.normalizePath)(path_1.default.join(root, subPage.path));
-                    subPage.style = subPage.style;
-                    pages.push(subPage);
-                });
-            }
-        });
-    }
-    return pages;
-}
-function normalizePages(pages) {
-    pages.forEach((page) => {
-        page.style = normalizePageStyle(page.style);
-    });
-}
-function normalizePageStyle(pageStyle) {
-    if (pageStyle) {
-        (0, shared_1.extend)(pageStyle, pageStyle['app']);
-        (0, pages_1.removePlatformStyle)(pageStyle);
-        return pageStyle;
-    }
-    return {};
-}