Skip to content

Commit 7a0a99f

Browse files
mayank1513mayank1513
authored
Merge branch 'canary' into snyk-upgrade-5a7932c70c39751905a6deb93fc80465
2 parents 185f04b + ad42b61 commit 7a0a99f

File tree

84 files changed

+605
-413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+605
-413
lines changed

‎docs/02-app/02-api-reference/04-functions/redirect.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: API Reference for the redirect function.
55

66
The `redirect` function allows you to redirect the user to another URL. `redirect` can be used in Server Components, Client Components, [Route Handlers](/docs/app/building-your-application/routing/route-handlers), and [Server Actions](/docs/app/building-your-application/data-fetching/forms-and-mutations).
77

8-
When used in a streaming context, this will insert a meta tag to emit the redirect on the client side. Otherwise, it will serve a 307 HTTP redirect response to the caller.
8+
When used in a [streaming context](/docs/app/building-your-application/routing/loading-ui-and-streaming#what-is-streaming), this will insert a meta tag to emit the redirect on the client side. Otherwise, it will serve a 307 HTTP redirect response to the caller.
99

1010
If a resource doesn't exist, you can use the [`notFound` function](/docs/app/api-reference/functions/not-found) instead.
1111

‎examples/api-routes-apollo-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@apollo/server": "^4.1.1",
1010
"@as-integrations/next": "^1.1.0",
1111
"@graphql-tools/schema": "^9.0.9",
12-
"graphql": "16.6.0",
12+
"graphql": "16.8.1",
1313
"graphql-tag": "^2.12.6",
1414
"next": "latest",
1515
"react": "^18.2.0",

‎examples/cms-contentful/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"contentful-import": "^9.0.4",
1818
"date-fns": "2.30.0",
1919
"next": "latest",
20-
"postcss": "8.4.28",
20+
"postcss": "8.4.31",
2121
"react": "^18.2.0",
2222
"react-dom": "^18.2.0",
2323
"tailwindcss": "^3.3.3",

‎examples/cms-cosmic/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@types/node": "^18.0.0",
2222
"@types/react": "^18.0.14",
2323
"autoprefixer": "10.4.7",
24-
"postcss": "8.4.14",
24+
"postcss": "8.4.31",
2525
"tailwindcss": "^3.1.4",
2626
"typescript": "^4.7.4"
2727
}

‎examples/cms-datocms/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"devDependencies": {
1919
"autoprefixer": "10.4.2",
20-
"postcss": "8.4.5",
20+
"postcss": "8.4.31",
2121
"tailwindcss": "^3.0.15"
2222
}
2323
}

‎examples/cms-drupal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"autoprefixer": "10.4.2",
18-
"postcss": "8.4.5",
18+
"postcss": "8.4.31",
1919
"tailwindcss": "^3.0.15"
2020
}
2121
}

‎examples/cms-enterspeed/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@types/node": "18.0.0",
1717
"@types/react": "18.0.14",
1818
"autoprefixer": "10.4.2",
19-
"postcss": "8.4.5",
19+
"postcss": "8.4.31",
2020
"tailwindcss": "^3.0.15",
2121
"typescript": "4.7.4"
2222
}

‎examples/cms-ghost/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"devDependencies": {
1818
"autoprefixer": "10.4.2",
19-
"postcss": "8.4.5",
19+
"postcss": "8.4.31",
2020
"tailwindcss": "^3.0.15"
2121
}
2222
}

‎examples/cms-graphcms/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"devDependencies": {
1616
"autoprefixer": "10.4.2",
17-
"postcss": "8.4.5",
17+
"postcss": "8.4.31",
1818
"tailwindcss": "^3.0.15"
1919
}
2020
}

‎examples/cms-kontent-ai/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"devDependencies": {
2424
"autoprefixer": "10.4.7",
25-
"postcss": "8.4.14",
25+
"postcss": "8.4.31",
2626
"tailwindcss": "^3.0.15",
2727
"tslib": "2.4.0"
2828
}

‎examples/cms-prepr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"devDependencies": {
1616
"autoprefixer": "10.4.2",
17-
"postcss": "8.4.5",
17+
"postcss": "8.4.31",
1818
"tailwindcss": "^3.0.15"
1919
}
2020
}

