Rename field-content to fields-content

.changeset/smart-baboons-shave.md

@@ -0,0 +1,8 @@
+---
+'@keystonejs/field-content': major
+'@keystonejs/fields-content': major
+'@keystonejs/fields': patch
+'@keystonejs/cypress-project-basic': patch
+---
+
+Renamed `@keystonejs/field-content` to `@keystonejs/fields-content`. Please install `@keystonejs/fields-content` and update your imports from `@keystonejs/field-content` to `@keystonejs/fields-content`.

package.json

@@ -170,6 +170,7 @@
       "packages/fields-mongoid",
       "packages/fields-wysiwyg-tinymce",
       "packages/oembed-adapters",
+      "packages/fields-content",
       "packages/fields-color"
     ],
     "___experimentalFlags_WILL_CHANGE_IN_PATCH": {
@@ -178,7 +179,6 @@
   },
   "field-types": {
     "packages": [
-      "packages/field-content",
       "packages/fields"
     ]
   },

packages/field-content/index.js

@@ -0,0 +1,3 @@
+throw new Error(
+  '`@keystonejs/field-content` has been renamed to `@keystonejs/fields-content`. Please install `@keystonejs/fields-content` and change your imports from `@keystonejs/field-content` to `@keystonejs/fields-content`'
+);

packages/field-content/package.json

@@ -1,55 +1,12 @@
 {
-  "name": "@keystonejs/field-content",
-  "description": "A block-based content field for KeystoneJS",
-  "version": "7.0.3",
-  "author": "The KeystoneJS Development Team",
-  "license": "MIT",
-  "engines": {
-    "node": ">=10.0.0"
-  },
-  "dependencies": {
-    "@arch-ui/color-utils": "^0.0.2",
-    "@arch-ui/fields": "^3.0.3",
-    "@arch-ui/hooks": "^0.0.10",
-    "@arch-ui/input": "^0.1.10",
-    "@arch-ui/theme": "^0.0.10",
-    "@arch-ui/tooltip": "^0.1.12",
-    "@arch-ui/typography": "^0.0.17",
-    "@babel/runtime": "^7.8.4",
-    "@emotion/core": "^10.0.28",
-    "@keystonejs/build-field-types": "^5.2.11",
-    "@keystonejs/fields": "^15.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",
-    "immutable": "^4.0.0-rc.12",
-    "is-hotkey": "^0.1.4",
-    "lodash.get": "^4.4.2",
-    "memoize-one": "^5.1.1",
-    "nanoassert": "^2.0.0",
-    "p-is-promise": "^3.0.0",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
-    "react-popper": "^2.2.2",
-    "slate": "^0.47.4",
-    "slate-drop-or-paste-images": "^0.9.1",
-    "slate-plain-serializer": "^0.7.11",
-    "slate-react": "^0.22.4"
-  },
-  "peerDependencies": {},
-  "field-types": {
-    "entrypoints": [
-      ".",
-      "Block",
-      "slate-serializer",
-      "blocks",
-      "block-components"
-    ]
-  },
-  "main": "dist/field-content.cjs.js",
-  "module": "dist/field-content.esm.js",
-  "repository": "https://github.com/keystonejs/keystone/tree/master/packages/field-content"
-}
+    "name": "@keystonejs/field-content",
+    "description": "A block-based content field for KeystoneJS",
+    "version": "7.0.3",
+    "author": "The KeystoneJS Development Team",
+    "license": "MIT",
+    "engines": {
+      "node": ">=10.0.0"
+    },
+    "repository": "https://github.com/keystonejs/keystone/tree/master/packages/field-content"
+  }
+

packages/fields-content/Block/package.json

@@ -0,0 +1,7 @@
+{
+  "main": "dist/fields-content.cjs.js",
+  "module": "dist/fields-content.esm.js",
+  "field-types": {
+    "source": "../src/Block"
+  }
+}

packages/field-content/README.md → packages/fields-content/README.md

