Merge branch 'canary' into issues/54008-Nginx-decoded-URIs-breaks-slu…

…gs-client-side

.github/workflows/code_freeze.yml

@@ -0,0 +1,44 @@
+on:
+  workflow_dispatch:
+    inputs:
+      type:
+        description: Enable/disable code freeze
+        required: true
+        type: choice
+        options:
+          - enable
+          - disable
+
+    secrets:
+      CODE_FREEZE_TOKEN:
+        required: true
+
+name: Code Freeze
+
+env:
+  NAPI_CLI_VERSION: 2.14.7
+  TURBO_VERSION: 1.10.9
+  NODE_MAINTENANCE_VERSION: 16
+  NODE_LTS_VERSION: 18
+
+jobs:
+  start:
+    runs-on: ubuntu-latest
+
+    environment: release-${{ github.event.inputs.releaseType }}
+    steps:
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          check-latest: true
+
+      - run: git clone https://github.com/vercel/next.js.git --depth=1 .
+
+      # https://github.com/actions/virtual-environments/issues/1187
+      - name: tune linux network
+        run: sudo ethtool -K eth0 tx off rx off
+
+      - run: node ./scripts/code-freeze.js --type ${{ github.event.inputs.type }}
+        env:
+          CODE_FREEZE_TOKEN: ${{ secrets.CODE_FREEZE_TOKEN }}

packages/next/src/client/components/router-reducer/fetch-server-response.ts