‎examples/cms-prismic/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"autoprefixer": "10.4.10",
24-
"postcss": "8.4.16",
24+
"postcss": "8.4.31",
2525
"slice-machine-ui": "^0.4.2",
2626
"tailwindcss": "^3.1.8",
2727
"typescript": "^4.8.3"

‎examples/cms-storyblok/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"devDependencies": {
1919
"autoprefixer": "10.4.2",
20-
"postcss": "8.4.5",
20+
"postcss": "8.4.31",
2121
"tailwindcss": "^3.0.15"
2222
}
2323
}

‎examples/cms-takeshape/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"devDependencies": {
1919
"autoprefixer": "10.4.2",
20-
"postcss": "8.4.5",
20+
"postcss": "8.4.31",
2121
"tailwindcss": "^3.0.15"
2222
}
2323
}

‎examples/cms-umbraco-heartcore/package.json

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"devDependencies": {
1616
"autoprefixer": "10.4.2",
17-
"postcss": "8.4.5",
17+
"postcss": "8.4.31",
1818
"tailwindcss": "^3.0.15"
1919
}
2020
}

‎examples/cms-wordpress/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"devDependencies": {
2121
"autoprefixer": "10.4.7",
22-
"postcss": "8.4.14",
22+
"postcss": "8.4.31",
2323
"tailwindcss": "^3.0.24"
2424
}
2525
}

‎examples/radix-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@types/node": "18.8.0",
1717
"@types/react": "18.0.21",
1818
"autoprefixer": "10.4.12",
19-
"postcss": "8.4.17",
19+
"postcss": "8.4.31",
2020
"tailwindcss": "3.1.8",
2121
"typescript": "4.8.4"
2222
}

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
"registry": "https://registry.npmjs.org/"
1717
}
1818
},
19-
"version": "13.5.5-canary.0"
19+
"version": "13.5.5-canary.2"
2020
}

‎lint-staged.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ module.exports = {
2727
`git add ${escapedFileNames}`,
2828
]
2929
},
30+
'**/*.rs': (filenames) => {
31+
const escapedFileNames = filenames
32+
.map((filename) => (isWin ? filename : escape([filename])))
33+
.join(' ')
34+
return [`cargo fmt -- ${escapedFileNames}`, `git add ${escapedFileNames}`]
35+
},
3036
}
3137

