Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit ea37c04
Author: Hendrik Liebau <[email protected]>
Date:   Wed Apr 17 21:59:01 2024 +0200

    Fix vscode launch configs to allow setting breakpoints in the IDE

commit 47fe8e8
Author: Hendrik Liebau <[email protected]>
Date:   Sat Apr 20 21:23:37 2024 +0200

    Add and load React production source maps

    This can be reverted when a React canary version is used that
    includes facebook/react#28881.

commit c8f3798
Author: Hendrik Liebau <[email protected]>
Date:   Sat Apr 20 21:18:35 2024 +0200

    Inline Next.js sources content into source map files

    This avoids a `loadNetworkResource` error in Chrome DevTools when trying
    to set breakpoints in the Next.js sources, for both server and client.

commit c286c02
Author: Tim Neutkens <[email protected]>
Date:   Sat Apr 20 15:45:35 2024 +0200

    Disable ncc cache instead of cache cleaning (#64804)

    `ncc cache clean` is running each time we call `ncc-compiled`. This PR
    removes the cache cleaning and instead just always passes `cache: false`
    to disable the built-in ncc cache.

    <!-- 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:

    - 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

    - 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

    - 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

    - 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

    - 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

    Closes NEXT-
    Fixes #

    -->

    Closes NEXT-3174

commit b914ad8
Author: Zack Tanner <[email protected]>
Date:   Fri Apr 19 18:11:32 2024 -0600

    fix interception route rewrite regex not supporting hyphenated segments (#64805)

    The function we use to generate a string with named parameters to pass
    into `path-to-regexp` currently doesn't properly handle non-word
    characters (namely, for the purposes of this bugfix, hyphens). As a
    result, `pathToRegexp` will convert something like `/foo/:bar-baz` into
    `/^\/foo(?:\/([^\/#\?]+?))-baz[\/#\?]?$/i`, effectively only treating
    the `:foo` as part of the regex capture group and leaving a dangling
    -baz.

    This means using an interception route within a dynamic segment (such as
    `/foo/[bar-baz]`) would not properly trigger the route interception

    Fixes #64766

commit 02e5f65
Author: vercel-release-bot <[email protected]>
Date:   Fri Apr 19 23:23:22 2024 +0000

    v14.3.0-canary.13

commit c1ca6ac
Author: Jeffrey Zutt <[email protected]>
Date:   Sat Apr 20 01:13:58 2024 +0200

    fix: remove traceparent from cachekey should not remove traceparent from original object (#64727)

    I submitted PR #64499 , it got merged, but it contains a mistake.
    I'm terribly sorry about this!

    By removing the traceparent from the cachekey, we mistakenly removed the
    header from the original object.
    Causing the actual request to be executed without the traceparent
    header.

    Creating a cachekey should not alter the original object.

    Flip the arguments for Object.assign

    ---------

    Co-authored-by: Jeffrey <[email protected]>
    Co-authored-by: JJ Kasper <[email protected]>

commit ea0f516
Author: Sean O'Neil <[email protected]>
Date:   Fri Apr 19 15:43:26 2024 -0500

    Update 06-bundle-analyzer.mdx (#64740)

    The[ existing code
    example](https://nextjs.org/docs/app/building-your-application/optimizing/bundle-analyzer)
    generates the following warning when using `--turbo` in the current
    latest version of NextJS (14.2.2):

    ⚠ Webpack is configured while Turbopack is not, which may cause
    problems.
     ⚠ See instructions if you need to configure Turbopack:
      https://nextjs.org/docs/app/api-reference/next-config-js/turbo

    This modification ensures that the bundle analyzer is only applied when
    the user intends to generate a report.

    Fixes # #64739

    ---------

    Co-authored-by: Lee Robinson <[email protected]>
    Co-authored-by: Maxim Svetlakov <[email protected]>
    Co-authored-by: JJ Kasper <[email protected]>

commit cf038a3
Author: Steven Primeaux <[email protected]>
Date:   Fri Apr 19 14:36:25 2024 -0400

    docs: "generateMetadata" to "generateViewport" in doc "generateViewport" (#64795)

    Changed "generateMetadata" to "generateViewport" in
    generate-viewport.mdx

    Co-authored-by: Sam Ko <[email protected]>

commit a0f334c
Author: Kushagra Sharma <[email protected]>
Date:   Sat Apr 20 00:04:21 2024 +0530

    Update index.mdx (#64794)

    Removed a type annotation from a code block

    <!-- 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:

    - 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

    - 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

    - 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

    - 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

    - 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

    Closes NEXT-
    Fixes #

    -->

commit bd6ab04
Author: Tim Neutkens <[email protected]>
Date:   Fri Apr 19 20:26:54 2024 +0200

    Upgrade Turborepo (#64767)

    Upgrade Turborepo to the latest version and enable the new terminal UI
    to dogfood: https://turbo.build/blog/turbo-1-13-0#new-terminal-ui.

    <!-- 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:

    - 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

    - 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

    - 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

    - 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

    - 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

    Closes NEXT-
    Fixes #

    -->

    Closes NEXT-3164
  • Loading branch information
eps1lon committed Apr 21, 2024
1 parent 375cad9 commit d494c0a
Show file tree
Hide file tree
Showing 89 changed files with 176 additions and 23 deletions.
83 changes: 66 additions & 17 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,79 @@
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "pnpm",
"runtimeArgs": ["debug", "dev", "test/e2e/app-dir/app"],
"runtimeExecutable": "node",
"runtimeArgs": [
"packages/next/dist/bin/next",
"dev",
"test/e2e/app-dir/app"
],
"skipFiles": ["<node_internals>/**"],
"sourceMapPathOverrides": {
"webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
"webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
},
"env": {
"NEXT_PRIVATE_LOCAL_WEBPACK": "1"
"NEXT_PRIVATE_LOCAL_WEBPACK": "1",
"NEXT_TELEMETRY_DISABLED": "1"
}
},
{
"name": "Launch test/e2e/app-dir/app build",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "pnpm",
"runtimeArgs": ["debug", "build", "test/e2e/app-dir/app"],
"runtimeExecutable": "node",
"runtimeArgs": [
"packages/next/dist/bin/next",
"build",
"test/e2e/app-dir/app"
],
"skipFiles": ["<node_internals>/**"],
"sourceMapPathOverrides": {
"webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
"webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
},
"env": {
"NEXT_PRIVATE_LOCAL_WEBPACK": "1"
"NEXT_PRIVATE_LOCAL_WEBPACK": "1",
"NEXT_TELEMETRY_DISABLED": "1"
}
},
{
"name": "Launch examples/hello-world development",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "pnpm",
"runtimeArgs": ["debug", "dev", "examples/hello-world"],
"runtimeExecutable": "node",
"runtimeArgs": [
"packages/next/dist/bin/next",
"dev",
"examples/hello-world"
],
"skipFiles": ["<node_internals>/**"],
"sourceMapPathOverrides": {
"webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
"webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
},
"env": {
"NEXT_PRIVATE_LOCAL_WEBPACK": "1"
"NEXT_PRIVATE_LOCAL_WEBPACK": "1",
"NEXT_TELEMETRY_DISABLED": "1"
}
},
{
"name": "Launch examples/hello-world build",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "pnpm",
"runtimeArgs": ["debug", "build", "examples/hello-world"],
"runtimeExecutable": "node",
"runtimeArgs": [
"packages/next/dist/bin/next",
"build",
"examples/hello-world"
],
"sourceMapPathOverrides": {
"webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
"webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
},
"skipFiles": ["<node_internals>/**"],
"env": {
"NEXT_PRIVATE_LOCAL_WEBPACK": "1"
Expand All @@ -57,23 +92,37 @@
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "pnpm",
"runtimeArgs": ["debug", "start", "examples/hello-world"],
"runtimeExecutable": "node",
"runtimeArgs": [
"packages/next/dist/bin/next",
"start",
"examples/hello-world"
],
"skipFiles": ["<node_internals>/**"],
"sourceMapPathOverrides": {
"webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
"webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
},
"env": {
"NEXT_PRIVATE_LOCAL_WEBPACK": "1"
"NEXT_PRIVATE_LOCAL_WEBPACK": "1",
"NEXT_TELEMETRY_DISABLED": "1"
}
},
{
"name": "Launch current directory in development",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "pnpm",
"runtimeArgs": ["debug", "dev", "${fileDirname}"],
"runtimeExecutable": "node",
"runtimeArgs": ["packages/next/dist/bin/next", "dev", "${fileDirname}"],
"skipFiles": ["<node_internals>/**"],
"sourceMapPathOverrides": {
"webpack://_N_E/../../../*": "${workspaceFolder}/packages/next/*",
"webpack://next/./dist/src/*": "${workspaceFolder}/packages/next/src/*"
},
"env": {
"NEXT_PRIVATE_LOCAL_WEBPACK": "1"
"NEXT_PRIVATE_LOCAL_WEBPACK": "1",
"NEXT_TELEMETRY_DISABLED": "1"
}
},
{
Expand Down
1 change: 1 addition & 0 deletions packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@
"setimmediate": "1.0.5",
"shell-quote": "1.7.3",
"source-map": "0.6.1",
"source-map-loader": "5.0.0",
"source-map08": "npm:[email protected]",
"stacktrace-parser": "0.1.10",
"stream-browserify": "3.0.0",
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit d494c0a

Please sign in to comment.