@dcloudio/uni-cli-shared 3.0.0-4010420240430002 → 3.0.0-4020320240708001

package/dist/easycom.js

@@ -115,8 +115,18 @@ function initEasycom({ isX, dirs, rootDir, custom, extensions, }) {
                 if (path_1.default.isAbsolute(source) && source.startsWith(rootDir)) {
                     source = '@/' + (0, utils_1.normalizePath)(path_1.default.relative(rootDir, source));
                 }
+                let imported = '';
+                // 加密插件easycom类型导入
+                if (source.includes('?uts-proxy')) {
+                    const moduleId = path_1.default.basename(source.split('?uts-proxy')[0]);
+                    source = `uts.sdk.modules.${(0, shared_1.camelize)(moduleId)}`;
+                    imported = genUTSComponentPublicInstanceImported(rootDir, `@/uni_modules/${moduleId}/components/${tagName}/${tagName}`);
+                }
+                else {
+                    imported = genUTSComponentPublicInstanceImported(rootDir, source);
+                }
                 addUTSEasyComAutoImports(source, [
-                    genUTSComponentPublicInstanceImported(rootDir, source),
+                    imported,
                     genUTSComponentPublicInstanceIdent(tagName),
                 ]);
             });
@@ -164,7 +174,16 @@ function matchEasycom(tag) {
     return source;
 }
 exports.matchEasycom = matchEasycom;
