Skip to content

Commit

Permalink
Next 11 (#6414)
Browse files Browse the repository at this point in the history
  • Loading branch information
emmatown authored Aug 31, 2021
1 parent ddcef2e commit 32f0247
Show file tree
Hide file tree
Showing 275 changed files with 389 additions and 237 deletions.
5 changes: 5 additions & 0 deletions .changeset/chatty-seals-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-next/keystone': major
---

Updated to Next.js 11. If you were using a custom Babel config, it will no longer be respected because of changes in Next.js.
21 changes: 21 additions & 0 deletions .changeset/heavy-crews-hope.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
'@keystone-ui/button': patch
'@keystone-ui/core': patch
'@keystone-ui/fields': patch
'@keystone-ui/icons': patch
'@keystone-ui/loading': patch
'@keystone-ui/modals': patch
'@keystone-ui/notice': patch
'@keystone-ui/options': patch
'@keystone-ui/pill': patch
'@keystone-ui/popover': patch
'@keystone-ui/segmented-control': patch
'@keystone-ui/toast': patch
'@keystone-ui/tooltip': patch
'@keystone-next/auth': patch
'@keystone-next/cloudinary': patch
'@keystone-next/fields-document': patch
'@keystone-next/keystone': patch
---

Updated usages of `jsx` from `@keystone-ui/core` to explicitly use `/** @jsxRuntime classic */`
8 changes: 8 additions & 0 deletions .changeset/shy-pans-hunt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@keystone-next/auth': patch
'@keystone-next/cloudinary': patch
'@keystone-next/fields-document': patch
'@keystone-next/keystone': patch
---

Changed the way the package directory for resolving views is obtained to use `__dirname` rather than `require.resolve('pkg/package.json')` because in Next.js 11 `require.resolve` returns a numeric id instead of the path.
1 change: 1 addition & 0 deletions design-system/packages/button/src/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { ReactNode, useContext } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/button/src/hooks/button.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { useTheme } from '@keystone-ui/core';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/core/src/components/Box.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '../emotion';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/core/src/components/Center.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '../emotion';
Expand Down
3 changes: 2 additions & 1 deletion design-system/packages/core/src/components/Core.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { Fragment, ReactNode } from 'react';
import { jsx, Global } from '../emotion';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/core/src/components/Divider.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '../emotion';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/core/src/components/Heading.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '../emotion';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/core/src/components/Inline.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { Children, ReactNode } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/core/src/components/Link.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '../emotion';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/core/src/components/Stack.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { ElementType, Children, Fragment, ReactNode, isValidElement } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/core/src/components/Text.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '../emotion';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/fields/src/Checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { Fragment, InputHTMLAttributes, ReactNode, forwardRef } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/fields/src/DatePicker/Calendar.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { useMemo } from 'react';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { ElementType, ReactNode, createContext, useContext } from 'react';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { ButtonHTMLAttributes, forwardRef } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/fields/src/DatePicker/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import React, { Fragment, useCallback } from 'react';
Expand Down
3 changes: 2 additions & 1 deletion design-system/packages/fields/src/FieldContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */
import { jsx, forwardRefWithAs } from '@keystone-ui/core';

export const FieldContainer = forwardRefWithAs<'div', {}>(({ as: Tag = 'div', ...props }, ref) => {
Expand Down
3 changes: 2 additions & 1 deletion design-system/packages/fields/src/FieldLabel.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { forwardRefWithAs, jsx, useTheme } from '@keystone-ui/core';
import type { ReactNode } from 'react';
Expand Down
3 changes: 2 additions & 1 deletion design-system/packages/fields/src/FieldLegend.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx, useTheme } from '@keystone-ui/core';
import type { HTMLAttributes } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/fields/src/Radio.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { Fragment, InputHTMLAttributes, ReactNode, forwardRef } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/fields/src/Select.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */
import { jsx, useTheme } from '@keystone-ui/core';
import ReactSelect, { OptionsType, mergeStyles, NamedProps } from 'react-select';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/fields/src/Switch.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

/**
Expand Down
3 changes: 2 additions & 1 deletion design-system/packages/fields/src/TextArea.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */
import { InputHTMLAttributes, forwardRef } from 'react';
import { jsx } from '@keystone-ui/core';

Expand Down
3 changes: 2 additions & 1 deletion design-system/packages/fields/src/TextInput.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

/**
* TODO
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { ReactNode, ReactElement } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/fields/src/components/Icons.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { ReactNode } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/icons/src/Icon.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { SVGAttributes, forwardRef, ReactNode } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/loading/src/Loading.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx, keyframes, useTheme } from '@keystone-ui/core';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/modals/src/AlertDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { Button } from '@keystone-ui/button';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/modals/src/Blanket.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { HTMLAttributes, forwardRef } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/modals/src/DialogBase.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { Fragment, KeyboardEvent, ReactNode } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/modals/src/Drawer.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { MutableRefObject, ReactNode } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/modals/src/DrawerBase.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { Fragment, KeyboardEvent, MutableRefObject, ReactNode, useCallback, useRef } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/notice/src/Notice.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { ReactNode, useMemo } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/notice/src/hooks/button.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { useTheme } from '@keystone-ui/core';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/options/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */
import { jsx, useTheme } from '@keystone-ui/core';
import { useIndicatorTokens } from '@keystone-ui/fields';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/pill/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */
import { jsx, useTheme } from '@keystone-ui/core';
import { ButtonHTMLAttributes, HTMLAttributes, forwardRef, ReactNode } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/popover/src/Popover.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

/**
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/toast/src/Toast.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { HTMLAttributes, ReactNode, forwardRef, useEffect, useMemo, useState } from 'react';
Expand Down
1 change: 1 addition & 0 deletions design-system/packages/tooltip/src/Tooltip.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import {
Expand Down
3 changes: 2 additions & 1 deletion design-system/website/components/Code.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { ReactNode } from 'react';
import { jsx, useTheme } from '@keystone-ui/core';
Expand Down
3 changes: 2 additions & 1 deletion design-system/website/components/Navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { Fragment, ReactNode } from 'react';
import { jsx, useTheme } from '@keystone-ui/core';
Expand Down
3 changes: 2 additions & 1 deletion design-system/website/components/Page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import type { HTMLAttributes, ReactNode } from 'react';
import { jsx, useTheme } from '@keystone-ui/core';
Expand Down
3 changes: 2 additions & 1 deletion design-system/website/components/ReadableColor.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import type { ReactNode } from 'react';
import { jsx } from '@keystone-ui/core';
Expand Down
2 changes: 1 addition & 1 deletion design-system/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@types/react-dom": "^17.0.9",
"@types/tinycolor2": "^1.4.3",
"@types/webpack": "^4.41.30",
"next": "^10.2.3",
"next": "^11.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"tinycolor2": "^1.4.2"
Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/components/button.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx, Stack } from '@keystone-ui/core';
import { Button, buttonToneValues, ToneKey, buttonWeightValues } from '@keystone-ui/button';
Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/components/fields.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { ComponentProps, ReactNode, useState } from 'react';
import { jsx, Stack, useTheme } from '@keystone-ui/core';
Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/components/loading.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { Fragment } from 'react';
import { jsx, Box, Stack } from '@keystone-ui/core';
Expand Down
1 change: 1 addition & 0 deletions design-system/website/pages/components/modals.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { useState } from 'react';
Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/components/notice.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '@keystone-ui/core';
import { Notice, noticeToneValues } from '@keystone-ui/notice';
Expand Down
1 change: 1 addition & 0 deletions design-system/website/pages/components/options.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '@keystone-ui/core';
Expand Down
1 change: 1 addition & 0 deletions design-system/website/pages/components/pill.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { Stack, jsx } from '@keystone-ui/core';
Expand Down
1 change: 1 addition & 0 deletions design-system/website/pages/components/popover.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx, Box } from '@keystone-ui/core';
Expand Down
1 change: 1 addition & 0 deletions design-system/website/pages/components/toast.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { Button } from '@keystone-ui/button';
Expand Down
1 change: 1 addition & 0 deletions design-system/website/pages/components/tooltip.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '@keystone-ui/core';
Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/core/alias-tokens.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx, useTheme, Inline } from '@keystone-ui/core';

Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/core/global-tokens.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx, useTheme } from '@keystone-ui/core';

Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/core/theme.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '@keystone-ui/core';

Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx } from '@keystone-ui/core';

Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/layout/box.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx, Box, useTheme } from '@keystone-ui/core';

Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/layout/center.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx, Box, useTheme, Center } from '@keystone-ui/core';

Expand Down
3 changes: 2 additions & 1 deletion design-system/website/pages/layout/stack.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* @jsx jsx */
/** @jsxRuntime classic */
/** @jsx jsx */

import { jsx, Text, Stack } from '@keystone-ui/core';

Expand Down
Loading

0 comments on commit 32f0247

Please sign in to comment.