@dcloudio/uni-cli-shared 3.0.0-alpha-3090720231103001 → 3.0.0-alpha-3090820231110001

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3090720231103001",
+  "version": "3.0.0-alpha-3090820231110001",
   "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-3090720231103001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3090720231103001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3090820231110001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3090820231110001",
     "@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-3090720231103001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3090820231110001",
     "@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"
   }
 }