From 31484a33a7fe225b8748476effab0f192ae9f65b Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 14 Sep 2022 10:40:59 +0100 Subject: [PATCH 1/9] fix(nuxt): pass fully resolved path to nitro dist files --- packages/nuxt/src/core/nitro.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 8b896e1d526..b6110a9193c 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -69,6 +69,7 @@ export async function initNitro (nuxt: Nuxt) { '@nuxt/', nuxt.options.buildDir ]), + distDir, 'nuxt/dist', 'nuxt3/dist' ] From 32fec92aa67d313c9ff9cf2ff7f1d160ceff78c6 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 14 Sep 2022 10:43:33 +0100 Subject: [PATCH 2/9] fix: remove previous paths --- packages/nuxt/src/core/nitro.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index b6110a9193c..903d562fb28 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -69,9 +69,7 @@ export async function initNitro (nuxt: Nuxt) { '@nuxt/', nuxt.options.buildDir ]), - distDir, - 'nuxt/dist', - 'nuxt3/dist' + distDir ] }, alias: { From d97f367969c935f71bc15cbae9846abe9e2337d3 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 14 Sep 2022 10:57:19 +0100 Subject: [PATCH 3/9] fix(vite): simplify no-external conditions --- packages/vite/src/server.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 947d6389afd..7ba0655450f 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -72,8 +72,7 @@ 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(\/|$)/ ] }, build: { From 2f71fb42a0d9ee40a200c4e2d7acaecc77ebb075 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 14 Sep 2022 11:20:31 +0100 Subject: [PATCH 4/9] fix: add back simpler inline patterns for windows --- packages/nuxt/src/core/nitro.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 903d562fb28..129a160b61e 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -1,4 +1,5 @@ import { existsSync, promises as fsp } from 'node:fs' +import { pathToFileURL } from 'node:url' import { resolve, join } from 'pathe' import { createNitro, createDevServer, build, prepare, copyPublicAssets, writeTypes, scanHandlers, prerender } from 'nitropack' import type { NitroEventHandler, NitroDevEventHandler, NitroConfig } from 'nitropack' @@ -69,7 +70,10 @@ export async function initNitro (nuxt: Nuxt) { '@nuxt/', nuxt.options.buildDir ]), - distDir + distDir, + // This simplifies windows inlining test + 'nuxt/dist', + 'nuxt3/dist' ] }, alias: { From 56c4a1345cc2e79beaa1ad18c6bee6da0be073ee Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 14 Sep 2022 12:02:41 +0100 Subject: [PATCH 5/9] fix: revert unused import --- packages/nuxt/src/core/nitro.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 129a160b61e..bf3468b50b1 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -1,5 +1,4 @@ import { existsSync, promises as fsp } from 'node:fs' -import { pathToFileURL } from 'node:url' import { resolve, join } from 'pathe' import { createNitro, createDevServer, build, prepare, copyPublicAssets, writeTypes, scanHandlers, prerender } from 'nitropack' import type { NitroEventHandler, NitroDevEventHandler, NitroConfig } from 'nitropack' From 44aa4cfb5ac37858fe27aa6e3ba9d6e297fd5633 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 14 Sep 2022 12:58:03 +0100 Subject: [PATCH 6/9] fix: try adding back noExternal path --- packages/vite/src/server.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 7ba0655450f..2b1b2ec1072 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -72,7 +72,8 @@ export async function buildServer (ctx: ViteBuildContext) { /\.(es|esm|esm-browser|esm-bundler).js$/, '/__vue-jsx', '#app', - /^nuxt(\/|$)/ + /^nuxt(\/|$)/, + /(nuxt|nuxt3)\/(dist|src|app)/ ] }, build: { From 46c56ab0048a1987e36d55363962e21d5cdc1be8 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 14 Sep 2022 13:15:19 +0100 Subject: [PATCH 7/9] fix: remove duplicate paths (testing windows on ci) --- packages/nuxt/src/core/nitro.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index bf3468b50b1..903d562fb28 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -69,10 +69,7 @@ export async function initNitro (nuxt: Nuxt) { '@nuxt/', nuxt.options.buildDir ]), - distDir, - // This simplifies windows inlining test - 'nuxt/dist', - 'nuxt3/dist' + distDir ] }, alias: { From 1dd5b8c9ea61918ac61d57587161c84ed39e2e5c Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 15 Sep 2022 09:40:19 +0100 Subject: [PATCH 8/9] fix: make change more minimal --- packages/nuxt/src/core/nitro.ts | 2 ++ packages/vite/src/server.ts | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 52010a4a32f..99a0a4086b5 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -69,6 +69,8 @@ export async function initNitro (nuxt: Nuxt) { '@nuxt/', nuxt.options.buildDir ]), + 'nuxt/dist', + 'nuxt3/dist', distDir ] }, diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 2b1b2ec1072..b3e429092b6 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -72,8 +72,7 @@ export async function buildServer (ctx: ViteBuildContext) { /\.(es|esm|esm-browser|esm-bundler).js$/, '/__vue-jsx', '#app', - /^nuxt(\/|$)/, - /(nuxt|nuxt3)\/(dist|src|app)/ + /(^|node_modules\/)(nuxt|nuxt3)(\/(dist|src|app)|$)/ ] }, build: { From 5be35d25063ed9dd73310be3b3eb65361bc6b194 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 15 Sep 2022 09:48:16 +0100 Subject: [PATCH 9/9] Apply suggestions from code review --- packages/vite/src/server.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index b3e429092b6..2b1b2ec1072 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -72,7 +72,8 @@ export async function buildServer (ctx: ViteBuildContext) { /\.(es|esm|esm-browser|esm-bundler).js$/, '/__vue-jsx', '#app', - /(^|node_modules\/)(nuxt|nuxt3)(\/(dist|src|app)|$)/ + /^nuxt(\/|$)/, + /(nuxt|nuxt3)\/(dist|src|app)/ ] }, build: {