Skip to content

Commit ffd5732

Browse files
authored
Fix .env hmr for Node.js runtime in Turbopack (vercel#61504)
## What? Whenever `.env` related files or tsconfig/jsconfig changes there's a call to `invalidate()`, as far as I found the only call to `invalidate()` even, which wasn't implemented for Turbopack yet. For `NEXT_PUBLIC_` changes normal Turbopack HMR will kick in already but this test was checking env vars that do not affect the compiled output, so Turbopack would not trigger a HMR as no inputs changed. Similarly webpack doesn't either and it implements this call in a similar way. For edge runtime there's a different bug where changes are not propagated even when you refresh, so while this change does fix another bug for edge runtime it doesn't solve that underlying issue where the values don't update to begin with. I'll investigate that next. <!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # -->
1 parent edb9371 commit ffd5732

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

packages/next/src/server/lib/router-utils/setup-dev-bundler.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,8 +1430,15 @@ async function startWatcher(opts: SetupOpts) {
14301430
}
14311431
return errors
14321432
},
1433-
invalidate(/* Unused parameter: { reloadAfterInvalidation } */) {
1434-
// Not implemented yet.
1433+
invalidate({
1434+
// .env files or tsconfig/jsconfig change
1435+
reloadAfterInvalidation,
1436+
}) {
1437+
if (reloadAfterInvalidation) {
1438+
this.send({
1439+
action: HMR_ACTIONS_SENT_TO_BROWSER.SERVER_COMPONENT_CHANGES,
1440+
})
1441+
}
14351442
},
14361443
async buildFallbackError() {
14371444
// Not implemented yet.

test/turbopack-tests-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,11 +1489,11 @@
14891489
"passed": [
14901490
"app-dir-hmr filesystem changes should have no unexpected action error for hmr",
14911491
"app-dir-hmr filesystem changes should not break when renaming a folder",
1492-
"app-dir-hmr filesystem changes should not continously poll when hitting a not found page"
1492+
"app-dir-hmr filesystem changes should not continously poll when hitting a not found page",
1493+
"app-dir-hmr filesystem changes should update server components pages when env files is changed (nodejs)"
14931494
],
14941495
"failed": [
1495-
"app-dir-hmr filesystem changes should update server components pages when env files is changed (edge)",
1496-
"app-dir-hmr filesystem changes should update server components pages when env files is changed (nodejs)"
1496+
"app-dir-hmr filesystem changes should update server components pages when env files is changed (edge)"
14971497
],
14981498
"pending": [],
14991499
"flakey": [],

0 commit comments

Comments
 (0)