refactor: use node hash (#7975)

packages/plugin-vue-jsx/index.js

@@ -3,7 +3,7 @@ const babel = require('@babel/core')
 const jsx = require('@vue/babel-plugin-jsx')
 const importMeta = require('@babel/plugin-syntax-import-meta')
 const { createFilter, normalizePath } = require('@rollup/pluginutils')
-const hash = require('hash-sum')
+const { createHash } = require('crypto')
 const path = require('path')
 
 const ssrRegisterHelperId = '/__vue-jsx-ssr-register-helper'
@@ -152,7 +152,7 @@ function vueJsxPlugin(options = {}) {
                   ({ name }) => ({
                     local: name,
                     exported: name,
-                    id: hash(id + name)
+                    id: getHash(id + name)
                   })
                 )
               )
@@ -169,7 +169,7 @@ function vueJsxPlugin(options = {}) {
                     hotComponents.push({
                       local: spec.local.name,
                       exported: spec.exported.name,
-                      id: hash(id + spec.exported.name)
+                      id: getHash(id + spec.exported.name)
                     })
                   }
                 }
@@ -187,15 +187,15 @@ function vueJsxPlugin(options = {}) {
                 hotComponents.push({
                   local: node.declaration.name,
                   exported: 'default',
-                  id: hash(id + 'default')
+                  id: getHash(id + 'default')
                 })
               }
             } else if (isDefineComponentCall(node.declaration)) {
               hasDefault = true
               hotComponents.push({
                 local: '__default__',
                 exported: 'default',
-                id: hash(id + 'default')
+                id: getHash(id + 'default')
               })
             }
           }
@@ -276,5 +276,13 @@ function isDefineComponentCall(node) {
   )
 }
 
+/**
+ * @param {string} text
+ * @returns {string}
+ */
+function getHash(text) {
+  return createHash('sha256').update(text).digest('hex').substring(0, 8)
+}
+
 module.exports = vueJsxPlugin
 vueJsxPlugin.default = vueJsxPlugin

packages/plugin-vue-jsx/package.json

@@ -26,8 +26,7 @@
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/plugin-transform-typescript": "^7.16.8",
     "@rollup/pluginutils": "^4.2.1",
