Merge branch 'canary' into respect-cache-headers

packages/create-next-app/templates/typescript/next-env.d.ts

@@ -1,2 +1,3 @@
 /// <reference types="next" />
 /// <reference types="next/types/global" />
+/// <reference types="next/image-types/global" />

packages/next/build/webpack/loaders/next-serverless-loader/api-handler.ts

@@ -2,6 +2,7 @@ import { parse as parseUrl } from 'url'
 import { IncomingMessage, ServerResponse } from 'http'
 import { apiResolver } from '../../../../server/api-utils'
 import { getUtils, vercelHeader, ServerlessHandlerCtx } from './utils'
+import { DecodeError } from '../../../../shared/lib/utils'
 
 export function getApiHandler(ctx: ServerlessHandlerCtx) {
   const { pageModule, encodedPreviewProps, pageIsDynamic } = ctx
@@ -50,8 +51,7 @@ export function getApiHandler(ctx: ServerlessHandlerCtx) {
     } catch (err) {
       console.error(err)
 
-      // TODO: better error for DECODE_FAILED?
-      if (err.code === 'DECODE_FAILED') {
+      if (err instanceof DecodeError) {
         res.statusCode = 400
         res.end('Bad Request')
       } else {

packages/next/build/webpack/loaders/next-serverless-loader/page-handler.ts

@@ -1,6 +1,6 @@
 import { IncomingMessage, ServerResponse } from 'http'
 import { parse as parseUrl, format as formatUrl, UrlWithParsedQuery } from 'url'
-import { isResSent } from '../../../../shared/lib/utils'
+import { DecodeError, isResSent } from '../../../../shared/lib/utils'
 import { sendPayload } from '../../../../server/send-payload'
 import { getUtils, vercelHeader, ServerlessHandlerCtx } from './utils'
 
@@ -409,8 +409,7 @@ export function getPageHandler(ctx: ServerlessHandlerCtx) {
 
       if (err.code === 'ENOENT') {
         res.statusCode = 404
-      } else if (err.code === 'DECODE_FAILED' || err.code === 'ENAMETOOLONG') {
-        // TODO: better error?
+      } else if (err instanceof DecodeError) {
         res.statusCode = 400
       } else {
         console.error('Unhandled error during request:', err)

packages/next/client/route-loader.ts

@@ -176,7 +176,7 @@ function resolvePromiseWithTimeout<T>(
 
 // TODO: stop exporting or cache the failure
 // It'd be best to stop exporting this. It's an implementation detail. We're
-// only exporting it for backwards compatibilty with the `page-loader`.
+// only exporting it for backwards compatibility with the `page-loader`.
 // Only cache this response as a last resort if we cannot eliminate all other
 // code branches that use the Build Manifest Callback and push them through
 // the Route Loader interface.

packages/next/lib/eslint/writeDefaultConfig.ts

@@ -70,14 +70,14 @@ export async function writeDefaultConfig(
     }
   } else {
     await fs.writeFile(
-      '.eslintrc',
+      '.eslintrc.json',
       CommentJson.stringify(defaultConfig, null, 2) + os.EOL
     )
 
     console.log(
       chalk.green(
         `We created the ${chalk.bold(
-          '.eslintrc'
+          '.eslintrc.json'
         )} file for you and included the base Next.js ESLint configuration.`
       )
     )

packages/next/server/dev/hot-reloader.ts

@@ -26,6 +26,7 @@ import { stringify } from 'querystring'
 import { difference } from '../../build/utils'
 import { NextConfig } from '../config'
 import { CustomRoutes } from '../../lib/load-custom-routes'
+import { DecodeError } from '../../shared/lib/utils'
 
 export async function renderScriptError(
   res: ServerResponse,
@@ -212,11 +213,7 @@ export default class HotReloader {
           .map((param) => decodeURIComponent(param))
           .join('/')}`
       } catch (_) {
-        const err: Error & { code?: string } = new Error(
-          'failed to decode param'
-        )
-        err.code = 'DECODE_FAILED'
-        throw err
+        throw new DecodeError('failed to decode param')
       }
 
       const page = denormalizePagePath(decodedPagePath)

packages/next/server/dev/next-dev-server.ts

@@ -30,6 +30,7 @@ import Server, {
   WrappedBuildError,
   ServerConstructor,
   FindComponentsResult,
+  ResponsePayload,
 } from '../next-server'
 import { normalizePagePath } from '../normalize-page-path'
 import Router, { Params, route } from '../router'
@@ -46,6 +47,7 @@ import {
   LoadComponentsReturnType,
   loadDefaultErrorComponents,
 } from '../load-components'
+import { DecodeError } from '../../shared/lib/utils'
 
 if (typeof React.Suspense === 'undefined') {
   throw new Error(
@@ -376,9 +378,7 @@ export default class DevServer extends Server {
     try {
       decodedPath = decodeURIComponent(path)
     } catch (_) {
-      const err: Error & { code?: string } = new Error('failed to decode param')
-      err.code = 'DECODE_FAILED'
-      throw err
+      throw new DecodeError('failed to decode param')
     }
 
     if (await this.hasPublicFile(decodedPath)) {
@@ -637,14 +637,14 @@ export default class DevServer extends Server {
     return await loadDefaultErrorComponents(this.distDir)
   }
 
-  sendHTML(
+  sendResponse(
     req: IncomingMessage,
     res: ServerResponse,
-    html: string
+    response: ResponsePayload
   ): Promise<void> {
     // In dev, we should not cache pages for any reason.
     res.setHeader('Cache-Control', 'no-store, must-revalidate')
-    return super.sendHTML(req, res, html)
+    return super.sendResponse(req, res, response)
   }
 
   protected setImmutableAssetCacheControl(res: ServerResponse): void {