Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/canary' into babel-turbo-mode
Browse files Browse the repository at this point in the history
* origin/canary: (36 commits)
  Fixed issue accessing index page of "with-reason-relay" example (vercel#23780)
  upgrade to webpack 5.31.0 (vercel#23776)
  Add note about prefetching (vercel#23732)
  v10.1.4-canary.2
  Ensure no-op export returns without error (vercel#23752)
  Update to with-supertokens example (vercel#23728)
  Ensure fallback rewrites dont match over pages with i18n (vercel#23674)
  Ensure basePath is not applied for external GSSP redirect (vercel#23673)
  Fix webpack5 cache distDir (vercel#23718)
  v10.1.4-canary.1
  Stop mutating `resolvedAsPath` (vercel#23705)
  Font optimization (vercel#21676)
  v10.1.4-canary.0
  Ensure default fallback values are correct with i18n (vercel#23675)
  Fix: Codeblock Syntax Highlighting (vercel#23545)
  fix with-mqtt-js example. (vercel#23636)
  fix with-styled-jsx-plugins example. (vercel#23635)
  fix with-web-worker example. (vercel#23634)
  fixes a part of vercel#23607 remove with-glamor example (vercel#23639)
  v10.1.3
  ...

# Conflicts:
#	packages/next/package.json
#	yarn.lock
  • Loading branch information
divmain committed Apr 7, 2021
2 parents 9940f45 + d34c9f1 commit 7471fb9
Show file tree
Hide file tree
Showing 133 changed files with 1,811 additions and 1,811 deletions.
2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ node_modules
**/.next/**
**/_next/**
**/dist/**
e2e-tests/**
examples/with-typescript-eslint-jest/**
examples/with-kea/**
packages/next/bundles/webpack/packages/*.runtime.js
Expand All @@ -17,5 +16,4 @@ packages/next-codemod/**/*.js
packages/next-codemod/**/*.d.ts
packages/next-env/**/*.d.ts
test/integration/async-modules/**
test/integration/eslint/**
test-timings.json
70 changes: 0 additions & 70 deletions docs/api-reference/next.config.js/eslint-warnings-errors.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/api-reference/next/link.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default Home
- `href` - The path or URL to navigate to. This is the only required prop
- `as` - Optional decorator for the path that will be shown in the browser URL bar. Before Next.js 9.5.3 this was used for dynamic routes, check our [previous docs](https://nextjs.org/docs/tag/v9.5.2/api-reference/next/link#dynamic-routes) to see how it worked
- [`passHref`](#if-the-child-is-a-custom-component-that-wraps-an-a-tag) - Forces `Link` to send the `href` property to its child. Defaults to `false`
- `prefetch` - Prefetch the page in the background. Defaults to `true`. Any `<Link />` that is in the viewport (initially or through scroll) will be preloaded. Prefetch can be disabled by passing `prefetch={false}`. Pages using [Static Generation](/docs/basic-features/data-fetching.md#getstaticprops-static-generation) will preload `JSON` files with the data for faster page transitions
- `prefetch` - Prefetch the page in the background. Defaults to `true`. Any `<Link />` that is in the viewport (initially or through scroll) will be preloaded. Prefetch can be disabled by passing `prefetch={false}`. Pages using [Static Generation](/docs/basic-features/data-fetching.md#getstaticprops-static-generation) will preload `JSON` files with the data for faster page transitions. Prefetching is only enabled in production.
- [`replace`](#replace-the-url-instead-of-push) - Replace the current `history` state instead of adding a new url into the stack. Defaults to `false`
- [`scroll`](#disable-scrolling-to-the-top-of-the-page) - Scroll to the top of the page after a navigation. Defaults to `true`
- [`shallow`](/docs/routing/shallow-routing.md) - Update the path of the current page without rerunning [`getStaticProps`](/docs/basic-features/data-fetching.md#getstaticprops-static-generation), [`getServerSideProps`](/docs/basic-features/data-fetching.md#getserversideprops-server-side-rendering) or [`getInitialProps`](/docs/api-reference/data-fetching/getInitialProps.md). Defaults to `false`
Expand Down
12 changes: 6 additions & 6 deletions docs/api-reference/next/router.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ import { useRouter } from 'next/router'
export default function Page() {
const router = useRouter()

return <span onClick={() => router.push('/post/abc')}>Click me</span>
return <button onClick={() => router.push('/post/abc')}>Click me</button>
}
```

Expand Down Expand Up @@ -137,7 +137,7 @@ export default function ReadMore({ post }) {
const router = useRouter()

return (
<span
<button
onClick={() => {
router.push({
pathname: '/post/[pid]',
Expand All @@ -146,7 +146,7 @@ export default function ReadMore({ post }) {
}}
>
Click here to read more
</span>
</button>
)
}
```
Expand All @@ -171,7 +171,7 @@ import { useRouter } from 'next/router'
export default function Page() {
const router = useRouter()

return <span onClick={() => router.replace('/home')}>Click me</span>
return <button onClick={() => router.replace('/home')}>Click me</button>
}
```

Expand Down Expand Up @@ -282,7 +282,7 @@ import { useRouter } from 'next/router'
export default function Page() {
const router = useRouter()

return <span onClick={() => router.back()}>Click here to go back</span>
return <button onClick={() => router.back()}>Click here to go back</button>
}
```

Expand All @@ -298,7 +298,7 @@ import { useRouter } from 'next/router'
export default function Page() {
const router = useRouter()

return <span onClick={() => router.reload()}>Click here to reload</span>
return <button onClick={() => router.reload()}>Click here to reload</button>
}
```

Expand Down
49 changes: 0 additions & 49 deletions docs/basic-features/eslint.md

This file was deleted.

8 changes: 0 additions & 8 deletions docs/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
"title": "Fast Refresh",
"path": "/docs/basic-features/fast-refresh.md"
},
{
"title": "ESLint",
"path": "/docs/basic-features/eslint.md"
},
{
"title": "TypeScript",
"path": "/docs/basic-features/typescript.md"
Expand Down Expand Up @@ -340,10 +336,6 @@
"title": "Configuring onDemandEntries",
"path": "/docs/api-reference/next.config.js/configuring-onDemandEntries.md"
},
{
"title": "ESLint Warnings and Errors",
"path": "/docs/api-reference/next.config.js/eslint-warnings-errors.md"
},
{
"title": "Ignoring TypeScript Errors",
"path": "/docs/api-reference/next.config.js/ignoring-typescript-errors.md"
Expand Down
20 changes: 8 additions & 12 deletions examples/custom-routes-proxying/next.config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
module.exports = {
async rewrites() {
return [
// we need to define a no-op rewrite to trigger checking
// all pages/static files before we attempt proxying
{
source: '/:path*',
destination: '/:path*',
},
{
source: '/:path*',
destination: `https://custom-routes-proxying-endpoint.vercel.app/:path*`,
},
]
return {
fallback: [
{
source: '/:path*',
destination: `https://custom-routes-proxying-endpoint.vercel.app/:path*`,
},
],
}
},
}
6 changes: 3 additions & 3 deletions examples/custom-server-express/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ npm install body-parser

Use the package within server.js:

```bash
const bodyParser = require('body-parser');
```js
const bodyParser = require('body-parser')

app.prepare().then(() => {
const server = express();
const server = express()
server.use(bodyParser.urlencoded({ extended: true }))
server.use(bodyParser.json())
})
Expand Down
1 change: 0 additions & 1 deletion examples/using-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
},
"devDependencies": {},
"dependencies": {
"@prefresh/next": "^1.3.0",
"next": "^10.0.0",
"next-plugin-preact": "^3.0.3",
"preact": "^10.5.5",
Expand Down
4 changes: 0 additions & 4 deletions examples/with-glamor/.babelrc

This file was deleted.

34 changes: 0 additions & 34 deletions examples/with-glamor/.gitignore

This file was deleted.

25 changes: 0 additions & 25 deletions examples/with-glamor/README.md

This file was deleted.

16 changes: 0 additions & 16 deletions examples/with-glamor/next.config.js

This file was deleted.

17 changes: 0 additions & 17 deletions examples/with-glamor/package.json

This file was deleted.

Loading

0 comments on commit 7471fb9

Please sign in to comment.