@dcloudio/uni-cli-shared 3.0.0-alpha-3040220220310006 → 3.0.0-alpha-3040320220324001

package/dist/constants.d.ts

@@ -15,6 +15,8 @@ export declare const JSON_JS_MAP: {
 };
 export declare const ASSETS_INLINE_LIMIT: number;
 export declare const APP_SERVICE_FILENAME = "app-service.js";
+export declare const APP_CONFIG = "app-config.js";
+export declare const APP_CONFIG_SERVICE = "app-config-service.js";
 export declare const BINDING_COMPONENTS = "__BINDING_COMPONENTS__";
 export declare const PAGE_EXTNAME_APP: string[];
 export declare const PAGE_EXTNAME: string[];

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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_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.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.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
@@ -25,6 +25,8 @@ exports.JSON_JS_MAP = {
 };
 exports.ASSETS_INLINE_LIMIT = 40 * 1024;
 exports.APP_SERVICE_FILENAME = 'app-service.js';
+exports.APP_CONFIG = 'app-config.js';
+exports.APP_CONFIG_SERVICE = 'app-config-service.js';
 exports.BINDING_COMPONENTS = '__BINDING_COMPONENTS__';
 // APP 平台解析页面后缀的优先级
 exports.PAGE_EXTNAME_APP = ['.nvue', '.vue', '.tsx', '.jsx', '.js'];

package/dist/env/provide.d.ts

@@ -3,6 +3,8 @@ export declare function initAppProvide(): {
     crypto: string[];
     'window.crypto': string[];
     'global.crypto': string[];
+    'uni.getCurrentSubNVue': string[];
+    'uni.requireNativePlugin': string[];
 };
 export declare function initH5Provide(): {
     __f__: string[];

package/dist/env/provide.js

@@ -13,6 +13,8 @@ function initAppProvide() {
         crypto: cryptoDefine,
         'window.crypto': cryptoDefine,
         'global.crypto': cryptoDefine,
+        'uni.getCurrentSubNVue': ['@dcloudio/uni-app', 'getCurrentSubNVue'],
+        'uni.requireNativePlugin': ['@dcloudio/uni-app', 'requireNativePlugin'],
     };
 }
 exports.initAppProvide = initAppProvide;

package/dist/esbuild.d.ts

@@ -1,2 +1,3 @@
 import { BuildOptions } from 'esbuild';
 export declare function transformWithEsbuild(code: string, filename: string, options: BuildOptions): Promise<import("esbuild").BuildResult>;
+export declare function esbuild(options: BuildOptions): Promise<import("esbuild").BuildResult>;

package/dist/esbuild.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformWithEsbuild = void 0;
+exports.esbuild = exports.transformWithEsbuild = void 0;
 const path_1 = __importDefault(require("path"));
 function transformWithEsbuild(code, filename, options) {
     options.stdin = {
@@ -38,3 +38,9 @@ function transformWithEsbuild(code, filename, options) {
     });
 }
 exports.transformWithEsbuild = transformWithEsbuild;
+function esbuild(options) {
+    return Promise.resolve().then(() => __importStar(require('esbuild'))).then((esbuild) => {
+        return esbuild.build(options);
+    });
+}
+exports.esbuild = esbuild;

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

@@ -1,3 +1,3 @@
 export declare const polyfillCode = "\nif (typeof Promise !== 'undefined' && !Promise.prototype.finally) {\n  Promise.prototype.finally = function(callback) {\n    const promise = this.constructor\n    return this.then(\n      value => promise.resolve(callback()).then(() => value),\n      reason => promise.resolve(callback()).then(() => {\n        throw reason\n      })\n    )\n  }\n}\nif(uni&&uni.base64ToArrayBuffer){\n  ArrayBuffer = uni.base64ToArrayBuffer('').constructor\n}\n";
