Skip to content

Commit

Permalink
fix: @vite/client http request is 404 not found (#4187)
Browse files Browse the repository at this point in the history
Co-authored-by: Shinigami <[email protected]>
  • Loading branch information
ygj6 and Shinigami92 authored Aug 2, 2021
1 parent 3df736b commit 21ecdac
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 5 deletions.
10 changes: 10 additions & 0 deletions packages/playground/extensions/__tests__/extensions.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
test('should have no 404s', () => {
browserLogs.forEach((msg) => {
expect(msg).not.toMatch('404')
})
})

test('not contain `.mjs`', async () => {
let appHtml = await page.content()
expect(appHtml).toMatch('Hello Vite!')
})
6 changes: 6 additions & 0 deletions packages/playground/extensions/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<div id="app">Hello Vite!</div>

<script type="module">
import { createApp } from 'vue'
createApp({ template: 'Hello Vite!' }).mount('#app')
</script>
14 changes: 14 additions & 0 deletions packages/playground/extensions/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "test-extensions",
"private": true,
"version": "0.0.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"debug": "node --inspect-brk ../../vite/bin/vite",
"serve": "vite preview"
},
"dependencies": {
"vue": "^3.0.8"
}
}
6 changes: 6 additions & 0 deletions packages/playground/extensions/vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
resolve: {
alias: [{ find: 'vue', replacement: 'vue/dist/vue.esm-bundler.js' }],
extensions: ['.js']
}
}
3 changes: 2 additions & 1 deletion packages/vite/src/client/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import {
} from 'types/hmrPayload'
import { CustomEventName } from 'types/customEvent'
import { ErrorOverlay, overlayId } from './overlay'
import './env'
// eslint-disable-next-line node/no-missing-import
import '@vite/env'

// injected by the hmr plugin when served
declare const __ROOT__: string
Expand Down
16 changes: 12 additions & 4 deletions packages/vite/src/node/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ import { ESBuildOptions } from './plugins/esbuild'
import dotenv from 'dotenv'
import dotenvExpand from 'dotenv-expand'
import { Alias, AliasOptions } from 'types/alias'
import { CLIENT_DIR, DEFAULT_ASSETS_RE } from './constants'
import {
CLIENT_PUBLIC_PATH,
CLIENT_ENTRY,
ENV_ENTRY,
DEFAULT_ASSETS_RE
} from './constants'
import {
InternalResolveOptions,
ResolveOptions,
Expand Down Expand Up @@ -295,13 +300,16 @@ export async function resolveConfig(
config.root ? path.resolve(config.root) : process.cwd()
)

const clientAlias = [
{ find: /^[\/]?@vite\/env/, replacement: () => ENV_ENTRY },
{ find: CLIENT_PUBLIC_PATH, replacement: () => CLIENT_ENTRY }
]

// resolve alias with internal client alias
const resolvedAlias = mergeAlias(
// #1732 the CLIENT_DIR may contain $$ which cannot be used as direct
// replacement string.
// @ts-ignore because @rollup/plugin-alias' type doesn't allow function
// replacement, but its implementation does work with function values.
[{ find: /^\/@vite\//, replacement: () => CLIENT_DIR + '/' }],
clientAlias,
config.resolve?.alias || config.alias || []
)

Expand Down

0 comments on commit 21ecdac

Please sign in to comment.