@dcloudio/uni-cli-shared 3.0.0-3090620231104002 → 3.0.0-3090820231124001

package/dist/constants.d.ts

@@ -1,5 +1,6 @@
 export declare const PUBLIC_DIR = "static";
 export declare const EXTNAME_JS: string[];
+export declare const X_EXTNAME_JS: string[];
 export declare const EXTNAME_TS: string[];
 export declare const EXTNAME_VUE: string[];
 export declare const X_EXTNAME_VUE: string[];

package/dist/constants.js

@@ -1,8 +1,9 @@
 "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.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = 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.X_EXTNAME_VUE = 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.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = 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.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.X_EXTNAME_JS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
+exports.X_EXTNAME_JS = ['.uts', ...exports.EXTNAME_JS];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
 exports.EXTNAME_VUE = ['.vue', '.nvue', '.uvue'];
 exports.X_EXTNAME_VUE = ['.uvue', '.vue'];
@@ -38,7 +39,7 @@ exports.BINDING_COMPONENTS = '__BINDING_COMPONENTS__';
 exports.PAGE_EXTNAME_APP = ['.nvue', '.vue', '.tsx', '.jsx', '.js'];
 // 其他平台解析页面后缀的优先级
 exports.PAGE_EXTNAME = ['.vue', '.nvue', '.tsx', '.jsx', '.js'];
-exports.X_PAGE_EXTNAME = ['.vue', '.uvue', '.tsx', '.jsx', '.js'];
+exports.X_PAGE_EXTNAME = ['.uvue', '.vue', '.tsx', '.jsx', '.js'];
 exports.X_PAGE_EXTNAME_APP = ['.uvue', '.tsx', '.jsx', '.js'];
 exports.H5_API_STYLE_PATH = '@dcloudio/uni-h5/style/api/';
 exports.H5_FRAMEWORK_STYLE_PATH = '@dcloudio/uni-h5/style/framework/';

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

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

package/dist/json/pages.js

