Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(json): load json module error #6352

Merged
merged 8 commits into from Mar 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/playground/json/index.html
Expand Up @@ -19,6 +19,9 @@ <h2>Importing as URL</h2>
<h2>Raw Import</h2>
<pre class="raw"></pre>

<h2>JSON Module</h2>
<pre class="module"></pre>

<script type="module">
import json, { hello } from './test.json'
import deepJson, { name } from 'vue/package.json'
Expand Down Expand Up @@ -46,6 +49,9 @@ <h2>Raw Import</h2>
import raw from './test.json?raw'
text('.raw', raw)

import moduleJSON from 'json-module'
text('.module', JSON.stringify(moduleJSON))

function text(sel, text) {
document.querySelector(sel).textContent = text
}
Expand Down
3 changes: 3 additions & 0 deletions packages/playground/json/json-module/index.json
@@ -0,0 +1,3 @@
{
"hello": "hi"
}
4 changes: 4 additions & 0 deletions packages/playground/json/json-module/package.json
@@ -0,0 +1,4 @@
{
"name": "json-module",
"version": "0.0.0"
}
3 changes: 2 additions & 1 deletion packages/playground/json/package.json
Expand Up @@ -9,6 +9,7 @@
"preview": "vite preview"
},
"devDependencies": {
"vue": "^3.2.25"
"vue": "^3.2.25",
"json-module": "file:./json-module"
}
}
65 changes: 35 additions & 30 deletions packages/vite/src/node/plugins/resolve.ts
Expand Up @@ -725,39 +725,44 @@ export function resolvePackageEntry(
}
}
}
entryPoint ||= data.main

// try default entry when entry is not define
// https://nodejs.org/api/modules.html#all-together
const entryPoints = entryPoint
? [entryPoint]
: ['index.js', 'index.json', 'index.node']

for (let entry of entryPoints) {
// make sure we don't get scripts when looking for sass
if (
options.mainFields?.[0] === 'sass' &&
!options.extensions?.includes(path.extname(entry))
) {
entry = ''
options.skipPackageJson = true
}

entryPoint = entryPoint || data.main || 'index.js'

// make sure we don't get scripts when looking for sass
if (
options.mainFields?.[0] === 'sass' &&
!options.extensions?.includes(path.extname(entryPoint))
) {
entryPoint = ''
options.skipPackageJson = true
}

// resolve object browser field in package.json
const { browser: browserField } = data
if (targetWeb && isObject(browserField)) {
entryPoint = mapWithBrowserField(entryPoint, browserField) || entryPoint
}

entryPoint = path.join(dir, entryPoint)
const resolvedEntryPoint = tryFsResolve(entryPoint, options)
// resolve object browser field in package.json
const { browser: browserField } = data
if (targetWeb && isObject(browserField)) {
entry = mapWithBrowserField(entry, browserField) || entry
}

if (resolvedEntryPoint) {
isDebug &&
debug(
`[package entry] ${colors.cyan(id)} -> ${colors.dim(
resolvedEntryPoint
)}`
)
setResolvedCache('.', resolvedEntryPoint, targetWeb)
return resolvedEntryPoint
} else {
packageEntryFailure(id)
const entryPointPath = path.join(dir, entry)
const resolvedEntryPoint = tryFsResolve(entryPointPath, options)
if (resolvedEntryPoint) {
isDebug &&
debug(
`[package entry] ${colors.cyan(id)} -> ${colors.dim(
resolvedEntryPoint
)}`
)
setResolvedCache('.', resolvedEntryPoint, targetWeb)
return resolvedEntryPoint
}
}
packageEntryFailure(id)
} catch (e) {
packageEntryFailure(id, e.message)
}
Expand Down
5 changes: 5 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.