@dcloudio/uni-cli-shared 3.0.0-alpha-3021320211123002 → 3.0.0-alpha-3030020211129001

package/dist/constants.d.ts

@@ -1,8 +1,10 @@
 export declare const PUBLIC_DIR = "static";
 export declare const EXTNAME_JS: string[];
+export declare const EXTNAME_TS: string[];
 export declare const EXTNAME_VUE: string[];
 export declare const EXTNAME_VUE_RE: RegExp;
 export declare const EXTNAME_JS_RE: RegExp;
+export declare const EXTNAME_TS_RE: RegExp;
 export declare const ASSETS_INLINE_LIMIT: number;
 export declare const APP_SERVICE_FILENAME = "app-service.js";
 export declare const BINDING_COMPONENTS = "__BINDING_COMPONENTS__";

package/dist/constants.js

@@ -1,11 +1,13 @@
 "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.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE = 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_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = 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_RE = /\.(vue|nvue)$/;
 exports.EXTNAME_JS_RE = /\.[jt]sx?$/;
+exports.EXTNAME_TS_RE = /\.tsx?$/;
 exports.ASSETS_INLINE_LIMIT = 40 * 1024;
 exports.APP_SERVICE_FILENAME = 'app-service.js';
 exports.BINDING_COMPONENTS = '__BINDING_COMPONENTS__';

package/dist/env/index.d.ts

@@ -1,2 +1,2 @@
 export { initDefine } from './define';
-export { initProvide } from './provide';
+export { initAppProvide } from './provide';

package/dist/env/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initProvide = exports.initDefine = void 0;
+exports.initAppProvide = exports.initDefine = void 0;
 var define_1 = require("./define");
 Object.defineProperty(exports, "initDefine", { enumerable: true, get: function () { return define_1.initDefine; } });
 var provide_1 = require("./provide");
-Object.defineProperty(exports, "initProvide", { enumerable: true, get: function () { return provide_1.initProvide; } });
+Object.defineProperty(exports, "initAppProvide", { enumerable: true, get: function () { return provide_1.initAppProvide; } });

package/dist/env/provide.d.ts