-const isDir = (path) => fs_1.default.lstatSync(path).isDirectory();
+const isDir = (path) => {
+    const stat = fs_1.default.lstatSync(path);
+    if (stat.isDirectory()) {
+        return true;
+    }
+    else if (stat.isSymbolicLink()) {
+        return fs_1.default.lstatSync(fs_1.default.realpathSync(path)).isDirectory();
+    }
+    return false;
+};
 function initAutoScanEasycom(dir, rootDir, extensions) {
     if (!path_1.default.isAbsolute(dir)) {
         dir = path_1.default.resolve(rootDir, dir);
@@ -173,6 +192,12 @@ function initAutoScanEasycom(dir, rootDir, extensions) {
     if (!fs_1.default.existsSync(dir)) {
         return easycoms;
     }
+    const is_uni_modules = path_1.default.basename(path_1.default.resolve(dir, '../..')) === 'uni_modules';
+    const is_encrypt_uni_modules = // uni_modules模式不需要此逻辑
+     process.env.UNI_COMPILE_TARGET !== 'uni_modules' &&
+        is_uni_modules &&
+        fs_1.default.existsSync(path_1.default.resolve(dir, '../encrypt'));
+    const uni_modules_plugin_id = is_encrypt_uni_modules && path_1.default.basename(path_1.default.resolve(dir, '..'));
     fs_1.default.readdirSync(dir).forEach((name) => {
         const folder = path_1.default.resolve(dir, name);
         if (!isDir(folder)) {
@@ -184,7 +209,14 @@ function initAutoScanEasycom(dir, rootDir, extensions) {
         for (let i = 0; i < extensions.length; i++) {
             const ext = extensions[i];
             if (files.includes(name + ext)) {
-                easycoms[`^${name}$`] = `${importDir}/${name}${ext}`;
+                easycoms[`^${name}$`] = is_encrypt_uni_modules
+                    ? (0, utils_1.normalizePath)(path_1.default.join(rootDir, `uni_modules/${uni_modules_plugin_id}?${
+                    // android 走 proxy
+                    process.env.UNI_APP_X === 'true' &&
+                        process.env.UNI_UTS_PLATFORM === 'app-android'
+                        ? 'uts-proxy'
+                        : 'uni_helpers'}`))
+                    : `${importDir}/${name}${ext}`;
                 break;
             }
         }

package/dist/fs.js

@@ -7,12 +7,15 @@ exports.emptyDir = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 function emptyDir(dir, skip = []) {
-    for (const file of fs_1.default.readdirSync(dir)) {
-        if (skip.includes(file)) {
-            continue;
+    try {
+        for (const file of fs_1.default.readdirSync(dir)) {
+            if (skip.includes(file)) {
+                continue;
+            }
+            // node >= 14.14.0
+            fs_1.default.rmSync(path_1.default.resolve(dir, file), { recursive: true, force: true });
         }
-        // node >= 14.14.0
-        fs_1.default.rmSync(path_1.default.resolve(dir, file), { recursive: true, force: true });
     }
+    catch (e) { }
 }
 exports.emptyDir = emptyDir;

package/dist/hbx/log.js

@@ -110,7 +110,16 @@ exports.errorFormatter = {
 };
 function buildErrorMessage(err, args = [], includeStack = true) {
     if (err.plugin) {
+        const otherMsgs = [];
+        if (err.message.includes(': [plugin ')) {
+            const messages = err.message.split(': [plugin ');
+            err.message = messages[0];
+            messages.slice(1).forEach((msg) => {
+                otherMsgs.push(`[plugin:${msg}`);
+            });
+        }
         args.push(`${picocolors_1.default.magenta('[plugin:' + err.plugin + ']')} ${picocolors_1.default.red(err.message)}`);
+        args.push(...otherMsgs);
         if (err.loc &&
             err.hook === 'transform' &&
             err.plugin === 'rollup-plugin-dynamic-import-variables' &&

package/dist/index.d.ts

@@ -22,7 +22,7 @@ export * from './resolve';
 export * from './scripts';
 export * from './platform';
 export * from './utsUtils';
-export { parseUniExtApis, parseInjects, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, } from './uni_modules';
+export { parseUniExtApi, parseUniExtApis, parseInjects, parseUniModulesArtifacts, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, resolveEncryptUniModule, formatExtApiProviderName, } from './uni_modules';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/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.checkUpdate = exports.M = exports.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = void 0;
+exports.checkUpdate = exports.M = exports.formatExtApiProviderName = exports.resolveEncryptUniModule = exports.getUniExtApiProviderRegisters = exports.parseUniModulesArtifacts = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -40,9 +40,13 @@ __exportStar(require("./scripts"), exports);
 __exportStar(require("./platform"), exports);
 __exportStar(require("./utsUtils"), exports);
 var uni_modules_1 = require("./uni_modules");
+Object.defineProperty(exports, "parseUniExtApi", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApi; } });
 Object.defineProperty(exports, "parseUniExtApis", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApis; } });
 Object.defineProperty(exports, "parseInjects", { enumerable: true, get: function () { return uni_modules_1.parseInjects; } });
+Object.defineProperty(exports, "parseUniModulesArtifacts", { enumerable: true, get: function () { return uni_modules_1.parseUniModulesArtifacts; } });
 Object.defineProperty(exports, "getUniExtApiProviderRegisters", { enumerable: true, get: function () { return uni_modules_1.getUniExtApiProviderRegisters; } });
+Object.defineProperty(exports, "resolveEncryptUniModule", { enumerable: true, get: function () { return uni_modules_1.resolveEncryptUniModule; } });
+Object.defineProperty(exports, "formatExtApiProviderName", { enumerable: true, get: function () { return uni_modules_1.formatExtApiProviderName; } });
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

package/dist/json/app/manifest/nvue.d.ts

@@ -1,4 +1,4 @@
 export declare function initNVue(manifestJson: Record<string, any>, pagesJson: UniApp.PagesJson): void;
-export declare function getNVueCompiler(manifestJson: Record<string, any>): "uni-app" | "vue" | "weex" | "vite";
+export declare function getNVueCompiler(manifestJson: Record<string, any>): "uni-app" | "weex" | "vue" | "vite";
 export declare function getNVueStyleCompiler(manifestJson: Record<string, any>): "uni-app" | "weex";
 export declare function getNVueFlexDirection(manifestJson: Record<string, any>): "column" | "row" | "row-reverse" | "column-reverse";

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

@@ -1,2 +1,2 @@
-export declare function definePageCode(pagesJson: Record<string, any>): string;
+export declare function definePageCode(pagesJson: Record<string, any>, platform?: UniApp.PLATFORM): string;
 export declare function defineNVuePageCode(pagesJson: Record<string, any>): string;

package/dist/json/app/pages/definePage.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineNVuePageCode = exports.definePageCode = void 0;
 const utils_1 = require("../../../utils");
-function definePageCode(pagesJson) {
+function definePageCode(pagesJson, platform = 'app') {
     const importPagesCode = [];
     const definePagesCode = [];
     pagesJson.pages.forEach((page) => {
-        if (page.style.isNVue) {
+        if (platform === 'app' && page.style.isNVue) {
             return;
         }
         const pagePath = page.path;
         const pageIdentifier = (0, utils_1.normalizeIdentifier)(pagePath);
-        const pagePathWithExtname = (0, utils_1.normalizePagePath)(pagePath, 'app');
+        const pagePathWithExtname = (0, utils_1.normalizePagePath)(pagePath, platform);
         if (pagePathWithExtname) {
             if (process.env.UNI_APP_CODE_SPLITING) {
                 // 拆分页面

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

@@ -1,3 +1,3 @@
-export declare function normalizeAppPagesJson(pagesJson: Record<string, any>): string;
+export declare function normalizeAppPagesJson(pagesJson: Record<string, any>, platform?: UniApp.PLATFORM): string;
 export declare function normalizeAppNVuePagesJson(pagesJson: Record<string, any>): string;
 export declare function normalizeAppConfigService(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;

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

@@ -5,8 +5,8 @@ const code_1 = require("./code");
 const definePage_1 = require("./definePage");
 const uniConfig_1 = require("./uniConfig");
 const uniRoutes_1 = require("./uniRoutes");
-function normalizeAppPagesJson(pagesJson) {
-    return (0, definePage_1.definePageCode)(pagesJson);
+function normalizeAppPagesJson(pagesJson, platform = 'app') {
+    return (0, definePage_1.definePageCode)(pagesJson, platform);
 }
 exports.normalizeAppPagesJson = normalizeAppPagesJson;
 function normalizeAppNVuePagesJson(pagesJson) {

package/dist/json/manifest.d.ts

@@ -31,4 +31,5 @@ export declare function getRouterOptions(manifestJson: Record<string, any>): {
 export declare function isEnableTreeShaking(manifestJson: Record<string, any>): boolean;
 export declare function getDevServerOptions(manifestJson: Record<string, any>): any;
 export declare function getPlatformManifestJsonOnce(): any;
+export declare function validateThemeValue(value: string): boolean;
 export {};

package/dist/json/manifest.js

@@ -3,19 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPlatformManifestJsonOnce = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const json_1 = require("./json");
 const parseManifestJson = (inputDir) => {
+    const manifestFilename = path_1.default.join(inputDir, 'manifest.json');
+    if (!fs_1.default.existsSync(manifestFilename)) {
+        if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+            return {};
+        }
+    }
     return (0, json_1.parseJson)(fs_1.default.readFileSync(path_1.default.join(inputDir, 'manifest.json'), 'utf8'));
 };
 exports.parseManifestJson = parseManifestJson;
 exports.parseManifestJsonOnce = (0, uni_shared_1.once)(exports.parseManifestJson);
 exports.parseRpx2UnitOnce = (0, uni_shared_1.once)((inputDir, platform = 'h5') => {
-    const rpx2unit = platform === 'h5' || platform === 'app'
+    const rpx2unit = platform === 'h5' || platform === 'app' || platform === 'app-harmony'
         ? uni_shared_1.defaultRpx2Unit
         : uni_shared_1.defaultMiniProgramRpx2Unit;
     const platformOptions = (0, exports.parseManifestJsonOnce)(inputDir)[platform];
@@ -115,3 +121,8 @@ function getPlatformManifestJsonOnce() {
         : (0, exports.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR)[platform] || {};
 }
 exports.getPlatformManifestJsonOnce = getPlatformManifestJsonOnce;
+const themeValues = ['dark', 'light', 'auto'];
+function validateThemeValue(value) {
+    return themeValues.indexOf(value) !== -1;
+}
+exports.validateThemeValue = validateThemeValue;

package/dist/json/pages.js

@@ -43,7 +43,16 @@ exports.isUniPageSfcFile = isUniPageSfcFile;
  * @returns
  */
 const parsePagesJson = (inputDir, platform, normalize = true) => {
-    const jsonStr = fs_1.default.readFileSync(path_1.default.join(inputDir, 'pages.json'), 'utf8');
+    const pagesFilename = path_1.default.join(inputDir, 'pages.json');
+    if (!fs_1.default.existsSync(pagesFilename)) {
+        if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+            return {
+                pages: [],
+                globalStyle: { navigationBar: {} },
+            };
+        }
+    }
+    const jsonStr = fs_1.default.readFileSync(pagesFilename, 'utf8');
     if (normalize) {
         return normalizePagesJson(jsonStr, platform);
     }
@@ -146,6 +155,15 @@ exports.validatePages = validatePages;
 function normalizePages(pages, platform) {
     pages.forEach((page) => {
         page.style = normalizePageStyle(page.path, page.style, platform);
+        if (platform === 'app-harmony') {
+            // 鸿蒙下强制 isNVue 为 false，增加额外的 isNVueStyle 来标记样式处理
+            // 因为已有的代码里太多根据 isNVue 来处理的逻辑，这些逻辑在鸿蒙都不适用
+            // 鸿蒙仅需要将 nvue 当做 vue，并补充 css 即可
+            if (page.style.isNVue) {
+                page.style.isNVue = false;
+                page.style.isNVueStyle = true;
+            }
+        }
     });
     if (platform !== 'app') {
         return;
@@ -233,7 +251,7 @@ function normalizePageStyle(pagePath, pageStyle, platform) {
         else {
             (0, shared_1.extend)(pageStyle, pageStyle[platform]);
         }
-        if (['h5', 'app'].includes(platform)) {
+        if (['h5', 'app', 'app-harmony'].includes(platform)) {
             pageStyle.navigationBar = normalizeNavigationBar(pageStyle);
             if (isEnablePullDownRefresh(pageStyle)) {
                 pageStyle.enablePullDownRefresh = true;

package/dist/json/theme.d.ts

@@ -2,3 +2,22 @@ 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;
+export declare class ThemeSassParser {
+    _index: number;
+    _input: string;
+    _theme: Record<string, Record<string, any>>;
+    constructor();
+    parse(input: string): Record<string, Record<string, any>>;
+    parseVariable(): void;
+    parseVariableValue(): any;
+    parseFunction(): void | string[];
+    skipOtherValue(): void;
+    parseString(): string;
+    pushThemeValue(key: string, valuePair: string[]): void;
+    consume(expected: string): void;
+    get currentChar(): string;
+    skipWhiteSpaceAndComments(): void;
+    skipComment(): void;
+    skipWhiteSpace(): void;
+    isspace(str: string): boolean;
+}

package/dist/json/theme.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.initTheme = exports.normalizeThemeConfigOnce = exports.parseThemeJson = exports.hasThemeJson = void 0;
+exports.ThemeSassParser = 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");
@@ -27,7 +27,61 @@ const parseThemeJson = (themeLocation = 'theme.json') => {
     return (0, json_1.parseJson)(jsonStr, true);
 };
 exports.parseThemeJson = parseThemeJson;
-exports.normalizeThemeConfigOnce = (0, uni_shared_1.once)((manifestJsonPlatform = {}) => (0, exports.parseThemeJson)(manifestJsonPlatform.themeLocation));
+const SCHEME_RE = /^([a-z-]+:)?\/\//i;
+const DATA_RE = /^data:.*,.*/;
+function normalizeFilepath(filepath) {
+    if (!(SCHEME_RE.test(filepath) || DATA_RE.test(filepath)) &&
+        filepath.indexOf('/') !== 0) {
+        return (0, uni_shared_1.addLeadingSlash)(filepath);
+    }
+    return filepath;
+}
+const parseThemeJsonIconPath = (themeConfig, curPathThemeJsonKey) => {
+    if (themeConfig.light?.[curPathThemeJsonKey]) {
+        themeConfig.light[curPathThemeJsonKey] = normalizeFilepath(themeConfig.light[curPathThemeJsonKey]);
+    }
+    if (themeConfig.dark?.[curPathThemeJsonKey]) {
+        themeConfig.dark[curPathThemeJsonKey] = normalizeFilepath(themeConfig.dark[curPathThemeJsonKey]);
+    }
+};
+function normalizeUniConfigThemeJsonIconPath(themeConfig, pagesJson) {
+    // 处理 tabbar 下 list -> item -> iconPath、selectedIconPath; midButton -> backgroundImage 路径 / 不开头的情况
+    const tabBar = pagesJson.tabBar;
+    if (tabBar) {
+        tabBar.list.forEach((item) => {
+            if (item.iconPath && item.iconPath.indexOf('@') === 0) {
+                parseThemeJsonIconPath(themeConfig, item.iconPath.replace(/^@/, ''));
+            }
+            if (item.selectedIconPath && item.selectedIconPath.indexOf('@') === 0) {
+                parseThemeJsonIconPath(themeConfig, item.selectedIconPath.replace(/^@/, ''));
+            }
+        });
+        const midButtonBackgroundImage = tabBar.midButton?.backgroundImage;
+        if (midButtonBackgroundImage &&
+            midButtonBackgroundImage.indexOf('@') === 0) {
+            parseThemeJsonIconPath(themeConfig, midButtonBackgroundImage.replace(/^@/, ''));
+        }
+    }
+    return themeConfig;
+}
+const getPagesJson = (inputDir) => {
+    const pagesFilename = path_1.default.join(inputDir, 'pages.json');
+    if (!fs_1.default.existsSync(pagesFilename)) {
+        return {
+            pages: [],
+            globalStyle: { navigationBar: {} },
+        };
+    }
+    const jsonStr = fs_1.default.readFileSync(pagesFilename, 'utf8');
+    return (0, json_1.parseJson)(jsonStr, true);
+};
+exports.normalizeThemeConfigOnce = (0, uni_shared_1.once)((manifestJsonPlatform = {}) => {
+    const themeConfig = (0, exports.parseThemeJson)(manifestJsonPlatform.themeLocation);
+    if (process.env.UNI_INPUT_DIR) {
+        normalizeUniConfigThemeJsonIconPath(themeConfig, getPagesJson(process.env.UNI_INPUT_DIR));
+    }
+    return themeConfig;
+});
 function initTheme(manifestJson, pagesJson) {
     const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
     const manifestPlatform = manifestJson['plus'] || manifestJson[platform] || {};
@@ -35,3 +89,187 @@ function initTheme(manifestJson, pagesJson) {
     return (0, uni_shared_1.normalizeStyles)(pagesJson, themeConfig);
 }
 exports.initTheme = initTheme;
+// TODO
+class ThemeSassParser {
+    constructor() {
+        this._index = 0;
+        this._input = '';
+        this._theme = {};
+    }
+    parse(input) {
+        this._index = 0;
+        this._input = input;
+        this._theme = {};
+        this._theme['light'] = {};
+        this._theme['dark'] = {};
+        this.parseVariable();
+        return this._theme;
+    }
+    parseVariable() {
+        this.skipWhiteSpaceAndComments();
+        this.consume('$');
+        this.skipWhiteSpaceAndComments();
+        let key = this.parseString();
+        this.skipWhiteSpaceAndComments();
+        this.consume(':');
+        this.skipWhiteSpace();
+        const value = this.parseVariableValue();
+        if (Array.isArray(value)) {
+            this.pushThemeValue(key, value);
+        }
+        this.consume(';');
+        this.skipWhiteSpaceAndComments();
+        if (this._index < this._input.length) {
+            this.parseVariable();
+        }
+    }
+    parseVariableValue() {
+        switch (this.currentChar) {
+            case 'l':
+                return this.parseFunction();
+            default:
+                return this.skipOtherValue();
+        }
+    }
+    parseFunction() {
+        let functionName = '';
+        while (this.currentChar != '(') {
+            functionName += this.currentChar;
+            if (this._index + 1 < this._input.length) {
+                ++this._index;
+            }
+            else {
+                break;
+            }
+        }
+        if (functionName != 'light-dark') {
+            return this.skipOtherValue();
+        }
+        let valuePair = new Array(2);
+        valuePair[0] = '';
+        valuePair[1] = '';
+        this.consume('(');
+        let index = 0;
+        // TODO rgb?
+        while (this.currentChar != ')') {
+            valuePair[index] += this.currentChar;
+            if (this.currentChar === ',') {
+                index++;
+            }
+            ++this._index;
+        }
+        this.consume(')');
+        valuePair[0] = valuePair[0].trim();
+        valuePair[1] = valuePair[1].trim();
+        return valuePair;
+    }
+    skipOtherValue() {
+        while (this.currentChar != ';') {
+            if (this._index + 1 < this._input.length) {
+                ++this._index;
+            }
+            else {
+                break;
+            }
+        }
+    }
+    parseString() {
+        let str = '';
+        while (this.currentChar != ':') {
+            if (this.currentChar == '\\') {
+                str += this.currentChar;
+                if (this._index + 1 < this._input.length) {
+                    str += this._input[++this._index];
+                }
+            }
+            str += this.currentChar;
+            if (this._index + 1 < this._input.length) {
+                ++this._index;
+            }
+            else {
+                break;
+            }
+        }
+        return str;
+    }
+    pushThemeValue(key, valuePair) {
+        this._theme['light'][key] = valuePair[0];
+        this._theme['dark'][key] = valuePair[1];
+    }
+    consume(expected) {
+        if (this.currentChar != expected) {
+            throw new Error('Unexpected character ' +
+                expected +
+                ' index=' +
+                this._index +
+                ' ' +
+                this.currentChar);
+        }
+        ++this._index;
+    }
+    get currentChar() {
+        if (this._index >= this._input.length) {
+            throw new Error('Unexpected end of input');
+        }
+        return this._input[this._index];
+    }
+    skipWhiteSpaceAndComments() {
+        while (this._index < this._input.length) {
+            const c = this._input[this._index];
+            if (this.isspace(c)) {
+                ++this._index;
+            }
+            else if (c == '/') {
+                this.skipComment();
+            }
+            else {
+                break;
+            }
+        }
+    }
+    skipComment() {
+        if (this.currentChar != '/') {
+            return;
+        }
+        this.consume('/');
+        let nextChar = this.currentChar;
+        if (nextChar == '/') {
+            // Single line comment
+            while (
+            // @ts-expect-error
+            this.currentChar !== '\n' &&
+                this._index < this._input.length - 1) {
+                ++this._index;
+            }
+            this.skipWhiteSpace();
+        }
+        else if (nextChar === '*') {
+            // Multi-line comment
+            while (true) {
+                if (this._index + 1 >= this._input.length) {
+                    throw new Error('Unterminated multi-line comment');
+                }
+                ++this._index;
+                // @ts-expect-error
+                if (this.currentChar === '*' && this._input[this._index + 1] === '/') {
+                    this._index += 2;
+                    break;
+                }
+            }
+            this.skipWhiteSpace();
+        }
+        else {
+            throw new Error('Invalid comment');
+        }
+    }
+    skipWhiteSpace() {
+        while (this._index < this._input.length &&
+            this.isspace(this._input[this._index])) {
+            ++this._index;
+        }
+    }
+    isspace(str) {
+        return str == ' ' || str == '\n' || str == '\r' || str == "'";
+    }
+}
+exports.ThemeSassParser = ThemeSassParser;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeAppXUniConfig = void 0;
 const uniConfig_1 = require("../app/pages/uniConfig");
+// app-config.js 内容
 function normalizeAppXUniConfig(pagesJson, manifestJson) {
     const config = {
         pages: [],
@@ -16,6 +17,10 @@ function normalizeAppXUniConfig(pagesJson, manifestJson) {
         config.conditionUrl = config.entryPagePath;
         config.entryPagePath = config.realEntryPagePath;
     }
+    // darkmode
+    if (pagesJson.themeConfig) {
+        config.themeConfig = pagesJson.themeConfig;
+    }
     // TODO 待支持分包
     return JSON.stringify(config);
 }

package/dist/messages/en.d.ts

@@ -43,5 +43,6 @@ declare const _default: {
     readonly 'prompt.run.devtools.quickapp-webview-union': "Quick App Alliance Devtools";
     readonly 'uvue.unsupported': "uvue does not support {platform} platform";
     readonly 'uvue.dev.watching.end.empty': "The compilation outcome remains unchanged; there is no need to synchronize.";
+    readonly 'uni_modules.import': "Plug-in [{0}] only supports @/uni_modules/{1}.";
 };
 export default _default;

package/dist/messages/en.js

@@ -45,4 +45,5 @@ exports.default = {
     'prompt.run.devtools.quickapp-webview-union': 'Quick App Alliance Devtools',
     'uvue.unsupported': 'uvue does not support {platform} platform',
     'uvue.dev.watching.end.empty': 'The compilation outcome remains unchanged; there is no need to synchronize.',
+    'uni_modules.import': 'Plug-in [{0}] only supports @/uni_modules/{1}.',
 };

package/dist/messages/index.d.ts

@@ -43,6 +43,7 @@ export declare const M: {
     readonly 'prompt.run.devtools.quickapp-webview-union': "快应用联盟开发者工具";
     readonly 'uvue.unsupported': "uvue 暂不支持 {platform} 平台";
     readonly 'uvue.dev.watching.end.empty': "本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。";
+    readonly 'uni_modules.import': "插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。";
 } | {
     readonly 'app.compiler.version': "Compiler version: {version}";
     readonly compiling: "Compiling...";
@@ -88,4 +89,5 @@ export declare const M: {
     readonly 'prompt.run.devtools.quickapp-webview-union': "Quick App Alliance Devtools";
     readonly 'uvue.unsupported': "uvue does not support {platform} platform";
     readonly 'uvue.dev.watching.end.empty': "The compilation outcome remains unchanged; there is no need to synchronize.";
+    readonly 'uni_modules.import': "Plug-in [{0}] only supports @/uni_modules/{1}.";
 };

package/dist/messages/zh_CN.d.ts

@@ -43,5 +43,6 @@ declare const _default: {
     readonly 'prompt.run.devtools.quickapp-webview-union': "快应用联盟开发者工具";
     readonly 'uvue.unsupported': "uvue 暂不支持 {platform} 平台";
     readonly 'uvue.dev.watching.end.empty': "本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。";
+    readonly 'uni_modules.import': "插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。";
 };
 export default _default;

package/dist/messages/zh_CN.js

@@ -45,4 +45,5 @@ exports.default = {
     'prompt.run.devtools.quickapp-webview-union': '快应用联盟开发者工具',
     'uvue.unsupported': 'uvue 暂不支持 {platform} 平台',
     'uvue.dev.watching.end.empty': '本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。',
+    'uni_modules.import': '插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。',
 };

package/dist/postcss/plugins/uniapp.js

@@ -97,6 +97,7 @@ function rewriteUniAppTags(tag) {
 const transforms = {
     h5: rewriteUniH5Tags,
     app: rewriteUniAppTags,
+    'app-harmony': rewriteUniAppTags,
     'mp-baidu': rewriteBaiduTags,
 };
 const uniapp = (opts) => {