-export declare const restoreGlobalCode = "\nimport * as vue from 'vue'\nif(uni.restoreGlobal){\n  uni.restoreGlobal(vue,weex,plus,setTimeout,clearTimeout,setInterval,clearInterval)\n}\n";
+export declare const restoreGlobalCode = "\nif(uni.restoreGlobal){\n  uni.restoreGlobal(Vue,weex,plus,setTimeout,clearTimeout,setInterval,clearInterval)\n}\n";
 export declare const globalCode: string;

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

@@ -18,9 +18,8 @@ if(uni&&uni.base64ToArrayBuffer){
 }
 `;
 exports.restoreGlobalCode = `
-import * as vue from 'vue'
 if(uni.restoreGlobal){
-  uni.restoreGlobal(vue,weex,plus,setTimeout,clearTimeout,setInterval,clearInterval)
+  uni.restoreGlobal(Vue,weex,plus,setTimeout,clearTimeout,setInterval,clearInterval)
 }
 `;
 const GLOBALS = [

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

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

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.definePageCode = void 0;
+exports.defineNVuePageCode = exports.definePageCode = void 0;
 const utils_1 = require("../../../utils");
 function definePageCode(pagesJson) {
     const importPagesCode = [];
@@ -26,3 +26,17 @@ function definePageCode(pagesJson) {
     return importPagesCode.join('\n') + '\n' + definePagesCode.join('\n');
 }
 exports.definePageCode = definePageCode;
+function defineNVuePageCode(pagesJson) {
+    const importNVuePagesCode = [];
+    pagesJson.pages.forEach((page) => {
+        if (!page.style.isNVue) {
+            return;
+        }
+        const pagePathWithExtname = (0, utils_1.normalizePagePath)(page.path, 'app');
+        if (pagePathWithExtname) {
+            importNVuePagesCode.push(`import('./${pagePathWithExtname}').then(()=>{})`);
+        }
+    });
+    return importNVuePagesCode.join('\n');
+}
+exports.defineNVuePageCode = defineNVuePageCode;

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

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

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeAppConfigService = exports.normalizeAppPagesJson = void 0;
+exports.normalizeAppConfigService = exports.normalizeAppNVuePagesJson = exports.normalizeAppPagesJson = void 0;
 const code_1 = require("./code");
 const definePage_1 = require("./definePage");
 const uniConfig_1 = require("./uniConfig");
@@ -9,12 +9,17 @@ function normalizeAppPagesJson(pagesJson) {
     return code_1.polyfillCode + code_1.restoreGlobalCode + (0, definePage_1.definePageCode)(pagesJson);
 }
 exports.normalizeAppPagesJson = normalizeAppPagesJson;
+function normalizeAppNVuePagesJson(pagesJson) {
+    return (0, definePage_1.defineNVuePageCode)(pagesJson);
+}
+exports.normalizeAppNVuePagesJson = normalizeAppNVuePagesJson;
 function normalizeAppConfigService(pagesJson, manifestJson) {
     return `
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
   const __uniConfig = ${(0, uniConfig_1.normalizeAppUniConfig)(pagesJson, manifestJson)};
   const __uniRoutes = ${(0, uniRoutes_1.normalizeAppUniRoutes)(pagesJson)}.map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  __uniConfig.styles=${process.env.UNI_NVUE_APP_STYLES || '[]'};//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:16})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,${code_1.globalCode}}}}}); 

package/dist/json/manifest.d.ts

@@ -19,7 +19,7 @@ export declare function normalizeNetworkTimeout(networkTimeout?: Partial<typeof
     downloadFile: number;
 };
 export declare function getUniStatistics(inputDir: string, platform: UniApp.PLATFORM): any;
