@dcloudio/uni-cli-shared 3.0.0-alpha-3060820221027004 → 3.0.0-alpha-3060920221111002

package/dist/hbx/log.js

@@ -43,7 +43,7 @@ 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.split('?')[0])) +
+    return `at ${picocolors_1.default.cyan((0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename.replace('\x00', '').split('?')[0])) +
         ':' +
         (line || 1) +
         ':' +

package/dist/json/app/manifest/index.js

@@ -34,7 +34,7 @@ const theme_1 = require("../../theme");
 function normalizeAppManifestJson(userManifestJson, pagesJson) {
     const manifestJson = (0, merge_1.initRecursiveMerge)((0, defaultManifestJson_1.initDefaultManifestJson)(), userManifestJson);
     const { pages, globalStyle, tabBar } = (0, theme_1.initTheme)(manifestJson, pagesJson);
-    (0, shared_1.extend)(pagesJson, { pages, globalStyle, tabBar });
+    (0, shared_1.extend)(pagesJson, JSON.parse(JSON.stringify({ pages, globalStyle, tabBar })));
     (0, statusbar_1.initAppStatusbar)(manifestJson, pagesJson);
     (0, arguments_1.initArguments)(manifestJson, pagesJson);
     (0, plus_1.initPlus)(manifestJson, pagesJson);

package/dist/json/mp/pages.js

@@ -125,16 +125,19 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
     if (networkTimeout) {
         appJson.networkTimeout = networkTimeout;
     }
-    if (darkmode) {
-        appJson.darkmode = true;
-        appJson.themeLocation = 'theme.json';
-    }
-    else {
-        const manifestJson = (0, manifest_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
+    const manifestJson = (0, manifest_1.getPlatformManifestJsonOnce)();
+    if (!darkmode) {
         const { pages, window, tabBar } = (0, theme_1.initTheme)(manifestJson, appJson);
-        (0, shared_1.extend)(appJson, { pages, window, tabBar });
+        (0, shared_1.extend)(appJson, JSON.parse(JSON.stringify({ pages, window, tabBar })));
+        delete appJson.darkmode;
+        delete appJson.themeLocation;
         pageJsons = (0, theme_1.initTheme)(manifestJson, pageJsons);
     }
+    else {
+        const themeLocation = manifestJson.themeLocation || 'theme.json';
+        if ((0, theme_1.hasThemeJson)(path_1.default.join(process.env.UNI_INPUT_DIR, themeLocation)))
+            appJson.themeLocation = themeLocation;
+    }
     return {
         appJson,
         pageJsons,

package/dist/json/theme.d.ts

@@ -1,3 +1,4 @@
+export declare function hasThemeJson(themeLocation: string): boolean;
 export declare const parseThemeJson: (themeLocation?: string) => UniApp.ThemeJson;
 export declare const normalizeThemeConfigOnce: (manifestJsonPlatform?: Record<string, any>) => UniApp.ThemeJson;
 export declare function initTheme<T extends object>(manifestJson: Record<string, any>, pagesJson: T): T;

package/dist/json/theme.js

@@ -3,17 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initTheme = exports.normalizeThemeConfigOnce = exports.parseThemeJson = void 0;
+exports.initTheme = exports.normalizeThemeConfigOnce = exports.parseThemeJson = exports.hasThemeJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const json_1 = require("./json");
 const uni_shared_1 = require("@dcloudio/uni-shared");
+function hasThemeJson(themeLocation) {
+    if (!fs_1.default.existsSync(themeLocation)) {
+        return false;
+    }
+    return true;
+}
+exports.hasThemeJson = hasThemeJson;
 const parseThemeJson = (themeLocation = 'theme.json') => {
     if (!themeLocation || !process.env.UNI_INPUT_DIR) {
         return {};
     }
     themeLocation = path_1.default.join(process.env.UNI_INPUT_DIR, themeLocation);
-    if (!fs_1.default.existsSync(themeLocation)) {
+    if (!hasThemeJson(themeLocation)) {
         return {};
     }
     const jsonStr = fs_1.default.readFileSync(themeLocation, 'utf8');

package/dist/mp/plugin.js

@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyMiniProgramThemeJson = exports.copyMiniProgramPluginJson = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const json_1 = require("../json/json");
 const manifest_1 = require("../json/manifest");
 exports.copyMiniProgramPluginJson = {
@@ -15,12 +20,13 @@ exports.copyMiniProgramPluginJson = {
 const copyMiniProgramThemeJson = () => {
     if (!process.env.UNI_INPUT_DIR)
         return [];
-    const manifestJson = (0, manifest_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR)[process.env.UNI_PLATFORM] || {};
-    return (manifestJson.darkmode && manifestJson.themeLocation) ||
-        (manifestJson.themeLocation = 'theme.json')
-        ? [
+    const manifestJson = (0, manifest_1.getPlatformManifestJsonOnce)();
+    const themeLocation = manifestJson.themeLocation || 'theme.json';
+    const hasThemeJson = fs_1.default.existsSync(path_1.default.resolve(process.env.UNI_INPUT_DIR, themeLocation));
+    if (hasThemeJson) {
+        return [
             {
-                src: [manifestJson.themeLocation],
+                src: [(manifestJson.themeLocation = themeLocation)],
                 get dest() {
                     return process.env.UNI_OUTPUT_DIR;
                 },
@@ -28,7 +34,8 @@ const copyMiniProgramThemeJson = () => {
                     return JSON.stringify((0, json_1.parseJson)(source.toString(), true), null, 2);
                 },
             },
-        ]
-        : [];
+        ];
+    }
+    return [];
 };
 exports.copyMiniProgramThemeJson = copyMiniProgramThemeJson;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060820221027004",
+  "version": "3.0.0-alpha-3060920221111002",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.19.6",
     "@babel/parser": "^7.19.6",
     "@babel/types": "^7.20.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3060820221027004",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060820221027004",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060920221111002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060920221111002",
     "@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-3060820221027004",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060920221111002",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",