@@ -194,23 +194,28 @@ function normalizeSubpackageSubNVues(root, style = { navigationBar: {} }) {
     return style;
 }
 function normalizePageStyle(pagePath, pageStyle, platform) {
-    const hasNVue = pagePath &&
-        process.env.UNI_INPUT_DIR &&
-        fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.nvue'))
-        ? true
-        : undefined;
     let isNVue = false;
-    if (hasNVue) {
-        const hasVue = fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.vue'));
-        if (hasVue) {
-            if (platform === 'app') {
-                if (process.env.UNI_NVUE_COMPILER !== 'vue') {
-                    isNVue = true;
+    if (process.env.UNI_APP_X === 'true') {
+        isNVue = undefined;
+    }
+    else {
+        const hasNVue = pagePath &&
+            process.env.UNI_INPUT_DIR &&
+            fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.nvue'))
+            ? true
+            : undefined;
+        if (hasNVue) {
+            const hasVue = fs_1.default.existsSync(path_1.default.join(process.env.UNI_INPUT_DIR, pagePath + '.vue'));
+            if (hasVue) {
+                if (platform === 'app') {
+                    if (process.env.UNI_NVUE_COMPILER !== 'vue') {
+                        isNVue = true;
+                    }
                 }
             }
-        }
-        else {
-            isNVue = true;
+            else {
+                isNVue = true;
+            }
         }
     }
     if (pageStyle) {

package/dist/preprocess/context.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initPreContext = exports.getPreUVueContext = exports.getPreNVueContext = exports.getPreVueContext = void 0;
-const shared_1 = require("@vue/shared");
+const extend = Object.assign;
+const isString = (val) => typeof val === 'string';
+const objectToString = Object.prototype.toString;
+const toTypeString = (value) => objectToString.call(value);
+const isPlainObject = (val) => toTypeString(val) === '[object Object]';
 const DEFAULT_KEYS = [
     'UNI_APP_X',
     'APP',
@@ -88,21 +92,21 @@ function initPreContext(platform, userPreContext, utsPlatform, isX) {
         defaultContext.WEB = true;
     }
     if (userPreContext) {
-        if ((0, shared_1.isString)(userPreContext)) {
+        if (isString(userPreContext)) {
             try {
                 userPreContext = JSON.parse(userPreContext);
             }
             catch (e) { }
         }
-        if ((0, shared_1.isPlainObject)(userPreContext)) {
+        if (isPlainObject(userPreContext)) {
             Object.keys(userPreContext).forEach((key) => {
                 defaultContext[normalizeKey(key)] = !!userPreContext[key];
             });
         }
     }
-    (0, shared_1.extend)(preVueContext, defaultContext, vueContext);
-    (0, shared_1.extend)(preNVueContext, defaultContext, nvueContext);
-    (0, shared_1.extend)(preUVueContext, defaultContext, uvueContext);
+    extend(preVueContext, defaultContext, vueContext);
+    extend(preNVueContext, defaultContext, nvueContext);
+    extend(preUVueContext, defaultContext, uvueContext);
 }
 exports.initPreContext = initPreContext;
 function normalizeKey(name) {

package/dist/uni_modules.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseInjects = exports.parseUniExtApis = void 0;
+// 重要：此文件编译后的js，需同步至 vue2 编译器中 uni-cli-shared/lib/uts/uni_modules.js
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 function parseUniExtApis(vite = true, platform, language = 'javascript') {
@@ -63,6 +64,9 @@ exports.parseUniExtApis = parseUniExtApis;
  * @returns
  */
 function parseInjects(vite = true, platform, language, source, uniModuleRootDir, exports = {}) {
+    if (platform === 'app-plus') {
+        platform = 'app';
+    }
     let rootDefines = {};
     Object.keys(exports).forEach((name) => {
         if (name.startsWith('uni')) {
@@ -71,10 +75,17 @@ function parseInjects(vite = true, platform, language, source, uniModuleRootDir,
     });
     const injects = {};
     if (Object.keys(rootDefines).length) {
-        const hasPlatformFile = uniModuleRootDir
+        let 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;
+        if (!hasPlatformFile) {
+            if (platform === 'app') {
+                hasPlatformFile =
+                    fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-android')) ||
+                        fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-ios'));
+            }
+        }
         for (const key in rootDefines) {
             Object.assign(injects, parseInject(vite, platform, language, source, 'uni', rootDefines[key], hasPlatformFile));
         }

package/dist/utils.d.ts

@@ -2,6 +2,7 @@ export { default as hash } from 'hash-sum';
 import { ElementNode, RootNode, TemplateChildNode } from '@vue/compiler-core';
 import { ParserPlugin } from '@babel/parser';
 export declare const version: any;
+export { camelize, capitalize, isArray } from '@vue/shared';
 export declare let isRunningWithYarnPnp: boolean;
 export declare const isWindows: boolean;
 export declare function normalizePath(id: string): string;

package/dist/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.resolveAppVue = exports.isAppVue = exports.installDepTips = exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.version = exports.hash = void 0;
+exports.resolveAppVue = exports.isAppVue = exports.installDepTips = exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.isArray = exports.capitalize = exports.camelize = exports.version = exports.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -14,6 +14,11 @@ Object.defineProperty(exports, "hash", { enumerable: true, get: function () { re
 const constants_1 = require("./constants");
 const platform_1 = require("./platform");
 exports.version = require('../package.json').version;
+// 专为 uts.ts 服务
+var shared_2 = require("@vue/shared");
+Object.defineProperty(exports, "camelize", { enumerable: true, get: function () { return shared_2.camelize; } });
+Object.defineProperty(exports, "capitalize", { enumerable: true, get: function () { return shared_2.capitalize; } });
+Object.defineProperty(exports, "isArray", { enumerable: true, get: function () { return shared_2.isArray; } });
 try {
     exports.isRunningWithYarnPnp = Boolean(require('pnpapi'));
 }

package/dist/uts.js

@@ -7,11 +7,20 @@ exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce =
 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");
+// 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
+function once(fn, ctx = null) {
+    let res;
+    return ((...args) => {
+        if (fn) {
+            res = fn.apply(ctx, args);
+            fn = null;
+        }
+        return res;
+    });
+}
 /**
  * 解析 app 平台的 uts 插件，任意平台（android|ios）存在即可
  * @param id
@@ -114,7 +123,7 @@ 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';
+        const className = (0, utils_1.capitalize)((0, utils_1.camelize)(name)) + 'Component';
         return {
             className,
             namespace,
@@ -209,16 +218,16 @@ function prefix(id) {
     return id;
 }
 function parseKotlinPackageWithPluginId(id, is_uni_modules) {
-    return 'uts.sdk.' + (is_uni_modules ? 'modules.' : '') + (0, shared_1.camelize)(prefix(id));
+    return 'uts.sdk.' + (is_uni_modules ? 'modules.' : '') + (0, utils_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))));
+        (0, utils_1.capitalize)((0, utils_1.camelize)(prefix(id))));
 }
 exports.parseSwiftPackageWithPluginId = parseSwiftPackageWithPluginId;
-exports.parseUniExtApiNamespacesOnce = (0, uni_shared_1.once)((platform, language) => {
+exports.parseUniExtApiNamespacesOnce = once((platform, language) => {
     const extApis = (0, exports.parseUniExtApiNamespacesJsOnce)(platform, language);
     const namespaces = {};
     Object.keys(extApis).forEach((name) => {
@@ -235,12 +244,12 @@ exports.parseUniExtApiNamespacesOnce = (0, uni_shared_1.once)((platform, languag
     });
     return namespaces;
 });
-exports.parseUniExtApiNamespacesJsOnce = (0, uni_shared_1.once)((platform, language) => {
+exports.parseUniExtApiNamespacesJsOnce = 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) {
+        if ((0, utils_1.isArray)(options) && options.length >= 2) {
             namespaces[name.replace('uni.', '')] = [options[0], options[1]];
         }
     });

package/dist/vite/autoImport.d.ts

@@ -0,0 +1,3 @@
+import { Options } from 'unplugin-auto-import/types';
+export type AutoImportOptions = Options;
+export declare function initAutoImportOptions(platform: typeof process.env.UNI_UTS_PLATFORM, { imports, ...userOptions }: AutoImportOptions): AutoImportOptions;

package/dist/vite/autoImport.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initAutoImportOptions = void 0;
+const uniPreset = {
+    from: '@dcloudio/uni-app',
+    imports: [
+        // uni-app lifecycle
+        // App and Page
+        'onShow',
+        'onHide',
+        // App
+        'onAppShow',
+        'onLaunch',
+        'onError',
+        'onThemeChange',
+        'onKeyboardHeightChange',
+        'onPageNotFound',
+        'onUnhandledRejection',
+        'onLastPageBackPress',
+        'onExit',
+        // Page
+        'onLoad',
+        'onReady',
+        'onUnload',
+        'onResize',
+        'onBackPress',
+        'onPageScroll',
+        'onTabItemTap',
+        'onReachBottom',
+        'onPullDownRefresh',
+    ],
+};
+const cloudPreset = {
+    '@dcloudio/uni-cloud': [['default', 'uniCloud']],
+};
+const vuePreset = {
+    from: 'vue',
+    imports: [
+        // vue lifecycle
+        'onActivated',
+        'onBeforeMount',
+        'onBeforeUnmount',
+        'onBeforeUpdate',
+        'onErrorCaptured',
+        'onDeactivated',
+        'onMounted',
+        'onServerPrefetch',
+        'onUnmounted',
+        'onUpdated',
+        // setup helpers
+        'useAttrs',
+        'useSlots',
+        // reactivity,
+        'computed',
+        'customRef',
+        'isReadonly',
+        'isRef',
+        'isProxy',
+        'isReactive',
+        'markRaw',
+        'reactive',
+        'readonly',
+        'ref',
+        'shallowReactive',
+        'shallowReadonly',
+        'shallowRef',
+        'triggerRef',
+        'toRaw',
+        'toRef',
+        'toRefs',
+        'toValue',
+        'unref',
+        'watch',
+        'watchEffect',
+        'watchPostEffect',
+        'watchSyncEffect',
+        // component
+        'defineComponent',
+        'defineAsyncComponent',
+        'getCurrentInstance',
+        'h',
+        'inject',
+        'nextTick',
+        'provide',
+        'useCssModule',
+        'createApp',
+        // effect scope
+        'effectScope',
+        'EffectScope',
+        'getCurrentScope',
+        'onScopeDispose',
+        // types 全部全局导入
+    ],
+};
+function initAutoImportOptions(platform, { imports = [], ...userOptions }) {
+    return {
+        ...userOptions,
+        include: [/\.[u]?ts$/, /\.[u]?vue$/, /\.[u]?vue\?vue/],
+        imports: imports.concat(
+        // app-android 平台暂不注入其他
+        platform === 'app-android' ? [] : [uniPreset, cloudPreset, vuePreset]),
+        dts: false,
+    };
+}
+exports.initAutoImportOptions = initAutoImportOptions;

package/dist/vite/index.d.ts

@@ -34,3 +34,4 @@ export interface UniVitePlugin extends Plugin {
 export * from './utils';
 export * from './plugins';
 export * from './features';
+export * from './autoImport';

package/dist/vite/index.js

@@ -19,3 +19,4 @@ exports.cssTarget = 'chrome53';
 __exportStar(require("./utils"), exports);
 __exportStar(require("./plugins"), exports);
 __exportStar(require("./features"), exports);
+__exportStar(require("./autoImport"), exports);

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

@@ -5,8 +5,8 @@ export * from './mainJs';
 export * from './jsonJs';
 export * from './console';
 export * from './dynamicImportPolyfill';
-export * from './uts/app';
-export * from './uts/h5';
+export * from './uts/uni_modules';
+export * from './uts/uvue';
 export { assetPlugin, parseAssets, getAssetHash } from './vitejs/plugins/asset';
 export { isCSSRequest, cssPlugin, cssPostPlugin, minifyCSS, cssLangRE, commonjsProxyRE, } from './vitejs/plugins/css';
 export { generateCodeFrame, locToStartAndEnd } from './vitejs/utils';

package/dist/vite/plugins/index.js

@@ -22,8 +22,8 @@ __exportStar(require("./mainJs"), exports);
 __exportStar(require("./jsonJs"), exports);
 __exportStar(require("./console"), exports);
 __exportStar(require("./dynamicImportPolyfill"), exports);
-__exportStar(require("./uts/app"), exports);
-__exportStar(require("./uts/h5"), exports);
+__exportStar(require("./uts/uni_modules"), exports);
+__exportStar(require("./uts/uvue"), 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; } });

package/dist/vite/plugins/uts/{app.d.ts → uni_modules.d.ts}

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

package/dist/vite/plugins/uts/{app.js → uni_modules.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.uniUTSAppPlugin = exports.utsPlugins = void 0;
+exports.uniUTSUniModulesPlugin = exports.utsPlugins = void 0;
 const path_1 = __importDefault(require("path"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const uts_1 = require("../../../uts");
@@ -14,10 +14,10 @@ function isUTSProxy(id) {
 }
 const utsModuleCaches = new Map();
 exports.utsPlugins = new Set();
-function uniUTSAppPlugin(options = {}) {
+function uniUTSUniModulesPlugin(options = {}) {
     process.env.UNI_UTS_USING_ROLLUP = 'true';
     return {
-        name: 'uni:uts',
+        name: 'uni:uts-uni_modules',
         apply: 'build',
         enforce: 'pre',
         resolveId(id, importer) {
@@ -66,6 +66,7 @@ function uniUTSAppPlugin(options = {}) {
                 exports.utsPlugins.add(path_1.default.basename(pluginDir));
                 return (0, uts_1.resolveUTSCompiler)().compile(pluginDir, {
                     isX: !!options.x,
+                    isSingleThread: !!options.isSingleThread,
                     isPlugin: true,
                     extApis: options.extApis,
                     sourceMap: process.env.NODE_ENV === 'development',
@@ -86,4 +87,4 @@ function uniUTSAppPlugin(options = {}) {
         },
     };
 }
-exports.uniUTSAppPlugin = uniUTSAppPlugin;
+exports.uniUTSUniModulesPlugin = uniUTSUniModulesPlugin;

package/dist/vite/plugins/uts/uvue.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from 'vite';
+export declare function uniUTSUVueJavaScriptPlugin(options?: {}): Plugin;

package/dist/vite/plugins/uts/{h5.js → uvue.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniUTSJsPlugin = void 0;
+exports.uniUTSUVueJavaScriptPlugin = void 0;
 const vue_1 = require("../../../vue");
-function uniUTSJsPlugin(options = {}) {
+function uniUTSUVueJavaScriptPlugin(options = {}) {
     process.env.UNI_UTS_USING_ROLLUP = 'true';
     return {
-        name: 'uni:uts',
+        name: 'uni:uts-uvue',
         enforce: 'pre',
         configResolved(config) {
             // 移除自带的 esbuild 处理 ts 文件
@@ -30,4 +30,4 @@ function uniUTSJsPlugin(options = {}) {
         },
     };
 }
-exports.uniUTSJsPlugin = uniUTSJsPlugin;
+exports.uniUTSUVueJavaScriptPlugin = uniUTSUVueJavaScriptPlugin;

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

@@ -30,7 +30,9 @@ export declare const isDirectCSSRequest: (request: string) => boolean;
 /**
  * Plugin applied before user plugins
  */
-export declare function cssPlugin(config: ResolvedConfig): Plugin;
+export declare function cssPlugin(config: ResolvedConfig, options?: {
+    isAppX: boolean;
+}): Plugin;
 /**
  * Plugin applied after user plugins
  */

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

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hoistAtRules = exports.minifyCSS = exports.importCssRE = exports.cssDataUriRE = exports.cssUrlRE = exports.formatPostcssSourceMap = exports.cssPostPlugin = exports.cssPlugin = exports.isDirectCSSRequest = exports.isCSSRequest = exports.commonjsProxyRE = exports.cssLangRE = void 0;
-const fs_1 = __importDefault(require("fs"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const picocolors_1 = __importDefault(require("picocolors"));
@@ -57,7 +57,7 @@ const postcssConfigCache = new WeakMap();
 /**
  * Plugin applied before user plugins
  */
-function cssPlugin(config) {
+function cssPlugin(config, options) {
     let server;
     let moduleCache;
     const resolveUrl = config.createResolver({
@@ -87,7 +87,14 @@ function cssPlugin(config) {
                 }
                 const resolved = await resolveUrl(url, importer);
                 if (resolved) {
-                    return (0, asset_1.fileToUrl)(resolved, config, this, true);
+                    return (0, asset_1.fileToUrl)(resolved, config, options?.isAppX
+                        ? {
+                            emitFile(emittedFile) {
+                                // 直接写入目标目录
+                                fs_extra_1.default.outputFileSync(path_1.default.resolve(process.env.UNI_OUTPUT_DIR, emittedFile.fileName), emittedFile.source);
+                            },
+                        }
+                        : this, true);
                 }
                 return url;
             };
@@ -843,7 +850,7 @@ function preprocessCss(content, isNVue = false) {
 async function rebaseUrls(file, rootFile, alias, isNVue = false) {
     file = path_1.default.resolve(file); // ensure os-specific flashes
     // fixed by xxxxxx 条件编译
-    let contents = preprocessCss(fs_1.default.readFileSync(file, 'utf-8'), isNVue);
+    let contents = preprocessCss(fs_extra_1.default.readFileSync(file, 'utf-8'), isNVue);
     // in the same dir, no need to rebase
     const fileDir = path_1.default.dirname(file);
     const rootDir = path_1.default.dirname(rootFile);
@@ -960,7 +967,7 @@ function createViteLessPlugin(less, rootFile, alias, resolvers, isNVue) {
                         contents = result.contents;
                     }
                     else {
-                        contents = fs_1.default.readFileSync(resolved, 'utf-8');
+                        contents = fs_extra_1.default.readFileSync(resolved, 'utf-8');
                     }
                     return {
                         filename: path_1.default.resolve(resolved),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-3090620231104002",
+  "version": "3.0.0-3090820231124001",
   "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-3090620231104002",
-    "@dcloudio/uni-shared": "3.0.0-3090620231104002",
+    "@dcloudio/uni-i18n": "3.0.0-3090820231124001",
+    "@dcloudio/uni-shared": "3.0.0-3090820231124001",
     "@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-3090620231104002",
+    "@dcloudio/uni-uts-v1": "3.0.0-3090820231124001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",
@@ -77,6 +77,7 @@
     "@types/sass": "^1.43.1",
     "@types/stylus": "^0.48.36",
     "postcss": "^8.4.21",
+    "unplugin-auto-import": "^0.16.7",
     "vue": "3.2.47"
   }
 }

package/dist/vite/plugins/uts/h5.d.ts

@@ -1,2 +0,0 @@
-import type { Plugin } from 'vite';
-export declare function uniUTSJsPlugin(options?: {}): Plugin;