-export declare function getUniPush(inputDir: string, platform: UniApp.PLATFORM): any;
+export declare function isEnableUniPushV2(inputDir: string, platform: UniApp.PLATFORM): boolean;
 export declare function isUniPushOffline(inputDir: string): boolean;
 export declare function getRouterOptions(manifestJson: Record<string, any>): {
     mode?: 'history' | 'hash';

package/dist/json/manifest.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.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.getUniPush = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.isEnableUniPushV2 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -47,15 +47,20 @@ function getUniStatistics(inputDir, platform) {
     return (0, shared_1.extend)({}, manifest.uniStatistics, manifest[platform] && manifest[platform].uniStatistics);
 }
 exports.getUniStatistics = getUniStatistics;
-function getUniPush(inputDir, platform) {
+function isEnableUniPushV2(inputDir, platform) {
+    var _a, _b, _c, _d, _e, _f, _g;
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
-    return (0, shared_1.extend)({}, manifest.unipush, manifest[platform] && manifest[platform].unipush);
+    if (platform === 'app') {
+        return (((_e = (_d = (_c = (_b = (_a = manifest['app-plus']) === null || _a === void 0 ? void 0 : _a.distribute) === null || _b === void 0 ? void 0 : _b.sdkConfigs) === null || _c === void 0 ? void 0 : _c.push) === null || _d === void 0 ? void 0 : _d.unipush) === null || _e === void 0 ? void 0 : _e.version) ==
+            '2');
+    }
+    return ((_g = (_f = manifest[platform]) === null || _f === void 0 ? void 0 : _f.unipush) === null || _g === void 0 ? void 0 : _g.enable) === true;
 }
-exports.getUniPush = getUniPush;
+exports.isEnableUniPushV2 = isEnableUniPushV2;
 function isUniPushOffline(inputDir) {
     var _a, _b, _c, _d, _e;
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
-    return (((_e = (_d = (_c = (_b = (_a = manifest === null || manifest === void 0 ? void 0 : manifest['app-plus']) === null || _a === void 0 ? void 0 : _a.distribute) === null || _b === void 0 ? void 0 : _b.sdkConfigs) === null || _c === void 0 ? void 0 : _c.push) === null || _d === void 0 ? void 0 : _d.unipush) === null || _e === void 0 ? void 0 : _e.enable) ===
+    return (((_e = (_d = (_c = (_b = (_a = manifest['app-plus']) === null || _a === void 0 ? void 0 : _a.distribute) === null || _b === void 0 ? void 0 : _b.sdkConfigs) === null || _c === void 0 ? void 0 : _c.push) === null || _d === void 0 ? void 0 : _d.unipush) === null || _e === void 0 ? void 0 : _e.offline) ===
         true);
 }
 exports.isUniPushOffline = isUniPushOffline;

package/dist/json/pages.js

@@ -113,9 +113,30 @@ function validatePages(pagesJson, jsonStr) {
 }
 exports.validatePages = validatePages;
 function normalizePages(pages, platform) {
-    return pages.forEach((page) => {
+    pages.forEach((page) => {
         page.style = normalizePageStyle(page.path, page.style, platform);
     });
+    if (platform !== 'app') {
+        return;
+    }
+    const subNVuePages = [];
+    // subNVues
+    pages.forEach(({ style: { subNVues } }) => {
+        if (!(0, shared_1.isArray)(subNVues)) {
+            return;
+        }
+        subNVues.forEach((subNVue) => {
+            if (subNVue && subNVue.path) {
+                subNVuePages.push({
+                    path: subNVue.path,
+                    style: { isSubNVue: true, isNVue: true, navigationBar: {} },
+                });
+            }
+        });
+    });
+    if (subNVuePages.length) {
+        pages.push(...subNVuePages);
+    }
 }
 function normalizeSubpackages(subpackages) {
     const pages = [];
@@ -137,7 +158,7 @@ function normalizeSubpackageSubNVues(root, style = { navigationBar: {} }) {
     if (!platformStyle) {
         return style;
     }
-    if (Array.isArray(platformStyle.subNVues)) {
+    if ((0, shared_1.isArray)(platformStyle.subNVues)) {
         platformStyle.subNVues.forEach((subNVue) => {
             if (subNVue.path) {
                 subNVue.path = (0, utils_1.normalizePath)(path_1.default.join(root, subNVue.path));

package/dist/logs/format.d.ts

@@ -4,5 +4,8 @@ export interface Formatter<T extends LogOptions = LogOptions> {
     format: (msg: string, options?: T) => string;
 }
 export declare function formatErrMsg(msg: string, options?: LogErrorOptions): string;
-export declare function formatInfoMsg(msg: string, options?: LogOptions): string;
+export declare const removeNVueInfoFormatter: Formatter;
+export declare function formatInfoMsg(msg: string, options?: LogOptions & {
+    nvue?: boolean;
+}): string;
 export declare function formatWarnMsg(msg: string, options?: LogOptions): string;

package/dist/logs/format.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatWarnMsg = exports.formatInfoMsg = exports.formatErrMsg = void 0;
+exports.formatWarnMsg = exports.formatInfoMsg = exports.removeNVueInfoFormatter = exports.formatErrMsg = void 0;
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const env_1 = require("../hbx/env");
 const alias_1 = require("../hbx/alias");
@@ -37,12 +37,37 @@ function formatErrMsg(msg, options) {
     return msg;
 }
 exports.formatErrMsg = formatErrMsg;
+const REMOVED_NVUE_MSGS = [
+    (msg) => {
+        // vite v2.7.10 building for development... (x2)
+        return msg.includes('vite v') && msg.includes('building ');
+    },
+];
+exports.removeNVueInfoFormatter = {
+    test(msg) {
+        return !!REMOVED_NVUE_MSGS.find((m) => typeof m === 'string' ? msg.includes(m) : m(msg));
+    },
+    format() {
+        return '';
+    },
+};
+const nvueInfoFormatters = [];
+const initNVueInfoFormattersOnce = (0, uni_shared_1.once)(() => {
+    nvueInfoFormatters.push(exports.removeNVueInfoFormatter);
+});
 function formatInfoMsg(msg, options) {
     initInfoFormattersOnce();
     const formatter = infoFormatters.find(({ test }) => test(msg, options));
     if (formatter) {
         return formatter.format(msg, options);
     }
+    if (options === null || options === void 0 ? void 0 : options.nvue) {
+        initNVueInfoFormattersOnce();
+        const formatter = nvueInfoFormatters.find(({ test }) => test(msg, options));
+        if (formatter) {
+            return formatter.format(msg, options);
+        }
+    }
     return msg;
 }
 exports.formatInfoMsg = formatInfoMsg;

package/dist/logs/index.d.ts

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

package/dist/logs/index.js

@@ -1,7 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatWarnMsg = exports.formatInfoMsg = exports.formatErrMsg = void 0;
+exports.output = 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 output(type, msg) {
+    if (type === lastType && msg === lastMsg) {
+        return;
+    }
+    lastMsg = msg;
+    lastType = type;
+    const method = type === 'info' ? 'log' : type;
+    console[method](msg);
+}
+exports.output = output;

package/dist/preprocess/context.js

@@ -45,7 +45,7 @@ function initPreContext(platform, userPreContext) {
     });
     defaultContext[normalizeKey(platform)] = true;
     vueContext.VUE3 = true;
-    nvueContext.VUE2 = true;
+    nvueContext.VUE3 = true;
     if (platform === 'app' || platform === 'app-plus') {
         defaultContext.APP = true;
         defaultContext.APP_PLUS = true;

package/dist/vite/index.d.ts

@@ -1,7 +1,7 @@
 import type { Plugin } from 'vite';
 import type { EmittedAsset } from 'rollup';
 import type { ParserOptions } from '@vue/compiler-core';
-import type { CompilerOptions, TemplateCompiler } from '@vue/compiler-sfc';
+import type { CompilerOptions, SFCStyleCompileOptions, TemplateCompiler } from '@vue/compiler-sfc';
 import { UniViteCopyPluginOptions } from './plugins/copy';
 export declare const cssTarget = "chrome53";
 export interface CopyOptions {
@@ -13,6 +13,7 @@ export interface CopyOptions {
 }
 interface UniVitePluginUniOptions {
     compiler?: TemplateCompiler;
+    styleOptions?: Pick<SFCStyleCompileOptions, 'postcssPlugins'>;
     compilerOptions?: {
         miniProgram?: {
             emitFile?: (emittedFile: EmittedAsset) => string;

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

@@ -2,5 +2,6 @@ import type { Plugin } from 'vite';
 interface UniCssScopedPluginOptions {
     filter: (id: string) => boolean;
 }
+export declare function uniRemoveCssScopedPlugin({ filter }?: UniCssScopedPluginOptions): Plugin;
 export declare function uniCssScopedPlugin({ filter }?: UniCssScopedPluginOptions): Plugin;
 export {};

package/dist/vite/plugins/cssScoped.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.uniCssScopedPlugin = void 0;
+exports.uniCssScopedPlugin = exports.uniRemoveCssScopedPlugin = void 0;
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
 const constants_1 = require("../../constants");
@@ -17,6 +17,28 @@ function addScoped(code) {
     }
     return code.replace(/(<style\b[^><]*)>/gi, '$1 scoped>');
 }
+function removeScoped(code) {
+    if (!SCOPED_RE.test(code)) {
+        return code;
+    }
+    return code.replace(/(<style.*)scoped(.*>)/gi, '$1$2');
+}
+function uniRemoveCssScopedPlugin({ filter } = { filter: () => false }) {
+    return {
+        name: 'uni:css-remove-scoped',
+        enforce: 'pre',
+        transform(code, id) {
+            if (!filter(id))
+                return null;
+            debugScoped(id);
+            return {
+                code: removeScoped(code),
+                map: null,
+            };
+        },
+    };
+}
+exports.uniRemoveCssScopedPlugin = uniRemoveCssScopedPlugin;
 function uniCssScopedPlugin({ filter } = { filter: () => false }) {
     return {
         name: 'uni:css-scoped',

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

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

package/dist/vite/plugins/dynamicImportPolyfill.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dynamicImportPolyfill = void 0;
+function dynamicImportPolyfill(promise = false) {
+    return {
+        name: 'dynamic-import-polyfill',
+        renderDynamicImport() {
+            return {
+                left: promise ? 'Promise.resolve(' : '(',
+                right: ')',
+            };
+        },
+    };
+}
+exports.dynamicImportPolyfill = dynamicImportPolyfill;

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

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

package/dist/vite/plugins/index.js

@@ -14,13 +14,14 @@ 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.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.assetPlugin = void 0;
+exports.generateCodeFrame = exports.commonjsProxyRE = exports.cssLangRE = exports.minifyCSS = exports.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.getAssetHash = exports.assetPlugin = void 0;
 __exportStar(require("./cssScoped"), exports);
 __exportStar(require("./copy"), exports);
 __exportStar(require("./inject"), exports);
 __exportStar(require("./mainJs"), exports);
 __exportStar(require("./jsonJs"), exports);
 __exportStar(require("./console"), exports);
+__exportStar(require("./dynamicImportPolyfill"), 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; } });
@@ -29,3 +30,7 @@ Object.defineProperty(exports, "isCSSRequest", { enumerable: true, get: function
 Object.defineProperty(exports, "cssPlugin", { enumerable: true, get: function () { return css_1.cssPlugin; } });
 Object.defineProperty(exports, "cssPostPlugin", { enumerable: true, get: function () { return css_1.cssPostPlugin; } });
 Object.defineProperty(exports, "minifyCSS", { enumerable: true, get: function () { return css_1.minifyCSS; } });
+Object.defineProperty(exports, "cssLangRE", { enumerable: true, get: function () { return css_1.cssLangRE; } });
+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; } });

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

@@ -8,5 +8,5 @@ export interface InjectOptions {
     exclude?: FilterPattern;
     [str: string]: Injectment | FilterPattern | Boolean | Function | undefined;
 }
-export declare function uniViteInjectPlugin(options: InjectOptions): Plugin;
+export declare function uniViteInjectPlugin(name: string, options: InjectOptions): Plugin;
 export {};

package/dist/vite/plugins/inject.js

@@ -13,7 +13,7 @@ const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
 const debugInject = (0, debug_1.default)('uni:inject');
 const debugInjectTry = (0, debug_1.default)('uni:inject-try');
-function uniViteInjectPlugin(options) {
+function uniViteInjectPlugin(name, options) {
     if (!options)
         throw new Error('Missing options');
     const filter = (0, pluginutils_1.createFilter)(options.include, options.exclude);
@@ -41,7 +41,7 @@ function uniViteInjectPlugin(options) {
     const sourceMap = options.sourceMap !== false;
     const callback = options.callback;
     return {
-        name: 'uni:inject',
+        name,
         // 确保在 commonjs 之后，否则会混合 es6 module 与 cjs 的代码，导致 commonjs 失效
         enforce: 'post',
         transform(code, id) {

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

@@ -24,6 +24,7 @@ export interface CSSModulesOptions {
     localsConvention?: 'camelCase' | 'camelCaseOnly' | 'dashes' | 'dashesOnly' | null;
 }
 export declare const cssLangRE: RegExp;
+export declare const commonjsProxyRE: RegExp;
 export declare const isCSSRequest: (request: string) => boolean;
 export declare const isDirectCSSRequest: (request: string) => boolean;
 /**
@@ -35,7 +36,7 @@ export declare function cssPlugin(config: ResolvedConfig): Plugin;
  */
 export declare function cssPostPlugin(config: ResolvedConfig, { chunkCssFilename, chunkCssCode, }: {
     chunkCssFilename: (id: string) => string | void;
-    chunkCssCode: (filename: string, cssCode: string) => string;
+    chunkCssCode: (filename: string, cssCode: string) => Promise<string> | string;
 }): Plugin;
 export declare const cssUrlRE: RegExp;
 export declare function minifyCSS(css: string, config: ResolvedConfig): Promise<string>;

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

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.minifyCSS = exports.cssUrlRE = exports.cssPostPlugin = exports.cssPlugin = exports.isDirectCSSRequest = exports.isCSSRequest = exports.cssLangRE = void 0;
+exports.minifyCSS = exports.cssUrlRE = exports.cssPostPlugin = exports.cssPlugin = exports.isDirectCSSRequest = exports.isCSSRequest = exports.commonjsProxyRE = exports.cssLangRE = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
@@ -42,7 +42,7 @@ const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 exports.cssLangRE = new RegExp(cssLangs);
 const cssModuleRE = new RegExp(`\\.module${cssLangs}`);
 const directRequestRE = /(\?|&)direct\b/;
-const commonjsProxyRE = /\?commonjs-proxy/;
+exports.commonjsProxyRE = /\?commonjs-proxy/;
 const isCSSRequest = (request) => exports.cssLangRE.test(request) && !directRequestRE.test(request);
 exports.isCSSRequest = isCSSRequest;
 const isDirectCSSRequest = (request) => exports.cssLangRE.test(request) && directRequestRE.test(request);
@@ -72,7 +72,7 @@ function cssPlugin(config) {
             cssModulesCache.set(config, moduleCache);
         },
         async transform(raw, id) {
-            if (!exports.cssLangRE.test(id) || commonjsProxyRE.test(id)) {
+            if (!exports.cssLangRE.test(id) || exports.commonjsProxyRE.test(id)) {
                 return;
             }
             const urlReplacer = async (url, importer) => {
@@ -123,7 +123,7 @@ function findCssModuleIds(moduleId, cssModuleIds, seen) {
                 // 查询main.js时，需要忽略pages.json.js，否则会把所有页面样式加进来
                 return;
             }
-            if (exports.cssLangRE.test(id) && !commonjsProxyRE.test(id)) {
+            if (exports.cssLangRE.test(id) && !exports.commonjsProxyRE.test(id)) {
                 cssModuleIds.add(id);
             }
             else {
@@ -146,7 +146,7 @@ function cssPostPlugin(config, { chunkCssFilename, chunkCssCode, }) {
             cssChunks = new Map();
         },
         async transform(css, id) {
-            if (!exports.cssLangRE.test(id) || commonjsProxyRE.test(id)) {
+            if (!exports.cssLangRE.test(id) || exports.commonjsProxyRE.test(id)) {
                 return;
             }
             const modules = cssModulesCache.get(config).get(id);

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

@@ -6,9 +6,6 @@ export interface UniViteFilterPluginOptions {
 }
 export declare function injectAssetPlugin(config: ResolvedConfig): void;
 export declare function injectCssPlugin(config: ResolvedConfig): void;
-export declare function injectCssPostPlugin(config: ResolvedConfig, { chunkCssFilename, chunkCssCode, }: {
-    chunkCssFilename: (id: string) => string | void;
-    chunkCssCode: (filename: string, cssCode: string) => string;
-}): 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;

package/dist/vite/utils/plugin.js

@@ -12,11 +12,7 @@ function injectCssPlugin(config) {
     replacePlugins([(0, css_1.cssPlugin)(config)], config);
 }
 exports.injectCssPlugin = injectCssPlugin;
-function injectCssPostPlugin(config, { chunkCssFilename, chunkCssCode, }) {
-    const newCssPostPlugin = (0, css_1.cssPostPlugin)(config, {
-        chunkCssFilename,
-        chunkCssCode,
-    });
+function injectCssPostPlugin(config, newCssPostPlugin) {
     const oldCssPostPlugin = config.plugins.find((p) => p.name === newCssPostPlugin.name);
     // 直接覆盖原有方法，不能删除，替换，因为 unocss 在 pre 阶段已经获取到了旧的 css-post 插件对象
     if (oldCssPostPlugin) {

package/dist/vue/utils.d.ts

@@ -28,3 +28,4 @@ export declare function createUniVueTransformAssetUrls(base: string): {
     };
 };
 export declare function getBaseNodeTransforms(base: string): import("@vue/compiler-core").NodeTransform[];
+export declare function renameProp(name: string, prop?: DirectiveNode | AttributeNode): void;

package/dist/vue/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBaseNodeTransforms = exports.createUniVueTransformAssetUrls = exports.createBindDirectiveNode = exports.createOnDirectiveNode = exports.createDirectiveNode = exports.addStaticClass = exports.createAttributeNode = exports.isUserComponent = exports.isVueSfcFile = exports.VUE_REF_IN_FOR = exports.VUE_REF = void 0;
+exports.renameProp = exports.getBaseNodeTransforms = exports.createUniVueTransformAssetUrls = exports.createBindDirectiveNode = exports.createOnDirectiveNode = exports.createDirectiveNode = exports.addStaticClass = exports.createAttributeNode = exports.isUserComponent = exports.isVueSfcFile = exports.VUE_REF_IN_FOR = exports.VUE_REF = void 0;
 const shared_1 = require("@vue/shared");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const compiler_core_1 = require("@vue/compiler-core");
 const templateTransformAssetUrl_1 = require("./transforms/templateTransformAssetUrl");
 const templateTransformSrcset_1 = require("./transforms/templateTransformSrcset");
+const ast_1 = require("../vite/utils/ast");
 const url_1 = require("../vite/utils/url");
 const constants_1 = require("../constants");
 exports.VUE_REF = 'r';
@@ -103,3 +104,17 @@ function getBaseNodeTransforms(base) {
     ];
 }
 exports.getBaseNodeTransforms = getBaseNodeTransforms;
+function renameProp(name, prop) {
+    if (!prop) {
+        return;
+    }
+    if ((0, ast_1.isDirectiveNode)(prop)) {
+        if (prop.arg && (0, compiler_core_1.isStaticExp)(prop.arg)) {
+            prop.arg.content = name;
+        }
+    }
+    else {
+        prop.name = name;
+    }
+}
+exports.renameProp = renameProp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3040220220310006",
+  "version": "3.0.0-alpha-3040320220324001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
     "@babel/core": "^7.17.2",
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.16.8",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3040220220310006",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3040220220310006",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3040320220324001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3040320220324001",
     "@rollup/pluginutils": "^4.1.2",
     "@vue/compiler-core": "3.2.31",
     "@vue/compiler-dom": "3.2.31",