From 95bb560b6da105bd6baba032a2c33c0d6c5bf0d3 Mon Sep 17 00:00:00 2001 From: patak-js Date: Sat, 18 Sep 2021 21:22:40 +0200 Subject: [PATCH 1/2] fix: normalize internal plugin names --- packages/plugin-legacy/index.js | 10 +++++----- packages/plugin-vue-jsx/index.js | 2 +- packages/vite/src/node/plugins/assetImportMetaUrl.ts | 2 +- packages/vite/src/node/plugins/loadFallback.ts | 6 +++++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/plugin-legacy/index.js b/packages/plugin-legacy/index.js index 735d20c2afa7db..2a01c16180c656 100644 --- a/packages/plugin-legacy/index.js +++ b/packages/plugin-legacy/index.js @@ -79,7 +79,7 @@ function viteLegacyPlugin(options = {}) { * @type {import('vite').Plugin} */ const legacyConfigPlugin = { - name: 'legacy-config', + name: 'vite:legacy-config', apply: 'build', config(config) { @@ -93,7 +93,7 @@ function viteLegacyPlugin(options = {}) { * @type {import('vite').Plugin} */ const legacyGenerateBundlePlugin = { - name: 'legacy-generate-polyfill-chunk', + name: 'vite:legacy-generate-polyfill-chunk', apply: 'build', configResolved(config) { @@ -164,7 +164,7 @@ function viteLegacyPlugin(options = {}) { * @type {import('vite').Plugin} */ const legacyPostPlugin = { - name: 'legacy-post-process', + name: 'vite:legacy-post-process', enforce: 'post', apply: 'build', @@ -449,7 +449,7 @@ function viteLegacyPlugin(options = {}) { * @type {import('vite').Plugin} */ const legacyEnvPlugin = { - name: 'legacy-env', + name: 'vite:legacy-env', config(config, env) { if (env) { @@ -582,7 +582,7 @@ const polyfillId = 'vite/legacy-polyfills' */ function polyfillsPlugin(imports) { return { - name: 'polyfills', + name: 'vite:legacy-polyfills', resolveId(id) { if (id === polyfillId) { return id diff --git a/packages/plugin-vue-jsx/index.js b/packages/plugin-vue-jsx/index.js index 86b011702578b2..6866899c8cb82c 100644 --- a/packages/plugin-vue-jsx/index.js +++ b/packages/plugin-vue-jsx/index.js @@ -45,7 +45,7 @@ function vueJsxPlugin(options = {}) { let needSourceMap = true return { - name: 'vue-jsx', + name: 'vite:vue-jsx', config(config) { return { diff --git a/packages/vite/src/node/plugins/assetImportMetaUrl.ts b/packages/vite/src/node/plugins/assetImportMetaUrl.ts index c2e503058ac822..1ff1ee631f3254 100644 --- a/packages/vite/src/node/plugins/assetImportMetaUrl.ts +++ b/packages/vite/src/node/plugins/assetImportMetaUrl.ts @@ -17,7 +17,7 @@ import { multilineCommentsRE, singlelineCommentsRE } from '../utils' */ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin { return { - name: 'asset-import-meta-url', + name: 'vite:asset-import-meta-url', async transform(code, id, ssr) { if (code.includes('new URL') && code.includes(`import.meta.url`)) { const importMetaUrlRE = diff --git a/packages/vite/src/node/plugins/loadFallback.ts b/packages/vite/src/node/plugins/loadFallback.ts index 625b3ee80eadbc..a88349e846e56e 100644 --- a/packages/vite/src/node/plugins/loadFallback.ts +++ b/packages/vite/src/node/plugins/loadFallback.ts @@ -2,9 +2,13 @@ import { promises as fs } from 'fs' import { Plugin } from '..' import { cleanUrl } from '../utils' +/** + * A plugin to provide build load fallback for arbitrary request with queries + */ + export function loadFallbackPlugin(): Plugin { return { - name: 'load-fallback', + name: 'vite:load-fallback', async load(id) { try { return fs.readFile(cleanUrl(id), 'utf-8') From a45e68ebde9403b59cfba97c8504838df80635ba Mon Sep 17 00:00:00 2001 From: patak Date: Sat, 18 Sep 2021 22:24:03 +0200 Subject: [PATCH 2/2] Update packages/vite/src/node/plugins/loadFallback.ts Co-authored-by: Shinigami --- packages/vite/src/node/plugins/loadFallback.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/vite/src/node/plugins/loadFallback.ts b/packages/vite/src/node/plugins/loadFallback.ts index a88349e846e56e..c60c2e6f816bf4 100644 --- a/packages/vite/src/node/plugins/loadFallback.ts +++ b/packages/vite/src/node/plugins/loadFallback.ts @@ -3,9 +3,8 @@ import { Plugin } from '..' import { cleanUrl } from '../utils' /** - * A plugin to provide build load fallback for arbitrary request with queries + * A plugin to provide build load fallback for arbitrary request with queries. */ - export function loadFallbackPlugin(): Plugin { return { name: 'vite:load-fallback',