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
kodiakhq[bot] authored Aug 6, 2021
2 parents b5b74d1 + 62707d4 commit 31c46da
Show file tree
Hide file tree
Showing 20 changed files with 1,653 additions and 778 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

* @timneutkens @ijjk @shuding @styfle @huozhi @padmaia
/docs/ @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @leerob @lfades
/examples/ @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @leerob @lfades
/examples/ @timneutkens @ijjk @shuding @leerob @lfades
3 changes: 2 additions & 1 deletion .github/labeler.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
{ "type": "user", "pattern": "devknoll" },
{ "type": "user", "pattern": "janicklas-ralph" },
{ "type": "user", "pattern": "atcastle" },
{ "type": "user", "pattern": "Joonpark13" }
{ "type": "user", "pattern": "kyliau" },
{ "type": "user", "pattern": "kara" }
],
"created-by: Next.js team": [
{ "type": "user", "pattern": "ijjk" },
Expand Down
4 changes: 2 additions & 2 deletions docs/basic-features/eslint.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ module.exports = {
The plugin can be installed normally in your project without needing to run `next lint`:

```bash
npm install --save-dev eslint-plugin-next
npm install --save-dev @next/eslint-plugin-next
# or
yarn add --dev eslint-plugin-next
yarn add --dev @next/eslint-plugin-next
```

This eliminates the risk of collisions or errors that can occur due to importing the same plugin or parser across multiple configurations.
Expand Down
2 changes: 1 addition & 1 deletion examples/with-stripe-typescript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Once you have access to [the environment variables you'll need](#required-config
- Checkout payment result page that uses [SWR](https://github.com/vercel/swr) hooks to fetch the CheckoutSession status from the API route: [pages/result.tsx](pages/result.tsx).
- Stripe Elements
- Custom Amount Donation with Stripe Elements & PaymentIntents (no redirect):
- Frontend: [pages/donate-with-elements.tsx](pages/donate-with-checkout.tsx)
- Frontend: [pages/donate-with-elements.tsx](pages/donate-with-elements.tsx)
- Backend: [pages/api/payment_intents/](pages/api/payment_intents/)
- Webhook handling for [post-payment events](https://stripe.com/docs/payments/accept-a-payment#web-fulfillment)
- By default Next.js API routes are same-origin only. To allow Stripe webhook event requests to reach our API route, we need to add `micro-cors` and [verify the webhook signature](https://stripe.com/docs/webhooks/signatures) of the event. All of this happens in [pages/api/webhooks/index.ts](pages/api/webhooks/index.ts).
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@fullhuman/postcss-purgecss": "1.3.0",
"@mdx-js/loader": "0.18.0",
"@svgr/webpack": "5.5.0",
"@swc/core": "1.2.66",
"@swc/core": "1.2.74",
"@testing-library/react": "11.2.5",
"@types/cheerio": "0.22.16",
"@types/fs-extra": "8.1.0",
Expand All @@ -57,6 +57,7 @@
"@types/string-hash": "1.1.1",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"@vercel/fetch": "6.1.1",
"@zeit/next-css": "1.0.2-canary.2",
"@zeit/next-sass": "1.0.2-canary.2",
"@zeit/next-typescript": "1.1.2-canary.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/next/build/babel/preset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ export default (
presetEnvConfig.targets = {
// Targets the current process' version of Node. This requires apps be
// built and deployed on the same version of Node.
node: 'current',
// This is the same as using "current" but explicit
node: process.versions.node,
}
}

Expand Down
Loading

0 comments on commit 31c46da

Please sign in to comment.