Unverified Commit d78bb6fe authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

upgrade to typescript 4.4.3 (#29112)

Co-authored-by: 's avatarkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
parent cefd9cf2
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
"tailwindcss": "1.1.3", "tailwindcss": "1.1.3",
"taskr": "1.1.0", "taskr": "1.1.0",
"tree-kill": "1.2.2", "tree-kill": "1.2.2",
"typescript": "4.3.4", "typescript": "4.4.3",
"wait-port": "0.2.2", "wait-port": "0.2.2",
"web-streams-polyfill": "2.1.1", "web-streams-polyfill": "2.1.1",
"webpack-bundle-analyzer": "4.3.0", "webpack-bundle-analyzer": "4.3.0",
......
...@@ -44,7 +44,7 @@ export async function createApp({ ...@@ -44,7 +44,7 @@ export async function createApp({
try { try {
repoUrl = new URL(example) repoUrl = new URL(example)
} catch (error) { } catch (error: any) {
if (error.code !== 'ERR_INVALID_URL') { if (error.code !== 'ERR_INVALID_URL') {
console.error(error) console.error(error)
process.exit(1) process.exit(1)
...@@ -158,7 +158,16 @@ export async function createApp({ ...@@ -158,7 +158,16 @@ export async function createApp({
}) })
} }
} catch (reason) { } catch (reason) {
throw new DownloadError(reason) function isErrorLike(err: unknown): err is { message: string } {
return (
typeof err === 'object' &&
err !== null &&
typeof (err as { message?: unknown }).message === 'string'
)
}
throw new DownloadError(
isErrorLike(reason) ? reason.message : reason + ''
)
} }
// Copy our default `.gitignore` if the application did not provide one // Copy our default `.gitignore` if the application did not provide one
const ignorePath = path.join(root, '.gitignore') const ignorePath = path.join(root, '.gitignore')
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
"prompts": "2.1.0", "prompts": "2.1.0",
"rimraf": "3.0.0", "rimraf": "3.0.0",
"tar": "4.4.10", "tar": "4.4.10",
"typescript": "4.3.4",
"update-check": "1.5.4", "update-check": "1.5.4",
"validate-npm-package-name": "3.0.0" "validate-npm-package-name": "3.0.0"
}, },
......
...@@ -106,7 +106,7 @@ export function loadEnvConfig( ...@@ -106,7 +106,7 @@ export function loadEnvConfig(
path: envFile, path: envFile,
contents, contents,
}) })
} catch (err) { } catch (err: any) {
if (err.code !== 'ENOENT') { if (err.code !== 'ENOENT') {
log.error(`Failed to load env from ${envFile}`, err) log.error(`Failed to load env from ${envFile}`, err)
} }
......
...@@ -90,6 +90,7 @@ import { writeBuildId } from './write-build-id' ...@@ -90,6 +90,7 @@ import { writeBuildId } from './write-build-id'
import { normalizeLocalePath } from '../shared/lib/i18n/normalize-locale-path' import { normalizeLocalePath } from '../shared/lib/i18n/normalize-locale-path'
import { isWebpack5 } from 'next/dist/compiled/webpack/webpack' import { isWebpack5 } from 'next/dist/compiled/webpack/webpack'
import { NextConfigComplete } from '../server/config-shared' import { NextConfigComplete } from '../server/config-shared'
import isError from '../lib/is-error'
export type SsgRoute = { export type SsgRoute = {
initialRevalidateSeconds: number | false initialRevalidateSeconds: number | false
...@@ -463,7 +464,7 @@ export default async function build( ...@@ -463,7 +464,7 @@ export default async function build(
await promises.mkdir(distDir, { recursive: true }) await promises.mkdir(distDir, { recursive: true })
return true return true
} catch (err) { } catch (err) {
if (err.code === 'EPERM') { if (isError(err) && err.code === 'EPERM') {
return false return false
} }
throw err throw err
...@@ -927,7 +928,8 @@ export default async function build( ...@@ -927,7 +928,8 @@ export default async function build(
) )
} }
} catch (err) { } catch (err) {
if (err.message !== 'INVALID_DEFAULT_EXPORT') throw err if (isError(err) && err.message !== 'INVALID_DEFAULT_EXPORT')
throw err
invalidPages.add(page) invalidPages.add(page)
} }
} }
......
...@@ -34,6 +34,7 @@ import { loadComponents } from '../server/load-components' ...@@ -34,6 +34,7 @@ import { loadComponents } from '../server/load-components'
import { trace } from '../trace' import { trace } from '../trace'
import { setHttpAgentOptions } from '../server/config' import { setHttpAgentOptions } from '../server/config'
import { NextConfigComplete } from '../server/config-shared' import { NextConfigComplete } from '../server/config-shared'
import isError from '../lib/is-error'
const fileGzipStats: { [k: string]: Promise<number> | undefined } = {} const fileGzipStats: { [k: string]: Promise<number> | undefined } = {}
const fsStatGzip = (file: string) => { const fsStatGzip = (file: string) => {
...@@ -942,7 +943,7 @@ export async function isPageStatic( ...@@ -942,7 +943,7 @@ export async function isPageStatic(
traceExcludes: config.unstable_excludeFiles || [], traceExcludes: config.unstable_excludeFiles || [],
} }
} catch (err) { } catch (err) {
if (err.code === 'MODULE_NOT_FOUND') return {} if (isError(err) && err.code === 'MODULE_NOT_FOUND') return {}
throw err throw err
} }
}) })
......
...@@ -48,6 +48,7 @@ import { WellKnownErrorsPlugin } from './webpack/plugins/wellknown-errors-plugin ...@@ -48,6 +48,7 @@ import { WellKnownErrorsPlugin } from './webpack/plugins/wellknown-errors-plugin
import { regexLikeCss } from './webpack/config/blocks/css' import { regexLikeCss } from './webpack/config/blocks/css'
import { CopyFilePlugin } from './webpack/plugins/copy-file-plugin' import { CopyFilePlugin } from './webpack/plugins/copy-file-plugin'
import type { Span } from '../trace' import type { Span } from '../trace'
import isError from '../lib/is-error'
type ExcludesFalse = <T>(x: T | false) => x is T type ExcludesFalse = <T>(x: T | false) => x is T
...@@ -74,9 +75,15 @@ function parseJsonFile(filePath: string) { ...@@ -74,9 +75,15 @@ function parseJsonFile(filePath: string) {
try { try {
return JSON5.parse(contents) return JSON5.parse(contents)
} catch (err) { } catch (err) {
if (!isError(err)) throw err
const codeFrame = codeFrameColumns( const codeFrame = codeFrameColumns(
String(contents), String(contents),
{ start: { line: err.lineNumber, column: err.columnNumber } }, {
start: {
line: (err as Error & { lineNumber?: number }).lineNumber || 0,
column: (err as Error & { columnNumber?: number }).columnNumber || 0,
},
},
{ message: err.message, highlightCode: true } { message: err.message, highlightCode: true }
) )
throw new Error(`Failed to parse "${filePath}":\n${codeFrame}`) throw new Error(`Failed to parse "${filePath}":\n${codeFrame}`)
......
...@@ -12,6 +12,7 @@ import { getRedirectStatus } from '../../../../lib/load-custom-routes' ...@@ -12,6 +12,7 @@ import { getRedirectStatus } from '../../../../lib/load-custom-routes'
import getRouteNoAssetPath from '../../../../shared/lib/router/utils/get-route-from-asset-path' import getRouteNoAssetPath from '../../../../shared/lib/router/utils/get-route-from-asset-path'
import { PERMANENT_REDIRECT_STATUS } from '../../../../shared/lib/constants' import { PERMANENT_REDIRECT_STATUS } from '../../../../shared/lib/constants'
import RenderResult from '../../../../server/render-result' import RenderResult from '../../../../server/render-result'
import isError from '../../../../lib/is-error'
export function getPageHandler(ctx: ServerlessHandlerCtx) { export function getPageHandler(ctx: ServerlessHandlerCtx) {
const { const {
...@@ -406,7 +407,7 @@ export function getPageHandler(ctx: ServerlessHandlerCtx) { ...@@ -406,7 +407,7 @@ export function getPageHandler(ctx: ServerlessHandlerCtx) {
parsedUrl = parseUrl(req.url!, true) parsedUrl = parseUrl(req.url!, true)
} }
if (err.code === 'ENOENT') { if (isError(err) && err.code === 'ENOENT') {
res.statusCode = 404 res.statusCode = 404
} else if (err instanceof DecodeError) { } else if (err instanceof DecodeError) {
res.statusCode = 400 res.statusCode = 400
......
...@@ -8,6 +8,7 @@ import { ...@@ -8,6 +8,7 @@ import {
import { TRACE_OUTPUT_VERSION } from '../../../shared/lib/constants' import { TRACE_OUTPUT_VERSION } from '../../../shared/lib/constants'
import { spans } from './profiling-plugin' import { spans } from './profiling-plugin'
import { Span } from '../../../trace' import { Span } from '../../../trace'
import isError from '../../../lib/is-error'
const PLUGIN_NAME = 'TraceEntryPointsPlugin' const PLUGIN_NAME = 'TraceEntryPointsPlugin'
const TRACE_IGNORES = [ const TRACE_IGNORES = [
...@@ -163,7 +164,10 @@ export class TraceEntryPointsPlugin implements webpack.Plugin { ...@@ -163,7 +164,10 @@ export class TraceEntryPointsPlugin implements webpack.Plugin {
try { try {
return compilation.inputFileSystem.readFileSync(path) return compilation.inputFileSystem.readFileSync(path)
} catch (e) { } catch (e) {
if (e.code === 'ENOENT' || e.code === 'EISDIR') { if (
isError(e) &&
(e.code === 'ENOENT' || e.code === 'EISDIR')
) {
return null return null
} }
throw e throw e
...@@ -176,13 +180,14 @@ export class TraceEntryPointsPlugin implements webpack.Plugin { ...@@ -176,13 +180,14 @@ export class TraceEntryPointsPlugin implements webpack.Plugin {
return compilation.inputFileSystem.readlinkSync(path) return compilation.inputFileSystem.readlinkSync(path)
} catch (e) { } catch (e) {
if ( if (
e.code !== 'EINVAL' && isError(e) &&
e.code !== 'ENOENT' && (e.code === 'EINVAL' ||
e.code !== 'UNKNOWN' e.code === 'ENOENT' ||
e.code === 'UNKNOWN')
) { ) {
throw e return null
} }
return null throw e
} }
// }) // })
} }
...@@ -191,7 +196,7 @@ export class TraceEntryPointsPlugin implements webpack.Plugin { ...@@ -191,7 +196,7 @@ export class TraceEntryPointsPlugin implements webpack.Plugin {
try { try {
return compilation.inputFileSystem.statSync(path) return compilation.inputFileSystem.statSync(path)
} catch (e) { } catch (e) {
if (e.code === 'ENOENT') { if (isError(e) && e.code === 'ENOENT') {
return null return null
} }
throw e throw e
......
...@@ -2,6 +2,7 @@ import { webpack } from 'next/dist/compiled/webpack/webpack' ...@@ -2,6 +2,7 @@ import { webpack } from 'next/dist/compiled/webpack/webpack'
import { isWebpack5 } from 'next/dist/compiled/webpack/webpack' import { isWebpack5 } from 'next/dist/compiled/webpack/webpack'
import { realpathSync } from 'fs' import { realpathSync } from 'fs'
import path from 'path' import path from 'path'
import isError from '../../../lib/is-error'
const originModules = [ const originModules = [
require.resolve('../../../server/require'), require.resolve('../../../server/require'),
...@@ -12,7 +13,7 @@ function deleteCache(filePath: string) { ...@@ -12,7 +13,7 @@ function deleteCache(filePath: string) {
try { try {
filePath = realpathSync(filePath) filePath = realpathSync(filePath)
} catch (e) { } catch (e) {
if (e.code !== 'ENOENT') throw e if (isError(e) && e.code !== 'ENOENT') throw e
} }
const module = require.cache[filePath] const module = require.cache[filePath]
if (module) { if (module) {
......
...@@ -6,7 +6,7 @@ const chalk = new Chalk.constructor({ enabled: true }) ...@@ -6,7 +6,7 @@ const chalk = new Chalk.constructor({ enabled: true })
export function getBabelError( export function getBabelError(
fileName: string, fileName: string,
err: Error & { err: Error & {
code?: 'BABEL_PARSE_ERROR' code?: string | number
loc?: { line: number; column: number } loc?: { line: number; column: number }
} }
): SimpleWebpackError | false { ): SimpleWebpackError | false {
......
...@@ -6,6 +6,7 @@ import { getCssError } from './parseCss' ...@@ -6,6 +6,7 @@ import { getCssError } from './parseCss'
import { getScssError } from './parseScss' import { getScssError } from './parseScss'
import { getNotFoundError } from './parseNotFoundError' import { getNotFoundError } from './parseNotFoundError'
import { SimpleWebpackError } from './simpleWebpackError' import { SimpleWebpackError } from './simpleWebpackError'
import isError from '../../../../lib/is-error'
function getFileData( function getFileData(
compilation: webpack.compilation.Compilation, compilation: webpack.compilation.Compilation,
...@@ -50,7 +51,7 @@ export async function getModuleBuildError( ...@@ -50,7 +51,7 @@ export async function getModuleBuildError(
(input?.name === 'ModuleBuildError' || (input?.name === 'ModuleBuildError' ||
input?.name === 'ModuleNotFoundError') && input?.name === 'ModuleNotFoundError') &&
Boolean(input.module) && Boolean(input.module) &&
input.error instanceof Error isError(input.error)
) )
) { ) {
return false return false
......
...@@ -6,6 +6,7 @@ import * as Log from '../build/output/log' ...@@ -6,6 +6,7 @@ import * as Log from '../build/output/log'
import { cliCommand } from '../bin/next' import { cliCommand } from '../bin/next'
import build from '../build' import build from '../build'
import { printAndExit } from '../server/lib/utils' import { printAndExit } from '../server/lib/utils'
import isError from '../lib/is-error'
const nextBuild: cliCommand = (argv) => { const nextBuild: cliCommand = (argv) => {
const validArgs: arg.Spec = { const validArgs: arg.Spec = {
...@@ -23,7 +24,7 @@ const nextBuild: cliCommand = (argv) => { ...@@ -23,7 +24,7 @@ const nextBuild: cliCommand = (argv) => {
try { try {
args = arg(validArgs, { argv }) args = arg(validArgs, { argv })
} catch (error) { } catch (error) {
if (error.code === 'ARG_UNKNOWN_OPTION') { if (isError(error) && error.code === 'ARG_UNKNOWN_OPTION') {
return printAndExit(error.message, 1) return printAndExit(error.message, 1)
} }
throw error throw error
......
...@@ -7,6 +7,7 @@ import { printAndExit } from '../server/lib/utils' ...@@ -7,6 +7,7 @@ import { printAndExit } from '../server/lib/utils'
import * as Log from '../build/output/log' import * as Log from '../build/output/log'
import { startedDevelopmentServer } from '../build/output' import { startedDevelopmentServer } from '../build/output'
import { cliCommand } from '../bin/next' import { cliCommand } from '../bin/next'
import isError from '../lib/is-error'
const nextDev: cliCommand = (argv) => { const nextDev: cliCommand = (argv) => {
const validArgs: arg.Spec = { const validArgs: arg.Spec = {
...@@ -24,7 +25,7 @@ const nextDev: cliCommand = (argv) => { ...@@ -24,7 +25,7 @@ const nextDev: cliCommand = (argv) => {
try { try {
args = arg(validArgs, { argv }) args = arg(validArgs, { argv })
} catch (error) { } catch (error) {
if (error.code === 'ARG_UNKNOWN_OPTION') { if (isError(error) && error.code === 'ARG_UNKNOWN_OPTION') {
return printAndExit(error.message, 1) return printAndExit(error.message, 1)
} }
throw error throw error
......
...@@ -6,6 +6,7 @@ import exportApp from '../export' ...@@ -6,6 +6,7 @@ import exportApp from '../export'
import { printAndExit } from '../server/lib/utils' import { printAndExit } from '../server/lib/utils'
import { cliCommand } from '../bin/next' import { cliCommand } from '../bin/next'
import { trace } from '../trace' import { trace } from '../trace'
import isError from '../lib/is-error'
const nextExport: cliCommand = (argv) => { const nextExport: cliCommand = (argv) => {
const nextExportCliSpan = trace('next-export-cli') const nextExportCliSpan = trace('next-export-cli')
...@@ -25,7 +26,7 @@ const nextExport: cliCommand = (argv) => { ...@@ -25,7 +26,7 @@ const nextExport: cliCommand = (argv) => {
try { try {
args = arg(validArgs, { argv }) args = arg(validArgs, { argv })
} catch (error) { } catch (error) {
if (error.code === 'ARG_UNKNOWN_OPTION') { if (isError(error) && error.code === 'ARG_UNKNOWN_OPTION') {
return printAndExit(error.message, 1) return printAndExit(error.message, 1)
} }
throw error throw error
......
...@@ -13,6 +13,7 @@ import loadConfig from '../server/config' ...@@ -13,6 +13,7 @@ import loadConfig from '../server/config'
import { PHASE_PRODUCTION_BUILD } from '../shared/lib/constants' import { PHASE_PRODUCTION_BUILD } from '../shared/lib/constants'
import { eventLintCheckCompleted } from '../telemetry/events' import { eventLintCheckCompleted } from '../telemetry/events'
import { CompileError } from '../lib/compile-error' import { CompileError } from '../lib/compile-error'
import isError from '../lib/is-error'
const eslintOptions = (args: arg.Spec, defaultCacheLocation: string) => ({ const eslintOptions = (args: arg.Spec, defaultCacheLocation: string) => ({
overrideConfigFile: args['--config'] || null, overrideConfigFile: args['--config'] || null,
...@@ -77,7 +78,7 @@ const nextLint: cliCommand = async (argv) => { ...@@ -77,7 +78,7 @@ const nextLint: cliCommand = async (argv) => {
try { try {
args = arg({ ...validArgs, ...validEslintArgs }, { argv }) args = arg({ ...validArgs, ...validEslintArgs }, { argv })
} catch (error) { } catch (error) {
if (error.code === 'ARG_UNKNOWN_OPTION') { if (isError(error) && error.code === 'ARG_UNKNOWN_OPTION') {
return printAndExit(error.message, 1) return printAndExit(error.message, 1)
} }
throw error throw error
......
...@@ -6,6 +6,7 @@ import startServer from '../server/lib/start-server' ...@@ -6,6 +6,7 @@ import startServer from '../server/lib/start-server'
import { printAndExit } from '../server/lib/utils' import { printAndExit } from '../server/lib/utils'
import { cliCommand } from '../bin/next' import { cliCommand } from '../bin/next'
import * as Log from '../build/output/log' import * as Log from '../build/output/log'
import isError from '../lib/is-error'
const nextStart: cliCommand = (argv) => { const nextStart: cliCommand = (argv) => {
const validArgs: arg.Spec = { const validArgs: arg.Spec = {
...@@ -23,7 +24,7 @@ const nextStart: cliCommand = (argv) => { ...@@ -23,7 +24,7 @@ const nextStart: cliCommand = (argv) => {
try { try {
args = arg(validArgs, { argv }) args = arg(validArgs, { argv })
} catch (error) { } catch (error) {
if (error.code === 'ARG_UNKNOWN_OPTION') { if (isError(error) && error.code === 'ARG_UNKNOWN_OPTION') {
return printAndExit(error.message, 1) return printAndExit(error.message, 1)
} }
throw error throw error
......
...@@ -4,6 +4,7 @@ import arg from 'next/dist/compiled/arg/index.js' ...@@ -4,6 +4,7 @@ import arg from 'next/dist/compiled/arg/index.js'
import { printAndExit } from '../server/lib/utils' import { printAndExit } from '../server/lib/utils'
import { cliCommand } from '../bin/next' import { cliCommand } from '../bin/next'
import { Telemetry } from '../telemetry/storage' import { Telemetry } from '../telemetry/storage'
import isError from '../lib/is-error'
const nextTelemetry: cliCommand = (argv) => { const nextTelemetry: cliCommand = (argv) => {
const validArgs: arg.Spec = { const validArgs: arg.Spec = {
...@@ -18,7 +19,7 @@ const nextTelemetry: cliCommand = (argv) => { ...@@ -18,7 +19,7 @@ const nextTelemetry: cliCommand = (argv) => {
try { try {
args = arg(validArgs, { argv }) args = arg(validArgs, { argv })
} catch (error) { } catch (error) {
if (error.code === 'ARG_UNKNOWN_OPTION') { if (isError(error) && error.code === 'ARG_UNKNOWN_OPTION') {
return printAndExit(error.message, 1) return printAndExit(error.message, 1)
} }
throw error throw error
......
...@@ -26,6 +26,7 @@ import PageLoader, { StyleSheetTuple } from './page-loader' ...@@ -26,6 +26,7 @@ import PageLoader, { StyleSheetTuple } from './page-loader'
import measureWebVitals from './performance-relayer' import measureWebVitals from './performance-relayer'
import { RouteAnnouncer } from './route-announcer' import { RouteAnnouncer } from './route-announcer'
import { createRouter, makePublicRouterInstance } from './router' import { createRouter, makePublicRouterInstance } from './router'
import isError from '../lib/is-error'
/// <reference types="react-dom/experimental" /> /// <reference types="react-dom/experimental" />
...@@ -326,7 +327,7 @@ export async function initNext(opts: { webpackHMR?: any } = {}) { ...@@ -326,7 +327,7 @@ export async function initNext(opts: { webpackHMR?: any } = {}) {
} }
} catch (error) { } catch (error) {
// This catches errors like throwing in the top level of a module // This catches errors like throwing in the top level of a module
initialErr = error initialErr = isError(error) ? error : new Error(error + '')
} }
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
...@@ -343,7 +344,7 @@ export async function initNext(opts: { webpackHMR?: any } = {}) { ...@@ -343,7 +344,7 @@ export async function initNext(opts: { webpackHMR?: any } = {}) {
// not overridden when we re-throw it below. // not overridden when we re-throw it below.
throw new Error(initialErr!.message) throw new Error(initialErr!.message)
} catch (e) { } catch (e) {
error = e error = e as Error
} }
error.name = initialErr!.name error.name = initialErr!.name
...@@ -417,9 +418,10 @@ export async function render(renderingProps: RenderRouteInfo): Promise<void> { ...@@ -417,9 +418,10 @@ export async function render(renderingProps: RenderRouteInfo): Promise<void> {
try { try {
await doRender(renderingProps) await doRender(renderingProps)
} catch (renderErr) { } catch (err) {
const renderErr = err instanceof Error ? err : new Error(err + '')
// bubble up cancelation errors // bubble up cancelation errors
if (renderErr.cancelled) { if ((renderErr as Error & { cancelled?: boolean }).cancelled) {
throw renderErr throw renderErr
} }
......
type RequestIdleCallbackHandle = any
type RequestIdleCallbackOptions = {
timeout: number
}
type RequestIdleCallbackDeadline = {
readonly didTimeout: boolean
timeRemaining: () => number
}
declare global {
interface Window {
requestIdleCallback: (
callback: (deadline: RequestIdleCallbackDeadline) => void,
opts?: RequestIdleCallbackOptions
) => RequestIdleCallbackHandle
cancelIdleCallback: (id: RequestIdleCallbackHandle) => void
}
}
export const requestIdleCallback = export const requestIdleCallback =
(typeof self !== 'undefined' && (typeof self !== 'undefined' &&
self.requestIdleCallback && self.requestIdleCallback &&
self.requestIdleCallback.bind(window)) || self.requestIdleCallback.bind(window)) ||
function ( function (cb: IdleRequestCallback): number {
cb: (deadline: RequestIdleCallbackDeadline) => void
): NodeJS.Timeout {
let start = Date.now() let start = Date.now()
return setTimeout(function () { return setTimeout(function () {
cb({ cb({
...@@ -32,13 +11,13 @@ export const requestIdleCallback = ...@@ -32,13 +11,13 @@ export const requestIdleCallback =
return Math.max(0, 50 - (Date.now() - start)) return Math.max(0, 50 - (Date.now() - start))
}, },
}) })
}, 1) }, 1) as unknown as number
} }
export const cancelIdleCallback = export const cancelIdleCallback =
(typeof self !== 'undefined' && (typeof self !== 'undefined' &&
self.cancelIdleCallback && self.cancelIdleCallback &&
self.cancelIdleCallback.bind(window)) || self.cancelIdleCallback.bind(window)) ||
function (id: RequestIdleCallbackHandle) { function (id: number) {
return clearTimeout(id) return clearTimeout(id)
} }
...@@ -3,6 +3,7 @@ import React from 'react' ...@@ -3,6 +3,7 @@ import React from 'react'
import Router from '../shared/lib/router/router' import Router from '../shared/lib/router/router'
import type { NextRouter } from '../shared/lib/router/router' import type { NextRouter } from '../shared/lib/router/router'
import { RouterContext } from '../shared/lib/router-context' import { RouterContext } from '../shared/lib/router-context'
import isError from '../lib/is-error'
type ClassArguments<T> = T extends new (...args: infer U) => any ? U : any type ClassArguments<T> = T extends new (...args: infer U) => any ? U : any
...@@ -107,7 +108,9 @@ routerEvents.forEach((event) => { ...@@ -107,7 +108,9 @@ routerEvents.forEach((event) => {
_singletonRouter[eventField](...args) _singletonRouter[eventField](...args)
} catch (err) { } catch (err) {
console.error(`Error when running the Router event: ${eventField}`) console.error(`Error when running the Router event: ${eventField}`)
console.error(`${err.message}\n${err.stack}`) console.error(
isError(err) ? `${err.message}\n${err.stack}` : err + ''
)
} }
} }
}) })
......
...@@ -21,6 +21,7 @@ import { isInAmpMode } from '../shared/lib/amp' ...@@ -21,6 +21,7 @@ import { isInAmpMode } from '../shared/lib/amp'
import { NextConfigComplete } from '../server/config-shared' import { NextConfigComplete } from '../server/config-shared'
import { setHttpAgentOptions } from '../server/config' import { setHttpAgentOptions } from '../server/config'
import RenderResult from '../server/render-result' import RenderResult from '../server/render-result'
import isError from '../lib/is-error'
const envConfig = require('../shared/lib/runtime-config') const envConfig = require('../shared/lib/runtime-config')
...@@ -500,7 +501,7 @@ export default async function exportPage({ ...@@ -500,7 +501,7 @@ export default async function exportPage({
} catch (error) { } catch (error) {
console.error( console.error(
`\nError occurred prerendering page "${path}". Read more: https://nextjs.org/docs/messages/prerender-error\n` + `\nError occurred prerendering page "${path}". Read more: https://nextjs.org/docs/messages/prerender-error\n` +
error.stack (isError(error) ? error.stack : error)
) )
results.error = true results.error = true
} }
......
...@@ -18,6 +18,7 @@ import { isYarn } from '../is-yarn' ...@@ -18,6 +18,7 @@ import { isYarn } from '../is-yarn'
import * as Log from '../../build/output/log' import * as Log from '../../build/output/log'
import { EventLintCheckCompleted } from '../../telemetry/events/build' import { EventLintCheckCompleted } from '../../telemetry/events/build'
import isError from '../is-error'
type Config = { type Config = {
plugins: string[] plugins: string[]
...@@ -90,7 +91,7 @@ async function lint( ...@@ -90,7 +91,7 @@ async function lint(
`ESLint must be installed${ `ESLint must be installed${
lintDuringBuild ? ' in order to run during builds:' : ':' lintDuringBuild ? ' in order to run during builds:' : ':'
} ${chalk.bold.cyan( } ${chalk.bold.cyan(
isYarn(baseDir) (await isYarn(baseDir))
? 'yarn add --dev eslint' ? 'yarn add --dev eslint'
: 'npm install --save-dev eslint' : 'npm install --save-dev eslint'
)}` )}`
...@@ -211,11 +212,13 @@ async function lint( ...@@ -211,11 +212,13 @@ async function lint(
} catch (err) { } catch (err) {
if (lintDuringBuild) { if (lintDuringBuild) {
Log.error( Log.error(
`ESLint: ${err.message ? err.message.replace(/\n/g, ' ') : err}` `ESLint: ${
isError(err) && err.message ? err.message.replace(/\n/g, ' ') : err
}`
) )
return null return null
} else { } else {
throw new Error(err) throw new Error(err + '')
} }
} }
} }
......
import { constants, promises } from 'fs' import { constants, promises } from 'fs'
import isError from './is-error'
export async function fileExists( export async function fileExists(
fileName: string, fileName: string,
...@@ -16,7 +17,10 @@ export async function fileExists( ...@@ -16,7 +17,10 @@ export async function fileExists(
} }
return true return true
} catch (err) { } catch (err) {
if (err.code === 'ENOENT' || err.code === 'ENAMETOOLONG') { if (
isError(err) &&
(err.code === 'ENOENT' || err.code === 'ENAMETOOLONG')
) {
return false return false
} }
throw err throw err
......
// We allow some additional attached properties for Errors
interface NextError extends Error {
type?: string
page?: string
code?: string | number
cancelled?: boolean
}
export default function isError(err: unknown): err is NextError {
return (
typeof err === 'object' && err !== null && 'name' in err && 'message' in err
)
}
...@@ -7,6 +7,7 @@ import { ...@@ -7,6 +7,7 @@ import {
PERMANENT_REDIRECT_STATUS, PERMANENT_REDIRECT_STATUS,
TEMPORARY_REDIRECT_STATUS, TEMPORARY_REDIRECT_STATUS,
} from '../shared/lib/constants' } from '../shared/lib/constants'
import isError from './is-error'
export type RouteHas = export type RouteHas =
| { | {
...@@ -156,9 +157,9 @@ function tryParsePath(route: string, handleUrl?: boolean): ParseAttemptResult { ...@@ -156,9 +157,9 @@ function tryParsePath(route: string, handleUrl?: boolean): ParseAttemptResult {
result.regexStr = regex.source result.regexStr = regex.source
} catch (err) { } catch (err) {
// If there is an error show our error link but still show original error or a formatted one if we can // If there is an error show our error link but still show original error or a formatted one if we can
const errMatches = err.message.match(/at (\d{0,})/) let errMatches
if (errMatches) { if (isError(err) && (errMatches = err.message.match(/at (\d{0,})/))) {
const position = parseInt(errMatches[1], 10) const position = parseInt(errMatches[1], 10)
console.error( console.error(
`\nError parsing \`${route}\` ` + `\nError parsing \`${route}\` ` +
......
import path from 'path' import path from 'path'
import { promises, constants, Dirent, Stats } from 'fs' import { promises, constants, Dirent, Stats } from 'fs'
import { Sema } from 'next/dist/compiled/async-sema' import { Sema } from 'next/dist/compiled/async-sema'
import isError from './is-error'
const COPYFILE_EXCL = constants.COPYFILE_EXCL const COPYFILE_EXCL = constants.COPYFILE_EXCL
...@@ -49,7 +50,7 @@ export async function recursiveCopy( ...@@ -49,7 +50,7 @@ export async function recursiveCopy(
await promises.mkdir(target) await promises.mkdir(target)
} catch (err) { } catch (err) {
// do not throw `folder already exists` errors // do not throw `folder already exists` errors
if (err.code !== 'EEXIST') { if (isError(err) && err.code !== 'EEXIST') {
throw err throw err
} }
} }
......
import { Dirent, promises } from 'fs' import { Dirent, promises } from 'fs'
import { join } from 'path' import { join } from 'path'
import { promisify } from 'util' import { promisify } from 'util'
import isError from './is-error'
const sleep = promisify(setTimeout) const sleep = promisify(setTimeout)
...@@ -8,18 +9,19 @@ const unlinkFile = async (p: string, t = 1): Promise<void> => { ...@@ -8,18 +9,19 @@ const unlinkFile = async (p: string, t = 1): Promise<void> => {
try { try {
await promises.unlink(p) await promises.unlink(p)
} catch (e) { } catch (e) {
const code = isError(e) && e.code
if ( if (
(e.code === 'EBUSY' || (code === 'EBUSY' ||
e.code === 'ENOTEMPTY' || code === 'ENOTEMPTY' ||
e.code === 'EPERM' || code === 'EPERM' ||
e.code === 'EMFILE') && code === 'EMFILE') &&
t < 3 t < 3
) { ) {
await sleep(t * 100) await sleep(t * 100)
return unlinkFile(p, t++) return unlinkFile(p, t++)
} }
if (e.code === 'ENOENT') { if (code === 'ENOENT') {
return return
} }
...@@ -43,7 +45,7 @@ export async function recursiveDelete( ...@@ -43,7 +45,7 @@ export async function recursiveDelete(
try { try {
result = await promises.readdir(dir, { withFileTypes: true }) result = await promises.readdir(dir, { withFileTypes: true })
} catch (e) { } catch (e) {
if (e.code === 'ENOENT') { if (isError(e) && e.code === 'ENOENT') {
return return
} }
throw e throw e
......
...@@ -3,6 +3,7 @@ import os from 'os' ...@@ -3,6 +3,7 @@ import os from 'os'
import path from 'path' import path from 'path'
import { FatalError } from '../fatal-error' import { FatalError } from '../fatal-error'
import isError from '../is-error'
export async function getTypeScriptConfiguration( export async function getTypeScriptConfiguration(
ts: typeof import('typescript'), ts: typeof import('typescript'),
...@@ -54,8 +55,8 @@ export async function getTypeScriptConfiguration( ...@@ -54,8 +55,8 @@ export async function getTypeScriptConfiguration(
return result return result
} catch (err) { } catch (err) {
if (err?.name === 'SyntaxError') { if (isError(err) && err.name === 'SyntaxError') {
const reason = '\n' + (err?.message ?? '') const reason = '\n' + (err.message ?? '')
throw new FatalError( throw new FatalError(
chalk.red.bold( chalk.red.bold(
'Could not parse', 'Could not parse',
......
...@@ -5,7 +5,7 @@ import { MissingDependency } from '../has-necessary-dependencies' ...@@ -5,7 +5,7 @@ import { MissingDependency } from '../has-necessary-dependencies'
import { FatalError } from '../fatal-error' import { FatalError } from '../fatal-error'
import { isYarn } from '../is-yarn' import { isYarn } from '../is-yarn'
export function missingDepsError( export async function missingDepsError(
dir: string, dir: string,
missingPackages: MissingDependency[] missingPackages: MissingDependency[]
) { ) {
...@@ -28,7 +28,7 @@ export function missingDepsError( ...@@ -28,7 +28,7 @@ export function missingDepsError(
chalk.bold(`Please install ${chalk.bold(packagesHuman)} by running:`) + chalk.bold(`Please install ${chalk.bold(packagesHuman)} by running:`) +
'\n\n' + '\n\n' +
`\t${chalk.bold.cyan( `\t${chalk.bold.cyan(
(isYarn(dir) ? 'yarn add --dev' : 'npm install --save-dev') + ((await isYarn(dir)) ? 'yarn add --dev' : 'npm install --save-dev') +
' ' + ' ' +
packagesCli packagesCli
)}` + )}` +
......
...@@ -6,6 +6,7 @@ import { ESLINT_DEFAULT_DIRS } from './constants' ...@@ -6,6 +6,7 @@ import { ESLINT_DEFAULT_DIRS } from './constants'
import { Telemetry } from '../telemetry/storage' import { Telemetry } from '../telemetry/storage'
import { eventLintCheckCompleted } from '../telemetry/events' import { eventLintCheckCompleted } from '../telemetry/events'
import { CompileError } from './compile-error' import { CompileError } from './compile-error'
import isError from './is-error'
export async function verifyAndLint( export async function verifyAndLint(
dir: string, dir: string,
...@@ -62,13 +63,15 @@ export async function verifyAndLint( ...@@ -62,13 +63,15 @@ export async function verifyAndLint(
lintWorkers.end() lintWorkers.end()
} catch (err) { } catch (err) {
if (err.type === 'CompileError' || err instanceof CompileError) { if (isError(err)) {
console.error(chalk.red('\nFailed to compile.')) if (err.type === 'CompileError' || err instanceof CompileError) {
console.error(err.message) console.error(chalk.red('\nFailed to compile.'))
process.exit(1) console.error(err.message)
} else if (err.type === 'FatalError') { process.exit(1)
console.error(err.message) } else if (err.type === 'FatalError') {
process.exit(1) console.error(err.message)
process.exit(1)
}
} }
throw err throw err
} }
......
...@@ -44,7 +44,7 @@ export async function verifyTypeScriptSetup( ...@@ -44,7 +44,7 @@ export async function verifyTypeScriptSetup(
) )
if (deps.missing?.length > 0) { if (deps.missing?.length > 0) {
missingDepsError(dir, deps.missing) await missingDepsError(dir, deps.missing)
} }
// Load TypeScript after we're sure it exists: // Load TypeScript after we're sure it exists:
......
...@@ -247,7 +247,6 @@ ...@@ -247,7 +247,6 @@
"taskr": "1.1.0", "taskr": "1.1.0",
"terser": "5.7.1", "terser": "5.7.1",
"text-table": "0.2.0", "text-table": "0.2.0",
"typescript": "4.3.4",
"unistore": "3.4.1", "unistore": "3.4.1",
"web-vitals": "2.1.0", "web-vitals": "2.1.0",
"webpack": "4.44.1", "webpack": "4.44.1",
......
...@@ -14,6 +14,7 @@ import { BuildManifest, getPageFiles } from '../server/get-page-files' ...@@ -14,6 +14,7 @@ import { BuildManifest, getPageFiles } from '../server/get-page-files'
import { cleanAmpPath } from '../server/utils' import { cleanAmpPath } from '../server/utils'
import { htmlEscapeJsonString } from '../server/htmlescape' import { htmlEscapeJsonString } from '../server/htmlescape'
import Script, { ScriptProps } from '../client/script' import Script, { ScriptProps } from '../client/script'
import isError from '../lib/is-error'
export { DocumentContext, DocumentInitialProps, DocumentProps } export { DocumentContext, DocumentInitialProps, DocumentProps }
...@@ -756,7 +757,7 @@ export class NextScript extends Component<OriginProps> { ...@@ -756,7 +757,7 @@ export class NextScript extends Component<OriginProps> {
const data = JSON.stringify(__NEXT_DATA__) const data = JSON.stringify(__NEXT_DATA__)
return htmlEscapeJsonString(data) return htmlEscapeJsonString(data)
} catch (err) { } catch (err) {
if (err.message.indexOf('circular structure')) { if (isError(err) && err.message.indexOf('circular structure')) {
throw new Error( throw new Error(
`Circular structure in "getInitialProps" result of page "${__NEXT_DATA__.page}". https://nextjs.org/docs/messages/circular-structure` `Circular structure in "getInitialProps" result of page "${__NEXT_DATA__.page}". https://nextjs.org/docs/messages/circular-structure`
) )
......
...@@ -9,6 +9,7 @@ import { decryptWithSecret, encryptWithSecret } from './crypto-utils' ...@@ -9,6 +9,7 @@ import { decryptWithSecret, encryptWithSecret } from './crypto-utils'
import { interopDefault } from './load-components' import { interopDefault } from './load-components'
import { sendEtagResponse } from './send-payload' import { sendEtagResponse } from './send-payload'
import generateETag from 'etag' import generateETag from 'etag'
import isError from '../lib/is-error'
export type NextApiRequestCookies = { [key: string]: string } export type NextApiRequestCookies = { [key: string]: string }
export type NextApiRequestQuery = { [key: string]: string | string[] } export type NextApiRequestQuery = { [key: string]: string | string[] }
...@@ -120,7 +121,7 @@ export async function apiResolver( ...@@ -120,7 +121,7 @@ export async function apiResolver(
sendError(apiRes, err.statusCode, err.message) sendError(apiRes, err.statusCode, err.message)
} else { } else {
if (dev) { if (dev) {
if (err) { if (isError(err)) {
err.page = page err.page = page
} }
throw err throw err
...@@ -157,7 +158,7 @@ export async function parseBody( ...@@ -157,7 +158,7 @@ export async function parseBody(
try { try {
buffer = await getRawBody(req, { encoding, limit }) buffer = await getRawBody(req, { encoding, limit })
} catch (e) { } catch (e) {
if (e.type === 'entity.too.large') { if (isError(e) && e.type === 'entity.too.large') {
throw new ApiError(413, `Body exceeded ${limit} limit`) throw new ApiError(413, `Body exceeded ${limit} limit`)
} else { } else {
throw new ApiError(400, 'Invalid body') throw new ApiError(400, 'Invalid body')
......
...@@ -28,6 +28,7 @@ import { NextConfigComplete } from '../config-shared' ...@@ -28,6 +28,7 @@ import { NextConfigComplete } from '../config-shared'
import { CustomRoutes } from '../../lib/load-custom-routes' import { CustomRoutes } from '../../lib/load-custom-routes'
import { DecodeError } from '../../shared/lib/utils' import { DecodeError } from '../../shared/lib/utils'
import { Span, trace } from '../../trace' import { Span, trace } from '../../trace'
import isError from '../../lib/is-error'
export async function renderScriptError( export async function renderScriptError(
res: ServerResponse, res: ServerResponse,
...@@ -227,7 +228,10 @@ export default class HotReloader { ...@@ -227,7 +228,10 @@ export default class HotReloader {
try { try {
await this.ensurePage(page) await this.ensurePage(page)
} catch (error) { } catch (error) {
await renderScriptError(pageBundleRes, error) await renderScriptError(
pageBundleRes,
isError(error) ? error : new Error(error + '')
)
return { finished: true } return { finished: true }
} }
......
...@@ -54,6 +54,7 @@ import { ...@@ -54,6 +54,7 @@ import {
getSourceById, getSourceById,
} from '@next/react-dev-overlay/lib/middleware' } from '@next/react-dev-overlay/lib/middleware'
import * as Log from '../../build/output/log' import * as Log from '../../build/output/log'
import isError from '../../lib/is-error'
// Load ReactDevOverlay only when needed // Load ReactDevOverlay only when needed
let ReactDevOverlayImpl: React.FunctionComponent let ReactDevOverlayImpl: React.FunctionComponent
...@@ -449,12 +450,13 @@ export default class DevServer extends Server { ...@@ -449,12 +450,13 @@ export default class DevServer extends Server {
} }
try { try {
return await super.run(req, res, parsedUrl) return await super.run(req, res, parsedUrl)
} catch (err) { } catch (error) {
res.statusCode = 500 res.statusCode = 500
const err = isError(error) ? error : error ? new Error(error + '') : null
try { try {
this.logErrorWithOriginalStack(err).catch(() => {}) this.logErrorWithOriginalStack(err).catch(() => {})
return await this.renderError(err, req, res, pathname!, { return await this.renderError(err, req, res, pathname!, {
__NEXT_PAGE: err?.page || pathname, __NEXT_PAGE: (isError(err) && err.page) || pathname || '',
}) })
} catch (internalErr) { } catch (internalErr) {
console.error(internalErr) console.error(internalErr)
...@@ -464,15 +466,14 @@ export default class DevServer extends Server { ...@@ -464,15 +466,14 @@ export default class DevServer extends Server {
} }
private async logErrorWithOriginalStack( private async logErrorWithOriginalStack(
possibleError?: any, err?: unknown,
type?: 'unhandledRejection' | 'uncaughtException' type?: 'unhandledRejection' | 'uncaughtException'
) { ) {
let usedOriginalStack = false let usedOriginalStack = false
if (possibleError?.name && possibleError?.stack && possibleError?.message) { if (isError(err) && err.name && err.stack && err.message) {
const err: Error & { stack: string } = possibleError
try { try {
const frames = parseStack(err.stack) const frames = parseStack(err.stack!)
const frame = frames[0] const frame = frames[0]
if (frame.lineNumber && frame?.file) { if (frame.lineNumber && frame?.file) {
...@@ -521,9 +522,9 @@ export default class DevServer extends Server { ...@@ -521,9 +522,9 @@ export default class DevServer extends Server {
if (!usedOriginalStack) { if (!usedOriginalStack) {
if (type) { if (type) {
Log.error(`${type}:`, possibleError) Log.error(`${type}:`, err + '')
} else { } else {
Log.error(possibleError) Log.error(err + '')
} }
} }
} }
......
...@@ -97,6 +97,7 @@ import ResponseCache, { ...@@ -97,6 +97,7 @@ import ResponseCache, {
} from './response-cache' } from './response-cache'
import { NextConfigComplete } from './config-shared' import { NextConfigComplete } from './config-shared'
import { parseNextUrl } from '../shared/lib/router/utils/parse-next-url' import { parseNextUrl } from '../shared/lib/router/utils/parse-next-url'
import isError from '../lib/is-error'
const getCustomRouteMatcher = pathMatch(true) const getCustomRouteMatcher = pathMatch(true)
...@@ -490,7 +491,7 @@ export default class Server { ...@@ -490,7 +491,7 @@ export default class Server {
if (this.minimalMode || this.renderOpts.dev) { if (this.minimalMode || this.renderOpts.dev) {
throw err throw err
} }
this.logError(err) this.logError(isError(err) ? err : new Error(err + ''))
res.statusCode = 500 res.statusCode = 500
res.end('Internal Server Error') res.end('Internal Server Error')
} }
...@@ -1099,7 +1100,7 @@ export default class Server { ...@@ -1099,7 +1100,7 @@ export default class Server {
try { try {
builtPagePath = await this.getPagePath(page) builtPagePath = await this.getPagePath(page)
} catch (err) { } catch (err) {
if (err.code === 'ENOENT') { if (isError(err) && err.code === 'ENOENT') {
return false return false
} }
throw err throw err
...@@ -1412,7 +1413,7 @@ export default class Server { ...@@ -1412,7 +1413,7 @@ export default class Server {
}, },
} }
} catch (err) { } catch (err) {
if (err.code !== 'ENOENT') throw err if (isError(err) && err.code !== 'ENOENT') throw err
} }
} }
return null return null
...@@ -1938,7 +1939,8 @@ export default class Server { ...@@ -1938,7 +1939,8 @@ export default class Server {
} }
} }
} }
} catch (err) { } catch (error) {
const err = isError(error) ? error : error ? new Error(error + '') : null
if (err instanceof NoFallbackError && bubbleNoFallback) { if (err instanceof NoFallbackError && bubbleNoFallback) {
throw err throw err
} }
...@@ -1951,17 +1953,15 @@ export default class Server { ...@@ -1951,17 +1953,15 @@ export default class Server {
const isWrappedError = err instanceof WrappedBuildError const isWrappedError = err instanceof WrappedBuildError
const response = await this.renderErrorToResponse( const response = await this.renderErrorToResponse(
ctx, ctx,
isWrappedError ? err.innerError : err isWrappedError ? (err as WrappedBuildError).innerError : err
) )
if (!isWrappedError) { if (!isWrappedError) {
if (this.minimalMode || this.renderOpts.dev) { if (this.minimalMode || this.renderOpts.dev) {
if (err) { if (isError(err)) err.page = page
err.page = page
}
throw err throw err
} }
this.logError(err) this.logError(err || new Error(error + ''))
} }
return response return response
} }
...@@ -2080,10 +2080,15 @@ export default class Server { ...@@ -2080,10 +2080,15 @@ export default class Server {
} }
throw maybeFallbackError throw maybeFallbackError
} }
} catch (renderToHtmlError) { } catch (error) {
const renderToHtmlError = isError(error)
? error
: error
? new Error(error + '')
: null
const isWrappedError = renderToHtmlError instanceof WrappedBuildError const isWrappedError = renderToHtmlError instanceof WrappedBuildError
if (!isWrappedError) { if (!isWrappedError) {
this.logError(renderToHtmlError) this.logError(renderToHtmlError || new Error(error + ''))
} }
res.statusCode = 500 res.statusCode = 500
const fallbackComponents = await this.getFallbackErrorComponents() const fallbackComponents = await this.getFallbackErrorComponents()
...@@ -2173,7 +2178,9 @@ export default class Server { ...@@ -2173,7 +2178,9 @@ export default class Server {
try { try {
await serveStatic(req, res, path) await serveStatic(req, res, path)
} catch (err) { } catch (error) {
if (!isError(error)) throw error
const err = error as Error & { code?: string; statusCode?: number }
if (err.code === 'ENOENT' || err.statusCode === 404) { if (err.code === 'ENOENT' || err.statusCode === 404) {
this.render404(req, res, parsedUrl) this.render404(req, res, parsedUrl)
} else if (err.statusCode === 412) { } else if (err.statusCode === 412) {
......
...@@ -66,6 +66,7 @@ import { ...@@ -66,6 +66,7 @@ import {
} from '../lib/load-custom-routes' } from '../lib/load-custom-routes'
import { DomainLocale } from './config' import { DomainLocale } from './config'
import RenderResult, { NodeWritablePiper } from './render-result' import RenderResult, { NodeWritablePiper } from './render-result'
import isError from '../lib/is-error'
function noRouter() { function noRouter() {
const message = const message =
...@@ -585,10 +586,10 @@ export async function renderToHTML( ...@@ -585,10 +586,10 @@ export async function renderToHTML(
locale: renderOpts.locale, locale: renderOpts.locale,
defaultLocale: renderOpts.defaultLocale, defaultLocale: renderOpts.defaultLocale,
}) })
} catch (staticPropsError) { } catch (staticPropsError: any) {
// remove not found error code to prevent triggering legacy // remove not found error code to prevent triggering legacy
// 404 rendering // 404 rendering
if (staticPropsError.code === 'ENOENT') { if (staticPropsError && staticPropsError.code === 'ENOENT') {
delete staticPropsError.code delete staticPropsError.code
} }
throw staticPropsError throw staticPropsError
...@@ -775,10 +776,13 @@ export async function renderToHTML( ...@@ -775,10 +776,13 @@ export async function renderToHTML(
defaultLocale: renderOpts.defaultLocale, defaultLocale: renderOpts.defaultLocale,
}) })
canAccessRes = false canAccessRes = false
} catch (serverSidePropsError) { } catch (serverSidePropsError: any) {
// remove not found error code to prevent triggering legacy // remove not found error code to prevent triggering legacy
// 404 rendering // 404 rendering
if (serverSidePropsError.code === 'ENOENT') { if (
isError(serverSidePropsError) &&
serverSidePropsError.code === 'ENOENT'
) {
delete serverSidePropsError.code delete serverSidePropsError.code
} }
throw serverSidePropsError throw serverSidePropsError
......
...@@ -107,7 +107,7 @@ export default class ResponseCache { ...@@ -107,7 +107,7 @@ export default class ResponseCache {
) )
} }
} catch (err) { } catch (err) {
rejecter(err) rejecter(err as Error)
} finally { } finally {
if (key) { if (key) {
this.pendingResponses.delete(key) this.pendingResponses.delete(key)
......
...@@ -124,7 +124,7 @@ export default class Router { ...@@ -124,7 +124,7 @@ export default class Router {
const memoizedPageChecker = async (p: string): Promise<boolean> => { const memoizedPageChecker = async (p: string): Promise<boolean> => {
p = normalizeLocalePath(p, this.locales).pathname p = normalizeLocalePath(p, this.locales).pathname
if (pageChecks[p]) { if (pageChecks[p] !== undefined) {
return pageChecks[p] return pageChecks[p]
} }
const result = this.pageChecker(p) const result = this.pageChecker(p)
......
...@@ -13,6 +13,7 @@ import { ...@@ -13,6 +13,7 @@ import {
markAssetError, markAssetError,
} from '../../../client/route-loader' } from '../../../client/route-loader'
import { RouterEvent } from '../../../client/router' import { RouterEvent } from '../../../client/router'
import isError from '../../../lib/is-error'
import type { DomainLocale } from '../../../server/config' import type { DomainLocale } from '../../../server/config'
import { denormalizePagePath } from '../../../server/denormalize-page-path' import { denormalizePagePath } from '../../../server/denormalize-page-path'
import { normalizeLocalePath } from '../i18n/normalize-locale-path' import { normalizeLocalePath } from '../i18n/normalize-locale-path'
...@@ -1226,7 +1227,7 @@ export default class Router implements BaseRouter { ...@@ -1226,7 +1227,7 @@ export default class Router implements BaseRouter {
return true return true
} catch (err) { } catch (err) {
if (err.cancelled) { if (isError(err) && err.cancelled) {
return false return false
} }
throw err throw err
...@@ -1271,7 +1272,7 @@ export default class Router implements BaseRouter { ...@@ -1271,7 +1272,7 @@ export default class Router implements BaseRouter {
} }
async handleRouteInfoError( async handleRouteInfoError(
err: Error & { code: any; cancelled: boolean }, err: Error & { code?: any; cancelled?: boolean },
pathname: string, pathname: string,
query: ParsedUrlQuery, query: ParsedUrlQuery,
as: string, as: string,
...@@ -1337,7 +1338,7 @@ export default class Router implements BaseRouter { ...@@ -1337,7 +1338,7 @@ export default class Router implements BaseRouter {
return routeInfo return routeInfo
} catch (routeInfoErr) { } catch (routeInfoErr) {
return this.handleRouteInfoError( return this.handleRouteInfoError(
routeInfoErr, isError(routeInfoErr) ? routeInfoErr : new Error(routeInfoErr + ''),
pathname, pathname,
query, query,
as, as,
...@@ -1420,7 +1421,13 @@ export default class Router implements BaseRouter { ...@@ -1420,7 +1421,13 @@ export default class Router implements BaseRouter {
this.components[route] = routeInfo this.components[route] = routeInfo
return routeInfo return routeInfo
} catch (err) { } catch (err) {
return this.handleRouteInfoError(err, pathname, query, as, routeProps) return this.handleRouteInfoError(
isError(err) ? err : new Error(err + ''),
pathname,
query,
as,
routeProps
)
} }
} }
...@@ -1650,7 +1657,7 @@ export default class Router implements BaseRouter { ...@@ -1650,7 +1657,7 @@ export default class Router implements BaseRouter {
_getServerData(dataHref: string): Promise<object> { _getServerData(dataHref: string): Promise<object> {
const { href: resourceKey } = new URL(dataHref, window.location.href) const { href: resourceKey } = new URL(dataHref, window.location.href)
if (this.sdr[resourceKey]) { if (this.sdr[resourceKey] !== undefined) {
return this.sdr[resourceKey] return this.sdr[resourceKey]
} }
return (this.sdr[resourceKey] = fetchNextData(dataHref, this.isSsr) return (this.sdr[resourceKey] = fetchNextData(dataHref, this.isSsr)
......
...@@ -25,3 +25,7 @@ declare module '*.module.scss' { ...@@ -25,3 +25,7 @@ declare module '*.module.scss' {
const classes: { readonly [key: string]: string } const classes: { readonly [key: string]: string }
export default classes export default classes
} }
interface Window {
MSInputMethodContext?: unknown
}
...@@ -30,7 +30,7 @@ export function getNodeError(error: Error): Error { ...@@ -30,7 +30,7 @@ export function getNodeError(error: Error): Error {
try { try {
throw new Error(error.message) throw new Error(error.message)
} catch (e) { } catch (e) {
n = e n = e as Error
} }
n.name = error.name n.name = error.name
......
...@@ -19267,10 +19267,10 @@ typedarray@^0.0.6: ...@@ -19267,10 +19267,10 @@ typedarray@^0.0.6:
version "0.0.6" version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
typescript@4.3.4: typescript@4.4.3:
version "4.3.4" version "4.4.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew== integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
typescript@^4.1.3: typescript@^4.1.3:
version "4.1.3" version "4.1.3"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment