Merge branch 'canary' into refactor-data-fetching

vercel · Dec 14, 2021 · babe693 · babe693
2 parents 5178810 + 8f9aed6
commit babe693
Show file tree

Hide file tree

Showing 84 changed files with 827 additions and 956 deletions.
diff --git a/docs/advanced-features/custom-server.md b/docs/advanced-features/custom-server.md
@@ -7,7 +7,6 @@ description: Start a Next.js app programmatically using a custom server.
 <details>
   <summary><b>Examples</b></summary>
   <ul>
-    <li><a href="https://github.com/vercel/next.js/tree/canary/examples/custom-server">Basic custom server</a></li>
     <li><a href="https://github.com/vercel/next.js/tree/canary/examples/custom-server-express">Express integration</a></li>
     <li><a href="https://github.com/vercel/next.js/tree/canary/examples/custom-server-hapi">Hapi integration</a></li>
     <li><a href="https://github.com/vercel/next.js/tree/canary/examples/custom-server-koa">Koa integration</a></li>

diff --git a/docs/advanced-features/react-18.md b/docs/advanced-features/react-18.md
@@ -2,14 +2,14 @@
 
 [React 18](https://reactjs.org/blog/2021/06/08/the-plan-for-react-18.html) adds new features including, Suspense, automatic batching of updates, APIs like `startTransition`, and a new streaming API for server rendering with support for `React.lazy`.
 
-React 18 is still in beta. Read more about React 18's [release plan](https://github.com/reactwg/react-18/discussions) and discussions from the [working group](https://github.com/reactwg/react-18/discussions).
+React 18 is in RC now. Read more about React 18's [release plan](https://github.com/reactwg/react-18/discussions) and discussions from the [working group](https://github.com/reactwg/react-18/discussions).
 
 ### React 18 Usage in Next.js
 
-Ensure you have the `beta` version of React installed:
+Ensure you have the `rc` npm tag of React installed:
 
 ```jsx
-npm install next@latest react@beta react-dom@beta
+npm install next@latest react@rc react-dom@rc
 ```
 
 ### Enable SSR Streaming (Alpha)

diff --git a/docs/api-reference/next/image.md b/docs/api-reference/next/image.md
@@ -144,7 +144,7 @@ Should only be used when the image is visible above the fold. Defaults to `false
 
 A placeholder to use while the image is loading. Possible values are `blur` or `empty`. Defaults to `empty`.
 
-When `blur`, the [`blurDataURL`](#blurdataurl) property will be used as the placeholder. If `src` is an object from a [static import](#local-images) and the imported image is `.jpg`, `.png`, `.webp`, or `.avif`, then `blurDataURL` will be automatically populated.
+When `blur`, the [`blurDataURL`](#blurdataurl) property will be used as the placeholder. If `src` is an object from a [static import](/docs/basic-features/image-optimization.md#local-images) and the imported image is `.jpg`, `.png`, `.webp`, or `.avif`, then `blurDataURL` will be automatically populated.
 
 For dynamic images, you must provide the [`blurDataURL`](#blurdataurl) property. Solutions such as [Plaiceholder](https://github.com/joe-bell/plaiceholder) can help with `base64` generation.
 

diff --git a/errors/webpack5.md b/errors/webpack5.md
@@ -37,7 +37,7 @@ In case you do have custom webpack configuration, either through custom plugins
 
 - When using `next-transpile-modules` make sure you use the latest version which includes [this patch](https://github.com/martpie/next-transpile-modules/pull/179)
 - When using `@zeit/next-css` / `@zeit/next-sass` make sure you use the [built-in CSS/Sass support](https://nextjs.org/docs/basic-features/built-in-css-support) instead
-- When using `@zeit/next-preact` use [this example](https://github.com/vercel/next-plugins/tree/master/packages/next-preact) instead
+- When using `@zeit/next-preact` use [this example](https://github.com/vercel/next.js/tree/canary/examples/using-preact) instead
 - When using `@zeit/next-source-maps` use the [built-in production Source Map support](https://nextjs.org/docs/advanced-features/source-maps)
 - When using webpack plugins make sure they're upgraded to the latest version, in most cases the latest version will include webpack 5 support. In some cases these upgraded webpack plugins will only support webpack 5.
 

diff --git a/examples/blog-starter/README.md b/examples/blog-starter/README.md
@@ -61,4 +61,4 @@ Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&ut
 
 # Notes
 
-This blog-starter uses [Tailwind CSS](https://tailwindcss.com). To control the generated stylesheet's filesize, this example uses Tailwind CSS' v2.0 [`purge` option](https://tailwindcss.com/docs/controlling-file-size/#removing-unused-css) to remove unused CSS.
+This blog-starter uses [Tailwind CSS](https://tailwindcss.com) [(v3.0)](https://tailwindcss.com/blog/tailwindcss-v3).
diff --git a/examples/blog-starter/package.json b/examples/blog-starter/package.json
@@ -16,8 +16,8 @@
     "remark-html": "13.0.1"
   },
   "devDependencies": {
-    "autoprefixer": "^10.2.1",
-    "postcss": "^8.2.4",
-    "tailwindcss": "^2.0.2"
+    "autoprefixer": "^10.4.0",
+    "postcss": "^8.4.4",
+    "tailwindcss": "^3.0.1"
   }
 }
diff --git a/examples/blog-starter/styles/index.css b/examples/blog-starter/styles/index.css
@@ -1,15 +1,3 @@
 @tailwind base;
-
-/* Write your own custom base styles here */
-
-/* Start purging... */
 @tailwind components;
-/* Stop purging. */
-
-/* Write you own custom component styles here */
-
-/* Start purging... */
 @tailwind utilities;
-/* Stop purging. */
-
-/* Your own custom utilities */
diff --git a/examples/blog-starter/tailwind.config.js b/examples/blog-starter/tailwind.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  purge: ['./components/**/*.js', './pages/**/*.js'],
+  content: ['./components/**/*.js', './pages/**/*.js'],
   theme: {
     extend: {
       colors: {

diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "gray-matter": "^4.0.2",
     "next": "latest",
-    "nextra": "^0.4.4",
+    "nextra": "^2.0.0-beta.5",
     "nextra-theme-blog": "^0.1.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/examples/using-preact/README.md b/examples/using-preact/README.md
@@ -4,7 +4,7 @@ This example uses [Preact](https://github.com/preactjs/preact) instead of React.
 
 ## Preview
 
-Preview the example live on [StackBlitz](http://stackblitz.com/):
+Preview the example live on [StackBlitz](https://stackblitz.com/):
 
 [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/vercel/next.js/tree/canary/examples/using-preact)
 

diff --git a/examples/using-preact/package.json b/examples/using-preact/package.json
@@ -7,12 +7,12 @@
   },
   "devDependencies": {},
   "dependencies": {
-    "next": "^10.0.0",
-    "next-plugin-preact": "^3.0.3",
-    "preact": "^10.5.5",
-    "preact-render-to-string": "^5.1.11",
-    "react": "npm:@preact/compat",
-    "react-dom": "npm:@preact/compat",
-    "react-ssr-prepass": "npm:preact-ssr-prepass@^1.1.2"
+    "next": "^12.0.0",
+    "next-plugin-preact": "^3.0.6",
+    "preact": "^10.5.15",
+    "preact-render-to-string": "^5.1.19",
+    "react": "npm:@preact/compat@^17.0.2",
+    "react-dom": "npm:@preact/compat@^17.0.2",
+    "react-ssr-prepass": "npm:preact-ssr-prepass@^1.2.0"
   }
 }
diff --git a/examples/with-docker/Dockerfile b/examples/with-docker/Dockerfile
@@ -1,20 +1,20 @@
 # Install dependencies only when needed
-FROM node:14-alpine AS deps
+FROM node:alpine AS deps
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 COPY package.json yarn.lock ./
 RUN yarn install --frozen-lockfile
 
 # Rebuild the source code only when needed
-FROM node:14-alpine AS builder
+FROM node:alpine AS builder
 WORKDIR /app
 COPY . .
 COPY --from=deps /app/node_modules ./node_modules
-RUN yarn build
+RUN yarn build && yarn install --production --ignore-scripts --prefer-offline
 
 # Production image, copy all the files and run next
-FROM node:14-alpine AS runner
+FROM node:alpine AS runner
 WORKDIR /app
 
 ENV NODE_ENV production
@@ -25,10 +25,13 @@ RUN adduser -S nextjs -u 1001
 # You only need to copy next.config.js if you are NOT using the default configuration
 # COPY --from=builder /app/next.config.js ./
 COPY --from=builder /app/public ./public
-COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
-COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/package.json ./package.json
 
+# Automatically leverage output traces to reduce image size 
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
 USER nextjs
 
 EXPOSE 3000
@@ -40,4 +43,4 @@ ENV PORT 3000
 # Uncomment the following line in case you want to disable telemetry.
 # ENV NEXT_TELEMETRY_DISABLED 1
 
-CMD ["node_modules/.bin/next", "start"]
+CMD ["node", "server.js"]
diff --git a/examples/with-docker/next.config.js b/examples/with-docker/next.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  experimental: {
+    outputStandalone: true,
+  },
+}
diff --git a/examples/with-typescript-eslint-jest/.babelrc b/examples/with-typescript-eslint-jest/.babelrc
diff --git a/examples/with-typescript-eslint-jest/.eslintignore b/examples/with-typescript-eslint-jest/.eslintignore
diff --git a/examples/with-typescript-eslint-jest/.eslintrc.json b/examples/with-typescript-eslint-jest/.eslintrc.json
diff --git a/examples/with-typescript-eslint-jest/.gitignore b/examples/with-typescript-eslint-jest/.gitignore
diff --git a/examples/with-typescript-eslint-jest/.prettierignore b/examples/with-typescript-eslint-jest/.prettierignore
diff --git a/examples/with-typescript-eslint-jest/.prettierrc b/examples/with-typescript-eslint-jest/.prettierrc
diff --git a/examples/with-typescript-eslint-jest/README.md b/examples/with-typescript-eslint-jest/README.md
diff --git a/examples/with-typescript-eslint-jest/jest.config.js b/examples/with-typescript-eslint-jest/jest.config.js
diff --git a/examples/with-typescript-eslint-jest/next-env.d.ts b/examples/with-typescript-eslint-jest/next-env.d.ts
diff --git a/examples/with-typescript-eslint-jest/package.json b/examples/with-typescript-eslint-jest/package.json
diff --git a/examples/with-typescript-eslint-jest/pages/api/hello.ts b/examples/with-typescript-eslint-jest/pages/api/hello.ts