3238
function escape(str) {

‎packages/create-next-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-next-app",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"keywords": [
55
"react",
66
"next",

‎packages/create-next-app/templates/app-tw/js/app/layout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import './globals.css'
21
import { Inter } from 'next/font/google'
2+
import './globals.css'
33

44
const inter = Inter({ subsets: ['latin'] })
55

‎packages/create-next-app/templates/app-tw/ts/app/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import './globals.css'
21
import type { Metadata } from 'next'
32
import { Inter } from 'next/font/google'
3+
import './globals.css'
44

55
const inter = Inter({ subsets: ['latin'] })
66

‎packages/create-next-app/templates/app/js/app/layout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import './globals.css'
21
import { Inter } from 'next/font/google'
2+
import './globals.css'
33

44
const inter = Inter({ subsets: ['latin'] })
55

‎packages/create-next-app/templates/app/ts/app/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import './globals.css'
21
import type { Metadata } from 'next'
32
import { Inter } from 'next/font/google'
3+
import './globals.css'
44

55
const inter = Inter({ subsets: ['latin'] })
66

‎packages/eslint-config-next/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-next",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"description": "ESLint configuration used by Next.js.",
55
"main": "index.js",
66
"license": "MIT",
@@ -10,7 +10,7 @@
1010
},
1111
"homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
1212
"dependencies": {
13-
"@next/eslint-plugin-next": "13.5.5-canary.0",
13+
"@next/eslint-plugin-next": "13.5.5-canary.2",
1414
"@rushstack/eslint-patch": "^1.3.3",
1515
"@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
1616
"eslint-import-resolver-node": "^0.3.6",

‎packages/eslint-plugin-next/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/eslint-plugin-next",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"description": "ESLint plugin for Next.js.",
55
"main": "dist/index.js",
66
"license": "MIT",

‎packages/font/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/font",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"repository": {
55
"url": "vercel/next.js",
66
"directory": "packages/font"

‎packages/next-bundle-analyzer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/bundle-analyzer",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"main": "index.js",
55
"types": "index.d.ts",
66
"license": "MIT",

‎packages/next-codemod/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/codemod",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"license": "MIT",
55
"repository": {
66
"type": "git",

‎packages/next-env/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/env",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"keywords": [
55
"react",
66
"next",

‎packages/next-mdx/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/mdx",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"main": "index.js",
55
"license": "MIT",
66
"repository": {

‎packages/next-plugin-storybook/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/plugin-storybook",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"repository": {
55
"url": "vercel/next.js",
66
"directory": "packages/next-plugin-storybook"

‎packages/next-polyfill-module/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/polyfill-module",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
55
"main": "dist/polyfill-module.js",
66
"license": "MIT",

‎packages/next-polyfill-nomodule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/polyfill-nomodule",
3-
"version": "13.5.5-canary.0",
3+
"version": "13.5.5-canary.2",
44
"description": "A polyfill for non-dead, nomodule browsers.",
55
"main": "dist/polyfill-nomodule.js",
66
"license": "MIT",

‎packages/next-swc/crates/next-core/src/next_import_map.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ async fn insert_next_server_special_aliases(
452452
match runtime {
453453
NextRuntime::Edge => "next/dist/compiled/react/jsx-runtime",
454454
NextRuntime::NodeJs => {
455-
"next/dist/server/future/route-modules/app-page/vendored/shared/\
455+
"next/dist/server/future/route-modules/app-page/vendored/ssr/\
456456
react-jsx-runtime"
457457
}
458458
},
@@ -465,7 +465,7 @@ async fn insert_next_server_special_aliases(
465465
match runtime {
466466
NextRuntime::Edge => "next/dist/compiled/react/jsx-dev-runtime",
467467
NextRuntime::NodeJs => {
468-
"next/dist/server/future/route-modules/app-page/vendored/shared/\
468+
"next/dist/server/future/route-modules/app-page/vendored/ssr/\
469469
react-jsx-dev-runtime"
470470
}
471471
},
@@ -579,7 +579,7 @@ async fn insert_next_server_special_aliases(
579579
match runtime {
580580
NextRuntime::Edge => "next/dist/compiled/react/jsx-runtime",
581581
NextRuntime::NodeJs => {
582-
"next/dist/server/future/route-modules/app-page/vendored/shared/\
582+
"next/dist/server/future/route-modules/app-page/vendored/rsc/\
583583
react-jsx-runtime"
584584
}
585585
},
@@ -592,7 +592,7 @@ async fn insert_next_server_special_aliases(
592592
match runtime {
593593
NextRuntime::Edge => "next/dist/compiled/react/jsx-dev-runtime",
594594
NextRuntime::NodeJs => {
595-
"next/dist/server/future/route-modules/app-page/vendored/shared/\
595+
"next/dist/server/future/route-modules/app-page/vendored/rsc/\
596596
react-jsx-dev-runtime"
597597
}
598598
},

‎packages/next-swc/crates/next-core/src/next_server/context.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ pub async fn get_server_resolve_options_context(
109109
let unsupported_modules_resolve_plugin = UnsupportedModulesResolvePlugin::new(project_path);
110110
let server_component_externals_plugin = ExternalCjsModulesResolvePlugin::new(
111111
project_path,
112+
project_path.root(),
112113
ExternalPredicate::Only(next_config.server_component_externals()).cell(),
113114
);
114115
let ty = ty.into_value();
@@ -125,6 +126,7 @@ pub async fn get_server_resolve_options_context(
125126
};
126127
let external_cjs_modules_plugin = ExternalCjsModulesResolvePlugin::new(
127128
project_path,
129+
project_path.root(),
128130
ExternalPredicate::AllExcept(next_config.transpile_packages()).cell(),
129131
);
130132

0 commit comments

Comments
 (0)