Merge branch 'master' into name-config-to-admin-ui

.changeset/witty-lies-attend.md

@@ -0,0 +1,17 @@
+---
+'@keystonejs/demo-custom-fields': patch
+'@keystonejs/app-admin-ui': patch
+'@arch-ui/day-picker': patch
+'@arch-ui/fields': patch
+'@arch-ui/modal-utils': patch
+'@arch-ui/options': patch
+'@arch-ui/pagination': patch
+'@arch-ui/pill': patch
+'@keystonejs/field-content': patch
+'@keystonejs/fields': patch
+'@keystonejs/fields-markdown': patch
+'@keystonejs/fields-wysiwyg-tinymce': patch
+'@keystonejs/website': patch
+---
+
+Migrated to @primer/octicons-react v10.

demo-projects/custom-fields/fields/MultiCheck/views/Field.js

@@ -4,7 +4,7 @@ import { jsx } from '@emotion/core';
 import { useState, useEffect } from 'react';
 import { FieldContainer, FieldDescription } from '@arch-ui/fields';
 import { Checkbox } from './MultiCheck';
-import { ShieldIcon } from '@arch-ui/icons';
+import { ShieldIcon } from '@primer/octicons-react';
 import { Lozenge } from '@arch-ui/lozenge';
 import { colors, gridSize } from '@arch-ui/theme';
 

demo-projects/custom-fields/package.json

@@ -16,7 +16,6 @@
   "dependencies": {
     "@arch-ui/controls": "^0.1.8",
     "@arch-ui/fields": "^3.0.2",
-    "@arch-ui/icons": "^0.1.1",
     "@arch-ui/lozenge": "^0.0.16",
     "@arch-ui/theme": "^0.0.10",
     "@emotion/core": "^10.0.28",
@@ -26,6 +25,7 @@
     "@keystonejs/app-static": "^5.1.2",
     "@keystonejs/fields": "^13.0.0",
     "@keystonejs/keystone": "^11.1.0",
+    "@primer/octicons-react": "^10.0.0",
     "cross-env": "^7.0.0",
     "react": "^16.13.1"
   },

packages/app-admin-ui/client/components/DeleteItems.js

@@ -1,6 +1,6 @@
 import React, { Fragment, useState } from 'react';
 
-import { TrashcanIcon } from '@arch-ui/icons';
+import { TrashcanIcon } from '@primer/octicons-react';
 import { IconButton } from '@arch-ui/button';
 
 import DeleteManyItemsModal from './DeleteManyItemsModal';

packages/app-admin-ui/client/components/ListTable.js

@@ -4,7 +4,7 @@ import { Suspense, Fragment, useState, useEffect, useRef } from 'react';
 import { Link } from 'react-router-dom';
 
 import { captureSuspensePromises, noop } from '@keystonejs/utils';
-import { KebabHorizontalIcon, LinkIcon, ShieldIcon, TrashcanIcon } from '@arch-ui/icons';
+import { KebabHorizontalIcon, LinkIcon, ShieldIcon, TrashcanIcon } from '@primer/octicons-react';
 import { colors, gridSize } from '@arch-ui/theme';
 import { alpha } from '@arch-ui/color-utils';
 import { Button } from '@arch-ui/button';

packages/app-admin-ui/client/components/Nav.js

