Merge pull request #2764 from contentful/feat/AHOY-3140-add-avatar-in…

…itials

feat(changesets): move avatar from alpha package to automatic release [AHOY-3166]

.changeset/config.json

@@ -7,11 +7,8 @@
     }
   ],
   "ignore": [
-    "@contentful/f36-avatar",
-    "@contentful/f36-image",
     "@contentful/f36-header",
     "@contentful/f36-layout",
-    "@contentful/f36-navbar",
     "@contentful/f36-navlist",
     "@contentful/f36-website"
   ],
@@ -50,7 +47,9 @@
       "@contentful/f36-text-link",
       "@contentful/f36-tooltip",
       "@contentful/f36-typography",
-      "@contentful/f36-components"
+      "@contentful/f36-components",
+      "@contentful/f36-image",
+      "@contentful/f36-avatar"
     ]
   ],
   "access": "public",

.changeset/nasty-tomatoes-boil.md

@@ -0,0 +1,7 @@
+---
+"@contentful/f36-components": patch
+"@contentful/f36-avatar": patch
+"@contentful/f36-image": patch
+---
+
+feat(changesets): move avatar from alpha package to automatic release [AHOY-3166]

packages/components/avatar/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentful/f36-avatar",
-  "version": "4.0.0-alpha.11",
+  "version": "4.0.0",
   "description": "Forma 36: Avatar component",
   "scripts": {
     "build": "tsup"
   },
   "dependencies": {
     "@contentful/f36-core": "^4.65.6",
-    "@contentful/f36-image": "^4.0.0-alpha.0",
+    "@contentful/f36-image": "4.0.0",
     "@contentful/f36-menu": "^4.65.6",
     "@contentful/f36-tokens": "^4.0.5",
     "@contentful/f36-tooltip": "^4.65.6",

packages/components/avatar/src/Avatar/README.mdx

@@ -15,6 +15,8 @@ Avatar can be used to visually represent users and apps.
 
 ```jsx static=true
 import { Avatar } from '@contentful/f36-avatar';
+// or
+import { Avatar } from '@contentful/f36-component';
 ```
 
 ## Examples

packages/components/image/README.mdx

@@ -14,6 +14,8 @@ Image component that can handle showing a loading skeleton while the image is lo
 
 ```jsx static=true
 import { Image } from '@contentful/f36-image';
+// or
+import { Image } from '@contentful/f36-component';
 ```
 
 ## Examples

packages/components/image/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/f36-image",
-  "version": "4.0.0-alpha.0",
+  "version": "4.0.0",
   "description": "Forma 36: Image component",
   "scripts": {
     "build": "tsup"

packages/components/navbar/package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "@contentful/f36-core": "^4.65.6",
     "@contentful/f36-menu": "^4.65.6",
-    "@contentful/f36-avatar": "^4.0.0-alpha.11",
+    "@contentful/f36-avatar": "4.0.0",
     "@contentful/f36-tokens": "^4.0.1",
     "@contentful/f36-utils": "^4.23.2",
     "@contentful/f36-skeleton": "^4.65.6",

packages/forma-36-react-components/package.json

@@ -33,6 +33,7 @@
     "@contentful/f36-accordion": "^4.65.6",
     "@contentful/f36-asset": "^4.65.6",
     "@contentful/f36-autocomplete": "^4.65.6",
+    "@contentful/f36-avatar": "4.0.0",
     "@contentful/f36-badge": "^4.65.6",
     "@contentful/f36-button": "^4.65.6",
     "@contentful/f36-card": "^4.65.6",
@@ -47,6 +48,7 @@
     "@contentful/f36-forms": "^4.65.6",
     "@contentful/f36-icon": "^4.65.6",
     "@contentful/f36-icons": "^4.28.1",
+    "@contentful/f36-image": "4.0.0",
     "@contentful/f36-list": "^4.65.6",
     "@contentful/f36-menu": "^4.65.6",
     "@contentful/f36-modal": "^4.65.6",

packages/forma-36-react-components/src/index.ts

@@ -1,6 +1,7 @@
 export * from '@contentful/f36-accordion';
 export * from '@contentful/f36-asset';
 export * from '@contentful/f36-autocomplete';
+export * from '@contentful/f36-avatar';
 export * from '@contentful/f36-badge';
 export * from '@contentful/f36-button';
 export * from '@contentful/f36-card';
@@ -14,6 +15,7 @@ export * from '@contentful/f36-entity-list';
 export * from '@contentful/f36-empty-state';
 export * from '@contentful/f36-forms';
 export * from '@contentful/f36-icon';
+export * from '@contentful/f36-image';
 export * from '@contentful/f36-list';
 export * from '@contentful/f36-menu';
 export * from '@contentful/f36-modal';

packages/website/components/LiveEditor/ComponentSource.tsx

@@ -13,9 +13,7 @@ import * as f36Components from '@contentful/f36-components';
 import { Multiselect } from '@contentful/f36-multiselect';
 import { NavList } from '@contentful/f36-navlist';
 import * as f36utils from '@contentful/f36-utils';
-import { Avatar, AvatarGroup } from '@contentful/f36-avatar';
 import { Header } from '@contentful/f36-header';
-import { Image } from '@contentful/f36-image';
 import { Layout } from '@contentful/f36-layout';
 import { useForm, useController } from 'react-hook-form';
 import { MdAccessAlarm } from 'react-icons/md';
@@ -41,10 +39,7 @@ const liveProviderScope = {
   ...f36Components,
   ...f36icons,
   ...f36utils,
-  Avatar, // Remove when avatar is added to f36-components
-  AvatarGroup, // Remove when avatar is added to f36-components
   Header, // Remove when added to f36-components
-  Image, // Remove when added to f36-components
   Layout, // Remove when added to f36-components
   Multiselect, // Remove when added to f36-components
   NavList, // Remove when added to f36-components

packages/website/components/Playground/SandpackRenderer.tsx

@@ -95,9 +95,7 @@ export function SandpackRenderer({
           'react-dom': '^17.0.0',
           'react-scripts': '^4.0.0',
           '@contentful/f36-components': '^4.0.0',
-          '@contentful/f36-avatar': '^4.0.0-alpha.0', // Remove when added to f36-components
           '@contentful/f36-header': '^4.0.0-alpha.0', // Remove when added to f36-components
-          '@contentful/f36-image': '^4.0.0-alpha.0', // Remove when added to f36-components
           '@contentful/f36-layout': '^4.0.0-alpha.0', // Remove when added to f36-components
           '@contentful/f36-multiselect': '^4.0.0', // Remove when added to f36-components
           '@contentful/f36-navlist': '^4.1.0-alpha.0', // Remove when added to f36-components

packages/website/package.json

@@ -10,14 +10,14 @@
   },
   "dependencies": {
     "@codesandbox/sandpack-react": "^1.17.0",
-    "@contentful/f36-avatar": "^4.0.0-alpha.0",
+    "@contentful/f36-avatar": "4.0.0",
     "@contentful/f36-components": "^4.65.6",
     "@contentful/f36-docs-utils": "^4.0.2",
     "@contentful/f36-empty-state": "^4.65.6",
     "@contentful/f36-header": "^4.0.0-alpha.0",
     "@contentful/f36-icon": "^4.65.6",
     "@contentful/f36-icons": "^4.28.2",
-    "@contentful/f36-image": "^4.0.0-alpha.0",
+    "@contentful/f36-image": "4.0.0",
     "@contentful/f36-layout": "^4.0.0-alpha.0",
     "@contentful/f36-multiselect": "^4.23.1",
     "@contentful/f36-navlist": "4.1.0-alpha.1",