Skip to content

Commit

Permalink
Merge branch 'canary' into add/react-loadable-swc
Browse files Browse the repository at this point in the history
  • Loading branch information
padmaia authored Aug 5, 2021
2 parents 28e4cf6 + 567d47b commit b5b74d1
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 20 deletions.
4 changes: 4 additions & 0 deletions packages/next/client/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,10 @@ export function renderError(renderErrorProps: RenderErrorProps): Promise<any> {

// Make sure we log the error to the console, otherwise users can't track down issues.
console.error(err)
console.error(
`A client-side exception has occurred, see here for more info: https://nextjs.org/docs/messages/client-side-exception-occurred`
)

return pageLoader
.loadPage('/_error')
.then(({ page: ErrorComponent, styleSheets }) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"stream-browserify": "3.0.0",
"stream-http": "3.1.1",
"string_decoder": "1.3.0",
"styled-jsx": "3.3.2",
"styled-jsx": "3.4.7",
"timers-browserify": "2.0.12",
"tty-browserify": "0.0.1",
"use-subscription": "1.5.1",
Expand Down
7 changes: 2 additions & 5 deletions packages/next/pages/_error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,8 @@ export default class Error<P = {}> extends React.Component<P & ErrorProps> {
title
) : (
<>
Application error: a client-side exception has occurred (
<a href="https://nextjs.org/docs/messages/client-side-exception-occurred">
developer guidance
</a>
)
Application error: a client-side exception has occurred (see
the browser console for more information)
</>
)}
.
Expand Down
7 changes: 1 addition & 6 deletions packages/next/types/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// <reference types="node" />
/// <reference types="react" />
/// <reference types="react-dom" />
/// <reference types="styled-jsx" />

import React from 'react'
import { ParsedUrlQuery } from 'querystring'
Expand Down Expand Up @@ -39,12 +40,6 @@ declare module 'react' {
interface LinkHTMLAttributes<T> extends HTMLAttributes<T> {
nonce?: string
}

// <style jsx> and <style jsx global> support for styled-jsx
interface StyleHTMLAttributes<T> extends HTMLAttributes<T> {
jsx?: boolean
global?: boolean
}
}

export type Redirect =
Expand Down
2 changes: 1 addition & 1 deletion test/integration/css/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,7 @@ describe('CSS Support', () => {
await browser.waitForElementByCss('#link-other').click()
await check(
() => browser.eval(`document.body.innerText`),
'Application error: a client-side exception has occurred (developer guidance).',
'Application error: a client-side exception has occurred (see the browser console for more information).',
true
)

Expand Down
4 changes: 2 additions & 2 deletions test/integration/no-page-props/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const runTests = () => {
it('should load 404 page correctly', async () => {
const browser = await webdriver(appPort, '/non-existent')
expect(await browser.elementByCss('h2').text()).toBe(
'Application error: a client-side exception has occurred (developer guidance).'
'Application error: a client-side exception has occurred (see the browser console for more information).'
)
expect(await browser.eval('window.uncaughtErrors')).toEqual([])
})
Expand Down Expand Up @@ -74,7 +74,7 @@ const runTests = () => {
await browser.waitForElementByCss('h2')
expect(await browser.eval('window.beforeNav')).toBe(null)
expect(await browser.elementByCss('h2').text()).toBe(
'Application error: a client-side exception has occurred (developer guidance).'
'Application error: a client-side exception has occurred (see the browser console for more information).'
)
expect(await browser.eval('window.uncaughtErrors')).toEqual([])
})
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6254,7 +6254,7 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"

caniuse-lite@1.0.30001228, caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001165, caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228:
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001165, caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228:
version "1.0.30001228"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
Expand Down Expand Up @@ -18088,10 +18088,10 @@ styled-jsx-plugin-postcss@3.0.2:
postcss "^7.0.2"
postcss-load-plugins "^2.3.0"

styled-jsx@3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.3.2.tgz#2474601a26670a6049fb4d3f94bd91695b3ce018"
integrity sha512-daAkGd5mqhbBhLd6jYAjYBa9LpxYCzsgo/f6qzPdFxVB8yoGbhxvzQgkC0pfmCVvW3JuAEBn0UzFLBfkHVZG1g==
styled-jsx@3.4.7:
version "3.4.7"
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.4.7.tgz#803bc8a36f1c359cc99691b6db6e0791ea3e1e31"
integrity sha512-PkImcCsovR39byv4Tz83tAPsYs2CiTPOmDSplhe0lsIFVYJyd7rzJ7fbm41vSNsF/lnO+Ob5n/jgMookwY0pww==
dependencies:
"@babel/types" "7.8.3"
babel-plugin-syntax-jsx "6.18.0"
Expand Down

0 comments on commit b5b74d1

Please sign in to comment.