-    "@vue/babel-plugin-jsx": "^1.1.1",
-    "hash-sum": "^2.0.0"
+    "@vue/babel-plugin-jsx": "^1.1.1"
   },
   "peerDependencies": {
     "vite": "^2.0.0",

packages/plugin-vue/package.json

@@ -37,7 +37,6 @@
   "devDependencies": {
     "@rollup/pluginutils": "^4.2.1",
     "debug": "^4.3.4",
-    "hash-sum": "^2.0.0",
     "rollup": "^2.72.1",
     "slash": "^4.0.0",
     "source-map": "^0.6.1",

packages/plugin-vue/src/utils/descriptorCache.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
+import { createHash } from 'crypto'
 import slash from 'slash'
-import hash from 'hash-sum'
 import type { CompilerError, SFCDescriptor } from 'vue/compiler-sfc'
 import type { ResolvedOptions, VueQuery } from '..'
 
@@ -27,7 +27,7 @@ export function createDescriptor(
   // ensure the path is normalized in a way that is consistent inside
   // project (relative to root) and on different systems.
   const normalizedPath = slash(path.normalize(path.relative(root, filename)))
-  descriptor.id = hash(normalizedPath + (isProduction ? source : ''))
+  descriptor.id = getHash(normalizedPath + (isProduction ? source : ''))
 
   cache.set(filename, descriptor)
   return { descriptor, errors }
@@ -88,3 +88,7 @@ export function setSrcDescriptor(
   }
   cache.set(filename, entry)
 }
+
+function getHash(text: string): string {
+  return createHash('sha256').update(text).digest('hex').substring(0, 8)
+}

packages/vite/src/node/__tests__/asset.spec.ts

@@ -1,13 +1,5 @@
 import { describe, expect, test } from 'vitest'
-import { assetFileNamesToFileName, getAssetHash } from '../plugins/asset'
-
-describe('getAssetHash', () => {
-  test('8-digit hex', () => {
-    const hash = getAssetHash(Buffer.alloc(0))
-
-    expect(hash).toMatch(/^[\da-f]{8}$/)
-  })
-})
+import { assetFileNamesToFileName } from '../plugins/asset'
 
 describe('assetFileNamesToFileName', () => {
   // on Windows, both forward slashes and backslashes may appear in the input

packages/vite/src/node/__tests__/utils.spec.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from 'vitest'
 import {
+  getHash,
   getPotentialTsSrcPaths,
   injectQuery,
   isWindows,
@@ -98,3 +99,10 @@ test('ts import of file with .js and query param', () => {
     'test-file.js.tsx?lee=123'
   ])
 })
+
+describe('getHash', () => {
+  test('8-digit hex', () => {
+    const hash = getHash(Buffer.alloc(0))
+    expect(hash).toMatch(/^[\da-f]{8}$/)
+  })
+})

packages/vite/src/node/optimizer/index.ts

@@ -1,6 +1,5 @@
 import fs from 'fs'
 import path from 'path'
-import { createHash } from 'crypto'
 import { performance } from 'perf_hooks'
 import _debug from 'debug'
 import colors from 'picocolors'
@@ -12,6 +11,7 @@ import {
   createDebugger,
   emptyDir,
   flattenId,
+  getHash,
   lookupFile,
   normalizeId,
   normalizePath,
@@ -816,10 +816,6 @@ function getOptimizedBrowserHash(
   return getHash(hash + JSON.stringify(deps) + timestamp)
 }
 
-export function getHash(text: string): string {
-  return createHash('sha256').update(text).digest('hex').substring(0, 8)
-}
-
 export function optimizedDepInfoFromId(
   metadata: DepOptimizationMetadata,
   id: string

packages/vite/src/node/optimizer/registerMissing.ts

@@ -1,5 +1,6 @@
 import colors from 'picocolors'
 import _debug from 'debug'
+import { getHash } from '../utils'
 import type { ViteDevServer } from '..'
 import {
   addOptimizedDepInfo,
@@ -8,7 +9,6 @@ import {
   depsFromOptimizedDepInfo,
   depsLogString,
   discoverProjectDependencies,
-  getHash,
   getOptimizedDepPath,
   loadCachedDepOptimizationMetadata,
   newDepOptimizationProcessing,

packages/vite/src/node/plugins/asset.ts

@@ -1,15 +1,14 @@
 import path from 'path'
 import { parse as parseUrl } from 'url'
 import fs, { promises as fsp } from 'fs'
-import { createHash } from 'crypto'
 import * as mrmime from 'mrmime'
 import type { OutputOptions, PluginContext } from 'rollup'
 import MagicString from 'magic-string'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
 import { cleanUrl } from '../utils'
 import { FS_PREFIX } from '../constants'
-import { normalizePath } from '../utils'
+import { getHash, normalizePath } from '../utils'
 
 export const assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g
 
@@ -195,7 +194,7 @@ export function getAssetFilename(
  * const fileName = assetFileNamesToFileName(
  *   'assets/[name].[hash][extname]',
  *   '/path/to/file.txt',
- *   getAssetHash(content),
+ *   getHash(content),
  *   content
  * )
  * // fileName: 'assets/file.982d9e3e.txt'
@@ -300,7 +299,7 @@ async function fileToBuiltUrl(
     // https://bundlers.tooling.report/hashing/asset-cascade/
     // https://github.com/rollup/rollup/issues/3415
     const map = assetHashToFilenameMap.get(config)!
-    const contentHash = getAssetHash(content)
+    const contentHash = getHash(content)
     const { search, hash } = parseUrl(id)
     const postfix = (search || '') + (hash || '')
     const output = config.build?.rollupOptions?.output
@@ -337,10 +336,6 @@ async function fileToBuiltUrl(
   return url
 }
 
-export function getAssetHash(content: Buffer | string): string {
-  return createHash('sha256').update(content).digest('hex').slice(0, 8)
-}
-
 export async function urlToBuiltUrl(
   url: string,
   importer: string,

packages/vite/src/node/plugins/css.ts

@@ -33,6 +33,7 @@ import {
   cleanUrl,
   combineSourcemaps,
   generateCodeFrame,
+  getHash,
   isDataUrl,
   isExternalUrl,
   isObject,
@@ -46,8 +47,7 @@ import {
   assetUrlRE,
   checkPublicFile,
   fileToUrl,
-  getAssetFilename,
-  getAssetHash
+  getAssetFilename
 } from './asset'
 
 // const debug = createDebugger('vite:css')
@@ -360,7 +360,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
       const query = parseRequest(id)
       if (inlineCSS && isHTMLProxy) {
         addToHTMLProxyTransformResult(
-          `${getAssetHash(cleanUrl(id))}_${Number.parseInt(query!.index)}`,
+          `${getHash(cleanUrl(id))}_${Number.parseInt(query!.index)}`,
           css
         )
         return `export default ''`

packages/vite/src/node/plugins/html.ts

@@ -21,6 +21,7 @@ import type { ViteDevServer } from '../server'
 import {
   cleanUrl,
   generateCodeFrame,
+  getHash,
   isDataUrl,
   isExternalUrl,
   normalizePath,
@@ -32,7 +33,6 @@ import {
   assetUrlRE,
   checkPublicFile,
   getAssetFilename,
-  getAssetHash,
   urlToBuiltUrl
 } from './asset'
 import { isCSSRequest } from './css'
@@ -380,7 +380,7 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
             addToHTMLProxyCache(config, filePath, inlineModuleIndex, { code })
             // will transform with css plugin and cache result with css-post plugin
             js += `\nimport "${id}?html-proxy&inline-css&index=${inlineModuleIndex}.css"`
-            const hash = getAssetHash(cleanUrl(id))
+            const hash = getHash(cleanUrl(id))
             // will transform in `applyHtmlTransforms`
             s.overwrite(
               styleNode.loc.start.offset,
@@ -399,7 +399,7 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
               code: styleNode.content
             })
             js += `\nimport "${id}?html-proxy&inline-css&index=${inlineModuleIndex}.css"`
-            const hash = getAssetHash(cleanUrl(id))
+            const hash = getHash(cleanUrl(id))
             // will transform in `applyHtmlTransforms`
             s.overwrite(
               styleNode.loc.start.offset,

packages/vite/src/node/plugins/worker.ts

@@ -3,10 +3,10 @@ import type Rollup from 'rollup'
 import type { EmittedFile, TransformPluginContext } from 'rollup'
 import type { ResolvedConfig } from '../config'
 import type { Plugin } from '../plugin'
-import { cleanUrl, injectQuery, parseRequest } from '../utils'
+import { cleanUrl, getHash, injectQuery, parseRequest } from '../utils'
 import { ENV_PUBLIC_PATH } from '../constants'
 import { onRollupWarning } from '../build'
-import { fileToUrl, getAssetHash } from './asset'
+import { fileToUrl } from './asset'
 
 interface WorkerCache {
   // save worker bundle emitted files avoid overwrites the same file.
@@ -143,7 +143,7 @@ function emitSourcemapForWorkerEntry(
       const basename = path.parse(cleanUrl(id)).name
       const data = sourcemap.toString()
       const content = Buffer.from(data)
-      const contentHash = getAssetHash(content)
+      const contentHash = getHash(content)
       const fileName = `${basename}.${contentHash}.js.map`
       const filePath = path.posix.join(config.build.assetsDir, fileName)
       emitWorkerSourcemap(context, config, {
@@ -186,7 +186,7 @@ export async function workerFileToUrl(
   }
   const code = await bundleWorkerEntry(ctx, config, id, query)
   const basename = path.parse(cleanUrl(id)).name
-  const contentHash = getAssetHash(code)
+  const contentHash = getHash(code)
   const fileName = path.posix.join(
     config.build.assetsDir,
     `${basename}.${contentHash}.js`

packages/vite/src/node/utils.ts

@@ -1,6 +1,7 @@
 import fs from 'fs'
 import os from 'os'
 import path from 'path'
+import { createHash } from 'crypto'
 import { promisify } from 'util'
 import { URL, pathToFileURL } from 'url'
 import { builtinModules } from 'module'
@@ -769,6 +770,10 @@ export function parseRequest(id: string): Record<string, string> | null {
 
 export const blankReplacer = (match: string) => ' '.repeat(match.length)
 
+export function getHash(text: Buffer | string): string {
+  return createHash('sha256').update(text).digest('hex').substring(0, 8)
+}
+
 // Based on node-graceful-fs
 
 // The ISC License