From be36ec18a3a26be4a1e339caa35fa05861367ee3 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Wed, 12 Jan 2022 14:00:30 +0800 Subject: [PATCH] chore: rename plugins --- packages/uni-app-vite/src/nvue/index.ts | 2 +- packages/uni-app-vite/src/nvue/plugins/entry.ts | 2 +- packages/uni-app-vite/src/plugins/confusion.ts | 2 +- packages/uni-app-vite/src/plugins/easycom.ts | 2 +- packages/uni-app-vite/src/plugins/mainJs.ts | 2 +- packages/uni-app-vite/src/plugins/manifestJson.ts | 2 +- packages/uni-app-vite/src/plugins/pagesJson.ts | 2 +- packages/uni-app-vite/src/plugins/renderjs.ts | 4 ++-- packages/uni-app-vite/src/plugins/resolveId.ts | 4 ++-- packages/uni-app-vite/src/plugins/stats.ts | 2 +- packages/uni-app-vite/src/plugins/template.ts | 2 +- packages/uni-automator/lib/uni.plugin.js | 2 +- packages/uni-automator/src/uni.plugin.ts | 2 +- packages/uni-cli-nvue/src/plugin.ts | 2 +- packages/uni-cli-shared/src/checkUpdate.ts | 2 +- packages/uni-cli-shared/src/easycom.ts | 2 +- packages/uni-cli-shared/src/vite/plugins/console.ts | 4 ++-- packages/uni-cli-shared/src/vite/plugins/copy.ts | 2 +- packages/uni-cli-shared/src/vite/plugins/cssScoped.ts | 4 ++-- packages/uni-cli-shared/src/vite/plugins/inject.ts | 6 +++--- packages/uni-cloud/lib/uni.plugin.js | 2 +- packages/uni-cloud/lib/validateFunction.js | 2 +- packages/uni-cloud/src/uni.plugin.ts | 2 +- packages/uni-cloud/src/validateFunction.ts | 2 +- packages/uni-h5-vite/src/plugin/configureServer/static.ts | 2 +- .../uni-h5-vite/src/plugin/esbuild/esbuildPrePlugin.ts | 2 +- packages/uni-h5-vite/src/plugin/handleHotUpdate/index.ts | 2 +- packages/uni-h5-vite/src/plugin/index.ts | 2 +- packages/uni-h5-vite/src/plugins/css.ts | 2 +- packages/uni-h5-vite/src/plugins/easycom.ts | 2 +- packages/uni-h5-vite/src/plugins/inject.ts | 2 +- packages/uni-h5-vite/src/plugins/mainJs.ts | 2 +- packages/uni-h5-vite/src/plugins/manifestJson.ts | 2 +- packages/uni-h5-vite/src/plugins/pagesJson.ts | 2 +- packages/uni-h5-vite/src/plugins/renderjs.ts | 4 ++-- packages/uni-h5-vite/src/plugins/resolveId.ts | 4 ++-- packages/uni-h5-vite/src/plugins/setup.ts | 4 ++-- packages/uni-h5-vite/src/plugins/ssr.ts | 2 +- packages/uni-mp-alipay/dist/uni.compiler.js | 2 +- packages/uni-mp-alipay/src/compiler/index.ts | 2 +- packages/uni-mp-baidu/dist/uni.compiler.js | 2 +- packages/uni-mp-baidu/src/compiler/index.ts | 2 +- packages/uni-mp-kuaishou/dist/uni.compiler.js | 2 +- packages/uni-mp-kuaishou/src/compiler/index.ts | 2 +- packages/uni-mp-lark/dist/uni.compiler.js | 2 +- packages/uni-mp-lark/src/compiler/index.ts | 2 +- packages/uni-mp-qq/dist/uni.compiler.js | 2 +- packages/uni-mp-qq/src/compiler/index.ts | 2 +- packages/uni-mp-toutiao/dist/uni.compiler.js | 2 +- packages/uni-mp-toutiao/src/compiler/index.ts | 2 +- packages/uni-mp-vite/src/plugin/build.ts | 2 +- packages/uni-mp-vite/src/plugin/configResolved.ts | 4 ++-- packages/uni-mp-vite/src/plugin/index.ts | 2 +- packages/uni-mp-vite/src/plugin/template.ts | 2 +- packages/uni-mp-vite/src/plugins/entry.ts | 2 +- packages/uni-mp-vite/src/plugins/mainJs.ts | 2 +- packages/uni-mp-vite/src/plugins/manifestJson.ts | 2 +- packages/uni-mp-vite/src/plugins/pagesJson.ts | 4 ++-- packages/uni-mp-vite/src/plugins/plugin.ts | 2 +- packages/uni-mp-vite/src/plugins/renderjs.ts | 4 ++-- packages/uni-mp-vite/src/plugins/runtimeHooks.ts | 2 +- packages/uni-mp-vite/src/plugins/subpackage.ts | 2 +- packages/uni-mp-vite/src/plugins/usingComponents.ts | 2 +- packages/uni-mp-weixin/dist/uni.compiler.js | 2 +- packages/uni-mp-weixin/src/compiler/index.ts | 2 +- packages/uni-quickapp-webview/dist/uni.compiler.js | 2 +- packages/uni-quickapp-webview/src/compiler/index.ts | 2 +- packages/uni-stat/lib/uni.plugin.js | 4 ++-- packages/uni-stat/src/plugin/index.ts | 4 ++-- packages/vite-plugin-uni/bin/uni.js | 8 +------- .../vite-plugin-uni/src/configResolved/plugins/index.ts | 2 +- .../vite-plugin-uni/src/configResolved/plugins/json.ts | 2 +- .../vite-plugin-uni/src/configResolved/plugins/pre.ts | 8 ++++---- .../vite-plugin-uni/src/configResolved/plugins/preCss.ts | 6 +++--- .../vite-plugin-uni/src/configResolved/plugins/preVue.ts | 4 ++-- .../src/configResolved/plugins/resolveId.ts | 4 ++-- .../vite-plugin-uni/src/configResolved/plugins/ssr.ts | 4 ++-- .../vite-plugin-uni/src/configResolved/plugins/static.ts | 4 ++-- packages/vite-plugin-uni/src/index.ts | 4 ++-- packages/vite-plugin-uni/src/plugins/copy.ts | 2 +- packages/vite-plugin-uni/src/utils/easycom.ts | 2 +- 81 files changed, 105 insertions(+), 111 deletions(-) diff --git a/packages/uni-app-vite/src/nvue/index.ts b/packages/uni-app-vite/src/nvue/index.ts index 577c80724..e97e236fd 100644 --- a/packages/uni-app-vite/src/nvue/index.ts +++ b/packages/uni-app-vite/src/nvue/index.ts @@ -2,7 +2,7 @@ import { Plugin } from 'vite' import { createRollupOptions } from './rollup' export function uniNVuePlugin(pagePath: string): Plugin { return { - name: 'vite:uni-app-nvue', + name: 'uni:app-nvue', config() { return { build: { diff --git a/packages/uni-app-vite/src/nvue/plugins/entry.ts b/packages/uni-app-vite/src/nvue/plugins/entry.ts index 073f3a1e3..e8d49b69a 100644 --- a/packages/uni-app-vite/src/nvue/plugins/entry.ts +++ b/packages/uni-app-vite/src/nvue/plugins/entry.ts @@ -24,7 +24,7 @@ function parseUniNvuePagePath(uniNVuePageUrl: string) { export function uniNVueEntryPlugin(): Plugin { const inputDir = process.env.UNI_INPUT_DIR return { - name: 'vite:uni-app-nvue-entry', + name: 'uni:app-nvue-entry', enforce: 'pre', resolveId(id) { if (isUniNVuePageUrl(id)) { diff --git a/packages/uni-app-vite/src/plugins/confusion.ts b/packages/uni-app-vite/src/plugins/confusion.ts index 76904483e..ee2867f9d 100644 --- a/packages/uni-app-vite/src/plugins/confusion.ts +++ b/packages/uni-app-vite/src/plugins/confusion.ts @@ -14,7 +14,7 @@ export function uniConfusionPlugin(): Plugin { const hasConfusion = process.env.NODE_ENV === 'production' && hasConfusionFile(inputDir) return { - name: 'vite:uni-app-confusion', + name: 'uni:app-confusion', enforce: 'post', apply: 'build', config() { diff --git a/packages/uni-app-vite/src/plugins/easycom.ts b/packages/uni-app-vite/src/plugins/easycom.ts index 9fe3774bd..9a571f688 100644 --- a/packages/uni-app-vite/src/plugins/easycom.ts +++ b/packages/uni-app-vite/src/plugins/easycom.ts @@ -18,7 +18,7 @@ interface UniEasycomPluginOptions { export function uniEasycomPlugin(options: UniEasycomPluginOptions): Plugin { const filter = createFilter(options.include, options.exclude) return { - name: 'vite:uni-app-easycom', + name: 'uni:app-easycom', transform(code, id) { if (!filter(id)) { return diff --git a/packages/uni-app-vite/src/plugins/mainJs.ts b/packages/uni-app-vite/src/plugins/mainJs.ts index 144b45ab2..dba9b1d82 100644 --- a/packages/uni-app-vite/src/plugins/mainJs.ts +++ b/packages/uni-app-vite/src/plugins/mainJs.ts @@ -3,7 +3,7 @@ import { defineUniMainJsPlugin } from '@dcloudio/uni-cli-shared' export function uniMainJsPlugin() { return defineUniMainJsPlugin((opts) => { return { - name: 'vite:uni-app-main-js', + name: 'uni:app-main-js', enforce: 'pre', transform(code, id) { if (opts.filter(id)) { diff --git a/packages/uni-app-vite/src/plugins/manifestJson.ts b/packages/uni-app-vite/src/plugins/manifestJson.ts index c5af5abe1..449c663ef 100644 --- a/packages/uni-app-vite/src/plugins/manifestJson.ts +++ b/packages/uni-app-vite/src/plugins/manifestJson.ts @@ -13,7 +13,7 @@ export function uniManifestJsonPlugin(): Plugin { return defineUniManifestJsonPlugin((opts) => { const inputDir = process.env.UNI_INPUT_DIR return { - name: 'vite:uni-app-manifest-json', + name: 'uni:app-manifest-json', enforce: 'pre', transform(code, id) { if (!opts.filter(id)) { diff --git a/packages/uni-app-vite/src/plugins/pagesJson.ts b/packages/uni-app-vite/src/plugins/pagesJson.ts index c047ac834..29d92d5ff 100644 --- a/packages/uni-app-vite/src/plugins/pagesJson.ts +++ b/packages/uni-app-vite/src/plugins/pagesJson.ts @@ -14,7 +14,7 @@ import { initWebpackNVueEntry } from '@dcloudio/uni-cli-nvue' export function uniPagesJsonPlugin(): Plugin { return defineUniPagesJsonPlugin((opts) => { return { - name: 'vite:uni-app-pages-json', + name: 'uni:app-pages-json', enforce: 'pre', transform(code, id) { if (!opts.filter(id)) { diff --git a/packages/uni-app-vite/src/plugins/renderjs.ts b/packages/uni-app-vite/src/plugins/renderjs.ts index 80dfb3a9b..8257fd542 100644 --- a/packages/uni-app-vite/src/plugins/renderjs.ts +++ b/packages/uni-app-vite/src/plugins/renderjs.ts @@ -13,7 +13,7 @@ import { transformWithEsbuild, } from '@dcloudio/uni-cli-shared' -const debugRenderjs = debug('vite:uni:renderjs') +const debugRenderjs = debug('uni:app-renderjs') export const APP_WXS_JS = 'app-wxs.js' export const APP_RENDERJS_JS = 'app-renderjs.js' @@ -24,7 +24,7 @@ export function uniRenderjsPlugin(): Plugin { let resolvedConfig: ResolvedConfig let changed: boolean = false return { - name: 'vite:uni-app-renderjs', + name: 'uni:app-renderjs', configResolved(config) { resolvedConfig = config wxsModulesCache.set(resolvedConfig, new Map()) diff --git a/packages/uni-app-vite/src/plugins/resolveId.ts b/packages/uni-app-vite/src/plugins/resolveId.ts index 47f76b9f1..a02c7bd6f 100644 --- a/packages/uni-app-vite/src/plugins/resolveId.ts +++ b/packages/uni-app-vite/src/plugins/resolveId.ts @@ -3,12 +3,12 @@ import { Plugin } from 'vite' import { resolveBuiltIn } from '@dcloudio/uni-cli-shared' -const debugResolve = debug('vite:uni:resolve') +const debugResolve = debug('uni:app-resolve-id') export function uniResolveIdPlugin(): Plugin { const resolveCache: Record = {} return { - name: 'vite:uni-app-resolve-id', + name: 'uni:app-resolve-id', enforce: 'pre', configResolved() { resolveCache['@dcloudio/uni-app-vue'] = resolveBuiltIn( diff --git a/packages/uni-app-vite/src/plugins/stats.ts b/packages/uni-app-vite/src/plugins/stats.ts index a463a90da..0c84b5236 100644 --- a/packages/uni-app-vite/src/plugins/stats.ts +++ b/packages/uni-app-vite/src/plugins/stats.ts @@ -6,7 +6,7 @@ const emittedHashMap = new WeakMap>() export function uniStatsPlugin(): Plugin { let resolvedConfig: ResolvedConfig return { - name: 'vite:uni-app-stats', + name: 'uni:app-stats', enforce: 'post', configResolved(config) { resolvedConfig = config diff --git a/packages/uni-app-vite/src/plugins/template.ts b/packages/uni-app-vite/src/plugins/template.ts index 57efb6bcc..f84cffeba 100644 --- a/packages/uni-app-vite/src/plugins/template.ts +++ b/packages/uni-app-vite/src/plugins/template.ts @@ -45,7 +45,7 @@ function genViewHtml(bundle: OutputBundle) { export function uniTemplatePlugin(): Plugin { let outputDir: string return { - name: 'vite:uni-app-template', + name: 'uni:app-template', enforce: 'post', configResolved() { outputDir = process.env.UNI_OUTPUT_DIR diff --git a/packages/uni-automator/lib/uni.plugin.js b/packages/uni-automator/lib/uni.plugin.js index a93c1bf1d..a9b51b9f6 100644 --- a/packages/uni-automator/lib/uni.plugin.js +++ b/packages/uni-automator/lib/uni.plugin.js @@ -9,7 +9,7 @@ const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared"); exports.default = [ (0, uni_cli_shared_1.defineUniMainJsPlugin)((opts) => { return { - name: 'vite:uni-automator', + name: 'uni:automator', enforce: 'pre', configResolved() { if (!process.env.UNI_AUTOMATOR_WS_ENDPOINT) { diff --git a/packages/uni-automator/src/uni.plugin.ts b/packages/uni-automator/src/uni.plugin.ts index b2bacc8bb..697e2fc06 100644 --- a/packages/uni-automator/src/uni.plugin.ts +++ b/packages/uni-automator/src/uni.plugin.ts @@ -5,7 +5,7 @@ import { defineUniMainJsPlugin } from '@dcloudio/uni-cli-shared' export default [ defineUniMainJsPlugin((opts) => { return { - name: 'vite:uni-automator', + name: 'uni:automator', enforce: 'pre', configResolved() { if (!process.env.UNI_AUTOMATOR_WS_ENDPOINT) { diff --git a/packages/uni-cli-nvue/src/plugin.ts b/packages/uni-cli-nvue/src/plugin.ts index 314980923..fbc6d94d2 100644 --- a/packages/uni-cli-nvue/src/plugin.ts +++ b/packages/uni-cli-nvue/src/plugin.ts @@ -9,7 +9,7 @@ const UniAppNVuePlugin = (): UniVitePlugin => { let lastNVueEntry: string let isPagesJsonChanged: boolean = false return { - name: 'vite:uni-cli-nvue', + name: 'uni:cli-nvue', enforce: 'post', config() { if (process.env.UNI_NVUE_COMPILER === 'vue') { diff --git a/packages/uni-cli-shared/src/checkUpdate.ts b/packages/uni-cli-shared/src/checkUpdate.ts index 0744d3b5c..416a0cba9 100644 --- a/packages/uni-cli-shared/src/checkUpdate.ts +++ b/packages/uni-cli-shared/src/checkUpdate.ts @@ -10,7 +10,7 @@ import { hasOwn, isString, isPlainObject } from '@vue/shared' import { parseManifestJsonOnce } from './json' import { isInHBuilderX } from './hbx' -const debugCheckUpdate = debug('vite:uni:check-update') +const debugCheckUpdate = debug('uni:check-update') interface CheckUpdateOptions { inputDir: string diff --git a/packages/uni-cli-shared/src/easycom.ts b/packages/uni-cli-shared/src/easycom.ts index e18db3434..1fa349fdd 100644 --- a/packages/uni-cli-shared/src/easycom.ts +++ b/packages/uni-cli-shared/src/easycom.ts @@ -24,7 +24,7 @@ interface EasycomCustom { [key: string]: string } -const debugEasycom = debug('vite:uni:easycom') +const debugEasycom = debug('uni:easycom') const easycoms: EasycomMatcher[] = [] diff --git a/packages/uni-cli-shared/src/vite/plugins/console.ts b/packages/uni-cli-shared/src/vite/plugins/console.ts index ee86bbcc5..5fcb91bef 100644 --- a/packages/uni-cli-shared/src/vite/plugins/console.ts +++ b/packages/uni-cli-shared/src/vite/plugins/console.ts @@ -12,13 +12,13 @@ export interface ConsoleOptions { exclude?: FilterPattern } -const debugConsole = debug('vite:uni:console') +const debugConsole = debug('uni:console') export function uniConsolePlugin(options: ConsoleOptions): Plugin { const filter = createFilter(options.include, options.exclude) let resolvedConfig: ResolvedConfig return { - name: 'vite:uni-console', + name: 'uni:console', enforce: 'pre', configResolved(config) { resolvedConfig = config diff --git a/packages/uni-cli-shared/src/vite/plugins/copy.ts b/packages/uni-cli-shared/src/vite/plugins/copy.ts index 9ea91048e..6ef11eb16 100644 --- a/packages/uni-cli-shared/src/vite/plugins/copy.ts +++ b/packages/uni-cli-shared/src/vite/plugins/copy.ts @@ -17,7 +17,7 @@ export function uniViteCopyPlugin({ let resolvedConfig: ResolvedConfig let inited = false return { - name: 'vite:uni-copy', + name: 'uni:copy', apply: 'build', configResolved(config) { resolvedConfig = config diff --git a/packages/uni-cli-shared/src/vite/plugins/cssScoped.ts b/packages/uni-cli-shared/src/vite/plugins/cssScoped.ts index 19eae70a2..409d79ed2 100644 --- a/packages/uni-cli-shared/src/vite/plugins/cssScoped.ts +++ b/packages/uni-cli-shared/src/vite/plugins/cssScoped.ts @@ -4,7 +4,7 @@ import type { Plugin } from 'vite' import { EXTNAME_VUE } from '../../constants' import { preHtml, preJs } from '../../preprocess' -const debugScoped = debug('vite:uni:scoped') +const debugScoped = debug('uni:scoped') const SCOPED_RE = /]*scoped[^>]*>/i @@ -23,7 +23,7 @@ export function uniCssScopedPlugin( { filter }: UniCssScopedPluginOptions = { filter: () => false } ): Plugin { return { - name: 'vite:uni-css-scoped', + name: 'uni:css-scoped', enforce: 'pre', transform(code, id) { if (!filter(id)) return null diff --git a/packages/uni-cli-shared/src/vite/plugins/inject.ts b/packages/uni-cli-shared/src/vite/plugins/inject.ts index c6a2a6e36..46c7a98ae 100644 --- a/packages/uni-cli-shared/src/vite/plugins/inject.ts +++ b/packages/uni-cli-shared/src/vite/plugins/inject.ts @@ -39,8 +39,8 @@ export interface InjectOptions { [str: string]: Injectment | FilterPattern | Boolean | Function | undefined } -const debugInject = debug('vite:uni:inject') -const debugInjectTry = debug('vite:uni:inject-try') +const debugInject = debug('uni:inject') +const debugInjectTry = debug('uni:inject-try') export function uniViteInjectPlugin(options: InjectOptions): Plugin { if (!options) throw new Error('Missing options') @@ -76,7 +76,7 @@ export function uniViteInjectPlugin(options: InjectOptions): Plugin { const sourceMap = options.sourceMap !== false const callback = options.callback return { - name: 'vite:uni-inject', + name: 'uni:inject', // 确保在 commonjs 之后,否则会混合 es6 module 与 cjs 的代码,导致 commonjs 失效 enforce: 'post', transform(code, id) { diff --git a/packages/uni-cloud/lib/uni.plugin.js b/packages/uni-cloud/lib/uni.plugin.js index 5d4f8a271..ccea4b5ee 100644 --- a/packages/uni-cloud/lib/uni.plugin.js +++ b/packages/uni-cloud/lib/uni.plugin.js @@ -10,7 +10,7 @@ initUniCloudEnv(); * @type {import('vite').Plugin} */ const UniCloudPlugin = { - name: 'vite:uni-cloud', + name: 'uni:cloud', config(config) { const silent = config.build && config.build.ssr ? true : false; if (silent) { diff --git a/packages/uni-cloud/lib/validateFunction.js b/packages/uni-cloud/lib/validateFunction.js index 5676d53d3..00f6d2c97 100644 --- a/packages/uni-cloud/lib/validateFunction.js +++ b/packages/uni-cloud/lib/validateFunction.js @@ -6,7 +6,7 @@ function replaceModuleExports(code) { } function uniValidateFunctionPlugin() { return { - name: 'vite:uni-cloud-vf', + name: 'uni:cloud-vf', enforce: 'pre', transform(code, id) { if (id.includes('validator/validateFunction')) { diff --git a/packages/uni-cloud/src/uni.plugin.ts b/packages/uni-cloud/src/uni.plugin.ts index 529ef36a6..820b9c2e0 100644 --- a/packages/uni-cloud/src/uni.plugin.ts +++ b/packages/uni-cloud/src/uni.plugin.ts @@ -23,7 +23,7 @@ initUniCloudEnv() * @type {import('vite').Plugin} */ const UniCloudPlugin: UniVitePlugin = { - name: 'vite:uni-cloud', + name: 'uni:cloud', config(config) { const silent = config.build && config.build.ssr ? true : false if (silent) { diff --git a/packages/uni-cloud/src/validateFunction.ts b/packages/uni-cloud/src/validateFunction.ts index 0c7420ef1..3d0b9bb4e 100644 --- a/packages/uni-cloud/src/validateFunction.ts +++ b/packages/uni-cloud/src/validateFunction.ts @@ -4,7 +4,7 @@ function replaceModuleExports(code: string) { } export function uniValidateFunctionPlugin(): Plugin { return { - name: 'vite:uni-cloud-vf', + name: 'uni:cloud-vf', enforce: 'pre', transform(code, id) { if (id.includes('validator/validateFunction')) { diff --git a/packages/uni-h5-vite/src/plugin/configureServer/static.ts b/packages/uni-h5-vite/src/plugin/configureServer/static.ts index bbf4dc33d..ace7ce413 100644 --- a/packages/uni-h5-vite/src/plugin/configureServer/static.ts +++ b/packages/uni-h5-vite/src/plugin/configureServer/static.ts @@ -11,7 +11,7 @@ import { import { uniStaticMiddleware } from './middlewares/static' -const debugStatic = debug('vite:uni:static') +const debugStatic = debug('uni:static') /** * devServer时提供static等目录的静态资源服务 * @param server diff --git a/packages/uni-h5-vite/src/plugin/esbuild/esbuildPrePlugin.ts b/packages/uni-h5-vite/src/plugin/esbuild/esbuildPrePlugin.ts index 6ed27c043..435b7cd87 100644 --- a/packages/uni-h5-vite/src/plugin/esbuild/esbuildPrePlugin.ts +++ b/packages/uni-h5-vite/src/plugin/esbuild/esbuildPrePlugin.ts @@ -7,7 +7,7 @@ export const JS_TYPES_RE = /\.(?:j|t)sx?$|\.mjs$/ export function esbuildPrePlugin(): Plugin { return { - name: 'vite:dep-scan', + name: 'uni:dep-scan', setup(build) { build.onLoad({ filter: JS_TYPES_RE }, ({ path: id }) => { let ext = path.extname(id).slice(1) diff --git a/packages/uni-h5-vite/src/plugin/handleHotUpdate/index.ts b/packages/uni-h5-vite/src/plugin/handleHotUpdate/index.ts index e7d6cedf6..024428812 100644 --- a/packages/uni-h5-vite/src/plugin/handleHotUpdate/index.ts +++ b/packages/uni-h5-vite/src/plugin/handleHotUpdate/index.ts @@ -11,7 +11,7 @@ import { resolveComponentsLibPath, } from '@dcloudio/uni-cli-shared' -const debugHmr = debug('vite:uni:hmr') +const debugHmr = debug('uni:hmr') async function invalidate(file: string, moduleGraph: ModuleGraph) { const mods = await moduleGraph.getModulesByFile(normalizePath(file)) diff --git a/packages/uni-h5-vite/src/plugin/index.ts b/packages/uni-h5-vite/src/plugin/index.ts index bd607f985..949d21c0b 100644 --- a/packages/uni-h5-vite/src/plugin/index.ts +++ b/packages/uni-h5-vite/src/plugin/index.ts @@ -18,7 +18,7 @@ export function uniH5Plugin(): UniVitePlugin { } rewriteReadFileSync() return { - name: 'vite:uni-h5', + name: 'uni:h5', uni: createUni(), config: createConfig(configOptions), configResolved(config) { diff --git a/packages/uni-h5-vite/src/plugins/css.ts b/packages/uni-h5-vite/src/plugins/css.ts index dd5d2cbc5..5874c58be 100644 --- a/packages/uni-h5-vite/src/plugins/css.ts +++ b/packages/uni-h5-vite/src/plugins/css.ts @@ -21,7 +21,7 @@ export function uniCssPlugin(): Plugin { let file = '' let fileName = '' return { - name: 'vite:uni-h5-css', + name: 'uni:h5-css', apply: 'build', enforce: 'pre', configResolved(config) { diff --git a/packages/uni-h5-vite/src/plugins/easycom.ts b/packages/uni-h5-vite/src/plugins/easycom.ts index 587c06dd5..79fe8d35a 100644 --- a/packages/uni-h5-vite/src/plugins/easycom.ts +++ b/packages/uni-h5-vite/src/plugins/easycom.ts @@ -60,7 +60,7 @@ export function uniEasycomPlugin(options: UniEasycomPluginOptions): Plugin { const filter = createFilter(options.include, options.exclude) let needCombineBuiltInCss = false return { - name: 'vite:uni-h5-easycom', + name: 'uni:h5-easycom', configResolved(config) { needCombineBuiltInCss = isCombineBuiltInCss(config) }, diff --git a/packages/uni-h5-vite/src/plugins/inject.ts b/packages/uni-h5-vite/src/plugins/inject.ts index 952b63efa..37515cb44 100644 --- a/packages/uni-h5-vite/src/plugins/inject.ts +++ b/packages/uni-h5-vite/src/plugins/inject.ts @@ -54,7 +54,7 @@ export function uniInjectPlugin(): Plugin { let injectPlugin: Plugin return { - name: 'vite:uni-h5-inject', + name: 'uni:h5-inject', apply: 'build', enforce: 'post', configResolved(config) { diff --git a/packages/uni-h5-vite/src/plugins/mainJs.ts b/packages/uni-h5-vite/src/plugins/mainJs.ts index 50813be25..1c99be57f 100644 --- a/packages/uni-h5-vite/src/plugins/mainJs.ts +++ b/packages/uni-h5-vite/src/plugins/mainJs.ts @@ -7,7 +7,7 @@ export function uniMainJsPlugin() { let pagesJsonJsPath = '' let runSSR = false return { - name: 'vite:uni-h5-main-js', + name: 'uni:h5-main-js', enforce: 'pre', configResolved(config) { pagesJsonJsPath = normalizePath( diff --git a/packages/uni-h5-vite/src/plugins/manifestJson.ts b/packages/uni-h5-vite/src/plugins/manifestJson.ts index e1eb5174a..a0aea0ecb 100644 --- a/packages/uni-h5-vite/src/plugins/manifestJson.ts +++ b/packages/uni-h5-vite/src/plugins/manifestJson.ts @@ -23,7 +23,7 @@ const defaultAsync = { export function uniManifestJsonPlugin(): Plugin { return defineUniManifestJsonPlugin((opts) => { return { - name: 'vite:uni-h5-manifest-json', + name: 'uni:h5-manifest-json', enforce: 'pre', transform(code, id) { if (!opts.filter(id)) { diff --git a/packages/uni-h5-vite/src/plugins/pagesJson.ts b/packages/uni-h5-vite/src/plugins/pagesJson.ts index 468f2def2..6a954f015 100644 --- a/packages/uni-h5-vite/src/plugins/pagesJson.ts +++ b/packages/uni-h5-vite/src/plugins/pagesJson.ts @@ -19,7 +19,7 @@ import { isSSR } from '../utils' export function uniPagesJsonPlugin(): Plugin { return defineUniPagesJsonPlugin((opts) => { return { - name: 'vite:uni-h5-pages-json', + name: 'uni:h5-pages-json', enforce: 'pre', transform(code, id, opt) { if (opts.filter(id)) { diff --git a/packages/uni-h5-vite/src/plugins/renderjs.ts b/packages/uni-h5-vite/src/plugins/renderjs.ts index 1e5fdbdbf..5f7475bd4 100644 --- a/packages/uni-h5-vite/src/plugins/renderjs.ts +++ b/packages/uni-h5-vite/src/plugins/renderjs.ts @@ -4,11 +4,11 @@ import { rewriteDefault } from '@vue/compiler-sfc' import { missingModuleName, parseRenderjs } from '@dcloudio/uni-cli-shared' -const debugRenderjs = debug('vite:uni:renderjs') +const debugRenderjs = debug('uni:h5-renderjs') export function uniRenderjsPlugin(): Plugin { return { - name: 'vite:uni-h5-renderjs', + name: 'uni:h5-renderjs', transform(code, id) { const { type, name } = parseRenderjs(id) if (!type) { diff --git a/packages/uni-h5-vite/src/plugins/resolveId.ts b/packages/uni-h5-vite/src/plugins/resolveId.ts index 5a837354a..cc6f037ce 100644 --- a/packages/uni-h5-vite/src/plugins/resolveId.ts +++ b/packages/uni-h5-vite/src/plugins/resolveId.ts @@ -5,12 +5,12 @@ import type { Plugin } from 'vite' import { resolveBuiltIn } from '@dcloudio/uni-cli-shared' import { ownerModuleName } from '../utils' -const debugResolve = debug('vite:uni:resolve') +const debugResolve = debug('uni:resolve') export function uniResolveIdPlugin(): Plugin { const resolveCache: Record = {} return { - name: 'vite:uni-h5-resolve-id', + name: 'uni:h5-resolve-id', enforce: 'pre', config() { resolveCache[ownerModuleName] = resolveBuiltIn( diff --git a/packages/uni-h5-vite/src/plugins/setup.ts b/packages/uni-h5-vite/src/plugins/setup.ts index 98bdbc130..adc5b6ea9 100644 --- a/packages/uni-h5-vite/src/plugins/setup.ts +++ b/packages/uni-h5-vite/src/plugins/setup.ts @@ -7,13 +7,13 @@ import { withSourcemap, } from '@dcloudio/uni-cli-shared' -const debugSetup = debug('vite:uni:setup') +const debugSetup = debug('uni:setup') export function uniSetupPlugin(): Plugin { let appVuePath: string let resolvedConfig: ResolvedConfig return { - name: 'vite:uni-setup', + name: 'uni:setup', configResolved(config) { resolvedConfig = config appVuePath = normalizePath( diff --git a/packages/uni-h5-vite/src/plugins/ssr.ts b/packages/uni-h5-vite/src/plugins/ssr.ts index c24d473e7..42b9722a3 100644 --- a/packages/uni-h5-vite/src/plugins/ssr.ts +++ b/packages/uni-h5-vite/src/plugins/ssr.ts @@ -23,7 +23,7 @@ export function uniSSRPlugin(): Plugin { let resolvedConfig: ResolvedConfig const entryServerJsCode = generateSsrEntryServerCode() return { - name: 'vite:uni-h5-ssr', + name: 'uni:h5-ssr', config(userConfig, env) { if (isSsr(env.command, userConfig)) { rewriteSsrVue() diff --git a/packages/uni-mp-alipay/dist/uni.compiler.js b/packages/uni-mp-alipay/dist/uni.compiler.js index 8d76bee7b..4b0837517 100644 --- a/packages/uni-mp-alipay/dist/uni.compiler.js +++ b/packages/uni-mp-alipay/dist/uni.compiler.js @@ -234,7 +234,7 @@ const options = { }; const uniMiniProgramAlipayPlugin = { - name: 'vite:uni-mp-alipay', + name: 'uni:mp-alipay', config() { return { define: { diff --git a/packages/uni-mp-alipay/src/compiler/index.ts b/packages/uni-mp-alipay/src/compiler/index.ts index b21ea6086..8c89b8183 100644 --- a/packages/uni-mp-alipay/src/compiler/index.ts +++ b/packages/uni-mp-alipay/src/compiler/index.ts @@ -4,7 +4,7 @@ import initMiniProgramPlugin from '@dcloudio/uni-mp-vite' import { options } from './options' const uniMiniProgramAlipayPlugin: Plugin = { - name: 'vite:uni-mp-alipay', + name: 'uni:mp-alipay', config() { return { define: { diff --git a/packages/uni-mp-baidu/dist/uni.compiler.js b/packages/uni-mp-baidu/dist/uni.compiler.js index c2137cd6e..5893fa6ac 100644 --- a/packages/uni-mp-baidu/dist/uni.compiler.js +++ b/packages/uni-mp-baidu/dist/uni.compiler.js @@ -130,7 +130,7 @@ const options = { }; const uniMiniProgramBaiduPlugin = { - name: 'vite:uni-mp-baidu', + name: 'uni:mp-baidu', config() { return { define: { diff --git a/packages/uni-mp-baidu/src/compiler/index.ts b/packages/uni-mp-baidu/src/compiler/index.ts index 5b6bed437..9f07e0b7d 100644 --- a/packages/uni-mp-baidu/src/compiler/index.ts +++ b/packages/uni-mp-baidu/src/compiler/index.ts @@ -2,7 +2,7 @@ import type { Plugin } from 'vite' import initMiniProgramPlugin from '@dcloudio/uni-mp-vite' import { options } from './options' const uniMiniProgramBaiduPlugin: Plugin = { - name: 'vite:uni-mp-baidu', + name: 'uni:mp-baidu', config() { return { define: { diff --git a/packages/uni-mp-kuaishou/dist/uni.compiler.js b/packages/uni-mp-kuaishou/dist/uni.compiler.js index 769f711c6..8abf6eaf3 100644 --- a/packages/uni-mp-kuaishou/dist/uni.compiler.js +++ b/packages/uni-mp-kuaishou/dist/uni.compiler.js @@ -184,7 +184,7 @@ const options = { }; const uniMiniProgramKuaishouPlugin = { - name: 'vite:uni-mp-kuaishou', + name: 'uni:mp-kuaishou', config() { return { define: { diff --git a/packages/uni-mp-kuaishou/src/compiler/index.ts b/packages/uni-mp-kuaishou/src/compiler/index.ts index 686e7e49e..b5d39ecc8 100644 --- a/packages/uni-mp-kuaishou/src/compiler/index.ts +++ b/packages/uni-mp-kuaishou/src/compiler/index.ts @@ -4,7 +4,7 @@ import initMiniProgramPlugin from '@dcloudio/uni-mp-vite' import { options } from './options' const uniMiniProgramKuaishouPlugin: Plugin = { - name: 'vite:uni-mp-kuaishou', + name: 'uni:mp-kuaishou', config() { return { define: { diff --git a/packages/uni-mp-lark/dist/uni.compiler.js b/packages/uni-mp-lark/dist/uni.compiler.js index 2a687fed2..d3031c5a4 100644 --- a/packages/uni-mp-lark/dist/uni.compiler.js +++ b/packages/uni-mp-lark/dist/uni.compiler.js @@ -127,7 +127,7 @@ ${filter.code} }; const uniMiniProgramToutiaoPlugin = { - name: 'vite:uni-mp-lark', + name: 'uni:mp-lark', config() { return { define: { diff --git a/packages/uni-mp-lark/src/compiler/index.ts b/packages/uni-mp-lark/src/compiler/index.ts index 9c2c7314a..d884d6d52 100644 --- a/packages/uni-mp-lark/src/compiler/index.ts +++ b/packages/uni-mp-lark/src/compiler/index.ts @@ -5,7 +5,7 @@ import { ASSETS_INLINE_LIMIT } from '@dcloudio/uni-cli-shared' import { options } from '@dcloudio/uni-mp-toutiao/src/compiler/options' const uniMiniProgramToutiaoPlugin: Plugin = { - name: 'vite:uni-mp-lark', + name: 'uni:mp-lark', config() { return { define: { diff --git a/packages/uni-mp-qq/dist/uni.compiler.js b/packages/uni-mp-qq/dist/uni.compiler.js index 0e87f6da2..7bd5b1357 100644 --- a/packages/uni-mp-qq/dist/uni.compiler.js +++ b/packages/uni-mp-qq/dist/uni.compiler.js @@ -157,7 +157,7 @@ const options = { }; const uniMiniProgramQQPlugin = { - name: 'vite:uni-mp-qq', + name: 'uni:mp-qq', config() { return { define: { diff --git a/packages/uni-mp-qq/src/compiler/index.ts b/packages/uni-mp-qq/src/compiler/index.ts index 69a6ed203..5b29a6136 100644 --- a/packages/uni-mp-qq/src/compiler/index.ts +++ b/packages/uni-mp-qq/src/compiler/index.ts @@ -6,7 +6,7 @@ import { fix2648 } from './fix2648' import { options } from './options' const uniMiniProgramQQPlugin: Plugin = { - name: 'vite:uni-mp-qq', + name: 'uni:mp-qq', config() { return { define: { diff --git a/packages/uni-mp-toutiao/dist/uni.compiler.js b/packages/uni-mp-toutiao/dist/uni.compiler.js index e1f2d78a1..b85392fae 100644 --- a/packages/uni-mp-toutiao/dist/uni.compiler.js +++ b/packages/uni-mp-toutiao/dist/uni.compiler.js @@ -127,7 +127,7 @@ ${filter.code} }; const uniMiniProgramToutiaoPlugin = { - name: 'vite:uni-mp-toutiao', + name: 'uni:mp-toutiao', config() { return { define: { diff --git a/packages/uni-mp-toutiao/src/compiler/index.ts b/packages/uni-mp-toutiao/src/compiler/index.ts index 24cac8fc4..b5dedc931 100644 --- a/packages/uni-mp-toutiao/src/compiler/index.ts +++ b/packages/uni-mp-toutiao/src/compiler/index.ts @@ -5,7 +5,7 @@ import initMiniProgramPlugin from '@dcloudio/uni-mp-vite' import { options } from './options' const uniMiniProgramToutiaoPlugin: Plugin = { - name: 'vite:uni-mp-toutiao', + name: 'uni:mp-toutiao', config() { return { define: { diff --git a/packages/uni-mp-vite/src/plugin/build.ts b/packages/uni-mp-vite/src/plugin/build.ts index 5a66c28e1..22f6edafc 100644 --- a/packages/uni-mp-vite/src/plugin/build.ts +++ b/packages/uni-mp-vite/src/plugin/build.ts @@ -23,7 +23,7 @@ import { parseVirtualPagePath, } from '../plugins/entry' -const debugChunk = debug('vite:uni:chunk') +const debugChunk = debug('uni:chunk') export function buildOptions(): UserConfig['build'] { const platform = process.env.UNI_PLATFORM diff --git a/packages/uni-mp-vite/src/plugin/configResolved.ts b/packages/uni-mp-vite/src/plugin/configResolved.ts index ae36cf034..cf055febf 100644 --- a/packages/uni-mp-vite/src/plugin/configResolved.ts +++ b/packages/uni-mp-vite/src/plugin/configResolved.ts @@ -21,7 +21,7 @@ import { parseVirtualPagePath, } from '../plugins/entry' -const debugNVueCss = debug('vite:uni:nvue-css') +const debugNVueCss = debug('uni:nvue-css') const cssVars = `page{--status-bar-height:25px;--top-window-height:0px;--window-top:0px;--window-bottom:0px;--window-left:0px;--window-right:0px;--window-magin:0px}` const genShadowCss = (cdn: string) => { @@ -114,7 +114,7 @@ export function createConfigResolved({ function adjustCssExtname(extname: string): Plugin { return { - name: 'vite:uni-adjust-css-extname', + name: 'uni:adjust-css-extname', generateBundle(_, bundle) { const files = Object.keys(bundle) files.forEach((name) => { diff --git a/packages/uni-mp-vite/src/plugin/index.ts b/packages/uni-mp-vite/src/plugin/index.ts index 7bb65e853..2933a0c78 100644 --- a/packages/uni-mp-vite/src/plugin/index.ts +++ b/packages/uni-mp-vite/src/plugin/index.ts @@ -98,7 +98,7 @@ export function uniMiniProgramPlugin( rewriteCompileScript() return { - name: 'vite:uni-mp', + name: 'uni:mp', uni: uniOptions({ copyOptions, customElements: template.customElements, diff --git a/packages/uni-mp-vite/src/plugin/template.ts b/packages/uni-mp-vite/src/plugin/template.ts index ee75e78e1..6cf60108a 100644 --- a/packages/uni-mp-vite/src/plugin/template.ts +++ b/packages/uni-mp-vite/src/plugin/template.ts @@ -14,7 +14,7 @@ import { import { getFiltersCache } from '../plugins/renderjs' import { UniMiniProgramPluginOptions } from '.' -const debugTemplate = debug('vite:uni:mp-template') +const debugTemplate = debug('uni:mp-template') export function getFilterFiles( resolvedConfig: ResolvedConfig, diff --git a/packages/uni-mp-vite/src/plugins/entry.ts b/packages/uni-mp-vite/src/plugins/entry.ts index 91057b7bf..09904d2ea 100644 --- a/packages/uni-mp-vite/src/plugins/entry.ts +++ b/packages/uni-mp-vite/src/plugins/entry.ts @@ -42,7 +42,7 @@ export function uniEntryPlugin({ }: UniMiniProgramPluginOptions): Plugin { const inputDir = process.env.UNI_INPUT_DIR return { - name: 'vite:uni-virtual', + name: 'uni:virtual', enforce: 'pre', resolveId(id) { if (isUniPageUrl(id) || isUniComponentUrl(id)) { diff --git a/packages/uni-mp-vite/src/plugins/mainJs.ts b/packages/uni-mp-vite/src/plugins/mainJs.ts index 07018d3f6..c69543faf 100644 --- a/packages/uni-mp-vite/src/plugins/mainJs.ts +++ b/packages/uni-mp-vite/src/plugins/mainJs.ts @@ -13,7 +13,7 @@ export function uniMainJsPlugin( ) { return defineUniMainJsPlugin((opts) => { return { - name: 'vite:uni-mp-main-js', + name: 'uni:mp-main-js', enforce: 'pre', async transform(source, id) { if (opts.filter(id)) { diff --git a/packages/uni-mp-vite/src/plugins/manifestJson.ts b/packages/uni-mp-vite/src/plugins/manifestJson.ts index 9a7294190..345365ebf 100644 --- a/packages/uni-mp-vite/src/plugins/manifestJson.ts +++ b/packages/uni-mp-vite/src/plugins/manifestJson.ts @@ -15,7 +15,7 @@ export function uniManifestJsonPlugin( let projectJson: Record return defineUniManifestJsonPlugin((opts) => { return { - name: 'vite:uni-mp-manifest-json', + name: 'uni:mp-manifest-json', enforce: 'pre', transform(code, id) { if (!opts.filter(id)) { diff --git a/packages/uni-mp-vite/src/plugins/pagesJson.ts b/packages/uni-mp-vite/src/plugins/pagesJson.ts index ac65757a1..eabbdb5f5 100644 --- a/packages/uni-mp-vite/src/plugins/pagesJson.ts +++ b/packages/uni-mp-vite/src/plugins/pagesJson.ts @@ -17,7 +17,7 @@ import { import { virtualPagePath } from './entry' import { UniMiniProgramPluginOptions } from '../plugin' -const debugPagesJson = debug('vite:uni:pages-json') +const debugPagesJson = debug('uni:pages-json') const nvueCssPathsCache = new Map() export function getNVueCssPaths(config: ResolvedConfig) { @@ -30,7 +30,7 @@ export function uniPagesJsonPlugin( let resolvedConfig: ResolvedConfig return defineUniPagesJsonPlugin((opts) => { return { - name: 'vite:uni-mp-pages-json', + name: 'uni:mp-pages-json', enforce: 'pre', configResolved(config) { resolvedConfig = config diff --git a/packages/uni-mp-vite/src/plugins/plugin.ts b/packages/uni-mp-vite/src/plugins/plugin.ts index 24c93fa88..fe8e0be4a 100644 --- a/packages/uni-mp-vite/src/plugins/plugin.ts +++ b/packages/uni-mp-vite/src/plugins/plugin.ts @@ -27,7 +27,7 @@ export function uniMiniProgramPluginPlugin({ ) } return { - name: 'vite:uni-mp-plugin', + name: 'uni:mp-plugin', enforce: 'post', config() { return { diff --git a/packages/uni-mp-vite/src/plugins/renderjs.ts b/packages/uni-mp-vite/src/plugins/renderjs.ts index 509055642..d287e68c5 100644 --- a/packages/uni-mp-vite/src/plugins/renderjs.ts +++ b/packages/uni-mp-vite/src/plugins/renderjs.ts @@ -8,7 +8,7 @@ import { parseRenderjs, } from '@dcloudio/uni-cli-shared' -const debugRenderjs = debug('vite:uni:renderjs') +const debugRenderjs = debug('uni:mp-renderjs') const filtersCache = new Map() @@ -19,7 +19,7 @@ export function getFiltersCache(resolvedConfig: ResolvedConfig) { export function uniRenderjsPlugin({ lang }: { lang?: string }): Plugin { let resolvedConfig: ResolvedConfig return { - name: 'vite:uni-mp-renderjs', + name: 'uni:mp-renderjs', configResolved(config) { resolvedConfig = config }, diff --git a/packages/uni-mp-vite/src/plugins/runtimeHooks.ts b/packages/uni-mp-vite/src/plugins/runtimeHooks.ts index e9178b7da..2684fc954 100644 --- a/packages/uni-mp-vite/src/plugins/runtimeHooks.ts +++ b/packages/uni-mp-vite/src/plugins/runtimeHooks.ts @@ -6,7 +6,7 @@ type RuntimeHooks = keyof typeof MINI_PROGRAM_PAGE_RUNTIME_HOOKS export function uniRuntimeHooksPlugin(): Plugin { return { - name: 'vite:uni-mp-runtime-hooks', + name: 'uni:mp-runtime-hooks', enforce: 'post', async transform(source, id) { if (!isUniPageSfcFile(id)) { diff --git a/packages/uni-mp-vite/src/plugins/subpackage.ts b/packages/uni-mp-vite/src/plugins/subpackage.ts index 39017a943..9c81acd5e 100644 --- a/packages/uni-mp-vite/src/plugins/subpackage.ts +++ b/packages/uni-mp-vite/src/plugins/subpackage.ts @@ -7,7 +7,7 @@ export function uniSubpackagePlugin({ style: { extname }, }: UniMiniProgramPluginOptions): Plugin { return { - name: 'vite:uni-mp-subpackage', + name: 'uni:mp-subpackage', enforce: 'post', generateBundle: createNonAppGenerateBundle(extname), } diff --git a/packages/uni-mp-vite/src/plugins/usingComponents.ts b/packages/uni-mp-vite/src/plugins/usingComponents.ts index a1f698421..f8ad8df9a 100644 --- a/packages/uni-mp-vite/src/plugins/usingComponents.ts +++ b/packages/uni-mp-vite/src/plugins/usingComponents.ts @@ -28,7 +28,7 @@ export function uniUsingComponentsPlugin( const inputDir = process.env.UNI_INPUT_DIR let resolvedConfig: ResolvedConfig return { - name: 'vite:uni-mp-using-component', + name: 'uni:mp-using-component', enforce: 'post', configResolved(config) { resolvedConfig = config diff --git a/packages/uni-mp-weixin/dist/uni.compiler.js b/packages/uni-mp-weixin/dist/uni.compiler.js index 343fb82d7..286ad624c 100644 --- a/packages/uni-mp-weixin/dist/uni.compiler.js +++ b/packages/uni-mp-weixin/dist/uni.compiler.js @@ -150,7 +150,7 @@ ${filter.code} }; const uniMiniProgramWeixinPlugin = { - name: 'vite:uni-mp-weixin', + name: 'uni:mp-weixin', config() { return { define: { diff --git a/packages/uni-mp-weixin/src/compiler/index.ts b/packages/uni-mp-weixin/src/compiler/index.ts index 248cc4ebb..95a8b2bfa 100644 --- a/packages/uni-mp-weixin/src/compiler/index.ts +++ b/packages/uni-mp-weixin/src/compiler/index.ts @@ -4,7 +4,7 @@ import initMiniProgramPlugin from '@dcloudio/uni-mp-vite' import { options } from './options' const uniMiniProgramWeixinPlugin: Plugin = { - name: 'vite:uni-mp-weixin', + name: 'uni:mp-weixin', config() { return { define: { diff --git a/packages/uni-quickapp-webview/dist/uni.compiler.js b/packages/uni-quickapp-webview/dist/uni.compiler.js index 4e8cc3ad1..e2577c841 100644 --- a/packages/uni-quickapp-webview/dist/uni.compiler.js +++ b/packages/uni-quickapp-webview/dist/uni.compiler.js @@ -110,7 +110,7 @@ ${filter.code} }; const uniQuickappWebviewPlugin = { - name: 'vite:uni-quickapp-webview', + name: 'uni:quickapp-webview', config() { return { define: { diff --git a/packages/uni-quickapp-webview/src/compiler/index.ts b/packages/uni-quickapp-webview/src/compiler/index.ts index 5edbfc274..4b60c0db6 100644 --- a/packages/uni-quickapp-webview/src/compiler/index.ts +++ b/packages/uni-quickapp-webview/src/compiler/index.ts @@ -4,7 +4,7 @@ import initMiniProgramPlugin from '@dcloudio/uni-mp-vite' import { options } from './options' const uniQuickappWebviewPlugin: Plugin = { - name: 'vite:uni-quickapp-webview', + name: 'uni:quickapp-webview', config() { return { define: { diff --git a/packages/uni-stat/lib/uni.plugin.js b/packages/uni-stat/lib/uni.plugin.js index 554f7484b..8e957e576 100644 --- a/packages/uni-stat/lib/uni.plugin.js +++ b/packages/uni-stat/lib/uni.plugin.js @@ -11,7 +11,7 @@ var index = [ uniCliShared.defineUniMainJsPlugin((opts) => { let isEnable = false; return { - name: 'vite:uni-stat', + name: 'uni:stat', enforce: 'pre', config(config, env) { if (isSsr(env.command, config)) { @@ -46,7 +46,7 @@ var index = [ } }); } - debug__default["default"]('vite:uni:stat')('isEnable', isEnable); + debug__default["default"]('uni:stat')('isEnable', isEnable); process.env.UNI_STAT_TITLE_JSON = JSON.stringify(titlesJson); return { define: { diff --git a/packages/uni-stat/src/plugin/index.ts b/packages/uni-stat/src/plugin/index.ts index 0dc66d2c0..e4f5f054f 100644 --- a/packages/uni-stat/src/plugin/index.ts +++ b/packages/uni-stat/src/plugin/index.ts @@ -12,7 +12,7 @@ export default [ defineUniMainJsPlugin((opts) => { let isEnable = false return { - name: 'vite:uni-stat', + name: 'uni:stat', enforce: 'pre', config(config, env) { if (isSsr(env.command, config)) { @@ -45,7 +45,7 @@ export default [ } }) } - debug('vite:uni:stat')('isEnable', isEnable) + debug('uni:stat')('isEnable', isEnable) process.env.UNI_STAT_TITLE_JSON = JSON.stringify(titlesJson) return { define: { diff --git a/packages/vite-plugin-uni/bin/uni.js b/packages/vite-plugin-uni/bin/uni.js index f0bdd1ab3..79087b2ff 100755 --- a/packages/vite-plugin-uni/bin/uni.js +++ b/packages/vite-plugin-uni/bin/uni.js @@ -8,13 +8,7 @@ const filterIndex = process.argv.findIndex((arg) => if (debugIndex > 0) { let value = process.argv[debugIndex + 1] if (!value || value.startsWith('-')) { - value = 'vite:*' - } else { - // support debugging multiple flags with comma-separated list - value = value - .split(',') - .map((v) => `vite:${v}`) - .join(',') + value = 'vite:*,uni:*' } process.env.DEBUG = value diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/index.ts b/packages/vite-plugin-uni/src/configResolved/plugins/index.ts index 29b313860..67894b866 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/index.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/index.ts @@ -16,7 +16,7 @@ import { uniPreVuePlugin } from './preVue' import { uniSSRPlugin } from './ssr' import { uniResolveIdPlugin } from './resolveId' -const debugPlugin = debug('vite:uni:plugin') +const debugPlugin = debug('uni:plugin') export interface UniPluginFilterOptions extends VitePluginUniResolvedOptions { include?: FilterPattern diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/json.ts b/packages/vite-plugin-uni/src/configResolved/plugins/json.ts index 5b2ba0ff4..f8fa78c95 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/json.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/json.ts @@ -8,7 +8,7 @@ const SPECIAL_QUERY_RE = /[\?&](?:worker|sharedworker|raw|url)\b/ export function uniJsonPlugin(options: VitePluginUniResolvedOptions): Plugin { return { - name: 'vite:uni-json', + name: 'uni:json', transform(code, id) { if (!jsonExtRE.test(id)) return null if (SPECIAL_QUERY_RE.test(id)) return null diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/pre.ts b/packages/vite-plugin-uni/src/configResolved/plugins/pre.ts index eefc7b029..75ed21218 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/pre.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/pre.ts @@ -12,9 +12,9 @@ import { } from '@dcloudio/uni-cli-shared' import { UniPluginFilterOptions } from '.' -const debugPreJs = debug('vite:uni:pre-js') -const debugPreHtml = debug('vite:uni:pre-html') -const debugPreJsTry = debug('vite:uni:pre-js-try') +const debugPreJs = debug('uni:pre-js') +const debugPreHtml = debug('uni:pre-html') +const debugPreJsTry = debug('uni:pre-js-try') const PRE_JS_EXTNAME = ['.json', '.css'].concat(EXTNAME_VUE).concat(EXTNAME_JS) const PRE_HTML_EXTNAME = EXTNAME_VUE @@ -25,7 +25,7 @@ export function uniPrePlugin( const filter = createFilter(options.include, options.exclude) return { - name: 'vite:uni-pre', + name: 'uni:pre', transform(code, id) { if (!filter(id)) { return diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/preCss.ts b/packages/vite-plugin-uni/src/configResolved/plugins/preCss.ts index a20640ba2..ab07b4215 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/preCss.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/preCss.ts @@ -5,8 +5,8 @@ import { preJs, withSourcemap } from '@dcloudio/uni-cli-shared' import { UniPluginFilterOptions } from '.' -const debugPre = debug('vite:uni:pre-css') -const debugPreTry = debug('vite:uni:pre-css-try') +const debugPre = debug('uni:pre-css') +const debugPreTry = debug('uni:pre-css-try') const cssLangs = `\\.(css|less|sass|scss|styl|stylus|postcss)($|\\?)` const cssLangRE = new RegExp(cssLangs) /** @@ -19,7 +19,7 @@ export function uniPreCssPlugin( ): Plugin { const filter = createFilter(options.include, options.exclude) return { - name: 'vite:uni-pre-css', + name: 'uni:pre-css', transform(code, id) { if (!cssLangRE.test(id)) { return diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts b/packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts index 8c5626d18..ee6a24e9e 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts @@ -21,7 +21,7 @@ import { parseVue, } from '@dcloudio/uni-cli-shared' -const debugPreVue = debug('vite:uni:pre-vue') +const debugPreVue = debug('uni:pre-vue') const BLOCK_RE = /<\/block>/ @@ -31,7 +31,7 @@ const WXS_ATTRS = ['wxs', 'renderjs'] export function uniPreVuePlugin(): Plugin { return { - name: 'vite:uni-pre-vue', + name: 'uni:pre-vue', async transform(code, id) { const { filename, query } = parseVueRequest(id) if (query.vue) { diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/resolveId.ts b/packages/vite-plugin-uni/src/configResolved/plugins/resolveId.ts index f4f712d63..e7bf706a0 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/resolveId.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/resolveId.ts @@ -5,7 +5,7 @@ import { resolveBuiltIn } from '@dcloudio/uni-cli-shared' import { VitePluginUniResolvedOptions } from '../..' -const debugResolve = debug('vite:uni:resolve') +const debugResolve = debug('uni:resolve-id') const BUILT_IN_MODULES = { 'vue-router': 'dist/vue-router.esm-bundler.js', @@ -25,7 +25,7 @@ export function uniResolveIdPlugin( ): Plugin { const resolveCache: Record = {} return { - name: 'vite:uni-resolve-id', + name: 'uni:resolve-id', resolveId(id) { const cache = resolveCache[id] if (cache) { diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/ssr.ts b/packages/vite-plugin-uni/src/configResolved/plugins/ssr.ts index b24167e52..737c56888 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/ssr.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/ssr.ts @@ -15,7 +15,7 @@ import { } from '@dcloudio/uni-cli-shared' import { UniPluginFilterOptions } from '.' -const debugSSR = debug('vite:uni:ssr') +const debugSSR = debug('uni:ssr') const KEYED_FUNC_RE = /(ssrRef|shallowSsrRef)/ @@ -25,7 +25,7 @@ export function uniSSRPlugin( ): Plugin { const filter = createFilter(options.include, options.exclude) return { - name: 'vite:uni-ssr', + name: 'uni:ssr', transform(code, id) { if (!filter(id)) return null if (!KEYED_FUNC_RE.test(code)) { diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/static.ts b/packages/vite-plugin-uni/src/configResolved/plugins/static.ts index ddeccbe1b..f750cf9ff 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/static.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/static.ts @@ -5,7 +5,7 @@ import { cleanUrl } from '@dcloudio/uni-cli-shared' import { UniPluginFilterOptions } from '.' import { createPublicFileFilter } from '../../utils' -const debugStatic = debug('vite:uni:static') +const debugStatic = debug('uni:static') /** * 提供static等目录静态资源加载 * @param _options @@ -18,7 +18,7 @@ export function uniStaticPlugin( ): Plugin { const filter = createPublicFileFilter() return { - name: 'vite:uni-static', + name: 'uni:static', resolveId(id) { if (!config.assetsInclude(cleanUrl(id))) { return diff --git a/packages/vite-plugin-uni/src/index.ts b/packages/vite-plugin-uni/src/index.ts index 53220d77e..43f22cd1c 100644 --- a/packages/vite-plugin-uni/src/index.ts +++ b/packages/vite-plugin-uni/src/index.ts @@ -29,7 +29,7 @@ import { } from './vue' // import { createResolveId } from './resolveId' -const debugUni = debug('vite:uni:plugin') +const debugUni = debug('uni:plugin') const pkg = require(path.resolve(__dirname, '../package.json')) @@ -114,7 +114,7 @@ export default function uniPlugin( } plugins.push({ - name: 'vite:uni', + name: 'uni', config: createConfig(options, uniPlugins), // resolveId: createResolveId(options), configResolved: createConfigResolved(options), diff --git a/packages/vite-plugin-uni/src/plugins/copy.ts b/packages/vite-plugin-uni/src/plugins/copy.ts index e6f9ea260..42b52ac84 100644 --- a/packages/vite-plugin-uni/src/plugins/copy.ts +++ b/packages/vite-plugin-uni/src/plugins/copy.ts @@ -13,7 +13,7 @@ import { } from '@dcloudio/uni-cli-shared' import { VitePluginUniResolvedOptions } from '..' -const debugCopy = debug('vite:uni:copy') +const debugCopy = debug('uni:copy') export function uniCopyPlugin({ outputDir, diff --git a/packages/vite-plugin-uni/src/utils/easycom.ts b/packages/vite-plugin-uni/src/utils/easycom.ts index eaa5b58aa..6a23d6288 100644 --- a/packages/vite-plugin-uni/src/utils/easycom.ts +++ b/packages/vite-plugin-uni/src/utils/easycom.ts @@ -7,7 +7,7 @@ import { resolveComponentsLibPath, } from '@dcloudio/uni-cli-shared' -const debugEasycom = debug('vite:uni:easycom') +const debugEasycom = debug('uni:easycom') export const initEasycom = (watcher?: FSWatcher) => { const { filter, refresh, options } = initEasycomsOnce( process.env.UNI_INPUT_DIR, -- GitLab