@dcloudio/uni-cli-shared 3.0.0-alpha-3081220230802001 → 3.0.0-alpha-3090020230909001

package/dist/constants.d.ts

@@ -7,6 +7,7 @@ export declare const EXTNAME_VUE_RE: RegExp;
 export declare const EXTNAME_JS_RE: RegExp;
 export declare const EXTNAME_TS_RE: RegExp;
 export declare const extensions: string[];
+export declare const uni_app_x_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";

package/dist/constants.js

@@ -1,15 +1,15 @@
 "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_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.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.uni_app_x_extensions = 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'];
 exports.EXTNAME_VUE = ['.vue', '.nvue'];
 exports.EXTNAME_VUE_TEMPLATE = ['.vue', '.nvue', '.jsx', '.tsx'];
-exports.EXTNAME_VUE_RE = /\.(vue|nvue)$/;
+exports.EXTNAME_VUE_RE = /\.(vue|nvue|uvue)$/;
 exports.EXTNAME_JS_RE = /\.(js|jsx|ts|tsx|mjs)$/;
 exports.EXTNAME_TS_RE = /\.tsx?$/;
-exports.extensions = [
+const COMMON_EXTENSIONS = [
     '.uts',
     '.mjs',
     '.js',
@@ -17,7 +17,9 @@ exports.extensions = [
     '.jsx',
     '.tsx',
     '.json',
-].concat(exports.EXTNAME_VUE);
+];
+exports.extensions = COMMON_EXTENSIONS.concat(exports.EXTNAME_VUE);
+exports.uni_app_x_extensions = COMMON_EXTENSIONS.concat(['.uvue', '.vue']);
 exports.PAGES_JSON_JS = 'pages-json-js';
 exports.PAGES_JSON_UTS = 'pages-json-uts';
 exports.MANIFEST_JSON_JS = 'manifest-json-js';

package/dist/easycom.d.ts

@@ -1,7 +1,7 @@
 interface EasycomOption {
     dirs?: string[];
     rootDir: string;
-    extensions?: string[];
+    extensions: string[];
     autoscan?: boolean;
     custom?: EasycomCustom;
 }
@@ -13,9 +13,10 @@ export interface EasycomMatcher {
 interface EasycomCustom {
     [key: string]: string;
 }
-export declare function initEasycoms(inputDir: string, { dirs, platform }: {
+export declare function initEasycoms(inputDir: string, { dirs, platform, isX, }: {
     dirs: string[];
     platform: UniApp.PLATFORM;
+    isX?: boolean;
 }): {
     options: EasycomOption;
     filter: (id: unknown) => boolean;

package/dist/easycom.js

@@ -24,7 +24,7 @@ function clearEasycom() {
     easycomsCache.clear();
     easycomsInvalidCache.clear();
 }
-function initEasycoms(inputDir, { dirs, platform }) {
+function initEasycoms(inputDir, { dirs, platform, isX, }) {
     const componentsDir = path_1.default.resolve(inputDir, 'components');
     const uniModulesDir = path_1.default.resolve(inputDir, 'uni_modules');
     const initEasycomOptions = (pagesJson) => {
@@ -41,6 +41,7 @@ function initEasycoms(inputDir, { dirs, platform }) {
             rootDir: inputDir,
             autoscan: !!(easycom && easycom.autoscan),
             custom: (easycom && easycom.custom) || {},
+            extensions: [...(isX ? ['.uvue'] : []), ...['.vue', '.jsx', '.tsx']],
         };
         debugEasycom(easycomOptions);
         return easycomOptions;
@@ -59,13 +60,14 @@ function initEasycoms(inputDir, { dirs, platform }) {
     };
     initEasycom(options);
     initUTSEasycom();
+    const componentExtNames = isX ? 'uvue|vue' : 'vue';
     const res = {
         options,
         filter: (0, pluginutils_1.createFilter)([
-            'components/*/*.(vue|jsx|tsx)',
-            'uni_modules/*/components/*/*.(vue|jsx|tsx)',
-            'utssdk/*/**/*.vue',
-            'uni_modules/*/utssdk/*/*.vue',
+            'components/*/*.(' + componentExtNames + '|jsx|tsx)',
+            'uni_modules/*/components/*/*.(' + componentExtNames + '|jsx|tsx)',
+            'utssdk/*/**/*.(' + componentExtNames + ')',
+            'uni_modules/*/utssdk/*/*.(' + componentExtNames + ')',
         ], [], {
             resolve: inputDir,
         }),
@@ -94,7 +96,7 @@ function initUniModulesEasycomDirs(uniModulesDir) {
     })
         .filter(Boolean);
 }
-function initEasycom({ dirs, rootDir, custom, extensions = ['.vue', '.jsx', '.tsx'], }) {
+function initEasycom({ dirs, rootDir, custom, extensions }) {
     clearEasycom();
     const easycomsObj = Object.create(null);
     if (dirs && dirs.length && rootDir) {

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

@@ -2,3 +2,4 @@ export declare function normalizeAppManifestJson(userManifestJson: Record<string
 export * from './env';
 export { APP_CONFUSION_FILENAME, isConfusionFile, hasConfusionFile, } from './confusion';
 export { getNVueCompiler, getNVueStyleCompiler, getNVueFlexDirection, } from './nvue';
+export { parseArguments } from './arguments';

package/dist/json/app/manifest/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.getNVueFlexDirection = exports.getNVueStyleCompiler = exports.getNVueCompiler = exports.hasConfusionFile = exports.isConfusionFile = exports.APP_CONFUSION_FILENAME = exports.normalizeAppManifestJson = void 0;
+exports.parseArguments = exports.getNVueFlexDirection = exports.getNVueStyleCompiler = exports.getNVueCompiler = exports.hasConfusionFile = exports.isConfusionFile = exports.APP_CONFUSION_FILENAME = exports.normalizeAppManifestJson = void 0;
 const shared_1 = require("@vue/shared");
 const merge_1 = require("./merge");
 const defaultManifestJson_1 = require("./defaultManifestJson");
@@ -59,3 +59,5 @@ var nvue_2 = require("./nvue");
 Object.defineProperty(exports, "getNVueCompiler", { enumerable: true, get: function () { return nvue_2.getNVueCompiler; } });
 Object.defineProperty(exports, "getNVueStyleCompiler", { enumerable: true, get: function () { return nvue_2.getNVueStyleCompiler; } });
 Object.defineProperty(exports, "getNVueFlexDirection", { enumerable: true, get: function () { return nvue_2.getNVueFlexDirection; } });
+var arguments_2 = require("./arguments");
+Object.defineProperty(exports, "parseArguments", { enumerable: true, get: function () { return arguments_2.parseArguments; } });

package/dist/json/pages.js

@@ -215,9 +215,9 @@ function normalizePageStyle(pagePath, pageStyle, platform) {
     }
     if (pageStyle) {
         if (platform === 'h5') {
-            (0, shared_1.extend)(pageStyle, pageStyle['app'] || pageStyle['app-plus']);
+            (0, shared_1.extend)(pageStyle, pageStyle['app'] || pageStyle['app-plus'], pageStyle['web'] || pageStyle['h5']);
         }
-        if (platform === 'app') {
+        else if (platform === 'app') {
             (0, shared_1.extend)(pageStyle, pageStyle['app'] || pageStyle['app-plus']);
         }
         else {
@@ -383,7 +383,7 @@ function normalizeFilepath(filepath) {
     }
     return filepath;
 }
-const platforms = ['h5', 'app', 'mp-', 'quickapp'];
+const platforms = ['h5', 'app', 'mp-', 'quickapp', 'web'];
 function removePlatformStyle(pageStyle) {
     Object.keys(pageStyle).forEach((name) => {
         if (platforms.find((prefix) => name.startsWith(prefix))) {

package/dist/json/uniAppX.js

@@ -42,6 +42,10 @@ function normalizeUniAppXAppPagesJson(jsonStr) {
     if (userPagesJson.tabBar) {
         pagesJson.tabBar = userPagesJson.tabBar;
     }
+    // condition
+    if (userPagesJson.condition) {
+        pagesJson.condition = userPagesJson.condition;
+    }
     return pagesJson;
 }
 exports.normalizeUniAppXAppPagesJson = normalizeUniAppXAppPagesJson;

package/dist/logs/index.d.ts

@@ -1,3 +1,4 @@
 export { formatErrMsg, formatInfoMsg, formatWarnMsg } from './format';
 type LogType = 'error' | 'warn' | 'info' | 'log';
+export declare function resetOutput(type: LogType): void;
 export declare function output(type: LogType, msg: string): void;

package/dist/logs/index.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.output = exports.formatWarnMsg = exports.formatInfoMsg = exports.formatErrMsg = void 0;
+exports.output = exports.resetOutput = exports.formatWarnMsg = exports.formatInfoMsg = exports.formatErrMsg = void 0;
 var format_1 = require("./format");
 Object.defineProperty(exports, "formatErrMsg", { enumerable: true, get: function () { return format_1.formatErrMsg; } });
 Object.defineProperty(exports, "formatInfoMsg", { enumerable: true, get: function () { return format_1.formatInfoMsg; } });
 Object.defineProperty(exports, "formatWarnMsg", { enumerable: true, get: function () { return format_1.formatWarnMsg; } });
 let lastType;
 let lastMsg;
+function resetOutput(type) {
+    if (type === lastType) {
+        lastType = undefined;
+        lastMsg = '';
+    }
+}
+exports.resetOutput = resetOutput;
 function output(type, msg) {
     if (type === lastType && msg === lastMsg) {
         return;

package/dist/messages/en.d.ts

@@ -9,6 +9,7 @@ declare const _default: {
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
+    readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "Build failed with errors.";
     readonly 'stat.warn.appid': "The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303";
     readonly 'stat.warn.version': "The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat";
@@ -39,5 +40,6 @@ declare const _default: {
     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";
+    readonly 'uvue.dev.watching.end.empty': "The compilation outcome remains unchanged; there is no need to synchronize.";
 };
 export default _default;

package/dist/messages/en.js

@@ -11,6 +11,7 @@ exports.default = {
     'dev.watching.end': 'DONE  Build complete. Watching for changes...',
     'dev.watching.end.pages': 'DONE  Build complete. PAGES:{pages}',
     'dev.watching.end.files': 'DONE  Build complete. FILES:{files}',
+    'build.failed': 'DONE  Build failed.',
     'compiler.build.failed': 'Build failed with errors.',
     'stat.warn.appid': 'The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303',
     'stat.warn.version': 'The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat',
@@ -41,4 +42,5 @@ exports.default = {
     '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',
+    'uvue.dev.watching.end.empty': 'The compilation outcome remains unchanged; there is no need to synchronize.',
 };

package/dist/messages/index.d.ts

@@ -9,6 +9,7 @@ export declare const M: {
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
+    readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "编译失败";
     readonly 'stat.warn.appid': "当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303";
     readonly 'stat.warn.version': "当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat";
@@ -39,6 +40,7 @@ export declare const M: {
     readonly 'prompt.run.devtools.quickapp-webview-huawei': "华为快应用开发者工具";
     readonly 'prompt.run.devtools.quickapp-webview-union': "快应用联盟开发者工具";
     readonly 'uvue.unsupported': "uvue 暂不支持 {platform} 平台";
+    readonly 'uvue.dev.watching.end.empty': "本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。";
 } | {
     readonly 'app.compiler.version': "Compiler version: {version}";
     readonly compiling: "Compiling...";
@@ -50,6 +52,7 @@ export declare const M: {
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
+    readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "Build failed with errors.";
     readonly 'stat.warn.appid': "The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303";
     readonly 'stat.warn.version': "The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat";
@@ -80,4 +83,5 @@ export declare const M: {
     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";
+    readonly 'uvue.dev.watching.end.empty': "The compilation outcome remains unchanged; there is no need to synchronize.";
 };

package/dist/messages/zh_CN.d.ts

@@ -9,6 +9,7 @@ declare const _default: {
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
+    readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "编译失败";
     readonly 'stat.warn.appid': "当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303";
     readonly 'stat.warn.version': "当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat";
@@ -39,5 +40,6 @@ declare const _default: {
     readonly 'prompt.run.devtools.quickapp-webview-huawei': "华为快应用开发者工具";
     readonly 'prompt.run.devtools.quickapp-webview-union': "快应用联盟开发者工具";
     readonly 'uvue.unsupported': "uvue 暂不支持 {platform} 平台";
+    readonly 'uvue.dev.watching.end.empty': "本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。";
 };
 export default _default;

package/dist/messages/zh_CN.js

@@ -11,6 +11,7 @@ exports.default = {
     'dev.watching.end': 'DONE  Build complete. Watching for changes...',
     'dev.watching.end.pages': 'DONE  Build complete. PAGES:{pages}',
     'dev.watching.end.files': 'DONE  Build complete. FILES:{files}',
+    'build.failed': 'DONE  Build failed.',
     'compiler.build.failed': '编译失败',
     'stat.warn.appid': '当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303',
     'stat.warn.version': '当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat',
@@ -41,4 +42,5 @@ exports.default = {
     'prompt.run.devtools.quickapp-webview-huawei': '华为快应用开发者工具',
     'prompt.run.devtools.quickapp-webview-union': '快应用联盟开发者工具',
     'uvue.unsupported': 'uvue 暂不支持 {platform} 平台',
+    'uvue.dev.watching.end.empty': '本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。',
 };

package/dist/platform.js

@@ -5,6 +5,7 @@ const BUILT_IN_PLATFORMS = [
     'app',
     'app-plus',
     'h5',
+    'web',
     'mp-360',
     'mp-alipay',
     'mp-baidu',

package/dist/preprocess/context.d.ts

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

package/dist/preprocess/context.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initPreContext = exports.getPreUVueContext = exports.getPreNVueContext = exports.getPreVueContext = void 0;
 const shared_1 = require("@vue/shared");
 const DEFAULT_KEYS = [
+    'UNI_APP_X',
     'APP',
     'APP_NVUE',
     'APP_PLUS',
@@ -44,7 +45,7 @@ function getPreUVueContext() {
     return preUVueContext;
 }
 exports.getPreUVueContext = getPreUVueContext;
-function initPreContext(platform, userPreContext, utsPlatform) {
+function initPreContext(platform, userPreContext, utsPlatform, isX) {
     const vueContext = Object.create(null);
     const nvueContext = Object.create(null);
     const uvueContext = Object.create(null);
@@ -52,10 +53,16 @@ function initPreContext(platform, userPreContext, utsPlatform) {
     DEFAULT_KEYS.forEach((key) => {
         defaultContext[key] = false;
     });
+    defaultContext.uniVersion = parseFloat(process.env.UNI_COMPILER_VERSION) || 0;
     defaultContext[normalizeKey(platform)] = true;
     vueContext.VUE3 = true;
     nvueContext.VUE3 = true;
     uvueContext.VUE3 = true;
+    if (isX) {
+        vueContext.UNI_APP_X = true;
+        nvueContext.UNI_APP_X = true;
+        uvueContext.UNI_APP_X = true;
+    }
     if (platform === 'app' || platform === 'app-plus') {
         defaultContext.APP = true;
         defaultContext.APP_PLUS = true;

package/dist/resolve.js

@@ -19,7 +19,7 @@ exports.requireResolve = requireResolve;
 function resolveWithSymlinks(id, basedir) {
     return resolve_1.default.sync(id, {
         basedir,
-        extensions: constants_1.extensions,
+        extensions: process.env.UNI_APP_X === 'true' ? constants_1.uni_app_x_extensions : constants_1.extensions,
         // necessary to work with pnpm
         preserveSymlinks: true,
     });

package/dist/vite/plugins/copy.js

@@ -4,6 +4,7 @@ exports.uniViteCopyPlugin = void 0;
 const watcher_1 = require("../../watcher");
 const messages_1 = require("../../messages");
 const logs_1 = require("../../logs");
+const uni_shared_1 = require("@dcloudio/uni-shared");
 function uniViteCopyPlugin({ targets, verbose, }) {
     let resolvedConfig;
     let initialized = false;
@@ -24,6 +25,11 @@ function uniViteCopyPlugin({ targets, verbose, }) {
             return new Promise((resolve) => {
                 Promise.all(targets.map(({ watchOptions, ...target }) => {
                     return new Promise((resolve) => {
+                        // 防抖，可能短时间触发很多次add,unlink
+                        const onChange = (0, uni_shared_1.debounce)(() => {
+                            (0, logs_1.resetOutput)('log');
+                            (0, logs_1.output)('log', messages_1.M['dev.watching.end']);
+                        }, 100, { setTimeout, clearTimeout });
                         new watcher_1.FileWatcher({
                             verbose,
                             ...target,
@@ -40,10 +46,7 @@ function uniViteCopyPlugin({ targets, verbose, }) {
                             else {
                                 resolve(void 0);
                             }
-                        }, () => {
-                            // TODO 目前初始化编译时，也会不停地触发此函数。
-                            (0, logs_1.output)('log', messages_1.M['dev.watching.end']);
-                        });
+                        }, onChange);
                     });
                 })).then(() => resolve());
             });

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

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

package/dist/vite/plugins/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.generateCodeFrame = exports.commonjsProxyRE = exports.cssLangRE = exports.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.assetPlugin = void 0;
+exports.locToStartAndEnd = exports.generateCodeFrame = exports.commonjsProxyRE = exports.cssLangRE = exports.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.parseAssets = exports.assetPlugin = void 0;
 __exportStar(require("./cssScoped"), exports);
 __exportStar(require("./copy"), exports);
 __exportStar(require("./inject"), exports);
@@ -25,6 +25,7 @@ __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, "parseAssets", { enumerable: true, get: function () { return asset_1.parseAssets; } });
 Object.defineProperty(exports, "getAssetHash", { enumerable: true, get: function () { return asset_1.getAssetHash; } });
 var css_1 = require("./vitejs/plugins/css");
 Object.defineProperty(exports, "isCSSRequest", { enumerable: true, get: function () { return css_1.isCSSRequest; } });
@@ -35,3 +36,4 @@ Object.defineProperty(exports, "cssLangRE", { enumerable: true, get: function ()
 Object.defineProperty(exports, "commonjsProxyRE", { enumerable: true, get: function () { return css_1.commonjsProxyRE; } });
 var utils_1 = require("./vitejs/utils");
 Object.defineProperty(exports, "generateCodeFrame", { enumerable: true, get: function () { return utils_1.generateCodeFrame; } });
+Object.defineProperty(exports, "locToStartAndEnd", { enumerable: true, get: function () { return utils_1.locToStartAndEnd; } });

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

@@ -7,7 +7,10 @@ export declare const chunkToEmittedAssetsMap: WeakMap<RenderedChunk, Set<string>
 /**
  * Also supports loading plain strings with import text from './foo.txt?raw'
  */
-export declare function assetPlugin(config: ResolvedConfig): Plugin;
+export declare function assetPlugin(config: ResolvedConfig, options?: {
+    isAppX: boolean;
+}): Plugin;
+export declare function parseAssets(config: ResolvedConfig, code: string): string;
 export declare function registerAssetToChunk(chunk: RenderedChunk, file: string): void;
 export declare function checkPublicFile(url: string, { publicDir }: ResolvedConfig): string | undefined;
 export declare function fileToUrl(id: string, config: ResolvedConfig, ctx: PluginContext, canInline?: boolean): string;

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

@@ -26,11 +26,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.urlToBuiltUrl = exports.getAssetHash = exports.assetFileNamesToFileName = exports.getAssetFilename = exports.fileToUrl = exports.checkPublicFile = exports.registerAssetToChunk = exports.assetPlugin = exports.chunkToEmittedAssetsMap = exports.assetUrlRE = void 0;
+exports.urlToBuiltUrl = exports.getAssetHash = exports.assetFileNamesToFileName = exports.getAssetFilename = exports.fileToUrl = exports.checkPublicFile = exports.registerAssetToChunk = exports.parseAssets = exports.assetPlugin = exports.chunkToEmittedAssetsMap = exports.assetUrlRE = void 0;
 const path_1 = __importDefault(require("path"));
 const url_1 = require("url");
 const lite_1 = __importDefault(require("mime/lite"));
-const fs_1 = __importStar(require("fs"));
+const fs_extra_1 = __importStar(require("fs-extra"));
 const magic_string_1 = __importDefault(require("magic-string"));
 const crypto_1 = require("crypto");
 const utils_1 = require("../utils");
@@ -38,9 +38,6 @@ const utils_2 = require("../../../../vite/utils/utils");
 const shared_1 = require("@vue/shared");
 const utils_3 = require("../../../../utils");
 exports.assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g;
-// urls in JS must be quoted as strings, so when replacing them we need
-// a different regex
-const assetUrlQuotedRE = /"__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?"/g;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 exports.chunkToEmittedAssetsMap = new WeakMap();
@@ -51,7 +48,7 @@ const emittedHashMap = new WeakMap();
 /**
  * Also supports loading plain strings with import text from './foo.txt?raw'
  */
-function assetPlugin(config) {
+function assetPlugin(config, options) {
     // assetHashToFilenameMap initialization in buildStart causes getAssetFilename to return undefined
     assetHashToFilenameMap.set(config, new Map());
     return {
@@ -81,19 +78,39 @@ function assetPlugin(config) {
             if (rawRE.test(id)) {
                 const file = checkPublicFile(id, config) || (0, utils_1.cleanUrl)(id);
                 // raw query, read file and return as string
-                return `export default ${JSON.stringify(await fs_1.promises.readFile(file, 'utf-8'))}`;
+                return `export default ${JSON.stringify(await fs_extra_1.promises.readFile(file, 'utf-8'))}`;
             }
             if (!config.assetsInclude((0, utils_1.cleanUrl)(id)) && !urlRE.test(id)) {
                 return;
             }
             id = id.replace(urlRE, '$1').replace(/[\?&]$/, '');
-            const url = await fileToUrl(id, config, this);
+            const url = await fileToUrl(id, config, options?.isAppX
+                ? {
+                    emitFile(emittedFile) {
+                        // 直接写入目标目录
+                        fs_extra_1.default.outputFileSync(path_1.default.resolve(process.env.UNI_OUTPUT_DIR, emittedFile.fileName), emittedFile.source);
+                    },
+                }
+                : this);
+            if (options?.isAppX) {
+                this.emitFile({
+                    type: 'asset',
+                    fileName: (0, utils_3.normalizeNodeModules)(path_1.default.relative(process.env.UNI_INPUT_DIR, id) + '.uts'),
+                    source: `export default ${JSON.stringify(parseAssets(config, url))}`,
+                });
+            }
             return `export default ${JSON.stringify(url)}`;
         },
         renderChunk(code, chunk) {
             let match;
             let s;
-            while ((match = assetUrlQuotedRE.exec(code))) {
+            exports.assetUrlRE.lastIndex = 0;
+            // Urls added with JS using e.g.
+            // imgElement.src = "__VITE_ASSET__5aa0ddc0__" are using quotes
+            // Urls added in CSS that is imported in JS end up like
+            // var inlined = ".inlined{color:green;background:url(__VITE_ASSET__5aa0ddc0__)}\n";
+            // In both cases, the wrapping should already be fine
+            while ((match = exports.assetUrlRE.exec(code))) {
                 s = s || (s = new magic_string_1.default(code));
                 const [full, hash, postfix = ''] = match;
                 // some internal plugins may still need to emit chunks (e.g. worker) so
@@ -101,7 +118,7 @@ function assetPlugin(config) {
                 const file = getAssetFilename(hash, config) || this.getFileName(hash);
                 registerAssetToChunk(chunk, file);
                 const outputFilepath = config.base + file + postfix;
-                s.overwrite(match.index, match.index + full.length, JSON.stringify(outputFilepath));
+                s.overwrite(match.index, match.index + full.length, outputFilepath);
             }
             if (s) {
                 return {
@@ -116,6 +133,25 @@ function assetPlugin(config) {
     };
 }
 exports.assetPlugin = assetPlugin;
+function parseAssets(config, code) {
+    let match;
+    let s;
+    exports.assetUrlRE.lastIndex = 0;
+    while ((match = exports.assetUrlRE.exec(code))) {
+        s = s || (s = new magic_string_1.default(code));
+        const [full, hash, postfix = ''] = match;
+        // some internal plugins may still need to emit chunks (e.g. worker) so
+        // fallback to this.getFileName for that.
+        const file = getAssetFilename(hash, config);
+        const outputFilepath = config.base + file + postfix;
+        s.overwrite(match.index, match.index + full.length, outputFilepath);
+    }
+    if (s) {
+        return s.toString();
+    }
+    return code;
+}
+exports.parseAssets = parseAssets;
 function registerAssetToChunk(chunk, file) {
     let emitted = exports.chunkToEmittedAssetsMap.get(chunk);
     if (!emitted) {
@@ -132,7 +168,7 @@ function checkPublicFile(url, { publicDir }) {
         return;
     }
     const publicFile = path_1.default.join(publicDir, (0, utils_1.cleanUrl)(url));
-    if (fs_1.default.existsSync(publicFile)) {
+    if (fs_extra_1.default.existsSync(publicFile)) {
         return publicFile;
     }
     else {
@@ -235,7 +271,7 @@ function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false, canI
         return cached;
     }
     const file = (0, utils_1.cleanUrl)(id);
-    const content = fs_1.default.readFileSync(file);
+    const content = fs_extra_1.default.readFileSync(file);
     let url;
     if (canInline && content.length < Number(config.build.assetsInlineLimit)) {
         // base64 inlined as a string

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

@@ -177,7 +177,7 @@ function cssPostPlugin(config, { platform, isJsCode, chunkCssFilename, chunkCssC
                 const filename = chunkCssFilename(id);
                 if (filename) {
                     if (platform === 'app' &&
-                        (filename === 'app.css' || filename.startsWith('App.vue.style'))) {
+                        (filename === 'app.css' || filename.startsWith('App.style'))) {
                         // 获取 unocss 的样式文件信息
                         const ids = Object.keys(chunk.modules).filter((id) => styles.has(id) &&
                             (id.includes('__uno.css') || id.includes('-unocss-')));

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

@@ -19,6 +19,19 @@ export declare function posToNumber(source: string, pos: number | {
     line: number;
     column: number;
 }): number;
+export declare function locToStartAndEnd(source: string, loc: {
+    start: {
+        line: number;
+        column: number;
+    };
+    end: {
+        line: number;
+        column: number;
+    };
+}): {
+    start: number;
+    end: number;
+};
 export declare function generateCodeFrame(source: string, start?: number | {
     line: number;
     column: number;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.combineSourcemaps = exports.processSrcSet = exports.generateCodeFrame = exports.posToNumber = exports.pad = exports.isObject = exports.asyncReplace = exports.multilineCommentsRE = exports.isDataUrl = exports.dataUrlRE = exports.isExternalUrl = exports.externalRE = exports.cleanUrl = exports.hashRE = exports.queryRE = exports.normalizePath = exports.isWindows = exports.deepImportRE = exports.bareImportRE = exports.slash = void 0;
+exports.combineSourcemaps = exports.processSrcSet = exports.generateCodeFrame = exports.locToStartAndEnd = exports.posToNumber = exports.pad = exports.isObject = exports.asyncReplace = exports.multilineCommentsRE = exports.isDataUrl = exports.dataUrlRE = exports.isExternalUrl = exports.externalRE = exports.cleanUrl = exports.hashRE = exports.queryRE = exports.normalizePath = exports.isWindows = exports.deepImportRE = exports.bareImportRE = exports.slash = void 0;
 /**
  * https://github.com/vitejs/vite/blob/main/packages/vite/src/node/utils.ts
  */
@@ -60,14 +60,23 @@ function posToNumber(source, pos) {
     if (typeof pos === 'number')
         return pos;
     const lines = source.split(splitRE);
-    const { line, column } = pos;
+    return posToNumberByLines(lines, pos.line, pos.column);
+}
+exports.posToNumber = posToNumber;
+function posToNumberByLines(lines, line, column) {
     let start = 0;
     for (let i = 0; i < line - 1; i++) {
         start += lines[i].length + 1;
     }
     return start + column;
 }
-exports.posToNumber = posToNumber;
+function locToStartAndEnd(source, loc) {
+    const lines = source.split(splitRE);
+    const start = posToNumberByLines(lines, loc.start.line, loc.start.column);
+    const end = posToNumberByLines(lines, loc.end.line, loc.end.column);
+    return { start, end };
+}
+exports.locToStartAndEnd = locToStartAndEnd;
 function generateCodeFrame(source, start = 0, end) {
     start = posToNumber(source, start);
     end = end || start;

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

@@ -1,5 +1,5 @@
 import type { Literal, BaseNode, Property, Identifier, CallExpression, AssignmentExpression, MemberExpression, MethodDefinition, ExportSpecifier } from 'estree';
-import { Node, ElementNode, DirectiveNode, SimpleExpressionNode, AttributeNode } from '@vue/compiler-core';
+import { Node, ElementNode, DirectiveNode, SimpleExpressionNode, AttributeNode, CompoundExpressionNode } from '@vue/compiler-core';
 export declare const isProperty: (node: BaseNode) => node is Property;
 export declare const isIdentifier: (node: BaseNode) => node is Identifier;
 export declare const isAssignmentExpression: (node: BaseNode) => node is AssignmentExpression;
@@ -16,3 +16,4 @@ export declare function isElementNode(node: Node): node is ElementNode;
 export declare function isAttributeNode(node: Node): node is AttributeNode;
 export declare function isDirectiveNode(node: Node): node is DirectiveNode;
 export declare function isSimpleExpressionNode(node: Node): node is SimpleExpressionNode;
+export declare function isCompoundExpressionNode(node: Node): node is CompoundExpressionNode;

package/dist/vite/utils/ast.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSimpleExpressionNode = exports.isDirectiveNode = exports.isAttributeNode = exports.isElementNode = exports.parseVue = exports.createCallExpression = exports.createIdentifier = exports.createLiteral = exports.isReference = exports.isExportSpecifier = exports.isMethodDefinition = exports.isMemberExpression = exports.isCallExpression = exports.isAssignmentExpression = exports.isIdentifier = exports.isProperty = void 0;
+exports.isCompoundExpressionNode = exports.isSimpleExpressionNode = exports.isDirectiveNode = exports.isAttributeNode = exports.isElementNode = exports.parseVue = exports.createCallExpression = exports.createIdentifier = exports.createLiteral = exports.isReference = exports.isExportSpecifier = exports.isMethodDefinition = exports.isMemberExpression = exports.isCallExpression = exports.isAssignmentExpression = exports.isIdentifier = exports.isProperty = void 0;
 const compiler_dom_1 = require("@vue/compiler-dom");
 const isProperty = (node) => node.type === 'Property';
 exports.isProperty = isProperty;
@@ -87,3 +87,7 @@ function isSimpleExpressionNode(node) {
     return node.type === 4 /* NodeTypes.SIMPLE_EXPRESSION */;
 }
 exports.isSimpleExpressionNode = isSimpleExpressionNode;
+function isCompoundExpressionNode(node) {
+    return node.type === 8 /* NodeTypes.COMPOUND_EXPRESSION */;
+}
+exports.isCompoundExpressionNode = isCompoundExpressionNode;

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

@@ -4,7 +4,9 @@ export interface UniViteFilterPluginOptions {
     resolvedConfig: ResolvedConfig;
     filter: (id: string) => boolean;
 }
-export declare function injectAssetPlugin(config: ResolvedConfig): void;
+export declare function injectAssetPlugin(config: ResolvedConfig, options?: {
+    isAppX: boolean;
+}): void;
 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;

package/dist/vite/utils/plugin.js

@@ -4,8 +4,8 @@ exports.insertBeforePlugin = exports.removePlugins = exports.replacePlugins = ex
 const shared_1 = require("@vue/shared");
 const asset_1 = require("../plugins/vitejs/plugins/asset");
 const css_1 = require("../plugins/vitejs/plugins/css");
-function injectAssetPlugin(config) {
-    replacePlugins([(0, asset_1.assetPlugin)(config)], config);
+function injectAssetPlugin(config, options) {
+    replacePlugins([(0, asset_1.assetPlugin)(config, options)], config);
 }
 exports.injectAssetPlugin = injectAssetPlugin;
 function injectCssPlugin(config) {

package/dist/watcher.js

@@ -53,7 +53,7 @@ class FileWatcher {
     copy(from) {
         const to = this.to(from);
         this.info('copy', from + '=>' + to);
-        let content;
+        let content = '';
         if (this.transform) {
             const filename = this.from(from);
             content = this.transform(fs_extra_1.default.readFileSync(filename), filename);

package/lib/preprocess/lib/preprocess.js

@@ -375,7 +375,8 @@ function getTestTemplate(test) {
   test = test.trim();
 
   // force single equals replacement
-  test = test.replace(/([^=!])=([^=])/g, '$1==$2');
+  // fixed by xxxxxx 不替换，会影响 >= 等判断
+  // test = test.replace(/([^=!])=([^=])/g, '$1==$2');
   // fixed by xxxxxx
   test = test.replace(/-/g, '_')
   return new Function("context", "with (context||{}){ return ( " + test + " ); }");

package/package.json

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