@@ -19,7 +19,7 @@ import {
 import { Title, Truncate } from '@arch-ui/typography';
 import Tooltip from '@arch-ui/tooltip';
 import { FlexGroup } from '@arch-ui/layout';
-import { PersonIcon, SignOutIcon, TerminalIcon, MarkGithubIcon } from '@arch-ui/icons';
+import { PersonIcon, SignOutIcon, TerminalIcon, MarkGithubIcon } from '@primer/octicons-react';
 
 import { useAdminMeta } from '../providers/AdminMeta';
 import { useResizeHandler, KEYBOARD_SHORTCUT } from '../hooks/ResizeHandler';

packages/app-admin-ui/client/components/NoResults.js

@@ -3,7 +3,7 @@
 import { jsx } from '@emotion/core';
 
 import { Button } from '@arch-ui/button';
-import { InfoIcon } from '@arch-ui/icons';
+import { InfoIcon } from '@primer/octicons-react';
 import { colors } from '@arch-ui/theme';
 
 import { useListPagination } from '../pages/List/dataHooks';

packages/app-admin-ui/client/components/PageError.js

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 
-import { StopIcon } from '@arch-ui/icons';
+import { StopIcon } from '@primer/octicons-react';
 import { colors } from '@arch-ui/theme';
 import { Container } from '@arch-ui/layout';
 

packages/app-admin-ui/client/components/UpdateItems.js

@@ -3,7 +3,7 @@
 import React, { Fragment, useState } from 'react';
 
 import { IconButton } from '@arch-ui/button';
-import { SettingsIcon } from '@arch-ui/icons';
+import { SettingsIcon } from '@primer/octicons-react';
 
 import { useList } from '../providers/List';
 import { UpdateManyItemsModal } from '../../components';

packages/app-admin-ui/client/pages/Home/components.js

@@ -7,7 +7,7 @@ import { useList } from '../../providers/List';
 
 import CreateItemModal from '../../components/CreateItemModal';
 
-import { PlusIcon } from '@arch-ui/icons';
+import { PlusIcon } from '@primer/octicons-react';
 import { Card } from '@arch-ui/card';
 import { colors, gridSize } from '@arch-ui/theme';
 import { LoadingIndicator } from '@arch-ui/loading';

packages/app-admin-ui/client/pages/Item/AddNewItem.js

@@ -2,7 +2,7 @@
 import { jsx } from '@emotion/core';
 import Tooltip from '@arch-ui/tooltip';
 import { IconButton } from '@arch-ui/button';
-import { PlusIcon } from '@arch-ui/icons';
+import { PlusIcon } from '@primer/octicons-react';
 import { useList } from '../../providers/List';
 
 const AddNewItem = () => {

packages/app-admin-ui/client/pages/Item/IdCopy.js

@@ -4,7 +4,7 @@ import { useCallback, memo, useState, useEffect } from 'react';
 
 import copyToClipboard from 'clipboard-copy';
 import Animation from '../../components/Animation';
-import { CheckIcon, ClippyIcon } from '@arch-ui/icons';
+import { CheckIcon, ClippyIcon } from '@primer/octicons-react';
 import { FlexGroup } from '@arch-ui/layout';
 import { A11yText } from '@arch-ui/typography';
 import { colors } from '@arch-ui/theme';

packages/app-admin-ui/client/pages/Item/ItemTitle.js

@@ -2,7 +2,7 @@
 import { jsx } from '@emotion/core';
 import { memo } from 'react';
 
-import { ChevronLeftIcon } from '@arch-ui/icons';
+import { ChevronLeftIcon } from '@primer/octicons-react';
 import { FlexGroup } from '@arch-ui/layout';
 import { IconButton } from '@arch-ui/button';
 import { gridSize } from '@arch-ui/theme';

packages/app-admin-ui/client/pages/Item/Search.js

@@ -4,7 +4,7 @@ import { jsx, keyframes } from '@emotion/core';
 import { forwardRef, useEffect, useRef, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 
-import { SearchIcon, XIcon } from '@arch-ui/icons';
+import { SearchIcon, XIcon } from '@primer/octicons-react';
 import { IconButton } from '@arch-ui/button';
 import { A11yText } from '@arch-ui/typography';
 import { colors } from '@arch-ui/theme';

packages/app-admin-ui/client/pages/List/CreateItem.js

@@ -2,7 +2,7 @@
 import { jsx } from '@emotion/core';
 
 import { IconButton } from '@arch-ui/button';
-import { PlusIcon } from '@arch-ui/icons';
+import { PlusIcon } from '@primer/octicons-react';
 
 import { useList } from '../../providers/List';
 

packages/app-admin-ui/client/pages/List/Filters/AddFilterPopout.js

@@ -3,7 +3,7 @@ import { jsx } from '@emotion/core';
 import { Component, createRef, Suspense } from 'react';
 import { Transition, TransitionGroup } from 'react-transition-group';
 
-import { ChevronLeftIcon, ChevronRightIcon, AlertIcon } from '@arch-ui/icons';
+import { ChevronLeftIcon, ChevronRightIcon, AlertIcon } from '@primer/octicons-react';
 import { colors, gridSize } from '@arch-ui/theme';
 import { A11yText } from '@arch-ui/typography';
 import { Alert } from '@arch-ui/alert';

packages/app-admin-ui/client/pages/List/MoreDropdown.js

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
-import { FoldIcon, KebabVerticalIcon, UnfoldIcon, ZapIcon } from '@arch-ui/icons';
+import { FoldIcon, KebabVerticalIcon, UnfoldIcon, ZapIcon } from '@primer/octicons-react';
 import { CONTAINER_GUTTER, CONTAINER_WIDTH } from '@arch-ui/layout';
 import { A11yText } from '@arch-ui/typography';
 import { IconButton } from '@arch-ui/button';

packages/app-admin-ui/client/pages/List/Search.js

@@ -4,7 +4,7 @@ import { jsx } from '@emotion/core';
 import { useRef, forwardRef, useState, useCallback } from 'react';
 import debounce from 'lodash.debounce';
 
-import { SearchIcon, XIcon } from '@arch-ui/icons';
+import { SearchIcon, XIcon } from '@primer/octicons-react';
 // import { Input } from '@arch-ui/input';
 import { A11yText } from '@arch-ui/typography';
 import { LoadingSpinner } from '@arch-ui/loading';

packages/app-admin-ui/client/pages/List/index.js

@@ -8,7 +8,7 @@ import { Container, FlexGroup } from '@arch-ui/layout';
 import { colors, gridSize } from '@arch-ui/theme';
 import { PageTitle } from '@arch-ui/typography';
 import { Button } from '@arch-ui/button';
-import { KebabHorizontalIcon } from '@arch-ui/icons';
+import { KebabHorizontalIcon } from '@primer/octicons-react';
 import Tooltip from '@arch-ui/tooltip';
 import { applyRefs } from 'apply-ref';
 import { LoadingIndicator } from '@arch-ui/loading';

packages/app-admin-ui/client/pages/ListNotFound.js

@@ -2,7 +2,7 @@ import React from 'react';
 
 import PageError from '../components/PageError';
 import { Button } from '@arch-ui/button';
-import { IssueOpenedIcon } from '@arch-ui/icons';
+import { IssueOpenedIcon } from '@primer/octicons-react';
 
 import { useAdminMeta } from '../providers/AdminMeta';
 

packages/app-admin-ui/client/pages/NoLists.js

@@ -3,7 +3,7 @@ import React from 'react';
 import DocTitle from '../components/DocTitle';
 import PageError from '../components/PageError';
 
-import { InfoIcon } from '@arch-ui/icons';
+import { InfoIcon } from '@primer/octicons-react';
 
 const NoListsPage = () => {
   return (

packages/app-admin-ui/client/pages/Signout.js

@@ -7,7 +7,7 @@ import { Fragment } from 'react';
 import { useMutation } from '@apollo/react-hooks';
 import gql from 'graphql-tag';
 
-import { CheckIcon } from '@arch-ui/icons';
+import { CheckIcon } from '@primer/octicons-react';
 import { Button } from '@arch-ui/button';
 import { LoadingIndicator } from '@arch-ui/loading';
 import { colors } from '@arch-ui/theme';

packages/app-admin-ui/package.json

@@ -22,7 +22,6 @@
     "@arch-ui/dropdown": "^0.0.18",
     "@arch-ui/fields": "^3.0.2",
     "@arch-ui/hooks": "^0.0.10",
-    "@arch-ui/icons": "^0.1.1",
     "@arch-ui/input": "^0.1.10",
     "@arch-ui/layout": "^0.2.13",
     "@arch-ui/loading": "^0.0.17",
@@ -44,6 +43,7 @@
     "@keystonejs/fields": "^13.0.2",
     "@keystonejs/session": "^7.0.1",
     "@keystonejs/utils": "^5.4.2",
+    "@primer/octicons-react": "^10.0.0",
     "@types/react": "^16.8.12",
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-client": "^2.6.10",

packages/arch/packages/day-picker/package.json

@@ -12,14 +12,14 @@
     "react": "^16.13.1"
   },
   "dependencies": {
-    "@arch-ui/icons": "^0.1.1",
     "@arch-ui/input": "^0.1.9",
     "@arch-ui/select": "^0.1.8",
     "@arch-ui/theme": "^0.0.10",
     "@arch-ui/typography": "^0.0.17",
     "@babel/runtime": "^7.8.4",
     "@emotion/core": "^10.0.28",
     "@emotion/styled": "^10.0.27",
+    "@primer/octicons-react": "^10.0.0",
     "chrono-node": "^1.4.6",
     "date-fns": "^2.14.0",
     "intersection-observer": "^0.10.0",

packages/arch/packages/day-picker/src/DayPicker/index.js

@@ -12,7 +12,7 @@ import {
   endOfYear,
 } from 'date-fns';
 import { VariableSizeList as List } from 'react-window';
-import { ChevronLeftIcon, ChevronRightIcon } from '@arch-ui/icons';
+import { ChevronLeftIcon, ChevronRightIcon } from '@primer/octicons-react';
 import { useLayoutEffect, useState, useRef, useMemo, useCallback } from 'react';
 import { borderRadius, colors } from '@arch-ui/theme';
 import { yearRange, months, getWeeksInMonth, isNumberInRange } from './utils';

packages/arch/packages/fields/package.json

@@ -12,12 +12,12 @@
     "react": "^16.13.1"
   },
   "dependencies": {
-    "@arch-ui/icons": "^0.1.1",
     "@arch-ui/lozenge": "^0.0.16",
     "@arch-ui/theme": "^0.0.10",
     "@babel/runtime": "^7.8.4",
     "@emotion/core": "^10.0.28",
-    "@emotion/styled": "^10.0.27"
+    "@emotion/styled": "^10.0.27",
+    "@primer/octicons-react": "^10.0.0"
   },
   "module": "dist/fields.esm.js",
   "repository": "https://github.com/keystonejs/keystone/tree/master/packages/arch/packages/fields"

packages/arch/packages/fields/src/index.js

@@ -2,7 +2,7 @@
 
 import { jsx } from '@emotion/core';
 import { colors, gridSize } from '@arch-ui/theme';
-import { ShieldIcon } from '@arch-ui/icons';
+import { ShieldIcon } from '@primer/octicons-react';
 import { Lozenge } from '@arch-ui/lozenge';
 
 export const FieldContainer = props => (

packages/arch/packages/options/package.json

@@ -13,10 +13,10 @@
   },
   "dependencies": {
     "@arch-ui/common": "^0.0.11",
-    "@arch-ui/icons": "^0.1.1",
     "@arch-ui/theme": "^0.0.10",
     "@babel/runtime": "^7.8.4",
     "@emotion/core": "^10.0.28",
+    "@primer/octicons-react": "^10.0.0",
     "react-select": "^3.1.0"
   },
   "module": "dist/options.esm.js",

packages/arch/packages/options/src/index.js

@@ -2,7 +2,7 @@
 import { jsx } from '@emotion/core';
 import { useMemo } from 'react';
 import ReactSelect, { components as reactSelectComponents } from 'react-select';
-import { CheckIcon } from '@arch-ui/icons';
+import { CheckIcon } from '@primer/octicons-react';
 import { colors, gridSize } from '@arch-ui/theme';
 import { uniformHeight } from '@arch-ui/common';
 

packages/arch/packages/pagination/package.json

@@ -13,13 +13,13 @@
   },
   "dependencies": {
     "@arch-ui/button": "^0.0.20",
-    "@arch-ui/icons": "^0.1.1",
     "@arch-ui/layout": "^0.2.13",
     "@arch-ui/loading": "^0.0.17",
     "@arch-ui/theme": "^0.0.10",
     "@babel/runtime": "^7.8.4",
     "@emotion/core": "^10.0.28",
     "@emotion/styled": "^10.0.27",
+    "@primer/octicons-react": "^10.0.0",
     "react-router-dom": "5.2.0"
   },
   "module": "dist/pagination.esm.js",

packages/arch/packages/pagination/src/Pagination.js

@@ -2,7 +2,7 @@
 
 import { jsx } from '@emotion/core';
 import { useEffect, useState } from 'react';
-import { ChevronLeftIcon, ChevronRightIcon, KebabHorizontalIcon } from '@arch-ui/icons';
+import { ChevronLeftIcon, ChevronRightIcon, KebabHorizontalIcon } from '@primer/octicons-react';
 import { FlexGroup } from '@arch-ui/layout';
 import { LoadingSpinner } from '@arch-ui/loading';
 

packages/arch/packages/pill/package.json

@@ -13,11 +13,11 @@
   },
   "dependencies": {
     "@arch-ui/common": "^0.0.11",
-    "@arch-ui/icons": "^0.1.1",
     "@arch-ui/theme": "0.0.10",
     "@babel/runtime": "^7.8.4",
     "@emotion/core": "^10.0.28",
-    "@emotion/styled": "^10.0.27"
+    "@emotion/styled": "^10.0.27",
+    "@primer/octicons-react": "^10.0.0"
   },
   "module": "dist/pill.esm.js",
   "repository": "https://github.com/keystonejs/keystone/tree/master/packages/arch/packages/pill"

packages/arch/packages/pill/src/index.js

@@ -3,7 +3,7 @@ import { jsx } from '@emotion/core';
 import styled from '@emotion/styled';
 import { forwardRef } from 'react';
 
-import { XIcon } from '@arch-ui/icons';
+import { XIcon } from '@primer/octicons-react';
 import { colors } from '@arch-ui/theme';
 import { uniformHeight } from '@arch-ui/common';
 

packages/field-content/package.json

@@ -11,7 +11,6 @@
     "@arch-ui/color-utils": "^0.0.2",
     "@arch-ui/fields": "^3.0.2",
     "@arch-ui/hooks": "^0.0.10",
-    "@arch-ui/icons": "^0.1.1",
     "@arch-ui/input": "^0.1.10",
     "@arch-ui/theme": "^0.0.10",
     "@arch-ui/tooltip": "^0.1.12",
@@ -22,6 +21,7 @@
     "@keystonejs/fields": "^13.0.0",
     "@keystonejs/utils": "^5.4.1",
     "@popperjs/core": "^2.3.3",
+    "@primer/octicons-react": "^10.0.0",
     "apply-ref": "^0.2.0",
     "get-selection-range": "^0.1.0",
     "image-extensions": "^1.1.0",

packages/field-content/src/views/editor/add-block.js

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import { useState, useRef, useCallback, useLayoutEffect, Fragment } from 'react';
-import { PlusIcon } from '@arch-ui/icons';
+import { PlusIcon } from '@primer/octicons-react';
 import { type as defaultType } from './blocks/paragraph';
 
 const getSelectedElement = () => {

packages/field-content/src/views/editor/blocks/blockquote.js

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import { hasAncestorBlock } from '../utils';
-import { QuoteIcon } from '@arch-ui/icons';
+import { QuoteIcon } from '@primer/octicons-react';
 import { ToolbarButton } from '../toolbar-components';
 
 export let type = 'blockquote';

packages/field-content/src/views/editor/blocks/link.js

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useContext, useState, Fragment, useEffect } from 'react';
-import { LinkIcon, CheckIcon, CircleSlashIcon, LinkExternalIcon } from '@arch-ui/icons';
+import { LinkIcon, CheckIcon, CircleSlashIcon, LinkExternalIcon } from '@primer/octicons-react';
 import { colors, gridSize } from '@arch-ui/theme';
 import { usePopper } from 'react-popper';
 import { createPortal } from 'react-dom';

packages/field-content/src/views/editor/blocks/ordered-list.js

@@ -3,7 +3,7 @@ import { ToolbarButton } from '../toolbar-components';
 import { hasAncestorBlock, hasBlock } from '../utils';
 import * as listItem from './list-item';
 import { type as defaultType } from './paragraph';
-import { ListOrderedIcon } from '@arch-ui/icons';
+import { ListOrderedIcon } from '@primer/octicons-react';
 
 // duplicated logic for now, make some of this functionality happen in the schema instead soon
 let handleListButtonClick = (editor, editorState, type) => {