@@ -16,10 +16,10 @@ editing flows.
 
 ## Usage
 
-This package isn't included with the keystone fields package and needs to be installed with `yarn add @keystonejs/field-content` or `npm install @keystonejs/field-content`.
+This package isn't included with the keystone fields package and needs to be installed with `yarn add @keystonejs/fields-content` or `npm install @keystonejs/fields-content`.
 
 ```javascript
-const { Content } = require('@keystonejs/field-content');
+const { Content } = require('@keystonejs/fields-content');
 
 keystone.createList('Post', {
   fields: {

packages/fields-content/block-components/package.json

@@ -0,0 +1,7 @@
+{
+  "main": "dist/fields-content.cjs.js",
+  "module": "dist/fields-content.esm.js",
+  "field-types": {
+    "source": "../src/views/"
+  }
+}

packages/fields-content/blocks/package.json

@@ -0,0 +1,7 @@
+{
+  "main": "dist/fields-content.cjs.js",
+  "module": "dist/fields-content.esm.js",
+  "field-types": {
+    "source": "../src/blocks"
+  }
+}

packages/fields-content/package.json

@@ -0,0 +1,55 @@
+{
+  "name": "@keystonejs/fields-content",
+  "description": "A block-based content field for KeystoneJS",
+  "version": "7.0.3",
+  "author": "The KeystoneJS Development Team",
+  "license": "MIT",
+  "engines": {
+    "node": ">=10.0.0"
+  },
+  "dependencies": {
+    "@arch-ui/color-utils": "^0.0.2",
+    "@arch-ui/fields": "^3.0.3",
+    "@arch-ui/hooks": "^0.0.10",
+    "@arch-ui/input": "^0.1.10",
+    "@arch-ui/theme": "^0.0.10",
+    "@arch-ui/tooltip": "^0.1.12",
+    "@arch-ui/typography": "^0.0.17",
+    "@babel/runtime": "^7.8.4",
+    "@emotion/core": "^10.0.28",
+    "@keystonejs/fields": "^15.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",
+    "immutable": "^4.0.0-rc.12",
+    "is-hotkey": "^0.1.4",
+    "lodash.get": "^4.4.2",
+    "memoize-one": "^5.1.1",
+    "nanoassert": "^2.0.0",
+    "p-is-promise": "^3.0.0",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-popper": "^2.2.2",
+    "slate": "^0.47.4",
+    "slate-drop-or-paste-images": "^0.9.1",
+    "slate-plain-serializer": "^0.7.11",
+    "slate-react": "^0.22.4"
+  },
+  "preconstruct": {
+    "entrypoints": [
+      "index.js",
+      "Block.js",
+      "slate-serializer.js",
+      "blocks/index.js",
+      "block-components.js",
+      "views/*.js",
+      "views/editor/blocks/*.js"
+    ]
+  },
+  "main": "dist/fields-content.cjs.js",
+  "module": "dist/fields-content.esm.js",
+  "repository": "https://github.com/keystonejs/keystone/tree/master/packages/fields-content"
+}

packages/fields-content/slate-serializer/package.json

@@ -0,0 +1,7 @@
+{
+  "main": "dist/fields-content.cjs.js",
+  "module": "dist/fields-content.esm.js",
+  "field-types": {
+    "source": "../src/slate-serializer"
+  }
+}

packages/fields-content/src/block-components.js

@@ -0,0 +1 @@
+export { BlockMenuItem } from './views/editor/block-menu-item';

packages/field-content/src/blocks/blockquote.js → packages/fields-content/src/blocks/blockquote.js

@@ -1,11 +1,11 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 
 export default class BlockquoteBlock extends Block {
   get type() {
     return 'blockquote';
   }
   getAdminViews() {
-    return [importView('../views/editor/blocks/blockquote')];
+    return [resolveView('views/editor/blocks/blockquote')];
   }
 }

packages/field-content/src/blocks/caption.js → packages/fields-content/src/blocks/caption.js

@@ -1,11 +1,11 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 
 export default class CaptionBlock extends Block {
   get type() {
     return 'caption';
   }
   getAdminViews() {
-    return [importView('../views/editor/blocks/caption')];
+    return [resolveView('views/editor/blocks/caption')];
   }
 }

packages/field-content/src/blocks/heading.js → packages/fields-content/src/blocks/heading.js

@@ -1,4 +1,4 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 import { paragraph } from '../blocks';
 
@@ -7,6 +7,6 @@ export default class HeadingBlock extends Block {
     return 'heading';
   }
   getAdminViews() {
-    return [importView('../views/editor/blocks/heading'), ...new paragraph().getAdminViews()];
+    return [resolveView('views/editor/blocks/heading'), ...new paragraph().getAdminViews()];
   }
 }

packages/field-content/src/blocks/image-container.js → packages/fields-content/src/blocks/image-container.js

@@ -1,4 +1,4 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 import image from './image';
 import caption from './caption';
@@ -9,7 +9,7 @@ export default class ImageContainerBlock extends Block {
   }
   getAdminViews() {
     return [
-      importView('../views/editor/blocks/image-container'),
+      resolveView('views/editor/blocks/image-container'),
       ...new image().getAdminViews(),
       ...new caption().getAdminViews(),
     ];

packages/field-content/src/blocks/image.js → packages/fields-content/src/blocks/image.js

@@ -1,11 +1,11 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 
 export default class ImageBlock extends Block {
   get type() {
     return 'image';
   }
   getAdminViews() {
-    return [importView('../views/editor/blocks/image')];
+    return [resolveView('views/editor/blocks/image')];
   }
 }

packages/field-content/src/blocks/link.js → packages/fields-content/src/blocks/link.js

@@ -1,11 +1,11 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 
 export default class LinkBlock extends Block {
   get type() {
     return 'link';
   }
   getAdminViews() {
-    return [importView('../views/editor/blocks/link')];
+    return [resolveView('views/editor/blocks/link')];
   }
 }

packages/field-content/src/blocks/list-item.js → packages/fields-content/src/blocks/list-item.js

@@ -1,11 +1,11 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 
 export default class ListItemBlock extends Block {
   get type() {
     return 'list-item';
   }
   getAdminViews() {
-    return [importView('../views/editor/blocks/list-item')];
+    return [resolveView('views/editor/blocks/list-item')];
   }
 }

packages/field-content/src/blocks/ordered-list.js → packages/fields-content/src/blocks/ordered-list.js

@@ -1,4 +1,4 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 import listItem from './list-item';
 
@@ -7,6 +7,6 @@ export default class OrderedListBlock extends Block {
     return 'ordered-list';
   }
   getAdminViews() {
-    return [importView('../views/editor/blocks/ordered-list'), ...new listItem().getAdminViews()];
+    return [resolveView('views/editor/blocks/ordered-list'), ...new listItem().getAdminViews()];
   }
 }

packages/field-content/src/blocks/paragraph.js → packages/fields-content/src/blocks/paragraph.js

@@ -1,11 +1,11 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 
 export default class ParagraphBlock extends Block {
   get type() {
     return 'paragraph';
   }
   getAdminViews() {
-    return [importView('../views/editor/blocks/paragraph')];
+    return [resolveView('views/editor/blocks/paragraph')];
   }
 }

packages/field-content/src/blocks/unordered-list.js → packages/fields-content/src/blocks/unordered-list.js

@@ -1,4 +1,4 @@
-import { importView } from '@keystonejs/build-field-types';
+import { resolveView } from '../resolve-view';
 import { Block } from '../Block';
 import listItem from './list-item';
 
@@ -7,6 +7,6 @@ export default class UnorderedListBlock extends Block {
     return 'unordered-list';
   }
   getAdminViews() {
-    return [importView('../views/editor/blocks/unordered-list'), ...new listItem().getAdminViews()];
+    return [resolveView('views/editor/blocks/unordered-list'), ...new listItem().getAdminViews()];
   }
 }