Merge branch 'canary' into wyattjoh/NEXT-713-unify-request

vercel · Apr 5, 2023 · b6b4546 · b6b4546
2 parents e45f1f3 + d32ee25
commit b6b4546
Show file tree

Hide file tree

Showing 81 changed files with 852 additions and 456 deletions.
diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -3,6 +3,7 @@ on:
     branches: ['canary', 'trunk-merge/*']
   pull_request:
     types: [opened, synchronize]
+  merge_group:
 
 name: Build, test, and deploy
 

diff --git a/docs/basic-features/image-optimization.md b/docs/basic-features/image-optimization.md
@@ -35,7 +35,7 @@ Now, you can define the `src` for your image (either local or remote).
 To use a local image, `import` your `.jpg`, `.png`, or `.webp` files:
 
 ```jsx
-import profilePic from '../public/me.png'
+import profilePic from '../assets/me.png'
 ```
 
 Dynamic `await import()` or `require()` are _not_ supported. The `import` must be static so it can be analyzed at build time.
@@ -44,7 +44,7 @@ Next.js will automatically determine the `width` and `height` of your image base
 
 ```js
 import Image from 'next/image'
-import profilePic from '../public/me.png'
+import profilePic from '../assets/me.png'
 
 function Home() {
   return (

diff --git a/docs/migrating/from-gatsby.md b/docs/migrating/from-gatsby.md
@@ -185,7 +185,7 @@ Instead, use the built-in [`next/image`](/docs/api-reference/next/image.md) comp
 
 ```jsx
 import Image from 'next/image'
-import profilePic from '../public/me.png'
+import profilePic from '../assets/me.png'
 
 export default function Home() {
   return (

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.2.5-canary.29"
+  "version": "13.2.5-canary.30"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "test-pack": "cd ../../ && pnpm test-pack eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "13.2.5-canary.29",
+    "@next/eslint-plugin-next": "13.2.5-canary.30",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.42.0",
     "eslint-import-resolver-node": "^0.3.6",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "13.2.5-canary.29",
+  "version": "13.2.5-canary.30",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",