chore: update

vitejs · May 29, 2022 · 73e8bfd · 73e8bfd
1 parent 461e7f5
commit 73e8bfd
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 43 deletions.
diff --git a/packages/vite/src/node/plugins/assetImportMetaUrl.ts b/packages/vite/src/node/plugins/assetImportMetaUrl.ts
@@ -3,6 +3,7 @@ import MagicString from 'magic-string'
 import { stripLiteral } from 'strip-literal'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
+import { transformResult } from '../utils'
 import { fileToUrl } from './asset'
 import { preloadHelperId } from './importAnalysisBuild'
 
@@ -17,8 +18,6 @@ import { preloadHelperId } from './importAnalysisBuild'
  * ```
  */
 export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
-  const isBuild = config.command === 'build'
-
   return {
     name: 'vite:asset-import-meta-url',
     async transform(code, id, options) {
@@ -82,13 +81,7 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
           )
         }
         if (s) {
-          return {
-            code: s.toString(),
-            map:
-              !isBuild || config.build.sourcemap
-                ? s.generateMap({ hires: true, source: id })
-                : null
-          }
+          return transformResult(s, id, config)
         }
       }
       return null

diff --git a/packages/vite/src/node/plugins/dynamicImportVars.ts b/packages/vite/src/node/plugins/dynamicImportVars.ts
@@ -7,7 +7,12 @@ import { createFilter } from '@rollup/pluginutils'
 import { dynamicImportToGlob } from '@rollup/plugin-dynamic-import-vars'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
-import { normalizePath, parseRequest, requestQuerySplitRE } from '../utils'
+import {
+  normalizePath,
+  parseRequest,
+  requestQuerySplitRE,
+  transformResult
+} from '../utils'
 
 export const dynamicImportHelperId = '/@vite/dynamic-import-helper'
 
@@ -117,7 +122,6 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
   const { include, exclude, warnOnError } =
     config.build.dynamicImportVarsOptions
   const filter = createFilter(include, exclude)
-  const isBuild = config.command === 'build'
 
   return {
     name: 'vite:dynamic-import-vars',
@@ -205,13 +209,7 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
             `import __variableDynamicImportRuntimeHelper from "${dynamicImportHelperId}";`
           )
         }
-        return {
-          code: s.toString(),
-          map:
-            !isBuild || config.build.sourcemap
-              ? s.generateMap({ hires: true, source: importer })
-              : null
-        }
+        return transformResult(s, importer, config)
       }
     }
   }

diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -37,6 +37,7 @@ import {
   prettifyUrl,
   removeImportQuery,
   timeFrom,
+  transformResult,
   unwrapId
 } from '../utils'
 import type { ResolvedConfig } from '../config'
@@ -111,7 +112,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
   const { root, base } = config
   const clientPublicPath = path.posix.join(base, CLIENT_PUBLIC_PATH)
   let server: ViteDevServer
-  const isBuild = config.command === 'build'
+
   return {
     name: 'vite:import-analysis',
 
@@ -626,13 +627,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       }
 
       if (s) {
-        return {
-          code: s.toString(),
-          map:
-            !isBuild || config.build.sourcemap
-              ? s.generateMap({ hires: true, source: importer })
-              : null
-        }
+        return transformResult(s, importer, config)
       } else {
         return source
       }

diff --git a/packages/vite/src/node/plugins/importMetaGlob.ts b/packages/vite/src/node/plugins/importMetaGlob.ts
@@ -17,7 +17,7 @@ import type { Plugin } from '../plugin'
 import type { ViteDevServer } from '../server'
 import type { ModuleNode } from '../server/moduleGraph'
 import type { ResolvedConfig } from '../config'
-import { normalizePath, slash } from '../utils'
+import { normalizePath, slash, transformResult } from '../utils'
 
 const { isMatch, scan } = micromatch
 
@@ -47,7 +47,6 @@ export function getAffectedGlobModules(file: string, server: ViteDevServer) {
 
 export function importGlobPlugin(config: ResolvedConfig): Plugin {
   let server: ViteDevServer | undefined
-  const isBuild = config.command === 'build'
 
   return {
     name: 'vite:import-glob',
@@ -73,13 +72,7 @@ export function importGlobPlugin(config: ResolvedConfig): Plugin {
             server!.watcher.add(dirname(file))
           })
         }
-        return {
-          code: result.s.toString(),
-          map:
-            !isBuild || config.build.sourcemap
-              ? result.s.generateMap({ hires: true, source: id })
-              : null
-        }
+        return transformResult(result.s, id, config)
       }
     }
   }

diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -5,7 +5,13 @@ import type { RollupError } from 'rollup'
 import { stripLiteral } from 'strip-literal'
 import type { ResolvedConfig } from '../config'
 import type { Plugin } from '../plugin'
-import { cleanUrl, injectQuery, normalizePath, parseRequest } from '../utils'
+import {
+  cleanUrl,
+  injectQuery,
+  normalizePath,
+  parseRequest,
+  transformResult
+} from '../utils'
 import type { WorkerType } from './worker'
 import { WORKER_FILE_ID, workerFileToUrl } from './worker'
 import { fileToUrl } from './asset'
@@ -130,13 +136,7 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
         }
 
         if (s) {
-          return {
-            code: s.toString(),
-            map:
-              !isBuild || config.build.sourcemap
-                ? s.generateMap({ hires: true, source: id })
-                : null
-          }
+          return transformResult(s, id, config)
         }
 
         return null

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -13,6 +13,8 @@ import type { DecodedSourceMap, RawSourceMap } from '@ampproject/remapping'
 import colors from 'picocolors'
 import debug from 'debug'
 import type { Alias, AliasOptions } from 'types/alias'
+import type MagicString from 'magic-string'
+
 import {
   CLIENT_ENTRY,
   CLIENT_PUBLIC_PATH,
@@ -21,6 +23,7 @@ import {
   FS_PREFIX,
   VALID_ID_PREFIX
 } from './constants'
+import type { ResolvedConfig } from '.'
 
 export function slash(p: string): string {
   return p.replace(/\\/g, '/')
@@ -971,3 +974,19 @@ function normalizeSingleAlias({
   }
   return alias
 }
+
+export function transformResult(
+  s: MagicString,
+  id: string,
+  config: ResolvedConfig
+) {
+  const isBuild = config.command === 'build'
+
+  return {
+    code: s.toString(),
+    map:
+      !isBuild || config.build.sourcemap
+        ? s.generateMap({ hires: true, source: id })
+        : null
+  }
+}