Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

fix(nuxt): pass fully resolved path to nitro dist files #7494

Merged
merged 11 commits into from
Sep 15, 2022
Merged

fix(nuxt): pass fully resolved path to nitro dist files #7494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
31484a3
fix(nuxt): pass fully resolved path to nitro dist files
danielroe Sep 14, 2022
32fec92
fix: remove previous paths
danielroe Sep 14, 2022
d97f367
fix(vite): simplify no-external conditions
danielroe Sep 14, 2022
2f71fb4
fix: add back simpler inline patterns for windows
danielroe Sep 14, 2022
56c4a13
fix: revert unused import
danielroe Sep 14, 2022
44aa4cf
fix: try adding back noExternal path
danielroe Sep 14, 2022
46c56ab
fix: remove duplicate paths (testing windows on ci)
danielroe Sep 14, 2022
449bc8b
Merge remote-tracking branch 'origin/main' into fix/inline-dist
danielroe Sep 14, 2022
88e742d
Merge branch 'main' into fix/inline-dist
danielroe Sep 15, 2022
1dd5b8c
fix: make change more minimal
danielroe Sep 15, 2022
5be35d2
Apply suggestions from code review
danielroe Sep 15, 2022
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
3 changes: 2 additions & 1 deletion packages/nuxt/src/core/nitro.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ export async function initNitro (nuxt: Nuxt) {
nuxt.options.buildDir
]),
'nuxt/dist',
'nuxt3/dist'
'nuxt3/dist',
distDir
danielroe marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might need to exclude dist dir for prerender (will come with another PR if needed)

]
},
alias: {
Expand Down
4 changes: 2 additions & 2 deletions packages/vite/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ export async function buildServer (ctx: ViteBuildContext) {
/\.(es|esm|esm-browser|esm-bundler).js$/,
'/__vue-jsx',
'#app',
/(nuxt|nuxt3)\/(dist|src|app)/,
/@nuxt\/nitro\/(dist|src)/
/^nuxt(\/|$)/,
/(nuxt|nuxt3)\/(dist|src|app)/
danielroe marked this conversation as resolved.
Show resolved Hide resolved
]
},
build: {
Expand Down