Merge branch 'canary' into update-react-to-d900fadbf

Author: gnoff

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.5.5-canary.1"
+  "version": "13.5.5-canary.2"
 }

lint-staged.config.js

@@ -27,6 +27,12 @@ module.exports = {
       `git add ${escapedFileNames}`,
     ]
   },
+  '**/*.rs': (filenames) => {
+    const escapedFileNames = filenames
+      .map((filename) => (isWin ? filename : escape([filename])))
+      .join(' ')
+    return [`cargo fmt -- ${escapedFileNames}`, `git add ${escapedFileNames}`]
+  },
 }
 
 function escape(str) {

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "keywords": [
     "react",
     "next",

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

@@ -1,5 +1,5 @@
-import './globals.css'
 import { Inter } from 'next/font/google'
+import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

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

@@ -1,6 +1,6 @@
-import './globals.css'
 import type { Metadata } from 'next'
 import { Inter } from 'next/font/google'
+import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

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

@@ -1,5 +1,5 @@
-import './globals.css'
 import { Inter } from 'next/font/google'
+import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

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

@@ -1,6 +1,6 @@
-import './globals.css'
 import type { Metadata } from 'next'
 import { Inter } from 'next/font/google'
+import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
   "dependencies": {
-    "@next/eslint-plugin-next": "13.5.5-canary.1",
+    "@next/eslint-plugin-next": "13.5.5-canary.2",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
     "eslint-import-resolver-node": "^0.3.6",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

packages/font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"