Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion packages/vite/src/node/server/middlewares/indexHtml.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { Connect } from '#dep-types/connect'
import type { PreviewServer, ResolvedConfig, ViteDevServer } from '../..'
import { cleanUrl, unwrapId, wrapId } from '../../../shared/utils'
import { getNodeAssetAttributes } from '../../assetSource'
import { CLIENT_PUBLIC_PATH, FS_PREFIX } from '../../constants'
import { CLIENT_PUBLIC_PATH, DEP_VERSION_RE, FS_PREFIX } from '../../constants'
import { getHmrImplementation } from '../../plugins/clientInjections'
import type { IndexHtmlTransformHook } from '../../plugins/html'
import {
Expand Down Expand Up @@ -36,8 +36,12 @@ import {
getHash,
injectQuery,
isCSSRequest,
isDataUrl,
isDevServer,
isExternalUrl,
isInNodeModules,
isJSRequest,
isOptimizable,
isParentDirectory,
joinUrlSegments,
normalizePath,
Expand Down Expand Up @@ -162,6 +166,26 @@ const processNodeUrl = (

let preTransformUrl: string | undefined

if (
server &&
isClassicScriptLink === false &&
!checkPublicFile(url, config) &&
isInNodeModules(url) &&
!isExternalUrl(url) &&
!isDataUrl(url) &&
!DEP_VERSION_RE.test(url)
) {
const depsOptimizer = server.environments.client.depsOptimizer
const versionHash = depsOptimizer?.metadata.browserHash
if (
versionHash &&
depsOptimizer &&
isOptimizable(url, depsOptimizer.options)
) {
url = injectQuery(url, `v=${versionHash}`)
}
}

if (!isClassicScriptLink && shouldPreTransform(url, config)) {
if (url[0] === '/' && url[1] !== '/') {
preTransformUrl = url
Expand Down
41 changes: 41 additions & 0 deletions playground/optimize-deps/__tests__/optimize-deps.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { describe, expect, test } from 'vitest'
import {
addFile,
browserErrors,
browserLogs,
getColor,
isBuild,
isServe,
page,
readDepOptimizationMetadata,
removeFile,
serverLogs,
viteTestUrl,
} from '~utils'
Expand Down Expand Up @@ -255,6 +257,45 @@ test('non optimized module is not duplicated', async () => {
.toBe('from-absolute-path, from-relative-path')
})

test.runIf(isServe)(
'node_modules module script is not duplicated',
async () => {
const packageJson = 'node_modules/test-browserhash-repro/package.json'
const packageIndex = 'node_modules/test-browserhash-repro/index.js'

try {
addFile(
packageJson,
JSON.stringify({
name: 'test-browserhash-repro',
type: 'module',
main: 'index.js',
}),
)
addFile(
packageIndex,
`document.body.insertAdjacentHTML(
'beforeend',
\`<p class="browserhash-repro-load">\${import.meta.url}</p>\`,
)`,
)

await page.goto(`${viteTestUrl}/node-modules.html`)
const loadedUrls = await page
.locator('.browserhash-repro-load')
.allTextContents()
expect(loadedUrls).toHaveLength(1)
expect(loadedUrls[0]).toMatch(
/\/node_modules\/test-browserhash-repro\/index\.js\?v=\w+/,
)
} finally {
await page.goto(viteTestUrl)
removeFile(packageIndex)
removeFile(packageJson)
}
},
)

test.runIf(isServe)('error on builtin modules usage', () => {
expect(browserLogs).toEqual(
expect.arrayContaining([
Expand Down
12 changes: 12 additions & 0 deletions playground/optimize-deps/node-modules.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!doctype html>
<html>
<body>
<script
type="module"
src="/node_modules/test-browserhash-repro/index.js"
></script>
<script type="module">
import 'test-browserhash-repro'
</script>
</body>
</html>
1 change: 1 addition & 0 deletions playground/optimize-deps/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export default defineConfig({
'@vitejs/test-nested-exclude',
'@vitejs/test-dep-non-optimized',
'@vitejs/test-dep-esm-external',
'test-browserhash-repro',
'stream',
],
rolldownOptions: {
Expand Down
Loading