@@ -1,4 +1,4 @@
-export declare function initProvide(): {
+export declare function initAppProvide(): {
     __f__: string[];
     crypto: string[];
     'window.crypto': string[];

package/dist/env/provide.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initProvide = void 0;
+exports.initAppProvide = void 0;
 const path_1 = __importDefault(require("path"));
 const libDir = path_1.default.resolve(__dirname, '../../lib');
-function initProvide() {
+function initAppProvide() {
     const cryptoDefine = [path_1.default.join(libDir, 'crypto.js'), 'default'];
     return {
         __f__: ['@dcloudio/uni-shared', 'formatAppLog'],
@@ -15,4 +15,4 @@ function initProvide() {
         'global.crypto': cryptoDefine,
     };
 }
-exports.initProvide = initProvide;
+exports.initAppProvide = initAppProvide;

package/dist/hbx/alias.js

@@ -23,7 +23,7 @@ function initModuleAlias() {
 }
 exports.initModuleAlias = initModuleAlias;
 function supportAutoInstallPlugin() {
-    return true;
+    return !!process.env.HX_Version;
 }
 function installHBuilderXPlugin(plugin) {
     if (!supportAutoInstallPlugin()) {

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

@@ -15,10 +15,10 @@ function definePageCode(pagesJson) {
         if (pagePathWithExtname) {
             if (process.env.UNI_APP_CODE_SPLITING) {
                 // 拆分页面
-                importPagesCode.push(`const ${pageIdentifier} = ()=>import('./${pagePathWithExtname}?mpType=page')`);
+                importPagesCode.push(`const ${pageIdentifier} = ()=>import('./${pagePathWithExtname}')`);
             }
             else {
-                importPagesCode.push(`import ${pageIdentifier} from './${pagePathWithExtname}?mpType=page'`);
+                importPagesCode.push(`import ${pageIdentifier} from './${pagePathWithExtname}'`);
             }
             definePagesCode.push(`__definePage('${pagePath}',${pageIdentifier})`);
         }

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

@@ -17,7 +17,7 @@ function normalizeAppConfigService(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.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:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,${code_1.globalCode}}}}}); 
+  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/mp/jsonFile.d.ts

@@ -1,5 +1,6 @@
 import { ComponentJson, PageWindowOptions, UsingComponents } from './types';
-export declare function isPageFile(file: string): boolean;
+export declare function isMiniProgramPageFile(file: string, inputDir?: string): boolean;
+export declare function isMiniProgramPageSfcFile(file: string, inputDir?: string): boolean;
 export declare function hasJsonFile(filename: string): boolean;
 export declare function normalizeJsonFilename(filename: string): string;
 export declare function findChangedJsonFiles(): Map<string, string>;

package/dist/json/mp/jsonFile.js

@@ -1,18 +1,30 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.hasJsonFile = exports.isPageFile = void 0;
+exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
+const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
 const utils_1 = require("../../utils");
 const resolve_1 = require("../../resolve");
+const utils_2 = require("../../vue/utils");
 let appJsonCache = {};
 const jsonFilesCache = new Map();
 const jsonPagesCache = new Map();
 const jsonComponentsCache = new Map();
 const jsonUsingComponentsCache = new Map();
-function isPageFile(file) {
+function isMiniProgramPageFile(file, inputDir) {
+    if (inputDir && path_1.default.isAbsolute(file)) {
+        file = (0, utils_1.normalizePath)(path_1.default.relative(inputDir, file));
+    }
     return jsonPagesCache.has((0, utils_1.removeExt)(file));
 }
-exports.isPageFile = isPageFile;
+exports.isMiniProgramPageFile = isMiniProgramPageFile;
+function isMiniProgramPageSfcFile(file, inputDir) {
+    return (0, utils_2.isVueSfcFile)(file) && isMiniProgramPageFile(file, inputDir);
+}
+exports.isMiniProgramPageSfcFile = isMiniProgramPageSfcFile;
 function hasJsonFile(filename) {
     return (filename === 'app' ||
         jsonPagesCache.has(filename) ||

package/dist/json/pages.d.ts

@@ -1,5 +1,14 @@
+export declare function isUniPageFile(file: string, inputDir?: string): boolean;
+export declare function isUniPageSfcFile(file: string, inputDir?: string): boolean;
 export declare const parsePagesJson: (inputDir: string, platform: UniApp.PLATFORM, normalize?: boolean) => UniApp.PagesJson;
 export declare const parsePagesJsonOnce: (inputDir: string, platform: UniApp.PLATFORM, normalize?: boolean) => UniApp.PagesJson;
+/**
+ * 目前 App 和 H5 使用了该方法
+ * @param jsonStr
+ * @param platform
+ * @param param2
+ * @returns
+ */
 export declare function normalizePagesJson(jsonStr: string, platform: UniApp.PLATFORM, { subpackages, }?: {
     subpackages: boolean;
 }): UniApp.PagesJson;

package/dist/json/pages.js

@@ -3,13 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizePagesRoute = exports.removePlatformStyle = exports.validatePages = exports.normalizePagesJson = exports.parsePagesJsonOnce = exports.parsePagesJson = void 0;
+exports.normalizePagesRoute = exports.removePlatformStyle = exports.validatePages = exports.normalizePagesJson = exports.parsePagesJsonOnce = exports.parsePagesJson = exports.isUniPageSfcFile = exports.isUniPageFile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const utils_1 = require("../utils");
 const json_1 = require("./json");
+const utils_2 = require("../vue/utils");
+const pagesCacheSet = new Set();
+function isUniPageFile(file, inputDir = process.env.UNI_INPUT_DIR) {
+    if (inputDir && path_1.default.isAbsolute(file)) {
+        file = (0, utils_1.normalizePath)(path_1.default.relative(inputDir, file));
+    }
+    return pagesCacheSet.has((0, utils_1.removeExt)(file));
+}
+exports.isUniPageFile = isUniPageFile;
+function isUniPageSfcFile(file, inputDir = process.env.UNI_INPUT_DIR) {
+    return (0, utils_2.isVueSfcFile)(file) && isUniPageFile(file, inputDir);
+}
+exports.isUniPageSfcFile = isUniPageSfcFile;
 const parsePagesJson = (inputDir, platform, normalize = true) => {
     const jsonStr = fs_1.default.readFileSync(path_1.default.join(inputDir, 'pages.json'), 'utf8');
     if (normalize) {
@@ -19,6 +32,13 @@ const parsePagesJson = (inputDir, platform, normalize = true) => {
 };
 exports.parsePagesJson = parsePagesJson;
 exports.parsePagesJsonOnce = (0, uni_shared_1.once)(exports.parsePagesJson);
+/**
+ * 目前 App 和 H5 使用了该方法
+ * @param jsonStr
+ * @param platform
+ * @param param2
+ * @returns
+ */
 function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages: false }) {
     let pagesJson = {
         pages: [],
@@ -66,6 +86,9 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
             delete pagesJson.tabBar;
         }
     }
+    // 缓存页面列表
+    pagesCacheSet.clear();
+    pagesJson.pages.forEach((page) => pagesCacheSet.add(page.path));
     return pagesJson;
 }
 exports.normalizePagesJson = normalizePagesJson;
@@ -284,7 +307,7 @@ const DATA_RE = /^data:.*,.*/;
 function normalizeFilepath(filepath) {
     if (!(SCHEME_RE.test(filepath) || DATA_RE.test(filepath)) &&
         filepath.indexOf('/') !== 0) {
-        return '/' + filepath;
+        return (0, uni_shared_1.addLeadingSlash)(filepath);
     }
     return filepath;
 }

package/dist/mp/constants.d.ts

@@ -1,2 +1,4 @@
 export declare const COMPONENT_ON_LINK = "onVI";
 export declare const COMPONENT_BIND_LINK = "__l";
+export declare const COMPONENT_CUSTOM_HIDDEN = "data-c-h";
+export declare const COMPONENT_CUSTOM_HIDDEN_BIND: string;

package/dist/mp/constants.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COMPONENT_BIND_LINK = exports.COMPONENT_ON_LINK = void 0;
+exports.COMPONENT_CUSTOM_HIDDEN_BIND = exports.COMPONENT_CUSTOM_HIDDEN = exports.COMPONENT_BIND_LINK = exports.COMPONENT_ON_LINK = void 0;
 exports.COMPONENT_ON_LINK = 'onVI';
 exports.COMPONENT_BIND_LINK = '__l';
+exports.COMPONENT_CUSTOM_HIDDEN = 'data-c-h';
+exports.COMPONENT_CUSTOM_HIDDEN_BIND = 'bind:-' + exports.COMPONENT_CUSTOM_HIDDEN;

package/dist/mp/imports.d.ts

@@ -1,5 +1,12 @@
 import { PluginContext } from 'rollup';
 import { ImportSpecifier } from 'es-module-lexer';
+/**
+ * 暂时没用
+ * @param source
+ * @param importer
+ * @param resolve
+ * @returns
+ */
 export declare function findVueComponentImports(source: string, importer: string, resolve: PluginContext['resolve']): Promise<(ImportSpecifier & {
     i: string;
 })[]>;

package/dist/mp/imports.js

@@ -10,6 +10,14 @@ const shared_1 = require("@vue/shared");
 const types_1 = require("@babel/types");
 const parser_1 = require("@babel/parser");
 const constants_1 = require("../constants");
+const utils_1 = require("../utils");
+/**
+ * 暂时没用
+ * @param source
+ * @param importer
+ * @param resolve
+ * @returns
+ */
 async function findVueComponentImports(source, importer, resolve) {
     await es_module_lexer_1.init;
     let imports = [];
@@ -44,6 +52,7 @@ async function findVueComponentImports(source, importer, resolve) {
         }
         if (constants_1.EXTNAME_VUE_RE.test(res.id)) {
             const expr = (0, parser_1.parse)(source.slice(importSpecifier.ss, importSpecifier.se), {
+                plugins: (0, utils_1.normalizeParsePlugins)(res.id),
                 sourceType: 'module',
             }).program.body[0];
             if ((0, types_1.isImportDeclaration)(expr) && expr.specifiers.length === 1) {

package/dist/mp/template.d.ts

@@ -39,6 +39,12 @@ export interface MiniProgramCompilerOptions {
     filter?: {
         lang: string;
     };
+    component?: {
+        /**
+         * 自定义组件自定义 hidden 属性用于实现 v-show
+         */
+        vShow: string;
+    };
     directive: string;
     emitFile?: (emittedFile: EmittedAsset) => string;
 }

package/dist/mp/transformImports.js

@@ -12,13 +12,14 @@ const magic_string_1 = __importDefault(require("magic-string"));
 const messages_1 = require("../messages");
 const constants_1 = require("../constants");
 const utils_1 = require("../utils");
+const uni_shared_1 = require("@dcloudio/uni-shared");
 async function transformVueComponentImports(code, importer, { root, resolve, global, dynamicImport, babelParserPlugins, }) {
     if (!global && !code.includes(constants_1.BINDING_COMPONENTS)) {
         return { code, usingComponents: {} };
     }
     const s = new magic_string_1.default(code);
     const scriptAst = (0, parser_1.parse)(code, {
-        plugins: [...(babelParserPlugins || [])],
+        plugins: (0, utils_1.normalizeParsePlugins)(importer, babelParserPlugins),
         sourceType: 'module',
     }).program;
     const imports = findVueComponentImports(scriptAst.body, global
@@ -32,8 +33,7 @@ async function transformVueComponentImports(code, importer, { root, resolve, glo
             s.overwrite(start, end, dynamicImport(specifier.local.name, resolveId.id) + ';');
             const componentName = (0, shared_1.hyphenate)(tag);
             if (!usingComponents[componentName]) {
-                usingComponents[componentName] =
-                    '/' + (0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(resolveId.id, root));
+                usingComponents[componentName] = (0, uni_shared_1.addLeadingSlash)((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(resolveId.id, root)));
             }
         }
     }

package/dist/utils.d.ts

@@ -1,5 +1,6 @@
 export { default as hash } from 'hash-sum';
 import { ElementNode, RootNode, TemplateChildNode } from '@vue/compiler-core';
+import { ParserPlugin } from '@babel/parser';
 export declare let isRunningWithYarnPnp: boolean;
 export declare const isWindows: boolean;
 export declare function normalizePath(id: string): string;
@@ -9,3 +10,4 @@ export declare function normalizePagePath(pagePath: string, platform: UniApp.PLA
 export declare function removeExt(str: string): string;
 export declare function normalizeNodeModules(str: string): string;
 export declare function normalizeMiniProgramFilename(filename: string, inputDir?: string): string;
+export declare function normalizeParsePlugins(importer: string, babelParserPlugins?: ParserPlugin[]): ParserPlugin[];

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.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.hash = void 0;
+exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isRunningWithYarnPnp = exports.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -65,3 +65,16 @@ function normalizeMiniProgramFilename(filename, inputDir) {
     return normalizeNodeModules(path_1.default.relative(inputDir, filename));
 }
 exports.normalizeMiniProgramFilename = normalizeMiniProgramFilename;
+function normalizeParsePlugins(importer, babelParserPlugins) {
+    const isTS = constants_1.EXTNAME_TS_RE.test(importer.split('?')[0]);
+    const plugins = [];
+    if (isTS) {
+        plugins.push('jsx');
+    }
+    if (babelParserPlugins)
+        plugins.push(...babelParserPlugins);
+    if (isTS)
+        plugins.push('typescript', 'decorators-legacy');
+    return plugins;
+}
+exports.normalizeParsePlugins = normalizeParsePlugins;

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

@@ -1,8 +1,6 @@
 import type { Plugin } from 'vite';
-import { FilterPattern } from '@rollup/pluginutils';
 interface UniCssScopedPluginOptions {
-    include?: FilterPattern;
-    exclude?: FilterPattern;
+    filter: (id: string) => boolean;
 }
-export declare function uniCssScopedPlugin(options?: UniCssScopedPluginOptions): Plugin;
+export declare function uniCssScopedPlugin({ filter }?: UniCssScopedPluginOptions): Plugin;
 export {};

package/dist/vite/plugins/cssScoped.js

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uniCssScopedPlugin = void 0;
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
-const utils_1 = require("../utils");
 const constants_1 = require("../../constants");
-const pluginutils_1 = require("@rollup/pluginutils");
 const preprocess_1 = require("../../preprocess");
 const debugScoped = (0, debug_1.default)('vite:uni:scoped');
 const SCOPED_RE = /<style\s[^>]*scoped[^>]*>/i;
@@ -18,28 +16,18 @@ function addScoped(code) {
     }
     return code.replace(/(<style\b[^><]*)>/gi, '$1 scoped>');
 }
-function uniCssScopedPlugin(options = {}) {
-    const filter = (0, pluginutils_1.createFilter)(options.include, options.exclude);
+function uniCssScopedPlugin({ filter } = { filter: () => false }) {
     return {
         name: 'vite:uni-css-scoped',
         enforce: 'pre',
         transform(code, id) {
-            if (id.endsWith('App.vue')) {
-                return;
-            }
             if (!filter(id))
                 return null;
-            const { filename, query } = (0, utils_1.parseVueRequest)(id);
-            if (query.vue) {
-                return;
-            }
-            if (constants_1.EXTNAME_VUE.includes(path_1.default.extname(filename))) {
-                debugScoped(id);
-                return {
-                    code: addScoped(code),
-                    map: null,
-                };
-            }
+            debugScoped(id);
+            return {
+                code: addScoped(code),
+                map: null,
+            };
         },
         // 仅 h5
         handleHotUpdate(ctx) {

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

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

package/dist/vite/plugins/index.js

@@ -10,7 +10,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.cssPostPlugin = exports.cssPlugin = exports.isCSSRequest = exports.assetPlugin = void 0;
+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);
@@ -19,7 +19,9 @@ __exportStar(require("./jsonJs"), exports);
 __exportStar(require("./console"), 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; } });
 var css_1 = require("./vitejs/plugins/css");
 Object.defineProperty(exports, "isCSSRequest", { enumerable: true, get: function () { return css_1.isCSSRequest; } });
 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; } });

package/dist/vite/plugins/inject.js

@@ -165,7 +165,10 @@ function uniViteInjectPlugin(options) {
             if (newImports.size === 0) {
                 return {
                     code,
-                    ast,
+                    // 不能返回 ast ，否则会导致代码不能被再次修改
+                    // 比如 App.vue 中，console.log('uniCloud') 触发了 inject 检测，检测完，发现不需要
+                    // 此时返回 ast，会导致 import { setupApp } from '@dcloudio/uni-h5' 不会被编译
+                    // ast
                     map: sourceMap ? magicString.generateMap({ hires: true }) : null,
                 };
             }

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

@@ -38,10 +38,10 @@ export declare function cssPostPlugin(config: ResolvedConfig, { chunkCssFilename
     chunkCssCode: (filename: string, cssCode: string) => string;
 }): Plugin;
 export declare const cssUrlRE: RegExp;
+export declare function minifyCSS(css: string, config: ResolvedConfig): Promise<string>;
 export interface StylePreprocessorResults {
     code: string;
     map?: object;
     errors: RollupError[];
     deps: string[];
 }
-export declare function preprocessCss(content: string): any;

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

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.preprocessCss = 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.cssLangRE = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
@@ -508,6 +508,7 @@ async function minifyCSS(css, config) {
     }
     return code;
 }
+exports.minifyCSS = minifyCSS;
 const AtImportHoistPlugin = () => {
     return {
         postcssPlugin: 'vite-hoist-at-imports',
@@ -602,7 +603,6 @@ function preprocessCss(content) {
     }
     return content;
 }
-exports.preprocessCss = preprocessCss;
 /**
  * relative url() inside \@imported sass and less files must be rebased to use
  * root file as base.

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

@@ -4,9 +4,6 @@ export interface UniViteFilterPluginOptions {
     resolvedConfig: ResolvedConfig;
     filter: (id: string) => boolean;
 }
-export declare function injectH5AssetPlugin(config: ResolvedConfig): void;
-export declare function injectH5CssPlugin(config: ResolvedConfig): void;
-export declare function injectH5CssPostPlugin(config: ResolvedConfig): void;
 export declare function injectAssetPlugin(config: ResolvedConfig): void;
 export declare function injectCssPlugin(config: ResolvedConfig): void;
 export declare function injectCssPostPlugin(config: ResolvedConfig, { chunkCssFilename, chunkCssCode, }: {

package/dist/vite/utils/plugin.js

@@ -1,22 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removePlugins = exports.replacePlugins = exports.injectCssPostPlugin = exports.injectCssPlugin = exports.injectAssetPlugin = exports.injectH5CssPostPlugin = exports.injectH5CssPlugin = exports.injectH5AssetPlugin = void 0;
+exports.removePlugins = exports.replacePlugins = exports.injectCssPostPlugin = exports.injectCssPlugin = exports.injectAssetPlugin = void 0;
 const asset_1 = require("../plugins/vitejs/plugins/asset");
 const css_1 = require("../plugins/vitejs/plugins/css");
-const h5Asset_1 = require("../plugins/vitejs/plugins/h5Asset");
-const h5Css_1 = require("../plugins/vitejs/plugins/h5Css");
-function injectH5AssetPlugin(config) {
-    replacePlugins([(0, h5Asset_1.assetPlugin)(config)], config);
-}
-exports.injectH5AssetPlugin = injectH5AssetPlugin;
-function injectH5CssPlugin(config) {
-    replacePlugins([(0, h5Css_1.cssPlugin)(config)], config);
-}
-exports.injectH5CssPlugin = injectH5CssPlugin;
-function injectH5CssPostPlugin(config) {
-    replacePlugins([(0, h5Css_1.cssPostPlugin)(config)], config);
-}
-exports.injectH5CssPostPlugin = injectH5CssPostPlugin;
 function injectAssetPlugin(config) {
     replacePlugins([(0, asset_1.assetPlugin)(config)], config);
 }

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

@@ -5,7 +5,6 @@ export interface VueQuery {
     index?: number;
     lang?: string;
     raw?: boolean;
-    mpType?: 'page';
 }
 export declare function parseVueRequest(id: string): {
     filename: string;

package/dist/vue/utils.d.ts

@@ -1,7 +1,10 @@
 import { AttributeNode, ComponentNode, DirectiveNode, ElementNode, RootNode, ExpressionNode, TemplateChildNode, TransformContext } from '@vue/compiler-core';
 export declare const VUE_REF = "r";
 export declare const VUE_REF_IN_FOR = "r-i-f";
-export declare function isUserComponent(node: RootNode | TemplateChildNode, context: TransformContext): node is ComponentNode;
+export declare function isVueSfcFile(id: string): boolean;
+export declare function isUserComponent(node: RootNode | TemplateChildNode, context: {
+    isBuiltInComponent: TransformContext['isBuiltInComponent'];
+}): node is ComponentNode;
 export declare function createAttributeNode(name: string, content: string): AttributeNode;
 export declare function addStaticClass(node: ElementNode, clazz: string): string | number | undefined;
 export declare function createDirectiveNode(name: string, arg: string, exp: string | ExpressionNode): DirectiveNode;

package/dist/vue/utils.js

@@ -1,13 +1,20 @@
 "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.VUE_REF_IN_FOR = exports.VUE_REF = void 0;
+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 url_1 = require("../vite/utils/url");
+const constants_1 = require("../constants");
 exports.VUE_REF = 'r';
 exports.VUE_REF_IN_FOR = 'r-i-f';
+function isVueSfcFile(id) {
+    const { filename, query } = (0, url_1.parseVueRequest)(id);
+    return constants_1.EXTNAME_VUE_RE.test(filename) && !query.vue;
+}
+exports.isVueSfcFile = isVueSfcFile;
 function isUserComponent(node, context) {
     return (node.type === 1 /* ELEMENT */ &&
         node.tagType === 1 /* COMPONENT */ &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3021320211123002",
+  "version": "3.0.0-alpha-3030020211129001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,13 +20,13 @@
   "dependencies": {
     "@babel/parser": "^7.15.0",
     "@babel/types": "^7.15.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3021320211123002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3021320211123002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3030020211129001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3030020211129001",
     "@rollup/pluginutils": "^4.1.1",
-    "@vue/compiler-core": "3.2.22",
-    "@vue/compiler-dom": "3.2.22",
-    "@vue/compiler-sfc": "3.2.22",
-    "@vue/shared": "3.2.22",
+    "@vue/compiler-core": "3.2.23",
+    "@vue/compiler-dom": "3.2.23",
+    "@vue/compiler-sfc": "3.2.23",
+    "@vue/shared": "3.2.23",
     "chalk": "^4.1.1",
     "chokidar": "^3.5.2",
     "compare-versions": "^3.6.0",