@@ -122,6 +122,11 @@ export async function fetchServerResponse(
     // If fetch returns something different than flight response handle it like a mpa navigation
     // If the fetch was not 200, we also handle it like a mpa navigation
     if (!isFlightResponse || !res.ok) {
+      // in case the original URL came with a hash, preserve it before redirecting to the new URL
+      if (url.hash) {
+        responseUrl.hash = url.hash
+      }
+
       return doMpaNavigation(responseUrl.toString())
     }
 

packages/next/src/server/next-server.ts

@@ -101,6 +101,12 @@ import { loadManifest } from './load-manifest'
 
 export * from './base-server'
 
+declare const __non_webpack_require__: NodeRequire
+
+const dynamicRequire = process.env.NEXT_MINIMAL
+  ? __non_webpack_require__
+  : require
+
 function writeStdoutLine(text: string) {
   process.stdout.write(' ' + text + '\n')
 }
@@ -244,12 +250,15 @@ export default class NextNodeServer extends BaseServer {
       this.nextConfig.experimental.instrumentationHook
     ) {
       try {
-        const instrumentationHook = await require(resolve(
-          this.serverOptions.dir || '.',
-          this.serverOptions.conf.distDir!,
-          'server',
-          INSTRUMENTATION_HOOK_FILENAME
-        ))
+        const instrumentationHook = await dynamicRequire(
+          resolve(
+            this.serverOptions.dir || '.',
+            this.serverOptions.conf.distDir!,
+            'server',
+            INSTRUMENTATION_HOOK_FILENAME
+          )
+        )
+
         await instrumentationHook.register?.()
       } catch (err: any) {
         if (err.code !== 'MODULE_NOT_FOUND') {
@@ -289,9 +298,11 @@ export default class NextNodeServer extends BaseServer {
     const { incrementalCacheHandlerPath } = this.nextConfig.experimental
 
     if (incrementalCacheHandlerPath) {
-      CacheHandler = require(isAbsolute(incrementalCacheHandlerPath)
-        ? incrementalCacheHandlerPath
-        : join(this.distDir, incrementalCacheHandlerPath))
+      CacheHandler = dynamicRequire(
+        isAbsolute(incrementalCacheHandlerPath)
+          ? incrementalCacheHandlerPath
+          : join(this.distDir, incrementalCacheHandlerPath)
+      )
       CacheHandler = CacheHandler.default || CacheHandler
     }
 

scripts/code-freeze.js

@@ -0,0 +1,117 @@
+const authToken = process.env.CODE_FREEZE_TOKEN
+
+if (!authToken) {
+  throw new Error(`missing CODE_FREEZE_TOKEN env`)
+}
+
+const codeFreezeRule = {
+  context: 'Potentially publish release',
+  app_id: 15368,
+}
+
+async function updateRules(newRules) {
+  const res = await fetch(
+    `https://api.github.com/repos/vercel/next.js/branches/canary/protection`,
+    {
+      method: 'PUT',
+      headers: {
+        Accept: 'application/vnd.github+json',
+        Authorization: `Bearer ${authToken}`,
+        'X-GitHub-Api-Version': '2022-11-28',
+      },
+      body: JSON.stringify(newRules),
+    }
+  )
+
+  if (!res.ok) {
+    throw new Error(
+      `Failed to check for rule ${res.status} ${await res.text()}`
+    )
+  }
+}
+
+async function getCurrentRules() {
+  const res = await fetch(
+    `https://api.github.com/repos/vercel/next.js/branches/canary/protection`,
+    {
+      headers: {
+        Accept: 'application/vnd.github+json',
+        Authorization: `Bearer ${authToken}`,
+        'X-GitHub-Api-Version': '2022-11-28',
+      },
+    }
+  )
+
+  if (!res.ok) {
+    throw new Error(
+      `Failed to check for rule ${res.status} ${await res.text()}`
+    )
+  }
+  const data = await res.json()
+
+  return {
+    required_status_checks: {
+      strict: data.required_status_checks.strict,
+      // checks: data.required_status_checks.checks,
+      contexts: data.required_status_checks.contexts,
+    },
+    enforce_admins: data.enforce_admins.enabled,
+    required_pull_request_reviews: {
+      dismiss_stale_reviews:
+        data.required_pull_request_reviews.dismiss_stale_reviews,
+      require_code_owner_reviews:
+        data.required_pull_request_reviews.require_code_owner_reviews,
+      require_last_push_approval:
+        data.required_pull_request_reviews.require_last_push_approval,
+      required_approving_review_count:
+        data.required_pull_request_reviews.required_approving_review_count,
+    },
+    restrictions: data.restrictions || {
+      users: [],
+      teams: [],
+      apps: [],
+    },
+  }
+}
+
+async function main() {
+  const typeIdx = process.argv.indexOf('--type')
+  const type = process.argv[typeIdx + 1]
+
+  if (type !== 'enable' && type !== 'disable') {
+    throw new Error(`--type should be enable or disable`)
+  }
+  const isEnable = type === 'enable'
+  const currentRules = await getCurrentRules()
+  const hasRule = currentRules.required_status_checks.contexts?.some((ctx) => {
+    return ctx === codeFreezeRule.context
+  })
+
+  console.log(currentRules)
+
+  if (isEnable) {
+    if (hasRule) {
+      console.log(`Already enabled`)
+      return
+    }
+    currentRules.required_status_checks.contexts.push(codeFreezeRule.context)
+    await updateRules(currentRules)
+    console.log('Enabled code freeze')
+  } else {
+    if (!hasRule) {
+      console.log(`Already disabled`)
+      return
+    }
+    currentRules.required_status_checks.contexts =
+      currentRules.required_status_checks.contexts.filter(
+        (ctx) => ctx !== codeFreezeRule.context
+      )
+    await updateRules(currentRules)
+    console.log('Disabled code freeze')
+  }
+}
+
+main().catch((err) => {
+  console.error(err)
+  process.exit(1)
+})

test/e2e/app-dir/navigation/app/hash-link-to-pages-router/global.css

@@ -0,0 +1,7 @@
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+  font-size: 14px;
+  line-height: 1;
+}

test/e2e/app-dir/navigation/app/hash-link-to-pages-router/page.js

@@ -0,0 +1,13 @@
+import Link from 'next/link'
+import './global.css'
+
+export default function HashPage() {
+  return (
+    <div style={{ fontFamily: 'sans-serif', fontSize: '16px' }}>
+      <p>Hash To Pages Router Page</p>
+      <Link href="/some#non-existent" id="link-to-pages-router">
+        To pages router
+      </Link>
+    </div>
+  )
+}

test/e2e/app-dir/navigation/navigation.test.ts

@@ -498,6 +498,15 @@ createNextDescribe(
         expect(await browser.url()).toBe(next.url + '/some')
       })
 
+      it('should not omit the hash while navigating from app to pages', async () => {
+        const browser = await next.browser('/hash-link-to-pages-router')
+        await browser
+          .elementByCss('#link-to-pages-router')
+          .click()
+          .waitForElementByCss('#link-to-app')
+        await check(() => browser.url(), next.url + '/some#non-existent')
+      })
+
       if (!isNextDev) {
         // this test is pretty hard to test in playwright, so most of the heavy lifting is in the page component itself
         // it triggers a hover on a link to initiate a prefetch request every second, and so we check that