@dcloudio/uni-cli-shared 3.0.0-alpha-3080420230602001 → 3.0.0-alpha-3080520230612001

package/dist/constants.d.ts

@@ -8,7 +8,9 @@ export declare const EXTNAME_JS_RE: RegExp;
 export declare const EXTNAME_TS_RE: RegExp;
 export declare const extensions: string[];
 export declare const PAGES_JSON_JS = "pages-json-js";
+export declare const PAGES_JSON_UTS = "pages-json-uts";
 export declare const MANIFEST_JSON_JS = "manifest-json-js";
+export declare const MANIFEST_JSON_UTS = "manifest-json-uts";
 export declare const JSON_JS_MAP: {
     readonly 'pages.json': "pages-json-js";
     readonly 'manifest.json': "manifest-json-js";

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_JS = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
@@ -19,7 +19,9 @@ exports.extensions = [
     '.json',
 ].concat(exports.EXTNAME_VUE);
 exports.PAGES_JSON_JS = 'pages-json-js';
+exports.PAGES_JSON_UTS = 'pages-json-uts';
 exports.MANIFEST_JSON_JS = 'manifest-json-js';
+exports.MANIFEST_JSON_UTS = 'manifest-json-uts';
 exports.JSON_JS_MAP = {
     'pages.json': exports.PAGES_JSON_JS,
     'manifest.json': exports.MANIFEST_JSON_JS,

package/dist/easycom.d.ts

@@ -6,6 +6,7 @@ interface EasycomOption {
     custom?: EasycomCustom;
 }
 export interface EasycomMatcher {
+    name: string;
     pattern: RegExp;
     replacement: string;
 }

package/dist/easycom.js

@@ -48,7 +48,7 @@ function initEasycoms(inputDir, { dirs, platform }) {
     const options = initEasycomOptions((0, pages_1.parsePagesJsonOnce)(inputDir, platform));
     const initUTSEasycom = () => {
         (0, uts_1.initUTSComponents)(inputDir, platform).forEach((item) => {
-            const index = easycoms.findIndex((easycom) => item.pattern.toString() === easycom.pattern.toString());
+            const index = easycoms.findIndex((easycom) => item.name === easycom.name);
             if (index > -1) {
                 easycoms.splice(index, 1, item);
             }
@@ -110,6 +110,7 @@ function initEasycom({ dirs, rootDir, custom, extensions = ['.vue', '.jsx', '.ts
     }
     Object.keys(easycomsObj).forEach((name) => {
         easycoms.push({
+            name: name.startsWith('^') && name.endsWith('$') ? name.slice(1, -1) : name,
             pattern: new RegExp(name),
             replacement: easycomsObj[name],
         });

package/dist/hbx/alias.js

@@ -17,15 +17,15 @@ const hbxPlugins = {
 };
 function initModuleAlias() {
     const compilerSfcPath = require.resolve('@vue/compiler-sfc');
-    // const serverRendererPath = require.resolve('@vue/server-renderer')
+    const serverRendererPath = require.resolve('@vue/server-renderer');
     module_alias_1.default.addAliases({
         '@vue/shared': require.resolve('@vue/shared'),
         '@vue/shared/dist/shared.esm-bundler.js': require.resolve('@vue/shared/dist/shared.esm-bundler.js'),
         '@vue/compiler-dom': require.resolve('@vue/compiler-dom'),
         '@vue/compiler-sfc': compilerSfcPath,
-        // '@vue/server-renderer': serverRendererPath,
+        '@vue/server-renderer': serverRendererPath,
         'vue/compiler-sfc': compilerSfcPath,
-        // 'vue/server-renderer': serverRendererPath,
+        'vue/server-renderer': serverRendererPath,
     });
     if (process.env.VITEST) {
         module_alias_1.default.addAliases({

package/dist/index.d.ts

@@ -21,7 +21,7 @@ export * from './esbuild';
 export * from './resolve';
 export * from './scripts';
 export * from './platform';
-export { parseUniExtApis } from './uni_modules';
+export { parseUniExtApis, parseInjects } 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.parseUniExtApis = void 0;
+exports.checkUpdate = exports.M = exports.parseInjects = exports.parseUniExtApis = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -40,6 +40,7 @@ __exportStar(require("./scripts"), exports);
 __exportStar(require("./platform"), exports);
 var uni_modules_1 = require("./uni_modules");
 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; } });
 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/pages/definePage.js

@@ -34,7 +34,7 @@ function defineNVuePageCode(pagesJson) {
         }
         const pagePathWithExtname = (0, utils_1.normalizePagePath)(page.path, 'app');
         if (pagePathWithExtname) {
-            importNVuePagesCode.push(`import('./${pagePathWithExtname}').then(()=>{})`);
+            importNVuePagesCode.push(`import('./${pagePathWithExtname}').then((res)=>{res.length})`);
         }
     });
     return importNVuePagesCode.join('\n');

package/dist/json/index.d.ts

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

package/dist/json/index.js

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

package/dist/json/pages.js

@@ -127,6 +127,15 @@ function validatePages(pagesJson, jsonStr) {
     else if (!pagesJson.pages.length) {
         throw new Error(`[uni-app] Error: pages.json->pages must contain at least 1 page.`);
     }
+    else {
+        const pages = [];
+        pagesJson.pages.forEach((page) => {
+            if (pages.indexOf(page.path) !== -1) {
+                throw new Error(`[uni-app] Error: pages.json->${page.path} duplication.`);
+            }
+            pages.push(page.path);
+        });
+    }
 }
 exports.validatePages = validatePages;
 function normalizePages(pages, platform) {

package/dist/json/uniAppX.d.ts

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

package/dist/json/uniAppX.js

@@ -0,0 +1,75 @@
+"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;
+    }
+    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 {};
+}

package/dist/messages/en.d.ts

@@ -36,5 +36,6 @@ declare const _default: {
     readonly 'prompt.run.devtools.quickapp-webview': "Quick App Alliance Devtools | Huawei Quick App Devtools";
     readonly 'prompt.run.devtools.quickapp-webview-huawei': "Huawei Quick App Devtools";
     readonly 'prompt.run.devtools.quickapp-webview-union': "Quick App Alliance Devtools";
+    readonly 'uvue.unsupported': "uvue does not support {platform} platform";
 };
 export default _default;

package/dist/messages/en.js

@@ -38,4 +38,5 @@ exports.default = {
     'prompt.run.devtools.quickapp-webview': 'Quick App Alliance Devtools | Huawei Quick App Devtools',
     'prompt.run.devtools.quickapp-webview-huawei': 'Huawei Quick App Devtools',
     'prompt.run.devtools.quickapp-webview-union': 'Quick App Alliance Devtools',
+    'uvue.unsupported': 'uvue does not support {platform} platform',
 };

package/dist/messages/index.d.ts

@@ -36,6 +36,7 @@ export declare const M: {
     readonly 'prompt.run.devtools.quickapp-webview': "快应用联盟开发者工具 | 华为快应用开发者工具";
     readonly 'prompt.run.devtools.quickapp-webview-huawei': "华为快应用开发者工具";
     readonly 'prompt.run.devtools.quickapp-webview-union': "快应用联盟开发者工具";
+    readonly 'uvue.unsupported': "uvue 暂不支持 {platform} 平台";
 } | {
     readonly 'app.compiler.version': "Compiler version: {version}";
     readonly compiling: "Compiling...";
@@ -74,4 +75,5 @@ export declare const M: {
     readonly 'prompt.run.devtools.quickapp-webview': "Quick App Alliance Devtools | Huawei Quick App Devtools";
     readonly 'prompt.run.devtools.quickapp-webview-huawei': "Huawei Quick App Devtools";
     readonly 'prompt.run.devtools.quickapp-webview-union': "Quick App Alliance Devtools";
+    readonly 'uvue.unsupported': "uvue does not support {platform} platform";
 };

package/dist/messages/zh_CN.d.ts

@@ -36,5 +36,6 @@ declare const _default: {
     readonly 'prompt.run.devtools.quickapp-webview': "快应用联盟开发者工具 | 华为快应用开发者工具";
     readonly 'prompt.run.devtools.quickapp-webview-huawei': "华为快应用开发者工具";
     readonly 'prompt.run.devtools.quickapp-webview-union': "快应用联盟开发者工具";
+    readonly 'uvue.unsupported': "uvue 暂不支持 {platform} 平台";
 };
 export default _default;

package/dist/messages/zh_CN.js

@@ -38,4 +38,5 @@ exports.default = {
     'prompt.run.devtools.quickapp-webview': '快应用联盟开发者工具 | 华为快应用开发者工具',
     'prompt.run.devtools.quickapp-webview-huawei': '华为快应用开发者工具',
     'prompt.run.devtools.quickapp-webview-union': '快应用联盟开发者工具',
+    'uvue.unsupported': 'uvue 暂不支持 {platform} 平台',
 };

package/dist/postcss/plugins/uniapp.d.ts

@@ -1,9 +1,10 @@
-import type { Plugin } from 'postcss';
+import type { Plugin, Root } from 'postcss';
 export interface UniAppCssProcessorOptions {
     unit?: string;
     unitRatio?: number;
     unitPrecision?: number;
 }
+export declare function filterPrefersColorScheme(root: Root, force?: boolean): void;
 declare const uniapp: {
     (opts?: UniAppCssProcessorOptions): Plugin;
     postcss: boolean;

package/dist/postcss/plugins/uniapp.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterPrefersColorScheme = void 0;
 const shared_1 = require("@vue/shared");
 const postcss_selector_parser_1 = __importDefault(require("postcss-selector-parser"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
@@ -56,10 +57,10 @@ function walkDecls(rpx2unit) {
         decl.value = rpx2unit(decl.value);
     };
 }
-function filterPrefersColorScheme(root) {
+function filterPrefersColorScheme(root, force = false) {
     if (process.env.VUE_APP_DARK_MODE !== 'true') {
         const filePath = root.source?.input.file;
-        if (filePath && filePath.includes('@dcloudio')) {
+        if (force || (filePath && filePath.includes('@dcloudio'))) {
             root.walkAtRules((rule) => {
                 if (rule.params.includes('prefers-color-scheme')) {
                     rule.remove();
@@ -68,6 +69,7 @@ function filterPrefersColorScheme(root) {
         }
     }
 }
+exports.filterPrefersColorScheme = filterPrefersColorScheme;
 const baiduTags = {
     navigator: 'nav',
 };

package/dist/preprocess/context.d.ts

@@ -1,3 +1,4 @@
 export declare function getPreVueContext(): any;
 export declare function getPreNVueContext(): any;
-export declare function initPreContext(platform: UniApp.PLATFORM, userPreContext?: Record<string, boolean> | string): void;
+export declare function getPreUVueContext(): any;
+export declare function initPreContext(platform: UniApp.PLATFORM, userPreContext?: Record<string, boolean> | string, utsPlatform?: typeof process.env.UNI_UTS_PLATFORM): void;

package/dist/preprocess/context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initPreContext = exports.getPreNVueContext = exports.getPreVueContext = void 0;
+exports.initPreContext = exports.getPreUVueContext = exports.getPreNVueContext = exports.getPreVueContext = void 0;
 const shared_1 = require("@vue/shared");
 const DEFAULT_KEYS = [
     'APP',
@@ -31,6 +31,7 @@ const DEFAULT_KEYS = [
 ];
 const preVueContext = Object.create(null);
 const preNVueContext = Object.create(null);
+const preUVueContext = Object.create(null);
 function getPreVueContext() {
     return preVueContext;
 }
@@ -39,9 +40,14 @@ function getPreNVueContext() {
     return preNVueContext;
 }
 exports.getPreNVueContext = getPreNVueContext;
-function initPreContext(platform, userPreContext) {
+function getPreUVueContext() {
+    return preUVueContext;
+}
+exports.getPreUVueContext = getPreUVueContext;
+function initPreContext(platform, userPreContext, utsPlatform) {
     const vueContext = Object.create(null);
     const nvueContext = Object.create(null);
+    const uvueContext = Object.create(null);
     const defaultContext = Object.create(null);
     DEFAULT_KEYS.forEach((key) => {
         defaultContext[key] = false;
@@ -49,12 +55,20 @@ function initPreContext(platform, userPreContext) {
     defaultContext[normalizeKey(platform)] = true;
     vueContext.VUE3 = true;
     nvueContext.VUE3 = true;
+    uvueContext.VUE3 = true;
     if (platform === 'app' || platform === 'app-plus') {
         defaultContext.APP = true;
         defaultContext.APP_PLUS = true;
         vueContext.APP_VUE = true;
         nvueContext.APP_NVUE = true;
         nvueContext.APP_PLUS_NVUE = true;
+        uvueContext.APP_UVUE = true;
+        if (utsPlatform === 'app-android') {
+            uvueContext.APP_ANDROID = true;
+        }
+        else if (utsPlatform === 'app-ios') {
+            uvueContext.APP_IOS = true;
+        }
     }
     else if (platform.startsWith('mp-')) {
         defaultContext.MP = true;
@@ -80,6 +94,7 @@ function initPreContext(platform, userPreContext) {
     }
     (0, shared_1.extend)(preVueContext, defaultContext, vueContext);
     (0, shared_1.extend)(preNVueContext, defaultContext, nvueContext);
+    (0, shared_1.extend)(preUVueContext, defaultContext, uvueContext);
 }
 exports.initPreContext = initPreContext;
 function normalizeKey(name) {

package/dist/preprocess/index.d.ts

@@ -7,3 +7,7 @@ export declare function preNVueJs(jsCode: string): any;
 export declare function preNVueHtml(htmlCode: string): any;
 export declare const preNVueCss: typeof preNVueJs;
 export declare const preNVueJson: typeof preNVueJs;
+export declare function preUVueJs(jsCode: string): any;
+export declare function preUVueHtml(htmlCode: string): any;
+export declare const preUVueCss: typeof preUVueJs;
+export declare const preUVueJson: typeof preUVueJs;

package/dist/preprocess/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.preNVueJson = exports.preNVueCss = exports.preNVueHtml = exports.preNVueJs = exports.preJson = exports.preCss = exports.preHtml = exports.preJs = exports.initPreContext = void 0;
+exports.preUVueJson = exports.preUVueCss = exports.preUVueHtml = exports.preUVueJs = exports.preNVueJson = exports.preNVueCss = exports.preNVueHtml = exports.preNVueJs = exports.preJson = exports.preCss = exports.preHtml = exports.preJs = exports.initPreContext = void 0;
 const context_1 = require("./context");
 /* eslint-disable no-restricted-globals */
 const { preprocess } = require('../../lib/preprocess');
@@ -26,3 +26,13 @@ function preNVueHtml(htmlCode) {
 exports.preNVueHtml = preNVueHtml;
 exports.preNVueCss = preNVueJs;
 exports.preNVueJson = preNVueJs;
+function preUVueJs(jsCode) {
+    return preprocess(jsCode, (0, context_1.getPreUVueContext)(), { type: 'js' });
+}
+exports.preUVueJs = preUVueJs;
+function preUVueHtml(htmlCode) {
+    return preprocess(htmlCode, (0, context_1.getPreUVueContext)(), { type: 'html' });
+}
+exports.preUVueHtml = preUVueHtml;
+exports.preUVueCss = preUVueJs;
+exports.preUVueJson = preUVueJs;

package/dist/resolve.js

@@ -30,6 +30,10 @@ function relativeFile(from, to) {
 }
 exports.relativeFile = relativeFile;
 exports.resolveMainPathOnce = (0, uni_shared_1.once)((inputDir) => {
+    const mainUTSPath = path_1.default.resolve(inputDir, 'main.uts');
+    if (fs_1.default.existsSync(mainUTSPath)) {
+        return (0, utils_1.normalizePath)(mainUTSPath);
+    }
     const mainTsPath = path_1.default.resolve(inputDir, 'main.ts');
     if (fs_1.default.existsSync(mainTsPath)) {
         return (0, utils_1.normalizePath)(mainTsPath);

package/dist/uni_modules.d.ts

@@ -1,3 +1,4 @@
+import type { UTSTargetLanguage } from './uts';
 type DefineOptions = {
     name?: string;
     app?: boolean | {
@@ -14,7 +15,7 @@ type Defines = {
 export interface Exports {
     [name: string]: Define | Defines | false;
 }
-export declare function parseUniExtApis(vite?: boolean): Injects;
+export declare function parseUniExtApis(vite: boolean | undefined, platform: typeof process.env.UNI_UTS_PLATFORM, language?: UTSTargetLanguage): Injects;
 type Injects = {
     [name: string]: string | [string, string] | [string, string, DefineOptions['app']] | false;
 };
@@ -39,6 +40,5 @@ type Injects = {
  * @param define
  * @returns
  */
-export declare function parseInjects(vite: boolean | undefined, platform: UniApp.PLATFORM, source: string, exports?: Exports): Injects;
-export declare function parseInject(vite: boolean | undefined, platform: UniApp.PLATFORM, source: string, globalObject: string, define: Define): Injects;
+export declare function parseInjects(vite: boolean | undefined, platform: typeof process.env.UNI_UTS_PLATFORM, language: UTSTargetLanguage, source: string, uniModuleRootDir: string, exports?: Exports): Injects;
 export {};

package/dist/uni_modules.js

@@ -3,29 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseInject = exports.parseInjects = exports.parseUniExtApis = void 0;
+exports.parseInjects = exports.parseUniExtApis = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const merge_1 = require("merge");
-function parseUniExtApis(vite = true) {
+function parseUniExtApis(vite = true, platform, language = 'javascript') {
+    if (!process.env.UNI_INPUT_DIR) {
+        return {};
+    }
     const uniModulesDir = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules');
     if (!fs_extra_1.default.existsSync(uniModulesDir)) {
         return {};
     }
-    let platform = process.env.UNI_PLATFORM;
-    if (platform === 'h5') {
-        platform = 'web';
-    }
-    else if (platform === 'app-plus') {
-        platform = 'app';
-    }
     const injects = {};
     fs_extra_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
         // 必须以 uni- 开头
         if (!uniModuleDir.startsWith('uni-')) {
             return;
         }
-        const pkgPath = path_1.default.resolve(uniModulesDir, uniModuleDir, 'package.json');
+        const uniModuleRootDir = path_1.default.resolve(uniModulesDir, uniModuleDir);
+        const pkgPath = path_1.default.resolve(uniModuleRootDir, 'package.json');
         if (!fs_extra_1.default.existsSync(pkgPath)) {
             return;
         }
@@ -33,18 +29,7 @@ function parseUniExtApis(vite = true) {
             const exports = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))
                 ?.uni_modules?.['uni-ext-api'];
             if (exports) {
-                const curInjects = parseInjects(vite, platform, `@/uni_modules/${uniModuleDir}`, exports);
-                if (platform === 'app') {
-                    Object.keys(curInjects).forEach((name) => {
-                        const options = curInjects[name];
-                        // js 平台禁用了
-                        if (Array.isArray(options) && options.length === 3) {
-                            if (options[2] && options[2].js === false) {
-                                delete curInjects[name];
-                            }
-                        }
-                    });
-                }
+                const curInjects = parseInjects(vite, platform, language, `@/uni_modules/${uniModuleDir}`, uniModuleRootDir, exports);
                 Object.assign(injects, curInjects);
             }
         }
@@ -74,41 +59,43 @@ exports.parseUniExtApis = parseUniExtApis;
  * @param define
  * @returns
  */
-function parseInjects(vite = true, platform, source, exports = {}) {
+function parseInjects(vite = true, platform, language, source, uniModuleRootDir, exports = {}) {
     let rootDefines = {};
     Object.keys(exports).forEach((name) => {
         if (name.startsWith('uni')) {
             rootDefines[name] = exports[name];
         }
     });
-    const platformDefines = exports[platform];
-    // 该平台不支持
-    if (platformDefines === false) {
-        return {};
-    }
-    if (platformDefines) {
-        rootDefines = (0, merge_1.recursive)(true, rootDefines, platformDefines);
-    }
     const injects = {};
-    for (const key in rootDefines) {
-        Object.assign(injects, parseInject(vite, platform, source, 'uni', rootDefines[key]));
+    if (Object.keys(rootDefines).length) {
+        const hasPlatformFile = uniModuleRootDir
+            ? fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'index.uts')) ||
+                fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', platform))
+            : true;
+        for (const key in rootDefines) {
+            Object.assign(injects, parseInject(vite, platform, language, source, 'uni', rootDefines[key], hasPlatformFile));
+        }
     }
     return injects;
 }
 exports.parseInjects = parseInjects;
-function parseInject(vite = true, platform, source, globalObject, define) {
+function parseInject(vite = true, platform, language, source, globalObject, define, hasPlatformFile) {
     const injects = {};
     if (define === false) {
     }
     else if (typeof define === 'string') {
         // {'uni.getBatteryInfo' : '@dcloudio/uni-getbatteryinfo'}
-        injects[globalObject + '.' + define] = vite ? source : [source, 'default'];
+        if (hasPlatformFile) {
+            injects[globalObject + '.' + define] = vite ? source : [source, 'default'];
+        }
     }
     else if (Array.isArray(define)) {
         // {'uni.getBatteryInfo' : ['@dcloudio/uni-getbatteryinfo','getBatteryInfo]}
-        define.forEach((d) => {
-            injects[globalObject + '.' + d] = [source, d];
-        });
+        if (hasPlatformFile) {
+            define.forEach((d) => {
+                injects[globalObject + '.' + d] = [source, d];
+            });
+        }
     }
     else {
         const keys = Object.keys(define);
@@ -118,21 +105,56 @@ function parseInject(vite = true, platform, source, globalObject, define) {
             }
             else {
                 const defineOptions = define[d];
-                if (defineOptions[platform] !== false) {
-                    if (platform === 'app') {
-                        injects[globalObject + '.' + d] = [
-                            source,
-                            defineOptions.name || d,
-                            defineOptions.app,
-                        ];
-                    }
-                    else {
+                const p = platform === 'app-android' || platform === 'app-ios'
+                    ? 'app'
+                    : platform;
+                if (!(p in defineOptions)) {
+                    if (hasPlatformFile) {
                         injects[globalObject + '.' + d] = [source, defineOptions.name || d];
                     }
                 }
+                else {
+                    if (defineOptions[p] !== false) {
+                        if (p === 'app') {
+                            const appOptions = defineOptions.app;
+                            if (isPlainObject(appOptions)) {
+                                if (language === 'javascript') {
+                                    if (appOptions.js === false) {
+                                        return;
+                                    }
+                                }
+                                else if (language === 'kotlin') {
+                                    if (appOptions.kotlin === false) {
+                                        return;
+                                    }
+                                }
+                                else if (language === 'swift') {
+                                    if (appOptions.swift === false) {
+                                        return;
+                                    }
+                                }
+                            }
+                            injects[globalObject + '.' + d] = [
+                                source,
+                                defineOptions.name || d,
+                                defineOptions.app,
+                            ];
+                        }
+                        else {
+                            injects[globalObject + '.' + d] = [
+                                source,
+                                defineOptions.name || d,
+                            ];
+                        }
+                    }
+                }
             }
         });
     }
     return injects;
 }
-exports.parseInject = parseInject;
+const objectToString = Object.prototype.toString;
+const toTypeString = (value) => objectToString.call(value);
+function isPlainObject(val) {
+    return toTypeString(val) === '[object Object]';
+}

package/dist/utils.d.ts

@@ -11,7 +11,7 @@ export declare function normalizePagePath(pagePath: string, platform: UniApp.PLA
 export declare function removeExt(str: string): string;
 export declare function normalizeNodeModules(str: string): string;
 export declare function normalizeMiniProgramFilename(filename: string, inputDir?: string): string;
-export declare function normalizeParsePlugins(importer: string, babelParserPlugins?: ParserPlugin[]): (import("@babel/parser").ParserPluginWithOptions | ("asyncDoExpressions" | "asyncGenerators" | "bigInt" | "classPrivateMethods" | "classPrivateProperties" | "classProperties" | "classStaticBlock" | "decimal" | "decorators-legacy" | "decoratorAutoAccessors" | "destructuringPrivate" | "doExpressions" | "dynamicImport" | "explicitResourceManagement" | "exportDefaultFrom" | "exportNamespaceFrom" | "flow" | "flowComments" | "functionBind" | "functionSent" | "importMeta" | "jsx" | "logicalAssignment" | "importAssertions" | "importReflection" | "moduleBlocks" | "moduleStringNames" | "nullishCoalescingOperator" | "numericSeparator" | "objectRestSpread" | "optionalCatchBinding" | "optionalChaining" | "partialApplication" | "placeholders" | "privateIn" | "regexpUnicodeSets" | "throwExpressions" | "topLevelAwait" | "v8intrinsic" | "decorators" | "estree" | "moduleAttributes" | "pipelineOperator" | "recordAndTuple" | "typescript"))[];
+export declare function normalizeParsePlugins(importer: string, babelParserPlugins?: ParserPlugin[]): ParserPlugin[];
 export declare function pathToGlob(pathString: string, glob: string, options?: {
     windows?: boolean;
     escape?: boolean;

package/dist/uts.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import * as UTSCompiler from '@dcloudio/uni-uts-v1';
 import type { EasycomMatcher } from './easycom';
 /**
@@ -6,7 +8,18 @@ import type { EasycomMatcher } from './easycom';
  * @param importer
  * @returns
  */
-export declare function resolveUTSAppModule(id: string, importer: string): string | undefined;
-export declare function resolveUTSModule(id: string, importer: string): string | undefined;
+export declare function resolveUTSAppModule(id: string, importer: string, includeUTSSDK?: boolean): string | undefined;
+export declare function resolveUTSModule(id: string, importer: string, includeUTSSDK?: boolean): string | undefined;
 export declare function resolveUTSCompiler(): typeof UTSCompiler;
+export declare function isUTSComponent(name: string): boolean;
+export declare function parseUTSComponent(name: string, type: 'kotlin' | 'swift'): {
+    className: string;
+    namespace: string;
+    source: string;
+} | undefined;
 export declare function initUTSComponents(inputDir: string, platform: UniApp.PLATFORM): EasycomMatcher[];
+export declare function parseKotlinPackageWithPluginId(id: string, is_uni_modules: boolean): string;
+export declare function parseSwiftPackageWithPluginId(id: string, is_uni_modules: boolean): string;
+export type UTSTargetLanguage = typeof process.env.UNI_UTS_TARGET_LANGUAGE;
+export declare const parseUniExtApiNamespacesOnce: (platform: typeof process.env.UNI_UTS_PLATFORM, language: UTSTargetLanguage) => Record<string, [string, string]>;
+export declare const parseUniExtApiNamespacesJsOnce: (platform: typeof process.env.UNI_UTS_PLATFORM, language: UTSTargetLanguage) => Record<string, [string, string]>;

package/dist/uts.js

@@ -3,24 +3,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initUTSComponents = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.isUTSComponent = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
+const shared_1 = require("@vue/shared");
 const hbx_1 = require("./hbx");
 const utils_1 = require("./utils");
+const uni_shared_1 = require("@dcloudio/uni-shared");
+const uni_modules_1 = require("./uni_modules");
 /**
  * 解析 app 平台的 uts 插件，任意平台（android|ios）存在即可
  * @param id
  * @param importer
  * @returns
  */
-function resolveUTSAppModule(id, importer) {
+function resolveUTSAppModule(id, importer, includeUTSSDK = true) {
     id = path_1.default.resolve(importer, id);
-    if (id.includes('utssdk') || id.includes('uni_modules')) {
+    if (id.includes('uni_modules') || (includeUTSSDK && id.includes('utssdk'))) {
         const parts = (0, utils_1.normalizePath)(id).split('/');
         const parentDir = parts[parts.length - 2];
-        if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
+        if (parentDir === 'uni_modules' ||
+            (includeUTSSDK && parentDir === 'utssdk')) {
             const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
             if (fs_1.default.existsSync(path_1.default.resolve(id, basedir, 'index.uts'))) {
                 return id;
@@ -40,16 +44,17 @@ function resolveUTSAppModule(id, importer) {
 }
 exports.resolveUTSAppModule = resolveUTSAppModule;
 // 仅限 root/uni_modules/test-plugin | root/utssdk/test-plugin 格式
-function resolveUTSModule(id, importer) {
+function resolveUTSModule(id, importer, includeUTSSDK = true) {
     if (process.env.UNI_PLATFORM === 'app' ||
         process.env.UNI_PLATFORM === 'app-plus') {
         return resolveUTSAppModule(id, importer);
     }
     id = path_1.default.resolve(importer, id);
-    if (id.includes('utssdk') || id.includes('uni_modules')) {
+    if (id.includes('uni_modules') || (includeUTSSDK && id.includes('utssdk'))) {
         const parts = (0, utils_1.normalizePath)(id).split('/');
         const parentDir = parts[parts.length - 2];
-        if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
+        if (parentDir === 'uni_modules' ||
+            (includeUTSSDK && parentDir === 'utssdk')) {
             const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
             const resolvePlatformDir = (p) => {
                 return path_1.default.resolve(id, basedir, p);
@@ -100,16 +105,38 @@ function resolveUTSCompiler() {
     return require(compilerPath);
 }
 exports.resolveUTSCompiler = resolveUTSCompiler;
+const utsComponents = new Map();
+function isUTSComponent(name) {
+    return utsComponents.has(name);
+}
+exports.isUTSComponent = isUTSComponent;
+function parseUTSComponent(name, type) {
+    const meta = utsComponents.get(name);
+    if (meta) {
+        const namespace = meta[type === 'swift' ? 'swiftModule' : 'kotlinPackage'] || '';
+        const className = (0, shared_1.capitalize)((0, shared_1.camelize)(name)) + 'Component';
+        return {
+            className,
+            namespace,
+            source: meta.source,
+        };
+    }
+}
+exports.parseUTSComponent = parseUTSComponent;
 function initUTSComponents(inputDir, platform) {
+    utsComponents.clear();
     const components = [];
     if (platform !== 'app' && platform !== 'app-plus') {
         return components;
     }
-    const easycomsObj = Object.create(null);
+    const easycomsObj = {};
     const dirs = resolveUTSComponentDirs(inputDir);
     dirs.forEach((dir) => {
         const is_uni_modules_utssdk = dir.endsWith('utssdk');
         const is_ussdk = !is_uni_modules_utssdk && path_1.default.dirname(dir).endsWith('utssdk');
+        const pluginId = is_uni_modules_utssdk
+            ? path_1.default.basename(path_1.default.dirname(dir))
+            : path_1.default.basename(dir);
         if (is_uni_modules_utssdk || is_ussdk) {
             fast_glob_1.default
                 .sync('**/*.vue', {
@@ -125,15 +152,27 @@ function initUTSComponents(inputDir, platform) {
                 }
                 if (name) {
                     const importDir = (0, utils_1.normalizePath)(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
-                    easycomsObj[`^${name}$`] = `${importDir}?uts-proxy`;
+                    easycomsObj[`^${name}$`] = {
+                        source: `${importDir}?uts-proxy`,
+                        kotlinPackage: parseKotlinPackageWithPluginId(pluginId, is_uni_modules_utssdk),
+                        swiftModule: parseSwiftPackageWithPluginId(pluginId, is_uni_modules_utssdk),
+                    };
                 }
             });
         }
     });
     Object.keys(easycomsObj).forEach((name) => {
+        const obj = easycomsObj[name];
+        const componentName = name.slice(1, -1);
         components.push({
+            name: componentName,
             pattern: new RegExp(name),
-            replacement: easycomsObj[name],
+            replacement: obj.source,
+        });
+        utsComponents.set(componentName, {
+            source: obj.source,
+            kotlinPackage: obj.kotlinPackage,
+            swiftModule: obj.swiftModule,
         });
     });
     return components;
@@ -162,3 +201,48 @@ function parseVueComponentName(file) {
         return matches[1];
     }
 }
+function prefix(id) {
+    if (process.env.UNI_UTS_MODULE_PREFIX &&
+        !id.startsWith(process.env.UNI_UTS_MODULE_PREFIX)) {
+        return process.env.UNI_UTS_MODULE_PREFIX + '-' + id;
+    }
+    return id;
+}
+function parseKotlinPackageWithPluginId(id, is_uni_modules) {
+    return 'uts.sdk.' + (is_uni_modules ? 'modules.' : '') + (0, shared_1.camelize)(prefix(id));
+}
+exports.parseKotlinPackageWithPluginId = parseKotlinPackageWithPluginId;
+function parseSwiftPackageWithPluginId(id, is_uni_modules) {
+    return ('UTSSDK' +
+        (is_uni_modules ? 'Modules' : '') +
+        (0, shared_1.capitalize)((0, shared_1.camelize)(prefix(id))));
+}
+exports.parseSwiftPackageWithPluginId = parseSwiftPackageWithPluginId;
+exports.parseUniExtApiNamespacesOnce = (0, uni_shared_1.once)((platform, language) => {
+    const extApis = (0, exports.parseUniExtApiNamespacesJsOnce)(platform, language);
+    const namespaces = {};
+    Object.keys(extApis).forEach((name) => {
+        const options = extApis[name];
+        let source = options[0];
+        const pluginId = path_1.default.basename(options[0]);
+        if (language === 'kotlin') {
+            source = parseKotlinPackageWithPluginId(pluginId, true);
+        }
+        else if (language === 'swift') {
+            source = parseSwiftPackageWithPluginId(pluginId, true);
+        }
+        namespaces[name] = [source, options[1]];
+    });
+    return namespaces;
+});
+exports.parseUniExtApiNamespacesJsOnce = (0, uni_shared_1.once)((platform, language) => {
+    const extApis = (0, uni_modules_1.parseUniExtApis)(true, platform, language);
+    const namespaces = {};
+    Object.keys(extApis).forEach((name) => {
+        const options = extApis[name];
+        if ((0, shared_1.isArray)(options) && options.length >= 2) {
+            namespaces[name.replace('uni.', '')] = [options[0], options[1]];
+        }
+    });
+    return namespaces;
+});

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

@@ -5,6 +5,7 @@ export * from './mainJs';
 export * from './jsonJs';
 export * from './console';
 export * from './dynamicImportPolyfill';
+export * from './utsPlugin';
 export { assetPlugin, getAssetHash } from './vitejs/plugins/asset';
 export { isCSSRequest, cssPlugin, cssPostPlugin, minifyCSS, cssLangRE, commonjsProxyRE, } from './vitejs/plugins/css';
 export { generateCodeFrame } from './vitejs/utils';

package/dist/vite/plugins/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./mainJs"), exports);
 __exportStar(require("./jsonJs"), exports);
 __exportStar(require("./console"), exports);
 __exportStar(require("./dynamicImportPolyfill"), exports);
+__exportStar(require("./utsPlugin"), exports);
 var asset_1 = require("./vitejs/plugins/asset");
 Object.defineProperty(exports, "assetPlugin", { enumerable: true, get: function () { return asset_1.assetPlugin; } });
 Object.defineProperty(exports, "getAssetHash", { enumerable: true, get: function () { return asset_1.getAssetHash; } });

package/dist/vite/plugins/mainJs.js

@@ -10,18 +10,20 @@ function defineUniMainJsPlugin(createUniMainJsPlugin) {
     const opts = {
         resolvedConfig: {},
         filter(id) {
-            return id === mainJsPath || id === mainTsPath;
+            return id === mainJsPath || id === mainTsPath || id === mainUTsPath;
         },
     };
     const plugin = createUniMainJsPlugin(opts);
     const origConfigResolved = plugin.configResolved;
     let mainJsPath = '';
     let mainTsPath = '';
+    let mainUTsPath = '';
     plugin.configResolved = function (config) {
         opts.resolvedConfig = config;
         const mainPath = (0, utils_1.normalizePath)(path_1.default.resolve(process.env.UNI_INPUT_DIR, 'main'));
         mainJsPath = mainPath + '.js';
         mainTsPath = mainPath + '.ts';
+        mainUTsPath = mainPath + '.uts';
         return origConfigResolved && origConfigResolved(config);
     };
     return plugin;

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

@@ -0,0 +1,8 @@
+import type { Plugin } from 'vite';
+interface UniUTSPluginOptions {
+    x?: boolean;
+    extApis?: Record<string, [string, string]>;
+}
+export declare const utsPlugins: Set<string>;
+export declare function uniUTSPlugin(options?: UniUTSPluginOptions): Plugin;
+export {};

package/dist/vite/plugins/utsPlugin.js

@@ -0,0 +1,88 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniUTSPlugin = exports.utsPlugins = void 0;
+const path_1 = __importDefault(require("path"));
+const uni_shared_1 = require("@dcloudio/uni-shared");
+const uts_1 = require("../../uts");
+const utils_1 = require("../utils");
+const UTSProxyRE = /\?uts-proxy$/;
+function isUTSProxy(id) {
+    return UTSProxyRE.test(id);
+}
+const utsModuleCaches = new Map();
+exports.utsPlugins = new Set();
+function uniUTSPlugin(options = {}) {
+    process.env.UNI_UTS_USING_ROLLUP = 'true';
+    return {
+        name: 'uni:uts',
+        apply: 'build',
+        enforce: 'pre',
+        resolveId(id, importer) {
+            if (isUTSProxy(id)) {
+                return id;
+            }
+            const module = (0, uts_1.resolveUTSAppModule)(id, importer ? path_1.default.dirname(importer) : process.env.UNI_INPUT_DIR, options.x !== true);
+            if (module) {
+                // prefix the polyfill id with \0 to tell other plugins not to try to load or transform it
+                return module + '?uts-proxy';
+            }
+        },
+        load(id) {
+            if (isUTSProxy(id)) {
+                return '';
+            }
+        },
+        buildEnd() {
+            utsModuleCaches.clear();
+        },
+        async transform(_, id, opts) {
+            if (opts && opts.ssr) {
+                return;
+            }
+            if (!isUTSProxy(id)) {
+                return;
+            }
+            const { filename: pluginDir } = (0, utils_1.parseVueRequest)(id.replace('\0', ''));
+            // 当 vue 和 nvue 均引用了相同 uts 插件，解决两套编译器会编译两次 uts 插件的问题
+            // 通过缓存，保证同一个 uts 插件只编译一次
+            if (utsModuleCaches.get(pluginDir)) {
+                return utsModuleCaches.get(pluginDir)().then((result) => {
+                    if (result) {
+                        result.deps.forEach((dep) => {
+                            this.addWatchFile(dep);
+                        });
+                        return {
+                            code: result.code,
+                            syntheticNamedExports: result.encrypt,
+                            meta: result.meta,
+                        };
+                    }
+                });
+            }
+            const compile = (0, uni_shared_1.once)(() => {
+                exports.utsPlugins.add(path_1.default.basename(pluginDir));
+                return (0, uts_1.resolveUTSCompiler)().compile(pluginDir, {
+                    isX: !!options.x,
+                    isPlugin: true,
+                    extApis: options.extApis,
+                });
+            });
+            utsModuleCaches.set(pluginDir, compile);
+            const result = await compile();
+            if (result) {
+                result.deps.forEach((dep) => {
+                    this.addWatchFile(dep);
+                });
+                return {
+                    code: result.code,
+                    syntheticNamedExports: result.encrypt,
+                    meta: result.meta,
+                };
+            }
+        },
+    };
+}
+exports.uniUTSPlugin = uniUTSPlugin;

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

@@ -34,8 +34,9 @@ export declare function cssPlugin(config: ResolvedConfig): Plugin;
 /**
  * Plugin applied after user plugins
  */
-export declare function cssPostPlugin(config: ResolvedConfig, { platform, chunkCssFilename, chunkCssCode, }: {
+export declare function cssPostPlugin(config: ResolvedConfig, { platform, isJsCode, chunkCssFilename, chunkCssCode, }: {
     platform: UniApp.PLATFORM;
+    isJsCode?: boolean;
     chunkCssFilename: (id: string) => string | void;
     chunkCssCode: (filename: string, cssCode: string) => Promise<string> | string;
 }): Plugin;

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

@@ -36,7 +36,9 @@ const pluginutils_1 = require("@rollup/pluginutils");
 const utils_1 = require("../utils");
 const asset_1 = require("./asset");
 const magic_string_1 = __importDefault(require("magic-string"));
+const Postcss = __importStar(require("postcss"));
 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");
@@ -122,7 +124,7 @@ function findCssModuleIds(moduleId, cssModuleIds, seen) {
     const moduleInfo = this.getModuleInfo(moduleId);
     if (moduleInfo) {
         moduleInfo.importedIds.forEach((id) => {
-            if (id.includes(constants_1.PAGES_JSON_JS)) {
+            if (id.includes(constants_1.PAGES_JSON_JS) || id.includes(constants_1.PAGES_JSON_UTS)) {
                 // 查询main.js时，需要忽略pages.json.js，否则会把所有页面样式加进来
                 return;
             }
@@ -139,7 +141,7 @@ function findCssModuleIds(moduleId, cssModuleIds, seen) {
 /**
  * Plugin applied after user plugins
  */
-function cssPostPlugin(config, { platform, chunkCssFilename, chunkCssCode, }) {
+function cssPostPlugin(config, { platform, isJsCode, chunkCssFilename, chunkCssCode, }) {
     // styles initialization in buildStart causes a styling loss in watch
     const styles = new Map();
     let cssChunks;
@@ -169,7 +171,8 @@ function cssPostPlugin(config, { platform, chunkCssFilename, chunkCssCode, }) {
             if (id) {
                 const filename = chunkCssFilename(id);
                 if (filename) {
-                    if (platform === 'app' && filename === 'app.css') {
+                    if (platform === 'app' &&
+                        (filename === 'app.css' || filename === 'App.vue.style.uts')) {
                         // 获取 unocss 的样式文件信息
                         const ids = Object.keys(chunk.modules).filter((id) => styles.has(id) &&
                             (id.includes('__uno.css') || id.includes('-unocss-')));
@@ -215,6 +218,9 @@ function cssPostPlugin(config, { platform, chunkCssFilename, chunkCssCode, }) {
                 css = css.replace(asset_1.assetUrlRE, (_, fileHash, postfix = '') => {
                     return (0, utils_1.normalizePath)(path_1.default.relative(path_1.default.dirname(filename), (0, asset_1.getAssetFilename)(fileHash, config) + postfix));
                 });
+                if (isJsCode) {
+                    return chunkCssCode(filename, css);
+                }
                 // only external @imports and @charset should exist at this point
                 // hoist them to the top of the CSS chunk per spec (#1845 and #6333)
                 if (css.includes('@import') || css.includes('@charset')) {
@@ -674,6 +680,11 @@ async function doImportCSSReplace(rawUrl, matched, replacer) {
 async function minifyCSS(css, config) {
     try {
         const { code, warnings } = await Promise.resolve().then(() => __importStar(require('esbuild'))).then(({ transform }) => {
+            if (process.env.VUE_APP_DARK_MODE !== 'true') {
+                const postcssRoot = Postcss.parse(css);
+                (0, uniapp_1.filterPrefersColorScheme)(postcssRoot, true);
+                css = postcssRoot.toResult().css;
+            }
             return transform(css, {
                 loader: 'css',
                 minify: true,

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

@@ -9,3 +9,4 @@ export declare function injectCssPlugin(config: ResolvedConfig): void;
 export declare function injectCssPostPlugin(config: ResolvedConfig, newCssPostPlugin: Plugin): void;
 export declare function replacePlugins(plugins: Plugin[], config: ResolvedConfig): void;
 export declare function removePlugins(plugins: string | string[], config: ResolvedConfig): void;
+export declare function insertBeforePlugin(plugin: Plugin, before: string, config: ResolvedConfig): void;

package/dist/vite/utils/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removePlugins = exports.replacePlugins = exports.injectCssPostPlugin = exports.injectCssPlugin = exports.injectAssetPlugin = void 0;
+exports.insertBeforePlugin = exports.removePlugins = exports.replacePlugins = exports.injectCssPostPlugin = exports.injectCssPlugin = exports.injectAssetPlugin = void 0;
 const shared_1 = require("@vue/shared");
 const asset_1 = require("../plugins/vitejs/plugins/asset");
 const css_1 = require("../plugins/vitejs/plugins/css");
@@ -43,3 +43,11 @@ function removePlugins(plugins, config) {
     });
 }
 exports.removePlugins = removePlugins;
+function insertBeforePlugin(plugin, before, config) {
+    const index = config.plugins.findIndex((p) => p.name === before);
+    if (index > -1) {
+        ;
+        config.plugins.splice(index, 0, plugin);
+    }
+}
+exports.insertBeforePlugin = insertBeforePlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3080420230602001",
+  "version": "3.0.0-alpha-3080520230612001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "@ampproject/remapping": "^2.1.2",
-    "@babel/core": "^7.20.5",
-    "@babel/parser": "^7.20.5",
+    "@babel/core": "^7.21.3",
+    "@babel/parser": "^7.16.4",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3080420230602001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3080420230602001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3080520230612001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3080520230612001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -41,14 +41,14 @@
     "chokidar": "^3.5.3",
     "compare-versions": "^3.6.0",
     "debug": "^4.3.3",
-    "es-module-lexer": "^0.9.3",
+    "es-module-lexer": "^1.2.1",
     "esbuild": "^0.17.5",
     "estree-walker": "^2.0.2",
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
     "hash-sum": "^2.0.0",
     "jsonc-parser": "^3.0.0",
-    "magic-string": "^0.27.0",
+    "magic-string": "^0.30.0",
     "merge": "^2.1.1",
     "mime": "^3.0.0",
     "module-alias": "^2.2.2",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3080420230602001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3080520230612001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",