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

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, } from './uni-x';

package/dist/json/index.js

@@ -14,12 +14,13 @@ 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.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; } });

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,8 @@
+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/{uniAppX.js → uni-x/index.js}

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeUniAppXAppPagesJson = void 0;
+exports.normalizeUniAppXAppConfig = 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");
+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");
 function normalizeUniAppXAppPagesJson(jsonStr) {
     const pagesJson = {
         pages: [],
@@ -46,6 +48,10 @@ function normalizeUniAppXAppPagesJson(jsonStr) {
     if (userPagesJson.condition) {
         pagesJson.condition = userPagesJson.condition;
     }
+    // uniIdRouter
+    if (userPagesJson.uniIdRouter) {
+        pagesJson.uniIdRouter = userPagesJson.uniIdRouter;
+    }
     return pagesJson;
 }
 exports.normalizeUniAppXAppPagesJson = normalizeUniAppXAppPagesJson;
@@ -77,3 +83,16 @@ function normalizePageStyle(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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3090820231120001",
+  "version": "3.0.0-alpha-3090920231127001",
   "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-3090920231127001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3090920231127001",
     "@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-3090920231127001",
     "@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;