From 8aae69436ab4db7ffee30f2c64b64174e301e80e Mon Sep 17 00:00:00 2001 From: Jeff See Date: Thu, 22 Jun 2023 13:42:46 -0700 Subject: [PATCH 01/26] Ensure urls are sanitized in a tags for rich-text --- .changeset/metal-rats-tap.md | 5 +++ .../@tinacms/mdx/src/parse/remarkToPlate.ts | 31 +++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 .changeset/metal-rats-tap.md diff --git a/.changeset/metal-rats-tap.md b/.changeset/metal-rats-tap.md new file mode 100644 index 0000000000..973b36fe6c --- /dev/null +++ b/.changeset/metal-rats-tap.md @@ -0,0 +1,5 @@ +--- +'@tinacms/mdx': patch +--- + +Ensure urls are sanitized in a tags for rich-text diff --git a/packages/@tinacms/mdx/src/parse/remarkToPlate.ts b/packages/@tinacms/mdx/src/parse/remarkToPlate.ts index 2f152ade37..5ed4f75855 100644 --- a/packages/@tinacms/mdx/src/parse/remarkToPlate.ts +++ b/packages/@tinacms/mdx/src/parse/remarkToPlate.ts @@ -270,7 +270,7 @@ export const remarkToSlate = ( const link = (content: Md.Link): Plate.LinkElement => { return { type: 'a', - url: content.url, + url: sanitizeUrl(content.url), title: content.title, children: flatten( content.children.map((child) => staticPhrasingContent(child)) @@ -397,7 +397,12 @@ export const remarkToSlate = ( const children = flatten( node.children.map((child) => phrashingMark(child, marks)) ) - accum.push({ type: 'a', url: node.url, title: node.title, children }) + accum.push({ + type: 'a', + url: sanitizeUrl(node.url), + title: node.title, + children, + }) break } case 'text': @@ -501,3 +506,25 @@ export class RichTextParseError extends Error { this.position = position } } + +// Prevent javascript scheme (eg. `javascript:alert(document.domain)`) +const sanitizeUrl = (url: string | undefined) => { + const allowedSchemes = ['http', 'https', 'mailto', 'tel'] + if (!url) return '' + + let parsedUrl: URL | null = null + + try { + parsedUrl = new URL(url) + } catch (error) { + return url + } + + const scheme = parsedUrl.protocol.slice(0, -1) + if (allowedSchemes && !allowedSchemes.includes(scheme)) { + console.warn(`Invalid URL scheme detected ${scheme}`) + return '' + } + + return parsedUrl.href +} From 193d98dfa4ff51faf9513cea26e8227925243e8b Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 12 Jul 2023 12:21:18 -0700 Subject: [PATCH 02/26] Adds ability to specify branch name in the request for the autogenerated client --- .changeset/olive-beers-raise.md | 5 ++ .../cli/src/next/codegen/codegen/plugin.ts | 47 +++++++++++++------ 2 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 .changeset/olive-beers-raise.md diff --git a/.changeset/olive-beers-raise.md b/.changeset/olive-beers-raise.md new file mode 100644 index 0000000000..cbe9d1a9fa --- /dev/null +++ b/.changeset/olive-beers-raise.md @@ -0,0 +1,5 @@ +--- +'@tinacms/cli': patch +--- + +Adds ability to specify branch name in the request for the autogenerated client diff --git a/packages/@tinacms/cli/src/next/codegen/codegen/plugin.ts b/packages/@tinacms/cli/src/next/codegen/codegen/plugin.ts index f368720eb8..4199bf751e 100644 --- a/packages/@tinacms/cli/src/next/codegen/codegen/plugin.ts +++ b/packages/@tinacms/cli/src/next/codegen/codegen/plugin.ts @@ -12,36 +12,55 @@ export const AddGeneratedClientFunc: (apiURL: string) => PluginFunction = ( // TinaSDK generated code import { createClient, TinaClient } from "tinacms/dist/client"; -const generateRequester = (client: TinaClient) => { +const generateRequester = ( + client: TinaClient, + options?: { branch?: string } +) => { const requester: ( doc: any, vars?: any, - options?: any, + options?: { branch?: string }, client - ) => Promise = async (doc, vars, _options) => { + ) => Promise = async (doc, vars, options) => { + let url = client.apiUrl + if (options?.branch) { + const index = client.apiUrl.lastIndexOf('/') + url = client.apiUrl.substring(0, index + 1) + options.branch + } const data = await client.request({ query: doc, variables: vars, - }); + url, + }) - return { data: data?.data, query: doc, variables: vars || {} }; - }; + return { data: data?.data, query: doc, variables: vars || {} } + } - return requester; -}; + return requester +} /** * @experimental this class can be used but may change in the future **/ export const ExperimentalGetTinaClient = () => getSdk( - generateRequester(createClient({ url: "${apiURL}", queries })) - ); + generateRequester( + createClient({ + url: "${apiURL}", + queries, + }) + ) + ) -export const queries = (client: TinaClient) => { - const requester = generateRequester(client); - return getSdk(requester); -}; +export const queries = ( + client: TinaClient, + options?: { + branch?: string + } +) => { + const requester = generateRequester(client, options) + return getSdk(requester) +} ` } } From 8a3dc449020dd700c34de1815b7ab52d2622a7fd Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 12 Jul 2023 12:31:23 -0700 Subject: [PATCH 03/26] bump From 6b91c668d7b41fe901b7d6f9d2b49b117b82de17 Mon Sep 17 00:00:00 2001 From: "vince.joe" Date: Mon, 24 Jul 2023 22:55:13 +0900 Subject: [PATCH 04/26] Organize badges --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9d162fb25b..727bd465fc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -[![GitHub license](https://img.shields.io/github/license/tinacms/tinacms?color=blue)](https://github.com/tinacms/tinacms/blob/main/LICENSE) [![npm version](https://img.shields.io/npm/v/tinacms.svg?style=flat)](https://www.npmjs.com/package/tinacms) ![Status](https://github.com/tinacms/tinacms/workflows/Build,%20Test,%20Lint%20for%20Master/badge.svg) -[![All Contributors](https://img.shields.io/badge/all_contributors-103-orange.svg?style=flat-square)](#contributors-) - +[![GitHub license](https://img.shields.io/github/license/tinacms/tinacms?color=blue)](https://github.com/tinacms/tinacms/blob/main/LICENSE) +[![npm version](https://img.shields.io/npm/v/tinacms.svg?style=flat)](https://www.npmjs.com/package/tinacms) +[![Build, Test, Lint for Main](https://github.com/tinacms/tinacms/actions/workflows/main.yml/badge.svg?branch=main&event=push)](https://github.com/tinacms/tinacms/actions/workflows/main.yml) +[![All Contributors](https://img.shields.io/github/all-contributors/tinacms/tinacms?color=ec4815)](#contributors) # [![TINA CMS](https://res.cloudinary.com/forestry-demo/image/upload/v1585234360/TinaCMS/TinaCMS.png 'Visit tinacms.org')](https://tina.io) From 713f6d8ddff01916634023a31f73ed4489b55911 Mon Sep 17 00:00:00 2001 From: "vince.joe" Date: Mon, 24 Jul 2023 23:00:42 +0900 Subject: [PATCH 05/26] Add tag --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 727bd465fc..b8ca60e56e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ [![GitHub license](https://img.shields.io/github/license/tinacms/tinacms?color=blue)](https://github.com/tinacms/tinacms/blob/main/LICENSE) [![npm version](https://img.shields.io/npm/v/tinacms.svg?style=flat)](https://www.npmjs.com/package/tinacms) [![Build, Test, Lint for Main](https://github.com/tinacms/tinacms/actions/workflows/main.yml/badge.svg?branch=main&event=push)](https://github.com/tinacms/tinacms/actions/workflows/main.yml) + [![All Contributors](https://img.shields.io/github/all-contributors/tinacms/tinacms?color=ec4815)](#contributors) + # [![TINA CMS](https://res.cloudinary.com/forestry-demo/image/upload/v1585234360/TinaCMS/TinaCMS.png 'Visit tinacms.org')](https://tina.io) From 8809c89c57a8fef2bd090fcd0f0537b810b3bf27 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Tue, 25 Jul 2023 13:58:46 -0700 Subject: [PATCH 06/26] Reorganize @tinacms/toolkit - use kebab-case for all file and folder names - use "@/" path alias - move from jest to vitest - move deeply nested files to a more flattened structure --- packages/@tinacms/scripts/src/index.ts | 5 + packages/@tinacms/toolkit/jest.config.js | 6 - packages/@tinacms/toolkit/package.json | 17 +- .../src/{packages => }/alerts/alerts.test.ts | 29 ++- .../src/{packages => }/alerts/alerts.ts | 6 +- .../src/{packages => }/alerts/index.ts | 6 - .../browser-storage/browser-storage-client.ts | 6 - .../get-flattened-form-values.ts | 8 +- .../{packages => }/browser-storage/index.ts | 4 - .../browser-storage/use-form-browser-cache.ts | 10 +- ...dicator.tsx => active-field-indicator.tsx} | 16 +- .../src/components/media/breadcrumb.tsx | 10 +- .../toolkit/src/components/media/index.ts | 6 - .../src/components/media/media-item.tsx | 7 +- .../src/components/media/media-manager.tsx | 21 +- .../toolkit/src/components/media/modal.tsx | 6 +- .../src/components/media/pagination.tsx | 8 +- ...MutationSignal.tsx => mutation-signal.tsx} | 5 - ...er.test.tsx => tina-cms-provider.test.tsx} | 13 +- ...aCMSProvider.tsx => tina-cms-provider.tsx} | 12 +- .../{TinaProvider.tsx => tina-provider.tsx} | 10 +- .../{TinaUI.test.tsx => tina-ui.test.tsx} | 13 +- .../components/{TinaUI.tsx => tina-ui.tsx} | 10 +- .../src/{packages => }/core/cms.test.ts | 6 - .../toolkit/src/{packages => }/core/cms.ts | 6 - .../toolkit/src/{packages => }/core/event.ts | 5 - .../src/{packages => }/core/events.test.ts | 21 +- .../toolkit/src/{packages => }/core/flags.ts | 4 - .../toolkit/src/{packages => }/core/index.ts | 6 - .../core/media-store.default.ts | 8 +- .../toolkit/src/{packages => }/core/media.ts | 6 - .../src/{packages => }/core/plugins.test.ts | 11 +- .../src/{packages => }/core/plugins.ts | 6 - .../{packages => }/core/subscribable.test.ts | 25 +-- .../src/{packages => }/core/subscribable.ts | 5 - .../core/types/react-frame-component.d.ts | 6 - .../components/button-toggle.tsx} | 6 - .../components/checkbox-group.tsx} | 6 - .../color-picker}/color-formatter.tsx | 6 - .../components/color-picker/color-picker.tsx} | 10 +- .../components/color-picker}/index.css | 0 .../fields/components/color-picker/index.ts | 1 + .../components/image-upload/image-upload.tsx} | 10 +- .../fields/components/image-upload/index.ts | 1 + .../toolkit/src/fields/components/index.ts | 12 ++ .../Input.tsx => fields/components/input.tsx} | 8 +- .../components/number-input.tsx} | 8 +- .../components/radio-group.tsx} | 6 - .../components/reference}/index.tsx | 12 +- .../components/reference/reference-link.tsx} | 8 +- .../reference/reference-select.tsx} | 14 +- .../components/select.tsx} | 8 +- .../components/text-field.tsx} | 6 - .../components/textarea.tsx} | 6 - .../components/toggle.tsx} | 8 +- .../src/{packages => }/fields/field-events.ts | 7 +- .../src/{packages => }/fields/index.ts | 8 +- .../block-selector-big.tsx} | 14 +- .../blocks-field-plugin/block-selector.tsx} | 12 +- .../plugins/blocks-field-plugin}/index.tsx | 26 +-- .../plugins/button-toggle-field-plugin.tsx} | 8 +- .../plugins/checkbox-group-field-plugin.tsx} | 8 +- .../plugins/color-field-plugin.tsx} | 4 +- .../plugins/date-field-plugin.css} | 0 .../plugins/date-field-plugin.tsx} | 6 +- .../plugins/date-format.ts} | 4 - .../plugins/field-props.ts} | 10 +- .../plugins/group-field-plugin.tsx} | 14 +- .../plugins/group-list-field-plugin.tsx} | 22 +- .../plugins/hidden-field-plugin.tsx} | 8 +- .../plugins/image-field-plugin.tsx} | 10 +- .../toolkit/src/fields/plugins/index.ts | 19 ++ .../plugins/list-field-meta.tsx} | 16 +- .../plugins/list-field-plugin.tsx} | 18 +- .../plugins/mdx-field-plugin}/index.tsx | 8 +- .../monaco/error-message.tsx | 5 - .../mdx-field-plugin}/monaco/index.tsx | 6 - .../mdx-field-plugin}/monaco/use-debounce.ts | 5 - .../plate/editor-context.tsx | 4 - .../plate/hooks/embed-hooks.ts | 8 +- .../plate/hooks/use-resize.ts | 6 - .../plugins/mdx-field-plugin}/plate/index.tsx | 4 - .../mdx-field-plugin}/plate/nested-form.tsx | 12 +- .../core/autoformat/autoformat-block.ts} | 10 +- .../core/autoformat/autoformat-lists.ts} | 15 +- .../core/autoformat/autoformat-marks.ts} | 6 - .../core/autoformat/autoformat-rules.ts | 9 + .../core/autoformat/autoformat-utils.ts} | 6 - .../plate/plugins/core/common.tsx | 4 - .../plate/plugins/core/formatting.tsx | 6 +- .../plate/plugins/core/index.tsx | 6 - .../core/with-correct-void-behavior.ts | 6 - .../plate/plugins/create-code-block/index.tsx | 5 - .../plugins/create-img-plugin/component.tsx | 6 +- .../plate/plugins/create-img-plugin/index.tsx | 8 +- .../create-invalid-markdown-plugin/index.tsx | 4 - .../plugins/create-link-plugin/index.tsx | 6 - .../plugins/create-mdx-plugins/component.tsx | 4 - .../plugins/create-mdx-plugins/index.tsx | 4 - .../soft-break/create-soft-break-plugin.tsx} | 5 +- .../plate/plugins/soft-break/index.ts | 7 + .../soft-break/on-key-down-soft-break.ts} | 5 +- .../plate/plugins/soft-break/types.ts | 3 - .../plate/plugins/ui/autocomplete.tsx | 5 - .../plate/plugins/ui/code-block/index.tsx | 7 - .../plate/plugins/ui/components.tsx | 6 - .../plate/plugins/ui/dropdown.tsx | 5 - .../plate/plugins/ui/helpers.tsx | 6 - .../plate/plugins/ui/icons.tsx | 4 - .../plugins/ui/toolbar/floating-toolbar.tsx | 6 - .../plate/plugins/ui/toolbar/index.tsx | 8 +- .../plugins/ui/toolbar/overflow-menu.tsx | 6 - .../plugins/ui/toolbar/resize-observer.d.ts | 6 - .../plate/plugins/ui/toolbar/toolbar-item.tsx | 8 +- .../plate/transforms/insert-empty-block.ts} | 6 - .../plugins/mdx-field-plugin}/plate/types.ts | 6 +- .../plugins/number-field-plugin.tsx} | 4 +- .../plugins/number-format.ts} | 6 - .../plugins/radio-group-field-plugin.tsx} | 2 +- .../plugins/reference-field-plugin.tsx} | 6 +- .../plugins/select-field-plugin.tsx} | 10 +- .../plugins/tags-field-plugin.tsx} | 14 +- .../plugins/text-field-plugin.tsx} | 10 +- .../plugins/text-format.test.ts} | 9 +- .../plugins/text-format.ts} | 6 - .../plugins/textarea-field-plugin.tsx} | 4 +- .../plugins/toggle-field-plugin.tsx} | 2 +- .../plugins/wrap-field-with-meta.tsx} | 14 +- .../form-builder/field-plugin.tsx | 12 +- .../form-builder/fields-builder.tsx | 10 +- .../form-actions.tsx} | 12 +- .../form-builder.tsx} | 14 +- .../form-legacy.tsx} | 8 +- .../form-portal.tsx} | 0 .../Form.tsx => form-builder/form.tsx} | 10 +- .../toolkit/src/form-builder/index.ts | 10 + .../loading-dots.css} | 0 .../loading-dots.tsx} | 10 +- .../reset-form.tsx} | 8 +- .../forms/content-creator-plugin.ts | 8 +- .../toolkit/src/{packages => }/forms/field.ts | 0 .../src/{packages => }/forms/form.test.ts | 26 +-- .../toolkit/src/{packages => }/forms/form.ts | 2 +- .../form.update-values.test.ts} | 8 +- .../toolkit/src/{packages => }/forms/index.ts | 6 - .../forms/types/react-frame-component.d.ts | 6 - .../{packages => }/git-client/git-client.ts | 6 - .../src/{packages => }/git-client/git-file.ts | 7 +- .../git-client/git-media-store.ts | 7 +- .../src/{packages => }/git-client/index.ts | 6 - .../{packages => }/git-client/use-git-file.ts | 7 +- .../toolkit/src/hooks/use-field-reference.ts | 8 +- .../toolkit/src/hooks/use-local-storage.ts | 4 - .../toolkit/src/{packages => }/icons/Add.tsx | 0 .../src/{packages => }/icons/Alert.tsx | 0 .../src/{packages => }/icons/AlignCenter.tsx | 0 .../src/{packages => }/icons/AlignLeft.tsx | 0 .../src/{packages => }/icons/AlignRight.tsx | 0 .../toolkit/src/{packages => }/icons/Bold.tsx | 0 .../src/{packages => }/icons/ChevronDown.tsx | 0 .../src/{packages => }/icons/ChevronLeft.tsx | 0 .../src/{packages => }/icons/ChevronRight.tsx | 0 .../src/{packages => }/icons/ChevronUp.tsx | 0 .../src/{packages => }/icons/Circle.tsx | 0 .../src/{packages => }/icons/CircleCheck.tsx | 0 .../src/{packages => }/icons/Close.tsx | 0 .../toolkit/src/{packages => }/icons/Code.tsx | 0 .../toolkit/src/{packages => }/icons/Drag.tsx | 0 .../src/{packages => }/icons/Duplicate.tsx | 0 .../toolkit/src/{packages => }/icons/Edit.tsx | 0 .../{packages => }/icons/EllipsisVertical.tsx | 0 .../src/{packages => }/icons/Error.tsx | 0 .../toolkit/src/{packages => }/icons/Exit.tsx | 0 .../toolkit/src/{packages => }/icons/File.tsx | 0 .../src/{packages => }/icons/Folder.tsx | 0 .../src/{packages => }/icons/Hamburger.tsx | 0 .../src/{packages => }/icons/Heading.tsx | 0 .../toolkit/src/{packages => }/icons/Info.tsx | 0 .../src/{packages => }/icons/Italic.tsx | 0 .../src/{packages => }/icons/LeftArrow.tsx | 0 .../toolkit/src/{packages => }/icons/Link.tsx | 0 .../toolkit/src/{packages => }/icons/Lock.tsx | 0 .../src/{packages => }/icons/Markdown.tsx | 0 .../src/{packages => }/icons/Media.tsx | 0 .../src/{packages => }/icons/OrderedList.tsx | 0 .../src/{packages => }/icons/PullRequest.tsx | 0 .../src/{packages => }/icons/Quote.tsx | 0 .../toolkit/src/{packages => }/icons/Redo.tsx | 0 .../src/{packages => }/icons/Reorder.tsx | 0 .../src/{packages => }/icons/ReorderRow.tsx | 0 .../src/{packages => }/icons/Reset.tsx | 0 .../src/{packages => }/icons/RightArrow.tsx | 0 .../src/{packages => }/icons/Settings.tsx | 0 .../{packages => }/icons/Strikethrough.tsx | 0 .../src/{packages => }/icons/Table.tsx | 0 .../toolkit/src/{packages => }/icons/Tina.tsx | 0 .../src/{packages => }/icons/Trash.tsx | 0 .../src/{packages => }/icons/Underline.tsx | 0 .../toolkit/src/{packages => }/icons/Undo.tsx | 0 .../{packages => }/icons/UnorderedList.tsx | 0 .../src/{packages => }/icons/Upload.tsx | 0 .../src/{packages => }/icons/Warning.tsx | 0 .../toolkit/src/{packages => }/icons/index.ts | 0 packages/@tinacms/toolkit/src/index.ts | 61 +++--- .../fields/components/ColorPicker/index.ts | 7 - .../fields/components/ImageUpload/index.ts | 7 - .../src/packages/fields/components/index.ts | 18 -- .../core/autoformat/autoformatRules.ts | 15 -- .../plate/plugins/soft-break/index.ts | 10 - .../fields/plugins/dateFormat.test.ts | 78 ------- .../src/packages/fields/plugins/index.ts | 25 --- .../src/packages/form-builder/index.ts | 16 -- .../src/packages/react-alerts/index.ts | 7 - .../src/packages/react-dismissible/index.ts | 7 - .../toolkit/src/packages/react-forms/index.ts | 7 - .../src/packages/react-modals/Modal/index.ts | 10 - .../src/packages/react-modals/index.ts | 10 - .../react-sidebar/components/Sidebar.test.tsx | 67 ------ .../src/packages/react-sidebar/index.ts | 11 - .../src/packages/styles/FontLoader.tsx | 42 ---- .../toolkit/src/packages/styles/index.ts | 10 - .../README.md | 4 +- .../branch-banner.tsx} | 8 +- .../branch-button.tsx} | 6 +- .../branch-data.tsx} | 5 +- .../branch-modal.tsx} | 13 +- .../branch-switcher-legacy.tsx} | 10 +- .../branch-switcher.test.tsx} | 3 +- .../branch-switcher.tsx} | 13 +- .../src/plugin-branch-switcher/index.ts | 6 + .../plugin.tsx | 4 +- .../types.ts | 0 .../fields => plugin-fields}/index.ts | 8 +- .../fields => plugin-fields}/markdown.tsx | 7 +- .../form-meta => plugin-form-meta}/index.tsx | 6 +- .../screens => plugin-screens}/index.tsx | 8 +- .../media-manager-screen.tsx | 10 +- .../src/plugins/branch-switcher/index.ts | 9 - .../alerts.test.tsx} | 16 +- .../Alerts.tsx => react-alerts/alerts.tsx} | 12 +- .../toolkit/src/react-alerts/index.ts | 1 + .../cloud-config-plugin.tsx | 8 +- .../react-cloud-config/index.ts | 6 - .../use-cloud-config-plugin.tsx | 7 +- .../src/{packages => }/react-core/index.ts | 6 - .../react-core/tina-error-boundary.tsx | 6 - .../react-core/use-cms-event.ts | 8 +- .../src/{packages => }/react-core/use-cms.ts | 4 +- .../src/{packages => }/react-core/use-form.ts | 8 +- .../{packages => }/react-core/use-plugin.tsx | 8 +- .../react-core/use-subscribable.tsx | 6 - .../react-core/use-watch-form-values.ts | 8 +- .../{packages => }/react-core/with-plugin.tsx | 8 +- .../react-datetime/DateTime.jsx | 4 - .../react-datetime/parts/ViewNavigation.jsx | 0 .../react-datetime/views/DaysView.jsx | 0 .../react-datetime/views/MonthsView.jsx | 0 .../react-datetime/views/TimeView.jsx | 0 .../react-datetime/views/YearsView.jsx | 0 .../dismissible.tsx} | 6 - .../toolkit/src/react-dismissible/index.ts | 1 + .../form-modal.tsx} | 12 +- .../@tinacms/toolkit/src/react-forms/index.ts | 1 + .../fullscreen-modal.tsx} | 6 - .../toolkit/src/react-modals/index.ts | 4 + .../modal-provider.tsx} | 6 - .../toolkit/src/react-modals/modal/index.ts | 5 + .../modal/modal-actions.tsx} | 5 - .../modal/modal-body.tsx} | 6 - .../modal/modal-header.tsx} | 8 +- .../modal/modal-overlay.tsx} | 5 - .../modal/modal.tsx} | 10 +- .../popup-modal.tsx} | 6 - .../components/screen-plugin-modal.tsx | 8 +- .../src/{packages => }/react-screens/index.ts | 6 - .../react-screens/screen-plugin.tsx | 8 +- .../react-screens/use-screen-plugin.tsx | 7 +- .../components/form-list.tsx} | 4 +- .../components/local-warning.tsx} | 8 +- .../components/nav.tsx} | 19 +- .../components/no-forms-placeholder.tsx} | 4 +- .../components/resize-handle.tsx} | 2 +- .../components/sidebar-body.tsx} | 23 +-- .../components/sidebar.tsx} | 20 +- .../components/sync-status.tsx} | 11 +- .../toolkit/src/react-sidebar/index.ts | 5 + .../{packages => }/react-sidebar/sidebar.ts | 8 +- .../toolkit/src/react-tinacms/index.ts | 12 +- .../toolkit/src/react-tinacms/use-cms.ts | 12 +- .../toolkit/src/react-tinacms/use-form.ts | 22 +- .../toolkit/src/react-tinacms/use-plugin.tsx | 8 +- .../src/react-tinacms/use-subscribable.tsx | 8 +- .../react-tinacms/use-watch-form-values.ts | 8 +- .../toolkit/src/react-tinacms/with-plugin.tsx | 8 +- .../toolkit/src/react-tinacms/with-tina.tsx | 10 +- .../styles/Button.tsx => styles/button.tsx} | 5 - .../Container.tsx => styles/container.tsx} | 5 - .../toolkit/src/styles/font-loader.tsx | 24 +++ packages/@tinacms/toolkit/src/styles/index.ts | 4 + .../styles/Message.tsx => styles/message.tsx} | 0 .../overflow-menu.tsx} | 0 packages/@tinacms/toolkit/src/tina-cms.ts | 22 +- packages/@tinacms/toolkit/tsconfig.json | 6 +- packages/@tinacms/toolkit/vitest.config.ts | 15 ++ .../tinacms/src/admin/components/Sidebar.tsx | 2 +- pnpm-lock.yaml | 195 ++++++++++++++---- 306 files changed, 693 insertions(+), 1774 deletions(-) delete mode 100644 packages/@tinacms/toolkit/jest.config.js rename packages/@tinacms/toolkit/src/{packages => }/alerts/alerts.test.ts (89%) rename packages/@tinacms/toolkit/src/{packages => }/alerts/alerts.ts (97%) rename packages/@tinacms/toolkit/src/{packages => }/alerts/index.ts (69%) rename packages/@tinacms/toolkit/src/{packages => }/browser-storage/browser-storage-client.ts (98%) rename packages/@tinacms/toolkit/src/{packages => }/browser-storage/get-flattened-form-values.ts (86%) rename packages/@tinacms/toolkit/src/{packages => }/browser-storage/index.ts (90%) rename packages/@tinacms/toolkit/src/{packages => }/browser-storage/use-form-browser-cache.ts (85%) rename packages/@tinacms/toolkit/src/components/{ActiveFieldIndicator.tsx => active-field-indicator.tsx} (94%) rename packages/@tinacms/toolkit/src/components/{MutationSignal.tsx => mutation-signal.tsx} (98%) rename packages/@tinacms/toolkit/src/components/{TinaCMSProvider.test.tsx => tina-cms-provider.test.tsx} (79%) rename packages/@tinacms/toolkit/src/components/{TinaCMSProvider.tsx => tina-cms-provider.tsx} (78%) rename packages/@tinacms/toolkit/src/components/{TinaProvider.tsx => tina-provider.tsx} (81%) rename packages/@tinacms/toolkit/src/components/{TinaUI.test.tsx => tina-ui.test.tsx} (95%) rename packages/@tinacms/toolkit/src/components/{TinaUI.tsx => tina-ui.tsx} (82%) rename packages/@tinacms/toolkit/src/{packages => }/core/cms.test.ts (99%) rename packages/@tinacms/toolkit/src/{packages => }/core/cms.ts (99%) rename packages/@tinacms/toolkit/src/{packages => }/core/event.ts (99%) rename packages/@tinacms/toolkit/src/{packages => }/core/events.test.ts (93%) rename packages/@tinacms/toolkit/src/{packages => }/core/flags.ts (97%) rename packages/@tinacms/toolkit/src/{packages => }/core/index.ts (94%) rename packages/@tinacms/toolkit/src/{packages => }/core/media-store.default.ts (99%) rename packages/@tinacms/toolkit/src/{packages => }/core/media.ts (99%) rename packages/@tinacms/toolkit/src/{packages => }/core/plugins.test.ts (91%) rename packages/@tinacms/toolkit/src/{packages => }/core/plugins.ts (99%) rename packages/@tinacms/toolkit/src/{packages => }/core/subscribable.test.ts (87%) rename packages/@tinacms/toolkit/src/{packages => }/core/subscribable.ts (99%) rename packages/@tinacms/toolkit/src/{packages => }/core/types/react-frame-component.d.ts (78%) rename packages/@tinacms/toolkit/src/{packages/fields/components/ButtonToggle.tsx => fields/components/button-toggle.tsx} (99%) rename packages/@tinacms/toolkit/src/{packages/fields/components/CheckboxGroup.tsx => fields/components/checkbox-group.tsx} (99%) rename packages/@tinacms/toolkit/src/{packages/fields/components/ColorPicker => fields/components/color-picker}/color-formatter.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/components/ColorPicker/ColorPicker.tsx => fields/components/color-picker/color-picker.tsx} (98%) rename packages/@tinacms/toolkit/src/{packages/fields/components/ColorPicker => fields/components/color-picker}/index.css (100%) create mode 100644 packages/@tinacms/toolkit/src/fields/components/color-picker/index.ts rename packages/@tinacms/toolkit/src/{packages/fields/components/ImageUpload/ImageUpload.tsx => fields/components/image-upload/image-upload.tsx} (93%) create mode 100644 packages/@tinacms/toolkit/src/fields/components/image-upload/index.ts create mode 100644 packages/@tinacms/toolkit/src/fields/components/index.ts rename packages/@tinacms/toolkit/src/{packages/fields/components/Input.tsx => fields/components/input.tsx} (81%) rename packages/@tinacms/toolkit/src/{packages/fields/components/NumberInput.tsx => fields/components/number-input.tsx} (89%) rename packages/@tinacms/toolkit/src/{packages/fields/components/RadioGroup.tsx => fields/components/radio-group.tsx} (99%) rename packages/@tinacms/toolkit/src/{packages/fields/components/Reference => fields/components/reference}/index.tsx (80%) rename packages/@tinacms/toolkit/src/{packages/fields/components/Reference/ReferenceLink.tsx => fields/components/reference/reference-link.tsx} (97%) rename packages/@tinacms/toolkit/src/{packages/fields/components/Reference/ReferenceSelect.tsx => fields/components/reference/reference-select.tsx} (94%) rename packages/@tinacms/toolkit/src/{packages/fields/components/Select.tsx => fields/components/select.tsx} (97%) rename packages/@tinacms/toolkit/src/{packages/fields/components/TextField.tsx => fields/components/text-field.tsx} (98%) rename packages/@tinacms/toolkit/src/{packages/fields/components/TextArea.tsx => fields/components/textarea.tsx} (98%) rename packages/@tinacms/toolkit/src/{packages/fields/components/Toggle.tsx => fields/components/toggle.tsx} (98%) rename packages/@tinacms/toolkit/src/{packages => }/fields/field-events.ts (81%) rename packages/@tinacms/toolkit/src/{packages => }/fields/index.ts (62%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/BlocksFieldPlugin/BlockSelectorBig.tsx => fields/plugins/blocks-field-plugin/block-selector-big.tsx} (98%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/BlocksFieldPlugin/BlockSelector.tsx => fields/plugins/blocks-field-plugin/block-selector.tsx} (96%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/BlocksFieldPlugin => fields/plugins/blocks-field-plugin}/index.tsx (94%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/ButtonToggleFieldPlugin.tsx => fields/plugins/button-toggle-field-plugin.tsx} (75%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/CheckboxGroupFieldPlugin.tsx => fields/plugins/checkbox-group-field-plugin.tsx} (84%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/ColorFieldPlugin.tsx => fields/plugins/color-field-plugin.tsx} (87%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/DateFieldPlugin.css => fields/plugins/date-field-plugin.css} (100%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/DateFieldPlugin.tsx => fields/plugins/date-field-plugin.tsx} (95%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/dateFormat.ts => fields/plugins/date-format.ts} (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/fieldProps.ts => fields/plugins/field-props.ts} (54%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/GroupFieldPlugin.tsx => fields/plugins/group-field-plugin.tsx} (95%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/GroupListFieldPlugin.tsx => fields/plugins/group-list-field-plugin.tsx} (95%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/HiddenFieldPlugin.tsx => fields/plugins/hidden-field-plugin.tsx} (78%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/ImageFieldPlugin.tsx => fields/plugins/image-field-plugin.tsx} (94%) create mode 100644 packages/@tinacms/toolkit/src/fields/plugins/index.ts rename packages/@tinacms/toolkit/src/{packages/fields/plugins/ListFieldMeta.tsx => fields/plugins/list-field-meta.tsx} (94%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/ListFieldPlugin.tsx => fields/plugins/list-field-plugin.tsx} (94%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/index.tsx (97%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/monaco/error-message.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/monaco/index.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/monaco/use-debounce.ts (98%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/editor-context.tsx (98%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/hooks/embed-hooks.ts (95%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/hooks/use-resize.ts (97%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/index.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/nested-form.tsx (82%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatBlocks.ts => fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-block.ts} (95%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatLists.ts => fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-lists.ts} (79%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatMarks.ts => fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-marks.ts} (97%) create mode 100644 packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-rules.ts rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatUtils.ts => fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-utils.ts} (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/core/common.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/core/formatting.tsx (97%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/core/index.tsx (91%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/core/with-correct-void-behavior.ts (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/create-code-block/index.tsx (97%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/create-img-plugin/component.tsx (97%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/create-img-plugin/index.tsx (88%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/create-invalid-markdown-plugin/index.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/create-link-plugin/index.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/create-mdx-plugins/component.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/create-mdx-plugins/index.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/createSoftBreakPlugin.tsx => fields/plugins/mdx-field-plugin/plate/plugins/soft-break/create-soft-break-plugin.tsx} (92%) create mode 100644 packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/index.ts rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/onKeyDownSoftBreak.ts => fields/plugins/mdx-field-plugin/plate/plugins/soft-break/on-key-down-soft-break.ts} (91%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/soft-break/types.ts (97%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/autocomplete.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/code-block/index.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/components.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/dropdown.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/helpers.tsx (96%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/icons.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/toolbar/floating-toolbar.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/toolbar/index.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/toolbar/overflow-menu.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/toolbar/resize-observer.d.ts (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/plugins/ui/toolbar/toolbar-item.tsx (99%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin/plate/transforms/insertEmptyBlock.ts => fields/plugins/mdx-field-plugin/plate/transforms/insert-empty-block.ts} (98%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/MdxFieldPlugin => fields/plugins/mdx-field-plugin}/plate/types.ts (70%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/NumberFieldPlugin.tsx => fields/plugins/number-field-plugin.tsx} (84%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/numberFormat.ts => fields/plugins/number-format.ts} (83%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/RadioGroupFieldPlugin.tsx => fields/plugins/radio-group-field-plugin.tsx} (84%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/ReferenceFieldPlugin.tsx => fields/plugins/reference-field-plugin.tsx} (66%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/SelectFieldPlugin.tsx => fields/plugins/select-field-plugin.tsx} (76%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/TagsFieldPlugin.tsx => fields/plugins/tags-field-plugin.tsx} (94%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/TextFieldPlugin.tsx => fields/plugins/text-field-plugin.tsx} (89%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/textFormat.test.ts => fields/plugins/text-format.test.ts} (81%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/textFormat.ts => fields/plugins/text-format.ts} (82%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/TextareaFieldPlugin.tsx => fields/plugins/textarea-field-plugin.tsx} (89%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/ToggleFieldPlugin.tsx => fields/plugins/toggle-field-plugin.tsx} (85%) rename packages/@tinacms/toolkit/src/{packages/fields/plugins/wrapFieldWithMeta.tsx => fields/plugins/wrap-field-with-meta.tsx} (95%) rename packages/@tinacms/toolkit/src/{packages => }/form-builder/field-plugin.tsx (70%) rename packages/@tinacms/toolkit/src/{packages => }/form-builder/fields-builder.tsx (97%) rename packages/@tinacms/toolkit/src/{packages/form-builder/FormActions.tsx => form-builder/form-actions.tsx} (93%) rename packages/@tinacms/toolkit/src/{packages/form-builder/FormBuilder.tsx => form-builder/form-builder.tsx} (97%) rename packages/@tinacms/toolkit/src/{packages/form-builder/FormLegacy.tsx => form-builder/form-legacy.tsx} (95%) rename packages/@tinacms/toolkit/src/{packages/form-builder/FormPortal.tsx => form-builder/form-portal.tsx} (100%) rename packages/@tinacms/toolkit/src/{packages/form-builder/Form.tsx => form-builder/form.tsx} (94%) create mode 100644 packages/@tinacms/toolkit/src/form-builder/index.ts rename packages/@tinacms/toolkit/src/{packages/form-builder/LoadingDots.css => form-builder/loading-dots.css} (100%) rename packages/@tinacms/toolkit/src/{packages/form-builder/LoadingDots.tsx => form-builder/loading-dots.tsx} (90%) rename packages/@tinacms/toolkit/src/{packages/form-builder/ResetForm.tsx => form-builder/reset-form.tsx} (96%) rename packages/@tinacms/toolkit/src/{packages => }/forms/content-creator-plugin.ts (89%) rename packages/@tinacms/toolkit/src/{packages => }/forms/field.ts (100%) rename packages/@tinacms/toolkit/src/{packages => }/forms/form.test.ts (93%) rename packages/@tinacms/toolkit/src/{packages => }/forms/form.ts (99%) rename packages/@tinacms/toolkit/src/{packages/forms/form.updateValues.test.ts => forms/form.update-values.test.ts} (99%) rename packages/@tinacms/toolkit/src/{packages => }/forms/index.ts (93%) rename packages/@tinacms/toolkit/src/{packages => }/forms/types/react-frame-component.d.ts (78%) rename packages/@tinacms/toolkit/src/{packages => }/git-client/git-client.ts (99%) rename packages/@tinacms/toolkit/src/{packages => }/git-client/git-file.ts (95%) rename packages/@tinacms/toolkit/src/{packages => }/git-client/git-media-store.ts (98%) rename packages/@tinacms/toolkit/src/{packages => }/git-client/index.ts (91%) rename packages/@tinacms/toolkit/src/{packages => }/git-client/use-git-file.ts (87%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Add.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Alert.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/AlignCenter.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/AlignLeft.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/AlignRight.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Bold.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/ChevronDown.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/ChevronLeft.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/ChevronRight.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/ChevronUp.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Circle.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/CircleCheck.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Close.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Code.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Drag.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Duplicate.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Edit.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/EllipsisVertical.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Error.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Exit.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/File.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Folder.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Hamburger.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Heading.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Info.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Italic.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/LeftArrow.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Link.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Lock.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Markdown.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Media.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/OrderedList.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/PullRequest.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Quote.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Redo.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Reorder.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/ReorderRow.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Reset.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/RightArrow.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Settings.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Strikethrough.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Table.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Tina.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Trash.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Underline.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Undo.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/UnorderedList.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Upload.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/Warning.tsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/icons/index.ts (100%) delete mode 100644 packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/fields/components/ImageUpload/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/fields/components/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatRules.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/fields/plugins/dateFormat.test.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/fields/plugins/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/form-builder/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/react-alerts/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/react-dismissible/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/react-forms/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/react-modals/Modal/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/react-modals/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/react-sidebar/components/Sidebar.test.tsx delete mode 100644 packages/@tinacms/toolkit/src/packages/react-sidebar/index.ts delete mode 100644 packages/@tinacms/toolkit/src/packages/styles/FontLoader.tsx delete mode 100644 packages/@tinacms/toolkit/src/packages/styles/index.ts rename packages/@tinacms/toolkit/src/{plugins/branch-switcher => plugin-branch-switcher}/README.md (87%) rename packages/@tinacms/toolkit/src/{plugins/branch-switcher/BranchBanner.tsx => plugin-branch-switcher/branch-banner.tsx} (92%) rename packages/@tinacms/toolkit/src/{plugins/branch-switcher/BranchButton.tsx => plugin-branch-switcher/branch-button.tsx} (92%) rename packages/@tinacms/toolkit/src/{plugins/branch-switcher/BranchData.tsx => plugin-branch-switcher/branch-data.tsx} (93%) rename packages/@tinacms/toolkit/src/{plugins/branch-switcher/BranchModal.tsx => plugin-branch-switcher/branch-modal.tsx} (77%) rename packages/@tinacms/toolkit/src/{plugins/branch-switcher/BranchSwitcherLegecy.tsx => plugin-branch-switcher/branch-switcher-legacy.tsx} (97%) rename packages/@tinacms/toolkit/src/{plugins/branch-switcher/BranchSwitcher.test.tsx => plugin-branch-switcher/branch-switcher.test.tsx} (95%) rename packages/@tinacms/toolkit/src/{plugins/branch-switcher/BranchSwitcher.tsx => plugin-branch-switcher/branch-switcher.tsx} (98%) create mode 100644 packages/@tinacms/toolkit/src/plugin-branch-switcher/index.ts rename packages/@tinacms/toolkit/src/{plugins/branch-switcher => plugin-branch-switcher}/plugin.tsx (88%) rename packages/@tinacms/toolkit/src/{plugins/branch-switcher => plugin-branch-switcher}/types.ts (100%) rename packages/@tinacms/toolkit/src/{plugins/fields => plugin-fields}/index.ts (87%) rename packages/@tinacms/toolkit/src/{plugins/fields => plugin-fields}/markdown.tsx (95%) rename packages/@tinacms/toolkit/src/{plugins/form-meta => plugin-form-meta}/index.tsx (79%) rename packages/@tinacms/toolkit/src/{plugins/screens => plugin-screens}/index.tsx (78%) rename packages/@tinacms/toolkit/src/{plugins/screens => plugin-screens}/media-manager-screen.tsx (65%) delete mode 100644 packages/@tinacms/toolkit/src/plugins/branch-switcher/index.ts rename packages/@tinacms/toolkit/src/{packages/react-alerts/Alerts.test.tsx => react-alerts/alerts.test.tsx} (85%) rename packages/@tinacms/toolkit/src/{packages/react-alerts/Alerts.tsx => react-alerts/alerts.tsx} (95%) create mode 100644 packages/@tinacms/toolkit/src/react-alerts/index.ts rename packages/@tinacms/toolkit/src/{packages => }/react-cloud-config/cloud-config-plugin.tsx (95%) rename packages/@tinacms/toolkit/src/{packages => }/react-cloud-config/index.ts (87%) rename packages/@tinacms/toolkit/src/{packages => }/react-cloud-config/use-cloud-config-plugin.tsx (86%) rename packages/@tinacms/toolkit/src/{packages => }/react-core/index.ts (95%) rename packages/@tinacms/toolkit/src/{packages => }/react-core/tina-error-boundary.tsx (98%) rename packages/@tinacms/toolkit/src/{packages => }/react-core/use-cms-event.ts (92%) rename packages/@tinacms/toolkit/src/{packages => }/react-core/use-cms.ts (88%) rename packages/@tinacms/toolkit/src/{packages => }/react-core/use-form.ts (98%) rename packages/@tinacms/toolkit/src/{packages => }/react-core/use-plugin.tsx (94%) rename packages/@tinacms/toolkit/src/{packages => }/react-core/use-subscribable.tsx (97%) rename packages/@tinacms/toolkit/src/{packages => }/react-core/use-watch-form-values.ts (93%) rename packages/@tinacms/toolkit/src/{packages => }/react-core/with-plugin.tsx (93%) rename packages/@tinacms/toolkit/src/{packages => }/react-datetime/DateTime.jsx (99%) rename packages/@tinacms/toolkit/src/{packages => }/react-datetime/parts/ViewNavigation.jsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/react-datetime/views/DaysView.jsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/react-datetime/views/MonthsView.jsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/react-datetime/views/TimeView.jsx (100%) rename packages/@tinacms/toolkit/src/{packages => }/react-datetime/views/YearsView.jsx (100%) rename packages/@tinacms/toolkit/src/{packages/react-dismissible/Dismissible.tsx => react-dismissible/dismissible.tsx} (99%) create mode 100644 packages/@tinacms/toolkit/src/react-dismissible/index.ts rename packages/@tinacms/toolkit/src/{packages/react-forms/FormModal.tsx => react-forms/form-modal.tsx} (83%) create mode 100644 packages/@tinacms/toolkit/src/react-forms/index.ts rename packages/@tinacms/toolkit/src/{packages/react-modals/FullscreenModal.tsx => react-modals/fullscreen-modal.tsx} (97%) create mode 100644 packages/@tinacms/toolkit/src/react-modals/index.ts rename packages/@tinacms/toolkit/src/{packages/react-modals/ModalProvider.tsx => react-modals/modal-provider.tsx} (98%) create mode 100644 packages/@tinacms/toolkit/src/react-modals/modal/index.ts rename packages/@tinacms/toolkit/src/{packages/react-modals/Modal/ModalActions.tsx => react-modals/modal/modal-actions.tsx} (95%) rename packages/@tinacms/toolkit/src/{packages/react-modals/Modal/ModalBody.tsx => react-modals/modal/modal-body.tsx} (96%) rename packages/@tinacms/toolkit/src/{packages/react-modals/Modal/ModalHeader.tsx => react-modals/modal/modal-header.tsx} (94%) rename packages/@tinacms/toolkit/src/{packages/react-modals/Modal/ModalOverlay.tsx => react-modals/modal/modal-overlay.tsx} (96%) rename packages/@tinacms/toolkit/src/{packages/react-modals/Modal/Modal.tsx => react-modals/modal/modal.tsx} (79%) rename packages/@tinacms/toolkit/src/{packages/react-modals/PopupModal.tsx => react-modals/popup-modal.tsx} (97%) rename packages/@tinacms/toolkit/src/{packages => }/react-screens/components/screen-plugin-modal.tsx (96%) rename packages/@tinacms/toolkit/src/{packages => }/react-screens/index.ts (91%) rename packages/@tinacms/toolkit/src/{packages => }/react-screens/screen-plugin.tsx (96%) rename packages/@tinacms/toolkit/src/{packages => }/react-screens/use-screen-plugin.tsx (84%) rename packages/@tinacms/toolkit/src/{packages/react-sidebar/components/FormList.tsx => react-sidebar/components/form-list.tsx} (98%) rename packages/@tinacms/toolkit/src/{packages/react-sidebar/components/LocalWarning.tsx => react-sidebar/components/local-warning.tsx} (97%) rename packages/@tinacms/toolkit/src/{packages/react-sidebar/components/Nav.tsx => react-sidebar/components/nav.tsx} (96%) rename packages/@tinacms/toolkit/src/{packages/react-sidebar/components/NoFormsPlaceHolder.tsx => react-sidebar/components/no-forms-placeholder.tsx} (94%) rename packages/@tinacms/toolkit/src/{packages/react-sidebar/components/ResizeHandle.tsx => react-sidebar/components/resize-handle.tsx} (97%) rename packages/@tinacms/toolkit/src/{packages/react-sidebar/components/SidebarBody.tsx => react-sidebar/components/sidebar-body.tsx} (90%) rename packages/@tinacms/toolkit/src/{packages/react-sidebar/components/Sidebar.tsx => react-sidebar/components/sidebar.tsx} (97%) rename packages/@tinacms/toolkit/src/{packages/react-sidebar/components/SyncStatus.tsx => react-sidebar/components/sync-status.tsx} (97%) create mode 100644 packages/@tinacms/toolkit/src/react-sidebar/index.ts rename packages/@tinacms/toolkit/src/{packages => }/react-sidebar/sidebar.ts (95%) rename packages/@tinacms/toolkit/src/{packages/styles/Button.tsx => styles/button.tsx} (99%) rename packages/@tinacms/toolkit/src/{packages/styles/Container.tsx => styles/container.tsx} (97%) create mode 100644 packages/@tinacms/toolkit/src/styles/font-loader.tsx create mode 100644 packages/@tinacms/toolkit/src/styles/index.ts rename packages/@tinacms/toolkit/src/{packages/styles/Message.tsx => styles/message.tsx} (100%) rename packages/@tinacms/toolkit/src/{packages/styles/OverflowMenu.tsx => styles/overflow-menu.tsx} (100%) create mode 100644 packages/@tinacms/toolkit/vitest.config.ts diff --git a/packages/@tinacms/scripts/src/index.ts b/packages/@tinacms/scripts/src/index.ts index 087ae18247..1704cd9531 100644 --- a/packages/@tinacms/scripts/src/index.ts +++ b/packages/@tinacms/scripts/src/index.ts @@ -591,6 +591,11 @@ export const buildIt = async (entryPoint, packageJSON) => { }, }, ], + resolve: { + alias: { + '@': path.resolve(process.cwd(), 'src'), + }, + }, build: { minify: false, assetsInlineLimit: 0, diff --git a/packages/@tinacms/toolkit/jest.config.js b/packages/@tinacms/toolkit/jest.config.js deleted file mode 100644 index 9f9a89c2a7..0000000000 --- a/packages/@tinacms/toolkit/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -/** - -*/ - -const mod = require('@tinacms/scripts/dist/jest-runner.js') -module.exports = mod.default.config diff --git a/packages/@tinacms/toolkit/package.json b/packages/@tinacms/toolkit/package.json index 91e22fcb69..038b79008d 100644 --- a/packages/@tinacms/toolkit/package.json +++ b/packages/@tinacms/toolkit/package.json @@ -30,16 +30,15 @@ }, "license": "Apache-2.0", "scripts": { - "types": "pnpm tsc", + "types": "pnpm tsc && pnpm tsc-alias", "build": "tinacms-scripts build", - "test": "jest --env=jsdom --passWithNoTests", - "test-watch": "jest --watch --env=jsdom --passWithNoTests" + "test": "vitest" }, "devDependencies": { + "@testing-library/dom": "^7.21.4 ", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^12.0.0", "@testing-library/user-event": "^12.7.0", - "@testing-library/dom": "^7.21.4 ", "@tinacms/scripts": "workspace:*", "@types/atob": "^2.1.2", "@types/codemirror": "^0.0.71", @@ -54,12 +53,12 @@ "@types/react-dom": "^17.0.9", "@types/react-select": "^2.0.11", "@types/storybook__react": "^4.0.2", - "jest": "^29.5.0", - "jest-environment-jsdom": "^29.5.0", + "happy-dom": "^10.5.2", "react": "17.0.2", "react-dom": "17.0.2", "tslib": "^2.3.0", - "typescript": "4.3.5" + "typescript": "4.3.5", + "vitest": "^0.32.2" }, "dependencies": { "@floating-ui/dom": "^1.4.4", @@ -76,7 +75,6 @@ "@tinacms/search": "workspace:*", "@tinacms/sharedctx": "workspace:*", "@udecode/plate-headless": "^21.4.0", - "react-textarea-autosize": "8.5.2", "atob": "2.1.2", "color-string": "^1.5.3", "date-fns": "2.30.0", @@ -97,11 +95,14 @@ "react-final-form": "^6.3.0", "react-icons": "^4.3.1", "react-onclickoutside": "^6.13.0", + "react-textarea-autosize": "8.5.2", "scheduler": "0.19.0", "slate": "^0.94.1", "slate-history": "^0.93.0", "slate-hyperscript": "^0.77.0", "slate-react": "^0.97.1", + "tsc-alias": "^1.8.7", + "vite": "^4.3.9", "webfontloader": "1.6.28" }, "peerDependencies": { diff --git a/packages/@tinacms/toolkit/src/packages/alerts/alerts.test.ts b/packages/@tinacms/toolkit/src/alerts/alerts.test.ts similarity index 89% rename from packages/@tinacms/toolkit/src/packages/alerts/alerts.test.ts rename to packages/@tinacms/toolkit/src/alerts/alerts.test.ts index 4a3a19f3ae..5376712394 100644 --- a/packages/@tinacms/toolkit/src/packages/alerts/alerts.test.ts +++ b/packages/@tinacms/toolkit/src/alerts/alerts.test.ts @@ -1,11 +1,8 @@ -/** - -*/ - import { Alerts } from './alerts' -import { EventBus } from '../core' +import { EventBus } from '@/core' +import { describe, it, vi } from 'vitest' -jest.useFakeTimers() +vi.useFakeTimers() const events = new EventBus() @@ -36,7 +33,7 @@ describe('Alerts', () => { const alerts = new Alerts(events) alerts.info('Test') - jest.runOnlyPendingTimers() + vi.runOnlyPendingTimers() expect(setTimeout).toHaveBeenCalledWith(expect.any(Function), 3000) expect(alerts.all).toHaveLength(0) @@ -48,7 +45,7 @@ describe('Alerts', () => { alerts.info('Test', 1351) - jest.runOnlyPendingTimers() + vi.runOnlyPendingTimers() expect(setTimeout).toHaveBeenCalledWith(expect.any(Function), 1351) expect(alerts.all).toHaveLength(0) }) @@ -59,7 +56,7 @@ describe('Alerts', () => { dismiss() - jest.runOnlyPendingTimers() + vi.runOnlyPendingTimers() expect(alerts.all).toHaveLength(0) }) }) @@ -67,7 +64,7 @@ describe('Alerts', () => { describe('#subscribe(listener)', () => { it('does not call listener', () => { - const listener = jest.fn() + const listener = vi.fn() const alerts = new Alerts(events) alerts.subscribe(listener) @@ -75,7 +72,7 @@ describe('Alerts', () => { expect(listener).not.toHaveBeenCalled() }) it('listener is called after `add` is called', () => { - const listener = jest.fn() + const listener = vi.fn() const alerts = new Alerts(events) alerts.subscribe(listener) @@ -84,7 +81,7 @@ describe('Alerts', () => { expect(listener).toHaveBeenCalled() }) it('listener is called after `dismiss` is called', () => { - const listener = jest.fn() + const listener = vi.fn() const alerts = new Alerts(events) const dismiss = alerts.info('Test') alerts.subscribe(listener) @@ -97,7 +94,7 @@ describe('Alerts', () => { describe('alerts.info("Information", 2000)', () => { it('calls alerts.add("info", "Information", 2000)', () => { const alerts = new Alerts(events) - alerts.add = jest.fn() + alerts.add = vi.fn() alerts.info('Information', 2000) @@ -107,7 +104,7 @@ describe('Alerts', () => { describe('alerts.success("Hooray!", 6000)', () => { it('calls alerts.add("success", "Hooray!", 6000)', () => { const alerts = new Alerts(events) - alerts.add = jest.fn() + alerts.add = vi.fn() alerts.success('Hooray!', 6000) @@ -117,7 +114,7 @@ describe('Alerts', () => { describe('alerts.warn("Warning", 40)', () => { it('calls alerts.add("warn", "Warning", 40)', () => { const alerts = new Alerts(events) - alerts.add = jest.fn() + alerts.add = vi.fn() alerts.warn('Warning', 40) @@ -127,7 +124,7 @@ describe('Alerts', () => { describe('alerts.error("Error", 560)', () => { it('calls alerts.add("error", "Error", 560)', () => { const alerts = new Alerts(events) - alerts.add = jest.fn() + alerts.add = vi.fn() alerts.error('Error', 560) diff --git a/packages/@tinacms/toolkit/src/packages/alerts/alerts.ts b/packages/@tinacms/toolkit/src/alerts/alerts.ts similarity index 97% rename from packages/@tinacms/toolkit/src/packages/alerts/alerts.ts rename to packages/@tinacms/toolkit/src/alerts/alerts.ts index 7b821f78cd..21dfa43dd6 100644 --- a/packages/@tinacms/toolkit/src/packages/alerts/alerts.ts +++ b/packages/@tinacms/toolkit/src/alerts/alerts.ts @@ -1,9 +1,5 @@ -/** - -*/ - import React from 'react' -import { EventBus, Callback, CMSEvent } from '../../packages/core' +import { EventBus, Callback, CMSEvent } from '@/core' export interface EventsToAlerts { [key: string]: ToAlert | AlertArgs diff --git a/packages/@tinacms/toolkit/src/packages/alerts/index.ts b/packages/@tinacms/toolkit/src/alerts/index.ts similarity index 69% rename from packages/@tinacms/toolkit/src/packages/alerts/index.ts rename to packages/@tinacms/toolkit/src/alerts/index.ts index 61044a212f..a6a05991a5 100644 --- a/packages/@tinacms/toolkit/src/packages/alerts/index.ts +++ b/packages/@tinacms/toolkit/src/alerts/index.ts @@ -1,7 +1 @@ -/** - - - -*/ - export * from './alerts' diff --git a/packages/@tinacms/toolkit/src/packages/browser-storage/browser-storage-client.ts b/packages/@tinacms/toolkit/src/browser-storage/browser-storage-client.ts similarity index 98% rename from packages/@tinacms/toolkit/src/packages/browser-storage/browser-storage-client.ts rename to packages/@tinacms/toolkit/src/browser-storage/browser-storage-client.ts index 3572ae5dc6..c28380d9ff 100644 --- a/packages/@tinacms/toolkit/src/packages/browser-storage/browser-storage-client.ts +++ b/packages/@tinacms/toolkit/src/browser-storage/browser-storage-client.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - export class BrowserStorageClient { data: any = {} timeout: number | null = null diff --git a/packages/@tinacms/toolkit/src/packages/browser-storage/get-flattened-form-values.ts b/packages/@tinacms/toolkit/src/browser-storage/get-flattened-form-values.ts similarity index 86% rename from packages/@tinacms/toolkit/src/packages/browser-storage/get-flattened-form-values.ts rename to packages/@tinacms/toolkit/src/browser-storage/get-flattened-form-values.ts index d5a0e845c4..11ba622075 100644 --- a/packages/@tinacms/toolkit/src/packages/browser-storage/get-flattened-form-values.ts +++ b/packages/@tinacms/toolkit/src/browser-storage/get-flattened-form-values.ts @@ -1,11 +1,5 @@ -/** - - - -*/ - import get from 'lodash.get' -import { Form } from '../../packages/forms' +import { Form } from '@/forms' export function getFlattenedFormValues(form: Form) { const flatData: any = {} diff --git a/packages/@tinacms/toolkit/src/packages/browser-storage/index.ts b/packages/@tinacms/toolkit/src/browser-storage/index.ts similarity index 90% rename from packages/@tinacms/toolkit/src/packages/browser-storage/index.ts rename to packages/@tinacms/toolkit/src/browser-storage/index.ts index cf5c606dd9..ed11f36be1 100644 --- a/packages/@tinacms/toolkit/src/packages/browser-storage/index.ts +++ b/packages/@tinacms/toolkit/src/browser-storage/index.ts @@ -1,6 +1,2 @@ -/** - -*/ - export * from './browser-storage-client' export * from './use-form-browser-cache' diff --git a/packages/@tinacms/toolkit/src/packages/browser-storage/use-form-browser-cache.ts b/packages/@tinacms/toolkit/src/browser-storage/use-form-browser-cache.ts similarity index 85% rename from packages/@tinacms/toolkit/src/packages/browser-storage/use-form-browser-cache.ts rename to packages/@tinacms/toolkit/src/browser-storage/use-form-browser-cache.ts index fe43a22998..11f1472509 100644 --- a/packages/@tinacms/toolkit/src/packages/browser-storage/use-form-browser-cache.ts +++ b/packages/@tinacms/toolkit/src/browser-storage/use-form-browser-cache.ts @@ -1,12 +1,6 @@ -/** - - - -*/ - import { useCallback, useEffect } from 'react' -import { Form } from '../../packages/forms' -import { useCMS, useWatchFormValues } from '../../packages/react-core' +import { Form } from '@/forms' +import { useCMS, useWatchFormValues } from '@/react-core' import { getFlattenedFormValues } from './get-flattened-form-values' diff --git a/packages/@tinacms/toolkit/src/components/ActiveFieldIndicator.tsx b/packages/@tinacms/toolkit/src/components/active-field-indicator.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/components/ActiveFieldIndicator.tsx rename to packages/@tinacms/toolkit/src/components/active-field-indicator.tsx index f221882cc5..4b8d77f86c 100644 --- a/packages/@tinacms/toolkit/src/components/ActiveFieldIndicator.tsx +++ b/packages/@tinacms/toolkit/src/components/active-field-indicator.tsx @@ -1,16 +1,8 @@ -/** - - - -*/ import * as React from 'react' -import { ChevronUpIcon, ChevronDownIcon } from '../packages/icons' -import { useEvent } from '../packages/react-core/use-cms-event' -import { - FieldHoverEvent, - FieldFocusEvent, -} from '../packages/fields/field-events' -import { useFieldReference } from '../hooks/use-field-reference' +import { ChevronUpIcon, ChevronDownIcon } from '@/icons' +import { useEvent } from '@/react-core/use-cms-event' +import { FieldHoverEvent, FieldFocusEvent } from '@/fields/field-events' +import { useFieldReference } from '@/hooks/use-field-reference' const IndicatorWrap = ({ style = {}, position, ...props }) => (
{ describe('when passed an instance of CMS', () => { diff --git a/packages/@tinacms/toolkit/src/components/TinaCMSProvider.tsx b/packages/@tinacms/toolkit/src/components/tina-cms-provider.tsx similarity index 78% rename from packages/@tinacms/toolkit/src/components/TinaCMSProvider.tsx rename to packages/@tinacms/toolkit/src/components/tina-cms-provider.tsx index 07bcbbfe08..6edfd3bb54 100644 --- a/packages/@tinacms/toolkit/src/components/TinaCMSProvider.tsx +++ b/packages/@tinacms/toolkit/src/components/tina-cms-provider.tsx @@ -1,13 +1,7 @@ -/** - - - -*/ - import * as React from 'react' -import { TinaCMS } from '../tina-cms' -import { CMSContext } from '../react-tinacms/use-cms' -import { initialState, tinaReducer } from '../tina-state' +import { TinaCMS } from '@/tina-cms' +import { CMSContext } from '@/react-tinacms/use-cms' +import { initialState, tinaReducer } from '@/tina-state' export interface TinaCMSProviderProps { cms: TinaCMS diff --git a/packages/@tinacms/toolkit/src/components/TinaProvider.tsx b/packages/@tinacms/toolkit/src/components/tina-provider.tsx similarity index 81% rename from packages/@tinacms/toolkit/src/components/TinaProvider.tsx rename to packages/@tinacms/toolkit/src/components/tina-provider.tsx index f4249e29ae..329b50e1de 100644 --- a/packages/@tinacms/toolkit/src/components/TinaProvider.tsx +++ b/packages/@tinacms/toolkit/src/components/tina-provider.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - import * as React from 'react' -import { TinaCMSProvider, TinaCMSProviderProps } from './TinaCMSProvider' -import { TinaUI, TinaUIProps } from './TinaUI' +import { TinaCMSProvider, TinaCMSProviderProps } from './tina-cms-provider' +import { TinaUI, TinaUIProps } from './tina-ui' export interface TinaProviderProps extends TinaCMSProviderProps, TinaUIProps {} diff --git a/packages/@tinacms/toolkit/src/components/TinaUI.test.tsx b/packages/@tinacms/toolkit/src/components/tina-ui.test.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/components/TinaUI.test.tsx rename to packages/@tinacms/toolkit/src/components/tina-ui.test.tsx index 53925230ea..d7c393cff5 100644 --- a/packages/@tinacms/toolkit/src/components/TinaUI.test.tsx +++ b/packages/@tinacms/toolkit/src/components/tina-ui.test.tsx @@ -1,14 +1,9 @@ -/** - - - -*/ - import { render, act } from '@testing-library/react' import React, { useEffect } from 'react' -import { TinaCMSProvider } from './TinaCMSProvider' -import { TinaUI } from './TinaUI' +import { TinaCMSProvider } from './tina-cms-provider' +import { TinaUI } from './tina-ui' import { TinaCMS } from '../tina-cms' +import { describe, it, vi } from 'vitest' describe('TinaUI', () => { describe('when the CMS is enabled', () => { @@ -112,7 +107,7 @@ describe('TinaUI', () => { }, }) - const onMount = jest.fn() + const onMount = vi.fn() function Child() { useEffect(onMount, []) return null diff --git a/packages/@tinacms/toolkit/src/components/TinaUI.tsx b/packages/@tinacms/toolkit/src/components/tina-ui.tsx similarity index 82% rename from packages/@tinacms/toolkit/src/components/TinaUI.tsx rename to packages/@tinacms/toolkit/src/components/tina-ui.tsx index c25588e7d2..63c79bfdda 100644 --- a/packages/@tinacms/toolkit/src/components/TinaUI.tsx +++ b/packages/@tinacms/toolkit/src/components/tina-ui.tsx @@ -5,13 +5,13 @@ */ import * as React from 'react' -import { ModalProvider } from '../packages/react-modals' -import { SidebarProvider, SidebarPosition } from '../packages/react-sidebar' +import { ModalProvider } from '@/react-modals' +import { SidebarProvider, SidebarPosition } from '@/react-sidebar' import { useCMS } from '../react-tinacms/use-cms' -import { Alerts } from '../packages/react-alerts' +import { Alerts } from '@/react-alerts' import { MediaManager } from './media' -import { ActiveFieldIndicator } from './ActiveFieldIndicator' -import { MutationSignalProvider } from './MutationSignal' +import { ActiveFieldIndicator } from './active-field-indicator' +import { MutationSignalProvider } from './mutation-signal' // @ts-ignore importing css is not recognized import styles from '../styles.css' diff --git a/packages/@tinacms/toolkit/src/packages/core/cms.test.ts b/packages/@tinacms/toolkit/src/core/cms.test.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/core/cms.test.ts rename to packages/@tinacms/toolkit/src/core/cms.test.ts index 4bb8ad8fa2..e84c08981c 100644 --- a/packages/@tinacms/toolkit/src/packages/core/cms.test.ts +++ b/packages/@tinacms/toolkit/src/core/cms.test.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import { CMS } from './cms' import { CMSEvent, EventBus } from './event' diff --git a/packages/@tinacms/toolkit/src/packages/core/cms.ts b/packages/@tinacms/toolkit/src/core/cms.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/core/cms.ts rename to packages/@tinacms/toolkit/src/core/cms.ts index a216e74521..d7c1885271 100644 --- a/packages/@tinacms/toolkit/src/packages/core/cms.ts +++ b/packages/@tinacms/toolkit/src/core/cms.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - /** * This package contains the [[CMS]] class which is the core * piece of any content management system. diff --git a/packages/@tinacms/toolkit/src/packages/core/event.ts b/packages/@tinacms/toolkit/src/core/event.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/core/event.ts rename to packages/@tinacms/toolkit/src/core/event.ts index eb5595aa3d..f365b24cb2 100644 --- a/packages/@tinacms/toolkit/src/packages/core/event.ts +++ b/packages/@tinacms/toolkit/src/core/event.ts @@ -1,8 +1,3 @@ -/** - - - -*/ export type Callback = (event: E) => void export interface CMSEvent { diff --git a/packages/@tinacms/toolkit/src/packages/core/events.test.ts b/packages/@tinacms/toolkit/src/core/events.test.ts similarity index 93% rename from packages/@tinacms/toolkit/src/packages/core/events.test.ts rename to packages/@tinacms/toolkit/src/core/events.test.ts index b6dd36eee5..4b82440b9b 100644 --- a/packages/@tinacms/toolkit/src/packages/core/events.test.ts +++ b/packages/@tinacms/toolkit/src/core/events.test.ts @@ -1,14 +1,9 @@ -/** - - - -*/ - import { EventBus, Listener } from './event' +import { describe, it, test, expect, beforeEach, vi } from 'vitest' describe('EventBus', () => { it('calls listener and passes it the dispatched event', () => { - const listener = jest.fn() + const listener = vi.fn() const events = new EventBus() const event = { type: 'example' } @@ -18,7 +13,7 @@ describe('EventBus', () => { expect(listener).toHaveBeenCalledWith(event) }) test('for an array of eventscalls listeners and passes it the dispatched event', () => { - const listener = jest.fn() + const listener = vi.fn() const events = new EventBus() const one = { type: 'one' } const two = { type: 'two' } @@ -32,7 +27,7 @@ describe('EventBus', () => { }) describe('after calling unsubscribe', () => { it('does not invoke the listener', () => { - const listener = jest.fn() + const listener = vi.fn() const events = new EventBus() const event = { type: 'example' } @@ -48,21 +43,21 @@ describe('EventBus', () => { describe('Listener', () => { describe('handleEvent', () => { it("invokes it's callback if it watches the event", () => { - const cb = jest.fn() + const cb = vi.fn() const listener = new Listener('example', cb) const event = { type: 'example' } - listener.watchesEvent = jest.fn(() => true) + listener.watchesEvent = vi.fn(() => true) listener.handleEvent(event) expect(cb).toHaveBeenCalledWith(event) }) it('does not invoke callback if it does not watch the event', () => { - const cb = jest.fn() + const cb = vi.fn() const listener = new Listener('something', cb) const event = { type: 'example' } - listener.watchesEvent = jest.fn(() => false) + listener.watchesEvent = vi.fn(() => false) listener.handleEvent(event) expect(cb).not.toHaveBeenCalledWith(event) diff --git a/packages/@tinacms/toolkit/src/packages/core/flags.ts b/packages/@tinacms/toolkit/src/core/flags.ts similarity index 97% rename from packages/@tinacms/toolkit/src/packages/core/flags.ts rename to packages/@tinacms/toolkit/src/core/flags.ts index fbea729d5d..4a648f80ad 100644 --- a/packages/@tinacms/toolkit/src/packages/core/flags.ts +++ b/packages/@tinacms/toolkit/src/core/flags.ts @@ -1,7 +1,3 @@ -/** - -*/ - import { EventBus } from './event' export interface SetFlagEvent { diff --git a/packages/@tinacms/toolkit/src/packages/core/index.ts b/packages/@tinacms/toolkit/src/core/index.ts similarity index 94% rename from packages/@tinacms/toolkit/src/packages/core/index.ts rename to packages/@tinacms/toolkit/src/core/index.ts index f25758a63a..e13e0224c4 100644 --- a/packages/@tinacms/toolkit/src/packages/core/index.ts +++ b/packages/@tinacms/toolkit/src/core/index.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - export * from './cms' export * from './event' export * from './subscribable' diff --git a/packages/@tinacms/toolkit/src/packages/core/media-store.default.ts b/packages/@tinacms/toolkit/src/core/media-store.default.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/core/media-store.default.ts rename to packages/@tinacms/toolkit/src/core/media-store.default.ts index a0165a6e33..fd3683c6d2 100644 --- a/packages/@tinacms/toolkit/src/packages/core/media-store.default.ts +++ b/packages/@tinacms/toolkit/src/core/media-store.default.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import { Media, MediaStore, @@ -14,7 +8,7 @@ import { E_BAD_ROUTE, } from './media' import { CMS } from './cms' -import { DEFAULT_MEDIA_UPLOAD_TYPES } from '../../components/media/utils' +import { DEFAULT_MEDIA_UPLOAD_TYPES } from '@/components/media/utils' const s3ErrorRegex = /.*(.+)<\/Code>.*(.+)<\/Message>.*/ diff --git a/packages/@tinacms/toolkit/src/packages/core/media.ts b/packages/@tinacms/toolkit/src/core/media.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/core/media.ts rename to packages/@tinacms/toolkit/src/core/media.ts index 2ccbc49f67..9e04a5c5ae 100644 --- a/packages/@tinacms/toolkit/src/packages/core/media.ts +++ b/packages/@tinacms/toolkit/src/core/media.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import { EventBus } from './event' import { DummyMediaStore } from './media-store.default' diff --git a/packages/@tinacms/toolkit/src/packages/core/plugins.test.ts b/packages/@tinacms/toolkit/src/core/plugins.test.ts similarity index 91% rename from packages/@tinacms/toolkit/src/packages/core/plugins.test.ts rename to packages/@tinacms/toolkit/src/core/plugins.test.ts index 4047495801..25a393b5d3 100644 --- a/packages/@tinacms/toolkit/src/packages/core/plugins.test.ts +++ b/packages/@tinacms/toolkit/src/core/plugins.test.ts @@ -1,11 +1,6 @@ -/** - - - -*/ - import { PluginTypeManager } from './plugins' import { EventBus } from './event' +import { describe, it, test, expect, beforeEach, vi } from 'vitest' describe('PluginTypeManager', () => { describe('when nothing has been added', () => { @@ -19,7 +14,7 @@ describe('PluginTypeManager', () => { }) describe('when a "test" plugin has been added', () => { it('notifies the subscribers', () => { - const listeners = [jest.fn(), jest.fn(), jest.fn(), jest.fn()] + const listeners = [vi.fn(), vi.fn(), vi.fn(), vi.fn()] const p = { __type: 'test', name: 'Example' } const plugins = new PluginTypeManager(new EventBus()) listeners.forEach((listener) => @@ -51,7 +46,7 @@ describe('PluginTypeManager', () => { }) describe('when a "test" plugin has been removed', () => { it('notifies the subscribers', () => { - const listeners = [jest.fn(), jest.fn(), jest.fn(), jest.fn()] + const listeners = [vi.fn(), vi.fn(), vi.fn(), vi.fn()] const p = { __type: 'test', name: 'Example' } const plugins = new PluginTypeManager(new EventBus()) plugins.add(p) diff --git a/packages/@tinacms/toolkit/src/packages/core/plugins.ts b/packages/@tinacms/toolkit/src/core/plugins.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/core/plugins.ts rename to packages/@tinacms/toolkit/src/core/plugins.ts index f16a5f519b..afffe248f9 100644 --- a/packages/@tinacms/toolkit/src/packages/core/plugins.ts +++ b/packages/@tinacms/toolkit/src/core/plugins.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - /** * This package defines the plugin system of TinaCMS. * diff --git a/packages/@tinacms/toolkit/src/packages/core/subscribable.test.ts b/packages/@tinacms/toolkit/src/core/subscribable.test.ts similarity index 87% rename from packages/@tinacms/toolkit/src/packages/core/subscribable.test.ts rename to packages/@tinacms/toolkit/src/core/subscribable.test.ts index 4508fb949b..409ec720a0 100644 --- a/packages/@tinacms/toolkit/src/packages/core/subscribable.test.ts +++ b/packages/@tinacms/toolkit/src/core/subscribable.test.ts @@ -1,10 +1,5 @@ -/** - - - -*/ - import { Subscribable } from './subscribable' +import { describe, it, test, expect, beforeEach, vi } from 'vitest' class Example extends Subscribable { notify() { @@ -16,7 +11,7 @@ describe('Subscribable', () => { describe('#subscribe', () => { it('does not callback initially', () => { const subscribable = new Example() - const callback = jest.fn() + const callback = vi.fn() subscribable.subscribe(callback) @@ -24,7 +19,7 @@ describe('Subscribable', () => { }) it('calls the callback when notify', () => { const subscribable = new Example() - const callback = jest.fn() + const callback = vi.fn() subscribable.subscribe(callback) subscribable.notify() @@ -33,7 +28,7 @@ describe('Subscribable', () => { }) it('calls the callback on subsequent calls', () => { const subscribable = new Example() - const callback = jest.fn() + const callback = vi.fn() subscribable.subscribe(callback) subscribable.notify() @@ -44,7 +39,7 @@ describe('Subscribable', () => { }) it('returns an unsubscribe function', () => { const subscribable = new Example() - const callback = jest.fn() + const callback = vi.fn() const unsubscribe = subscribable.subscribe(callback) subscribable.notify() @@ -56,8 +51,8 @@ describe('Subscribable', () => { describe('when there are multiple subscribers', () => { it('calls them all each time', () => { const subscribable = new Example() - const cb1 = jest.fn() - const cb2 = jest.fn() + const cb1 = vi.fn() + const cb2 = vi.fn() subscribable.subscribe(cb1) subscribable.subscribe(cb2) @@ -74,7 +69,7 @@ describe('Subscribable', () => { describe('after calling #unsubscribe', () => { it('does not call the callback', () => { const subscribable = new Example() - const cb1 = jest.fn() + const cb1 = vi.fn() subscribable.subscribe(cb1) subscribable.notify() @@ -85,8 +80,8 @@ describe('Subscribable', () => { }) it('does not unsubscribe other callbacks', () => { const subscribable = new Example() - const cb1 = jest.fn() - const cb2 = jest.fn() + const cb1 = vi.fn() + const cb2 = vi.fn() subscribable.subscribe(cb1) subscribable.subscribe(cb2) diff --git a/packages/@tinacms/toolkit/src/packages/core/subscribable.ts b/packages/@tinacms/toolkit/src/core/subscribable.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/core/subscribable.ts rename to packages/@tinacms/toolkit/src/core/subscribable.ts index 1b146406b9..7ece914561 100644 --- a/packages/@tinacms/toolkit/src/packages/core/subscribable.ts +++ b/packages/@tinacms/toolkit/src/core/subscribable.ts @@ -1,9 +1,4 @@ /** - - - -*/ -/** * This package provides an abstract class for making objects Subscribable. * * @packageDocumentation diff --git a/packages/@tinacms/toolkit/src/packages/core/types/react-frame-component.d.ts b/packages/@tinacms/toolkit/src/core/types/react-frame-component.d.ts similarity index 78% rename from packages/@tinacms/toolkit/src/packages/core/types/react-frame-component.d.ts rename to packages/@tinacms/toolkit/src/core/types/react-frame-component.d.ts index 6a5a675952..512c3050f0 100644 --- a/packages/@tinacms/toolkit/src/packages/core/types/react-frame-component.d.ts +++ b/packages/@tinacms/toolkit/src/core/types/react-frame-component.d.ts @@ -1,7 +1 @@ -/** - - - -*/ - declare module 'react-frame-component' diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/ButtonToggle.tsx b/packages/@tinacms/toolkit/src/fields/components/button-toggle.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/components/ButtonToggle.tsx rename to packages/@tinacms/toolkit/src/fields/components/button-toggle.tsx index 9f2d7a2dac..f3611d5db4 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/ButtonToggle.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/button-toggle.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' type Option = { diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/CheckboxGroup.tsx b/packages/@tinacms/toolkit/src/fields/components/checkbox-group.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/components/CheckboxGroup.tsx rename to packages/@tinacms/toolkit/src/fields/components/checkbox-group.tsx index 0e7d8dcb21..c2ab4692e5 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/CheckboxGroup.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/checkbox-group.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' import { BiCheck } from 'react-icons/bi' diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/color-formatter.tsx b/packages/@tinacms/toolkit/src/fields/components/color-picker/color-formatter.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/color-formatter.tsx rename to packages/@tinacms/toolkit/src/fields/components/color-picker/color-formatter.tsx index 776c0dc179..fb401148cb 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/color-formatter.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/color-picker/color-formatter.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as pkg from 'color-string' const { get: getColor, to: toColor } = pkg diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/ColorPicker.tsx b/packages/@tinacms/toolkit/src/fields/components/color-picker/color-picker.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/ColorPicker.tsx rename to packages/@tinacms/toolkit/src/fields/components/color-picker/color-picker.tsx index 7886a87df6..495289d74d 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/ColorPicker.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/color-picker/color-picker.tsx @@ -1,16 +1,10 @@ -/** - - - -*/ - import * as React from 'react' import { useState } from 'react' -import { Dismissible } from '../../../react-dismissible' +import { Dismissible } from '@/react-dismissible' import * as pkg from 'react-color' const { SketchPicker, BlockPicker } = pkg import { ColorRGBA, ColorFormat, ColorFormatter } from './color-formatter' -import { useFormPortal } from '../../../form-builder' +import { useFormPortal } from '@/form-builder' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore importing css is not recognized import keyframes from './index.css' diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/index.css b/packages/@tinacms/toolkit/src/fields/components/color-picker/index.css similarity index 100% rename from packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/index.css rename to packages/@tinacms/toolkit/src/fields/components/color-picker/index.css diff --git a/packages/@tinacms/toolkit/src/fields/components/color-picker/index.ts b/packages/@tinacms/toolkit/src/fields/components/color-picker/index.ts new file mode 100644 index 0000000000..64fd0c9ca9 --- /dev/null +++ b/packages/@tinacms/toolkit/src/fields/components/color-picker/index.ts @@ -0,0 +1 @@ +export * from './color-picker' diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/ImageUpload/ImageUpload.tsx b/packages/@tinacms/toolkit/src/fields/components/image-upload/image-upload.tsx similarity index 93% rename from packages/@tinacms/toolkit/src/packages/fields/components/ImageUpload/ImageUpload.tsx rename to packages/@tinacms/toolkit/src/fields/components/image-upload/image-upload.tsx index dd210b9207..2d564f1da0 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/ImageUpload/ImageUpload.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/image-upload/image-upload.tsx @@ -4,15 +4,15 @@ import * as React from 'react' import * as dropzone from 'react-dropzone' -import { IconButton } from '../../../styles' -import { TrashIcon } from '../../../icons' -import { LoadingDots } from '../../../form-builder' -import { useCMS } from '../../../../react-tinacms/use-cms' +import { IconButton } from '@/styles' +import { TrashIcon } from '@/icons' +import { LoadingDots } from '@/form-builder' +import { useCMS } from '@/react-tinacms/use-cms' import { DEFAULT_MEDIA_UPLOAD_TYPES, dropzoneAcceptFromString, isImage, -} from '../../../../components/media/utils' +} from '@/components/media/utils' import { BiFileBlank } from 'react-icons/bi' const { useDropzone } = dropzone diff --git a/packages/@tinacms/toolkit/src/fields/components/image-upload/index.ts b/packages/@tinacms/toolkit/src/fields/components/image-upload/index.ts new file mode 100644 index 0000000000..a1257c2780 --- /dev/null +++ b/packages/@tinacms/toolkit/src/fields/components/image-upload/index.ts @@ -0,0 +1 @@ +export * from './image-upload' diff --git a/packages/@tinacms/toolkit/src/fields/components/index.ts b/packages/@tinacms/toolkit/src/fields/components/index.ts new file mode 100644 index 0000000000..0fc36b8258 --- /dev/null +++ b/packages/@tinacms/toolkit/src/fields/components/index.ts @@ -0,0 +1,12 @@ +export * from './text-field' +export * from './textarea' +export * from './color-picker' +export * from './toggle' +export * from './select' +export * from './radio-group' +export * from './checkbox-group' +export * from './number-input' +export * from './image-upload' +export * from './input' +export * from './reference' +export * from './button-toggle' diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/Input.tsx b/packages/@tinacms/toolkit/src/fields/components/input.tsx similarity index 81% rename from packages/@tinacms/toolkit/src/packages/fields/components/Input.tsx rename to packages/@tinacms/toolkit/src/fields/components/input.tsx index e00617b8bc..46cff3cd67 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/Input.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/input.tsx @@ -1,11 +1,5 @@ -/** - - - -*/ - import * as React from 'react' -import { textFieldClasses } from './TextField' +import { textFieldClasses } from './text-field' export interface InputProps { error?: boolean diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/NumberInput.tsx b/packages/@tinacms/toolkit/src/fields/components/number-input.tsx similarity index 89% rename from packages/@tinacms/toolkit/src/packages/fields/components/NumberInput.tsx rename to packages/@tinacms/toolkit/src/fields/components/number-input.tsx index beceab4462..ae630481d8 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/NumberInput.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/number-input.tsx @@ -1,11 +1,5 @@ -/** - - - -*/ - import * as React from 'react' -import { Input } from './Input' +import { Input } from './input' type a = React.DetailedHTMLProps< React.InputHTMLAttributes, diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/RadioGroup.tsx b/packages/@tinacms/toolkit/src/fields/components/radio-group.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/components/RadioGroup.tsx rename to packages/@tinacms/toolkit/src/fields/components/radio-group.tsx index f923f6d0aa..2f90d81370 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/RadioGroup.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/radio-group.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' import { BiCheck } from 'react-icons/bi' diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/Reference/index.tsx b/packages/@tinacms/toolkit/src/fields/components/reference/index.tsx similarity index 80% rename from packages/@tinacms/toolkit/src/packages/fields/components/Reference/index.tsx rename to packages/@tinacms/toolkit/src/fields/components/reference/index.tsx index af4e7b05e6..6aff7edd31 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/Reference/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/reference/index.tsx @@ -1,13 +1,7 @@ -/** - - - -*/ - import * as React from 'react' -import { useCMS } from '../../../../react-tinacms/use-cms' -import ReferenceSelect from './ReferenceSelect' -import ReferenceLink from './ReferenceLink' +import { useCMS } from '@/react-tinacms/use-cms' +import ReferenceSelect from './reference-select' +import ReferenceLink from './reference-link' type Option = { value: string diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/Reference/ReferenceLink.tsx b/packages/@tinacms/toolkit/src/fields/components/reference/reference-link.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/fields/components/Reference/ReferenceLink.tsx rename to packages/@tinacms/toolkit/src/fields/components/reference/reference-link.tsx index 4fed5269ed..3db08a971b 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/Reference/ReferenceLink.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/reference/reference-link.tsx @@ -1,11 +1,5 @@ -/** - - - -*/ - import * as React from 'react' -import type { TinaCMS } from '../../../../tina-cms' +import type { TinaCMS } from '@/tina-cms' import { BiEdit } from 'react-icons/bi' interface ReferenceLinkProps { diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/Reference/ReferenceSelect.tsx b/packages/@tinacms/toolkit/src/fields/components/reference/reference-select.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/fields/components/Reference/ReferenceSelect.tsx rename to packages/@tinacms/toolkit/src/fields/components/reference/reference-select.tsx index 021a85c16a..ae3d74ab5c 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/Reference/ReferenceSelect.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/reference/reference-select.tsx @@ -1,16 +1,10 @@ -/** - - - -*/ - import * as React from 'react' -import type { TinaCMS } from '../../../../tina-cms' +import type { TinaCMS } from '@/tina-cms' import type { ReferenceFieldProps } from './index' -import { selectFieldClasses } from '../Select' -import { LoadingDots } from '../../../form-builder' +import { selectFieldClasses } from '../select' +import { LoadingDots } from '@/form-builder' import { MdKeyboardArrowDown } from 'react-icons/md' -import { Field } from '../../../forms' +import { Field } from '@/forms' interface ReferenceSelectProps { cms: TinaCMS diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/Select.tsx b/packages/@tinacms/toolkit/src/fields/components/select.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/fields/components/Select.tsx rename to packages/@tinacms/toolkit/src/fields/components/select.tsx index 1bf365faa8..0f02d8b79c 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/Select.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/select.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - import * as React from 'react' import { MdKeyboardArrowDown } from 'react-icons/md' -import type { Field } from '../../forms' +import type { Field } from '@/forms' type Option = { value: string diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/TextField.tsx b/packages/@tinacms/toolkit/src/fields/components/text-field.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/packages/fields/components/TextField.tsx rename to packages/@tinacms/toolkit/src/fields/components/text-field.tsx index 7204144340..6fa17b18ab 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/TextField.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/text-field.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' type a = React.DetailedHTMLProps< diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/TextArea.tsx b/packages/@tinacms/toolkit/src/fields/components/textarea.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/packages/fields/components/TextArea.tsx rename to packages/@tinacms/toolkit/src/fields/components/textarea.tsx index 8b90c3ab72..1bc73143d6 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/TextArea.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/textarea.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' type a = React.DetailedHTMLProps< diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/Toggle.tsx b/packages/@tinacms/toolkit/src/fields/components/toggle.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/packages/fields/components/Toggle.tsx rename to packages/@tinacms/toolkit/src/fields/components/toggle.tsx index bf88de4839..bfabe4abe3 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/components/Toggle.tsx +++ b/packages/@tinacms/toolkit/src/fields/components/toggle.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - import { FC } from 'react' import * as React from 'react' -import { Field } from '../../forms' +import { Field } from '@/forms' export interface ToggleProps { name: string diff --git a/packages/@tinacms/toolkit/src/packages/fields/field-events.ts b/packages/@tinacms/toolkit/src/fields/field-events.ts similarity index 81% rename from packages/@tinacms/toolkit/src/packages/fields/field-events.ts rename to packages/@tinacms/toolkit/src/fields/field-events.ts index 2adffd3e25..17b46e9950 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/field-events.ts +++ b/packages/@tinacms/toolkit/src/fields/field-events.ts @@ -1,9 +1,4 @@ -/** - - - -*/ -import { CMSEvent } from '../core/event' +import { CMSEvent } from '@/core/event' export interface FieldHoverEvent extends CMSEvent { type: 'field:hover' diff --git a/packages/@tinacms/toolkit/src/packages/fields/index.ts b/packages/@tinacms/toolkit/src/fields/index.ts similarity index 62% rename from packages/@tinacms/toolkit/src/packages/fields/index.ts rename to packages/@tinacms/toolkit/src/fields/index.ts index 7fd6219ae5..35cfd6469d 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/index.ts +++ b/packages/@tinacms/toolkit/src/fields/index.ts @@ -1,10 +1,4 @@ -/** - - - -*/ - export * from './components' export * from './plugins' // TODO: Move this into components -export * from './plugins/wrapFieldWithMeta' +export * from './plugins/wrap-field-with-meta' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/BlocksFieldPlugin/BlockSelectorBig.tsx b/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector-big.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/BlocksFieldPlugin/BlockSelectorBig.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector-big.tsx index a1845f53ad..fe1d5a3740 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/BlocksFieldPlugin/BlockSelectorBig.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector-big.tsx @@ -1,15 +1,9 @@ -/** - - - -*/ - import * as React from 'react' -import { AddIcon } from '../../../icons' -import { IconButton } from '../../../styles' +import { AddIcon } from '@/icons' +import { IconButton } from '@/styles' import { Disclosure, Transition } from '@headlessui/react' -import { useFormPortal } from '../../../form-builder' -import { PanelHeader } from '../GroupFieldPlugin' +import { useFormPortal } from '@/form-builder' +import { PanelHeader } from '../group-field-plugin' import { BlockTemplate } from '.' import { MdKeyboardArrowDown, MdOutlineClear } from 'react-icons/md' import { BiSearch } from 'react-icons/bi' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/BlocksFieldPlugin/BlockSelector.tsx b/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/BlocksFieldPlugin/BlockSelector.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector.tsx index 63c7d5ff8c..10f7876389 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/BlocksFieldPlugin/BlockSelector.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector.tsx @@ -1,14 +1,8 @@ -/** - - - -*/ - import * as React from 'react' -import { AddIcon } from '../../../icons' -import { IconButton } from '../../../styles' +import { AddIcon } from '@/icons' +import { IconButton } from '@/styles' import { Popover, Transition } from '@headlessui/react' -import { BlockTemplate } from './' +import { BlockTemplate } from '.' export const BlockSelector = ({ templates, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/BlocksFieldPlugin/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/index.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/BlocksFieldPlugin/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/index.tsx index 8dcbd68125..57e1f2dcfb 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/BlocksFieldPlugin/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/index.tsx @@ -1,28 +1,22 @@ -/** - - - -*/ - import * as React from 'react' -import { Field, Form } from '../../../forms' -import { FieldsBuilder, useFormPortal } from '../../../form-builder' +import { Field, Form } from '@/forms' +import { FieldsBuilder, useFormPortal } from '@/form-builder' import { Droppable, Draggable } from 'react-beautiful-dnd' -import { GroupPanel, PanelHeader, PanelBody } from '../GroupFieldPlugin' +import { GroupPanel, PanelHeader, PanelBody } from '../group-field-plugin' import { GroupLabel, ItemDeleteButton, ItemHeader, DragHandle, ItemClickTarget, -} from '../GroupListFieldPlugin' -import { useCMS } from '../../../react-core/use-cms' -import { useEvent } from '../../../react-core' -import { FieldHoverEvent, FieldFocusEvent } from '../../field-events' -import { BlockSelector } from './BlockSelector' -import { BlockSelectorBig } from './BlockSelectorBig' +} from '../group-list-field-plugin' +import { useCMS } from '@/react-core/use-cms' +import { useEvent } from '@/react-core' +import { FieldHoverEvent, FieldFocusEvent } from '@/fields/field-events' +import { BlockSelector } from './block-selector' +import { BlockSelectorBig } from './block-selector-big' import { BiPencil } from 'react-icons/bi' -import { EmptyList, ListFieldMeta, ListPanel } from '../ListFieldMeta' +import { EmptyList, ListFieldMeta, ListPanel } from '../list-field-meta' export interface BlocksFieldDefinititon extends Field { component: 'blocks' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/ButtonToggleFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/button-toggle-field-plugin.tsx similarity index 75% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/ButtonToggleFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/button-toggle-field-plugin.tsx index 4b67bda123..2291ca8ee3 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/ButtonToggleFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/button-toggle-field-plugin.tsx @@ -1,10 +1,4 @@ -/** - - - -*/ - -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' import { ButtonToggle } from '../components' export const ButtonToggleField = wrapFieldsWithMeta(ButtonToggle) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/CheckboxGroupFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/checkbox-group-field-plugin.tsx similarity index 84% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/CheckboxGroupFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/checkbox-group-field-plugin.tsx index 52dbb0b032..a54ee18dca 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/CheckboxGroupFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/checkbox-group-field-plugin.tsx @@ -1,10 +1,4 @@ -/** - - - -*/ - -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' import { CheckboxGroup } from '../components' export const CheckboxGroupField = wrapFieldsWithMeta(CheckboxGroup) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/ColorFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/color-field-plugin.tsx similarity index 87% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/ColorFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/color-field-plugin.tsx index 468e135c44..20f86481c9 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/ColorFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/color-field-plugin.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { ColorPicker, InputProps } from '../components' -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' -import { parse } from './textFormat' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' +import { parse } from './text-format' export interface ColorFieldProps { colorFormat: string diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/DateFieldPlugin.css b/packages/@tinacms/toolkit/src/fields/plugins/date-field-plugin.css similarity index 100% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/DateFieldPlugin.css rename to packages/@tinacms/toolkit/src/fields/plugins/date-field-plugin.css diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/DateFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/date-field-plugin.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/DateFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/date-field-plugin.tsx index f7d5e15b10..07c7fd4dcc 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/DateFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/date-field-plugin.tsx @@ -1,14 +1,14 @@ import * as React from 'react' import { useEffect, useState, useRef } from 'react' import { InputProps, textFieldClasses } from '../components' -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' // we might be able to go back to react-datetime when https://github.com/arqex/react-datetime/pull/813 is merged import ReactDatetime from '../../react-datetime/DateTime' import type { DatetimepickerProps } from 'react-datetime' -import { format, parse, DEFAULT_DATE_DISPLAY_FORMAT } from './dateFormat' +import { format, parse, DEFAULT_DATE_DISPLAY_FORMAT } from './date-format' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore importing css is not recognized -import DateFieldPluginCSS from './DateFieldPlugin.css' +import DateFieldPluginCSS from './date-field-plugin.css' import { Field } from '../../forms' export const DateField = wrapFieldsWithMeta( diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/dateFormat.ts b/packages/@tinacms/toolkit/src/fields/plugins/date-format.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/dateFormat.ts rename to packages/@tinacms/toolkit/src/fields/plugins/date-format.ts index dbfcd550b8..143f43a4d4 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/dateFormat.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/date-format.ts @@ -1,7 +1,3 @@ -/** - -*/ - import moment from 'moment' import type { DatetimepickerProps } from 'react-datetime' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/fieldProps.ts b/packages/@tinacms/toolkit/src/fields/plugins/field-props.ts similarity index 54% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/fieldProps.ts rename to packages/@tinacms/toolkit/src/fields/plugins/field-props.ts index 91a5fb0b4d..cef4fe14fd 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/fieldProps.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/field-props.ts @@ -1,11 +1,5 @@ -/** - - - -*/ - -import { Field, FormApi } from '../../forms' -import { FieldRenderProps } from '../../form-builder' +import { Field, FormApi } from '@/forms' +import { FieldRenderProps } from '@/form-builder' export interface FieldProps extends FieldRenderProps { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/GroupFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/group-field-plugin.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/GroupFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/group-field-plugin.tsx index abb1732676..8681eaff7d 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/GroupFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/group-field-plugin.tsx @@ -1,16 +1,10 @@ -/** - - - -*/ - import * as React from 'react' -import { Field, Form } from '../../forms' -import { FieldsBuilder, useFormPortal, FormWrapper } from '../../form-builder' -import { useCMS } from '../../react-core/use-cms' +import { Field, Form } from '@/forms' +import { FieldsBuilder, useFormPortal, FormWrapper } from '@/form-builder' +import { useCMS } from '@/react-core/use-cms' import { BiPencil } from 'react-icons/bi' import { IoMdClose } from 'react-icons/io' -import { wrapFieldWithError } from './wrapFieldWithMeta' +import { wrapFieldWithError } from './wrap-field-with-meta' export interface GroupFieldDefinititon extends Field { component: 'group' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/GroupListFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/group-list-field-plugin.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/GroupListFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/group-list-field-plugin.tsx index eda42f1505..b0cdf0ddea 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/GroupListFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/group-list-field-plugin.tsx @@ -1,21 +1,15 @@ -/** - - - -*/ - import * as React from 'react' -import { Field, Form } from '../../forms' -import { FieldsBuilder, useFormPortal } from '../../form-builder' -import { IconButton } from '../../styles' +import { Field, Form } from '@/forms' +import { FieldsBuilder, useFormPortal } from '@/form-builder' +import { IconButton } from '@/styles' import { Droppable, Draggable } from 'react-beautiful-dnd' -import { AddIcon, DragIcon, ReorderIcon, TrashIcon } from '../../icons' -import { GroupPanel, PanelHeader, PanelBody } from './GroupFieldPlugin' -import { useEvent } from '../../react-core/use-cms-event' +import { AddIcon, DragIcon, ReorderIcon, TrashIcon } from '@/icons' +import { GroupPanel, PanelHeader, PanelBody } from './group-field-plugin' +import { useEvent } from '@/react-core/use-cms-event' import { FieldHoverEvent, FieldFocusEvent } from '../field-events' -import { useCMS } from '../../react-core/use-cms' +import { useCMS } from '@/react-core/use-cms' import { BiPencil } from 'react-icons/bi' -import { EmptyList, ListFieldMeta, ListPanel } from './ListFieldMeta' +import { EmptyList, ListFieldMeta, ListPanel } from './list-field-meta' interface GroupFieldDefinititon extends Field { component: 'group' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/HiddenFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/hidden-field-plugin.tsx similarity index 78% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/HiddenFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/hidden-field-plugin.tsx index 13a5b2c067..9fa00dbdff 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/HiddenFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/hidden-field-plugin.tsx @@ -1,11 +1,5 @@ -/** - - - -*/ - import * as React from 'react' -import { parse } from './textFormat' +import { parse } from './text-format' export const HiddenField = () => { return <> diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/ImageFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/image-field-plugin.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/ImageFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/image-field-plugin.tsx index ffadf4b17e..1dc2a7ef7f 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/ImageFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/image-field-plugin.tsx @@ -1,10 +1,10 @@ import * as React from 'react' -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' import { InputProps, ImageUpload } from '../components' -import { Media, MediaStore } from '../../core' -import { useCMS } from '../../react-core' -import { parse } from './textFormat' -import { useState, useEffect } from 'react' +import { Media } from '@/core' +import { useCMS } from '@/react-core' +import { parse } from './text-format' +import { useState } from 'react' import { FileError } from 'react-dropzone' interface ImageProps { diff --git a/packages/@tinacms/toolkit/src/fields/plugins/index.ts b/packages/@tinacms/toolkit/src/fields/plugins/index.ts new file mode 100644 index 0000000000..28932ebc9f --- /dev/null +++ b/packages/@tinacms/toolkit/src/fields/plugins/index.ts @@ -0,0 +1,19 @@ +export * from './blocks-field-plugin' +export * from './color-field-plugin' +export * from './group-field-plugin' +export * from './group-list-field-plugin' +export * from './list-field-plugin' +export * from './image-field-plugin' +export * from './mdx-field-plugin' +export * from './number-field-plugin' +export * from './select-field-plugin' +export * from './radio-group-field-plugin' +export * from './textarea-field-plugin' +export * from './text-field-plugin' +export * from './toggle-field-plugin' +export * from './tags-field-plugin' +export * from './date-field-plugin' +export * from './checkbox-group-field-plugin' +export * from './reference-field-plugin' +export * from './button-toggle-field-plugin' +export * from './hidden-field-plugin' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/ListFieldMeta.tsx b/packages/@tinacms/toolkit/src/fields/plugins/list-field-meta.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/ListFieldMeta.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/list-field-meta.tsx index eac6514b47..83a55d62ea 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/ListFieldMeta.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/list-field-meta.tsx @@ -1,14 +1,12 @@ -/** - - - -*/ - import * as React from 'react' -import { useEvent } from '../../react-core/use-cms-event' +import { useEvent } from '@/react-core/use-cms-event' import { FieldHoverEvent, FieldFocusEvent } from '../field-events' -import { Form } from '../../forms' -import { FieldDescription, FieldError, FieldWrapper } from './wrapFieldWithMeta' +import { Form } from '@/forms' +import { + FieldDescription, + FieldError, + FieldWrapper, +} from './wrap-field-with-meta' interface FieldMetaProps extends React.HTMLAttributes { name: string diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/ListFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/list-field-plugin.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/ListFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/list-field-plugin.tsx index 906cb2db98..6d8849b222 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/ListFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/list-field-plugin.tsx @@ -1,22 +1,16 @@ -/** - - - -*/ - import * as React from 'react' -import { Field, Form } from '../../forms' -import { FieldsBuilder } from '../../form-builder' -import { IconButton } from '../../styles' +import { Field, Form } from '@/forms' +import { FieldsBuilder } from '@/form-builder' +import { IconButton } from '@/styles' import { Droppable, Draggable } from 'react-beautiful-dnd' -import { AddIcon } from '../../icons' +import { AddIcon } from '@/icons' import { DragHandle, ItemClickTarget, ItemDeleteButton, ItemHeader, -} from './GroupListFieldPlugin' -import { EmptyList, ListFieldMeta, ListPanel } from './ListFieldMeta' +} from './group-list-field-plugin' +import { EmptyList, ListFieldMeta, ListPanel } from './list-field-meta' type DefaultItem = string | number | (() => string | number) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/index.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/index.tsx index 2b25bb441b..ba64de533e 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/index.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - import React from 'react' import { InputProps } from 'react-select/lib/components/Input' -import { InputFieldType, wrapFieldsWithMeta } from '../wrapFieldWithMeta' +import { InputFieldType, wrapFieldsWithMeta } from '../wrap-field-with-meta' import { RichEditor } from './plate' import { EditorContext } from './plate/editor-context' import type { MdxTemplate } from './plate/types' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/monaco/error-message.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/error-message.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/monaco/error-message.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/error-message.tsx index db7d378a08..bce1e3691d 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/monaco/error-message.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/error-message.tsx @@ -1,8 +1,3 @@ -/** - - - -*/ import React from 'react' import { XCircleIcon } from '@heroicons/react/solid' import { Popover, Transition } from '@headlessui/react' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/monaco/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/index.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/monaco/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/index.tsx index e9e65322ec..3b842cb9f6 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/monaco/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/index.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import React from 'react' import { uuid } from '../plate/plugins/ui/helpers' import MonacoEditor, { useMonaco, loader } from '@monaco-editor/react' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/monaco/use-debounce.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/use-debounce.ts similarity index 98% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/monaco/use-debounce.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/use-debounce.ts index 043a219727..fc6a06c5bc 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/monaco/use-debounce.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/use-debounce.ts @@ -1,8 +1,3 @@ -/** - - - -*/ import { useState, useEffect } from 'react' export function useDebounce(value, delay) { const [debouncedValue, setDebouncedValue] = useState(value) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/editor-context.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/editor-context.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/editor-context.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/editor-context.tsx index 7421635585..c64f96da72 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/editor-context.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/editor-context.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import React from 'react' import type { MdxTemplate } from './types' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/hooks/embed-hooks.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts similarity index 95% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/hooks/embed-hooks.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts index 9a5e78b43c..d3d67bb105 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/hooks/embed-hooks.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts @@ -1,13 +1,9 @@ -/** - -*/ - import React from 'react' import { Transforms } from 'slate' import { useSelected, ReactEditor } from 'slate-react' import isHotkey from 'is-hotkey' -import { useCMS, useEvent } from '../../../../../react-core' -import { FieldFocusEvent } from '../../../../field-events' +import { useCMS, useEvent } from '@/react-core' +import { FieldFocusEvent } from '@/fields/field-events' const handleCloseBase = (editor, element) => { const path = ReactEditor.findPath(editor, element) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/hooks/use-resize.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/use-resize.ts similarity index 97% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/hooks/use-resize.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/use-resize.ts index 3d5294743a..3d2a814163 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/hooks/use-resize.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/use-resize.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import React from 'react' export const useResize = (ref, callback) => { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/index.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/index.tsx index 1eeda80687..c6d5516fc5 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/index.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import React from 'react' import { Plate, createPlugins } from '@udecode/plate-headless' import { components } from './plugins/ui/components' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/nested-form.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/nested-form.tsx similarity index 82% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/nested-form.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/nested-form.tsx index 3952a1ed7b..4fee6908d6 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/nested-form.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/nested-form.tsx @@ -1,13 +1,7 @@ -/** - - - -*/ - import React from 'react' -import { useFormPortal, FormBuilder } from '../../../../form-builder' -import { PanelHeader, GroupPanel } from '../../GroupFieldPlugin' -import { Form, Field } from '../../../../forms' +import { useFormPortal, FormBuilder } from '@/form-builder' +import { PanelHeader, GroupPanel } from '../../group-field-plugin' +import { Form, Field } from '@/forms' import { uuid } from './plugins/ui/helpers' export const NestedForm = (props: { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatBlocks.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-block.ts similarity index 95% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatBlocks.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-block.ts index 31f007d6cb..eb47906e69 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatBlocks.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-block.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import { ELEMENT_CODE_BLOCK, ELEMENT_HR, @@ -20,8 +14,8 @@ import { } from '@udecode/plate-headless' import type { AutoformatRule } from '@udecode/plate-headless' -import { preFormat } from './autoformatUtils' -import { insertEmptyCodeBlock } from '../../../transforms/insertEmptyBlock' +import { preFormat } from './autoformat-utils' +import { insertEmptyCodeBlock } from '../../../transforms/insert-empty-block' export const autoformatBlocks: AutoformatRule[] = [ { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatLists.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-lists.ts similarity index 79% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatLists.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-lists.ts index 5c436984ed..614c937fbf 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatLists.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-lists.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import { ELEMENT_LI, ELEMENT_OL, @@ -12,13 +6,8 @@ import { isBlock, setNodes, } from '@udecode/plate-headless' -import type { - TTodoListItemElement, - TElement, - AutoformatRule, -} from '@udecode/plate-headless' -import { Editor } from 'slate' -import { formatList, preFormat } from './autoformatUtils' +import type { AutoformatRule } from '@udecode/plate-headless' +import { formatList, preFormat } from './autoformat-utils' export const autoformatLists: AutoformatRule[] = [ { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatMarks.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-marks.ts similarity index 97% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatMarks.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-marks.ts index c70fc1d8f8..0aa71bced5 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatMarks.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-marks.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import { MARK_BOLD, MARK_CODE, MARK_ITALIC } from '@udecode/plate-headless' import type { AutoformatRule } from '@udecode/plate-headless' diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-rules.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-rules.ts new file mode 100644 index 0000000000..226f06b105 --- /dev/null +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-rules.ts @@ -0,0 +1,9 @@ +import { autoformatBlocks } from './autoformat-block' +import { autoformatLists } from './autoformat-lists' +import { autoformatMarks } from './autoformat-marks' + +export const autoformatRules = [ + ...autoformatBlocks, + ...autoformatLists, + ...autoformatMarks, +] diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatUtils.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-utils.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatUtils.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-utils.ts index 972f340ce0..244dda487b 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatUtils.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-utils.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import { ELEMENT_CODE_BLOCK, ELEMENT_CODE_LINE, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/common.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/common.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/common.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/common.tsx index 1121db2b67..7274e8c717 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/common.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/common.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import { someNode, getPluginType, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/formatting.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/formatting.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/formatting.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/formatting.tsx index 305bdf133d..349c446f43 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/formatting.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/formatting.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import { createPluginFactory, isSelectionAtBlockStart, @@ -22,7 +18,7 @@ import { KEYS_HEADING, } from '@udecode/plate-headless' import { createSoftBreakPlugin } from '../soft-break' -import { autoformatRules } from './autoformat/autoformatRules' +import { autoformatRules } from './autoformat/autoformat-rules' import { withCorrectVoidBehavior } from './with-correct-void-behavior' export const HANDLES_MDX = [ diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/index.tsx similarity index 91% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/index.tsx index 98394c4980..fceafe459a 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/index.tsx @@ -1,8 +1,2 @@ -/** - - - -*/ - export { plugins as commonPlugins } from './common' export { plugins as formattingPlugins } from './formatting' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/with-correct-void-behavior.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/with-correct-void-behavior.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/with-correct-void-behavior.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/with-correct-void-behavior.ts index caa2e7b9fe..29166fbae2 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/with-correct-void-behavior.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/with-correct-void-behavior.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import { isElement } from '@udecode/plate-headless' import { Editor, Node, Path, Range, Transforms } from 'slate' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-code-block/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-code-block/index.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-code-block/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-code-block/index.tsx index 3aa92fc7b8..b4cdaa1566 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-code-block/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-code-block/index.tsx @@ -1,8 +1,3 @@ -/** - - - -*/ import { createPluginFactory } from '@udecode/plate-headless' export const createCodeBlockPlugin = createPluginFactory({ diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-img-plugin/component.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-img-plugin/component.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx index 199507be2e..155a2e9fda 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-img-plugin/component.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import React from 'react' import { useSelected } from 'slate-react' import { insertNodes, ELEMENT_PARAGRAPH } from '@udecode/plate-headless' @@ -13,7 +9,7 @@ import { StyledFile, StyledImage, } from '../../../../../components' -import { isImage } from '../../../../../../../components/media/utils' +import { isImage } from '@/components/media/utils' export const ImgEmbed = ({ attributes, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-img-plugin/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx similarity index 88% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-img-plugin/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx index 635add9a9a..721f4fae8c 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-img-plugin/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import React from 'react' import { ImgEmbed } from './component' import { @@ -11,9 +7,9 @@ import { setNodes, } from '@udecode/plate-headless' import { ReactEditor } from 'slate-react' -import { insertBlockElement, insertInlineElement } from '../core/common' +import { insertInlineElement } from '../core/common' import { Media } from '../../../../../../core/media' -import { isImage } from '../../../../../../../components/media/utils' +import { isImage } from '@/components/media/utils' export const ELEMENT_IMG = 'img' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-invalid-markdown-plugin/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-invalid-markdown-plugin/index.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-invalid-markdown-plugin/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-invalid-markdown-plugin/index.tsx index 68d2b61d49..6890dee0ac 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-invalid-markdown-plugin/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-invalid-markdown-plugin/index.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import React from 'react' import { createPluginFactory } from '@udecode/plate-headless' import { useEditorContext } from '../../editor-context' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-link-plugin/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-link-plugin/index.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-link-plugin/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-link-plugin/index.tsx index d9bd69bbf4..96eb3b8327 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-link-plugin/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-link-plugin/index.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import React from 'react' import { useEditorState, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-mdx-plugins/component.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-mdx-plugins/component.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx index a3b69d5bb0..295a759ccd 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-mdx-plugins/component.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import React from 'react' import { Element } from 'slate' import { useSelected, ReactEditor } from 'slate-react' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-mdx-plugins/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/index.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-mdx-plugins/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/index.tsx index d865a1061e..73d2d3f11f 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/create-mdx-plugins/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/index.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import React from 'react' import { createPluginFactory, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/createSoftBreakPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/create-soft-break-plugin.tsx similarity index 92% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/createSoftBreakPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/create-soft-break-plugin.tsx index a56efdc13f..999cc5f3cf 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/createSoftBreakPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/create-soft-break-plugin.tsx @@ -1,9 +1,6 @@ -/** - -*/ import React from 'react' import { createPluginFactory } from '@udecode/plate-headless' -import { onKeyDownSoftBreak } from './onKeyDownSoftBreak' +import { onKeyDownSoftBreak } from './on-key-down-soft-break' import { SoftBreakPlugin } from './types' export const KEY_SOFT_BREAK = 'break' diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/index.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/index.ts new file mode 100644 index 0000000000..bfa5021dac --- /dev/null +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/index.ts @@ -0,0 +1,7 @@ +/** + * @file Automatically generated by barrelsby. + */ + +export * from './create-soft-break-plugin' +export * from './on-key-down-soft-break' +export * from './types' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/onKeyDownSoftBreak.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/on-key-down-soft-break.ts similarity index 91% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/onKeyDownSoftBreak.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/on-key-down-soft-break.ts index e9060a2297..18a96e1777 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/onKeyDownSoftBreak.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/on-key-down-soft-break.ts @@ -1,9 +1,6 @@ -/** - -*/ import { getBlockAbove, queryNode, insertNodes } from '@udecode/plate-headless' import isHotkey from 'is-hotkey' -import { KEY_SOFT_BREAK } from './createSoftBreakPlugin' +import { KEY_SOFT_BREAK } from './create-soft-break-plugin' export const onKeyDownSoftBreak = (editor, { options: { rules = [] } }) => diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/types.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/types.ts similarity index 97% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/types.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/types.ts index 1a50ca926e..7285c637f5 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/types.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/types.ts @@ -1,6 +1,3 @@ -/** - -*/ import { QueryNodeOptions } from '@udecode/plate-headless' export interface SoftBreakRule { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/autocomplete.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/autocomplete.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/autocomplete.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/autocomplete.tsx index 4b82969c3c..a2eefe6b1b 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/autocomplete.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/autocomplete.tsx @@ -1,8 +1,3 @@ -/** - - -*/ - import React, { Fragment } from 'react' import { Combobox, Transition } from '@headlessui/react' import { classNames } from './helpers' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/code-block/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/code-block/index.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/code-block/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/code-block/index.tsx index 34d2453ae1..7d7e5f5973 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/code-block/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/code-block/index.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import React from 'react' import { ELEMENT_DEFAULT, @@ -18,7 +12,6 @@ import { getPointBefore, isCollapsed, } from '@udecode/plate-headless' -import { Dropdown } from '../dropdown' import { uuid } from '../helpers' import MonacoEditor, { useMonaco, loader } from '@monaco-editor/react' import type * as monaco from 'monaco-editor' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/components.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/components.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/components.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/components.tsx index 62fff07013..69b99f78d3 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/components.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/components.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import React from 'react' import { ELEMENT_HR, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/dropdown.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/dropdown.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx index e7290ae4d3..924826fd4e 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/dropdown.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx @@ -1,8 +1,3 @@ -/** - - -*/ - import React, { Fragment } from 'react' import { Menu, Transition } from '@headlessui/react' import { ChevronDownIcon } from '@heroicons/react/solid' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/helpers.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/helpers.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/helpers.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/helpers.tsx index 40ab086890..753976e48c 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/helpers.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/helpers.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - export function classNames(...classes: string[]) { return classes.filter(Boolean).join(' ') } diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/icons.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/icons.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/icons.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/icons.tsx index 225712924b..f05167ca58 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/icons.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/icons.tsx @@ -1,7 +1,3 @@ -/** - -*/ - import React from 'react' const RawMarkdown = () => { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/floating-toolbar.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/floating-toolbar.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/floating-toolbar.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/floating-toolbar.tsx index 64ee351436..13aeb083c8 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/floating-toolbar.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/floating-toolbar.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' import { getEditorString, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/index.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/index.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/index.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/index.tsx index 58972248cf..ca57eea1a9 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/index.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/index.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' import { useEditorState, @@ -37,7 +31,7 @@ import { ELEMENT_IMG } from '../../create-img-plugin' import type { MdxTemplate } from '../../../types' import { useEditorContext } from '../../../editor-context' -import { insertEmptyCodeBlock } from '../../../transforms/insertEmptyBlock' +import { insertEmptyCodeBlock } from '../../../transforms/insert-empty-block' const headers = [ { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/overflow-menu.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/overflow-menu.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/overflow-menu.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/overflow-menu.tsx index 6884676492..4b8a5f9f41 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/overflow-menu.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/overflow-menu.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' import { Fragment } from 'react' import { ToolbarIcon } from '../icons' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/resize-observer.d.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/resize-observer.d.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/resize-observer.d.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/resize-observer.d.ts index 9525dbf5b0..e993bc166f 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/resize-observer.d.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/resize-observer.d.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - // For some reason ResizeObserver can't be found // Type definitions for non-npm package resize-observer-browser 0.1 // Project: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver, https://developers.google.com/web/updates/2016/10/resizeobserver, https://wicg.github.io/ResizeObserver/ diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/toolbar-item.tsx b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/toolbar-item.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx index 4845e76361..b5c549d130 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/ui/toolbar/toolbar-item.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import React, { Fragment } from 'react' import { PlusIcon, HeadingIcon, ToolbarIcon } from '../icons' import { Popover, Transition } from '@headlessui/react' @@ -18,7 +12,7 @@ import { import type { PlateEditor } from '@udecode/plate-headless' import type { MdxTemplate } from '../../../types' import { insertImg } from '../../create-img-plugin' -import { useCMS } from '../../../../../../../react-core' +import { useCMS } from '@/react-core' export type ToolbarItemType = { label: string diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/transforms/insertEmptyBlock.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/transforms/insert-empty-block.ts similarity index 98% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/transforms/insertEmptyBlock.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/transforms/insert-empty-block.ts index 6b71df082f..a8bda1c8fa 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/transforms/insertEmptyBlock.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/transforms/insert-empty-block.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - import { ELEMENT_CODE_BLOCK, PlateEditor, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/types.ts b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/types.ts similarity index 70% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/types.ts rename to packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/types.ts index 3897341958..9f9ab104e2 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/types.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/types.ts @@ -1,8 +1,4 @@ -/** - -*/ - -import type { Field } from '../../../../forms' +import type { Field } from '@/forms' export type MdxTemplate = { label: string diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/NumberFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/number-field-plugin.tsx similarity index 84% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/NumberFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/number-field-plugin.tsx index 979ceb2fe8..ca5ba79cd0 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/NumberFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/number-field-plugin.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' import { NumberInput as BaseNumberField, InputProps } from '../components' -import { parse } from './numberFormat' +import { parse } from './number-format' export const NumberField = wrapFieldsWithMeta<{ step: string | number diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/numberFormat.ts b/packages/@tinacms/toolkit/src/fields/plugins/number-format.ts similarity index 83% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/numberFormat.ts rename to packages/@tinacms/toolkit/src/fields/plugins/number-format.ts index c37cae6dcd..2ca0735c7a 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/numberFormat.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/number-format.ts @@ -1,7 +1 @@ -/** - - - -*/ - export const parse = (value?: string) => value && +value diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/RadioGroupFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/radio-group-field-plugin.tsx similarity index 84% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/RadioGroupFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/radio-group-field-plugin.tsx index 1112fa076a..a78d7dcdfd 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/RadioGroupFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/radio-group-field-plugin.tsx @@ -1,4 +1,4 @@ -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' import { RadioGroup } from '../components' export const RadioGroupField = wrapFieldsWithMeta(RadioGroup) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/ReferenceFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/reference-field-plugin.tsx similarity index 66% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/ReferenceFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/reference-field-plugin.tsx index fb59fc0e00..94a6ae9a34 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/ReferenceFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/reference-field-plugin.tsx @@ -1,6 +1,6 @@ -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' -import { Reference } from './../components/Reference' -import { parse } from './textFormat' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' +import { Reference } from '../components/reference' +import { parse } from './text-format' export const ReferenceField = wrapFieldsWithMeta(Reference) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/SelectFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/select-field-plugin.tsx similarity index 76% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/SelectFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/select-field-plugin.tsx index b1a6cd855b..73208f1477 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/SelectFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/select-field-plugin.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' import { Select } from '../components' -import { parse } from './textFormat' +import { parse } from './text-format' // @ts-ignore export const SelectField = wrapFieldsWithMeta(Select) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/TagsFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/tags-field-plugin.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/TagsFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/tags-field-plugin.tsx index 26148e9cd0..273685f9c3 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/TagsFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/tags-field-plugin.tsx @@ -1,16 +1,10 @@ -/** - - - -*/ - import * as React from 'react' import { InputProps, BaseTextField } from '../components' -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' -import { parse } from './textFormat' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' +import { parse } from './text-format' import { BiX } from 'react-icons/bi' -import { AddIcon } from '../../icons' -import { IconButton } from '../../styles' +import { AddIcon } from '@/icons' +import { IconButton } from '@/styles' export const TagsField = wrapFieldsWithMeta< { placeholder: string }, diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/TextFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/text-field-plugin.tsx similarity index 89% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/TextFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/text-field-plugin.tsx index 2b7a541ec7..8dce6e6eca 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/TextFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/text-field-plugin.tsx @@ -1,13 +1,7 @@ -/** - - - -*/ - import * as React from 'react' import { BaseTextField, InputProps } from '../components' -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' -import { parse } from './textFormat' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' +import { parse } from './text-format' interface ExtraProps { placeholder: string disabled?: boolean diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/textFormat.test.ts b/packages/@tinacms/toolkit/src/fields/plugins/text-format.test.ts similarity index 81% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/textFormat.test.ts rename to packages/@tinacms/toolkit/src/fields/plugins/text-format.test.ts index 73d786dc75..29c49333fb 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/textFormat.test.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/text-format.test.ts @@ -1,10 +1,5 @@ -/** - - - -*/ - -import { parse } from './textFormat' +import { parse } from './text-format' +import { describe, it, expect } from 'vitest' describe('text format', () => { describe('parse', () => { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/textFormat.ts b/packages/@tinacms/toolkit/src/fields/plugins/text-format.ts similarity index 82% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/textFormat.ts rename to packages/@tinacms/toolkit/src/fields/plugins/text-format.ts index cadadc606b..06e2effc6f 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/textFormat.ts +++ b/packages/@tinacms/toolkit/src/fields/plugins/text-format.ts @@ -1,7 +1 @@ -/** - - - -*/ - export const parse = (value?: string) => value || '' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/TextareaFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/textarea-field-plugin.tsx similarity index 89% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/TextareaFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/textarea-field-plugin.tsx index 02ee86667c..28e976d0f0 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/TextareaFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/textarea-field-plugin.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { TextArea, InputProps } from '../components' -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' -import { parse } from './textFormat' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' +import { parse } from './text-format' export const TextareaField = wrapFieldsWithMeta<{ input: InputProps }>( (props) => { diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/ToggleFieldPlugin.tsx b/packages/@tinacms/toolkit/src/fields/plugins/toggle-field-plugin.tsx similarity index 85% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/ToggleFieldPlugin.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/toggle-field-plugin.tsx index 704093911e..ae92e8674f 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/ToggleFieldPlugin.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/toggle-field-plugin.tsx @@ -1,4 +1,4 @@ -import { wrapFieldsWithMeta } from './wrapFieldWithMeta' +import { wrapFieldsWithMeta } from './wrap-field-with-meta' import { Toggle } from '../components' export const ToggleField = wrapFieldsWithMeta(Toggle) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/wrapFieldWithMeta.tsx b/packages/@tinacms/toolkit/src/fields/plugins/wrap-field-with-meta.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/packages/fields/plugins/wrapFieldWithMeta.tsx rename to packages/@tinacms/toolkit/src/fields/plugins/wrap-field-with-meta.tsx index ff002ac8df..9c9b63b688 100644 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/wrapFieldWithMeta.tsx +++ b/packages/@tinacms/toolkit/src/fields/plugins/wrap-field-with-meta.tsx @@ -1,14 +1,8 @@ -/** - - - -*/ - import * as React from 'react' -import { FieldProps } from './fieldProps' -import { useEvent } from '../../react-core/use-cms-event' -import { FieldHoverEvent, FieldFocusEvent } from '../field-events' -import { Form } from '../../forms' +import { FieldProps } from './field-props' +import { useEvent } from '@/react-core/use-cms-event' +import { FieldHoverEvent, FieldFocusEvent } from '@/fields/field-events' +import { Form } from '@/forms' export type InputFieldType = FieldProps & ExtraFieldProps diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/field-plugin.tsx b/packages/@tinacms/toolkit/src/form-builder/field-plugin.tsx similarity index 70% rename from packages/@tinacms/toolkit/src/packages/form-builder/field-plugin.tsx rename to packages/@tinacms/toolkit/src/form-builder/field-plugin.tsx index b440e2519a..1e88c945f1 100644 --- a/packages/@tinacms/toolkit/src/packages/form-builder/field-plugin.tsx +++ b/packages/@tinacms/toolkit/src/form-builder/field-plugin.tsx @@ -1,11 +1,5 @@ -/** - - - -*/ - -import { Field } from '../forms' -import { InputFieldType } from '../fields/plugins/wrapFieldWithMeta' +import { Field } from '@/forms' +import { InputFieldType } from '@/fields/plugins/wrap-field-with-meta' export interface FieldPlugin { __type: 'field' @@ -23,4 +17,4 @@ export interface FieldPlugin { defaultValue?: any } -export type { InputFieldType } from '../fields/plugins/wrapFieldWithMeta' +export type { InputFieldType } from '../fields/plugins/wrap-field-with-meta' diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/fields-builder.tsx b/packages/@tinacms/toolkit/src/form-builder/fields-builder.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/form-builder/fields-builder.tsx rename to packages/@tinacms/toolkit/src/form-builder/fields-builder.tsx index ef82df2261..58ccbe36b9 100644 --- a/packages/@tinacms/toolkit/src/packages/form-builder/fields-builder.tsx +++ b/packages/@tinacms/toolkit/src/form-builder/fields-builder.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - import * as React from 'react' -import { Form, Field } from '../forms' -import { useCMS, useEventSubscription } from '../react-core' +import { Form, Field } from '@/forms' +import { useCMS, useEventSubscription } from '@/react-core' import { Field as FinalField } from 'react-final-form' import { FieldPlugin } from './field-plugin' diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/FormActions.tsx b/packages/@tinacms/toolkit/src/form-builder/form-actions.tsx similarity index 93% rename from packages/@tinacms/toolkit/src/packages/form-builder/FormActions.tsx rename to packages/@tinacms/toolkit/src/form-builder/form-actions.tsx index 9ba00492f0..7e0c947c20 100644 --- a/packages/@tinacms/toolkit/src/packages/form-builder/FormActions.tsx +++ b/packages/@tinacms/toolkit/src/form-builder/form-actions.tsx @@ -1,14 +1,8 @@ -/** - - - -*/ - import * as React from 'react' -import { EllipsisVerticalIcon } from '../icons' +import { EllipsisVerticalIcon } from '@/icons' import { useState, FC } from 'react' -import { Dismissible } from '../../packages/react-dismissible' -import { Form } from '../forms' +import { Dismissible } from '@/react-dismissible' +import { Form } from '@/forms' export interface FormActionMenuProps { form: Form diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/FormBuilder.tsx b/packages/@tinacms/toolkit/src/form-builder/form-builder.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/form-builder/FormBuilder.tsx rename to packages/@tinacms/toolkit/src/form-builder/form-builder.tsx index 555219f9e1..4e1ef612b2 100644 --- a/packages/@tinacms/toolkit/src/packages/form-builder/FormBuilder.tsx +++ b/packages/@tinacms/toolkit/src/form-builder/form-builder.tsx @@ -1,15 +1,15 @@ import * as React from 'react' import { FC, useEffect } from 'react' -import { Form } from '../forms' +import { Form } from '@/forms' import { Form as FinalForm } from 'react-final-form' import { DragDropContext, DropResult } from 'react-beautiful-dnd' -import { Button, OverflowMenu } from '../styles' -import { LoadingDots } from './LoadingDots' -import { FormPortalProvider } from './FormPortal' +import { Button, OverflowMenu } from '@/styles' +import { LoadingDots } from './loading-dots' +import { FormPortalProvider } from './form-portal' import { FieldsBuilder } from './fields-builder' -import { ResetForm } from './ResetForm' -import { FormActionMenu } from './FormActions' +import { ResetForm } from './reset-form' +import { FormActionMenu } from './form-actions' import { useCMS } from '../react-core' import { IoMdClose } from 'react-icons/io' import { @@ -21,7 +21,7 @@ import { } from '../react-modals' import { BiGitBranch } from 'react-icons/bi' import { MdOutlineSaveAlt } from 'react-icons/md' -import { formatBranchName } from '../../plugins/branch-switcher/BranchSwitcher' +import { formatBranchName } from '@/plugin-branch-switcher' export interface FormBuilderProps { form: { tinaForm: Form; activeFieldName?: string } diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/FormLegacy.tsx b/packages/@tinacms/toolkit/src/form-builder/form-legacy.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/packages/form-builder/FormLegacy.tsx rename to packages/@tinacms/toolkit/src/form-builder/form-legacy.tsx index fb6f6ba4bd..b1d632eff7 100644 --- a/packages/@tinacms/toolkit/src/packages/form-builder/FormLegacy.tsx +++ b/packages/@tinacms/toolkit/src/form-builder/form-legacy.tsx @@ -1,11 +1,5 @@ -/** - - - -*/ - import * as React from 'react' -import { Form } from '../forms' +import { Form } from '@/forms' import { Form as FinalForm, FormRenderProps } from 'react-final-form' import { FC } from 'react' diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/FormPortal.tsx b/packages/@tinacms/toolkit/src/form-builder/form-portal.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/form-builder/FormPortal.tsx rename to packages/@tinacms/toolkit/src/form-builder/form-portal.tsx diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/Form.tsx b/packages/@tinacms/toolkit/src/form-builder/form.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/form-builder/Form.tsx rename to packages/@tinacms/toolkit/src/form-builder/form.tsx index ff59bd3d68..00662346f8 100644 --- a/packages/@tinacms/toolkit/src/packages/form-builder/Form.tsx +++ b/packages/@tinacms/toolkit/src/form-builder/form.tsx @@ -1,14 +1,8 @@ -/** - - - -*/ - import * as React from 'react' import { useState, useContext } from 'react' import PropTypes from 'prop-types' -import { Form } from '../forms' -import { FormLegacy } from './FormLegacy' +import { Form } from '@/forms' +import { FormLegacy } from './form-legacy' import { Field } from 'react-final-form' interface RenderProps { diff --git a/packages/@tinacms/toolkit/src/form-builder/index.ts b/packages/@tinacms/toolkit/src/form-builder/index.ts new file mode 100644 index 0000000000..a333fb9e2a --- /dev/null +++ b/packages/@tinacms/toolkit/src/form-builder/index.ts @@ -0,0 +1,10 @@ +export * from './field-plugin' +export * from './fields-builder' +export * from './form' +export * from './form-builder' +export * from './form-legacy' +export * from './form-portal' +export * from './loading-dots' +export * from './reset-form' +export * from './form-actions' +export type { FieldRenderProps } from 'react-final-form' diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/LoadingDots.css b/packages/@tinacms/toolkit/src/form-builder/loading-dots.css similarity index 100% rename from packages/@tinacms/toolkit/src/packages/form-builder/LoadingDots.css rename to packages/@tinacms/toolkit/src/form-builder/loading-dots.css diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/LoadingDots.tsx b/packages/@tinacms/toolkit/src/form-builder/loading-dots.tsx similarity index 90% rename from packages/@tinacms/toolkit/src/packages/form-builder/LoadingDots.tsx rename to packages/@tinacms/toolkit/src/form-builder/loading-dots.tsx index b96ade6be9..788e8669b3 100644 --- a/packages/@tinacms/toolkit/src/packages/form-builder/LoadingDots.tsx +++ b/packages/@tinacms/toolkit/src/form-builder/loading-dots.tsx @@ -1,13 +1,7 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ -/** - - - -*/ - import * as React from 'react' -// @ts-ignore importing css is not recognized -import keyframes from './LoadingDots.css' +// @ts-ignore +import keyframes from './loading-dots.css' interface LoadingDotsProps { dotSize?: number diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/ResetForm.tsx b/packages/@tinacms/toolkit/src/form-builder/reset-form.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/packages/form-builder/ResetForm.tsx rename to packages/@tinacms/toolkit/src/form-builder/reset-form.tsx index 0f4c02cac7..35072d675f 100644 --- a/packages/@tinacms/toolkit/src/packages/form-builder/ResetForm.tsx +++ b/packages/@tinacms/toolkit/src/form-builder/reset-form.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - import * as React from 'react' import { FC } from 'react' -import { Button } from '../styles' +import { Button } from '@/styles' import { Modal, ModalHeader, diff --git a/packages/@tinacms/toolkit/src/packages/forms/content-creator-plugin.ts b/packages/@tinacms/toolkit/src/forms/content-creator-plugin.ts similarity index 89% rename from packages/@tinacms/toolkit/src/packages/forms/content-creator-plugin.ts rename to packages/@tinacms/toolkit/src/forms/content-creator-plugin.ts index 9cb5380e5e..2672f6d110 100644 --- a/packages/@tinacms/toolkit/src/packages/forms/content-creator-plugin.ts +++ b/packages/@tinacms/toolkit/src/forms/content-creator-plugin.ts @@ -1,10 +1,4 @@ -/** - - - -*/ - -import { CMS, Plugin } from '../core' +import { CMS, Plugin } from '@/core' import { Field } from './field' import { FormOptions } from './form' diff --git a/packages/@tinacms/toolkit/src/packages/forms/field.ts b/packages/@tinacms/toolkit/src/forms/field.ts similarity index 100% rename from packages/@tinacms/toolkit/src/packages/forms/field.ts rename to packages/@tinacms/toolkit/src/forms/field.ts diff --git a/packages/@tinacms/toolkit/src/packages/forms/form.test.ts b/packages/@tinacms/toolkit/src/forms/form.test.ts similarity index 93% rename from packages/@tinacms/toolkit/src/packages/forms/form.test.ts rename to packages/@tinacms/toolkit/src/forms/form.test.ts index e3107083f1..b2212a1db9 100644 --- a/packages/@tinacms/toolkit/src/packages/forms/form.test.ts +++ b/packages/@tinacms/toolkit/src/forms/form.test.ts @@ -1,11 +1,6 @@ -/** - - - -*/ - import { Form, FormOptions } from './form' -import { wait } from '@testing-library/react' +import { describe, it, expect, beforeEach, vi } from 'vitest' +import { waitFor } from '@testing-library/react' describe('Form', () => { let DEFAULTS: FormOptions @@ -14,7 +9,7 @@ describe('Form', () => { DEFAULTS = { id: 'example', label: 'Example', - onSubmit: jest.fn(), + onSubmit: vi.fn(), fields: [], } }) @@ -59,11 +54,12 @@ describe('Form', () => { ...DEFAULTS, loadInitialValues: () => new Promise((r) => { + // @ts-ignore resolve = r }), }) - await wait(() => { + await waitFor(() => { resolve() expect(form.loading).toBeFalsy() }) @@ -79,7 +75,7 @@ describe('Form', () => { }), }) - await wait(() => { + await waitFor(() => { resolve() expect(form.initialValues).toEqual(initialValues) }) @@ -115,7 +111,7 @@ describe('Form', () => { describe('after changing the #onSubmit', () => { it('calls the second #onSubmit and not the first', async () => { const form = new Form(DEFAULTS) - const newSubmit = jest.fn() + const newSubmit = vi.fn() form.onSubmit = newSubmit await form.submit() @@ -146,7 +142,7 @@ describe('Form', () => { ...DEFAULTS, initialValues, fields: [{ name: 'title', component: 'text' }], - onSubmit: jest.fn(() => { + onSubmit: vi.fn(() => { throw new Error() }), }) @@ -179,7 +175,7 @@ describe('Form', () => { }) describe('if given a `reset` option', () => { it('calls the user defined reset', async () => { - const reset = jest.fn() + const reset = vi.fn() const form = new Form({ ...DEFAULTS, reset, @@ -193,7 +189,7 @@ describe('Form', () => { it('sets the form values to the initialValues', async () => { const form = new Form({ ...DEFAULTS, - reset: jest.fn(), + reset: vi.fn(), initialValues, }) @@ -206,7 +202,7 @@ describe('Form', () => { it('sets does not the form values to the initialValues', async () => { const form = new Form({ ...DEFAULTS, - reset: jest.fn(() => { + reset: vi.fn(() => { throw new Error() }), }) diff --git a/packages/@tinacms/toolkit/src/packages/forms/form.ts b/packages/@tinacms/toolkit/src/forms/form.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/forms/form.ts rename to packages/@tinacms/toolkit/src/forms/form.ts index e68881b38b..1d145ac3d4 100644 --- a/packages/@tinacms/toolkit/src/packages/forms/form.ts +++ b/packages/@tinacms/toolkit/src/forms/form.ts @@ -9,7 +9,7 @@ import { getIn, } from 'final-form' import type { FormSubscription } from 'final-form' -import type { Plugin } from '../core' +import type { Plugin } from '@/core' import { Field, AnyField } from './field' export type { FormApi } diff --git a/packages/@tinacms/toolkit/src/packages/forms/form.updateValues.test.ts b/packages/@tinacms/toolkit/src/forms/form.update-values.test.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/forms/form.updateValues.test.ts rename to packages/@tinacms/toolkit/src/forms/form.update-values.test.ts index 502d5f0a93..1c9f71071c 100644 --- a/packages/@tinacms/toolkit/src/packages/forms/form.updateValues.test.ts +++ b/packages/@tinacms/toolkit/src/forms/form.update-values.test.ts @@ -1,11 +1,6 @@ -/** - - - -*/ - import { Form } from './form' import { Field } from './field' +import { describe, it, test, expect, beforeEach, vi } from 'vitest' function makeForm(initialValues: any, fields: Field[] = []) { return new Form({ @@ -224,6 +219,7 @@ describe('Form#updateValues', () => { let form: Form + // @ts-ignore beforeEach(() => (form = makeForm(initialValues))) describe('when "author.name" is active', () => { diff --git a/packages/@tinacms/toolkit/src/packages/forms/index.ts b/packages/@tinacms/toolkit/src/forms/index.ts similarity index 93% rename from packages/@tinacms/toolkit/src/packages/forms/index.ts rename to packages/@tinacms/toolkit/src/forms/index.ts index 7d91794ded..7196be7d71 100644 --- a/packages/@tinacms/toolkit/src/packages/forms/index.ts +++ b/packages/@tinacms/toolkit/src/forms/index.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - export * from './form' export * from './field' export type { ContentCreatorPlugin } from './content-creator-plugin' diff --git a/packages/@tinacms/toolkit/src/packages/forms/types/react-frame-component.d.ts b/packages/@tinacms/toolkit/src/forms/types/react-frame-component.d.ts similarity index 78% rename from packages/@tinacms/toolkit/src/packages/forms/types/react-frame-component.d.ts rename to packages/@tinacms/toolkit/src/forms/types/react-frame-component.d.ts index 6a5a675952..512c3050f0 100644 --- a/packages/@tinacms/toolkit/src/packages/forms/types/react-frame-component.d.ts +++ b/packages/@tinacms/toolkit/src/forms/types/react-frame-component.d.ts @@ -1,7 +1 @@ -/** - - - -*/ - declare module 'react-frame-component' diff --git a/packages/@tinacms/toolkit/src/packages/git-client/git-client.ts b/packages/@tinacms/toolkit/src/git-client/git-client.ts similarity index 99% rename from packages/@tinacms/toolkit/src/packages/git-client/git-client.ts rename to packages/@tinacms/toolkit/src/git-client/git-client.ts index 87f93e9ed4..502b7ebbb2 100644 --- a/packages/@tinacms/toolkit/src/packages/git-client/git-client.ts +++ b/packages/@tinacms/toolkit/src/git-client/git-client.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - export class GitClient { constructor(private baseUrl: string) {} diff --git a/packages/@tinacms/toolkit/src/packages/git-client/git-file.ts b/packages/@tinacms/toolkit/src/git-client/git-file.ts similarity index 95% rename from packages/@tinacms/toolkit/src/packages/git-client/git-file.ts rename to packages/@tinacms/toolkit/src/git-client/git-file.ts index 7bddd4371e..b7bcacdfb6 100644 --- a/packages/@tinacms/toolkit/src/packages/git-client/git-file.ts +++ b/packages/@tinacms/toolkit/src/git-client/git-file.ts @@ -1,9 +1,4 @@ -/** - - - -*/ -import { CMS } from '../core' +import { CMS } from '@/core' import { GitClient } from './git-client' export class GitFile { diff --git a/packages/@tinacms/toolkit/src/packages/git-client/git-media-store.ts b/packages/@tinacms/toolkit/src/git-client/git-media-store.ts similarity index 98% rename from packages/@tinacms/toolkit/src/packages/git-client/git-media-store.ts rename to packages/@tinacms/toolkit/src/git-client/git-media-store.ts index 9fd5b79dd9..4a3e6f7c2e 100644 --- a/packages/@tinacms/toolkit/src/packages/git-client/git-media-store.ts +++ b/packages/@tinacms/toolkit/src/git-client/git-media-store.ts @@ -1,15 +1,10 @@ -/** - - - -*/ import { MediaStore, MediaUploadOptions, Media, MediaListOptions, MediaList, -} from '../core' +} from '@/core' import { GitClient } from './git-client' export class GitMediaStore implements MediaStore { diff --git a/packages/@tinacms/toolkit/src/packages/git-client/index.ts b/packages/@tinacms/toolkit/src/git-client/index.ts similarity index 91% rename from packages/@tinacms/toolkit/src/packages/git-client/index.ts rename to packages/@tinacms/toolkit/src/git-client/index.ts index f9e0e5fbaf..ae8834b31b 100644 --- a/packages/@tinacms/toolkit/src/packages/git-client/index.ts +++ b/packages/@tinacms/toolkit/src/git-client/index.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - export * from './git-client' export * from './git-file' export * from './use-git-file' diff --git a/packages/@tinacms/toolkit/src/packages/git-client/use-git-file.ts b/packages/@tinacms/toolkit/src/git-client/use-git-file.ts similarity index 87% rename from packages/@tinacms/toolkit/src/packages/git-client/use-git-file.ts rename to packages/@tinacms/toolkit/src/git-client/use-git-file.ts index b905fb3870..52fddd5cd7 100644 --- a/packages/@tinacms/toolkit/src/packages/git-client/use-git-file.ts +++ b/packages/@tinacms/toolkit/src/git-client/use-git-file.ts @@ -1,10 +1,5 @@ -/** - - - -*/ import { useMemo } from 'react' -import { useCMS } from '../react-core' +import { useCMS } from '@/react-core' import { GitFile } from './git-file' export function useGitFile( diff --git a/packages/@tinacms/toolkit/src/hooks/use-field-reference.ts b/packages/@tinacms/toolkit/src/hooks/use-field-reference.ts index b3f3d2750b..0ed6c95154 100644 --- a/packages/@tinacms/toolkit/src/hooks/use-field-reference.ts +++ b/packages/@tinacms/toolkit/src/hooks/use-field-reference.ts @@ -1,11 +1,5 @@ -/** - - - -*/ - import * as React from 'react' -import { MutationSignalContext } from '../components/MutationSignal' +import { MutationSignalContext } from '@/components/mutation-signal' /** * If the DOM wrapped by Tina contains an element with a diff --git a/packages/@tinacms/toolkit/src/hooks/use-local-storage.ts b/packages/@tinacms/toolkit/src/hooks/use-local-storage.ts index ee648fa98b..884fd6cdad 100644 --- a/packages/@tinacms/toolkit/src/hooks/use-local-storage.ts +++ b/packages/@tinacms/toolkit/src/hooks/use-local-storage.ts @@ -1,7 +1,3 @@ -/** - -*/ - import * as React from 'react' export function useLocalStorage(key, initialValue) { diff --git a/packages/@tinacms/toolkit/src/packages/icons/Add.tsx b/packages/@tinacms/toolkit/src/icons/Add.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Add.tsx rename to packages/@tinacms/toolkit/src/icons/Add.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Alert.tsx b/packages/@tinacms/toolkit/src/icons/Alert.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Alert.tsx rename to packages/@tinacms/toolkit/src/icons/Alert.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/AlignCenter.tsx b/packages/@tinacms/toolkit/src/icons/AlignCenter.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/AlignCenter.tsx rename to packages/@tinacms/toolkit/src/icons/AlignCenter.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/AlignLeft.tsx b/packages/@tinacms/toolkit/src/icons/AlignLeft.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/AlignLeft.tsx rename to packages/@tinacms/toolkit/src/icons/AlignLeft.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/AlignRight.tsx b/packages/@tinacms/toolkit/src/icons/AlignRight.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/AlignRight.tsx rename to packages/@tinacms/toolkit/src/icons/AlignRight.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Bold.tsx b/packages/@tinacms/toolkit/src/icons/Bold.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Bold.tsx rename to packages/@tinacms/toolkit/src/icons/Bold.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/ChevronDown.tsx b/packages/@tinacms/toolkit/src/icons/ChevronDown.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/ChevronDown.tsx rename to packages/@tinacms/toolkit/src/icons/ChevronDown.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/ChevronLeft.tsx b/packages/@tinacms/toolkit/src/icons/ChevronLeft.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/ChevronLeft.tsx rename to packages/@tinacms/toolkit/src/icons/ChevronLeft.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/ChevronRight.tsx b/packages/@tinacms/toolkit/src/icons/ChevronRight.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/ChevronRight.tsx rename to packages/@tinacms/toolkit/src/icons/ChevronRight.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/ChevronUp.tsx b/packages/@tinacms/toolkit/src/icons/ChevronUp.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/ChevronUp.tsx rename to packages/@tinacms/toolkit/src/icons/ChevronUp.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Circle.tsx b/packages/@tinacms/toolkit/src/icons/Circle.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Circle.tsx rename to packages/@tinacms/toolkit/src/icons/Circle.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/CircleCheck.tsx b/packages/@tinacms/toolkit/src/icons/CircleCheck.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/CircleCheck.tsx rename to packages/@tinacms/toolkit/src/icons/CircleCheck.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Close.tsx b/packages/@tinacms/toolkit/src/icons/Close.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Close.tsx rename to packages/@tinacms/toolkit/src/icons/Close.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Code.tsx b/packages/@tinacms/toolkit/src/icons/Code.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Code.tsx rename to packages/@tinacms/toolkit/src/icons/Code.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Drag.tsx b/packages/@tinacms/toolkit/src/icons/Drag.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Drag.tsx rename to packages/@tinacms/toolkit/src/icons/Drag.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Duplicate.tsx b/packages/@tinacms/toolkit/src/icons/Duplicate.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Duplicate.tsx rename to packages/@tinacms/toolkit/src/icons/Duplicate.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Edit.tsx b/packages/@tinacms/toolkit/src/icons/Edit.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Edit.tsx rename to packages/@tinacms/toolkit/src/icons/Edit.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/EllipsisVertical.tsx b/packages/@tinacms/toolkit/src/icons/EllipsisVertical.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/EllipsisVertical.tsx rename to packages/@tinacms/toolkit/src/icons/EllipsisVertical.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Error.tsx b/packages/@tinacms/toolkit/src/icons/Error.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Error.tsx rename to packages/@tinacms/toolkit/src/icons/Error.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Exit.tsx b/packages/@tinacms/toolkit/src/icons/Exit.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Exit.tsx rename to packages/@tinacms/toolkit/src/icons/Exit.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/File.tsx b/packages/@tinacms/toolkit/src/icons/File.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/File.tsx rename to packages/@tinacms/toolkit/src/icons/File.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Folder.tsx b/packages/@tinacms/toolkit/src/icons/Folder.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Folder.tsx rename to packages/@tinacms/toolkit/src/icons/Folder.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Hamburger.tsx b/packages/@tinacms/toolkit/src/icons/Hamburger.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Hamburger.tsx rename to packages/@tinacms/toolkit/src/icons/Hamburger.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Heading.tsx b/packages/@tinacms/toolkit/src/icons/Heading.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Heading.tsx rename to packages/@tinacms/toolkit/src/icons/Heading.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Info.tsx b/packages/@tinacms/toolkit/src/icons/Info.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Info.tsx rename to packages/@tinacms/toolkit/src/icons/Info.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Italic.tsx b/packages/@tinacms/toolkit/src/icons/Italic.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Italic.tsx rename to packages/@tinacms/toolkit/src/icons/Italic.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/LeftArrow.tsx b/packages/@tinacms/toolkit/src/icons/LeftArrow.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/LeftArrow.tsx rename to packages/@tinacms/toolkit/src/icons/LeftArrow.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Link.tsx b/packages/@tinacms/toolkit/src/icons/Link.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Link.tsx rename to packages/@tinacms/toolkit/src/icons/Link.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Lock.tsx b/packages/@tinacms/toolkit/src/icons/Lock.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Lock.tsx rename to packages/@tinacms/toolkit/src/icons/Lock.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Markdown.tsx b/packages/@tinacms/toolkit/src/icons/Markdown.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Markdown.tsx rename to packages/@tinacms/toolkit/src/icons/Markdown.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Media.tsx b/packages/@tinacms/toolkit/src/icons/Media.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Media.tsx rename to packages/@tinacms/toolkit/src/icons/Media.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/OrderedList.tsx b/packages/@tinacms/toolkit/src/icons/OrderedList.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/OrderedList.tsx rename to packages/@tinacms/toolkit/src/icons/OrderedList.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/PullRequest.tsx b/packages/@tinacms/toolkit/src/icons/PullRequest.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/PullRequest.tsx rename to packages/@tinacms/toolkit/src/icons/PullRequest.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Quote.tsx b/packages/@tinacms/toolkit/src/icons/Quote.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Quote.tsx rename to packages/@tinacms/toolkit/src/icons/Quote.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Redo.tsx b/packages/@tinacms/toolkit/src/icons/Redo.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Redo.tsx rename to packages/@tinacms/toolkit/src/icons/Redo.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Reorder.tsx b/packages/@tinacms/toolkit/src/icons/Reorder.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Reorder.tsx rename to packages/@tinacms/toolkit/src/icons/Reorder.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/ReorderRow.tsx b/packages/@tinacms/toolkit/src/icons/ReorderRow.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/ReorderRow.tsx rename to packages/@tinacms/toolkit/src/icons/ReorderRow.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Reset.tsx b/packages/@tinacms/toolkit/src/icons/Reset.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Reset.tsx rename to packages/@tinacms/toolkit/src/icons/Reset.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/RightArrow.tsx b/packages/@tinacms/toolkit/src/icons/RightArrow.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/RightArrow.tsx rename to packages/@tinacms/toolkit/src/icons/RightArrow.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Settings.tsx b/packages/@tinacms/toolkit/src/icons/Settings.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Settings.tsx rename to packages/@tinacms/toolkit/src/icons/Settings.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Strikethrough.tsx b/packages/@tinacms/toolkit/src/icons/Strikethrough.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Strikethrough.tsx rename to packages/@tinacms/toolkit/src/icons/Strikethrough.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Table.tsx b/packages/@tinacms/toolkit/src/icons/Table.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Table.tsx rename to packages/@tinacms/toolkit/src/icons/Table.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Tina.tsx b/packages/@tinacms/toolkit/src/icons/Tina.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Tina.tsx rename to packages/@tinacms/toolkit/src/icons/Tina.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Trash.tsx b/packages/@tinacms/toolkit/src/icons/Trash.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Trash.tsx rename to packages/@tinacms/toolkit/src/icons/Trash.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Underline.tsx b/packages/@tinacms/toolkit/src/icons/Underline.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Underline.tsx rename to packages/@tinacms/toolkit/src/icons/Underline.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Undo.tsx b/packages/@tinacms/toolkit/src/icons/Undo.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Undo.tsx rename to packages/@tinacms/toolkit/src/icons/Undo.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/UnorderedList.tsx b/packages/@tinacms/toolkit/src/icons/UnorderedList.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/UnorderedList.tsx rename to packages/@tinacms/toolkit/src/icons/UnorderedList.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Upload.tsx b/packages/@tinacms/toolkit/src/icons/Upload.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Upload.tsx rename to packages/@tinacms/toolkit/src/icons/Upload.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/Warning.tsx b/packages/@tinacms/toolkit/src/icons/Warning.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/Warning.tsx rename to packages/@tinacms/toolkit/src/icons/Warning.tsx diff --git a/packages/@tinacms/toolkit/src/packages/icons/index.ts b/packages/@tinacms/toolkit/src/icons/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/packages/icons/index.ts rename to packages/@tinacms/toolkit/src/icons/index.ts diff --git a/packages/@tinacms/toolkit/src/index.ts b/packages/@tinacms/toolkit/src/index.ts index dadf9d8727..82d8f99a46 100644 --- a/packages/@tinacms/toolkit/src/index.ts +++ b/packages/@tinacms/toolkit/src/index.ts @@ -1,46 +1,35 @@ -/** - - - -*/ - /** * Export @tinacms internal packages */ -export * from './packages/react-modals' +export * from '@/react-modals' export type { Media, MediaUploadOptions, MediaStore, MediaListOptions, MediaList, -} from './packages/core' -export { MdxFieldPluginExtendible } from './packages/fields/plugins/MdxFieldPlugin' +} from '@/core' +export { MdxFieldPluginExtendible } from '@/fields/plugins/mdx-field-plugin' export { MediaManager, MediaListError, EventBus, DummyMediaStore, TinaMediaStore, -} from './packages/core' -export * from './packages/alerts' -export * from './packages/styles' -export { useScreenPlugin } from './packages/react-screens' -export type { ScreenPlugin } from './packages/react-screens' -export * from './packages/fields' -export * from './packages/form-builder' -export type { ContentCreatorPlugin as AddContentPlugin } from './packages/forms' -export type { ContentCreatorPlugin } from './packages/forms' +} from '@/core' +export * from '@/alerts' +export * from '@/styles' +export { useScreenPlugin } from '@/react-screens' +export type { ScreenPlugin } from '@/react-screens' +export * from '@/fields' +export * from '@/form-builder' +export type { ContentCreatorPlugin as AddContentPlugin } from '@/forms' +export type { ContentCreatorPlugin } from '@/forms' export type { TinaState } from './tina-state' -export * from './packages/forms' -export * from './packages/icons' -export * from './packages/react-dismissible' -export { - Nav, - LocalWarning, - BillingWarning, - SyncStatus, -} from './packages/react-sidebar' +export * from '@/forms' +export * from '@/icons' +export * from '@/react-dismissible' +export { Nav, LocalWarning, BillingWarning, SyncStatus } from '@/react-sidebar' /** * Custom `tinacms` things @@ -48,19 +37,19 @@ export { export * from './react-tinacms' export { TinaCMS } from './tina-cms' export type { TinaCMSConfig } from './tina-cms' -export { GlobalFormPlugin } from './plugins/screens' -export { FormMetaPlugin } from './plugins/form-meta' -export * from './plugins/branch-switcher' +export { GlobalFormPlugin } from '@/plugin-screens' +export { FormMetaPlugin } from '@/plugin-form-meta' +export * from '@/plugin-branch-switcher' export { TinaProvider, // Deprecated aliases to the previous exports Tina, -} from './components/TinaProvider' -export type { TinaProviderProps, TinaProps } from './components/TinaProvider' -export { TinaCMSProvider } from './components/TinaCMSProvider' -export type { TinaCMSProviderProps } from './components/TinaCMSProvider' -export { TinaUI } from './components/TinaUI' -export type { TinaUIProps } from './components/TinaUI' +} from './components/tina-provider' +export type { TinaProviderProps, TinaProps } from './components/tina-provider' +export { TinaCMSProvider } from './components/tina-cms-provider' +export type { TinaCMSProviderProps } from './components/tina-cms-provider' +export { TinaUI } from './components/tina-ui' +export type { TinaUIProps } from './components/tina-ui' export { useLocalStorage } from './hooks/use-local-storage' export { CursorPaginator } from './components/media/pagination' diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/index.ts b/packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/index.ts deleted file mode 100644 index 47e9db41fc..0000000000 --- a/packages/@tinacms/toolkit/src/packages/fields/components/ColorPicker/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - - - -*/ - -export * from './ColorPicker' diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/ImageUpload/index.ts b/packages/@tinacms/toolkit/src/packages/fields/components/ImageUpload/index.ts deleted file mode 100644 index fcee33ee28..0000000000 --- a/packages/@tinacms/toolkit/src/packages/fields/components/ImageUpload/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - - - -*/ - -export * from './ImageUpload' diff --git a/packages/@tinacms/toolkit/src/packages/fields/components/index.ts b/packages/@tinacms/toolkit/src/packages/fields/components/index.ts deleted file mode 100644 index 0ad440c3c4..0000000000 --- a/packages/@tinacms/toolkit/src/packages/fields/components/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -/** - - - -*/ - -export * from './TextField' -export * from './TextArea' -export * from './ColorPicker' -export * from './Toggle' -export * from './Select' -export * from './RadioGroup' -export * from './CheckboxGroup' -export * from './NumberInput' -export * from './ImageUpload' -export * from './Input' -export * from './Reference' -export * from './ButtonToggle' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatRules.ts b/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatRules.ts deleted file mode 100644 index 56bd6d3c34..0000000000 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/core/autoformat/autoformatRules.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - - - -*/ - -import { autoformatBlocks } from './autoformatBlocks' -import { autoformatLists } from './autoformatLists' -import { autoformatMarks } from './autoformatMarks' - -export const autoformatRules = [ - ...autoformatBlocks, - ...autoformatLists, - ...autoformatMarks, -] diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/index.ts b/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/index.ts deleted file mode 100644 index a47baf6c6c..0000000000 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/MdxFieldPlugin/plate/plugins/soft-break/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - -*/ -/** - * @file Automatically generated by barrelsby. - */ - -export * from './createSoftBreakPlugin' -export * from './onKeyDownSoftBreak' -export * from './types' diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/dateFormat.test.ts b/packages/@tinacms/toolkit/src/packages/fields/plugins/dateFormat.test.ts deleted file mode 100644 index 5f562da244..0000000000 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/dateFormat.test.ts +++ /dev/null @@ -1,78 +0,0 @@ -/** - - - -*/ - -import { format, parse } from './dateFormat' - -import moment from 'moment' - -describe('date format', () => { - describe('format', () => { - const dateString = '03 02 1972' - const dateFormat = 'MM DD YYYY' - - describe('with moment input', () => { - it('returns properly formatted string', () => { - const date = moment(dateString, dateFormat) - const result = format(date, 'date', { dateFormat: 'MM YYYY' }) - expect(result).toEqual('03 1972') - }) - }) - - describe('with date string input', () => { - it('returns properly formatted string', () => { - const dateString = '03 02 1972' - const result = format(dateString, 'date', { dateFormat: 'MM YYYY' }) - expect(result).toEqual('03 1972') - }) - }) - - describe('with non-date string input', () => { - it('returns input string', () => { - const result = format('hello!', 'date', { dateFormat: 'MM YYYY' }) - expect(result).toEqual('hello!') - }) - }) - }) - - describe('parse', () => { - const dateString = '07 02 1972' - const dateFormat = 'MM DD YYYY' - - describe('with moment input', () => { - it('returns correct date', () => { - const date = moment(dateString, dateFormat) - const result = moment( - parse(date, 'date', { dateFormat: 'MM YYYY' }) - ).toDate() as Date - - console.log('mmm ' + result) - console.log('month: ' + result.getMonth()) - expect(result.getMonth()).toEqual(6) - expect(result.getFullYear()).toEqual(1972) - }) - }) - - describe('with date string input', () => { - it('returns correct date', () => { - const result = moment( - parse('07/02/1992', 'date', { - dateFormat: 'MM/DD/YYYY', // should match date - }) - ).toDate() as Date - - expect(result.getMonth()).toEqual(6) - expect(result.getFullYear()).toEqual(1992) - }) - }) - - describe('with non-date string input', () => { - it('returns input string', () => { - const result = parse('hello!', 'date', { dateFormat: 'MM YYYY' }) - expect(result).toEqual('hello!') - }) - }) - }) -}) diff --git a/packages/@tinacms/toolkit/src/packages/fields/plugins/index.ts b/packages/@tinacms/toolkit/src/packages/fields/plugins/index.ts deleted file mode 100644 index 103c91a819..0000000000 --- a/packages/@tinacms/toolkit/src/packages/fields/plugins/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - - - -*/ - -export * from './BlocksFieldPlugin' -export * from './ColorFieldPlugin' -export * from './GroupFieldPlugin' -export * from './GroupListFieldPlugin' -export * from './ListFieldPlugin' -export * from './ImageFieldPlugin' -export * from './MdxFieldPlugin' -export * from './NumberFieldPlugin' -export * from './SelectFieldPlugin' -export * from './RadioGroupFieldPlugin' -export * from './TextareaFieldPlugin' -export * from './TextFieldPlugin' -export * from './ToggleFieldPlugin' -export * from './TagsFieldPlugin' -export * from './DateFieldPlugin' -export * from './CheckboxGroupFieldPlugin' -export * from './ReferenceFieldPlugin' -export * from './ButtonToggleFieldPlugin' -export * from './HiddenFieldPlugin' diff --git a/packages/@tinacms/toolkit/src/packages/form-builder/index.ts b/packages/@tinacms/toolkit/src/packages/form-builder/index.ts deleted file mode 100644 index 4f704b1142..0000000000 --- a/packages/@tinacms/toolkit/src/packages/form-builder/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -/** - - - -*/ - -export * from './field-plugin' -export * from './fields-builder' -export * from './Form' -export * from './FormBuilder' -export * from './FormLegacy' -export * from './FormPortal' -export * from './LoadingDots' -export * from './ResetForm' -export * from './FormActions' -export type { FieldRenderProps } from 'react-final-form' diff --git a/packages/@tinacms/toolkit/src/packages/react-alerts/index.ts b/packages/@tinacms/toolkit/src/packages/react-alerts/index.ts deleted file mode 100644 index 70e1084dc4..0000000000 --- a/packages/@tinacms/toolkit/src/packages/react-alerts/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - - - -*/ - -export * from './Alerts' diff --git a/packages/@tinacms/toolkit/src/packages/react-dismissible/index.ts b/packages/@tinacms/toolkit/src/packages/react-dismissible/index.ts deleted file mode 100644 index 8558dbc304..0000000000 --- a/packages/@tinacms/toolkit/src/packages/react-dismissible/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - - - -*/ - -export * from './Dismissible' diff --git a/packages/@tinacms/toolkit/src/packages/react-forms/index.ts b/packages/@tinacms/toolkit/src/packages/react-forms/index.ts deleted file mode 100644 index ef1f1f30b5..0000000000 --- a/packages/@tinacms/toolkit/src/packages/react-forms/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - - - -*/ - -export * from './FormModal' diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/index.ts b/packages/@tinacms/toolkit/src/packages/react-modals/Modal/index.ts deleted file mode 100644 index c8d897cc5e..0000000000 --- a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - - - -*/ -export * from './Modal' -export * from './ModalActions' -export * from './ModalBody' -export * from './ModalHeader' -export * from './ModalOverlay' diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/index.ts b/packages/@tinacms/toolkit/src/packages/react-modals/index.ts deleted file mode 100644 index 17ef6ab483..0000000000 --- a/packages/@tinacms/toolkit/src/packages/react-modals/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - - - -*/ - -export * from './ModalProvider' -export * from './Modal' -export * from './FullscreenModal' -export * from './PopupModal' diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/Sidebar.test.tsx b/packages/@tinacms/toolkit/src/packages/react-sidebar/components/Sidebar.test.tsx deleted file mode 100644 index 8163f2c351..0000000000 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/Sidebar.test.tsx +++ /dev/null @@ -1,67 +0,0 @@ -/** - - - -*/ - -import { render } from '@testing-library/react' -import '@testing-library/jest-dom/extend-expect' - -import React from 'react' -import { SidebarProvider } from './Sidebar' -import { TinaCMSProvider, TinaCMS } from '../../..' - -const createClient = (isLocal) => - new TinaCMS({ - enabled: true, - sidebar: true, - apis: { - tina: { isLocalMode: isLocal }, - }, - }) - -describe('Sidebar', () => { - describe('with local client', () => { - const cms = createClient(true) - cms.registerApi('admin', { - fetchCollections: () => { - return [] - }, - }) - - it('shows local banner', () => { - const { queryByText } = render( - - -
My site
- - - ) - - const banner = queryByText(/Local Mode/) - expect(banner).toBeInTheDocument() - }) - }) - - describe('with prod client', () => { - const cms = createClient(false) - cms.registerApi('admin', { - fetchCollections: () => { - return [] - }, - }) - - it('doesnt show local banner', () => { - const { queryByText } = render( - - -
My site
- - - ) - - const banner = queryByText(/Local Mode/) - expect(banner).not.toBeInTheDocument() - }) - }) -}) diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/index.ts b/packages/@tinacms/toolkit/src/packages/react-sidebar/index.ts deleted file mode 100644 index 703640d0d1..0000000000 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - - - -*/ - -export * from './sidebar' -export { SidebarProvider } from './components/Sidebar' -export { Nav } from './components/Nav' -export { LocalWarning, BillingWarning } from './components/LocalWarning' -export { SyncStatus } from './components/SyncStatus' diff --git a/packages/@tinacms/toolkit/src/packages/styles/FontLoader.tsx b/packages/@tinacms/toolkit/src/packages/styles/FontLoader.tsx deleted file mode 100644 index abc308d4e3..0000000000 --- a/packages/@tinacms/toolkit/src/packages/styles/FontLoader.tsx +++ /dev/null @@ -1,42 +0,0 @@ -/** - -Copyright 2021 Forestry.io Holdings, Inc. - - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -import * as React from 'react' - -export function FontLoader() { - const [fontLoaded, setFontLoaded] = React.useState(false) - - const WebFontConfig = { - google: { - families: ['Inter:400,600'], - }, - loading: () => { - setFontLoaded(true) - }, - } - - React.useEffect(() => { - if (!fontLoaded) { - import('webfontloader').then((WebFont) => { - return WebFont.load(WebFontConfig) - }) - } - }, []) - - return null -} diff --git a/packages/@tinacms/toolkit/src/packages/styles/index.ts b/packages/@tinacms/toolkit/src/packages/styles/index.ts deleted file mode 100644 index 790aef44d2..0000000000 --- a/packages/@tinacms/toolkit/src/packages/styles/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - - - -*/ - -export * from './Button' -export * from './FontLoader' -export * from './OverflowMenu' -export * from './Message' diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/README.md b/packages/@tinacms/toolkit/src/plugin-branch-switcher/README.md similarity index 87% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/README.md rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/README.md index 36e0c65ae8..d2714a6193 100644 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/README.md +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/README.md @@ -9,8 +9,8 @@ To use with Tina Cloud, all you need to do is set the `branch-switcher` feature ```tsx export default defineConfig({ cmsCallback: (cms) => { - cms.flags.set('branch-switcher', true) - return cms + cms.flags.set('branch-switcher', true) + return cms }, }) ``` diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchBanner.tsx b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-banner.tsx similarity index 92% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchBanner.tsx rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-banner.tsx index 8dcc750910..b762118d52 100644 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchBanner.tsx +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-banner.tsx @@ -5,11 +5,11 @@ import { BiLinkExternal, BiLockAlt, } from 'react-icons/bi' -import { useBranchData } from './BranchData' -import { BranchModal } from './BranchModal' -import { Button } from '../../packages/styles' +import { useBranchData } from './branch-data' +import { BranchModal } from './branch-modal' +import { Button } from '@/styles' import { useWindowWidth } from '@react-hook/window-size' -import { useCMS } from '../../react-tinacms/use-cms' +import { useCMS } from '@/react-tinacms/use-cms' // trim 'tina/' prefix from branch name const trimPrefix = (branchName: string) => { diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchButton.tsx b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-button.tsx similarity index 92% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchButton.tsx rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-button.tsx index 6746dfe677..1b132b7a24 100644 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchButton.tsx +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-button.tsx @@ -1,8 +1,8 @@ import * as React from 'react' import { BiChevronDown, BiGitBranch, BiLockAlt } from 'react-icons/bi' -import { useBranchData } from './BranchData' -import { BranchModal } from './BranchModal' -import { useCMS } from '../../react-tinacms' +import { useBranchData } from './branch-data' +import { BranchModal } from './branch-modal' +import { useCMS } from '@/react-tinacms' // trim 'tina/' prefix from branch name const trimPrefix = (branchName: string) => { diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchData.tsx b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-data.tsx similarity index 93% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchData.tsx rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-data.tsx index c8b3fd6907..f1794b8866 100644 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchData.tsx +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-data.tsx @@ -1,9 +1,6 @@ -/** - -*/ import * as React from 'react' import { BranchChangeEvent } from './types' -import { useEvent } from '../../packages/react-core' +import { useEvent } from '@/react-core' export interface BranchContextData { currentBranch: string diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchModal.tsx b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-modal.tsx similarity index 77% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchModal.tsx rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-modal.tsx index bd187c5090..10a444c0bf 100644 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchModal.tsx +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-modal.tsx @@ -1,13 +1,8 @@ import * as React from 'react' -import { - Modal, - ModalBody, - ModalHeader, - PopupModal, -} from '../../packages/react-modals' -import { useCMS } from '../../react-tinacms' -import { useBranchData } from './BranchData' -import { BranchSwitcher } from './BranchSwitcher' +import { Modal, ModalBody, ModalHeader, PopupModal } from '@/react-modals' +import { useCMS } from '@/react-tinacms' +import { useBranchData } from './branch-data' +import { BranchSwitcher } from './branch-switcher' interface SubmitModalProps { close(): void diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchSwitcherLegecy.tsx b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher-legacy.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchSwitcherLegecy.tsx rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher-legacy.tsx index 9e277f08cf..6bb7d3465e 100644 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchSwitcherLegecy.tsx +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher-legacy.tsx @@ -1,9 +1,9 @@ import * as React from 'react' import { BranchSwitcherProps, Branch } from './types' -import { useBranchData } from './BranchData' -import { BaseTextField, Input } from '../../packages/fields' -import { Button } from '../../packages/styles' -import { LoadingDots } from '../../packages/form-builder' +import { useBranchData } from './branch-data' +import { BaseTextField, Input } from '@/fields' +import { Button } from '@/styles' +import { LoadingDots } from '@/form-builder' import { BiError, BiGitBranch, @@ -15,7 +15,7 @@ import { GrCircleQuestion } from 'react-icons/gr' import { MdArrowForward, MdOutlineClear } from 'react-icons/md' import { AiFillWarning } from 'react-icons/ai' import { FaSpinner } from 'react-icons/fa' -import { useCMS } from '../../packages/react-core' +import { useCMS } from '@/react-core' type ListState = 'loading' | 'ready' | 'error' diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchSwitcher.test.tsx b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.test.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchSwitcher.test.tsx rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.test.tsx index 49816ce44c..676d948f94 100644 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchSwitcher.test.tsx +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.test.tsx @@ -1,5 +1,6 @@ -import { formatBranchName, getFilteredBranchList } from './BranchSwitcher' +import { formatBranchName, getFilteredBranchList } from './branch-switcher' import { Branch } from './types' +import { describe, it, expect } from 'vitest' const branches: Branch[] = [ { name: 'master', indexStatus: { status: 'complete' } }, diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchSwitcher.tsx b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchSwitcher.tsx rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.tsx index c284cc7e91..a0ac5b7652 100644 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/BranchSwitcher.tsx +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.tsx @@ -1,13 +1,12 @@ import * as React from 'react' import { BranchSwitcherProps, Branch } from './types' -import { useBranchData } from './BranchData' -import { BaseTextField, FieldLabel, Select } from '../../packages/fields' -import { Button, OverflowMenu } from '../../packages/styles' -import { LoadingDots, PrefixedTextField } from '../../packages/form-builder' +import { useBranchData } from './branch-data' +import { BaseTextField, FieldLabel, Select } from '@/fields' +import { Button, OverflowMenu } from '@/styles' +import { LoadingDots, PrefixedTextField } from '@/form-builder' import { BiError, BiGitBranch, - BiPlus, BiRefresh, BiSearch, BiLock, @@ -18,8 +17,8 @@ import { GrCircleQuestion } from 'react-icons/gr' import { MdArrowForward, MdOutlineClear } from 'react-icons/md' import { AiFillWarning } from 'react-icons/ai' import { FaSpinner } from 'react-icons/fa' -import { useCMS } from '../../packages/react-core' -import { BranchSwitcherLegacy } from './BranchSwitcherLegecy' +import { useCMS } from '@/react-core' +import { BranchSwitcherLegacy } from './branch-switcher-legacy' import { formatDistanceToNow } from 'date-fns' type ListState = 'loading' | 'ready' | 'error' diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/index.ts b/packages/@tinacms/toolkit/src/plugin-branch-switcher/index.ts new file mode 100644 index 0000000000..463165f339 --- /dev/null +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/index.ts @@ -0,0 +1,6 @@ +export * from './plugin' +export * from './types' +export * from './branch-switcher' +export * from './branch-data' +export * from './branch-banner' +export * from './branch-button' diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/plugin.tsx b/packages/@tinacms/toolkit/src/plugin-branch-switcher/plugin.tsx similarity index 88% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/plugin.tsx rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/plugin.tsx index d7d2aa7300..dbb9b3feb2 100644 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/plugin.tsx +++ b/packages/@tinacms/toolkit/src/plugin-branch-switcher/plugin.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { BiGitRepoForked } from 'react-icons/bi' -import { ScreenPlugin } from '../../packages/react-screens' -import { BranchSwitcher } from './BranchSwitcher' +import { ScreenPlugin } from '@/react-screens' +import { BranchSwitcher } from './branch-switcher' import { BranchSwitcherProps } from './types' export class BranchSwitcherPlugin implements ScreenPlugin { diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/types.ts b/packages/@tinacms/toolkit/src/plugin-branch-switcher/types.ts similarity index 100% rename from packages/@tinacms/toolkit/src/plugins/branch-switcher/types.ts rename to packages/@tinacms/toolkit/src/plugin-branch-switcher/types.ts diff --git a/packages/@tinacms/toolkit/src/plugins/fields/index.ts b/packages/@tinacms/toolkit/src/plugin-fields/index.ts similarity index 87% rename from packages/@tinacms/toolkit/src/plugins/fields/index.ts rename to packages/@tinacms/toolkit/src/plugin-fields/index.ts index 289288fcb2..6c15b53828 100644 --- a/packages/@tinacms/toolkit/src/plugins/fields/index.ts +++ b/packages/@tinacms/toolkit/src/plugin-fields/index.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - export { BlocksFieldPlugin, ColorFieldPlugin, @@ -18,4 +12,4 @@ export { DateFieldPlugin, CheckboxGroupFieldPlugin, ReferenceFieldPlugin, -} from '../../packages/fields' +} from '@/fields' diff --git a/packages/@tinacms/toolkit/src/plugins/fields/markdown.tsx b/packages/@tinacms/toolkit/src/plugin-fields/markdown.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/plugins/fields/markdown.tsx rename to packages/@tinacms/toolkit/src/plugin-fields/markdown.tsx index a4da47e2cb..473d4aeed1 100644 --- a/packages/@tinacms/toolkit/src/plugins/fields/markdown.tsx +++ b/packages/@tinacms/toolkit/src/plugin-fields/markdown.tsx @@ -1,10 +1,5 @@ -/** - - - -*/ import React from 'react' -import { FieldMeta } from '../../packages/fields' +import { FieldMeta } from '@/fields' export const MarkdownFieldPlaceholder = { __type: 'field', diff --git a/packages/@tinacms/toolkit/src/plugins/form-meta/index.tsx b/packages/@tinacms/toolkit/src/plugin-form-meta/index.tsx similarity index 79% rename from packages/@tinacms/toolkit/src/plugins/form-meta/index.tsx rename to packages/@tinacms/toolkit/src/plugin-form-meta/index.tsx index 063d8bccd0..aa219e3259 100644 --- a/packages/@tinacms/toolkit/src/plugins/form-meta/index.tsx +++ b/packages/@tinacms/toolkit/src/plugin-form-meta/index.tsx @@ -1,8 +1,4 @@ -/** - -*/ - -import { Plugin } from '../../packages/core' +import { Plugin } from '@/core' export class FormMetaPlugin implements Plugin { __type: string = 'form:meta' diff --git a/packages/@tinacms/toolkit/src/plugins/screens/index.tsx b/packages/@tinacms/toolkit/src/plugin-screens/index.tsx similarity index 78% rename from packages/@tinacms/toolkit/src/plugins/screens/index.tsx rename to packages/@tinacms/toolkit/src/plugin-screens/index.tsx index 6d6bb469a2..1d647740e7 100644 --- a/packages/@tinacms/toolkit/src/plugins/screens/index.tsx +++ b/packages/@tinacms/toolkit/src/plugin-screens/index.tsx @@ -6,10 +6,10 @@ import * as React from 'react' import { MdOutlineSettings } from 'react-icons/md' -import { Form } from '../../packages/forms' -import { ScreenPlugin } from '../../packages/react-screens' -import { FormBuilder } from '../../packages/form-builder' -import { useCMS } from '../../react-tinacms' +import { Form } from '@/forms' +import { ScreenPlugin } from '@/react-screens' +import { FormBuilder } from '@/form-builder' +import { useCMS } from '@/react-tinacms' export class GlobalFormPlugin implements ScreenPlugin { __type: ScreenPlugin['__type'] = 'screen' diff --git a/packages/@tinacms/toolkit/src/plugins/screens/media-manager-screen.tsx b/packages/@tinacms/toolkit/src/plugin-screens/media-manager-screen.tsx similarity index 65% rename from packages/@tinacms/toolkit/src/plugins/screens/media-manager-screen.tsx rename to packages/@tinacms/toolkit/src/plugin-screens/media-manager-screen.tsx index ce36576ec0..516c127519 100644 --- a/packages/@tinacms/toolkit/src/plugins/screens/media-manager-screen.tsx +++ b/packages/@tinacms/toolkit/src/plugin-screens/media-manager-screen.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - import { MdOutlinePhotoLibrary } from 'react-icons/md' -import { createScreen } from '../../packages/react-screens' -import { MediaPicker } from '../../components/media/media-manager' +import { createScreen } from '@/react-screens' +import { MediaPicker } from '@/components/media/media-manager' export const MediaManagerScreenPlugin = createScreen({ name: 'Media Manager', diff --git a/packages/@tinacms/toolkit/src/plugins/branch-switcher/index.ts b/packages/@tinacms/toolkit/src/plugins/branch-switcher/index.ts deleted file mode 100644 index 5415e658fa..0000000000 --- a/packages/@tinacms/toolkit/src/plugins/branch-switcher/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - -*/ -export * from './plugin' -export * from './types' -export * from './BranchSwitcher' -export * from './BranchData' -export * from './BranchBanner' -export * from './BranchButton' diff --git a/packages/@tinacms/toolkit/src/packages/react-alerts/Alerts.test.tsx b/packages/@tinacms/toolkit/src/react-alerts/alerts.test.tsx similarity index 85% rename from packages/@tinacms/toolkit/src/packages/react-alerts/Alerts.test.tsx rename to packages/@tinacms/toolkit/src/react-alerts/alerts.test.tsx index 12e4383b98..71b9711f3c 100644 --- a/packages/@tinacms/toolkit/src/packages/react-alerts/Alerts.test.tsx +++ b/packages/@tinacms/toolkit/src/react-alerts/alerts.test.tsx @@ -1,11 +1,8 @@ -/** - -*/ - import { render } from '@testing-library/react' import React from 'react' -import { Alerts } from './Alerts' +import { Alerts } from './alerts' import { Alert } from '../alerts' +import { describe, it, vi } from 'vitest' describe('Alerts', () => { it('subscribes to the `alerts`', () => { @@ -36,7 +33,10 @@ describe('Alerts', () => { const output = render() - output.getByText(alert.message) + const alertMessage = alert.message + if (typeof alertMessage === 'string') { + output.getByText(alertMessage) + } }) describe('clicking an alert', () => { it('calls dismiss on the collection', () => { @@ -62,7 +62,7 @@ function createMockAlerts(alerts: Alert[] = []): any { get all() { return alerts }, - subscribe: jest.fn(), - dismiss: jest.fn(), + subscribe: vi.fn(), + dismiss: vi.fn(), } } diff --git a/packages/@tinacms/toolkit/src/packages/react-alerts/Alerts.tsx b/packages/@tinacms/toolkit/src/react-alerts/alerts.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/packages/react-alerts/Alerts.tsx rename to packages/@tinacms/toolkit/src/react-alerts/alerts.tsx index f19197efef..d4f9161060 100644 --- a/packages/@tinacms/toolkit/src/packages/react-alerts/Alerts.tsx +++ b/packages/@tinacms/toolkit/src/react-alerts/alerts.tsx @@ -1,18 +1,14 @@ -/** - -*/ - import React from 'react' -import { Alerts as AlertsCollection, AlertLevel } from '../alerts' -import { useSubscribable } from '../react-core' +import { Alerts as AlertsCollection, AlertLevel } from '@/alerts' +import { useSubscribable } from '@/react-core' import { Modal, ModalActions, ModalBody, ModalHeader, PopupModal, -} from '../react-modals' -import { Button } from '../styles' +} from '@/react-modals' +import { Button } from '@/styles' import { BiCheckCircle, BiError, BiInfoCircle, BiX } from 'react-icons/bi' export interface AlertsProps { diff --git a/packages/@tinacms/toolkit/src/react-alerts/index.ts b/packages/@tinacms/toolkit/src/react-alerts/index.ts new file mode 100644 index 0000000000..a6a05991a5 --- /dev/null +++ b/packages/@tinacms/toolkit/src/react-alerts/index.ts @@ -0,0 +1 @@ +export * from './alerts' diff --git a/packages/@tinacms/toolkit/src/packages/react-cloud-config/cloud-config-plugin.tsx b/packages/@tinacms/toolkit/src/react-cloud-config/cloud-config-plugin.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/packages/react-cloud-config/cloud-config-plugin.tsx rename to packages/@tinacms/toolkit/src/react-cloud-config/cloud-config-plugin.tsx index 5a3454b525..023dc3588b 100644 --- a/packages/@tinacms/toolkit/src/packages/react-cloud-config/cloud-config-plugin.tsx +++ b/packages/@tinacms/toolkit/src/react-cloud-config/cloud-config-plugin.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - import { MdOutlineCloud } from 'react-icons/md' -import { Plugin } from '../core' +import { Plugin } from '@/core' /** * Represents a Tina Cloud Config that should be accessible via the CMS. diff --git a/packages/@tinacms/toolkit/src/packages/react-cloud-config/index.ts b/packages/@tinacms/toolkit/src/react-cloud-config/index.ts similarity index 87% rename from packages/@tinacms/toolkit/src/packages/react-cloud-config/index.ts rename to packages/@tinacms/toolkit/src/react-cloud-config/index.ts index 9b3ab5f91c..d5b2790f04 100644 --- a/packages/@tinacms/toolkit/src/packages/react-cloud-config/index.ts +++ b/packages/@tinacms/toolkit/src/react-cloud-config/index.ts @@ -1,8 +1,2 @@ -/** - - - -*/ - export * from './cloud-config-plugin' export * from './use-cloud-config-plugin' diff --git a/packages/@tinacms/toolkit/src/packages/react-cloud-config/use-cloud-config-plugin.tsx b/packages/@tinacms/toolkit/src/react-cloud-config/use-cloud-config-plugin.tsx similarity index 86% rename from packages/@tinacms/toolkit/src/packages/react-cloud-config/use-cloud-config-plugin.tsx rename to packages/@tinacms/toolkit/src/react-cloud-config/use-cloud-config-plugin.tsx index 873ad47dac..34091199d5 100644 --- a/packages/@tinacms/toolkit/src/packages/react-cloud-config/use-cloud-config-plugin.tsx +++ b/packages/@tinacms/toolkit/src/react-cloud-config/use-cloud-config-plugin.tsx @@ -1,9 +1,4 @@ -/** - - - -*/ -import { usePlugins } from '../react-core' +import { usePlugins } from '@/react-core' import { useMemo, DependencyList } from 'react' import { createCloudConfig, CloudConfigOptions } from './cloud-config-plugin' diff --git a/packages/@tinacms/toolkit/src/packages/react-core/index.ts b/packages/@tinacms/toolkit/src/react-core/index.ts similarity index 95% rename from packages/@tinacms/toolkit/src/packages/react-core/index.ts rename to packages/@tinacms/toolkit/src/react-core/index.ts index b90eb9c787..57f6fb74d6 100644 --- a/packages/@tinacms/toolkit/src/packages/react-core/index.ts +++ b/packages/@tinacms/toolkit/src/react-core/index.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - export * from './use-cms' export * from './use-form' export * from './use-plugin' diff --git a/packages/@tinacms/toolkit/src/packages/react-core/tina-error-boundary.tsx b/packages/@tinacms/toolkit/src/react-core/tina-error-boundary.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/packages/react-core/tina-error-boundary.tsx rename to packages/@tinacms/toolkit/src/react-core/tina-error-boundary.tsx index bb8d1d8abe..b74d3d2f84 100644 --- a/packages/@tinacms/toolkit/src/packages/react-core/tina-error-boundary.tsx +++ b/packages/@tinacms/toolkit/src/react-core/tina-error-boundary.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' export class TinaErrorBoundary extends React.Component< diff --git a/packages/@tinacms/toolkit/src/packages/react-core/use-cms-event.ts b/packages/@tinacms/toolkit/src/react-core/use-cms-event.ts similarity index 92% rename from packages/@tinacms/toolkit/src/packages/react-core/use-cms-event.ts rename to packages/@tinacms/toolkit/src/react-core/use-cms-event.ts index 7e35641ebb..862b232710 100644 --- a/packages/@tinacms/toolkit/src/packages/react-core/use-cms-event.ts +++ b/packages/@tinacms/toolkit/src/react-core/use-cms-event.ts @@ -1,11 +1,5 @@ -/** - - - -*/ - import * as React from 'react' -import { Callback, CMSEvent } from '../core' +import { Callback, CMSEvent } from '@/core' import { useCMS } from './use-cms' export function useCMSEvent( diff --git a/packages/@tinacms/toolkit/src/packages/react-core/use-cms.ts b/packages/@tinacms/toolkit/src/react-core/use-cms.ts similarity index 88% rename from packages/@tinacms/toolkit/src/packages/react-core/use-cms.ts rename to packages/@tinacms/toolkit/src/react-core/use-cms.ts index 7d7dce133c..1fba23716f 100644 --- a/packages/@tinacms/toolkit/src/packages/react-core/use-cms.ts +++ b/packages/@tinacms/toolkit/src/react-core/use-cms.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { TinaAction, TinaState } from '../../tina-state' -import { TinaCMS } from '../../tina-cms' +import { TinaAction, TinaState } from '@/tina-state' +import { TinaCMS } from '@/tina-cms' export const ERROR_MISSING_CMS = `useCMS could not find an instance of CMS` diff --git a/packages/@tinacms/toolkit/src/packages/react-core/use-form.ts b/packages/@tinacms/toolkit/src/react-core/use-form.ts similarity index 98% rename from packages/@tinacms/toolkit/src/packages/react-core/use-form.ts rename to packages/@tinacms/toolkit/src/react-core/use-form.ts index f4d450e9cf..190810f035 100644 --- a/packages/@tinacms/toolkit/src/packages/react-core/use-form.ts +++ b/packages/@tinacms/toolkit/src/react-core/use-form.ts @@ -1,10 +1,4 @@ -/** - - - -*/ - -import { FormOptions, Form, Field } from '../forms' +import { FormOptions, Form, Field } from '@/forms' import * as React from 'react' import { usePlugins } from './use-plugin' import { useCMSEvent } from './use-cms-event' diff --git a/packages/@tinacms/toolkit/src/packages/react-core/use-plugin.tsx b/packages/@tinacms/toolkit/src/react-core/use-plugin.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/react-core/use-plugin.tsx rename to packages/@tinacms/toolkit/src/react-core/use-plugin.tsx index bd570f4e5c..3fe3f277f9 100644 --- a/packages/@tinacms/toolkit/src/packages/react-core/use-plugin.tsx +++ b/packages/@tinacms/toolkit/src/react-core/use-plugin.tsx @@ -1,11 +1,5 @@ -/** - - - -*/ - import * as React from 'react' -import { Plugin } from '../core' +import { Plugin } from '@/core' import { useCMS } from './use-cms' /** diff --git a/packages/@tinacms/toolkit/src/packages/react-core/use-subscribable.tsx b/packages/@tinacms/toolkit/src/react-core/use-subscribable.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/react-core/use-subscribable.tsx rename to packages/@tinacms/toolkit/src/react-core/use-subscribable.tsx index c0b4fe2bbb..c523292be7 100644 --- a/packages/@tinacms/toolkit/src/packages/react-core/use-subscribable.tsx +++ b/packages/@tinacms/toolkit/src/react-core/use-subscribable.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' interface Subscribable { diff --git a/packages/@tinacms/toolkit/src/packages/react-core/use-watch-form-values.ts b/packages/@tinacms/toolkit/src/react-core/use-watch-form-values.ts similarity index 93% rename from packages/@tinacms/toolkit/src/packages/react-core/use-watch-form-values.ts rename to packages/@tinacms/toolkit/src/react-core/use-watch-form-values.ts index e12fe6f6f4..4d95760a06 100644 --- a/packages/@tinacms/toolkit/src/packages/react-core/use-watch-form-values.ts +++ b/packages/@tinacms/toolkit/src/react-core/use-watch-form-values.ts @@ -1,10 +1,4 @@ -/** - - - -*/ - -import { Form } from '../forms' +import { Form } from '@/forms' import { FormSubscriber } from 'final-form' import { useEffect } from 'react' diff --git a/packages/@tinacms/toolkit/src/packages/react-core/with-plugin.tsx b/packages/@tinacms/toolkit/src/react-core/with-plugin.tsx similarity index 93% rename from packages/@tinacms/toolkit/src/packages/react-core/with-plugin.tsx rename to packages/@tinacms/toolkit/src/react-core/with-plugin.tsx index ce2980c392..755d263892 100644 --- a/packages/@tinacms/toolkit/src/packages/react-core/with-plugin.tsx +++ b/packages/@tinacms/toolkit/src/react-core/with-plugin.tsx @@ -1,10 +1,4 @@ -/** - - - -*/ - -import { Plugin } from '../core' +import { Plugin } from '@/core' import { usePlugin } from './use-plugin' import * as React from 'react' diff --git a/packages/@tinacms/toolkit/src/packages/react-datetime/DateTime.jsx b/packages/@tinacms/toolkit/src/react-datetime/DateTime.jsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/react-datetime/DateTime.jsx rename to packages/@tinacms/toolkit/src/react-datetime/DateTime.jsx index 85ba09801a..537e6a8cd8 100644 --- a/packages/@tinacms/toolkit/src/packages/react-datetime/DateTime.jsx +++ b/packages/@tinacms/toolkit/src/react-datetime/DateTime.jsx @@ -1,7 +1,3 @@ -/** - -*/ - import PropTypes from 'prop-types' import moment from 'moment' import React from 'react' diff --git a/packages/@tinacms/toolkit/src/packages/react-datetime/parts/ViewNavigation.jsx b/packages/@tinacms/toolkit/src/react-datetime/parts/ViewNavigation.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/react-datetime/parts/ViewNavigation.jsx rename to packages/@tinacms/toolkit/src/react-datetime/parts/ViewNavigation.jsx diff --git a/packages/@tinacms/toolkit/src/packages/react-datetime/views/DaysView.jsx b/packages/@tinacms/toolkit/src/react-datetime/views/DaysView.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/react-datetime/views/DaysView.jsx rename to packages/@tinacms/toolkit/src/react-datetime/views/DaysView.jsx diff --git a/packages/@tinacms/toolkit/src/packages/react-datetime/views/MonthsView.jsx b/packages/@tinacms/toolkit/src/react-datetime/views/MonthsView.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/react-datetime/views/MonthsView.jsx rename to packages/@tinacms/toolkit/src/react-datetime/views/MonthsView.jsx diff --git a/packages/@tinacms/toolkit/src/packages/react-datetime/views/TimeView.jsx b/packages/@tinacms/toolkit/src/react-datetime/views/TimeView.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/react-datetime/views/TimeView.jsx rename to packages/@tinacms/toolkit/src/react-datetime/views/TimeView.jsx diff --git a/packages/@tinacms/toolkit/src/packages/react-datetime/views/YearsView.jsx b/packages/@tinacms/toolkit/src/react-datetime/views/YearsView.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/react-datetime/views/YearsView.jsx rename to packages/@tinacms/toolkit/src/react-datetime/views/YearsView.jsx diff --git a/packages/@tinacms/toolkit/src/packages/react-dismissible/Dismissible.tsx b/packages/@tinacms/toolkit/src/react-dismissible/dismissible.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/react-dismissible/Dismissible.tsx rename to packages/@tinacms/toolkit/src/react-dismissible/dismissible.tsx index 323e0ce38c..6644a3231b 100644 --- a/packages/@tinacms/toolkit/src/packages/react-dismissible/Dismissible.tsx +++ b/packages/@tinacms/toolkit/src/react-dismissible/dismissible.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' import { useRef, useEffect } from 'react' diff --git a/packages/@tinacms/toolkit/src/react-dismissible/index.ts b/packages/@tinacms/toolkit/src/react-dismissible/index.ts new file mode 100644 index 0000000000..3cd8eef40e --- /dev/null +++ b/packages/@tinacms/toolkit/src/react-dismissible/index.ts @@ -0,0 +1 @@ +export * from './dismissible' diff --git a/packages/@tinacms/toolkit/src/packages/react-forms/FormModal.tsx b/packages/@tinacms/toolkit/src/react-forms/form-modal.tsx similarity index 83% rename from packages/@tinacms/toolkit/src/packages/react-forms/FormModal.tsx rename to packages/@tinacms/toolkit/src/react-forms/form-modal.tsx index 3b4573700d..62048ca542 100644 --- a/packages/@tinacms/toolkit/src/packages/react-forms/FormModal.tsx +++ b/packages/@tinacms/toolkit/src/react-forms/form-modal.tsx @@ -1,13 +1,9 @@ -/** - -*/ - import * as React from 'react' -import { Modal, ModalHeader, ModalBody, PopupModal } from '../react-modals' -import { FormBuilder } from '../form-builder' +import { Modal, ModalHeader, ModalBody, PopupModal } from '@/react-modals' +import { FormBuilder } from '@/form-builder' import { useMemo } from 'react' -import { Form } from '../forms' -import { useCMS } from '../react-core' +import { Form } from '@/forms' +import { useCMS } from '@/react-core' // Pretty sure this isn't used anymore export const FormModal = ({ plugin, close }: any) => { diff --git a/packages/@tinacms/toolkit/src/react-forms/index.ts b/packages/@tinacms/toolkit/src/react-forms/index.ts new file mode 100644 index 0000000000..41b71c46a7 --- /dev/null +++ b/packages/@tinacms/toolkit/src/react-forms/index.ts @@ -0,0 +1 @@ +export * from './form-modal' diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/FullscreenModal.tsx b/packages/@tinacms/toolkit/src/react-modals/fullscreen-modal.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/react-modals/FullscreenModal.tsx rename to packages/@tinacms/toolkit/src/react-modals/fullscreen-modal.tsx index d9537389b0..d91f1f3e3f 100644 --- a/packages/@tinacms/toolkit/src/packages/react-modals/FullscreenModal.tsx +++ b/packages/@tinacms/toolkit/src/react-modals/fullscreen-modal.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import React from 'react' export const FullscreenModal = ({ className = '', style = {}, ...props }) => ( diff --git a/packages/@tinacms/toolkit/src/react-modals/index.ts b/packages/@tinacms/toolkit/src/react-modals/index.ts new file mode 100644 index 0000000000..c673f3328d --- /dev/null +++ b/packages/@tinacms/toolkit/src/react-modals/index.ts @@ -0,0 +1,4 @@ +export * from './modal-provider' +export * from './modal' +export * from './fullscreen-modal' +export * from './popup-modal' diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/ModalProvider.tsx b/packages/@tinacms/toolkit/src/react-modals/modal-provider.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/packages/react-modals/ModalProvider.tsx rename to packages/@tinacms/toolkit/src/react-modals/modal-provider.tsx index a1680dc324..e0e9cbf726 100644 --- a/packages/@tinacms/toolkit/src/packages/react-modals/ModalProvider.tsx +++ b/packages/@tinacms/toolkit/src/react-modals/modal-provider.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' import { useCallback, useState } from 'react' diff --git a/packages/@tinacms/toolkit/src/react-modals/modal/index.ts b/packages/@tinacms/toolkit/src/react-modals/modal/index.ts new file mode 100644 index 0000000000..3fa1c06d6c --- /dev/null +++ b/packages/@tinacms/toolkit/src/react-modals/modal/index.ts @@ -0,0 +1,5 @@ +export * from './modal' +export * from './modal-actions' +export * from './modal-body' +export * from './modal-header' +export * from './modal-overlay' diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalActions.tsx b/packages/@tinacms/toolkit/src/react-modals/modal/modal-actions.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalActions.tsx rename to packages/@tinacms/toolkit/src/react-modals/modal/modal-actions.tsx index 87f72c5aa0..1797ad4225 100644 --- a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalActions.tsx +++ b/packages/@tinacms/toolkit/src/react-modals/modal/modal-actions.tsx @@ -1,8 +1,3 @@ -/** - - - -*/ import * as React from 'react' export const ModalActions = ({ children }) => { diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalBody.tsx b/packages/@tinacms/toolkit/src/react-modals/modal/modal-body.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalBody.tsx rename to packages/@tinacms/toolkit/src/react-modals/modal/modal-body.tsx index d478b0a8bb..8e8ef2e686 100644 --- a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalBody.tsx +++ b/packages/@tinacms/toolkit/src/react-modals/modal/modal-body.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import React from 'react' export const ModalBody = ({ className = '', padded = false, ...props }) => ( diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalHeader.tsx b/packages/@tinacms/toolkit/src/react-modals/modal/modal-header.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalHeader.tsx rename to packages/@tinacms/toolkit/src/react-modals/modal/modal-header.tsx index bf65479be9..cc7e52d32b 100644 --- a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalHeader.tsx +++ b/packages/@tinacms/toolkit/src/react-modals/modal/modal-header.tsx @@ -1,11 +1,5 @@ -/** - - - -*/ - import * as React from 'react' -import { CloseIcon } from '../../icons' +import { CloseIcon } from '@/icons' export interface ModalHeaderProps { children: React.ReactChild | React.ReactChild[] diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalOverlay.tsx b/packages/@tinacms/toolkit/src/react-modals/modal/modal-overlay.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalOverlay.tsx rename to packages/@tinacms/toolkit/src/react-modals/modal/modal-overlay.tsx index f553cce2ec..814578a886 100644 --- a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/ModalOverlay.tsx +++ b/packages/@tinacms/toolkit/src/react-modals/modal/modal-overlay.tsx @@ -1,8 +1,3 @@ -/** - - - -*/ import * as React from 'react' export const ModalOverlay = ({ children }) => { diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/Modal.tsx b/packages/@tinacms/toolkit/src/react-modals/modal/modal.tsx similarity index 79% rename from packages/@tinacms/toolkit/src/packages/react-modals/Modal/Modal.tsx rename to packages/@tinacms/toolkit/src/react-modals/modal/modal.tsx index ad71043782..c179dbca40 100644 --- a/packages/@tinacms/toolkit/src/packages/react-modals/Modal/Modal.tsx +++ b/packages/@tinacms/toolkit/src/react-modals/modal/modal.tsx @@ -1,13 +1,7 @@ -/** - - - -*/ - import * as React from 'react' import { createPortal } from 'react-dom' -import { useModalContainer } from '../ModalProvider' -import { ModalOverlay } from './ModalOverlay' +import { useModalContainer } from '../modal-provider' +import { ModalOverlay } from './modal-overlay' export type ModalProps = React.DetailedHTMLProps< React.HTMLAttributes, diff --git a/packages/@tinacms/toolkit/src/packages/react-modals/PopupModal.tsx b/packages/@tinacms/toolkit/src/react-modals/popup-modal.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/react-modals/PopupModal.tsx rename to packages/@tinacms/toolkit/src/react-modals/popup-modal.tsx index 6583271f39..ce347ca908 100644 --- a/packages/@tinacms/toolkit/src/packages/react-modals/PopupModal.tsx +++ b/packages/@tinacms/toolkit/src/react-modals/popup-modal.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import React from 'react' export const PopupModal = ({ className = '', style = {}, ...props }) => ( diff --git a/packages/@tinacms/toolkit/src/packages/react-screens/components/screen-plugin-modal.tsx b/packages/@tinacms/toolkit/src/react-screens/components/screen-plugin-modal.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/packages/react-screens/components/screen-plugin-modal.tsx rename to packages/@tinacms/toolkit/src/react-screens/components/screen-plugin-modal.tsx index 835e5ca26d..7c2643351b 100644 --- a/packages/@tinacms/toolkit/src/packages/react-screens/components/screen-plugin-modal.tsx +++ b/packages/@tinacms/toolkit/src/react-screens/components/screen-plugin-modal.tsx @@ -1,9 +1,3 @@ -/** - - - -*/ - import * as React from 'react' import { FC } from 'react' import { @@ -12,7 +6,7 @@ import { ModalBody, ModalFullscreen, ModalPopup, -} from '../../react-modals' +} from '@/react-modals' import { ScreenPlugin } from '../screen-plugin' export interface ScreenPluginModalProps { diff --git a/packages/@tinacms/toolkit/src/packages/react-screens/index.ts b/packages/@tinacms/toolkit/src/react-screens/index.ts similarity index 91% rename from packages/@tinacms/toolkit/src/packages/react-screens/index.ts rename to packages/@tinacms/toolkit/src/react-screens/index.ts index 6b5dfe5e05..11688ce680 100644 --- a/packages/@tinacms/toolkit/src/packages/react-screens/index.ts +++ b/packages/@tinacms/toolkit/src/react-screens/index.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - export * from './screen-plugin' export * from './use-screen-plugin' export * from './components/screen-plugin-modal' diff --git a/packages/@tinacms/toolkit/src/packages/react-screens/screen-plugin.tsx b/packages/@tinacms/toolkit/src/react-screens/screen-plugin.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/packages/react-screens/screen-plugin.tsx rename to packages/@tinacms/toolkit/src/react-screens/screen-plugin.tsx index 9d871b1800..e8773d3c1c 100644 --- a/packages/@tinacms/toolkit/src/packages/react-screens/screen-plugin.tsx +++ b/packages/@tinacms/toolkit/src/react-screens/screen-plugin.tsx @@ -1,11 +1,5 @@ -/** - - - -*/ - import React from 'react' -import { Plugin } from '../core' +import { Plugin } from '@/core' /** * Represents a Screen that should be accessible via the CMS. diff --git a/packages/@tinacms/toolkit/src/packages/react-screens/use-screen-plugin.tsx b/packages/@tinacms/toolkit/src/react-screens/use-screen-plugin.tsx similarity index 84% rename from packages/@tinacms/toolkit/src/packages/react-screens/use-screen-plugin.tsx rename to packages/@tinacms/toolkit/src/react-screens/use-screen-plugin.tsx index 64a9f1c2d9..636bdd0480 100644 --- a/packages/@tinacms/toolkit/src/packages/react-screens/use-screen-plugin.tsx +++ b/packages/@tinacms/toolkit/src/react-screens/use-screen-plugin.tsx @@ -1,9 +1,4 @@ -/** - - - -*/ -import { usePlugins } from '../react-core' +import { usePlugins } from '@/react-core' import { useMemo, DependencyList } from 'react' import { createScreen, ScreenOptions } from './screen-plugin' diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/FormList.tsx b/packages/@tinacms/toolkit/src/react-sidebar/components/form-list.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/packages/react-sidebar/components/FormList.tsx rename to packages/@tinacms/toolkit/src/react-sidebar/components/form-list.tsx index 5ec43f08a9..c454a51c9a 100644 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/FormList.tsx +++ b/packages/@tinacms/toolkit/src/react-sidebar/components/form-list.tsx @@ -1,8 +1,8 @@ import * as React from 'react' import { BiEdit } from 'react-icons/bi' import { Transition } from '@headlessui/react' -import { TinaState } from '../../../tina-state' -import { useCMS } from '../../../react-tinacms' +import { TinaState } from '@/tina-state' +import { useCMS } from '@/react-tinacms' type FormListItem = TinaState['formLists'][number]['items'][number] diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/LocalWarning.tsx b/packages/@tinacms/toolkit/src/react-sidebar/components/local-warning.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/react-sidebar/components/LocalWarning.tsx rename to packages/@tinacms/toolkit/src/react-sidebar/components/local-warning.tsx index d3abf7e56a..4008da7803 100644 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/LocalWarning.tsx +++ b/packages/@tinacms/toolkit/src/react-sidebar/components/local-warning.tsx @@ -1,13 +1,7 @@ -/** - - - -*/ - import * as React from 'react' import { AiFillWarning } from 'react-icons/ai' import { BiError, BiRightArrowAlt } from 'react-icons/bi' -import { useCMS } from '../../react-core' +import { useCMS } from '@/react-core' export const LocalWarning = () => { return ( diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/Nav.tsx b/packages/@tinacms/toolkit/src/react-sidebar/components/nav.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/packages/react-sidebar/components/Nav.tsx rename to packages/@tinacms/toolkit/src/react-sidebar/components/nav.tsx index 9f9efdaa11..c42521af17 100644 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/Nav.tsx +++ b/packages/@tinacms/toolkit/src/react-sidebar/components/nav.tsx @@ -1,22 +1,15 @@ -/** - - - -*/ - import * as React from 'react' import { BiExit } from 'react-icons/bi' import { FiMoreVertical, FiInfo } from 'react-icons/fi' import { VscNewFile } from 'react-icons/vsc' import { Menu, Transition } from '@headlessui/react' -import { updateBodyDisplacement } from './Sidebar' -import { FormModal } from '../../react-forms' +import { updateBodyDisplacement } from './sidebar' +import { FormModal } from '@/react-forms' import { useEditState } from '@tinacms/sharedctx' -import type { ScreenPlugin } from '../../react-screens' -import { LoadingDots } from '../../form-builder' -import { SyncStatus, SyncErrorWidget, SyncStatusModal } from './SyncStatus' -import { useCMS } from '../../react-core' -import { CloudConfigPlugin } from '../../react-cloud-config' +import type { ScreenPlugin } from '@/react-screens' +import { SyncStatus, SyncErrorWidget, SyncStatusModal } from './sync-status' +import { useCMS } from '@/react-core' +import { CloudConfigPlugin } from '@/react-cloud-config' interface NavProps { isLocalMode: boolean diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/NoFormsPlaceHolder.tsx b/packages/@tinacms/toolkit/src/react-sidebar/components/no-forms-placeholder.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/packages/react-sidebar/components/NoFormsPlaceHolder.tsx rename to packages/@tinacms/toolkit/src/react-sidebar/components/no-forms-placeholder.tsx index 72a9c715eb..ee109f9a47 100644 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/NoFormsPlaceHolder.tsx +++ b/packages/@tinacms/toolkit/src/react-sidebar/components/no-forms-placeholder.tsx @@ -5,8 +5,8 @@ */ import * as React from 'react' -import { LoadingDots } from '../../form-builder' -import { Button } from '../../styles' +import { LoadingDots } from '@/form-builder' +import { Button } from '@/styles' export const PendingFormsPlaceholder = () => (
{ const { diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/SidebarBody.tsx b/packages/@tinacms/toolkit/src/react-sidebar/components/sidebar-body.tsx similarity index 90% rename from packages/@tinacms/toolkit/src/packages/react-sidebar/components/SidebarBody.tsx rename to packages/@tinacms/toolkit/src/react-sidebar/components/sidebar-body.tsx index 7cb87c7fb7..93f939203d 100644 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/SidebarBody.tsx +++ b/packages/@tinacms/toolkit/src/react-sidebar/components/sidebar-body.tsx @@ -1,21 +1,14 @@ -/** - - - -*/ - import * as React from 'react' -import { Form } from '../../forms' -import { FormLists } from './FormList' -import { useCMS } from '../../react-core' -import { FormBuilder, FormStatus } from '../../form-builder' -import { FormMetaPlugin } from '../../../plugins/form-meta' -import { SidebarContext, navBreakpoint } from './Sidebar' -import { BiChevronLeft, BiHomeAlt } from 'react-icons/bi' -import { useWindowWidth } from '@react-hook/window-size' +import { Form } from '@/forms' +import { FormLists } from './form-list' +import { useCMS } from '@/react-core' +import { FormBuilder, FormStatus } from '@/form-builder' +import { FormMetaPlugin } from '@/plugin-form-meta' +import { SidebarContext } from './sidebar' +import { BiHomeAlt } from 'react-icons/bi' import { EditContext } from '@tinacms/sharedctx' -import { PendingFormsPlaceholder } from './NoFormsPlaceHolder' +import { PendingFormsPlaceholder } from './no-forms-placeholder' export const FormsView = ({ children, diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/Sidebar.tsx b/packages/@tinacms/toolkit/src/react-sidebar/components/sidebar.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/react-sidebar/components/Sidebar.tsx rename to packages/@tinacms/toolkit/src/react-sidebar/components/sidebar.tsx index f2b1193712..ce59c79f97 100644 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/Sidebar.tsx +++ b/packages/@tinacms/toolkit/src/react-sidebar/components/sidebar.tsx @@ -7,23 +7,23 @@ import * as React from 'react' import { BiExpandAlt, BiLinkExternal, BiMenu, BiPencil } from 'react-icons/bi' -import { ScreenPlugin, ScreenPluginModal } from '../../react-screens' +import { ScreenPlugin, ScreenPluginModal } from '@/react-screens' import { SidebarState, SidebarStateOptions } from '../sidebar' -import { useCMS, useSubscribable } from '../../react-core' -import { useEffect, useState } from 'react' +import { useCMS, useSubscribable } from '@/react-core' +import { useState } from 'react' -import { Button } from '../../styles' -import { FormsView } from './SidebarBody' +import { Button } from '@/styles' +import { FormsView } from './sidebar-body' import { ImFilesEmpty } from 'react-icons/im' import { IoMdClose } from 'react-icons/io' -import { BillingWarning, LocalWarning } from './LocalWarning' +import { BillingWarning, LocalWarning } from './local-warning' import { MdOutlineArrowBackIos } from 'react-icons/md' -import { Nav } from './Nav' -import { ResizeHandle } from './ResizeHandle' +import { Nav } from './nav' +import { ResizeHandle } from './resize-handle' import { Transition } from '@headlessui/react' import { useWindowWidth } from '@react-hook/window-size' -import { CloudConfigPlugin } from '../../react-cloud-config' -import { BranchButton } from '../../../plugins/branch-switcher' +import { CloudConfigPlugin } from '@/react-cloud-config' +import { BranchButton } from '@/plugin-branch-switcher' export const SidebarContext = React.createContext(null) diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/SyncStatus.tsx b/packages/@tinacms/toolkit/src/react-sidebar/components/sync-status.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/react-sidebar/components/SyncStatus.tsx rename to packages/@tinacms/toolkit/src/react-sidebar/components/sync-status.tsx index c804c1b4a7..666de4606a 100644 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/components/SyncStatus.tsx +++ b/packages/@tinacms/toolkit/src/react-sidebar/components/sync-status.tsx @@ -1,16 +1,11 @@ import * as React from 'react' import { useState } from 'react' -import { TinaCMS } from '../../../tina-cms' +import { TinaCMS } from '@/tina-cms' import { MdSyncProblem } from 'react-icons/md' import { HiOutlineClipboardList } from 'react-icons/hi' -import { - FullscreenModal, - Modal, - ModalBody, - ModalHeader, -} from '../../react-modals' +import { FullscreenModal, Modal, ModalBody, ModalHeader } from '@/react-modals' import { BsCheckCircleFill, BsExclamationOctagonFill } from 'react-icons/bs' -import { Button } from '../../styles' +import { Button } from '@/styles' type EventListState = 'loading' | 'success' | 'error' | 'unauthorized' diff --git a/packages/@tinacms/toolkit/src/react-sidebar/index.ts b/packages/@tinacms/toolkit/src/react-sidebar/index.ts new file mode 100644 index 0000000000..060a0bef43 --- /dev/null +++ b/packages/@tinacms/toolkit/src/react-sidebar/index.ts @@ -0,0 +1,5 @@ +export * from './sidebar' +export { SidebarProvider } from './components/sidebar' +export { Nav } from './components/nav' +export { LocalWarning, BillingWarning } from './components/local-warning' +export { SyncStatus } from './components/sync-status' diff --git a/packages/@tinacms/toolkit/src/packages/react-sidebar/sidebar.ts b/packages/@tinacms/toolkit/src/react-sidebar/sidebar.ts similarity index 95% rename from packages/@tinacms/toolkit/src/packages/react-sidebar/sidebar.ts rename to packages/@tinacms/toolkit/src/react-sidebar/sidebar.ts index a7b91ac3fb..7815729b53 100644 --- a/packages/@tinacms/toolkit/src/packages/react-sidebar/sidebar.ts +++ b/packages/@tinacms/toolkit/src/react-sidebar/sidebar.ts @@ -1,11 +1,5 @@ -/** - - - -*/ - import { EventBus, Callback } from '../core' -import { NoFormsPlaceholder } from './components/NoFormsPlaceHolder' +import { NoFormsPlaceholder } from './components/no-forms-placeholder' import * as React from 'react' export interface SidebarStateOptions { diff --git a/packages/@tinacms/toolkit/src/react-tinacms/index.ts b/packages/@tinacms/toolkit/src/react-tinacms/index.ts index bd8a1a0e8c..1914acc7d5 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/index.ts +++ b/packages/@tinacms/toolkit/src/react-tinacms/index.ts @@ -1,9 +1,3 @@ -/** - - - -*/ - export * from './use-cms' export * from './use-form' export * from './use-plugin' @@ -11,7 +5,7 @@ export * from './use-subscribable' export * from './use-watch-form-values' export * from './with-plugin' export * from './with-tina' -export { useCMSEvent } from '../packages/react-core' +export { useCMSEvent } from '@/react-core' -export type { Plugin } from '../packages/core' -export type { Form, FormOptions, Field } from '../packages/forms' +export type { Plugin } from '@/core' +export type { Form, FormOptions, Field } from '@/forms' diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-cms.ts b/packages/@tinacms/toolkit/src/react-tinacms/use-cms.ts index ad7c0af8b1..0175ab4ca4 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-cms.ts +++ b/packages/@tinacms/toolkit/src/react-tinacms/use-cms.ts @@ -1,13 +1,7 @@ -/** +import { useCMS as useBaseCMS } from '@/react-core' +import { TinaCMS } from '@/tina-cms' - - -*/ - -import { useCMS as useBaseCMS } from '../packages/react-core' -import { TinaCMS } from '../tina-cms' - -export { ERROR_MISSING_CMS, CMSContext } from '../packages/react-core' +export { ERROR_MISSING_CMS, CMSContext } from '@/react-core' export function useCMS(): TinaCMS { return useBaseCMS() as TinaCMS diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-form.ts b/packages/@tinacms/toolkit/src/react-tinacms/use-form.ts index d4012978e1..84440b2a10 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-form.ts +++ b/packages/@tinacms/toolkit/src/react-tinacms/use-form.ts @@ -1,21 +1,9 @@ -import { FormOptions, Form } from '../packages/forms' -import { GlobalFormPlugin } from '../plugins/screens' +import { FormOptions, Form } from '@/forms' +import { GlobalFormPlugin } from '@/plugin-screens' import { useMemo } from 'react' -import { useForm, WatchableFormValue, usePlugins } from '../packages/react-core' - -/** - - - -*/ - -/** - - - -*/ -export { useLocalForm, useForm } from '../packages/react-core' -export type { WatchableFormValue } from '../packages/react-core' +import { useForm, WatchableFormValue, usePlugins } from '@/react-core' +export { useLocalForm, useForm } from '@/react-core' +export type { WatchableFormValue } from '@/react-core' /** * @deprecated See https://github.com/tinacms/rfcs/blob/master/0006-form-hook-conventions.md diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-plugin.tsx b/packages/@tinacms/toolkit/src/react-tinacms/use-plugin.tsx index 7bbbbea14c..cd1d2f2319 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-plugin.tsx +++ b/packages/@tinacms/toolkit/src/react-tinacms/use-plugin.tsx @@ -1,7 +1 @@ -/** - - - -*/ - -export { usePlugins, usePlugin } from '../packages/react-core' +export { usePlugins, usePlugin } from '@/react-core' diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-subscribable.tsx b/packages/@tinacms/toolkit/src/react-tinacms/use-subscribable.tsx index e8b282db7d..8358d918ff 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-subscribable.tsx +++ b/packages/@tinacms/toolkit/src/react-tinacms/use-subscribable.tsx @@ -1,7 +1 @@ -/** - - - -*/ - -export { useSubscribable } from '../packages/react-core' +export { useSubscribable } from '@/react-core' diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-watch-form-values.ts b/packages/@tinacms/toolkit/src/react-tinacms/use-watch-form-values.ts index cec07315d8..761c8c8cde 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-watch-form-values.ts +++ b/packages/@tinacms/toolkit/src/react-tinacms/use-watch-form-values.ts @@ -1,7 +1 @@ -/** - - - -*/ - -export { useWatchFormValues } from '../packages/react-core' +export { useWatchFormValues } from '@/react-core' diff --git a/packages/@tinacms/toolkit/src/react-tinacms/with-plugin.tsx b/packages/@tinacms/toolkit/src/react-tinacms/with-plugin.tsx index 01ee9bb03c..a2406874cf 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/with-plugin.tsx +++ b/packages/@tinacms/toolkit/src/react-tinacms/with-plugin.tsx @@ -1,7 +1 @@ -/** - - - -*/ - -export { withPlugins, withPlugin } from '../packages/react-core' +export { withPlugins, withPlugin } from '@/react-core' diff --git a/packages/@tinacms/toolkit/src/react-tinacms/with-tina.tsx b/packages/@tinacms/toolkit/src/react-tinacms/with-tina.tsx index e3fb7515a7..5d30a405f3 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/with-tina.tsx +++ b/packages/@tinacms/toolkit/src/react-tinacms/with-tina.tsx @@ -1,12 +1,6 @@ -/** - - - -*/ - import * as React from 'react' -import { TinaProvider } from '../components/TinaProvider' -import { TinaCMS, TinaCMSConfig } from '../tina-cms' +import { TinaProvider } from '../components/tina-provider' +import { TinaCMS, TinaCMSConfig } from '@/tina-cms' export function withTina(Component: any, config?: TinaCMSConfig) { return (props: any) => { diff --git a/packages/@tinacms/toolkit/src/packages/styles/Button.tsx b/packages/@tinacms/toolkit/src/styles/button.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/packages/styles/Button.tsx rename to packages/@tinacms/toolkit/src/styles/button.tsx index ac8b270495..fd4394c813 100644 --- a/packages/@tinacms/toolkit/src/packages/styles/Button.tsx +++ b/packages/@tinacms/toolkit/src/styles/button.tsx @@ -1,8 +1,3 @@ -/** - - - -*/ import * as React from 'react' export interface ButtonProps diff --git a/packages/@tinacms/toolkit/src/packages/styles/Container.tsx b/packages/@tinacms/toolkit/src/styles/container.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/packages/styles/Container.tsx rename to packages/@tinacms/toolkit/src/styles/container.tsx index 2c48ed2059..5758b0c1c5 100644 --- a/packages/@tinacms/toolkit/src/packages/styles/Container.tsx +++ b/packages/@tinacms/toolkit/src/styles/container.tsx @@ -1,8 +1,3 @@ -/** - - - -*/ import * as React from 'react' interface ContainerPropse { diff --git a/packages/@tinacms/toolkit/src/styles/font-loader.tsx b/packages/@tinacms/toolkit/src/styles/font-loader.tsx new file mode 100644 index 0000000000..abfcc221fa --- /dev/null +++ b/packages/@tinacms/toolkit/src/styles/font-loader.tsx @@ -0,0 +1,24 @@ +import * as React from 'react' + +export function FontLoader() { + const [fontLoaded, setFontLoaded] = React.useState(false) + + const WebFontConfig = { + google: { + families: ['Inter:400,600'], + }, + loading: () => { + setFontLoaded(true) + }, + } + + React.useEffect(() => { + if (!fontLoaded) { + import('webfontloader').then((WebFont) => { + return WebFont.load(WebFontConfig) + }) + } + }, []) + + return null +} diff --git a/packages/@tinacms/toolkit/src/styles/index.ts b/packages/@tinacms/toolkit/src/styles/index.ts new file mode 100644 index 0000000000..9b20214741 --- /dev/null +++ b/packages/@tinacms/toolkit/src/styles/index.ts @@ -0,0 +1,4 @@ +export * from './button' +export * from './font-loader' +export * from './overflow-menu' +export * from './message' diff --git a/packages/@tinacms/toolkit/src/packages/styles/Message.tsx b/packages/@tinacms/toolkit/src/styles/message.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/styles/Message.tsx rename to packages/@tinacms/toolkit/src/styles/message.tsx diff --git a/packages/@tinacms/toolkit/src/packages/styles/OverflowMenu.tsx b/packages/@tinacms/toolkit/src/styles/overflow-menu.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/packages/styles/OverflowMenu.tsx rename to packages/@tinacms/toolkit/src/styles/overflow-menu.tsx diff --git a/packages/@tinacms/toolkit/src/tina-cms.ts b/packages/@tinacms/toolkit/src/tina-cms.ts index d17a086239..bfaf9dbfd1 100644 --- a/packages/@tinacms/toolkit/src/tina-cms.ts +++ b/packages/@tinacms/toolkit/src/tina-cms.ts @@ -8,16 +8,15 @@ import { CMSEvent, MediaUploadOptions, PluginType, -} from './packages/core' -import { FieldPlugin } from './packages/form-builder' -import { ScreenPlugin } from './packages/react-screens' +} from '@/core' +import { FieldPlugin } from '@/form-builder' +import { ScreenPlugin } from '@/react-screens' import { TextFieldPlugin, TextareaFieldPlugin, ImageFieldPlugin, ColorFieldPlugin, NumberFieldPlugin, - MdxFieldPlugin, ToggleFieldPlugin, SelectFieldPlugin, RadioGroupFieldPlugin, @@ -31,16 +30,16 @@ import { ReferenceFieldPlugin, ButtonToggleFieldPlugin, HiddenFieldPlugin, -} from './packages/fields' -import { Form } from './packages/forms' -import { Alerts, EventsToAlerts } from './packages/alerts' -import { SidebarState, SidebarStateOptions } from './packages/react-sidebar' +} from '@/fields' +import { Form } from '@/forms' +import { Alerts, EventsToAlerts } from '@/alerts' +import { SidebarState, SidebarStateOptions } from '@/react-sidebar' import { MarkdownFieldPlaceholder, HtmlFieldPlaceholder, -} from './plugins/fields/markdown' -import { MediaManagerScreenPlugin } from './plugins/screens/media-manager-screen' -import { createCloudConfig } from './packages/react-cloud-config' +} from '@/plugin-fields/markdown' +import { MediaManagerScreenPlugin } from '@/plugin-screens/media-manager-screen' +import { createCloudConfig } from '@/react-cloud-config' import { TinaAction, TinaState } from './tina-state' const DEFAULT_FIELDS = [ @@ -51,7 +50,6 @@ const DEFAULT_FIELDS = [ NumberFieldPlugin, ToggleFieldPlugin, SelectFieldPlugin, - MdxFieldPlugin, RadioGroupFieldPlugin, GroupFieldPlugin, GroupListFieldPlugin, diff --git a/packages/@tinacms/toolkit/tsconfig.json b/packages/@tinacms/toolkit/tsconfig.json index c8b2839d63..51d739713e 100644 --- a/packages/@tinacms/toolkit/tsconfig.json +++ b/packages/@tinacms/toolkit/tsconfig.json @@ -2,7 +2,11 @@ "extends": "../../../base.tsconfig.json", "compilerOptions": { "outDir": "dist", + "baseUrl": "./", + "paths": { + "@/*": ["./src/*"] + }, }, - "exclude": ["node_modules", "dist", "src/**/*.test.tsx", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.spec.tsx"], + "exclude": ["node_modules", "dist"], "include": ["src"] } diff --git a/packages/@tinacms/toolkit/vitest.config.ts b/packages/@tinacms/toolkit/vitest.config.ts new file mode 100644 index 0000000000..192991ebec --- /dev/null +++ b/packages/@tinacms/toolkit/vitest.config.ts @@ -0,0 +1,15 @@ +/// +import { defineConfig } from 'vite' +import path from 'path' + +export default defineConfig({ + test: { + globals: true, + environment: 'happy-dom', + }, + resolve: { + alias: { + '@': path.resolve(__dirname, './src'), + }, + }, +}) diff --git a/packages/tinacms/src/admin/components/Sidebar.tsx b/packages/tinacms/src/admin/components/Sidebar.tsx index d3552e226c..777ef3036e 100644 --- a/packages/tinacms/src/admin/components/Sidebar.tsx +++ b/packages/tinacms/src/admin/components/Sidebar.tsx @@ -15,7 +15,7 @@ import { useWindowWidth } from '@react-hook/window-size' import { useGetCollections } from './GetCollections' import { IoMdClose } from 'react-icons/io' import { BiMenu } from 'react-icons/bi' -import { CloudConfigPlugin } from '@tinacms/toolkit/dist/packages/react-cloud-config' +import { CloudConfigPlugin } from '@tinacms/toolkit/dist/react-cloud-config' export const slugify = (text) => { return text diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7739db2796..beb2cf034d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -490,7 +490,7 @@ importers: zod: ^3.14.3 dependencies: '@graphql-codegen/core': 2.5.1_graphql@15.8.0 - '@graphql-codegen/plugin-helpers': 5.0.0_graphql@15.8.0 + '@graphql-codegen/plugin-helpers': 5.0.1_graphql@15.8.0 '@graphql-codegen/typescript': 4.0.1_graphql@15.8.0 '@graphql-codegen/typescript-generic-sdk': 3.1.0_3jt5ibhtazvod5hvf7xqhzsx4q '@graphql-codegen/typescript-operations': 4.0.1_graphql@15.8.0 @@ -1003,9 +1003,8 @@ importers: final-form: ^4.20.2 final-form-arrays: ^3.0.1 final-form-set-field-data: ^1.0.2 + happy-dom: ^10.5.2 is-hotkey: ^0.2.0 - jest: ^29.5.0 - jest-environment-jsdom: ^29.5.0 lodash.get: ^4.4.2 moment: 2.29.4 monaco-editor: 0.31.0 @@ -1027,8 +1026,11 @@ importers: slate-history: ^0.93.0 slate-hyperscript: ^0.77.0 slate-react: ^0.97.1 + tsc-alias: ^1.8.7 tslib: ^2.3.0 typescript: 4.3.5 + vite: ^4.3.9 + vitest: ^0.32.2 webfontloader: 1.6.28 dependencies: '@floating-ui/dom': 1.4.4 @@ -1071,6 +1073,8 @@ importers: slate-history: 0.93.0_slate@0.94.1 slate-hyperscript: 0.77.0_slate@0.94.1 slate-react: 0.97.1_ceyajmovvfljjbz2h2ik5qmoja + tsc-alias: 1.8.7 + vite: 4.3.9 webfontloader: 1.6.28 devDependencies: '@testing-library/dom': 7.31.2 @@ -1091,12 +1095,12 @@ importers: '@types/react-dom': 17.0.17 '@types/react-select': 2.0.19 '@types/storybook__react': 4.0.2 - jest: 29.5.0 - jest-environment-jsdom: 29.5.0 + happy-dom: 10.5.2 react: 17.0.2 react-dom: 17.0.2_react@17.0.2 tslib: 2.4.0 typescript: 4.3.5 + vitest: 0.32.2_happy-dom@10.5.2 packages/@tinacms/vercel-previews: specifiers: @@ -7650,10 +7654,10 @@ packages: tslib: 2.4.0 dev: false - /@graphql-codegen/plugin-helpers/5.0.0_graphql@15.8.0: + /@graphql-codegen/plugin-helpers/5.0.1_graphql@15.8.0: resolution: { - integrity: sha512-suL2ZMkBAU2a4YbBHaZvUPsV1z0q3cW6S96Z/eYYfkRIsJoe2vN+wNZ9Xdzmqx0JLmeeFCBSoBGC0imFyXlkDQ==, + integrity: sha512-6L5sb9D8wptZhnhLLBcheSPU7Tg//DGWgc5tQBWX46KYTOTQHGqDpv50FxAJJOyFVJrveN9otWk9UT9/yfY4ww==, } peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 @@ -7675,7 +7679,7 @@ packages: peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 dependencies: - '@graphql-codegen/plugin-helpers': 5.0.0_graphql@15.8.0 + '@graphql-codegen/plugin-helpers': 5.0.1_graphql@15.8.0 '@graphql-tools/utils': 10.0.0_graphql@15.8.0 graphql: 15.8.0 tslib: 2.5.0 @@ -7709,7 +7713,7 @@ packages: peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 dependencies: - '@graphql-codegen/plugin-helpers': 5.0.0_graphql@15.8.0 + '@graphql-codegen/plugin-helpers': 5.0.1_graphql@15.8.0 '@graphql-codegen/typescript': 4.0.1_graphql@15.8.0 '@graphql-codegen/visitor-plugin-common': 4.0.1_graphql@15.8.0 auto-bind: 4.0.0 @@ -7728,7 +7732,7 @@ packages: peerDependencies: graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 dependencies: - '@graphql-codegen/plugin-helpers': 5.0.0_graphql@15.8.0 + '@graphql-codegen/plugin-helpers': 5.0.1_graphql@15.8.0 '@graphql-codegen/schema-ast': 4.0.0_graphql@15.8.0 '@graphql-codegen/visitor-plugin-common': 4.0.1_graphql@15.8.0 auto-bind: 4.0.0 @@ -7771,7 +7775,7 @@ packages: peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 dependencies: - '@graphql-codegen/plugin-helpers': 5.0.0_graphql@15.8.0 + '@graphql-codegen/plugin-helpers': 5.0.1_graphql@15.8.0 '@graphql-tools/optimize': 2.0.0_graphql@15.8.0 '@graphql-tools/relay-operation-optimizer': 7.0.0_graphql@15.8.0 '@graphql-tools/utils': 10.0.0_graphql@15.8.0 @@ -11390,7 +11394,7 @@ packages: integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==, } dependencies: - '@types/node': 14.18.29 + '@types/node': 18.7.18 /@types/hast/2.3.4: resolution: @@ -15741,7 +15745,7 @@ packages: check-error: 1.0.2 deep-eql: 4.1.3 get-func-name: 2.0.0 - loupe: 2.3.4 + loupe: 2.3.6 pathval: 1.1.1 type-detect: 4.0.8 dev: true @@ -16291,6 +16295,14 @@ packages: engines: { node: '>= 12' } dev: false + /commander/9.5.0: + resolution: + { + integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==, + } + engines: { node: ^12.20.0 || >=14 } + dev: false + /commist/1.1.0: resolution: { @@ -20289,6 +20301,20 @@ packages: uglify-js: 3.17.4 dev: true + /happy-dom/10.5.2: + resolution: + { + integrity: sha512-dTA1cDcLOPIkAdykLd9Wo1k8Ly36Hh2OdKGkWEHWuAHb89KcVVRLSj1OFev7ir90xhRLSGCGrEdDvS6u9l13kg==, + } + dependencies: + css.escape: 1.5.1 + entities: 4.5.0 + iconv-lite: 0.6.3 + webidl-conversions: 7.0.0 + whatwg-encoding: 2.0.0 + whatwg-mimetype: 3.0.0 + dev: true + /hard-rejection/2.1.0: resolution: { @@ -21492,7 +21518,7 @@ packages: '@jest/expect': 29.5.0 '@jest/test-result': 29.5.0 '@jest/types': 29.5.0 - '@types/node': 14.18.29 + '@types/node': 18.7.18 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -21803,7 +21829,7 @@ packages: '@jest/environment': 29.5.0 '@jest/fake-timers': 29.5.0 '@jest/types': 29.5.0 - '@types/node': 14.18.29 + '@types/node': 18.7.18 jest-mock: 29.5.0 jest-util: 29.5.0 @@ -21994,7 +22020,7 @@ packages: '@jest/test-result': 29.5.0 '@jest/transform': 29.5.0 '@jest/types': 29.5.0 - '@types/node': 14.18.29 + '@types/node': 18.7.18 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.10 @@ -22129,7 +22155,7 @@ packages: } engines: { node: ^14.15.0 || ^16.10.0 || >=18.0.0 } dependencies: - '@types/node': 14.18.29 + '@types/node': 18.7.18 jest-util: 29.5.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -22907,15 +22933,6 @@ packages: dependencies: js-tokens: 4.0.0 - /loupe/2.3.4: - resolution: - { - integrity: sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==, - } - dependencies: - get-func-name: 2.0.0 - dev: true - /loupe/2.3.6: resolution: { @@ -24417,6 +24434,14 @@ packages: minimatch: 3.1.2 dev: false + /mylas/2.1.13: + resolution: + { + integrity: sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg==, + } + engines: { node: '>=12.0.0' } + dev: false + /mz/2.7.0: resolution: { @@ -25478,6 +25503,15 @@ packages: pathe: 1.1.1 dev: true + /plimit-lit/1.5.0: + resolution: + { + integrity: sha512-Eb/MqCb1Iv/ok4m1FqIXqvUKPISufcjZ605hl3KM/n8GaX8zfhtgdLwZU3vKjuHGh2O9Rjog/bHTq8ofIShdng==, + } + dependencies: + queue-lit: 1.5.0 + dev: false + /popmotion/11.0.3: resolution: { @@ -26212,6 +26246,13 @@ packages: } dev: true + /queue-lit/1.5.0: + resolution: + { + integrity: sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA==, + } + dev: false + /queue-microtask/1.2.3: resolution: { @@ -28264,7 +28305,7 @@ packages: integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==, } dependencies: - acorn: 8.8.2 + acorn: 8.9.0 dev: true /strip-outer/1.0.1: @@ -29036,6 +29077,21 @@ packages: yn: 3.1.1 dev: true + /tsc-alias/1.8.7: + resolution: + { + integrity: sha512-59Q/zUQa3miTf99mLbSqaW0hi1jt4WoG8Uhe5hSZJHQpSoFW9eEwvW7jlKMHXWvT+zrzy3SN9PE/YBhQ+WVydA==, + } + hasBin: true + dependencies: + chokidar: 3.5.3 + commander: 9.5.0 + globby: 11.1.0 + mylas: 2.1.13 + normalize-path: 3.0.0 + plimit-lit: 1.5.0 + dev: false + /tsconfig-paths/3.14.1: resolution: { @@ -30110,7 +30166,7 @@ packages: vfile-message: 3.1.4 dev: false - /vite-node/0.32.2_@types+node@14.18.29: + /vite-node/0.32.2_@types+node@18.7.18: resolution: { integrity: sha512-dTQ1DCLwl2aEseov7cfQ+kDMNJpM1ebpyMMMwWzBvLbis8Nla/6c9WQcqpPssTwS6Rp/+U6KwlIj8Eapw4bLdA==, @@ -30123,7 +30179,7 @@ packages: mlly: 1.4.0 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.3.9_@types+node@14.18.29 + vite: 4.3.9_@types+node@18.7.18 transitivePeerDependencies: - '@types/node' - less @@ -30204,7 +30260,7 @@ packages: fsevents: 2.3.2 dev: true - /vite/4.3.9_@types+node@14.18.29: + /vite/4.3.9_@types+node@18.7.18: resolution: { integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==, @@ -30232,7 +30288,7 @@ packages: terser: optional: true dependencies: - '@types/node': 14.18.29 + '@types/node': 18.7.18 esbuild: 0.17.19 postcss: 8.4.23 rollup: 3.25.1 @@ -30276,18 +30332,87 @@ packages: dependencies: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 - '@types/node': 14.18.29 + '@types/node': 18.7.18 '@vitest/expect': 0.32.2 '@vitest/runner': 0.32.2 '@vitest/snapshot': 0.32.2 '@vitest/spy': 0.32.2 '@vitest/utils': 0.32.2 - acorn: 8.8.2 + acorn: 8.9.0 + acorn-walk: 8.2.0 + cac: 6.7.14 + chai: 4.3.7 + concordance: 5.0.4 + debug: 4.3.4 + local-pkg: 0.4.3 + magic-string: 0.30.0 + pathe: 1.1.1 + picocolors: 1.0.0 + std-env: 3.3.3 + strip-literal: 1.0.1 + tinybench: 2.5.0 + tinypool: 0.5.0 + vite: 4.3.9_@types+node@18.7.18 + vite-node: 0.32.2_@types+node@18.7.18 + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + + /vitest/0.32.2_happy-dom@10.5.2: + resolution: + { + integrity: sha512-hU8GNNuQfwuQmqTLfiKcqEhZY72Zxb7nnN07koCUNmntNxbKQnVbeIS6sqUgR3eXSlbOpit8+/gr1KpqoMgWCQ==, + } + engines: { node: '>=v14.18.0' } + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@vitest/browser': '*' + '@vitest/ui': '*' + happy-dom: '*' + jsdom: '*' + playwright: '*' + safaridriver: '*' + webdriverio: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + playwright: + optional: true + safaridriver: + optional: true + webdriverio: + optional: true + dependencies: + '@types/chai': 4.3.5 + '@types/chai-subset': 1.3.3 + '@types/node': 18.7.18 + '@vitest/expect': 0.32.2 + '@vitest/runner': 0.32.2 + '@vitest/snapshot': 0.32.2 + '@vitest/spy': 0.32.2 + '@vitest/utils': 0.32.2 + acorn: 8.9.0 acorn-walk: 8.2.0 cac: 6.7.14 chai: 4.3.7 concordance: 5.0.4 debug: 4.3.4 + happy-dom: 10.5.2 local-pkg: 0.4.3 magic-string: 0.30.0 pathe: 1.1.1 @@ -30296,8 +30421,8 @@ packages: strip-literal: 1.0.1 tinybench: 2.5.0 tinypool: 0.5.0 - vite: 4.3.9_@types+node@14.18.29 - vite-node: 0.32.2_@types+node@14.18.29 + vite: 4.3.9_@types+node@18.7.18 + vite-node: 0.32.2_@types+node@18.7.18 why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 0251b5d44690261dce172b11b07bab3542a96bd1 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Tue, 25 Jul 2023 14:18:45 -0700 Subject: [PATCH 07/26] Move vite to dev dep --- packages/@tinacms/toolkit/package.json | 4 ++-- pnpm-lock.yaml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/@tinacms/toolkit/package.json b/packages/@tinacms/toolkit/package.json index 038b79008d..84f779ced2 100644 --- a/packages/@tinacms/toolkit/package.json +++ b/packages/@tinacms/toolkit/package.json @@ -58,6 +58,8 @@ "react-dom": "17.0.2", "tslib": "^2.3.0", "typescript": "4.3.5", + "tsc-alias": "^1.8.7", + "vite": "^4.3.9", "vitest": "^0.32.2" }, "dependencies": { @@ -101,8 +103,6 @@ "slate-history": "^0.93.0", "slate-hyperscript": "^0.77.0", "slate-react": "^0.97.1", - "tsc-alias": "^1.8.7", - "vite": "^4.3.9", "webfontloader": "1.6.28" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index beb2cf034d..840516438a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1073,8 +1073,6 @@ importers: slate-history: 0.93.0_slate@0.94.1 slate-hyperscript: 0.77.0_slate@0.94.1 slate-react: 0.97.1_ceyajmovvfljjbz2h2ik5qmoja - tsc-alias: 1.8.7 - vite: 4.3.9 webfontloader: 1.6.28 devDependencies: '@testing-library/dom': 7.31.2 @@ -1098,8 +1096,10 @@ importers: happy-dom: 10.5.2 react: 17.0.2 react-dom: 17.0.2_react@17.0.2 + tsc-alias: 1.8.7 tslib: 2.4.0 typescript: 4.3.5 + vite: 4.3.9 vitest: 0.32.2_happy-dom@10.5.2 packages/@tinacms/vercel-previews: @@ -16301,7 +16301,7 @@ packages: integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==, } engines: { node: ^12.20.0 || >=14 } - dev: false + dev: true /commist/1.1.0: resolution: @@ -24440,7 +24440,7 @@ packages: integrity: sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg==, } engines: { node: '>=12.0.0' } - dev: false + dev: true /mz/2.7.0: resolution: @@ -25510,7 +25510,7 @@ packages: } dependencies: queue-lit: 1.5.0 - dev: false + dev: true /popmotion/11.0.3: resolution: @@ -26251,7 +26251,7 @@ packages: { integrity: sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA==, } - dev: false + dev: true /queue-microtask/1.2.3: resolution: @@ -29090,7 +29090,7 @@ packages: mylas: 2.1.13 normalize-path: 3.0.0 plimit-lit: 1.5.0 - dev: false + dev: true /tsconfig-paths/3.14.1: resolution: From 121bd9fc46402af61b0c6a4c537e0c86f21cbbdf Mon Sep 17 00:00:00 2001 From: Jeff See Date: Tue, 25 Jul 2023 16:33:37 -0700 Subject: [PATCH 08/26] Absorb @tinacms/toolkit into tinacms --- .changeset/wet-islands-rhyme.md | 11 + packages/@tinacms/app/package.json | 1 - packages/@tinacms/cli/src/next/vite/index.ts | 4 +- packages/@tinacms/scripts/src/index.ts | 3 +- packages/@tinacms/toolkit/CHANGELOG.md | 2150 ----------------- packages/@tinacms/toolkit/README.md | 9 - packages/@tinacms/toolkit/assets/close.svg | 4 - .../@tinacms/toolkit/assets/ellipsis-v.svg | 3 - .../@tinacms/toolkit/assets/forestry-logo.svg | 3 - .../@tinacms/toolkit/assets/hamburger.svg | 5 - packages/@tinacms/toolkit/package.json | 113 - .../toolkit/src/react-tinacms/use-cms.ts | 8 - .../toolkit/src/react-tinacms/use-plugin.tsx | 1 - .../src/react-tinacms/use-subscribable.tsx | 1 - .../react-tinacms/use-watch-form-values.ts | 1 - .../toolkit/src/react-tinacms/with-plugin.tsx | 1 - packages/@tinacms/toolkit/tsconfig.json | 12 - packages/@tinacms/toolkit/typedoc.js | 7 - .../toolkit/types/react-frame-component.d.ts | 7 - packages/next-tinacms-cloudinary/package.json | 1 - .../src/cloudinary-media-store.ts | 8 +- .../next-tinacms-cloudinary/src/handlers.ts | 2 +- packages/next-tinacms-dos/package.json | 1 - .../next-tinacms-dos/src/dos-media-store.ts | 8 +- packages/next-tinacms-dos/src/handlers.ts | 2 +- packages/next-tinacms-s3/package.json | 1 - packages/next-tinacms-s3/src/handlers.ts | 2 +- .../next-tinacms-s3/src/s3-media-store.ts | 4 +- packages/tinacms/package.json | 61 +- .../tinacms/src/admin/components/Sidebar.tsx | 2 +- .../tinacms/src/auth/TinaCloudProvider.tsx | 4 +- packages/tinacms/src/edit-state.test.tsx | 9 +- packages/tinacms/src/global.css | 120 + packages/tinacms/src/index.ts | 2 +- packages/tinacms/src/styles.css | 30 +- .../src/toolkit}/alerts/alerts.test.ts | 2 +- .../src/toolkit}/alerts/alerts.ts | 2 +- .../src/toolkit}/alerts/index.ts | 0 .../browser-storage/browser-storage-client.ts | 0 .../get-flattened-form-values.ts | 2 +- .../src/toolkit}/browser-storage/index.ts | 0 .../browser-storage/use-form-browser-cache.ts | 4 +- .../components/active-field-indicator.tsx | 8 +- .../toolkit}/components/media/breadcrumb.tsx | 4 +- .../toolkit}/components/media/copy-field.tsx | 0 .../src/toolkit}/components/media/index.ts | 0 .../toolkit}/components/media/media-item.tsx | 2 +- .../components/media/media-manager.tsx | 15 +- .../src/toolkit}/components/media/modal.tsx | 6 +- .../toolkit}/components/media/pagination.tsx | 2 +- .../src/toolkit}/components/media/utils.ts | 0 .../toolkit}/components/mutation-signal.tsx | 0 .../components/tina-cms-provider.test.tsx | 4 +- .../toolkit}/components/tina-cms-provider.tsx | 6 +- .../src/toolkit}/components/tina-provider.tsx | 0 .../src/toolkit}/components/tina-ui.test.tsx | 0 .../src/toolkit}/components/tina-ui.tsx | 10 +- .../src/toolkit}/core/cms.test.ts | 0 .../src => tinacms/src/toolkit}/core/cms.ts | 0 .../src => tinacms/src/toolkit}/core/event.ts | 0 .../src/toolkit}/core/events.test.ts | 0 .../src => tinacms/src/toolkit}/core/flags.ts | 0 .../src => tinacms/src/toolkit}/core/index.ts | 0 .../src/toolkit}/core/media-store.default.ts | 2 +- .../src => tinacms/src/toolkit}/core/media.ts | 0 .../src/toolkit}/core/plugins.test.ts | 0 .../src/toolkit}/core/plugins.ts | 0 .../src/toolkit}/core/subscribable.test.ts | 0 .../src/toolkit}/core/subscribable.ts | 0 .../core/types/react-frame-component.d.ts | 0 .../fields/components/button-toggle.tsx | 0 .../fields/components/checkbox-group.tsx | 0 .../color-picker/color-formatter.tsx | 0 .../components/color-picker/color-picker.tsx | 4 +- .../fields/components/color-picker/index.css | 0 .../fields/components/color-picker/index.ts | 0 .../components/image-upload/image-upload.tsx | 10 +- .../fields/components/image-upload/index.ts | 0 .../src/toolkit}/fields/components/index.ts | 0 .../src/toolkit}/fields/components/input.tsx | 0 .../fields/components/number-input.tsx | 0 .../fields/components/radio-group.tsx | 0 .../fields/components/reference/index.tsx | 2 +- .../components/reference/reference-link.tsx | 2 +- .../components/reference/reference-select.tsx | 6 +- .../src/toolkit}/fields/components/select.tsx | 2 +- .../toolkit}/fields/components/text-field.tsx | 0 .../toolkit}/fields/components/textarea.tsx | 0 .../src/toolkit}/fields/components/toggle.tsx | 2 +- .../src/toolkit}/fields/field-events.ts | 2 +- .../src/toolkit}/fields/index.ts | 0 .../block-selector-big.tsx | 6 +- .../blocks-field-plugin/block-selector.tsx | 4 +- .../plugins/blocks-field-plugin/index.tsx | 10 +- .../plugins/button-toggle-field-plugin.tsx | 0 .../plugins/checkbox-group-field-plugin.tsx | 0 .../fields/plugins/color-field-plugin.tsx | 0 .../fields/plugins/date-field-plugin.css | 0 .../fields/plugins/date-field-plugin.tsx | 0 .../toolkit}/fields/plugins/date-format.ts | 0 .../toolkit}/fields/plugins/field-props.ts | 4 +- .../fields/plugins/group-field-plugin.tsx | 10 +- .../plugins/group-list-field-plugin.tsx | 12 +- .../fields/plugins/hidden-field-plugin.tsx | 0 .../fields/plugins/image-field-plugin.tsx | 4 +- .../src/toolkit}/fields/plugins/index.ts | 0 .../fields/plugins/list-field-meta.tsx | 4 +- .../fields/plugins/list-field-plugin.tsx | 8 +- .../fields/plugins/mdx-field-plugin/index.tsx | 0 .../mdx-field-plugin/monaco/error-message.tsx | 0 .../plugins/mdx-field-plugin/monaco/index.tsx | 0 .../mdx-field-plugin/monaco/use-debounce.ts | 0 .../mdx-field-plugin/plate/editor-context.tsx | 0 .../plate/hooks/embed-hooks.ts | 4 +- .../plate/hooks/use-resize.ts | 0 .../plugins/mdx-field-plugin/plate/index.tsx | 0 .../mdx-field-plugin/plate/nested-form.tsx | 4 +- .../core/autoformat/autoformat-block.ts | 0 .../core/autoformat/autoformat-lists.ts | 0 .../core/autoformat/autoformat-marks.ts | 0 .../core/autoformat/autoformat-rules.ts | 0 .../core/autoformat/autoformat-utils.ts | 0 .../plate/plugins/core/common.tsx | 0 .../plate/plugins/core/formatting.tsx | 0 .../plate/plugins/core/index.tsx | 0 .../core/with-correct-void-behavior.ts | 0 .../plate/plugins/create-code-block/index.tsx | 0 .../plugins/create-img-plugin/component.tsx | 2 +- .../plate/plugins/create-img-plugin/index.tsx | 2 +- .../create-invalid-markdown-plugin/index.tsx | 0 .../plugins/create-link-plugin/index.tsx | 0 .../plugins/create-mdx-plugins/component.tsx | 0 .../plugins/create-mdx-plugins/index.tsx | 0 .../soft-break/create-soft-break-plugin.tsx | 0 .../plate/plugins/soft-break/index.ts | 0 .../soft-break/on-key-down-soft-break.ts | 0 .../plate/plugins/soft-break/types.ts | 0 .../plate/plugins/ui/autocomplete.tsx | 0 .../plate/plugins/ui/code-block/index.tsx | 0 .../plate/plugins/ui/components.tsx | 0 .../plate/plugins/ui/dropdown.tsx | 0 .../plate/plugins/ui/helpers.tsx | 0 .../plate/plugins/ui/icons.tsx | 0 .../plugins/ui/toolbar/floating-toolbar.tsx | 0 .../plate/plugins/ui/toolbar/index.tsx | 0 .../plugins/ui/toolbar/overflow-menu.tsx | 0 .../plugins/ui/toolbar/resize-observer.d.ts | 0 .../plate/plugins/ui/toolbar/toolbar-item.tsx | 2 +- .../plate/transforms/insert-empty-block.ts | 0 .../plugins/mdx-field-plugin/plate/types.ts | 2 +- .../fields/plugins/number-field-plugin.tsx | 0 .../toolkit}/fields/plugins/number-format.ts | 0 .../plugins/radio-group-field-plugin.tsx | 0 .../fields/plugins/reference-field-plugin.tsx | 0 .../fields/plugins/select-field-plugin.tsx | 0 .../fields/plugins/tags-field-plugin.tsx | 4 +- .../fields/plugins/text-field-plugin.tsx | 0 .../fields/plugins/text-format.test.ts | 0 .../toolkit}/fields/plugins/text-format.ts | 0 .../fields/plugins/textarea-field-plugin.tsx | 0 .../fields/plugins/toggle-field-plugin.tsx | 0 .../fields/plugins/wrap-field-with-meta.tsx | 6 +- .../toolkit}/form-builder/field-plugin.tsx | 4 +- .../toolkit}/form-builder/fields-builder.tsx | 4 +- .../toolkit}/form-builder/form-actions.tsx | 6 +- .../toolkit}/form-builder/form-builder.tsx | 6 +- .../src/toolkit}/form-builder/form-legacy.tsx | 2 +- .../src/toolkit}/form-builder/form-portal.tsx | 0 .../src/toolkit}/form-builder/form.tsx | 2 +- .../src/toolkit}/form-builder/index.ts | 0 .../toolkit}/form-builder/loading-dots.css | 0 .../toolkit}/form-builder/loading-dots.tsx | 0 .../src/toolkit}/form-builder/reset-form.tsx | 2 +- .../toolkit}/forms/content-creator-plugin.ts | 2 +- .../src/toolkit}/forms/field.ts | 0 .../src/toolkit}/forms/form.test.ts | 0 .../src => tinacms/src/toolkit}/forms/form.ts | 2 +- .../toolkit}/forms/form.update-values.test.ts | 0 .../src/toolkit}/forms/index.ts | 0 .../forms/types/react-frame-component.d.ts | 0 .../src/toolkit}/git-client/git-client.ts | 0 .../src/toolkit}/git-client/git-file.ts | 2 +- .../toolkit}/git-client/git-media-store.ts | 2 +- .../src/toolkit}/git-client/index.ts | 0 .../src/toolkit}/git-client/use-git-file.ts | 2 +- .../src => tinacms/src/toolkit}/global.css | 0 .../src/toolkit}/hooks/use-field-reference.ts | 2 +- .../src/toolkit}/hooks/use-local-storage.ts | 0 .../src => tinacms/src/toolkit}/icons/Add.tsx | 5 +- .../src/toolkit}/icons/Alert.tsx | 0 .../src/toolkit}/icons/AlignCenter.tsx | 0 .../src/toolkit}/icons/AlignLeft.tsx | 0 .../src/toolkit}/icons/AlignRight.tsx | 0 .../src/toolkit}/icons/Bold.tsx | 0 .../src/toolkit}/icons/ChevronDown.tsx | 0 .../src/toolkit}/icons/ChevronLeft.tsx | 0 .../src/toolkit}/icons/ChevronRight.tsx | 0 .../src/toolkit}/icons/ChevronUp.tsx | 0 .../src/toolkit}/icons/Circle.tsx | 0 .../src/toolkit}/icons/CircleCheck.tsx | 0 .../src/toolkit}/icons/Close.tsx | 0 .../src/toolkit}/icons/Code.tsx | 0 .../src/toolkit}/icons/Drag.tsx | 0 .../src/toolkit}/icons/Duplicate.tsx | 0 .../src/toolkit}/icons/Edit.tsx | 0 .../src/toolkit}/icons/EllipsisVertical.tsx | 0 .../src/toolkit}/icons/Error.tsx | 0 .../src/toolkit}/icons/Exit.tsx | 0 .../src/toolkit}/icons/File.tsx | 0 .../src/toolkit}/icons/Folder.tsx | 0 .../src/toolkit}/icons/Hamburger.tsx | 0 .../src/toolkit}/icons/Heading.tsx | 0 .../src/toolkit}/icons/Info.tsx | 0 .../src/toolkit}/icons/Italic.tsx | 0 .../src/toolkit}/icons/LeftArrow.tsx | 0 .../src/toolkit}/icons/Link.tsx | 0 .../src/toolkit}/icons/Lock.tsx | 0 .../src/toolkit}/icons/Markdown.tsx | 0 .../src/toolkit}/icons/Media.tsx | 0 .../src/toolkit}/icons/OrderedList.tsx | 0 .../src/toolkit}/icons/PullRequest.tsx | 0 .../src/toolkit}/icons/Quote.tsx | 0 .../src/toolkit}/icons/Redo.tsx | 0 .../src/toolkit}/icons/Reorder.tsx | 0 .../src/toolkit}/icons/ReorderRow.tsx | 0 .../src/toolkit}/icons/Reset.tsx | 0 .../src/toolkit}/icons/RightArrow.tsx | 0 .../src/toolkit}/icons/Settings.tsx | 0 .../src/toolkit}/icons/Strikethrough.tsx | 0 .../src/toolkit}/icons/Table.tsx | 0 .../src/toolkit}/icons/Tina.tsx | 0 .../src/toolkit}/icons/Trash.tsx | 0 .../src/toolkit}/icons/Underline.tsx | 0 .../src/toolkit}/icons/Undo.tsx | 0 .../src/toolkit}/icons/UnorderedList.tsx | 0 .../src/toolkit}/icons/Upload.tsx | 0 .../src/toolkit}/icons/Warning.tsx | 0 .../src/toolkit}/icons/index.ts | 0 .../src => tinacms/src/toolkit}/index.ts | 49 +- .../toolkit}/plugin-branch-switcher/README.md | 0 .../plugin-branch-switcher/branch-banner.tsx | 4 +- .../plugin-branch-switcher/branch-button.tsx | 2 +- .../plugin-branch-switcher/branch-data.tsx | 2 +- .../plugin-branch-switcher/branch-modal.tsx | 9 +- .../branch-switcher-legacy.tsx | 8 +- .../branch-switcher.test.tsx | 0 .../branch-switcher.tsx | 8 +- .../toolkit}/plugin-branch-switcher/index.ts | 0 .../plugin-branch-switcher/plugin.tsx | 2 +- .../toolkit}/plugin-branch-switcher/types.ts | 0 .../src/toolkit}/plugin-fields/index.ts | 2 +- .../src/toolkit}/plugin-fields/markdown.tsx | 2 +- .../src/toolkit}/plugin-form-meta/index.tsx | 2 +- .../src/toolkit}/plugin-screens/index.tsx | 8 +- .../plugin-screens/media-manager-screen.tsx | 4 +- .../src => tinacms/src/toolkit}/preflight.css | 0 .../src/toolkit}/react-alerts/alerts.test.tsx | 0 .../src/toolkit}/react-alerts/alerts.tsx | 8 +- .../src/toolkit}/react-alerts/index.ts | 0 .../cloud-config-plugin.tsx | 2 +- .../src/toolkit}/react-cloud-config/index.ts | 0 .../use-cloud-config-plugin.tsx | 2 +- .../src/toolkit}/react-core/index.ts | 0 .../react-core/tina-error-boundary.tsx | 0 .../src/toolkit}/react-core/use-cms-event.ts | 2 +- .../src/toolkit}/react-core/use-cms.ts | 4 +- .../src/toolkit}/react-core/use-form.ts | 2 +- .../src/toolkit}/react-core/use-plugin.tsx | 2 +- .../toolkit}/react-core/use-subscribable.tsx | 0 .../react-core/use-watch-form-values.ts | 2 +- .../src/toolkit}/react-core/with-plugin.tsx | 2 +- .../src/toolkit}/react-datetime/DateTime.jsx | 0 .../react-datetime/parts/ViewNavigation.jsx | 0 .../react-datetime/views/DaysView.jsx | 0 .../react-datetime/views/MonthsView.jsx | 0 .../react-datetime/views/TimeView.jsx | 0 .../react-datetime/views/YearsView.jsx | 0 .../react-dismissible/dismissible.tsx | 0 .../src/toolkit}/react-dismissible/index.ts | 0 .../src/toolkit}/react-forms/form-modal.tsx | 13 +- .../src/toolkit}/react-forms/index.ts | 0 .../react-modals/fullscreen-modal.tsx | 0 .../src/toolkit}/react-modals/index.ts | 0 .../toolkit}/react-modals/modal-provider.tsx | 0 .../src/toolkit}/react-modals/modal/index.ts | 0 .../react-modals/modal/modal-actions.tsx | 0 .../react-modals/modal/modal-body.tsx | 0 .../react-modals/modal/modal-header.tsx | 2 +- .../react-modals/modal/modal-overlay.tsx | 0 .../src/toolkit}/react-modals/modal/modal.tsx | 0 .../src/toolkit}/react-modals/popup-modal.tsx | 0 .../components/screen-plugin-modal.tsx | 2 +- .../src/toolkit}/react-screens/index.ts | 0 .../toolkit}/react-screens/screen-plugin.tsx | 2 +- .../react-screens/use-screen-plugin.tsx | 2 +- .../react-sidebar/components/form-list.tsx | 4 +- .../components/local-warning.tsx | 2 +- .../toolkit}/react-sidebar/components/nav.tsx | 8 +- .../components/no-forms-placeholder.tsx | 4 +- .../components/resize-handle.tsx | 0 .../react-sidebar/components/sidebar-body.tsx | 8 +- .../react-sidebar/components/sidebar.tsx | 10 +- .../react-sidebar/components/sync-status.tsx | 11 +- .../src/toolkit}/react-sidebar/index.ts | 0 .../src/toolkit}/react-sidebar/sidebar.ts | 0 .../src/toolkit}/react-tinacms/index.ts | 6 +- .../src/toolkit/react-tinacms/use-cms.ts | 8 + .../src/toolkit}/react-tinacms/use-form.ts | 10 +- .../src/toolkit/react-tinacms/use-plugin.tsx | 1 + .../react-tinacms/use-subscribable.tsx | 1 + .../react-tinacms/use-watch-form-values.ts | 1 + .../src/toolkit/react-tinacms/with-plugin.tsx | 1 + .../src/toolkit}/react-tinacms/with-tina.tsx | 2 +- .../src => tinacms/src/toolkit}/styles.css | 0 .../src/toolkit}/styles/button.tsx | 0 .../src/toolkit}/styles/container.tsx | 0 .../src/toolkit}/styles/font-loader.tsx | 0 .../src/toolkit}/styles/index.ts | 0 .../src/toolkit}/styles/message.tsx | 0 .../src/toolkit}/styles/overflow-menu.tsx | 0 .../src => tinacms/src/toolkit}/tina-cms.ts | 20 +- .../src/toolkit}/tina-state.tsx | 0 packages/tinacms/tsconfig.json | 7 +- .../toolkit => tinacms}/vitest.config.ts | 3 +- pnpm-lock.yaml | 417 +--- 325 files changed, 628 insertions(+), 2876 deletions(-) create mode 100644 .changeset/wet-islands-rhyme.md delete mode 100644 packages/@tinacms/toolkit/CHANGELOG.md delete mode 100644 packages/@tinacms/toolkit/README.md delete mode 100644 packages/@tinacms/toolkit/assets/close.svg delete mode 100644 packages/@tinacms/toolkit/assets/ellipsis-v.svg delete mode 100644 packages/@tinacms/toolkit/assets/forestry-logo.svg delete mode 100644 packages/@tinacms/toolkit/assets/hamburger.svg delete mode 100644 packages/@tinacms/toolkit/package.json delete mode 100644 packages/@tinacms/toolkit/src/react-tinacms/use-cms.ts delete mode 100644 packages/@tinacms/toolkit/src/react-tinacms/use-plugin.tsx delete mode 100644 packages/@tinacms/toolkit/src/react-tinacms/use-subscribable.tsx delete mode 100644 packages/@tinacms/toolkit/src/react-tinacms/use-watch-form-values.ts delete mode 100644 packages/@tinacms/toolkit/src/react-tinacms/with-plugin.tsx delete mode 100644 packages/@tinacms/toolkit/tsconfig.json delete mode 100644 packages/@tinacms/toolkit/typedoc.js delete mode 100644 packages/@tinacms/toolkit/types/react-frame-component.d.ts create mode 100644 packages/tinacms/src/global.css rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/alerts/alerts.test.ts (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/alerts/alerts.ts (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/alerts/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/browser-storage/browser-storage-client.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/browser-storage/get-flattened-form-values.ts (90%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/browser-storage/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/browser-storage/use-form-browser-cache.ts (87%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/active-field-indicator.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/media/breadcrumb.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/media/copy-field.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/media/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/media/media-item.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/media/media-manager.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/media/modal.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/media/pagination.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/media/utils.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/mutation-signal.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/tina-cms-provider.test.tsx (91%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/tina-cms-provider.tsx (77%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/tina-provider.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/tina-ui.test.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/components/tina-ui.tsx (86%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/cms.test.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/cms.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/event.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/events.test.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/flags.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/media-store.default.ts (99%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/media.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/plugins.test.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/plugins.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/subscribable.test.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/subscribable.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/core/types/react-frame-component.d.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/button-toggle.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/checkbox-group.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/color-picker/color-formatter.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/color-picker/color-picker.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/color-picker/index.css (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/color-picker/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/image-upload/image-upload.tsx (94%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/image-upload/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/input.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/number-input.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/radio-group.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/reference/index.tsx (93%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/reference/reference-link.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/reference/reference-select.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/select.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/text-field.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/textarea.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/components/toggle.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/field-events.ts (82%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/blocks-field-plugin/block-selector-big.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/blocks-field-plugin/block-selector.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/blocks-field-plugin/index.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/button-toggle-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/checkbox-group-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/color-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/date-field-plugin.css (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/date-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/date-format.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/field-props.ts (56%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/group-field-plugin.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/group-list-field-plugin.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/hidden-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/image-field-plugin.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/list-field-meta.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/list-field-plugin.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/monaco/error-message.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/monaco/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/monaco/use-debounce.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/editor-context.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/hooks/use-resize.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/nested-form.tsx (89%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-block.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-lists.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-marks.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-rules.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-utils.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/core/common.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/core/formatting.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/core/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/core/with-correct-void-behavior.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/create-code-block/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/create-invalid-markdown-plugin/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/create-link-plugin/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/create-soft-break-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/on-key-down-soft-break.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/types.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/autocomplete.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/code-block/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/components.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/helpers.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/icons.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/floating-toolbar.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/index.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/overflow-menu.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/resize-observer.d.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx (99%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/transforms/insert-empty-block.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/mdx-field-plugin/plate/types.ts (75%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/number-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/number-format.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/radio-group-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/reference-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/select-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/tags-field-plugin.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/text-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/text-format.test.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/text-format.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/textarea-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/toggle-field-plugin.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/fields/plugins/wrap-field-with-meta.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/field-plugin.tsx (81%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/fields-builder.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/form-actions.tsx (93%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/form-builder.tsx (99%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/form-legacy.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/form-portal.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/form.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/loading-dots.css (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/loading-dots.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/form-builder/reset-form.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/forms/content-creator-plugin.ts (90%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/forms/field.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/forms/form.test.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/forms/form.ts (99%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/forms/form.update-values.test.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/forms/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/forms/types/react-frame-component.d.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/git-client/git-client.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/git-client/git-file.ts (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/git-client/git-media-store.ts (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/git-client/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/git-client/use-git-file.ts (88%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/global.css (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/hooks/use-field-reference.ts (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/hooks/use-local-storage.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Add.tsx (70%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Alert.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/AlignCenter.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/AlignLeft.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/AlignRight.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Bold.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/ChevronDown.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/ChevronLeft.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/ChevronRight.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/ChevronUp.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Circle.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/CircleCheck.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Close.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Code.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Drag.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Duplicate.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Edit.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/EllipsisVertical.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Error.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Exit.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/File.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Folder.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Hamburger.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Heading.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Info.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Italic.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/LeftArrow.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Link.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Lock.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Markdown.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Media.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/OrderedList.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/PullRequest.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Quote.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Redo.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Reorder.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/ReorderRow.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Reset.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/RightArrow.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Settings.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Strikethrough.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Table.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Tina.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Trash.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Underline.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Undo.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/UnorderedList.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Upload.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/Warning.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/icons/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/index.ts (50%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/README.md (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/branch-banner.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/branch-button.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/branch-data.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/branch-modal.tsx (86%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/branch-switcher-legacy.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/branch-switcher.test.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/branch-switcher.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/plugin.tsx (94%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-branch-switcher/types.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-fields/index.ts (92%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-fields/markdown.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-form-meta/index.tsx (84%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-screens/index.tsx (79%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/plugin-screens/media-manager-screen.tsx (67%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/preflight.css (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-alerts/alerts.test.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-alerts/alerts.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-alerts/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-cloud-config/cloud-config-plugin.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-cloud-config/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-cloud-config/use-cloud-config-plugin.tsx (86%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-core/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-core/tina-error-boundary.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-core/use-cms-event.ts (93%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-core/use-cms.ts (87%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-core/use-form.ts (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-core/use-plugin.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-core/use-subscribable.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-core/use-watch-form-values.ts (94%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-core/with-plugin.tsx (93%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-datetime/DateTime.jsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-datetime/parts/ViewNavigation.jsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-datetime/views/DaysView.jsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-datetime/views/MonthsView.jsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-datetime/views/TimeView.jsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-datetime/views/YearsView.jsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-dismissible/dismissible.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-dismissible/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-forms/form-modal.tsx (81%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-forms/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/fullscreen-modal.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/modal-provider.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/modal/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/modal/modal-actions.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/modal/modal-body.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/modal/modal-header.tsx (95%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/modal/modal-overlay.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/modal/modal.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-modals/popup-modal.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-screens/components/screen-plugin-modal.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-screens/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-screens/screen-plugin.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-screens/use-screen-plugin.tsx (85%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/components/form-list.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/components/local-warning.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/components/nav.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/components/no-forms-placeholder.tsx (94%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/components/resize-handle.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/components/sidebar-body.tsx (96%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/components/sidebar.tsx (98%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/components/sync-status.tsx (97%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-sidebar/sidebar.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-tinacms/index.ts (57%) create mode 100644 packages/tinacms/src/toolkit/react-tinacms/use-cms.ts rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-tinacms/use-form.ts (73%) create mode 100644 packages/tinacms/src/toolkit/react-tinacms/use-plugin.tsx create mode 100644 packages/tinacms/src/toolkit/react-tinacms/use-subscribable.tsx create mode 100644 packages/tinacms/src/toolkit/react-tinacms/use-watch-form-values.ts create mode 100644 packages/tinacms/src/toolkit/react-tinacms/with-plugin.tsx rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/react-tinacms/with-tina.tsx (86%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/styles.css (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/styles/button.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/styles/container.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/styles/font-loader.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/styles/index.ts (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/styles/message.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/styles/overflow-menu.tsx (100%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/tina-cms.ts (89%) rename packages/{@tinacms/toolkit/src => tinacms/src/toolkit}/tina-state.tsx (100%) rename packages/{@tinacms/toolkit => tinacms}/vitest.config.ts (62%) diff --git a/.changeset/wet-islands-rhyme.md b/.changeset/wet-islands-rhyme.md new file mode 100644 index 0000000000..c55d4aae70 --- /dev/null +++ b/.changeset/wet-islands-rhyme.md @@ -0,0 +1,11 @@ +--- +'next-tinacms-cloudinary': patch +'@tinacms/scripts': patch +'next-tinacms-dos': patch +'next-tinacms-s3': patch +'@tinacms/app': patch +'@tinacms/cli': patch +'tinacms': patch +--- + +Absorb @tinacms/toolkit into tinacms diff --git a/packages/@tinacms/app/package.json b/packages/@tinacms/app/package.json index 78e58759b7..6116a05a6e 100644 --- a/packages/@tinacms/app/package.json +++ b/packages/@tinacms/app/package.json @@ -15,7 +15,6 @@ "@heroicons/react": "1.0.6", "@monaco-editor/react": "4.4.5", "@tinacms/mdx": "workspace:*", - "@tinacms/toolkit": "workspace:*", "@xstate/react": "3.0.0", "final-form": "4.20.7", "graphiql": "3.0.0-alpha.1", diff --git a/packages/@tinacms/cli/src/next/vite/index.ts b/packages/@tinacms/cli/src/next/vite/index.ts index 49a524e71d..95d7d6392e 100644 --- a/packages/@tinacms/cli/src/next/vite/index.ts +++ b/packages/@tinacms/cli/src/next/vite/index.ts @@ -82,7 +82,7 @@ export const createConfig = async ({ appType: 'spa', resolve: { alias, - dedupe: ['graphql', 'tinacms', '@tinacms/toolkit', 'react', 'react-dom'], + dedupe: ['graphql', 'tinacms', 'react', 'react-dom'], }, define: { /** @@ -137,7 +137,7 @@ export const createConfig = async ({ }, plugins: [ /** - * `splitVendorChunkPlugin` is needed because `tinacms` and `@tinacms/toolkit` are quite large, + * `splitVendorChunkPlugin` is needed because `tinacms` is quite large, * Vite's chunking strategy chokes on memory issues for smaller machines (ie. on CI). */ react({ diff --git a/packages/@tinacms/scripts/src/index.ts b/packages/@tinacms/scripts/src/index.ts index 1704cd9531..5392644160 100644 --- a/packages/@tinacms/scripts/src/index.ts +++ b/packages/@tinacms/scripts/src/index.ts @@ -593,7 +593,8 @@ export const buildIt = async (entryPoint, packageJSON) => { ], resolve: { alias: { - '@': path.resolve(process.cwd(), 'src'), + '@toolkit': path.resolve(process.cwd(), 'src/toolkit'), + '@tinacms/toolkit': path.resolve(process.cwd(), 'src/toolkit/index.ts'), }, }, build: { diff --git a/packages/@tinacms/toolkit/CHANGELOG.md b/packages/@tinacms/toolkit/CHANGELOG.md deleted file mode 100644 index f72b099364..0000000000 --- a/packages/@tinacms/toolkit/CHANGELOG.md +++ /dev/null @@ -1,2150 +0,0 @@ -# Change Log - -## 1.7.13 - -### Patch Changes - -- bc812441b: Use .mjs extension for ES modules -- Updated dependencies [bc812441b] - - @tinacms/sharedctx@1.0.2 - - @tinacms/search@1.0.7 - -## 1.7.12 - -### Patch Changes - -- 1889422b0: Fix issue where deeply nested rich-text fields weren't selectable -- Updated dependencies [ad6a166a6] - - @tinacms/search@1.0.6 - -## 1.7.11 - -### Patch Changes - -- @tinacms/search@1.0.5 - -## 1.7.10 - -### Patch Changes - -- f1e8828c8: fix: resort prop overrides to allow for style & className merging of list items -- 304e23318: - Update pull request title to include the branch name - - Slugify brach name when typing in the title -- a5d986477: update branch modal text - -## 1.7.9 - -### Patch Changes - -- d73d03f8f: Improves image field UI -- 745e30708: Fix text truncation in branch button -- 495108725: Disable tina cloud specific calls when using custom content api -- 7d6e6ff3d: Update plate -- 808d5cc6c: Update branch banner button to reflect protected status - - @tinacms/search@1.0.4 - -## 1.7.8 - -### Patch Changes - -- f6efd498e: Added branch creation model - -## 1.7.7 - -### Patch Changes - -- 8710dec4b: Fix issue where navigating in and out of visual editing mode would not pick up the correct active form -- Updated dependencies [fe13b4ed9] -- Updated dependencies [812df6ace] - - @tinacms/search@1.0.3 - -## 1.7.6 - -### Patch Changes - -- Updated dependencies [ee9acb5e5] - - @tinacms/search@1.0.2 - -## 1.7.5 - -### Patch Changes - -- c385b5615: Initial implementation of search functionality -- Updated dependencies [c385b5615] - - @tinacms/search@1.0.1 - -## 1.7.4 - -### Patch Changes - -- cc621f665: fix: Skip media status check on external media - -## 1.7.3 - -### Patch Changes - -- 70c74bb55: Embed dropdown UI, media list view styles -- 385c8a865: Update Media Manager to sync media from Cloud dashboard -- 1aea2c6a4: Fix an issue which result in an infinite loop for required fields in some cases - -## 1.7.2 - -### Patch Changes - -- 63dd98904: - Adds newly added images to the top of the list and selects them - - Adds a refresh button to the image list - - Fixes a bug where you could not upload images in a directory (Locally) - - Adds a new folder button to the media manager - - Logs error messages from the handlers so the user is aware of them (previously they were just swallowed and returned in the response message but this is harder to find) -- b3d98d159: Add array check for value.children -- 7f95c1ce5: Reorganize the way fields are presented on the form to allow for deep-linking - -## 1.7.1 - -### Patch Changes - -- eba7e5e5e: Simplify formify logic - -## 1.7.0 - -### Minor Changes - -- eeedcfd30: Adds folder support in the admin. See [this PR](https://github.com/tinacms/tinacms/pull/3750) for more info and a demo. - -### Patch Changes - -- 804639965: Sets minimum width for SVG images - -## 1.6.4 - -### Patch Changes - -- 709b6f2ec: Fix template menu UI, image delete button - -## 1.6.3 - -### Patch Changes - -- 2a32a0b99: Truncate long branch names in sidebar UI -- 6f491f38c: allow slashes in branch names - -## 1.6.2 - -### Patch Changes - -- 1370ebae6: Update branching refresh logic to not refresh when a new branch is created. Instead it will be added to the list of branches in memory - -## 1.6.1 - -### Patch Changes - -- d0c4801b7: cancel index polling when component is unmounted - -## 1.6.0 - -### Minor Changes - -- 76c984bcc: Use new API endpoint in content api reqests - -### Patch Changes - -- 084a39d2c: Dont trigger hover events for ListFieldMeta when wrapping objects -- 785748400: Add error modal for failed media uploads - - @tinacms/sharedctx@1.0.1 - -## 1.5.2 - -### Patch Changes - -- 973e83f1f: Some fixes around image handling in the rich-text editor - - - Stop treating images as block-level - - Fix issue where images inside links were being stripped out - - Fix display of .avif images in the media manager - -- d1cf65999: Adds list support to image field, improved field UI - -## 1.5.1 - -### Patch Changes - -- f07d8f165: fix: nested thumbails - -## 1.5.0 - -### Minor Changes - -- 817b10b8a: deliver multiple size thumbnails - -### Patch Changes - -- ee4543ea5: feat: add absolute img urls to media library -- 743246851: Update isFile funtion to match src from TinaCloud - - @tinacms/sharedctx@1.0.1 - -## 1.4.0 - -### Minor Changes - -- 4cd5cd4f7: Refactor: Remove previewSrc from imageAPI - -### Patch Changes - -- be3eac32f: Adds grid view to media manager -- 9cf869d40: fix: previous directory link in Tina MediaManager -- 9c277e179: fix: make rich text errors scrollable -- 8d5c923c7: fix: When current branch doesn't exist, handle error more gracefully -- 0b7687424: support pdf uploads - - @tinacms/sharedctx@1.0.1 - -## 1.3.4 - -### Patch Changes - -- 0e6093a8d: Fixes branch switcher accessed from the branch banner, adds indexing status to branch list, improves UI clarity. - -## 1.3.3 - -### Patch Changes - -- f1f3938d9: Add default validation to all fields that did not have it. -- 5d024e4f1: Add branch banner to sidebar and admin - -## 1.3.2 - -### Patch Changes - -- efd56e769: Remove license headers -- 50f86caed: Adds filtering to the admin IU -- Updated dependencies [efd56e769] - - @tinacms/sharedctx@1.0.1 - -## 1.3.1 - -### Patch Changes - -- 09e716538: Fix error where children being undefined would cause an error - -## 1.3.0 - -### Minor Changes - -- e8776aa59: Add new GraphQL endpoint for updating a documents name -- e019a200a: Adds CMD/CTRL+S functionality for saving forms. It works in both the fullscreen and sidebar forms, making the editing experience a little more seamless. - -### Patch Changes - -- b4facb6ca: Fix billing warning to not show if not logged in - -## 1.2.1 - -### Patch Changes - -- c627ebe92: docs: Update broken media error links -- ef7c4043a: Fix links to Tina Cloud -- b2952a298: Adds meta wrapper for list-type fields that displays errors. Adds optional min/max for list-type fields that controls add/remove UI. Removes duplicate label from group field. - - @tinacms/sharedctx@1.0.0 - -## 1.2.0 - -### Minor Changes - -- 7554ea362: Adds hidden and button toggle fields, Improves toggle, radio, checkbox, select, textarea, and list field styles, Fixes block field UI, adds ability to set label to false on any field. - -### Patch Changes - -- a8c2f674b: Updated drag and drop to work on tina cloud -- cd82190fb: Adding warning for billing - -## 1.1.1 - -### Patch Changes - -- 7495f032b: Added `onLogout` hook function and a logout redirect page in the admin -- de693ea17: remove network request for redundant collection fetch - -## 1.1.0 - -### Minor Changes - -- 5a1e6faaf: - added autocomplete component - - made codeblock in rich-text to support all languages registered in Monaco editor - -### Patch Changes - -- 7c1425a82: - Add active field for iframe - - Introduce `tinaField` utility helper -- c1ac4bf10: Added a `onLogin` Callback function that is called when the user logs in. - - EX: - - ```ts - import { defineConfig } from 'tinacms' - - export default defineConfig({ - admin: { - auth: { - onLogin: () => { - console.log('On Log in!') - }, - }, - }, - /// ... - }) - ``` - -## 1.0.1 - -### Patch Changes - -- 8a92941bb: Show title for reference field with isTitle -- 03d83633b: Fixed issue with previous value -- 93234705a: Better user experience when the document creation fails due to existing filename -- 55ab9c26c: Fix elements displayed above the OverflowMenu - -## 1.0.0 - -### Major Changes - -- 958d10c82: Tina 1.0 Release - - Make sure you have updated to th "iframe" path: https://tina.io/blog/upgrading-to-iframe/ - -### Patch Changes - -- Updated dependencies [958d10c82] - - @tinacms/sharedctx@1.0.0 - -## 0.58.5 - -### Patch Changes - -- 7dda334e5: fix wrong background when hovering the "Embed" button inside the toolbar - -## 0.58.4 - -### Patch Changes - -- 6ce6085e8: fix DotMenu Popover displayed under blocks - -## 0.58.3 - -### Patch Changes - -- 48de42bc0: Add an info button to the collections label in the sidebar - -## 0.58.2 - -### Patch Changes - -- 194123d26: Update error message - -## 0.58.1 - -### Patch Changes - -- 31a2fefed: Fix text truncation in list and modal - - @tinacms/sharedctx@0.1.3 - -## 0.58.0 - -### Minor Changes - -- 431d73980: Fix #3253 bullet/numbered list items overflow out of text fields - - # Change - - - Add `w-full` class to list item content to prevent text overflow to the right of sidebar as shown in #3253. - - Also change `
    ` element class from `pl-2` to `pl-4` to fix numbered list's marker overflow to the left of text field. - -### Patch Changes - -- 2422e505d: Removed styled-components as a dependency in tinacms. - Removed deprecated react-toolbar in @tinacms/toolkit. - - @tinacms/sharedctx@0.1.3 - -## 0.57.12 - -### Patch Changes - -- 46bc9c4e5: Fix to use mime-type from file object instead of mime-types library - -## 0.57.11 - -### Patch Changes - -- 0c8c571d5: Custom filename field component, fix text field classes - -## 0.57.10 - -### Patch Changes - -- a60d96862: Fix rich-text dropdown overlap issue - -## 0.57.9 - -### Patch Changes - -- 183249b11: - deprecate: `defaultValue` - - add `defaultItem` to the collection (as a function or an object) - ```ts - defaultItem: () => { - const m = new Date() - return { - title: 'New Page', - test: 'This is a default value of the test field', - filename: `new-page-${ - m.getUTCFullYear() + - '-' + - (m.getUTCMonth() + 1) + - '-' + - m.getUTCDate() - }`, - } - }, - ``` - - Allow `datetime` field to be undefined or empty -- 8060d0949: Provide filename customization API. - - ```ts - name: 'posts', - path: 'content/posts', - ui: { - filename: { - slugify: (values) => mySlugifyFunc(values), - disabled: true - // other field props like `label`, `component`, `parse` can still be used too - } - }, - ``` - - If one is using `isTitle` a default slugify function is added that slugifys the title. - -## 0.57.8 - -### Patch Changes - -- eeab510d9: Revert "Fix rich text dropdown overlap issue" which was causing field labels to live underneath their inputs - -## 0.57.7 - -### Patch Changes - -- 4dc971b95: Upgrade react-dropzone due to es build issue with older versions - -## 0.57.6 - -### Patch Changes - -- 566386f30: Fix issue where drag-n-drop on image fields wasn't working with the repo-based media on local dev - -## 0.57.5 - -### Patch Changes - -- 4b9a2252f: Fixes rich text dropdown menu z-index issue -- 4e0a609cd: Disable tabbing into panel header -- fd90b7f49: Fix reference field loading only 10 first nodes in collection -- ee354c708: Fix event log dialog closing issue -- f3439ea35: Replace loading message and hide forms while loading. -- 112b7271d: fix vulnerabilities -- 4efe31214: Include error message in file failed upload model -- 8688dbff9: Add links to Tina Cloud project setting from sidebar -- Updated dependencies [f3439ea35] - - @tinacms/sharedctx@0.1.3 - -## 0.57.4 - -### Patch Changes - -- 4adf12619: Add support for experimental iframe mode -- f8b89379c: Fixed an issue with windows paths not working. - -## 0.57.3 - -### Patch Changes - -- 1dd9d01e2: Sets max height on image field to prevent it from getting too big -- 54dd48115: Improve sync event UI -- e650bc571: User interface for synchronization log event display - -## 0.57.2 - -### Patch Changes - -- 0ad8075aa: Errors are now blocking modals. - -## 0.57.1 - -### Patch Changes - -- b369d7238: Update dependencies to fix vulnerabilities in external packages. - -## 0.57.0 - -### Minor Changes - -- 7b0dda55e: Updates to the `rich-text` component as well the shape of the `rich-text` field response from the API - - - Adds support for isTitle on MDX elements - - Fixes issues related to nested marks - - Uses monaco editor for code blocks - - Improves styling of nested list items - - Improves handling of rich-text during reset - - No longer errors on unrecognized JSX/html, instead falls back to print `No component provided for ` - - No longer errors on markdown parsing errors, instead falls back to rendering markdown as a string, customizable via the TinaMarkdown component (invalid_markdown prop) - - Prepares rich-text component for raw mode - where you can edit the raw markdown directly in the Tina form. This will be available in future release. - -### Patch Changes - -- 8183b638c: ## Adds a new "Static" build option. - - This new option will build tina into a static `index.html` file. This will allow someone to use tina without having react as a dependency. - - ### How to update - - 1. Add a `.tina/config.{js,ts,tsx,jsx}` with the default export of define config. - - ```ts - // .tina/config.ts - import schema from './schema' - - export default defineConfig({ - schema: schema, - //.. Everything from define config in `schema.ts` - //.. Everything from `schema.config` - }) - ``` - - 2. Add Build config - - ``` - .tina/config.ts - - export default defineConfig({ - build: { - outputFolder: "admin", - publicFolder: "public", - }, - //... other config - }) - ``` - - 3. Go to `http://localhost:3000/admin/index.html` and view the admin - - - @tinacms/sharedctx@0.1.2 - -## 0.56.37 - -### Patch Changes - -- 028e10686: Adding sorting in the CMS - -## 0.56.36 - -### Patch Changes - -- 090a5b995: fixed issue where a dot would show up in the media store directory - -## 0.56.35 - -### Patch Changes - -- 67e291e56: Add support for ES modules -- 7a45e4e12: Added a media sync button that adds new media to tina-cloud. This button only appears when you are not in local mode and have the new media store enable -- ae23e9ad6: Remove unused deps from monorepo -- 489be9cb1: docs: Update media help link in sidebar -- Updated dependencies [67e291e56] - - @tinacms/sharedctx@0.1.2 - -## 0.56.34 - -### Patch Changes - -- ea9c190e8: Fix rich text field focus styles - -## 0.56.33 - -### Patch Changes - -- 2ef5a1f33: fix scale isssue, truncate form label to filename -- 7b77fe1b5: Add a default TinaMediaStore for repo-based media -- 99a13024d: Enables paging for local media manager - - @tinacms/sharedctx@0.1.1 - -## 0.56.32 - -### Patch Changes - -- 1f7d3ca3d: Use custom wrapper class for tailwind type plugin -- 6c17f0160: fix scale isssue, truncate form label to filename -- cceef726e: Fix login ui issue - - @tinacms/sharedctx@0.1.1 - -## 0.56.31 - -### Patch Changes - -- 999f0895a: Set font family on heading elements - -## 0.56.30 - -### Patch Changes - -- aaaa5bb09: Added pagination to the CMS - -## 0.56.29 - -### Patch Changes - -- 58a7a00f7: Replace field meta components, fix text wrapping -- 2cc206b1a: Improve mobile nav behaviour -- aaadefd2d: Improve group list ui, add edit icon - -## 0.56.28 - -### Patch Changes - -- a196198bd: Add ability to disable sidebar nav -- 57a4a3789: Persist sidebar state across browser reload -- ba1499029: Displays a helpful message in branch switcher when running locally - -## 0.56.27 - -### Patch Changes - -- d4f98d0fc: Add ability to set default sidebar open state, fix overlay position -- 7e2272442: Improve list field UI by using group list components - -## 0.56.26 - -### Patch Changes - -- f6f56bcc0: Remove old MDX editor component -- 59d33a74a: Fix issue where items of type "string" with list: true weren't sending the right event payload -- 8b7ee346a: - Display label instead of name for mdx dropdown af306fa - - Fix issue where reset triggered chagnes to the wrong rich-text field 03f6191 - - Fix issue where null children in a code block threw an error e454bce -- acb38bf9f: fix overflow menu click bug with popover panel - -## 0.56.25 - -### Patch Changes - -- e90647da3: Fix issue where popover item onMouseDown wasn't triggering - -## 0.56.24 - -### Patch Changes - -- 41d666f9a: Styles list page overflow menu, removes unused prop - -## 0.56.23 - -### Patch Changes - -- 6a6f137ae: # Simplify GraphQL API - - ## `schema` must be supplied to the `` component - - Previously the `.tina/schema.ts` was only used by the Tina CLI to generate the GraphQL API. However it's now required as a prop to ``. This allows you to provide runtime logic in the `ui` property of field definitions. See the documentation on "Extending Tina" for examples. - - ## The GraphQL API has been simplified - - ### `get` is now just the collection name - - ```graphql - # old - { - getPostDocument(relativePath: $relativePath) { ... } - } - - # new - { - post(relativePath: $relativePath) { ... } - } - ``` - - ### `getList` is now `Connection` - - The use of the term `connection` is due to our adherence the the [relay cursor spec](https://relay.dev/graphql/connections.htm). We may offer a simplified list field in a future release - - ```graphql - # old - { - getPostList { ... } - } - - # new - { - postConnection { ... } - } - ``` - - ### `getCollection` and `getCollections` are now `collection` and `collections` - - ```graphql - # old - { - getCollection(collection: "post") {...} - } - { - getCollections {...} - } - - # new - { - collection(collection: "post") {...} - } - { - collections {...} - } - ``` - - ### No more `data` property - - The `data` property was previously where all field definitions could be found. This has been moved on level up: - - ```graphql - # old - { - getPostDocument(relativePath: $relativePath) { - data { - title - } - } - } - - # new - { - post(relativePath: $relativePath) { - title - } - } - ``` - - #### The type for documents no longer includes "Document" at the end - - ```graphql - # old - { - getPostDocument(relativePath: $relativePath) { - data { - author { - ... on AuthorDocument { - data { - name - } - } - } - } - } - } - - # new - { - post(relativePath: $relativePath) { - author { - ... on Author { - name - } - } - } - } - ``` - - ### Meta fields are now underscored - - Aside from `id`, other metadata is now underscored: - - ```graphql - # old - { - getPostDocument(relativePath: $relativePath) { - sys { - relativePath - } - values - } - } - - # new - { - post(relativePath: $relativePath) { - _sys { - relativePath - } - _values - } - } - ``` - - ### `dataJSON` is gone - - This is identical to `_values` - - ### `form` is gone - - `form` was used internally to generate forms for the given document, however that's now handled by providing your `schema` to ``. - - ### `getDocumentList` is gone - - It's no longer possible to query all documents at once, you can query for collection documents via the `collection` query: - - ```graphql - { - collection { - documents { - edges { - node {...} - } - } - } - } - ``` - -## 0.56.22 - -### Patch Changes - -- bf5fe0074: Improvement of select dropdown. Make arrow icon clickable - -## 0.56.21 - -### Patch Changes - -- d37562999: Export OverflowMenu - -## 0.56.20 - -### Patch Changes - -- 40afac061: updated @headlessui/react - -## 0.56.19 - -### Patch Changes - -- 6c517b5da: Improves branch switcher UI -- e81cf8867: Improve rich text input list styles -- abf25c673: The schema can now to used on the frontend (optional for now but will be the main path moving forward). - - ### How to migrate. - - If you gone though the `tinacms init` process there should be a file called `.tina/components/TinaProvider`. In that file you can import the schema from `schema.ts` and add it to the TinaCMS wrapper component. - - ```tsx - import TinaCMS from 'tinacms' - import schema, { tinaConfig } from '../schema.ts' - - // Importing the TinaProvider directly into your page will cause Tina to be added to the production bundle. - // Instead, import the tina/provider/index default export to have it dynamially imported in edit-moode - /** - * - * @private Do not import this directly, please import the dynamic provider instead - */ - const TinaProvider = ({ children }) => { - return ( - - {children} - - ) - } - - export default TinaProvider - ``` - -- 0e270d878: Use async function to get reference field options -- Updated dependencies [429d8e93e] - - @tinacms/sharedctx@0.1.1 - -## 0.56.18 - -### Patch Changes - -- e9a0c82cf: Updated sidebar nav component to allow scrolling if needed -- d4fdeaa9f: Fix console warning about a ref being passed to a function component -- ed85f2594: Update version of react-beautiful-dnd to silence red herrings in the console - - See https://github.com/atlassian/react-beautiful-dnd/issues/1108 - -- d86e515ba: Ensure `error` is a string before rendering it from field meta component. In situations where an object's sub-field was invalid, touching the sub-field would trigger this error to be an object at the parent, React throws an error when trying to render an object -- db0dab1d4: add spacing and link styles to rich text field - -## 0.56.17 - -### Patch Changes - -- 106549814: Add a CMS event for when a field's value changes. To listen for events: - - ```ts - cms.events.subscribe(`forms:fields:onChange`, (event) => console.log(event)) - ``` - - Add a CMS event for when a field is reset. To listen for form resets: - - ```ts - cms.events.subscribe(`forms:reset`, (event) => console.log(event)) - ``` - -- 4923a2d66: Checks isAuthenticated() before making requests to the GraphQL client -- a07ff39bb: Fixed z index issue with nested forms - -## 0.56.16 - -### Patch Changes - -- ae1a5a58f: Sets `tina-admin` to default to `true` -- 5535a9970: Switches to using HashRouter for Admin -- 3ff1de06a: Upgrade to Tailwind 3 -- 022ccd389: fix: allow multiword tags -- 24f8b057f: Handles errors better in the CMS - - @tinacms/sharedctx@0.1.0 - -## 0.56.15 - -### Patch Changes - -- 43c834565: Adds an activity indicator throughout Admin - -## 0.56.14 - -### Patch Changes - -- af9f6c2c2: Prevents hard navigation away from dirty forms -- 2e14cda5e: Add visual block selector as optional UI -- 3d4c52a19: Change the default for rich-text to use the newer version - -## 0.56.13 - -### Patch Changes - -- e41b709ce: Fix sidebar position - -## 0.56.12 - -### Patch Changes - -- 8c18edd5c: restore event handlers that were detached from most field types -- 0773f6486: Added filtering to add block menu -- d8cd60f65: Update rich-text editor with some - - Use our own components instead of the out-of-the box ones from Plate - - Fix handling focus and selection of block/inline embeds - - Fixes inconsistencies with deleting and adding elements for uncollapsed collections - - For links, instead of a window prompt to get the value, use a Tina form (like the image field) - - Toolbar is now sticky so that it moves down the screen as you scroll - - Support for quick action slash command to MDX elements -- 9e77273d2: use collection name as fallback for label -- 63a74aece: Fixes form header bug when there's no label - -## 0.56.11 - -### Patch Changes - -- 3bba1817d: Integrates Chrome Components with TinaAdmin -- 415c03d25: adds missing arrow icon to reference field, truncates text in select dropdown - - @tinacms/sharedctx@0.1.0 - -## 0.56.10 - -### Patch Changes - -- 37286858e: style: multiform header and list - -## 0.56.9 - -### Patch Changes - -- 8ad8f03fd: Select field now validates when required is true. -- 6a50a1368: Updates the look and feel of the Tina Sidebar -- Updated dependencies [792f47251] - - @tinacms/sharedctx@0.1.0 - -## 0.56.8 - -### Patch Changes - -- 7006b38ea: Fixed issue where one could not login with tina cloud because the model context was null - -## 0.56.7 - -### Patch Changes - -- e8ca82899: Passes id to FormWrapper now that id is required - -## 0.56.6 - -### Patch Changes - -- 60f939f34: Don't allow "tabbing" for rich-text. Tabs in markdown represent code blocks, so this isn't something we want to support. - - Fixes bug where "reset" wasn't working for rich text. - -## 0.56.5 - -### Patch Changes - -- ddf81a4fd: constrain width of simple branch selector dropdown -- 20260a82d: Prevents navigation into objects when parent form is invalid -- 0370147fb: Remove ability to tab in rich-text editing -- 3de8c6165: Enabled branch creation in branch switcher -- 2eaad97bf: Remove unused underline and strikethrough icons in rich text editor -- 5c070a83f: feat: Add UI banner for when in localMode - -## 0.56.4 - -### Patch Changes - -- 2c7718636: updated media link - -## 0.56.3 - -### Patch Changes - -- 4700d7ae4: Patch fix to ensure builds include latest dependencies - -## 0.56.2 - -### Patch Changes - -- bc4699d2b: Use inline style instead of missing tailwind classes" - -## 0.56.1 - -### Patch Changes - -- f6876d30f: Alter empty sidebar message to be more specific to auto-generating logic -- 92268fc85: Ensure "src" is used instead of "previewSrc" for images in MDX - -## 0.56.0 - -### Minor Changes - -- df3030990: Add basic branch switcher - -## 0.55.4 - -### Patch Changes - -- 60729f60c: Adds a `reference` field - -## 0.55.3 - -### Patch Changes - -- 138ceb8c4: Clean up dependencies -- 0417e3750: Adds RouteMapperPlugin and FormMetaPlugin -- d9f37ea7e: Ensure the full image resolution URL is persisted - -## 0.55.2 - -### Patch Changes - -- 2724c48c0: Fix issue where the rich-text editor didn't allow user input when the initial value was empty - -## 0.55.1 - -### Patch Changes - -- 9c0d48e09: Fix console errors for mdx editor - -## 0.55.0 - -### Minor Changes - -- b99baebf1: Add rich-text editor based on mdx, bump React dependency requirement to 16.14 - -## 0.54.1 - -### Patch Changes - -- b961c7417: Adjust z-index for global menu so it sits overtop of nested form panels - -## 0.54.0 - -### Minor Changes - -- b59f23295: Fixed issue where heading button would not work in the WYSIWYG editor when using react 17 -- a419056b6: Fixed component types for field plugins -- ded8dfbee: support visually linking fields to DOM elements using `data-tinafield` -- 5df9fe543: Export Blocks, Group List, List, HTML and Markdown fields so that they can be used in field plugins. -- 9d68b058f: Add support for multiple image upload in the Media Store. - -### Patch Changes - -- 9213d5608: Uses a better default dateFormat for the DateField -- 91cebe5bc: Prevents navigating away from a form while invalid - -## 0.53.0 - -### Minor Changes - -- 906d72c50: Add generics to CMS event methods to allow type hinting specific events - -### Patch Changes - -- 7b149a4e7: Tina toolkit sometimes uses the "path" module, which presumably was built-in with the previous build script logic. It's now listed explicitly as a package dependency - -## 0.52.3 - -### Patch Changes - -- 9b27192fe: Build packages with new scripting, which includes preliminary support for ES modules. - -## 0.52.2 - -### Patch Changes - -- 6b1cbf916: Updated NoFormsPlaceholder links - -## 0.52.1 - -### Patch Changes - -- 4de977f63: Makes `DateFieldPlugin` timezone-friendly - -## 0.52.0 - -### Minor Changes - -- b4f5e973f: Update datetime field to expect and receive ISO string - -## 0.51.0 - -### Minor Changes - -- 634524925: image accecpt now comes from the media store - -## 0.50.1 - -### Patch Changes - -- e074d555: fix: link to forms guide - -## 0.50.0 - -### Minor Changes - -- 7f3c8c1a: # 🔧 Changes coming to TinaCMS ⚙️ - - 👋 You may have noticed we've been hard at-work lately building out a more opinionated approach to TinaCMS. To that end, we've settled around a few key points we'd like to announce. To see the work in progress, check out the [main](https://github.com/tinacms/tinacms/tree/main) branch, which will become the primary branch soon. - - ## Consolidating @tinacms packages in to @tinacms/toolkit - - By nature, Tina relies heavily on React context, and the dependency mismatches from over-modularizing our toolkit has led to many bugs related to missing context. To fix this, we'll be consolidating nearly every package in the @tinacms scope to a single package called `@tinacms/toolkit` - - We'll also be rolling out esm support as it's now much easier to address build improvements - - ## A more focused tinacms package - - The `tinacms` package now comes baked-in with APIs for working with the TinaCMS GraphQL API. Because `@tinacms/toolkit` now encompasses everything you'd need to build your own CMS integration, we're repurposing the `tinacms` package to more accurately reflect the "batteries-included" approach. - - If you haven't been introduced, the GraphQL API is a Git-backed CMS which we'll be leaning into more in the future. With a generous free tier and direct syncing with Github its something we're really excited to push forward. Sign up for free here - Note: tinacms still exports the same APIs, but we'll gradually start moving the backend-agnostic tools to @tinacms/toolkit. - - ## Consolidating the tina-graphql-gateway repo - - The tina-graphql-gateway repo will be absorbed into this one. If you've been working with our GraphQL APIs you'll need to follow our migration guide. - - ## Moving from Lerna to Yarn PNP - - We've had success with Yarn 2 and PNP in other monorepos, if you're a contributor you'll notice some updates to the DX, which should hopefully result in a smoother experience. - - ## FAQ - - ### What about other backends? - - The `@tinacms/toolkit` isn't going anywhere. And if you're using packages like `react-tinacms-strapi` or r`eact-tinacms-github` with success, that won't change much, they'll just be powered by `@tinacms/toolkit` under the hood. - - ### Do I need to do anything? - - We'll be bumping all packages to `0.50.0` to reflect the changes. If you're using @tincams scoped packages those won't receive the upgrade. Unscoped packages like `react-tinacms-editor` will be upgraded, and should be bumped to 0.50.0 as well. - When we move to `1.0.0` we'll be pushing internal APIs to `@tinacms/toolkit`, so that's the long-term location of - - ### Will you continue to patch older versions? - - We'll continue to make security patches, however major bug fixes will likely not see any updates. Keep in mind that `@tinacms/toolkit` will continue to be developed. - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.43.0](https://github.com/tinacms/tinacms/compare/v0.42.1...v0.43.0) (2021-07-12) - -### Features - -- **tinacms:** customize list error message by throwing a MediaListError ([5aff1da](https://github.com/tinacms/tinacms/commit/5aff1da8e725ad4046bf1888fa83599c3ef0a4c5)) - -# [0.42.0](https://github.com/tinacms/tinacms/compare/v0.41.1...v0.42.0) (2021-06-28) - -### Features - -- **tinacms:** configure media mgr page size via mediaOptions.pageSize ([5d7890f](https://github.com/tinacms/tinacms/commit/5d7890f5312e5efa08a07cd7fc4e3967d71eccf3)) -- **tinacms:** remove pluggable pagination ([846b516](https://github.com/tinacms/tinacms/commit/846b51621aa85520724817192f8d8ade19c1b02a)) -- **tinacms:** use cursor-based pagination in media manager ([7a94b97](https://github.com/tinacms/tinacms/commit/7a94b97e228ffd490a68159d458130e089dd6c87)) - -## [0.41.1](https://github.com/tinacms/tinacms/compare/v0.41.0...v0.41.1) (2021-06-11) - -**Note:** Version bump only for package tinacms - -# [0.41.0](https://github.com/tinacms/tinacms/compare/v0.40.1...v0.41.0) (2021-05-17) - -### Features - -- **@tinacms/fields:** Adds date field to default plugins ([8ac27d1](https://github.com/tinacms/tinacms/commit/8ac27d12bcc488a73f75b214b718da111e185d28)) - -## [0.40.1](https://github.com/tinacms/tinacms/compare/v0.40.0...v0.40.1) (2021-05-05) - -**Note:** Version bump only for package tinacms - -# [0.40.0](https://github.com/tinacms/tinacms/compare/v0.39.0...v0.40.0) (2021-04-19) - -**Note:** Version bump only for package tinacms - -# [0.39.0](https://github.com/tinacms/tinacms/compare/v0.38.0...v0.39.0) (2021-03-30) - -### Bug Fixes - -- copyright ([e4323c2](https://github.com/tinacms/tinacms/commit/e4323c25b7e893005bffad1827018b523b7f6939)), closes [#1778](https://github.com/tinacms/tinacms/issues/1778) -- **tinacms:** Fixes pagination for MediaStore ([5e51cbe](https://github.com/tinacms/tinacms/commit/5e51cbe9086df2540453295c86bb12575574a2ad)) - -### Features - -- **tinacms:** export independent components for CMS provider and UI ([c8bd31e](https://github.com/tinacms/tinacms/commit/c8bd31efdd5966af0dffa3d36e3618cf6ea3e02a)) - -# [0.38.0](https://github.com/tinacms/tinacms/compare/v0.37.0...v0.38.0) (2021-03-08) - -**Note:** Version bump only for package tinacms - -# [0.37.0](https://github.com/tinacms/tinacms/compare/v0.36.1...v0.37.0) (2021-02-08) - -### Features - -- radio group field ([7b53a64](https://github.com/tinacms/tinacms/commit/7b53a649edd35b50522ec70b1ea968bc8e8f6c99)) - -## [0.36.1](https://github.com/tinacms/tinacms/compare/v0.36.0...v0.36.1) (2021-02-01) - -**Note:** Version bump only for package tinacms - -# [0.36.0](https://github.com/tinacms/tinacms/compare/v0.35.1...v0.36.0) (2021-01-25) - -**Note:** Version bump only for package tinacms - -# [0.34.0](https://github.com/tinacms/tinacms/compare/v0.33.0...v0.34.0) (2020-11-23) - -### Features - -- **tinacms:** media manager dropzone accepts multiple files ([179eec6](https://github.com/tinacms/tinacms/commit/179eec60ff25366d10e2657784dab32a1b900ea1)) - -# [0.33.0](https://github.com/tinacms/tinacms/compare/v0.32.1...v0.33.0) (2020-11-16) - -### Features - -- **tinacms:** expose plugin handle for media pagination ([4b4345b](https://github.com/tinacms/tinacms/commit/4b4345bc2047de88a4d0473ad2e4674182972f0b)) - -# [0.32.0](https://github.com/tinacms/tinacms/compare/v0.31.0...v0.32.0) (2020-10-20) - -### Bug Fixes - -- **tinacms:** media manager upload button is busy while uploading ([3ab978c](https://github.com/tinacms/tinacms/commit/3ab978c43a11ba64f9db2122e94431f48d1b93c3)) - -# [0.31.0](https://github.com/tinacms/tinacms/compare/v0.30.0...v0.31.0) (2020-10-05) - -### Features - -- **tinacms:** add media manager UI ([4f0cf96](https://github.com/tinacms/tinacms/commit/4f0cf9631afe68d0b5204aabb66085a2a2291b24)) -- **tinacms:** added a default MediaManager screen ([dc33594](https://github.com/tinacms/tinacms/commit/dc33594c227afd884d5078af53f9340277734bca)) -- **tinacms:** an alerts map can be provided to TinaCMS constructor ([fcee016](https://github.com/tinacms/tinacms/commit/fcee01604bb6ae08b126c7903c8d90601adf92e5)) -- **tinacms:** apis can define their own event-to-alerts map ([24a9305](https://github.com/tinacms/tinacms/commit/24a93059a0abe7930a4f301fa447de162d19fd5c)) - -# [0.29.0](https://github.com/tinacms/tinacms/compare/v0.28.0...v0.29.0) (2020-08-25) - -**Note:** Version bump only for package tinacms - -# [0.28.0](https://github.com/tinacms/tinacms/compare/v0.27.3...v0.28.0) (2020-08-17) - -**Note:** Version bump only for package tinacms - -## [0.27.1](https://github.com/tinacms/tinacms/compare/v0.27.0...v0.27.1) (2020-08-10) - -**Note:** Version bump only for package tinacms - -# [0.27.0](https://github.com/tinacms/tinacms/compare/v0.26.0...v0.27.0) (2020-08-10) - -### Bug Fixes - -- **tinacms:** enabling cms with sidebar doesn't remount children ([1188dbf](https://github.com/tinacms/tinacms/commit/1188dbfa5bcaeb0ae9b832b15ad299b5c1ea4c01)) - -# [0.26.0](https://github.com/tinacms/tinacms/compare/v0.25.0...v0.26.0) (2020-08-03) - -**Note:** Version bump only for package tinacms - -# [0.23.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.22.1...tinacms@0.23.0-alpha.0) (2020-07-15) - -### Features - -- WIP - add list field plugin ([9e7c1be](https://github.com/tinacms/tinacms/commit/9e7c1be)) - -## [0.22.1](https://github.com/tinacms/tinacms/compare/tinacms@0.22.1-alpha.0...tinacms@0.22.1) (2020-07-07) - -**Note:** Version bump only for package tinacms - -## [0.22.1-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.22.0...tinacms@0.22.1-alpha.0) (2020-07-04) - -**Note:** Version bump only for package tinacms - -# [0.22.0](https://github.com/tinacms/tinacms/compare/tinacms@0.22.0-alpha.0...tinacms@0.22.0) (2020-06-29) - -**Note:** Version bump only for package tinacms - -# [0.22.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.21.3...tinacms@0.22.0-alpha.0) (2020-06-24) - -### Bug Fixes - -- only register default fields if one hasn't been added yet ([7b40d2f](https://github.com/tinacms/tinacms/commit/7b40d2f)) - -### Features - -- date field is no longer a default plugin ([8ef7a98](https://github.com/tinacms/tinacms/commit/8ef7a98)), closes [#771](https://github.com/tinacms/tinacms/issues/771) -- sidebar config can be a boolean to simplify setup ([d6ca564](https://github.com/tinacms/tinacms/commit/d6ca564)) -- the toolbar and sidebar ui are both opt-in ([92c50b3](https://github.com/tinacms/tinacms/commit/92c50b3)) -- toolbar config can be a boolean ([4e8def5](https://github.com/tinacms/tinacms/commit/4e8def5)) - -## [0.21.3](https://github.com/tinacms/tinacms/compare/tinacms@0.21.3-alpha.0...tinacms@0.21.3) (2020-06-23) - -**Note:** Version bump only for package tinacms - -## [0.21.3-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.21.2...tinacms@0.21.3-alpha.0) (2020-06-17) - -**Note:** Version bump only for package tinacms - -## [0.21.2](https://github.com/tinacms/tinacms/compare/tinacms@0.21.2-alpha.1...tinacms@0.21.2) (2020-06-15) - -**Note:** Version bump only for package tinacms - -## [0.21.2-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.21.2-alpha.0...tinacms@0.21.2-alpha.1) (2020-06-12) - -**Note:** Version bump only for package tinacms - -## [0.21.2-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.21.1...tinacms@0.21.2-alpha.0) (2020-06-08) - -**Note:** Version bump only for package tinacms - -## [0.21.1](https://github.com/tinacms/tinacms/compare/tinacms@0.21.0...tinacms@0.21.1) (2020-06-08) - -**Note:** Version bump only for package tinacms - -# [0.21.0](https://github.com/tinacms/tinacms/compare/tinacms@0.21.0-alpha.2...tinacms@0.21.0) (2020-06-01) - -**Note:** Version bump only for package tinacms - -# [0.21.0-alpha.2](https://github.com/tinacms/tinacms/compare/tinacms@0.21.0-alpha.1...tinacms@0.21.0-alpha.2) (2020-06-01) - -**Note:** Version bump only for package tinacms - -# [0.21.0-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.21.0-alpha.0...tinacms@0.21.0-alpha.1) (2020-05-29) - -**Note:** Version bump only for package tinacms - -# [0.21.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.20.0...tinacms@0.21.0-alpha.0) (2020-05-28) - -### Bug Fixes - -- default format now being passed to ReactDateTime ([bc4e1bd](https://github.com/tinacms/tinacms/commit/bc4e1bd)) -- parse function returns string in default datetime format ([beafd0b](https://github.com/tinacms/tinacms/commit/beafd0b)) -- time parsing & formatting should always deal in UTC ([9a04621](https://github.com/tinacms/tinacms/commit/9a04621)) -- we weren't handling time formatting in any way ([6a72ce6](https://github.com/tinacms/tinacms/commit/6a72ce6)) - -### Features - -- add font loader ([4f37605](https://github.com/tinacms/tinacms/commit/4f37605)) -- tina provider accepts 'styled' prop ([c581595](https://github.com/tinacms/tinacms/commit/c581595)) - -# [0.20.0](https://github.com/tinacms/tinacms/compare/tinacms@0.19.4...tinacms@0.20.0) (2020-05-25) - -### Bug Fixes - -- remove wysiwyg export from tinacms ([6d4cd7e](https://github.com/tinacms/tinacms/commit/6d4cd7e)) - -### Features - -- added TagsFieldPlugin ([8b447e5](https://github.com/tinacms/tinacms/commit/8b447e5)) -- remove markdown editor from tinacms default plugins ([c1c36f8](https://github.com/tinacms/tinacms/commit/c1c36f8)) - -## [0.19.4](https://github.com/tinacms/tinacms/compare/tinacms@0.19.3...tinacms@0.19.4) (2020-05-19) - -**Note:** Version bump only for package tinacms - -## [0.19.3](https://github.com/tinacms/tinacms/compare/tinacms@0.19.2...tinacms@0.19.3) (2020-05-12) - -**Note:** Version bump only for package tinacms - -## [0.19.2](https://github.com/tinacms/tinacms/compare/tinacms@0.19.2-alpha.3...tinacms@0.19.2) (2020-05-11) - -**Note:** Version bump only for package tinacms - -## [0.19.2-alpha.3](https://github.com/tinacms/tinacms/compare/tinacms@0.19.2-alpha.2...tinacms@0.19.2-alpha.3) (2020-05-08) - -**Note:** Version bump only for package tinacms - -## [0.19.2-alpha.2](https://github.com/tinacms/tinacms/compare/tinacms@0.19.2-alpha.1...tinacms@0.19.2-alpha.2) (2020-05-08) - -**Note:** Version bump only for package tinacms - -## [0.19.2-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.19.2-alpha.0...tinacms@0.19.2-alpha.1) (2020-05-08) - -**Note:** Version bump only for package tinacms - -## [0.19.2-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.19.1...tinacms@0.19.2-alpha.0) (2020-05-06) - -**Note:** Version bump only for package tinacms - -## [0.19.1](https://github.com/tinacms/tinacms/compare/tinacms@0.19.1-alpha.0...tinacms@0.19.1) (2020-05-04) - -**Note:** Version bump only for package tinacms - -## [0.19.1-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.19.0...tinacms@0.19.1-alpha.0) (2020-04-28) - -**Note:** Version bump only for package tinacms - -# [0.19.0](https://github.com/tinacms/tinacms/compare/tinacms@0.19.0-alpha.5...tinacms@0.19.0) (2020-04-27) - -**Note:** Version bump only for package tinacms - -# [0.19.0-alpha.5](https://github.com/tinacms/tinacms/compare/tinacms@0.19.0-alpha.4...tinacms@0.19.0-alpha.5) (2020-04-24) - -**Note:** Version bump only for package tinacms - -# [0.19.0-alpha.4](https://github.com/tinacms/tinacms/compare/tinacms@0.19.0-alpha.3...tinacms@0.19.0-alpha.4) (2020-04-20) - -### Bug Fixes - -- add moment as dep to tinacms ([df5cc6f](https://github.com/tinacms/tinacms/commit/df5cc6f)) -- deprecated useGlobalForm ([6d79cca](https://github.com/tinacms/tinacms/commit/6d79cca)) - -### Features - -- introduce useFormScreenPlugin ([b29c310](https://github.com/tinacms/tinacms/commit/b29c310)) - -# [0.19.0-alpha.3](https://github.com/tinacms/tinacms/compare/tinacms@0.19.0-alpha.2...tinacms@0.19.0-alpha.3) (2020-04-14) - -### Bug Fixes - -- forms are more flexible with the shape of Fields ([90d8b0c](https://github.com/tinacms/tinacms/commit/90d8b0c)) - -# [0.19.0-alpha.2](https://github.com/tinacms/tinacms/compare/tinacms@0.19.0-alpha.1...tinacms@0.19.0-alpha.2) (2020-04-07) - -**Note:** Version bump only for package tinacms - -# [0.19.0-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.18.4...tinacms@0.19.0-alpha.1) (2020-04-06) - -### Features - -- adds toolbar state to tinacms ([ff779c5](https://github.com/tinacms/tinacms/commit/ff779c5)) -- adds Toolbar to TinaProvider ([8acae8d](https://github.com/tinacms/tinacms/commit/8acae8d)) - -## [0.18.4](https://github.com/tinacms/tinacms/compare/tinacms@0.18.3...tinacms@0.18.4) (2020-04-06) - -**Note:** Version bump only for package tinacms - -## [0.18.3](https://github.com/tinacms/tinacms/compare/tinacms@0.18.2...tinacms@0.18.3) (2020-04-06) - -### Bug Fixes - -- removed unused useSidebar hook ([2165a3b](https://github.com/tinacms/tinacms/commit/2165a3b)) - -## [0.18.2](https://github.com/tinacms/tinacms/compare/tinacms@0.18.1...tinacms@0.18.2) (2020-03-30) - -### Bug Fixes - -- duplicate exports ([eb24613](https://github.com/tinacms/tinacms/commit/eb24613)) - -## [0.18.1](https://github.com/tinacms/tinacms/compare/tinacms@0.18.0...tinacms@0.18.1) (2020-03-30) - -**Note:** Version bump only for package tinacms - -# [0.18.0](https://github.com/tinacms/tinacms/compare/tinacms@0.17.0...tinacms@0.18.0) (2020-03-23) - -### Bug Fixes - -- tinacms constructor accepts media.store ([3293fce](https://github.com/tinacms/tinacms/commit/3293fce)) -- **alerts:** use @tinacms/react-alerts ([6f94d6c](https://github.com/tinacms/tinacms/commit/6f94d6c)) - -### Features - -- introduce @tinacms/alerts ([5f556b4](https://github.com/tinacms/tinacms/commit/5f556b4)) -- introduce @tinacms/media ([a1be1b6](https://github.com/tinacms/tinacms/commit/a1be1b6)) -- move theme system to css custom properties ([ba3bb22](https://github.com/tinacms/tinacms/commit/ba3bb22)) - -# [0.17.0](https://github.com/tinacms/tinacms/compare/tinacms@0.16.0...tinacms@0.17.0) (2020-03-16) - -### Bug Fixes - -- correct FormApi and FieldRenderProsp imports ([cbedf41](https://github.com/tinacms/tinacms/commit/cbedf41)) -- **TinaCMS:** config is now optional ([ffe567a](https://github.com/tinacms/tinacms/commit/ffe567a)) -- renamed Tina to TinaProvider ([dca44e1](https://github.com/tinacms/tinacms/commit/dca44e1)) - -### Features - -- introduce react-tinacms-editor ([06bfb4b](https://github.com/tinacms/tinacms/commit/06bfb4b)) - -# [0.16.0](https://github.com/tinacms/tinacms/compare/tinacms@0.16.0-alpha.1...tinacms@0.16.0) (2020-03-09) - -**Note:** Version bump only for package tinacms - -# [0.16.0-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.16.0-alpha.0...tinacms@0.16.0-alpha.1) (2020-03-06) - -**Note:** Version bump only for package tinacms - -# [0.16.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.15.0-alpha.0...tinacms@0.16.0-alpha.0) (2020-03-05) - -### Bug Fixes - -- BlockOption doesn't throw react warnings ([fcb477a](https://github.com/tinacms/tinacms/commit/fcb477a)) -- react warnings from MenuLinks ([386829f](https://github.com/tinacms/tinacms/commit/386829f)) -- react warnings with index ([b705b85](https://github.com/tinacms/tinacms/commit/b705b85)) -- supress react key warnings from form actions ([42cc21f](https://github.com/tinacms/tinacms/commit/42cc21f)) - -### Features - -- **Fields:** added an HTML field plugin ([f12cf3e](https://github.com/tinacms/tinacms/commit/f12cf3e)) -- added API for triggering alerts ([e396699](https://github.com/tinacms/tinacms/commit/e396699)), closes [#821](https://github.com/tinacms/tinacms/issues/821) - -# [0.15.0](https://github.com/tinacms/tinacms/compare/tinacms@0.15.0-alpha.0...tinacms@0.15.0) (2020-03-02) - -### Features - -- added API for triggering alerts ([e396699](https://github.com/tinacms/tinacms/commit/e396699)), closes [#821](https://github.com/tinacms/tinacms/issues/821) -- **Fields:** added an HTML field plugin ([f12cf3e](https://github.com/tinacms/tinacms/commit/f12cf3e)) - -# [0.15.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.14.0...tinacms@0.15.0-alpha.0) (2020-02-26) - -### Bug Fixes - -- **sidebar:** fix layout issue with sidebar header ([cc86f50](https://github.com/tinacms/tinacms/commit/cc86f50)) - -### Features - -- add useScreenPlugin for react ([7236374](https://github.com/tinacms/tinacms/commit/7236374)) -- createScreen helps with making plugins ([1a35617](https://github.com/tinacms/tinacms/commit/1a35617)) - -# [0.14.0](https://github.com/tinacms/tinacms/compare/tinacms@0.14.0-alpha.1...tinacms@0.14.0) (2020-02-24) - -### Bug Fixes - -- **sidebar:** fix toggling hidden state ([254326c](https://github.com/tinacms/tinacms/commit/254326c)) - -### Features - -- **Sidebar:** set the text of save/reset buttons ([5af1516](https://github.com/tinacms/tinacms/commit/5af1516)), closes [#620](https://github.com/tinacms/tinacms/issues/620) [#647](https://github.com/tinacms/tinacms/issues/647) - -# [0.14.0-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.14.0-alpha.0...tinacms@0.14.0-alpha.1) (2020-02-21) - -### Bug Fixes - -- pass close to ScreenPlugin components ([081f9b6](https://github.com/tinacms/tinacms/commit/081f9b6)) - -# [0.14.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.13.1...tinacms@0.14.0-alpha.0) (2020-02-20) - -### Bug Fixes - -- **tinacms:** if single form, FormView no longer renders form list ([780b16c](https://github.com/tinacms/tinacms/commit/780b16c)) - -### Features - -- **tinacms:** adds isHidden getter & setter to sidebar instance ([e98e595](https://github.com/tinacms/tinacms/commit/e98e595)) - -## [0.13.1](https://github.com/tinacms/tinacms/compare/tinacms@0.13.1-alpha.1...tinacms@0.13.1) (2020-02-18) - -**Note:** Version bump only for package tinacms - -## [0.13.1-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.13.1-alpha.0...tinacms@0.13.1-alpha.1) (2020-02-16) - -**Note:** Version bump only for package tinacms - -## [0.13.1-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.13.0...tinacms@0.13.1-alpha.0) (2020-02-14) - -### Bug Fixes - -- **Tina:** can override hidden and position ([63824ea](https://github.com/tinacms/tinacms/commit/63824ea)) -- hiding the sidebar ([691e936](https://github.com/tinacms/tinacms/commit/691e936)), closes [#744](https://github.com/tinacms/tinacms/issues/744) -- sidebar theming ([a5b02e8](https://github.com/tinacms/tinacms/commit/a5b02e8)) -- TinaCMS sidebar props are entirely optional ([8e15c21](https://github.com/tinacms/tinacms/commit/8e15c21)) - -# [0.13.0](https://github.com/tinacms/tinacms/compare/tinacms@0.13.0-alpha.1...tinacms@0.13.0) (2020-02-11) - -**Note:** Version bump only for package tinacms - -# [0.13.0-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.13.0-alpha.0...tinacms@0.13.0-alpha.1) (2020-02-11) - -**Note:** Version bump only for package tinacms - -# [0.13.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.12.1...tinacms@0.13.0-alpha.0) (2020-02-06) - -### Bug Fixes - -- **withTina:** TinaCMSConfig compat ([101c61d](https://github.com/tinacms/tinacms/commit/101c61d)) - -### Features - -- **Modals:** export all modal components ([3309eaf](https://github.com/tinacms/tinacms/commit/3309eaf)) - -## [0.12.1](https://github.com/tinacms/tinacms/compare/tinacms@0.12.1-alpha.1...tinacms@0.12.1) (2020-02-03) - -**Note:** Version bump only for package tinacms - -## [0.12.1-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.12.0...tinacms@0.12.1-alpha.1) (2020-02-03) - -**Note:** Version bump only for package tinacms - -## [0.12.1-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.12.0...tinacms@0.12.1-alpha.0) (2020-01-29) - -**Note:** Version bump only for package tinacms - -# [0.12.0](https://github.com/tinacms/tinacms/compare/tinacms@0.12.0-alpha.0...tinacms@0.12.0) (2020-01-27) - -### Bug Fixes - -- removed unused dependencies from package.json ([0945fed](https://github.com/tinacms/tinacms/commit/0945fed)) - -# [0.12.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.11.3...tinacms@0.12.0-alpha.0) (2020-01-24) - -### Features - -- **TinaCMS:** configure plugins/apis on instantiation ([eeec343](https://github.com/tinacms/tinacms/commit/eeec343)) -- **withTina:** add HOC for CMS provider ([b3c44ef](https://github.com/tinacms/tinacms/commit/b3c44ef)) - -## [0.11.3](https://github.com/tinacms/tinacms/compare/tinacms@0.11.3-alpha.1...tinacms@0.11.3) (2020-01-22) - -**Note:** Version bump only for package tinacms - -## [0.11.3-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.11.3-alpha.0...tinacms@0.11.3-alpha.1) (2020-01-22) - -### Bug Fixes - -- FieldPlugins for text have a default to empty string, instead of undefined ([c899ee5](https://github.com/tinacms/tinacms/commit/c899ee5)) - -## [0.11.3-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.11.2...tinacms@0.11.3-alpha.0) (2020-01-16) - -### Bug Fixes - -- remove global styles, fix issues from iframe removal ([0b1b836](https://github.com/tinacms/tinacms/commit/0b1b836)) -- remove styled frame comopnent ([eb30b25](https://github.com/tinacms/tinacms/commit/eb30b25)) -- remove styled frame from modal ([3905ab0](https://github.com/tinacms/tinacms/commit/3905ab0)) -- remove styled frame from sidebar container ([e274b7d](https://github.com/tinacms/tinacms/commit/e274b7d)) -- remove styled frame from sidebar toggle ([32bffff](https://github.com/tinacms/tinacms/commit/32bffff)) -- remove use of frame ([ae4a055](https://github.com/tinacms/tinacms/commit/ae4a055)) - -## [0.11.2](https://github.com/tinacms/tinacms/compare/tinacms@0.11.1...tinacms@0.11.2) (2020-01-14) - -**Note:** Version bump only for package tinacms - -## [0.11.1](https://github.com/tinacms/tinacms/compare/tinacms@0.11.1-alpha.1...tinacms@0.11.1) (2020-01-13) - -**Note:** Version bump only for package tinacms - -## [0.11.1-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.11.1-alpha.0...tinacms@0.11.1-alpha.1) (2020-01-10) - -**Note:** Version bump only for package tinacms - -# [0.11.0](https://github.com/tinacms/tinacms/compare/tinacms@0.11.0-alpha.0...tinacms@0.11.0) (2019-12-17) - -**Note:** Version bump only for package tinacms - -# [0.11.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.10.1-alpha.0...tinacms@0.11.0-alpha.0) (2019-12-17) - -### Features - -- allow user to user enter/return key to create new blog entry ([d850cfb](https://github.com/tinacms/tinacms/commit/d850cfb)) -- **Blocks:** have a "type" string ([19008ff](https://github.com/tinacms/tinacms/commit/19008ff)) - -## [0.10.1-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.10.0...tinacms@0.10.1-alpha.0) (2019-12-06) - -**Note:** Version bump only for package tinacms - -# [0.10.0](https://github.com/tinacms/tinacms/compare/tinacms@0.10.0-alpha.2...tinacms@0.10.0) (2019-12-02) - -**Note:** Version bump only for package tinacms - -# [0.10.0-alpha.2](https://github.com/tinacms/tinacms/compare/tinacms@0.10.0-alpha.1...tinacms@0.10.0-alpha.2) (2019-12-02) - -**Note:** Version bump only for package tinacms - -# [0.10.0-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.10.0-alpha.0...tinacms@0.10.0-alpha.1) (2019-11-28) - -### Features - -- **Blocks:** add Block component ([cfcb618](https://github.com/tinacms/tinacms/commit/cfcb618)) -- **useGlobalForm:** add hook for registering global forms ([d450cae](https://github.com/tinacms/tinacms/commit/d450cae)) - -# [0.10.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.9.1...tinacms@0.10.0-alpha.0) (2019-11-25) - -### Features - -- tinacms re-exports important types from @tinacms/core ([c51e9de](https://github.com/tinacms/tinacms/commit/c51e9de)) - -## [0.9.1](https://github.com/tinacms/tinacms/compare/tinacms@0.9.1-alpha.1...tinacms@0.9.1) (2019-11-25) - -**Note:** Version bump only for package tinacms - -## [0.9.1-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.9.1-alpha.0...tinacms@0.9.1-alpha.1) (2019-11-25) - -**Note:** Version bump only for package tinacms - -## [0.9.1-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.9.0...tinacms@0.9.1-alpha.0) (2019-11-25) - -### Bug Fixes - -- set form body wrapper height to 100% ([e43d1dc](https://github.com/tinacms/tinacms/commit/e43d1dc)) - -# [0.9.0](https://github.com/tinacms/tinacms/compare/tinacms@0.9.0-alpha.1...tinacms@0.9.0) (2019-11-18) - -**Note:** Version bump only for package tinacms - -# [0.9.0-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.8.1...tinacms@0.9.0-alpha.1) (2019-11-18) - -### Bug Fixes - -- **Blocks:** add placeholder for invalid blocks ([c3c2515](https://github.com/tinacms/tinacms/commit/c3c2515)) - -### Features - -- **FieldMeta:** provide basic field meta component ([fdb058d](https://github.com/tinacms/tinacms/commit/fdb058d)) -- add busy state to button, use when saving ([5f9e810](https://github.com/tinacms/tinacms/commit/5f9e810)) -- Add loading indicator on saving ([5faaf79](https://github.com/tinacms/tinacms/commit/5faaf79)) -- **Global Forms:** global forms can be registerd as plugins ([e94f112](https://github.com/tinacms/tinacms/commit/e94f112)) -- adds min-max height on markdown component ([3f7935b](https://github.com/tinacms/tinacms/commit/3f7935b)) -- screen plugins accept layout prop ([b14382e](https://github.com/tinacms/tinacms/commit/b14382e)) - -# [0.9.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.8.1...tinacms@0.9.0-alpha.0) (2019-11-18) - -### Bug Fixes - -- **Blocks:** add placeholder for invalid blocks ([c3c2515](https://github.com/tinacms/tinacms/commit/c3c2515)) - -### Features - -- **FieldMeta:** provide basic field meta component ([fdb058d](https://github.com/tinacms/tinacms/commit/fdb058d)) -- add busy state to button, use when saving ([5f9e810](https://github.com/tinacms/tinacms/commit/5f9e810)) -- Add loading indicator on saving ([5faaf79](https://github.com/tinacms/tinacms/commit/5faaf79)) -- **Global Forms:** global forms can be registerd as plugins ([e94f112](https://github.com/tinacms/tinacms/commit/e94f112)) -- adds min-max height on markdown component ([3f7935b](https://github.com/tinacms/tinacms/commit/3f7935b)) -- screen plugins accept layout prop ([b14382e](https://github.com/tinacms/tinacms/commit/b14382e)) - -## [0.8.1](https://github.com/tinacms/tinacms/compare/tinacms@0.8.0...tinacms@0.8.1) (2019-11-14) - -### Bug Fixes - -- correct react-tinacms version ([e8a4f55](https://github.com/tinacms/tinacms/commit/e8a4f55)) - -## 0.8.0 (2019-11-12) - -### Bug Fixes - -- fix block menu not showing all items ([c61829a](https://github.com/tinacms/tinacms/commit/c61829a)) -- styled-components is a peerDependency ([baaf3de](https://github.com/tinacms/tinacms/commit/baaf3de)) -- **content creator:** subscribe to plugin changes ([565ead9](https://github.com/tinacms/tinacms/commit/565ead9)), closes [#391](https://github.com/tinacms/tinacms/issues/391) -- **create content plugins:** form shape is generic ([4f691ac](https://github.com/tinacms/tinacms/commit/4f691ac)) - -### Features - -- **blocks:** add itemProps function to templates ([5fd0224](https://github.com/tinacms/tinacms/commit/5fd0224)) -- **blocks:** defaultItem can be a function ([a7b8ef6](https://github.com/tinacms/tinacms/commit/a7b8ef6)) - -## 0.6.0 (2019-11-04) - -### Bug Fixes - -- fix block menu not showing all items ([c61829a](https://github.com/tinacms/tinacms/commit/c61829a)) -- styled-components is a peerDependency ([baaf3de](https://github.com/tinacms/tinacms/commit/baaf3de)) -- **content creator:** subscribe to plugin changes ([565ead9](https://github.com/tinacms/tinacms/commit/565ead9)), closes [#391](https://github.com/tinacms/tinacms/issues/391) -- **create content plugins:** form shape is generic ([4f691ac](https://github.com/tinacms/tinacms/commit/4f691ac)) - -### Features - -- **blocks:** add itemProps function to templates ([5fd0224](https://github.com/tinacms/tinacms/commit/5fd0224)) -- **blocks:** defaultItem can be a function ([a7b8ef6](https://github.com/tinacms/tinacms/commit/a7b8ef6)) - -## [0.6.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.5.0-alpha.0...tinacms@0.6.0-alpha.0) (2019-10-28) - -### Bug Fixes - -- fix block menu not showing all items ([c61829a](https://github.com/tinacms/tinacms/commit/c61829a)) -- styled-components is a peerDependency ([baaf3de](https://github.com/tinacms/tinacms/commit/baaf3de)) - -### Features - -- **blocks:** add itemProps function to templates ([5fd0224](https://github.com/tinacms/tinacms/commit/5fd0224)) -- **blocks:** defaultItem can be a function ([a7b8ef6](https://github.com/tinacms/tinacms/commit/a7b8ef6)) - -## 0.5.0 (2019-10-28) - -### Bug Fixes - -- fix block menu not showing all items ([e955542](https://github.com/tinacms/tinacms/commit/e955542)) -- add fix for body padding ([82a8d9c](https://github.com/tinacms/tinacms/commit/82a8d9c)) -- add form list scroll support ([ef7fcf3](https://github.com/tinacms/tinacms/commit/ef7fcf3)) -- add format func to datePicker to fix issue where date wouldn't display correctly until clicked by the picker. Hide timeFormat by default ([9eb5978](https://github.com/tinacms/tinacms/commit/9eb5978)) -- add import for color helper ([d278397](https://github.com/tinacms/tinacms/commit/d278397)) -- add style for link popup ([9feefd3](https://github.com/tinacms/tinacms/commit/9feefd3)) -- add temp link for empty states ([cdf7edc](https://github.com/tinacms/tinacms/commit/cdf7edc)) -- always activate an only-form ([b58e5fc](https://github.com/tinacms/tinacms/commit/b58e5fc)) -- cleaning up other name/id/label bug issues ([f2c15e4](https://github.com/tinacms/tinacms/commit/f2c15e4)) -- close Reset Modal after success ([701bd3c](https://github.com/tinacms/tinacms/commit/701bd3c)) -- hmr of forms doesn't break the fs connection ([4501df3](https://github.com/tinacms/tinacms/commit/4501df3)) -- improve layout, add support for long titles ([1ce0bfb](https://github.com/tinacms/tinacms/commit/1ce0bfb)) -- inline wysiwyg keeps focus on first edit ([f209b34](https://github.com/tinacms/tinacms/commit/f209b34)) -- Link to docs ([080ccea](https://github.com/tinacms/tinacms/commit/080ccea)), closes [#161](https://github.com/tinacms/tinacms/issues/161) -- maintain order of forms in sidebar ([ccc9839](https://github.com/tinacms/tinacms/commit/ccc9839)), closes [#229](https://github.com/tinacms/tinacms/issues/229) -- no fields/forms placeholder padding ([89f03ba](https://github.com/tinacms/tinacms/commit/89f03ba)) -- only render create content button when available ([e540dd8](https://github.com/tinacms/tinacms/commit/e540dd8)) -- only render form in panel when open ([72f4f83](https://github.com/tinacms/tinacms/commit/72f4f83)) -- pass onClick to CreateContentButton ([273b85a](https://github.com/tinacms/tinacms/commit/273b85a)) -- remove console.log() ([5577549](https://github.com/tinacms/tinacms/commit/5577549)) -- remove css reset from site wrapper ([9a5821d](https://github.com/tinacms/tinacms/commit/9a5821d)) -- remove form header for single forms ([c5b470e](https://github.com/tinacms/tinacms/commit/c5b470e)) -- remove reliance on transform/position quirk ([a188e64](https://github.com/tinacms/tinacms/commit/a188e64)) -- remove theme ref from wysiwyg ([8dd00a8](https://github.com/tinacms/tinacms/commit/8dd00a8)) -- remove z-index from site wrapper, reorder elements ([ff89a95](https://github.com/tinacms/tinacms/commit/ff89a95)) -- replace theme with themeOverrides ([54224dc](https://github.com/tinacms/tinacms/commit/54224dc)) -- safari form overflow scrolling ([559ce36](https://github.com/tinacms/tinacms/commit/559ce36)) -- safari group panel bug ([5bf6853](https://github.com/tinacms/tinacms/commit/5bf6853)) -- set fieldWrapper to position relative ([3e9f953](https://github.com/tinacms/tinacms/commit/3e9f953)) -- set key on create content button ([68bf64e](https://github.com/tinacms/tinacms/commit/68bf64e)) -- SidebarPosition can be displace/overlay ([217d09d](https://github.com/tinacms/tinacms/commit/217d09d)), closes [#302](https://github.com/tinacms/tinacms/issues/302) -- **date field:** write date string to source ([51cbc1a](https://github.com/tinacms/tinacms/commit/51cbc1a)) -- **date field:** writes invalid dates to source ([b0fd128](https://github.com/tinacms/tinacms/commit/b0fd128)) -- syncing fields for layered group-lists ([c34936e](https://github.com/tinacms/tinacms/commit/c34936e)) -- tracks form with id instead of name ([2f12b75](https://github.com/tinacms/tinacms/commit/2f12b75)) -- wysiwyg does not blow up on hot-reload ([8915523](https://github.com/tinacms/tinacms/commit/8915523)) -- wysiwyg syncs with source content ([31f1fa9](https://github.com/tinacms/tinacms/commit/31f1fa9)) -- **prosemirror:** update prosemirror dependencies ([920a3c7](https://github.com/tinacms/tinacms/commit/920a3c7)) -- **sidebar:** call isOpen instead of the open ([c89efb6](https://github.com/tinacms/tinacms/commit/c89efb6)) -- **wysiwyg:** prevent blow up during live editing ([e033772](https://github.com/tinacms/tinacms/commit/e033772)) - -### Features - -- add better empty state ([6598fed](https://github.com/tinacms/tinacms/commit/6598fed)) -- add ChevronUp icon ([e2f4c88](https://github.com/tinacms/tinacms/commit/e2f4c88)) -- add field plugin for Group Lists ([41fb5a4](https://github.com/tinacms/tinacms/commit/41fb5a4)) -- Add Group field plugin ([b58864c](https://github.com/tinacms/tinacms/commit/b58864c)) -- add plus icon ([bb42bd8](https://github.com/tinacms/tinacms/commit/bb42bd8)) -- add reorder and drag icons ([0b04468](https://github.com/tinacms/tinacms/commit/0b04468)) -- add reset button to form footer ([f2ec90b](https://github.com/tinacms/tinacms/commit/f2ec90b)) -- add reset modal ([2667618](https://github.com/tinacms/tinacms/commit/2667618)) -- add Tina icon ([6e54f42](https://github.com/tinacms/tinacms/commit/6e54f42)) -- add trash icon ([ea9c7ff](https://github.com/tinacms/tinacms/commit/ea9c7ff)) -- allow partial theme override ([54bc7e2](https://github.com/tinacms/tinacms/commit/54bc7e2)) -- blocks field plugin ([cac4d86](https://github.com/tinacms/tinacms/commit/cac4d86)) -- field plugins accept a parse fn ([7d3b655](https://github.com/tinacms/tinacms/commit/7d3b655)) -- field.component can be null ([385c137](https://github.com/tinacms/tinacms/commit/385c137)) -- fields can have default values ([54c8602](https://github.com/tinacms/tinacms/commit/54c8602)) -- **sidebar:** add position & hidden to sidebar context ([ba89f50](https://github.com/tinacms/tinacms/commit/ba89f50)) -- group-list accepts itemProps function ([ca9a627](https://github.com/tinacms/tinacms/commit/ca9a627)), closes [#222](https://github.com/tinacms/tinacms/issues/222) -- group-list defaultItem can be a function ([d7b21d2](https://github.com/tinacms/tinacms/commit/d7b21d2)) -- **image:** previewSrc is given it's fields props ([d108d1a](https://github.com/tinacms/tinacms/commit/d108d1a)), closes [#273](https://github.com/tinacms/tinacms/issues/273) -- **sidebar:** "hidden" prop hides sidebar ([f448e6d](https://github.com/tinacms/tinacms/commit/f448e6d)), closes [#91](https://github.com/tinacms/tinacms/issues/91) -- **TextFieldPlugin:** accept placeholder ([e40b6ad](https://github.com/tinacms/tinacms/commit/e40b6ad)) -- move create buttons to header plus menu ([39f3d80](https://github.com/tinacms/tinacms/commit/39f3d80)) -- theme override ([4dd592e](https://github.com/tinacms/tinacms/commit/4dd592e)) -- **wysiwyg:** add codeblock support to wysiwyg ([149e411](https://github.com/tinacms/tinacms/commit/149e411)) -- **wysiwyg:** support links in wysiwyg ([a84804f](https://github.com/tinacms/tinacms/commit/a84804f)) - -## 0.4.0 (2019-10-14) - -### Bug Fixes - -- add fix for body padding ([82a8d9c](https://github.com/tinacms/tinacms/commit/82a8d9c)) -- add form list scroll support ([ef7fcf3](https://github.com/tinacms/tinacms/commit/ef7fcf3)) -- add import for color helper ([d278397](https://github.com/tinacms/tinacms/commit/d278397)) -- add style for link popup ([9feefd3](https://github.com/tinacms/tinacms/commit/9feefd3)) -- add temp link for empty states ([cdf7edc](https://github.com/tinacms/tinacms/commit/cdf7edc)) -- always activate an only-form ([b58e5fc](https://github.com/tinacms/tinacms/commit/b58e5fc)) -- cleaning up other name/id/label bug issues ([f2c15e4](https://github.com/tinacms/tinacms/commit/f2c15e4)) -- close Reset Modal after success ([701bd3c](https://github.com/tinacms/tinacms/commit/701bd3c)) -- hmr of forms doesn't break the fs connection ([4501df3](https://github.com/tinacms/tinacms/commit/4501df3)) -- improve layout, add support for long titles ([1ce0bfb](https://github.com/tinacms/tinacms/commit/1ce0bfb)) -- inline wysiwyg keeps focus on first edit ([f209b34](https://github.com/tinacms/tinacms/commit/f209b34)) -- Link to docs ([080ccea](https://github.com/tinacms/tinacms/commit/080ccea)), closes [#161](https://github.com/tinacms/tinacms/issues/161) -- maintain order of forms in sidebar ([ccc9839](https://github.com/tinacms/tinacms/commit/ccc9839)), closes [#229](https://github.com/tinacms/tinacms/issues/229) -- no fields/forms placeholder padding ([89f03ba](https://github.com/tinacms/tinacms/commit/89f03ba)) -- only render create content button when available ([e540dd8](https://github.com/tinacms/tinacms/commit/e540dd8)) -- only render form in panel when open ([72f4f83](https://github.com/tinacms/tinacms/commit/72f4f83)) -- pass onClick to CreateContentButton ([273b85a](https://github.com/tinacms/tinacms/commit/273b85a)) -- remove console.log() ([5577549](https://github.com/tinacms/tinacms/commit/5577549)) -- remove css reset from site wrapper ([9a5821d](https://github.com/tinacms/tinacms/commit/9a5821d)) -- remove form header for single forms ([c5b470e](https://github.com/tinacms/tinacms/commit/c5b470e)) -- remove reliance on transform/position quirk ([a188e64](https://github.com/tinacms/tinacms/commit/a188e64)) -- remove theme ref from wysiwyg ([8dd00a8](https://github.com/tinacms/tinacms/commit/8dd00a8)) -- remove z-index from site wrapper, reorder elements ([ff89a95](https://github.com/tinacms/tinacms/commit/ff89a95)) -- replace theme with themeOverrides ([54224dc](https://github.com/tinacms/tinacms/commit/54224dc)) -- safari form overflow scrolling ([559ce36](https://github.com/tinacms/tinacms/commit/559ce36)) -- safari group panel bug ([5bf6853](https://github.com/tinacms/tinacms/commit/5bf6853)) -- set fieldWrapper to position relative ([3e9f953](https://github.com/tinacms/tinacms/commit/3e9f953)) -- set key on create content button ([68bf64e](https://github.com/tinacms/tinacms/commit/68bf64e)) -- **date field:** write date string to source ([51cbc1a](https://github.com/tinacms/tinacms/commit/51cbc1a)) -- **date field:** writes invalid dates to source ([b0fd128](https://github.com/tinacms/tinacms/commit/b0fd128)) -- syncing fields for layered group-lists ([c34936e](https://github.com/tinacms/tinacms/commit/c34936e)) -- tracks form with id instead of name ([2f12b75](https://github.com/tinacms/tinacms/commit/2f12b75)) -- wysiwyg does not blow up on hot-reload ([8915523](https://github.com/tinacms/tinacms/commit/8915523)) -- wysiwyg syncs with source content ([31f1fa9](https://github.com/tinacms/tinacms/commit/31f1fa9)) -- **prosemirror:** update prosemirror dependencies ([920a3c7](https://github.com/tinacms/tinacms/commit/920a3c7)) -- **sidebar:** call isOpen instead of the open ([c89efb6](https://github.com/tinacms/tinacms/commit/c89efb6)) -- **wysiwyg:** prevent blow up during live editing ([e033772](https://github.com/tinacms/tinacms/commit/e033772)) - -### Features - -- add better empty state ([6598fed](https://github.com/tinacms/tinacms/commit/6598fed)) -- add ChevronUp icon ([e2f4c88](https://github.com/tinacms/tinacms/commit/e2f4c88)) -- add field plugin for Group Lists ([41fb5a4](https://github.com/tinacms/tinacms/commit/41fb5a4)) -- Add Group field plugin ([b58864c](https://github.com/tinacms/tinacms/commit/b58864c)) -- add plus icon ([bb42bd8](https://github.com/tinacms/tinacms/commit/bb42bd8)) -- add reorder and drag icons ([0b04468](https://github.com/tinacms/tinacms/commit/0b04468)) -- add reset button to form footer ([f2ec90b](https://github.com/tinacms/tinacms/commit/f2ec90b)) -- add reset modal ([2667618](https://github.com/tinacms/tinacms/commit/2667618)) -- add Tina icon ([6e54f42](https://github.com/tinacms/tinacms/commit/6e54f42)) -- add trash icon ([ea9c7ff](https://github.com/tinacms/tinacms/commit/ea9c7ff)) -- allow partial theme override ([54bc7e2](https://github.com/tinacms/tinacms/commit/54bc7e2)) -- blocks field plugin ([cac4d86](https://github.com/tinacms/tinacms/commit/cac4d86)) -- field plugins accept a parse fn ([7d3b655](https://github.com/tinacms/tinacms/commit/7d3b655)) -- field.component can be null ([385c137](https://github.com/tinacms/tinacms/commit/385c137)) -- fields can have default values ([54c8602](https://github.com/tinacms/tinacms/commit/54c8602)) -- **sidebar:** add position & hidden to sidebar context ([ba89f50](https://github.com/tinacms/tinacms/commit/ba89f50)) -- group-list accepts itemProps function ([ca9a627](https://github.com/tinacms/tinacms/commit/ca9a627)), closes [#222](https://github.com/tinacms/tinacms/issues/222) -- group-list defaultItem can be a function ([d7b21d2](https://github.com/tinacms/tinacms/commit/d7b21d2)) -- **image:** previewSrc is given it's fields props ([d108d1a](https://github.com/tinacms/tinacms/commit/d108d1a)), closes [#273](https://github.com/tinacms/tinacms/issues/273) -- **sidebar:** "hidden" prop hides sidebar ([f448e6d](https://github.com/tinacms/tinacms/commit/f448e6d)), closes [#91](https://github.com/tinacms/tinacms/issues/91) -- **TextFieldPlugin:** accept placeholder ([e40b6ad](https://github.com/tinacms/tinacms/commit/e40b6ad)) -- move create buttons to header plus menu ([39f3d80](https://github.com/tinacms/tinacms/commit/39f3d80)) -- theme override ([4dd592e](https://github.com/tinacms/tinacms/commit/4dd592e)) -- **wysiwyg:** add codeblock support to wysiwyg ([149e411](https://github.com/tinacms/tinacms/commit/149e411)) -- **wysiwyg:** support links in wysiwyg ([a84804f](https://github.com/tinacms/tinacms/commit/a84804f)) - -## 0.3.0 (2019-10-14) - -### Bug Fixes - -- add fix for body padding ([82a8d9c](https://github.com/tinacms/tinacms/commit/82a8d9c)) -- add form list scroll support ([ef7fcf3](https://github.com/tinacms/tinacms/commit/ef7fcf3)) -- add import for color helper ([d278397](https://github.com/tinacms/tinacms/commit/d278397)) -- add style for link popup ([9feefd3](https://github.com/tinacms/tinacms/commit/9feefd3)) -- add temp link for empty states ([cdf7edc](https://github.com/tinacms/tinacms/commit/cdf7edc)) -- always activate an only-form ([b58e5fc](https://github.com/tinacms/tinacms/commit/b58e5fc)) -- cleaning up other name/id/label bug issues ([f2c15e4](https://github.com/tinacms/tinacms/commit/f2c15e4)) -- close Reset Modal after success ([701bd3c](https://github.com/tinacms/tinacms/commit/701bd3c)) -- hmr of forms doesn't break the fs connection ([4501df3](https://github.com/tinacms/tinacms/commit/4501df3)) -- improve layout, add support for long titles ([1ce0bfb](https://github.com/tinacms/tinacms/commit/1ce0bfb)) -- inline wysiwyg keeps focus on first edit ([f209b34](https://github.com/tinacms/tinacms/commit/f209b34)) -- Link to docs ([080ccea](https://github.com/tinacms/tinacms/commit/080ccea)), closes [#161](https://github.com/tinacms/tinacms/issues/161) -- maintain order of forms in sidebar ([ccc9839](https://github.com/tinacms/tinacms/commit/ccc9839)), closes [#229](https://github.com/tinacms/tinacms/issues/229) -- no fields/forms placeholder padding ([89f03ba](https://github.com/tinacms/tinacms/commit/89f03ba)) -- only render create content button when available ([e540dd8](https://github.com/tinacms/tinacms/commit/e540dd8)) -- only render form in panel when open ([72f4f83](https://github.com/tinacms/tinacms/commit/72f4f83)) -- pass onClick to CreateContentButton ([273b85a](https://github.com/tinacms/tinacms/commit/273b85a)) -- remove console.log() ([5577549](https://github.com/tinacms/tinacms/commit/5577549)) -- remove css reset from site wrapper ([9a5821d](https://github.com/tinacms/tinacms/commit/9a5821d)) -- remove form header for single forms ([c5b470e](https://github.com/tinacms/tinacms/commit/c5b470e)) -- remove reliance on transform/position quirk ([a188e64](https://github.com/tinacms/tinacms/commit/a188e64)) -- remove theme ref from wysiwyg ([8dd00a8](https://github.com/tinacms/tinacms/commit/8dd00a8)) -- remove z-index from site wrapper, reorder elements ([ff89a95](https://github.com/tinacms/tinacms/commit/ff89a95)) -- replace theme with themeOverrides ([54224dc](https://github.com/tinacms/tinacms/commit/54224dc)) -- safari form overflow scrolling ([559ce36](https://github.com/tinacms/tinacms/commit/559ce36)) -- safari group panel bug ([5bf6853](https://github.com/tinacms/tinacms/commit/5bf6853)) -- set fieldWrapper to position relative ([3e9f953](https://github.com/tinacms/tinacms/commit/3e9f953)) -- set key on create content button ([68bf64e](https://github.com/tinacms/tinacms/commit/68bf64e)) -- **date field:** write date string to source ([51cbc1a](https://github.com/tinacms/tinacms/commit/51cbc1a)) -- **date field:** writes invalid dates to source ([b0fd128](https://github.com/tinacms/tinacms/commit/b0fd128)) -- syncing fields for layered group-lists ([c34936e](https://github.com/tinacms/tinacms/commit/c34936e)) -- tracks form with id instead of name ([2f12b75](https://github.com/tinacms/tinacms/commit/2f12b75)) -- wysiwyg does not blow up on hot-reload ([8915523](https://github.com/tinacms/tinacms/commit/8915523)) -- wysiwyg syncs with source content ([31f1fa9](https://github.com/tinacms/tinacms/commit/31f1fa9)) -- **prosemirror:** update prosemirror dependencies ([920a3c7](https://github.com/tinacms/tinacms/commit/920a3c7)) -- **sidebar:** call isOpen instead of the open ([c89efb6](https://github.com/tinacms/tinacms/commit/c89efb6)) -- **wysiwyg:** prevent blow up during live editing ([e033772](https://github.com/tinacms/tinacms/commit/e033772)) - -### Features - -- add better empty state ([6598fed](https://github.com/tinacms/tinacms/commit/6598fed)) -- add ChevronUp icon ([e2f4c88](https://github.com/tinacms/tinacms/commit/e2f4c88)) -- add field plugin for Group Lists ([41fb5a4](https://github.com/tinacms/tinacms/commit/41fb5a4)) -- Add Group field plugin ([b58864c](https://github.com/tinacms/tinacms/commit/b58864c)) -- add plus icon ([bb42bd8](https://github.com/tinacms/tinacms/commit/bb42bd8)) -- add reorder and drag icons ([0b04468](https://github.com/tinacms/tinacms/commit/0b04468)) -- add reset button to form footer ([f2ec90b](https://github.com/tinacms/tinacms/commit/f2ec90b)) -- add reset modal ([2667618](https://github.com/tinacms/tinacms/commit/2667618)) -- add Tina icon ([6e54f42](https://github.com/tinacms/tinacms/commit/6e54f42)) -- add trash icon ([ea9c7ff](https://github.com/tinacms/tinacms/commit/ea9c7ff)) -- allow partial theme override ([54bc7e2](https://github.com/tinacms/tinacms/commit/54bc7e2)) -- blocks field plugin ([cac4d86](https://github.com/tinacms/tinacms/commit/cac4d86)) -- field plugins accept a parse fn ([7d3b655](https://github.com/tinacms/tinacms/commit/7d3b655)) -- field.component can be null ([385c137](https://github.com/tinacms/tinacms/commit/385c137)) -- fields can have default values ([54c8602](https://github.com/tinacms/tinacms/commit/54c8602)) -- **sidebar:** add position & hidden to sidebar context ([ba89f50](https://github.com/tinacms/tinacms/commit/ba89f50)) -- group-list accepts itemProps function ([ca9a627](https://github.com/tinacms/tinacms/commit/ca9a627)), closes [#222](https://github.com/tinacms/tinacms/issues/222) -- group-list defaultItem can be a function ([d7b21d2](https://github.com/tinacms/tinacms/commit/d7b21d2)) -- **image:** previewSrc is given it's fields props ([d108d1a](https://github.com/tinacms/tinacms/commit/d108d1a)), closes [#273](https://github.com/tinacms/tinacms/issues/273) -- **sidebar:** "hidden" prop hides sidebar ([f448e6d](https://github.com/tinacms/tinacms/commit/f448e6d)), closes [#91](https://github.com/tinacms/tinacms/issues/91) -- **TextFieldPlugin:** accept placeholder ([e40b6ad](https://github.com/tinacms/tinacms/commit/e40b6ad)) -- move create buttons to header plus menu ([39f3d80](https://github.com/tinacms/tinacms/commit/39f3d80)) -- theme override ([4dd592e](https://github.com/tinacms/tinacms/commit/4dd592e)) -- **wysiwyg:** add codeblock support to wysiwyg ([149e411](https://github.com/tinacms/tinacms/commit/149e411)) -- **wysiwyg:** support links in wysiwyg ([a84804f](https://github.com/tinacms/tinacms/commit/a84804f)) - -## [0.2.0-alpha.4](https://github.com/tinacms/tinacms/compare/tinacms@0.2.0-alpha.3...tinacms@0.2.0-alpha.4) (2019-10-13) - -### Bug Fixes - -- only render form in panel when open ([72f4f83](https://github.com/tinacms/tinacms/commit/72f4f83)) - -## [0.2.0-alpha.2](https://github.com/tinacms/tinacms/compare/tinacms@0.2.0-alpha.1...tinacms@0.2.0-alpha.2) (2019-10-11) - -### Bug Fixes - -- remove form header for single forms ([c5b470e](https://github.com/tinacms/tinacms/commit/c5b470e)) -- safari form overflow scrolling ([559ce36](https://github.com/tinacms/tinacms/commit/559ce36)) - -## [0.2.0-alpha.1](https://github.com/tinacms/tinacms/compare/tinacms@0.1.1...tinacms@0.2.0-alpha.1) (2019-10-10) - -### Bug Fixes - -- add form list scroll support ([ef7fcf3](https://github.com/tinacms/tinacms/commit/ef7fcf3)) -- always activate an only-form ([b58e5fc](https://github.com/tinacms/tinacms/commit/b58e5fc)) -- close Reset Modal after success ([701bd3c](https://github.com/tinacms/tinacms/commit/701bd3c)) -- hmr of forms doesn't break the fs connection ([4501df3](https://github.com/tinacms/tinacms/commit/4501df3)) -- improve layout, add support for long titles ([1ce0bfb](https://github.com/tinacms/tinacms/commit/1ce0bfb)) -- inline wysiwyg keeps focus on first edit ([f209b34](https://github.com/tinacms/tinacms/commit/f209b34)) -- maintain order of forms in sidebar ([ccc9839](https://github.com/tinacms/tinacms/commit/ccc9839)), closes [#229](https://github.com/tinacms/tinacms/issues/229) -- only render create content button when available ([e540dd8](https://github.com/tinacms/tinacms/commit/e540dd8)) -- remove console.log() ([5577549](https://github.com/tinacms/tinacms/commit/5577549)) -- remove theme ref from wysiwyg ([8dd00a8](https://github.com/tinacms/tinacms/commit/8dd00a8)) -- replace theme with themeOverrides ([54224dc](https://github.com/tinacms/tinacms/commit/54224dc)) -- wysiwyg does not blow up on hot-reload ([8915523](https://github.com/tinacms/tinacms/commit/8915523)) -- wysiwyg syncs with source content ([31f1fa9](https://github.com/tinacms/tinacms/commit/31f1fa9)) - -### Features - -- add reset button to form footer ([f2ec90b](https://github.com/tinacms/tinacms/commit/f2ec90b)) -- add reset modal ([2667618](https://github.com/tinacms/tinacms/commit/2667618)) -- add Tina icon ([6e54f42](https://github.com/tinacms/tinacms/commit/6e54f42)) -- allow partial theme override ([54bc7e2](https://github.com/tinacms/tinacms/commit/54bc7e2)) -- **image:** previewSrc is given it's fields props ([d108d1a](https://github.com/tinacms/tinacms/commit/d108d1a)), closes [#273](https://github.com/tinacms/tinacms/issues/273) -- **sidebar:** add position & hidden to sidebar context ([ba89f50](https://github.com/tinacms/tinacms/commit/ba89f50)) -- group-list accepts itemProps function ([ca9a627](https://github.com/tinacms/tinacms/commit/ca9a627)), closes [#222](https://github.com/tinacms/tinacms/issues/222) -- group-list defaultItem can be a function ([d7b21d2](https://github.com/tinacms/tinacms/commit/d7b21d2)) - -## [0.2.0-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.1.1...tinacms@0.2.0-alpha.0) (2019-10-09) - -### Bug Fixes - -- add form list scroll support ([ef7fcf3](https://github.com/tinacms/tinacms/commit/ef7fcf3)) -- always activate an only-form ([b58e5fc](https://github.com/tinacms/tinacms/commit/b58e5fc)) -- close Reset Modal after success ([701bd3c](https://github.com/tinacms/tinacms/commit/701bd3c)) -- hmr of forms doesn't break the fs connection ([4501df3](https://github.com/tinacms/tinacms/commit/4501df3)) -- improve layout, add support for long titles ([1ce0bfb](https://github.com/tinacms/tinacms/commit/1ce0bfb)) -- inline wysiwyg keeps focus on first edit ([f209b34](https://github.com/tinacms/tinacms/commit/f209b34)) -- maintain order of forms in sidebar ([ccc9839](https://github.com/tinacms/tinacms/commit/ccc9839)), closes [#229](https://github.com/tinacms/tinacms/issues/229) -- only render create content button when available ([e540dd8](https://github.com/tinacms/tinacms/commit/e540dd8)) -- remove console.log() ([5577549](https://github.com/tinacms/tinacms/commit/5577549)) -- remove theme ref from wysiwyg ([8dd00a8](https://github.com/tinacms/tinacms/commit/8dd00a8)) -- wysiwyg does not blow up on hot-reload ([8915523](https://github.com/tinacms/tinacms/commit/8915523)) -- wysiwyg syncs with source content ([31f1fa9](https://github.com/tinacms/tinacms/commit/31f1fa9)) - -### Features - -- add reset modal ([2667618](https://github.com/tinacms/tinacms/commit/2667618)) -- group-list accepts itemProps function ([ca9a627](https://github.com/tinacms/tinacms/commit/ca9a627)), closes [#222](https://github.com/tinacms/tinacms/issues/222) -- group-list defaultItem can be a function ([d7b21d2](https://github.com/tinacms/tinacms/commit/d7b21d2)) -- **image:** previewSrc is given it's fields props ([d108d1a](https://github.com/tinacms/tinacms/commit/d108d1a)), closes [#273](https://github.com/tinacms/tinacms/issues/273) -- allow partial theme override ([54bc7e2](https://github.com/tinacms/tinacms/commit/54bc7e2)) -- **sidebar:** add position & hidden to sidebar context ([ba89f50](https://github.com/tinacms/tinacms/commit/ba89f50)) -- add reset button to form footer ([f2ec90b](https://github.com/tinacms/tinacms/commit/f2ec90b)) -- add Tina icon ([6e54f42](https://github.com/tinacms/tinacms/commit/6e54f42)) - -## [0.1.4-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.1.3...tinacms@0.1.4-alpha.0) (2019-10-07) - -### Bug Fixes - -- always activate an only-form ([b58e5fc](https://github.com/tinacms/tinacms/commit/b58e5fc)) - -## [0.1.3-alpha.0](https://github.com/tinacms/tinacms/compare/tinacms@0.1.1...tinacms@0.1.3-alpha.0) (2019-10-07) - -### Bug Fixes - -- add form list scroll support ([ef7fcf3](https://github.com/tinacms/tinacms/commit/ef7fcf3)) -- improve layout, add support for long titles ([1ce0bfb](https://github.com/tinacms/tinacms/commit/1ce0bfb)) -- maintain order of forms in sidebar ([ccc9839](https://github.com/tinacms/tinacms/commit/ccc9839)), closes [#229](https://github.com/tinacms/tinacms/issues/229) -- only render create content button when available ([e540dd8](https://github.com/tinacms/tinacms/commit/e540dd8)) - -## 0.1.1 (2019-10-03) - -### Bug Fixes - -- no fields/forms placeholder padding ([89f03ba](https://github.com/tinacms/tinacms/commit/89f03ba)) - -## [0.1.0-alpha.20](https://github.com/tinacms/tinacms/compare/tinacms@0.1.0-alpha.19...tinacms@0.1.0-alpha.20) (2019-10-02) - -### Bug Fixes - -- Link to docs ([080ccea](https://github.com/tinacms/tinacms/commit/080ccea)), closes [#161](https://github.com/tinacms/tinacms/issues/161) -- pass onClick to CreateContentButton ([273b85a](https://github.com/tinacms/tinacms/commit/273b85a)) -- remove reliance on transform/position quirk ([a188e64](https://github.com/tinacms/tinacms/commit/a188e64)) -- safari group panel bug ([5bf6853](https://github.com/tinacms/tinacms/commit/5bf6853)) -- set fieldWrapper to position relative ([3e9f953](https://github.com/tinacms/tinacms/commit/3e9f953)) -- set key on create content button ([68bf64e](https://github.com/tinacms/tinacms/commit/68bf64e)) -- syncing fields for layered group-lists ([c34936e](https://github.com/tinacms/tinacms/commit/c34936e)) - -### Features - -- add field plugin for Group Lists ([41fb5a4](https://github.com/tinacms/tinacms/commit/41fb5a4)) -- Add Group field plugin ([b58864c](https://github.com/tinacms/tinacms/commit/b58864c)) -- blocks field plugin ([cac4d86](https://github.com/tinacms/tinacms/commit/cac4d86)) -- move create buttons to header plus menu ([39f3d80](https://github.com/tinacms/tinacms/commit/39f3d80)) -- theme override ([4dd592e](https://github.com/tinacms/tinacms/commit/4dd592e)) - -## [0.1.0-alpha.19](https://github.com/tinacms/tinacms/compare/tinacms@0.1.0-alpha.18...tinacms@0.1.0-alpha.19) (2019-09-25) - -### Features - -- **TextFieldPlugin:** accept placeholder ([e40b6ad](https://github.com/tinacms/tinacms/commit/e40b6ad)) - -## [0.1.0-alpha.18](https://github.com/tinacms/tinacms/compare/tinacms@0.1.0-alpha.17...tinacms@0.1.0-alpha.18) (2019-09-23) - -### Bug Fixes - -- **sidebar:** call isOpen instead of the open ([c89efb6](https://github.com/tinacms/tinacms/commit/c89efb6)) - -## [0.1.0-alpha.17](https://github.com/tinacms/tinacms/compare/tinacms@0.1.0-alpha.16...tinacms@0.1.0-alpha.17) (2019-09-23) - -### Bug Fixes - -- remove css reset from site wrapper ([9a5821d](https://github.com/tinacms/tinacms/commit/9a5821d)) - -### Features - -- **sidebar:** "hidden" prop hides sidebar ([f448e6d](https://github.com/tinacms/tinacms/commit/f448e6d)), closes [#91](https://github.com/tinacms/tinacms/issues/91) - -## [0.1.0-alpha.14](https://github.com/tinacms/tinacms/compare/tinacms@0.1.0-alpha.11...tinacms@0.1.0-alpha.14) (2019-09-20) - -### Bug Fixes - -- add fix for body padding ([82a8d9c](https://github.com/tinacms/tinacms/commit/82a8d9c)) -- add import for color helper ([d278397](https://github.com/tinacms/tinacms/commit/d278397)) -- add temp link for empty states ([cdf7edc](https://github.com/tinacms/tinacms/commit/cdf7edc)) -- cleaning up other name/id/label bug issues ([f2c15e4](https://github.com/tinacms/tinacms/commit/f2c15e4)) -- tracks form with id instead of name ([2f12b75](https://github.com/tinacms/tinacms/commit/2f12b75)) -- **date field:** write date string to source ([51cbc1a](https://github.com/tinacms/tinacms/commit/51cbc1a)) -- **date field:** writes invalid dates to source ([b0fd128](https://github.com/tinacms/tinacms/commit/b0fd128)) - -### Features - -- add better empty state ([6598fed](https://github.com/tinacms/tinacms/commit/6598fed)) - -## [0.1.0-alpha.12](https://github.com/tinacms/tinacms/compare/tinacms@0.1.0-alpha.11...tinacms@0.1.0-alpha.12) (2019-09-20) - -### Bug Fixes - -- add fix for body padding ([82a8d9c](https://github.com/tinacms/tinacms/commit/82a8d9c)) -- add import for color helper ([d278397](https://github.com/tinacms/tinacms/commit/d278397)) -- cleaning up other name/id/label bug issues ([f2c15e4](https://github.com/tinacms/tinacms/commit/f2c15e4)) -- tracks form with id instead of name ([2f12b75](https://github.com/tinacms/tinacms/commit/2f12b75)) -- **date field:** write date string to source ([51cbc1a](https://github.com/tinacms/tinacms/commit/51cbc1a)) -- **date field:** writes invalid dates to source ([b0fd128](https://github.com/tinacms/tinacms/commit/b0fd128)) diff --git a/packages/@tinacms/toolkit/README.md b/packages/@tinacms/toolkit/README.md deleted file mode 100644 index 8f2bea2931..0000000000 --- a/packages/@tinacms/toolkit/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# tinacms - -Tina is a lightweight but powerful toolkit for creating a site editing ui with javascript components. Tina surfaces superpowers for dev’s to create, expand on and customize a simple yet intuitive ui for editing content. - -Tina is optimized for nextgen JAMstack tools. It is based in javascript and is extensible enough to be configured with many different frameworks. Right now we have explored using Tina with Gatsby, Create-React-App & Next.js, with plans to dive into Vue. - -[Visit the website to learn more!](https://tinacms.org/docs/) - -![Tina Demo](https://tinacms.org/86eeb01f0e69c12bb5603865954d79ba/temporary_show_tina.gif) diff --git a/packages/@tinacms/toolkit/assets/close.svg b/packages/@tinacms/toolkit/assets/close.svg deleted file mode 100644 index 784b96a534..0000000000 --- a/packages/@tinacms/toolkit/assets/close.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/@tinacms/toolkit/assets/ellipsis-v.svg b/packages/@tinacms/toolkit/assets/ellipsis-v.svg deleted file mode 100644 index bda316a2ad..0000000000 --- a/packages/@tinacms/toolkit/assets/ellipsis-v.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/@tinacms/toolkit/assets/forestry-logo.svg b/packages/@tinacms/toolkit/assets/forestry-logo.svg deleted file mode 100644 index 688caad3b1..0000000000 --- a/packages/@tinacms/toolkit/assets/forestry-logo.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/@tinacms/toolkit/assets/hamburger.svg b/packages/@tinacms/toolkit/assets/hamburger.svg deleted file mode 100644 index 1a591f2e2a..0000000000 --- a/packages/@tinacms/toolkit/assets/hamburger.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packages/@tinacms/toolkit/package.json b/packages/@tinacms/toolkit/package.json deleted file mode 100644 index 84f779ced2..0000000000 --- a/packages/@tinacms/toolkit/package.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "name": "@tinacms/toolkit", - "version": "1.7.13", - "main": "dist/index.js", - "types": "dist/index.d.ts", - "module": "./dist/index.mjs", - "keywords": [ - "tinacms", - "cms", - "react" - ], - "files": [ - "assets", - "dist" - ], - "exports": { - ".": { - "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "require": "./dist/index.js" - } - }, - "bugs": { - "url": "https://github.com/tinacms/tinacms/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/tinacms/tinacms.git", - "directory": "packages/tinacms" - }, - "license": "Apache-2.0", - "scripts": { - "types": "pnpm tsc && pnpm tsc-alias", - "build": "tinacms-scripts build", - "test": "vitest" - }, - "devDependencies": { - "@testing-library/dom": "^7.21.4 ", - "@testing-library/jest-dom": "^5.16.5", - "@testing-library/react": "^12.0.0", - "@testing-library/user-event": "^12.7.0", - "@tinacms/scripts": "workspace:*", - "@types/atob": "^2.1.2", - "@types/codemirror": "^0.0.71", - "@types/color-string": "^1.5.0", - "@types/jest": "^27.0.1", - "@types/lodash.debounce": "^4.0.6", - "@types/lodash.get": "^4.4.5", - "@types/prop-types": "^15.7.4", - "@types/react": "^17.0.14", - "@types/react-beautiful-dnd": "^11.0.3", - "@types/react-color": "^3.0.1", - "@types/react-dom": "^17.0.9", - "@types/react-select": "^2.0.11", - "@types/storybook__react": "^4.0.2", - "happy-dom": "^10.5.2", - "react": "17.0.2", - "react-dom": "17.0.2", - "tslib": "^2.3.0", - "typescript": "4.3.5", - "tsc-alias": "^1.8.7", - "vite": "^4.3.9", - "vitest": "^0.32.2" - }, - "dependencies": { - "@floating-ui/dom": "^1.4.4", - "@floating-ui/react-dom": "^2.0.1", - "@headlessui/react": "^1.5.0", - "@heroicons/react": "^1.0.5", - "@monaco-editor/react": "4.4.5", - "@radix-ui/react-popover": "^1.0.6", - "@react-aria/i18n": "^3.3.4", - "@react-hook/window-size": "^3.0.7", - "@react-types/combobox": "^3.2.0", - "@react-types/shared": "^3.10.0", - "@sambego/storybook-styles": "^1.0.0", - "@tinacms/search": "workspace:*", - "@tinacms/sharedctx": "workspace:*", - "@udecode/plate-headless": "^21.4.0", - "atob": "2.1.2", - "color-string": "^1.5.3", - "date-fns": "2.30.0", - "final-form": "^4.20.2", - "final-form-arrays": "^3.0.1", - "final-form-set-field-data": "^1.0.2", - "is-hotkey": "^0.2.0", - "lodash.get": "^4.4.2", - "moment": "2.29.4", - "monaco-editor": "0.31.0", - "prism-react-renderer": "^1.3.5", - "prismjs": "^1.28.0", - "prop-types": "15.7.2", - "react-beautiful-dnd": "^13.1.0", - "react-color": "^2.17.3", - "react-datetime": "^2.16.3", - "react-dropzone": "14.2.3", - "react-final-form": "^6.3.0", - "react-icons": "^4.3.1", - "react-onclickoutside": "^6.13.0", - "react-textarea-autosize": "8.5.2", - "scheduler": "0.19.0", - "slate": "^0.94.1", - "slate-history": "^0.93.0", - "slate-hyperscript": "^0.77.0", - "slate-react": "^0.97.1", - "webfontloader": "1.6.28" - }, - "peerDependencies": { - "react": ">=16.14", - "react-dom": ">=16.14" - }, - "gitHead": "87c8f9a3ca2c5bf41e1a4c54a73759d12a7c5bfd" -} diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-cms.ts b/packages/@tinacms/toolkit/src/react-tinacms/use-cms.ts deleted file mode 100644 index 0175ab4ca4..0000000000 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-cms.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { useCMS as useBaseCMS } from '@/react-core' -import { TinaCMS } from '@/tina-cms' - -export { ERROR_MISSING_CMS, CMSContext } from '@/react-core' - -export function useCMS(): TinaCMS { - return useBaseCMS() as TinaCMS -} diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-plugin.tsx b/packages/@tinacms/toolkit/src/react-tinacms/use-plugin.tsx deleted file mode 100644 index cd1d2f2319..0000000000 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-plugin.tsx +++ /dev/null @@ -1 +0,0 @@ -export { usePlugins, usePlugin } from '@/react-core' diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-subscribable.tsx b/packages/@tinacms/toolkit/src/react-tinacms/use-subscribable.tsx deleted file mode 100644 index 8358d918ff..0000000000 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-subscribable.tsx +++ /dev/null @@ -1 +0,0 @@ -export { useSubscribable } from '@/react-core' diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-watch-form-values.ts b/packages/@tinacms/toolkit/src/react-tinacms/use-watch-form-values.ts deleted file mode 100644 index 761c8c8cde..0000000000 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-watch-form-values.ts +++ /dev/null @@ -1 +0,0 @@ -export { useWatchFormValues } from '@/react-core' diff --git a/packages/@tinacms/toolkit/src/react-tinacms/with-plugin.tsx b/packages/@tinacms/toolkit/src/react-tinacms/with-plugin.tsx deleted file mode 100644 index a2406874cf..0000000000 --- a/packages/@tinacms/toolkit/src/react-tinacms/with-plugin.tsx +++ /dev/null @@ -1 +0,0 @@ -export { withPlugins, withPlugin } from '@/react-core' diff --git a/packages/@tinacms/toolkit/tsconfig.json b/packages/@tinacms/toolkit/tsconfig.json deleted file mode 100644 index 51d739713e..0000000000 --- a/packages/@tinacms/toolkit/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../../base.tsconfig.json", - "compilerOptions": { - "outDir": "dist", - "baseUrl": "./", - "paths": { - "@/*": ["./src/*"] - }, - }, - "exclude": ["node_modules", "dist"], - "include": ["src"] -} diff --git a/packages/@tinacms/toolkit/typedoc.js b/packages/@tinacms/toolkit/typedoc.js deleted file mode 100644 index 7cda0b045c..0000000000 --- a/packages/@tinacms/toolkit/typedoc.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - - - -*/ - -module.exports = require('../../typedoc.js')(require('./package.json')) diff --git a/packages/@tinacms/toolkit/types/react-frame-component.d.ts b/packages/@tinacms/toolkit/types/react-frame-component.d.ts deleted file mode 100644 index 6a5a675952..0000000000 --- a/packages/@tinacms/toolkit/types/react-frame-component.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - - - -*/ - -declare module 'react-frame-component' diff --git a/packages/next-tinacms-cloudinary/package.json b/packages/next-tinacms-cloudinary/package.json index de53783271..9f1b2bb9ec 100644 --- a/packages/next-tinacms-cloudinary/package.json +++ b/packages/next-tinacms-cloudinary/package.json @@ -26,7 +26,6 @@ "multer": "1.4.5-lts.1" }, "devDependencies": { - "@tinacms/toolkit": "workspace:*", "@tinacms/scripts": "workspace:*", "@types/crypto-js": "^3.1.47", "@types/js-cookie": "^2.2.6", diff --git a/packages/next-tinacms-cloudinary/src/cloudinary-media-store.ts b/packages/next-tinacms-cloudinary/src/cloudinary-media-store.ts index c7f46bf224..2e90d696f8 100644 --- a/packages/next-tinacms-cloudinary/src/cloudinary-media-store.ts +++ b/packages/next-tinacms-cloudinary/src/cloudinary-media-store.ts @@ -1,15 +1,11 @@ -/** - -*/ - import type { Media, MediaList, MediaListOptions, MediaStore, MediaUploadOptions, -} from '@tinacms/toolkit' -import { DEFAULT_MEDIA_UPLOAD_TYPES } from '@tinacms/toolkit' +} from 'tinacms' +import { DEFAULT_MEDIA_UPLOAD_TYPES } from 'tinacms' import { E_UNAUTHORIZED, E_BAD_ROUTE, interpretErrorMessage } from './errors' diff --git a/packages/next-tinacms-cloudinary/src/handlers.ts b/packages/next-tinacms-cloudinary/src/handlers.ts index f5b71d21ce..1473879f86 100644 --- a/packages/next-tinacms-cloudinary/src/handlers.ts +++ b/packages/next-tinacms-cloudinary/src/handlers.ts @@ -3,7 +3,7 @@ */ import { v2 as cloudinary } from 'cloudinary' -import type { Media, MediaListOptions } from '@tinacms/toolkit' +import type { Media, MediaListOptions } from 'tinacms' import path from 'path' import { NextApiRequest, NextApiResponse } from 'next' import multer from 'multer' diff --git a/packages/next-tinacms-dos/package.json b/packages/next-tinacms-dos/package.json index da7c2b5c1a..f5d8f1e643 100644 --- a/packages/next-tinacms-dos/package.json +++ b/packages/next-tinacms-dos/package.json @@ -26,7 +26,6 @@ "multer": "1.4.5-lts.1" }, "devDependencies": { - "@tinacms/toolkit": "workspace:*", "@tinacms/scripts": "workspace:*", "@types/crypto-js": "^3.1.47", "@types/js-cookie": "^2.2.6", diff --git a/packages/next-tinacms-dos/src/dos-media-store.ts b/packages/next-tinacms-dos/src/dos-media-store.ts index 47facc609e..8c11d6484c 100644 --- a/packages/next-tinacms-dos/src/dos-media-store.ts +++ b/packages/next-tinacms-dos/src/dos-media-store.ts @@ -1,15 +1,11 @@ -/** - -*/ - import type { Media, MediaList, MediaListOptions, MediaStore, MediaUploadOptions, -} from '@tinacms/toolkit' -import { DEFAULT_MEDIA_UPLOAD_TYPES } from '@tinacms/toolkit' +} from 'tinacms' +import { DEFAULT_MEDIA_UPLOAD_TYPES } from 'tinacms' import { E_UNAUTHORIZED, E_BAD_ROUTE, interpretErrorMessage } from './errors' diff --git a/packages/next-tinacms-dos/src/handlers.ts b/packages/next-tinacms-dos/src/handlers.ts index a5125e4cc2..60a6488226 100644 --- a/packages/next-tinacms-dos/src/handlers.ts +++ b/packages/next-tinacms-dos/src/handlers.ts @@ -13,7 +13,7 @@ import { DeleteObjectCommand, DeleteObjectCommandInput, } from '@aws-sdk/client-s3' -import type { Media, MediaListOptions } from '@tinacms/toolkit' +import type { Media, MediaListOptions } from 'tinacms' import path from 'path' import fs from 'fs' import { NextApiRequest, NextApiResponse } from 'next' diff --git a/packages/next-tinacms-s3/package.json b/packages/next-tinacms-s3/package.json index 37189928a0..bffc7fe9fd 100644 --- a/packages/next-tinacms-s3/package.json +++ b/packages/next-tinacms-s3/package.json @@ -27,7 +27,6 @@ "multer": "1.4.5-lts.1" }, "devDependencies": { - "@tinacms/toolkit": "workspace:*", "@tinacms/scripts": "workspace:*", "@types/crypto-js": "^3.1.47", "@types/js-cookie": "^2.2.6", diff --git a/packages/next-tinacms-s3/src/handlers.ts b/packages/next-tinacms-s3/src/handlers.ts index f4b85673cc..44db6cf9c6 100644 --- a/packages/next-tinacms-s3/src/handlers.ts +++ b/packages/next-tinacms-s3/src/handlers.ts @@ -13,7 +13,7 @@ import { DeleteObjectCommand, DeleteObjectCommandInput, } from '@aws-sdk/client-s3' -import { Media, MediaListOptions } from '@tinacms/toolkit' +import { Media, MediaListOptions } from 'tinacms' import path from 'path' import fs from 'fs' import { NextApiRequest, NextApiResponse } from 'next' diff --git a/packages/next-tinacms-s3/src/s3-media-store.ts b/packages/next-tinacms-s3/src/s3-media-store.ts index 695b1c41c1..a96f6812d5 100644 --- a/packages/next-tinacms-s3/src/s3-media-store.ts +++ b/packages/next-tinacms-s3/src/s3-media-store.ts @@ -8,8 +8,8 @@ import type { MediaListOptions, MediaStore, MediaUploadOptions, -} from '@tinacms/toolkit' -import { DEFAULT_MEDIA_UPLOAD_TYPES } from '@tinacms/toolkit' +} from 'tinacms' +import { DEFAULT_MEDIA_UPLOAD_TYPES } from 'tinacms' import { E_UNAUTHORIZED, E_BAD_ROUTE, interpretErrorMessage } from './errors' diff --git a/packages/tinacms/package.json b/packages/tinacms/package.json index 541e0b987a..de7c03dc46 100644 --- a/packages/tinacms/package.json +++ b/packages/tinacms/package.json @@ -57,10 +57,9 @@ "typings": "dist/index.d.ts", "license": "Apache-2.0", "scripts": { - "types": "pnpm tsc", + "types": "pnpm tsc && pnpm tsc-alias", "build": "tinacms-scripts build", - "test": "jest --env=jsdom --passWithNoTests", - "test-watch": "jest --env=jsdom --passWithNoTests --watch" + "test": "vitest" }, "dependencies": { "@graphql-inspector/core": "^4.0.0", @@ -70,11 +69,10 @@ "@tinacms/search": "workspace:*", "@tinacms/schema-tools": "workspace:*", "@tinacms/sharedctx": "workspace:*", - "@tinacms/toolkit": "workspace:*", "crypto-js": "^4.0.0", "encoding": "0.1.13", "fetch-ponyfill": "^7.1.0", - "final-form": "4.20.1", + "final-form": "4.20.4", "graphql": "15.8.0", "graphql-tag": "^2.11.0", "lodash.set": "^4.3.2", @@ -82,9 +80,55 @@ "react-icons": "^4.3.1", "react-router-dom": "6.3.0", "yup": "^0.32.0", - "zod": "^3.14.3" + "zod": "^3.14.3", + "@floating-ui/dom": "^1.4.4", + "@floating-ui/react-dom": "^2.0.1", + "@monaco-editor/react": "4.4.5", + "@radix-ui/react-popover": "^1.0.6", + "@react-aria/i18n": "^3.3.4", + "@react-types/combobox": "^3.2.0", + "@react-types/shared": "^3.10.0", + "@sambego/storybook-styles": "^1.0.0", + "@udecode/plate-headless": "^21.4.0", + "atob": "2.1.2", + "color-string": "^1.5.3", + "date-fns": "2.30.0", + "final-form-arrays": "^3.0.1", + "final-form-set-field-data": "^1.0.2", + "is-hotkey": "^0.2.0", + "lodash.get": "^4.4.2", + "moment": "2.29.4", + "monaco-editor": "0.31.0", + "prismjs": "^1.28.0", + "prop-types": "15.7.2", + "react-beautiful-dnd": "^13.1.0", + "react-color": "^2.17.3", + "react-datetime": "^2.16.3", + "react-dropzone": "14.2.3", + "react-final-form": "^6.3.0", + "react-onclickoutside": "^6.13.0", + "react-textarea-autosize": "8.5.2", + "scheduler": "0.19.0", + "slate": "^0.94.1", + "slate-history": "^0.93.0", + "slate-hyperscript": "^0.77.0", + "slate-react": "^0.97.1", + "webfontloader": "1.6.28" }, "devDependencies": { + "@types/atob": "^2.1.2", + "@types/codemirror": "^0.0.71", + "@types/color-string": "^1.5.0", + "@types/lodash.debounce": "^4.0.6", + "@types/lodash.get": "^4.4.5", + "@types/prop-types": "^15.7.4", + "@types/react-beautiful-dnd": "^11.0.3", + "@types/react-color": "^3.0.1", + "@types/react-dom": "^17.0.9", + "@types/react-select": "^2.0.11", + "@types/storybook__react": "^4.0.2", + "react-is": "^17.0.2", + "tslib": "^2.3.0", "@graphql-tools/utils": "^8.6.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^12.0.0", @@ -105,7 +149,10 @@ "next": "12.2.4", "react": "17.0.2", "react-dom": "17.0.2", - "typescript": "4.3.5" + "typescript": "4.3.5", + "tsc-alias": "^1.8.7", + "vite": "^4.3.9", + "vitest": "^0.32.2" }, "peerDependencies": { "react": ">=16.14.0", diff --git a/packages/tinacms/src/admin/components/Sidebar.tsx b/packages/tinacms/src/admin/components/Sidebar.tsx index 777ef3036e..75dbeaae7d 100644 --- a/packages/tinacms/src/admin/components/Sidebar.tsx +++ b/packages/tinacms/src/admin/components/Sidebar.tsx @@ -15,7 +15,7 @@ import { useWindowWidth } from '@react-hook/window-size' import { useGetCollections } from './GetCollections' import { IoMdClose } from 'react-icons/io' import { BiMenu } from 'react-icons/bi' -import { CloudConfigPlugin } from '@tinacms/toolkit/dist/react-cloud-config' +import { CloudConfigPlugin } from '@tinacms/toolkit' export const slugify = (text) => { return text diff --git a/packages/tinacms/src/auth/TinaCloudProvider.tsx b/packages/tinacms/src/auth/TinaCloudProvider.tsx index 34ef5c616e..a63f4dcb46 100644 --- a/packages/tinacms/src/auth/TinaCloudProvider.tsx +++ b/packages/tinacms/src/auth/TinaCloudProvider.tsx @@ -207,13 +207,13 @@ export const TinaCloudProvider = ( const setupMedia = async () => { const hasTinaMedia = Boolean(props.schema.config?.media?.tina) - /* + /* Has tina media (set up in the schema) */ if (hasTinaMedia) { cms.media.store = new TinaMediaStore(cms) } else if ( - /* + /* Has tina custom media (set up in the schema or define schema) */ props.schema.config?.media?.loadCustomStore || diff --git a/packages/tinacms/src/edit-state.test.tsx b/packages/tinacms/src/edit-state.test.tsx index 8ac5feacef..2046c5a6b5 100644 --- a/packages/tinacms/src/edit-state.test.tsx +++ b/packages/tinacms/src/edit-state.test.tsx @@ -1,11 +1,6 @@ -/** - - - -*/ - import { render, waitFor } from '@testing-library/react' import '@testing-library/jest-dom/extend-expect' +import { describe, it, expect, vi } from 'vitest' import React from 'react' import { useTina } from './edit-state' @@ -15,7 +10,7 @@ const query = `{}` const variables = { filename: 'neat.md' } const CreateDummyEditProvider = (isLoading, payload) => { - const setRequest = jest.fn() + const setRequest = vi.fn() return { setRequest, diff --git a/packages/tinacms/src/global.css b/packages/tinacms/src/global.css new file mode 100644 index 0000000000..2dd0c39186 --- /dev/null +++ b/packages/tinacms/src/global.css @@ -0,0 +1,120 @@ +:root { + --tina-color-primary-light: #2296fe; + --tina-color-primary: #0084ff; + --tina-color-primary-dark: #0574e4; + --tina-color-error-light: #eb6337; + --tina-color-error: #ec4815; + --tina-color-error-dark: #dc4419; + --tina-color-warning-light: #f5e06e; + --tina-color-warning: #e9d050; + --tina-color-warning-dark: #d3ba38; + --tina-color-success-light: #57c355; + --tina-color-success: #3cad3a; + --tina-color-success-dark: #249a21; + --tina-color-grey-0: #ffffff; + --tina-color-grey-1: #f6f6f9; + --tina-color-grey-2: #edecf3; + --tina-color-grey-3: #e1ddec; + --tina-color-grey-4: #b2adbe; + --tina-color-grey-5: #918c9e; + --tina-color-grey-6: #716c7f; + --tina-color-grey-7: #565165; + --tina-color-grey-8: #433e52; + --tina-color-grey-9: #363145; + --tina-color-grey-10: #252336; + --tina-color-indicator: var(--tina-color-primary); + + --tina-radius-small: 5px; + --tina-radius-big: 24px; + + --tina-padding-small: 12px; + --tina-padding-big: 20px; + + --tina-font-size-0: 12px; + --tina-font-size-1: 13px; + --tina-font-size-2: 15px; + --tina-font-size-3: 16px; + --tina-font-size-4: 18px; + --tina-font-size-5: 20px; + --tina-font-size-6: 22px; + --tina-font-size-7: 26px; + --tina-font-size-8: 32px; + + --tina-font-family: 'Inter', sans-serif; + + --tina-font-weight-regular: 400; + --tina-font-weight-bold: 600; + + --tina-shadow-big: 0px 2px 3px rgba(0, 0, 0, 0.05), + 0 4px 12px rgba(0, 0, 0, 0.1); + --tina-shadow-small: 0px 2px 3px rgba(0, 0, 0, 0.12); + + --tina-timing-short: 85ms; + --tina-timing-medium: 150ms; + --tina-timing-long: 250ms; + + --tina-z-index-0: 0; + --tina-z-index-1: 10; + --tina-z-index-2: 20; + --tina-z-index-3: 30; + --tina-z-index-4: 40; + --tina-z-index-5: 50; + + --tina-sidebar-width: 340px; + --tina-sidebar-header-height: 60px; + --tina-toolbar-height: 62px; +} + +@keyframes fly-in-left { + 0% { + transform: translate3d(100%, 0, 0); + } + + 100% { + transform: translate3d(0, 0, 0); + } +} + +@keyframes fly-in-up { + 0% { + transform: translate3d(0, 100%, 0); + } + + 100% { + transform: translate3d(0, 0, 0); + } +} + +@keyframes fade-in { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } +} + +@keyframes popup-right { + 0% { + transform: translate3d(-2rem, 0, 0); + opacity: 0; + } + + 100% { + transform: translate3d(0, 0, 0); + opacity: 1; + } +} + +@keyframes popup-down { + 0% { + transform: translate3d(0, -2rem, 0); + opacity: 0; + } + + 100% { + transform: translate3d(0, 0, 0); + opacity: 1; + } +} diff --git a/packages/tinacms/src/index.ts b/packages/tinacms/src/index.ts index 42d9c743b8..aa4bd4aef0 100644 --- a/packages/tinacms/src/index.ts +++ b/packages/tinacms/src/index.ts @@ -7,11 +7,11 @@ export * from './auth' export * from './utils' export * from './tina-cms' export { useDocumentCreatorPlugin } from './hooks/use-content-creator' -export * from '@tinacms/toolkit' export { TinaAdmin } from './admin' export { RouteMappingPlugin } from './admin/plugins/route-mapping' export { TinaAdminApi } from './admin/api' +export * from './toolkit' export { MdxFieldPluginExtendible } from '@tinacms/toolkit' import { TinaCMSProvider2, DocumentCreatorCallback } from './tina-cms' diff --git a/packages/tinacms/src/styles.css b/packages/tinacms/src/styles.css index ec504fada5..058cfe3a49 100644 --- a/packages/tinacms/src/styles.css +++ b/packages/tinacms/src/styles.css @@ -1,3 +1,4 @@ +@import 'global.css'; @import 'preflight.css'; @tailwind base; @tailwind components; @@ -11,6 +12,31 @@ } } -.tina-tailwind { - @apply font-sans text-gray-600 text-base; +/* if the last block has margin-bottom it makes the text box larger but some of it isn't clickable */ +.tina-prose [data-slate-editor='true'] { + padding-bottom: 0.5em; + outline: none; +} +/* prose adds backticks, which look like they should be editable */ +.tina-prose [data-slate-editor='true'] .slate-code::before { + content: ''; +} +.tina-prose [data-slate-editor='true'] .slate-code::after { + content: ''; +} +.tina-prose [data-slate-editor='true'] .slate-code_block { + margin: 0; +} +/* code lines as part of a block don't need the same background formatting */ +.tina-prose [data-slate-editor='true'] .slate-code_block .slate-code { + background: none; +} +/* prose makes the first p in a block slightly larger */ +.tina-prose [data-slate-editor='true'] p:first-of-type { + font-size: 1em; +} + +/* experimental floating toolbar doesn't need a large text area */ +.with-toolbar [data-slate-editor='true'] { + min-height: 72px; } diff --git a/packages/@tinacms/toolkit/src/alerts/alerts.test.ts b/packages/tinacms/src/toolkit/alerts/alerts.test.ts similarity index 98% rename from packages/@tinacms/toolkit/src/alerts/alerts.test.ts rename to packages/tinacms/src/toolkit/alerts/alerts.test.ts index 5376712394..c078a38273 100644 --- a/packages/@tinacms/toolkit/src/alerts/alerts.test.ts +++ b/packages/tinacms/src/toolkit/alerts/alerts.test.ts @@ -1,5 +1,5 @@ import { Alerts } from './alerts' -import { EventBus } from '@/core' +import { EventBus } from '@toolkit/core' import { describe, it, vi } from 'vitest' vi.useFakeTimers() diff --git a/packages/@tinacms/toolkit/src/alerts/alerts.ts b/packages/tinacms/src/toolkit/alerts/alerts.ts similarity index 97% rename from packages/@tinacms/toolkit/src/alerts/alerts.ts rename to packages/tinacms/src/toolkit/alerts/alerts.ts index 21dfa43dd6..b0a85ddbee 100644 --- a/packages/@tinacms/toolkit/src/alerts/alerts.ts +++ b/packages/tinacms/src/toolkit/alerts/alerts.ts @@ -1,5 +1,5 @@ import React from 'react' -import { EventBus, Callback, CMSEvent } from '@/core' +import { EventBus, Callback, CMSEvent } from '@toolkit/core' export interface EventsToAlerts { [key: string]: ToAlert | AlertArgs diff --git a/packages/@tinacms/toolkit/src/alerts/index.ts b/packages/tinacms/src/toolkit/alerts/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/alerts/index.ts rename to packages/tinacms/src/toolkit/alerts/index.ts diff --git a/packages/@tinacms/toolkit/src/browser-storage/browser-storage-client.ts b/packages/tinacms/src/toolkit/browser-storage/browser-storage-client.ts similarity index 100% rename from packages/@tinacms/toolkit/src/browser-storage/browser-storage-client.ts rename to packages/tinacms/src/toolkit/browser-storage/browser-storage-client.ts diff --git a/packages/@tinacms/toolkit/src/browser-storage/get-flattened-form-values.ts b/packages/tinacms/src/toolkit/browser-storage/get-flattened-form-values.ts similarity index 90% rename from packages/@tinacms/toolkit/src/browser-storage/get-flattened-form-values.ts rename to packages/tinacms/src/toolkit/browser-storage/get-flattened-form-values.ts index 11ba622075..576d36449d 100644 --- a/packages/@tinacms/toolkit/src/browser-storage/get-flattened-form-values.ts +++ b/packages/tinacms/src/toolkit/browser-storage/get-flattened-form-values.ts @@ -1,5 +1,5 @@ import get from 'lodash.get' -import { Form } from '@/forms' +import { Form } from '@toolkit/forms' export function getFlattenedFormValues(form: Form) { const flatData: any = {} diff --git a/packages/@tinacms/toolkit/src/browser-storage/index.ts b/packages/tinacms/src/toolkit/browser-storage/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/browser-storage/index.ts rename to packages/tinacms/src/toolkit/browser-storage/index.ts diff --git a/packages/@tinacms/toolkit/src/browser-storage/use-form-browser-cache.ts b/packages/tinacms/src/toolkit/browser-storage/use-form-browser-cache.ts similarity index 87% rename from packages/@tinacms/toolkit/src/browser-storage/use-form-browser-cache.ts rename to packages/tinacms/src/toolkit/browser-storage/use-form-browser-cache.ts index 11f1472509..e6b536fd91 100644 --- a/packages/@tinacms/toolkit/src/browser-storage/use-form-browser-cache.ts +++ b/packages/tinacms/src/toolkit/browser-storage/use-form-browser-cache.ts @@ -1,6 +1,6 @@ import { useCallback, useEffect } from 'react' -import { Form } from '@/forms' -import { useCMS, useWatchFormValues } from '@/react-core' +import { Form } from '@toolkit/forms' +import { useCMS, useWatchFormValues } from '@toolkit/react-core' import { getFlattenedFormValues } from './get-flattened-form-values' diff --git a/packages/@tinacms/toolkit/src/components/active-field-indicator.tsx b/packages/tinacms/src/toolkit/components/active-field-indicator.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/components/active-field-indicator.tsx rename to packages/tinacms/src/toolkit/components/active-field-indicator.tsx index 4b8d77f86c..570b12aa60 100644 --- a/packages/@tinacms/toolkit/src/components/active-field-indicator.tsx +++ b/packages/tinacms/src/toolkit/components/active-field-indicator.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { ChevronUpIcon, ChevronDownIcon } from '@/icons' -import { useEvent } from '@/react-core/use-cms-event' -import { FieldHoverEvent, FieldFocusEvent } from '@/fields/field-events' -import { useFieldReference } from '@/hooks/use-field-reference' +import { ChevronUpIcon, ChevronDownIcon } from '@toolkit/icons' +import { useEvent } from '@toolkit/react-core/use-cms-event' +import { FieldHoverEvent, FieldFocusEvent } from '@toolkit/fields/field-events' +import { useFieldReference } from '@toolkit/hooks/use-field-reference' const IndicatorWrap = ({ style = {}, position, ...props }) => (
    { diff --git a/packages/@tinacms/toolkit/src/components/tina-cms-provider.tsx b/packages/tinacms/src/toolkit/components/tina-cms-provider.tsx similarity index 77% rename from packages/@tinacms/toolkit/src/components/tina-cms-provider.tsx rename to packages/tinacms/src/toolkit/components/tina-cms-provider.tsx index 6edfd3bb54..dcaab01439 100644 --- a/packages/@tinacms/toolkit/src/components/tina-cms-provider.tsx +++ b/packages/tinacms/src/toolkit/components/tina-cms-provider.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { TinaCMS } from '@/tina-cms' -import { CMSContext } from '@/react-tinacms/use-cms' -import { initialState, tinaReducer } from '@/tina-state' +import { TinaCMS } from '@toolkit/tina-cms' +import { CMSContext } from '@toolkit/react-tinacms/use-cms' +import { initialState, tinaReducer } from '@toolkit/tina-state' export interface TinaCMSProviderProps { cms: TinaCMS diff --git a/packages/@tinacms/toolkit/src/components/tina-provider.tsx b/packages/tinacms/src/toolkit/components/tina-provider.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/components/tina-provider.tsx rename to packages/tinacms/src/toolkit/components/tina-provider.tsx diff --git a/packages/@tinacms/toolkit/src/components/tina-ui.test.tsx b/packages/tinacms/src/toolkit/components/tina-ui.test.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/components/tina-ui.test.tsx rename to packages/tinacms/src/toolkit/components/tina-ui.test.tsx diff --git a/packages/@tinacms/toolkit/src/components/tina-ui.tsx b/packages/tinacms/src/toolkit/components/tina-ui.tsx similarity index 86% rename from packages/@tinacms/toolkit/src/components/tina-ui.tsx rename to packages/tinacms/src/toolkit/components/tina-ui.tsx index 63c79bfdda..a5f65a541d 100644 --- a/packages/@tinacms/toolkit/src/components/tina-ui.tsx +++ b/packages/tinacms/src/toolkit/components/tina-ui.tsx @@ -5,10 +5,10 @@ */ import * as React from 'react' -import { ModalProvider } from '@/react-modals' -import { SidebarProvider, SidebarPosition } from '@/react-sidebar' +import { ModalProvider } from '@toolkit/react-modals' +import { SidebarProvider, SidebarPosition } from '@toolkit/react-sidebar' import { useCMS } from '../react-tinacms/use-cms' -import { Alerts } from '@/react-alerts' +import { Alerts } from '@toolkit/react-alerts' import { MediaManager } from './media' import { ActiveFieldIndicator } from './active-field-indicator' import { MutationSignalProvider } from './mutation-signal' @@ -27,12 +27,12 @@ export const TinaUI: React.FC = ({ children, position }) => { return ( - + {/* + > */}
    diff --git a/packages/@tinacms/toolkit/src/core/cms.test.ts b/packages/tinacms/src/toolkit/core/cms.test.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/cms.test.ts rename to packages/tinacms/src/toolkit/core/cms.test.ts diff --git a/packages/@tinacms/toolkit/src/core/cms.ts b/packages/tinacms/src/toolkit/core/cms.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/cms.ts rename to packages/tinacms/src/toolkit/core/cms.ts diff --git a/packages/@tinacms/toolkit/src/core/event.ts b/packages/tinacms/src/toolkit/core/event.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/event.ts rename to packages/tinacms/src/toolkit/core/event.ts diff --git a/packages/@tinacms/toolkit/src/core/events.test.ts b/packages/tinacms/src/toolkit/core/events.test.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/events.test.ts rename to packages/tinacms/src/toolkit/core/events.test.ts diff --git a/packages/@tinacms/toolkit/src/core/flags.ts b/packages/tinacms/src/toolkit/core/flags.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/flags.ts rename to packages/tinacms/src/toolkit/core/flags.ts diff --git a/packages/@tinacms/toolkit/src/core/index.ts b/packages/tinacms/src/toolkit/core/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/index.ts rename to packages/tinacms/src/toolkit/core/index.ts diff --git a/packages/@tinacms/toolkit/src/core/media-store.default.ts b/packages/tinacms/src/toolkit/core/media-store.default.ts similarity index 99% rename from packages/@tinacms/toolkit/src/core/media-store.default.ts rename to packages/tinacms/src/toolkit/core/media-store.default.ts index fd3683c6d2..42fbf10f3b 100644 --- a/packages/@tinacms/toolkit/src/core/media-store.default.ts +++ b/packages/tinacms/src/toolkit/core/media-store.default.ts @@ -8,7 +8,7 @@ import { E_BAD_ROUTE, } from './media' import { CMS } from './cms' -import { DEFAULT_MEDIA_UPLOAD_TYPES } from '@/components/media/utils' +import { DEFAULT_MEDIA_UPLOAD_TYPES } from '@toolkit/components/media/utils' const s3ErrorRegex = /.*(.+)<\/Code>.*(.+)<\/Message>.*/ diff --git a/packages/@tinacms/toolkit/src/core/media.ts b/packages/tinacms/src/toolkit/core/media.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/media.ts rename to packages/tinacms/src/toolkit/core/media.ts diff --git a/packages/@tinacms/toolkit/src/core/plugins.test.ts b/packages/tinacms/src/toolkit/core/plugins.test.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/plugins.test.ts rename to packages/tinacms/src/toolkit/core/plugins.test.ts diff --git a/packages/@tinacms/toolkit/src/core/plugins.ts b/packages/tinacms/src/toolkit/core/plugins.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/plugins.ts rename to packages/tinacms/src/toolkit/core/plugins.ts diff --git a/packages/@tinacms/toolkit/src/core/subscribable.test.ts b/packages/tinacms/src/toolkit/core/subscribable.test.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/subscribable.test.ts rename to packages/tinacms/src/toolkit/core/subscribable.test.ts diff --git a/packages/@tinacms/toolkit/src/core/subscribable.ts b/packages/tinacms/src/toolkit/core/subscribable.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/subscribable.ts rename to packages/tinacms/src/toolkit/core/subscribable.ts diff --git a/packages/@tinacms/toolkit/src/core/types/react-frame-component.d.ts b/packages/tinacms/src/toolkit/core/types/react-frame-component.d.ts similarity index 100% rename from packages/@tinacms/toolkit/src/core/types/react-frame-component.d.ts rename to packages/tinacms/src/toolkit/core/types/react-frame-component.d.ts diff --git a/packages/@tinacms/toolkit/src/fields/components/button-toggle.tsx b/packages/tinacms/src/toolkit/fields/components/button-toggle.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/button-toggle.tsx rename to packages/tinacms/src/toolkit/fields/components/button-toggle.tsx diff --git a/packages/@tinacms/toolkit/src/fields/components/checkbox-group.tsx b/packages/tinacms/src/toolkit/fields/components/checkbox-group.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/checkbox-group.tsx rename to packages/tinacms/src/toolkit/fields/components/checkbox-group.tsx diff --git a/packages/@tinacms/toolkit/src/fields/components/color-picker/color-formatter.tsx b/packages/tinacms/src/toolkit/fields/components/color-picker/color-formatter.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/color-picker/color-formatter.tsx rename to packages/tinacms/src/toolkit/fields/components/color-picker/color-formatter.tsx diff --git a/packages/@tinacms/toolkit/src/fields/components/color-picker/color-picker.tsx b/packages/tinacms/src/toolkit/fields/components/color-picker/color-picker.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/fields/components/color-picker/color-picker.tsx rename to packages/tinacms/src/toolkit/fields/components/color-picker/color-picker.tsx index 495289d74d..900ae52c22 100644 --- a/packages/@tinacms/toolkit/src/fields/components/color-picker/color-picker.tsx +++ b/packages/tinacms/src/toolkit/fields/components/color-picker/color-picker.tsx @@ -1,10 +1,10 @@ import * as React from 'react' import { useState } from 'react' -import { Dismissible } from '@/react-dismissible' +import { Dismissible } from '@toolkit/react-dismissible' import * as pkg from 'react-color' const { SketchPicker, BlockPicker } = pkg import { ColorRGBA, ColorFormat, ColorFormatter } from './color-formatter' -import { useFormPortal } from '@/form-builder' +import { useFormPortal } from '@toolkit/form-builder' // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore importing css is not recognized import keyframes from './index.css' diff --git a/packages/@tinacms/toolkit/src/fields/components/color-picker/index.css b/packages/tinacms/src/toolkit/fields/components/color-picker/index.css similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/color-picker/index.css rename to packages/tinacms/src/toolkit/fields/components/color-picker/index.css diff --git a/packages/@tinacms/toolkit/src/fields/components/color-picker/index.ts b/packages/tinacms/src/toolkit/fields/components/color-picker/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/color-picker/index.ts rename to packages/tinacms/src/toolkit/fields/components/color-picker/index.ts diff --git a/packages/@tinacms/toolkit/src/fields/components/image-upload/image-upload.tsx b/packages/tinacms/src/toolkit/fields/components/image-upload/image-upload.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/fields/components/image-upload/image-upload.tsx rename to packages/tinacms/src/toolkit/fields/components/image-upload/image-upload.tsx index 2d564f1da0..8f7f043ac2 100644 --- a/packages/@tinacms/toolkit/src/fields/components/image-upload/image-upload.tsx +++ b/packages/tinacms/src/toolkit/fields/components/image-upload/image-upload.tsx @@ -4,15 +4,15 @@ import * as React from 'react' import * as dropzone from 'react-dropzone' -import { IconButton } from '@/styles' -import { TrashIcon } from '@/icons' -import { LoadingDots } from '@/form-builder' -import { useCMS } from '@/react-tinacms/use-cms' +import { IconButton } from '@toolkit/styles' +import { TrashIcon } from '@toolkit/icons' +import { LoadingDots } from '@toolkit/form-builder' +import { useCMS } from '@toolkit/react-tinacms/use-cms' import { DEFAULT_MEDIA_UPLOAD_TYPES, dropzoneAcceptFromString, isImage, -} from '@/components/media/utils' +} from '@toolkit/components/media/utils' import { BiFileBlank } from 'react-icons/bi' const { useDropzone } = dropzone diff --git a/packages/@tinacms/toolkit/src/fields/components/image-upload/index.ts b/packages/tinacms/src/toolkit/fields/components/image-upload/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/image-upload/index.ts rename to packages/tinacms/src/toolkit/fields/components/image-upload/index.ts diff --git a/packages/@tinacms/toolkit/src/fields/components/index.ts b/packages/tinacms/src/toolkit/fields/components/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/index.ts rename to packages/tinacms/src/toolkit/fields/components/index.ts diff --git a/packages/@tinacms/toolkit/src/fields/components/input.tsx b/packages/tinacms/src/toolkit/fields/components/input.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/input.tsx rename to packages/tinacms/src/toolkit/fields/components/input.tsx diff --git a/packages/@tinacms/toolkit/src/fields/components/number-input.tsx b/packages/tinacms/src/toolkit/fields/components/number-input.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/number-input.tsx rename to packages/tinacms/src/toolkit/fields/components/number-input.tsx diff --git a/packages/@tinacms/toolkit/src/fields/components/radio-group.tsx b/packages/tinacms/src/toolkit/fields/components/radio-group.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/radio-group.tsx rename to packages/tinacms/src/toolkit/fields/components/radio-group.tsx diff --git a/packages/@tinacms/toolkit/src/fields/components/reference/index.tsx b/packages/tinacms/src/toolkit/fields/components/reference/index.tsx similarity index 93% rename from packages/@tinacms/toolkit/src/fields/components/reference/index.tsx rename to packages/tinacms/src/toolkit/fields/components/reference/index.tsx index 6aff7edd31..66133b6737 100644 --- a/packages/@tinacms/toolkit/src/fields/components/reference/index.tsx +++ b/packages/tinacms/src/toolkit/fields/components/reference/index.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { useCMS } from '@/react-tinacms/use-cms' +import { useCMS } from '@toolkit/react-tinacms/use-cms' import ReferenceSelect from './reference-select' import ReferenceLink from './reference-link' diff --git a/packages/@tinacms/toolkit/src/fields/components/reference/reference-link.tsx b/packages/tinacms/src/toolkit/fields/components/reference/reference-link.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/fields/components/reference/reference-link.tsx rename to packages/tinacms/src/toolkit/fields/components/reference/reference-link.tsx index 3db08a971b..a235f7507a 100644 --- a/packages/@tinacms/toolkit/src/fields/components/reference/reference-link.tsx +++ b/packages/tinacms/src/toolkit/fields/components/reference/reference-link.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import type { TinaCMS } from '@/tina-cms' +import type { TinaCMS } from '@toolkit/tina-cms' import { BiEdit } from 'react-icons/bi' interface ReferenceLinkProps { diff --git a/packages/@tinacms/toolkit/src/fields/components/reference/reference-select.tsx b/packages/tinacms/src/toolkit/fields/components/reference/reference-select.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/fields/components/reference/reference-select.tsx rename to packages/tinacms/src/toolkit/fields/components/reference/reference-select.tsx index ae3d74ab5c..ac535c806c 100644 --- a/packages/@tinacms/toolkit/src/fields/components/reference/reference-select.tsx +++ b/packages/tinacms/src/toolkit/fields/components/reference/reference-select.tsx @@ -1,10 +1,10 @@ import * as React from 'react' -import type { TinaCMS } from '@/tina-cms' +import type { TinaCMS } from '@toolkit/tina-cms' import type { ReferenceFieldProps } from './index' import { selectFieldClasses } from '../select' -import { LoadingDots } from '@/form-builder' +import { LoadingDots } from '@toolkit/form-builder' import { MdKeyboardArrowDown } from 'react-icons/md' -import { Field } from '@/forms' +import { Field } from '@toolkit/forms' interface ReferenceSelectProps { cms: TinaCMS diff --git a/packages/@tinacms/toolkit/src/fields/components/select.tsx b/packages/tinacms/src/toolkit/fields/components/select.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/fields/components/select.tsx rename to packages/tinacms/src/toolkit/fields/components/select.tsx index 0f02d8b79c..1d3e8701aa 100644 --- a/packages/@tinacms/toolkit/src/fields/components/select.tsx +++ b/packages/tinacms/src/toolkit/fields/components/select.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { MdKeyboardArrowDown } from 'react-icons/md' -import type { Field } from '@/forms' +import type { Field } from '@toolkit/forms' type Option = { value: string diff --git a/packages/@tinacms/toolkit/src/fields/components/text-field.tsx b/packages/tinacms/src/toolkit/fields/components/text-field.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/text-field.tsx rename to packages/tinacms/src/toolkit/fields/components/text-field.tsx diff --git a/packages/@tinacms/toolkit/src/fields/components/textarea.tsx b/packages/tinacms/src/toolkit/fields/components/textarea.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/components/textarea.tsx rename to packages/tinacms/src/toolkit/fields/components/textarea.tsx diff --git a/packages/@tinacms/toolkit/src/fields/components/toggle.tsx b/packages/tinacms/src/toolkit/fields/components/toggle.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/fields/components/toggle.tsx rename to packages/tinacms/src/toolkit/fields/components/toggle.tsx index bfabe4abe3..c8647733cd 100644 --- a/packages/@tinacms/toolkit/src/fields/components/toggle.tsx +++ b/packages/tinacms/src/toolkit/fields/components/toggle.tsx @@ -1,6 +1,6 @@ import { FC } from 'react' import * as React from 'react' -import { Field } from '@/forms' +import { Field } from '@toolkit/forms' export interface ToggleProps { name: string diff --git a/packages/@tinacms/toolkit/src/fields/field-events.ts b/packages/tinacms/src/toolkit/fields/field-events.ts similarity index 82% rename from packages/@tinacms/toolkit/src/fields/field-events.ts rename to packages/tinacms/src/toolkit/fields/field-events.ts index 17b46e9950..f9d58daee9 100644 --- a/packages/@tinacms/toolkit/src/fields/field-events.ts +++ b/packages/tinacms/src/toolkit/fields/field-events.ts @@ -1,4 +1,4 @@ -import { CMSEvent } from '@/core/event' +import { CMSEvent } from '@toolkit/core/event' export interface FieldHoverEvent extends CMSEvent { type: 'field:hover' diff --git a/packages/@tinacms/toolkit/src/fields/index.ts b/packages/tinacms/src/toolkit/fields/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/index.ts rename to packages/tinacms/src/toolkit/fields/index.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector-big.tsx b/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector-big.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector-big.tsx rename to packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector-big.tsx index fe1d5a3740..d29f24a20b 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector-big.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector-big.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { AddIcon } from '@/icons' -import { IconButton } from '@/styles' +import { AddIcon } from '@toolkit/icons' +import { IconButton } from '@toolkit/styles' import { Disclosure, Transition } from '@headlessui/react' -import { useFormPortal } from '@/form-builder' +import { useFormPortal } from '@toolkit/form-builder' import { PanelHeader } from '../group-field-plugin' import { BlockTemplate } from '.' import { MdKeyboardArrowDown, MdOutlineClear } from 'react-icons/md' diff --git a/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector.tsx b/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector.tsx rename to packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector.tsx index 10f7876389..39fc906952 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/block-selector.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import { AddIcon } from '@/icons' -import { IconButton } from '@/styles' +import { AddIcon } from '@toolkit/icons' +import { IconButton } from '@toolkit/styles' import { Popover, Transition } from '@headlessui/react' import { BlockTemplate } from '.' diff --git a/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/index.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/index.tsx index 57e1f2dcfb..e146cf87b3 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/blocks-field-plugin/index.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/index.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import { Field, Form } from '@/forms' -import { FieldsBuilder, useFormPortal } from '@/form-builder' +import { Field, Form } from '@toolkit/forms' +import { FieldsBuilder, useFormPortal } from '@toolkit/form-builder' import { Droppable, Draggable } from 'react-beautiful-dnd' import { GroupPanel, PanelHeader, PanelBody } from '../group-field-plugin' import { @@ -10,9 +10,9 @@ import { DragHandle, ItemClickTarget, } from '../group-list-field-plugin' -import { useCMS } from '@/react-core/use-cms' -import { useEvent } from '@/react-core' -import { FieldHoverEvent, FieldFocusEvent } from '@/fields/field-events' +import { useCMS } from '@toolkit/react-core/use-cms' +import { useEvent } from '@toolkit/react-core' +import { FieldHoverEvent, FieldFocusEvent } from '@toolkit/fields/field-events' import { BlockSelector } from './block-selector' import { BlockSelectorBig } from './block-selector-big' import { BiPencil } from 'react-icons/bi' diff --git a/packages/@tinacms/toolkit/src/fields/plugins/button-toggle-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/button-toggle-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/button-toggle-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/button-toggle-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/checkbox-group-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/checkbox-group-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/checkbox-group-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/checkbox-group-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/color-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/color-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/color-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/color-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/date-field-plugin.css b/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.css similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/date-field-plugin.css rename to packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.css diff --git a/packages/@tinacms/toolkit/src/fields/plugins/date-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/date-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/date-format.ts b/packages/tinacms/src/toolkit/fields/plugins/date-format.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/date-format.ts rename to packages/tinacms/src/toolkit/fields/plugins/date-format.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/field-props.ts b/packages/tinacms/src/toolkit/fields/plugins/field-props.ts similarity index 56% rename from packages/@tinacms/toolkit/src/fields/plugins/field-props.ts rename to packages/tinacms/src/toolkit/fields/plugins/field-props.ts index cef4fe14fd..08ca0dbe0c 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/field-props.ts +++ b/packages/tinacms/src/toolkit/fields/plugins/field-props.ts @@ -1,5 +1,5 @@ -import { Field, FormApi } from '@/forms' -import { FieldRenderProps } from '@/form-builder' +import { Field, FormApi } from '@toolkit/forms' +import { FieldRenderProps } from '@toolkit/form-builder' export interface FieldProps extends FieldRenderProps { diff --git a/packages/@tinacms/toolkit/src/fields/plugins/group-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/group-field-plugin.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/fields/plugins/group-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/group-field-plugin.tsx index 8681eaff7d..bee9c18ba2 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/group-field-plugin.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/group-field-plugin.tsx @@ -1,7 +1,11 @@ import * as React from 'react' -import { Field, Form } from '@/forms' -import { FieldsBuilder, useFormPortal, FormWrapper } from '@/form-builder' -import { useCMS } from '@/react-core/use-cms' +import { Field, Form } from '@toolkit/forms' +import { + FieldsBuilder, + useFormPortal, + FormWrapper, +} from '@toolkit/form-builder' +import { useCMS } from '@toolkit/react-core/use-cms' import { BiPencil } from 'react-icons/bi' import { IoMdClose } from 'react-icons/io' import { wrapFieldWithError } from './wrap-field-with-meta' diff --git a/packages/@tinacms/toolkit/src/fields/plugins/group-list-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/group-list-field-plugin.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/fields/plugins/group-list-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/group-list-field-plugin.tsx index b0cdf0ddea..64dd8f6d97 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/group-list-field-plugin.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/group-list-field-plugin.tsx @@ -1,13 +1,13 @@ import * as React from 'react' -import { Field, Form } from '@/forms' -import { FieldsBuilder, useFormPortal } from '@/form-builder' -import { IconButton } from '@/styles' +import { Field, Form } from '@toolkit/forms' +import { FieldsBuilder, useFormPortal } from '@toolkit/form-builder' +import { IconButton } from '@toolkit/styles' import { Droppable, Draggable } from 'react-beautiful-dnd' -import { AddIcon, DragIcon, ReorderIcon, TrashIcon } from '@/icons' +import { AddIcon, DragIcon, ReorderIcon, TrashIcon } from '@toolkit/icons' import { GroupPanel, PanelHeader, PanelBody } from './group-field-plugin' -import { useEvent } from '@/react-core/use-cms-event' +import { useEvent } from '@toolkit/react-core/use-cms-event' import { FieldHoverEvent, FieldFocusEvent } from '../field-events' -import { useCMS } from '@/react-core/use-cms' +import { useCMS } from '@toolkit/react-core/use-cms' import { BiPencil } from 'react-icons/bi' import { EmptyList, ListFieldMeta, ListPanel } from './list-field-meta' diff --git a/packages/@tinacms/toolkit/src/fields/plugins/hidden-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/hidden-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/hidden-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/hidden-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/image-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/image-field-plugin.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/fields/plugins/image-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/image-field-plugin.tsx index 1dc2a7ef7f..c34358fc46 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/image-field-plugin.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/image-field-plugin.tsx @@ -1,8 +1,8 @@ import * as React from 'react' import { wrapFieldsWithMeta } from './wrap-field-with-meta' import { InputProps, ImageUpload } from '../components' -import { Media } from '@/core' -import { useCMS } from '@/react-core' +import { Media } from '@toolkit/core' +import { useCMS } from '@toolkit/react-core' import { parse } from './text-format' import { useState } from 'react' import { FileError } from 'react-dropzone' diff --git a/packages/@tinacms/toolkit/src/fields/plugins/index.ts b/packages/tinacms/src/toolkit/fields/plugins/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/index.ts rename to packages/tinacms/src/toolkit/fields/plugins/index.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/list-field-meta.tsx b/packages/tinacms/src/toolkit/fields/plugins/list-field-meta.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/fields/plugins/list-field-meta.tsx rename to packages/tinacms/src/toolkit/fields/plugins/list-field-meta.tsx index 83a55d62ea..2897bbdf2d 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/list-field-meta.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/list-field-meta.tsx @@ -1,7 +1,7 @@ import * as React from 'react' -import { useEvent } from '@/react-core/use-cms-event' +import { useEvent } from '@toolkit/react-core/use-cms-event' import { FieldHoverEvent, FieldFocusEvent } from '../field-events' -import { Form } from '@/forms' +import { Form } from '@toolkit/forms' import { FieldDescription, FieldError, diff --git a/packages/@tinacms/toolkit/src/fields/plugins/list-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/list-field-plugin.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/fields/plugins/list-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/list-field-plugin.tsx index 6d8849b222..b15b19d55f 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/list-field-plugin.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/list-field-plugin.tsx @@ -1,9 +1,9 @@ import * as React from 'react' -import { Field, Form } from '@/forms' -import { FieldsBuilder } from '@/form-builder' -import { IconButton } from '@/styles' +import { Field, Form } from '@toolkit/forms' +import { FieldsBuilder } from '@toolkit/form-builder' +import { IconButton } from '@toolkit/styles' import { Droppable, Draggable } from 'react-beautiful-dnd' -import { AddIcon } from '@/icons' +import { AddIcon } from '@toolkit/icons' import { DragHandle, ItemClickTarget, diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/error-message.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/error-message.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/error-message.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/error-message.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/use-debounce.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/use-debounce.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/monaco/use-debounce.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/use-debounce.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/editor-context.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/editor-context.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/editor-context.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/editor-context.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts similarity index 95% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts index d3d67bb105..65efe5c717 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts +++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/hooks/embed-hooks.ts @@ -2,8 +2,8 @@ import React from 'react' import { Transforms } from 'slate' import { useSelected, ReactEditor } from 'slate-react' import isHotkey from 'is-hotkey' -import { useCMS, useEvent } from '@/react-core' -import { FieldFocusEvent } from '@/fields/field-events' +import { useCMS, useEvent } from '@toolkit/react-core' +import { FieldFocusEvent } from '@toolkit/fields/field-events' const handleCloseBase = (editor, element) => { const path = ReactEditor.findPath(editor, element) diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/use-resize.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/hooks/use-resize.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/hooks/use-resize.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/hooks/use-resize.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/nested-form.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/nested-form.tsx similarity index 89% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/nested-form.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/nested-form.tsx index 4fee6908d6..87054a653e 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/nested-form.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/nested-form.tsx @@ -1,7 +1,7 @@ import React from 'react' -import { useFormPortal, FormBuilder } from '@/form-builder' +import { useFormPortal, FormBuilder } from '@toolkit/form-builder' import { PanelHeader, GroupPanel } from '../../group-field-plugin' -import { Form, Field } from '@/forms' +import { Form, Field } from '@toolkit/forms' import { uuid } from './plugins/ui/helpers' export const NestedForm = (props: { diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-block.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-block.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-block.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-block.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-lists.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-lists.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-lists.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-lists.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-marks.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-marks.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-marks.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-marks.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-rules.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-rules.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-rules.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-rules.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-utils.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-utils.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-utils.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/autoformat/autoformat-utils.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/common.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/common.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/common.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/common.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/formatting.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/formatting.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/formatting.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/formatting.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/with-correct-void-behavior.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/with-correct-void-behavior.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/core/with-correct-void-behavior.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/core/with-correct-void-behavior.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-code-block/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-code-block/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-code-block/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-code-block/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx index 155a2e9fda..ba52f2470f 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx @@ -9,7 +9,7 @@ import { StyledFile, StyledImage, } from '../../../../../components' -import { isImage } from '@/components/media/utils' +import { isImage } from '@toolkit/components/media/utils' export const ImgEmbed = ({ attributes, diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx index 721f4fae8c..5318a9e786 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/index.tsx @@ -9,7 +9,7 @@ import { import { ReactEditor } from 'slate-react' import { insertInlineElement } from '../core/common' import { Media } from '../../../../../../core/media' -import { isImage } from '@/components/media/utils' +import { isImage } from '@toolkit/components/media/utils' export const ELEMENT_IMG = 'img' diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-invalid-markdown-plugin/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-invalid-markdown-plugin/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-invalid-markdown-plugin/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-invalid-markdown-plugin/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-link-plugin/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-link-plugin/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-link-plugin/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-link-plugin/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/create-soft-break-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/create-soft-break-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/create-soft-break-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/create-soft-break-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/index.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/index.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/index.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/on-key-down-soft-break.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/on-key-down-soft-break.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/on-key-down-soft-break.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/on-key-down-soft-break.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/types.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/types.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/types.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/soft-break/types.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/autocomplete.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/autocomplete.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/autocomplete.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/autocomplete.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/code-block/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/code-block/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/code-block/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/code-block/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/components.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/components.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/components.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/components.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/helpers.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/helpers.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/helpers.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/helpers.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/icons.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/icons.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/icons.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/icons.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/floating-toolbar.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/floating-toolbar.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/floating-toolbar.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/floating-toolbar.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/index.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/index.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/index.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/overflow-menu.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/overflow-menu.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/overflow-menu.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/overflow-menu.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/resize-observer.d.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/resize-observer.d.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/resize-observer.d.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/resize-observer.d.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx index b5c549d130..53bddc73df 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/toolbar/toolbar-item.tsx @@ -12,7 +12,7 @@ import { import type { PlateEditor } from '@udecode/plate-headless' import type { MdxTemplate } from '../../../types' import { insertImg } from '../../create-img-plugin' -import { useCMS } from '@/react-core' +import { useCMS } from '@toolkit/react-core' export type ToolbarItemType = { label: string diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/transforms/insert-empty-block.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/transforms/insert-empty-block.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/transforms/insert-empty-block.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/transforms/insert-empty-block.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/types.ts b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/types.ts similarity index 75% rename from packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/types.ts rename to packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/types.ts index 9f9ab104e2..ecc96f28e8 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/mdx-field-plugin/plate/types.ts +++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/types.ts @@ -1,4 +1,4 @@ -import type { Field } from '@/forms' +import type { Field } from '@toolkit/forms' export type MdxTemplate = { label: string diff --git a/packages/@tinacms/toolkit/src/fields/plugins/number-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/number-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/number-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/number-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/number-format.ts b/packages/tinacms/src/toolkit/fields/plugins/number-format.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/number-format.ts rename to packages/tinacms/src/toolkit/fields/plugins/number-format.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/radio-group-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/radio-group-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/radio-group-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/radio-group-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/reference-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/reference-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/reference-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/reference-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/select-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/select-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/select-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/select-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/tags-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/tags-field-plugin.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/fields/plugins/tags-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/tags-field-plugin.tsx index 273685f9c3..8e0106156e 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/tags-field-plugin.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/tags-field-plugin.tsx @@ -3,8 +3,8 @@ import { InputProps, BaseTextField } from '../components' import { wrapFieldsWithMeta } from './wrap-field-with-meta' import { parse } from './text-format' import { BiX } from 'react-icons/bi' -import { AddIcon } from '@/icons' -import { IconButton } from '@/styles' +import { AddIcon } from '@toolkit/icons' +import { IconButton } from '@toolkit/styles' export const TagsField = wrapFieldsWithMeta< { placeholder: string }, diff --git a/packages/@tinacms/toolkit/src/fields/plugins/text-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/text-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/text-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/text-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/text-format.test.ts b/packages/tinacms/src/toolkit/fields/plugins/text-format.test.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/text-format.test.ts rename to packages/tinacms/src/toolkit/fields/plugins/text-format.test.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/text-format.ts b/packages/tinacms/src/toolkit/fields/plugins/text-format.ts similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/text-format.ts rename to packages/tinacms/src/toolkit/fields/plugins/text-format.ts diff --git a/packages/@tinacms/toolkit/src/fields/plugins/textarea-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/textarea-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/textarea-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/textarea-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/toggle-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/toggle-field-plugin.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/fields/plugins/toggle-field-plugin.tsx rename to packages/tinacms/src/toolkit/fields/plugins/toggle-field-plugin.tsx diff --git a/packages/@tinacms/toolkit/src/fields/plugins/wrap-field-with-meta.tsx b/packages/tinacms/src/toolkit/fields/plugins/wrap-field-with-meta.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/fields/plugins/wrap-field-with-meta.tsx rename to packages/tinacms/src/toolkit/fields/plugins/wrap-field-with-meta.tsx index 9c9b63b688..09c785bfbe 100644 --- a/packages/@tinacms/toolkit/src/fields/plugins/wrap-field-with-meta.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/wrap-field-with-meta.tsx @@ -1,8 +1,8 @@ import * as React from 'react' import { FieldProps } from './field-props' -import { useEvent } from '@/react-core/use-cms-event' -import { FieldHoverEvent, FieldFocusEvent } from '@/fields/field-events' -import { Form } from '@/forms' +import { useEvent } from '@toolkit/react-core/use-cms-event' +import { FieldHoverEvent, FieldFocusEvent } from '@toolkit/fields/field-events' +import { Form } from '@toolkit/forms' export type InputFieldType = FieldProps & ExtraFieldProps diff --git a/packages/@tinacms/toolkit/src/form-builder/field-plugin.tsx b/packages/tinacms/src/toolkit/form-builder/field-plugin.tsx similarity index 81% rename from packages/@tinacms/toolkit/src/form-builder/field-plugin.tsx rename to packages/tinacms/src/toolkit/form-builder/field-plugin.tsx index 1e88c945f1..2a64a59bbf 100644 --- a/packages/@tinacms/toolkit/src/form-builder/field-plugin.tsx +++ b/packages/tinacms/src/toolkit/form-builder/field-plugin.tsx @@ -1,5 +1,5 @@ -import { Field } from '@/forms' -import { InputFieldType } from '@/fields/plugins/wrap-field-with-meta' +import { Field } from '@toolkit/forms' +import { InputFieldType } from '@toolkit/fields/plugins/wrap-field-with-meta' export interface FieldPlugin { __type: 'field' diff --git a/packages/@tinacms/toolkit/src/form-builder/fields-builder.tsx b/packages/tinacms/src/toolkit/form-builder/fields-builder.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/form-builder/fields-builder.tsx rename to packages/tinacms/src/toolkit/form-builder/fields-builder.tsx index 58ccbe36b9..13c6461d69 100644 --- a/packages/@tinacms/toolkit/src/form-builder/fields-builder.tsx +++ b/packages/tinacms/src/toolkit/form-builder/fields-builder.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import { Form, Field } from '@/forms' -import { useCMS, useEventSubscription } from '@/react-core' +import { Form, Field } from '@toolkit/forms' +import { useCMS, useEventSubscription } from '@toolkit/react-core' import { Field as FinalField } from 'react-final-form' import { FieldPlugin } from './field-plugin' diff --git a/packages/@tinacms/toolkit/src/form-builder/form-actions.tsx b/packages/tinacms/src/toolkit/form-builder/form-actions.tsx similarity index 93% rename from packages/@tinacms/toolkit/src/form-builder/form-actions.tsx rename to packages/tinacms/src/toolkit/form-builder/form-actions.tsx index 7e0c947c20..a51be895be 100644 --- a/packages/@tinacms/toolkit/src/form-builder/form-actions.tsx +++ b/packages/tinacms/src/toolkit/form-builder/form-actions.tsx @@ -1,8 +1,8 @@ import * as React from 'react' -import { EllipsisVerticalIcon } from '@/icons' +import { EllipsisVerticalIcon } from '@toolkit/icons' import { useState, FC } from 'react' -import { Dismissible } from '@/react-dismissible' -import { Form } from '@/forms' +import { Dismissible } from '@toolkit/react-dismissible' +import { Form } from '@toolkit/forms' export interface FormActionMenuProps { form: Form diff --git a/packages/@tinacms/toolkit/src/form-builder/form-builder.tsx b/packages/tinacms/src/toolkit/form-builder/form-builder.tsx similarity index 99% rename from packages/@tinacms/toolkit/src/form-builder/form-builder.tsx rename to packages/tinacms/src/toolkit/form-builder/form-builder.tsx index 4e1ef612b2..e1fc114bbd 100644 --- a/packages/@tinacms/toolkit/src/form-builder/form-builder.tsx +++ b/packages/tinacms/src/toolkit/form-builder/form-builder.tsx @@ -1,10 +1,10 @@ import * as React from 'react' import { FC, useEffect } from 'react' -import { Form } from '@/forms' +import { Form } from '@toolkit/forms' import { Form as FinalForm } from 'react-final-form' import { DragDropContext, DropResult } from 'react-beautiful-dnd' -import { Button, OverflowMenu } from '@/styles' +import { Button, OverflowMenu } from '@toolkit/styles' import { LoadingDots } from './loading-dots' import { FormPortalProvider } from './form-portal' import { FieldsBuilder } from './fields-builder' @@ -21,7 +21,7 @@ import { } from '../react-modals' import { BiGitBranch } from 'react-icons/bi' import { MdOutlineSaveAlt } from 'react-icons/md' -import { formatBranchName } from '@/plugin-branch-switcher' +import { formatBranchName } from '@toolkit/plugin-branch-switcher' export interface FormBuilderProps { form: { tinaForm: Form; activeFieldName?: string } diff --git a/packages/@tinacms/toolkit/src/form-builder/form-legacy.tsx b/packages/tinacms/src/toolkit/form-builder/form-legacy.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/form-builder/form-legacy.tsx rename to packages/tinacms/src/toolkit/form-builder/form-legacy.tsx index b1d632eff7..2f3796dad1 100644 --- a/packages/@tinacms/toolkit/src/form-builder/form-legacy.tsx +++ b/packages/tinacms/src/toolkit/form-builder/form-legacy.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Form } from '@/forms' +import { Form } from '@toolkit/forms' import { Form as FinalForm, FormRenderProps } from 'react-final-form' import { FC } from 'react' diff --git a/packages/@tinacms/toolkit/src/form-builder/form-portal.tsx b/packages/tinacms/src/toolkit/form-builder/form-portal.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/form-builder/form-portal.tsx rename to packages/tinacms/src/toolkit/form-builder/form-portal.tsx diff --git a/packages/@tinacms/toolkit/src/form-builder/form.tsx b/packages/tinacms/src/toolkit/form-builder/form.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/form-builder/form.tsx rename to packages/tinacms/src/toolkit/form-builder/form.tsx index 00662346f8..a5b847bb5b 100644 --- a/packages/@tinacms/toolkit/src/form-builder/form.tsx +++ b/packages/tinacms/src/toolkit/form-builder/form.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { useState, useContext } from 'react' import PropTypes from 'prop-types' -import { Form } from '@/forms' +import { Form } from '@toolkit/forms' import { FormLegacy } from './form-legacy' import { Field } from 'react-final-form' diff --git a/packages/@tinacms/toolkit/src/form-builder/index.ts b/packages/tinacms/src/toolkit/form-builder/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/form-builder/index.ts rename to packages/tinacms/src/toolkit/form-builder/index.ts diff --git a/packages/@tinacms/toolkit/src/form-builder/loading-dots.css b/packages/tinacms/src/toolkit/form-builder/loading-dots.css similarity index 100% rename from packages/@tinacms/toolkit/src/form-builder/loading-dots.css rename to packages/tinacms/src/toolkit/form-builder/loading-dots.css diff --git a/packages/@tinacms/toolkit/src/form-builder/loading-dots.tsx b/packages/tinacms/src/toolkit/form-builder/loading-dots.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/form-builder/loading-dots.tsx rename to packages/tinacms/src/toolkit/form-builder/loading-dots.tsx diff --git a/packages/@tinacms/toolkit/src/form-builder/reset-form.tsx b/packages/tinacms/src/toolkit/form-builder/reset-form.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/form-builder/reset-form.tsx rename to packages/tinacms/src/toolkit/form-builder/reset-form.tsx index 35072d675f..3b5bd50e74 100644 --- a/packages/@tinacms/toolkit/src/form-builder/reset-form.tsx +++ b/packages/tinacms/src/toolkit/form-builder/reset-form.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { FC } from 'react' -import { Button } from '@/styles' +import { Button } from '@toolkit/styles' import { Modal, ModalHeader, diff --git a/packages/@tinacms/toolkit/src/forms/content-creator-plugin.ts b/packages/tinacms/src/toolkit/forms/content-creator-plugin.ts similarity index 90% rename from packages/@tinacms/toolkit/src/forms/content-creator-plugin.ts rename to packages/tinacms/src/toolkit/forms/content-creator-plugin.ts index 2672f6d110..d21067480f 100644 --- a/packages/@tinacms/toolkit/src/forms/content-creator-plugin.ts +++ b/packages/tinacms/src/toolkit/forms/content-creator-plugin.ts @@ -1,4 +1,4 @@ -import { CMS, Plugin } from '@/core' +import { CMS, Plugin } from '@toolkit/core' import { Field } from './field' import { FormOptions } from './form' diff --git a/packages/@tinacms/toolkit/src/forms/field.ts b/packages/tinacms/src/toolkit/forms/field.ts similarity index 100% rename from packages/@tinacms/toolkit/src/forms/field.ts rename to packages/tinacms/src/toolkit/forms/field.ts diff --git a/packages/@tinacms/toolkit/src/forms/form.test.ts b/packages/tinacms/src/toolkit/forms/form.test.ts similarity index 100% rename from packages/@tinacms/toolkit/src/forms/form.test.ts rename to packages/tinacms/src/toolkit/forms/form.test.ts diff --git a/packages/@tinacms/toolkit/src/forms/form.ts b/packages/tinacms/src/toolkit/forms/form.ts similarity index 99% rename from packages/@tinacms/toolkit/src/forms/form.ts rename to packages/tinacms/src/toolkit/forms/form.ts index 1d145ac3d4..fbc0672cca 100644 --- a/packages/@tinacms/toolkit/src/forms/form.ts +++ b/packages/tinacms/src/toolkit/forms/form.ts @@ -9,7 +9,7 @@ import { getIn, } from 'final-form' import type { FormSubscription } from 'final-form' -import type { Plugin } from '@/core' +import type { Plugin } from '@toolkit/core' import { Field, AnyField } from './field' export type { FormApi } diff --git a/packages/@tinacms/toolkit/src/forms/form.update-values.test.ts b/packages/tinacms/src/toolkit/forms/form.update-values.test.ts similarity index 100% rename from packages/@tinacms/toolkit/src/forms/form.update-values.test.ts rename to packages/tinacms/src/toolkit/forms/form.update-values.test.ts diff --git a/packages/@tinacms/toolkit/src/forms/index.ts b/packages/tinacms/src/toolkit/forms/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/forms/index.ts rename to packages/tinacms/src/toolkit/forms/index.ts diff --git a/packages/@tinacms/toolkit/src/forms/types/react-frame-component.d.ts b/packages/tinacms/src/toolkit/forms/types/react-frame-component.d.ts similarity index 100% rename from packages/@tinacms/toolkit/src/forms/types/react-frame-component.d.ts rename to packages/tinacms/src/toolkit/forms/types/react-frame-component.d.ts diff --git a/packages/@tinacms/toolkit/src/git-client/git-client.ts b/packages/tinacms/src/toolkit/git-client/git-client.ts similarity index 100% rename from packages/@tinacms/toolkit/src/git-client/git-client.ts rename to packages/tinacms/src/toolkit/git-client/git-client.ts diff --git a/packages/@tinacms/toolkit/src/git-client/git-file.ts b/packages/tinacms/src/toolkit/git-client/git-file.ts similarity index 96% rename from packages/@tinacms/toolkit/src/git-client/git-file.ts rename to packages/tinacms/src/toolkit/git-client/git-file.ts index b7bcacdfb6..bd91d178cc 100644 --- a/packages/@tinacms/toolkit/src/git-client/git-file.ts +++ b/packages/tinacms/src/toolkit/git-client/git-file.ts @@ -1,4 +1,4 @@ -import { CMS } from '@/core' +import { CMS } from '@toolkit/core' import { GitClient } from './git-client' export class GitFile { diff --git a/packages/@tinacms/toolkit/src/git-client/git-media-store.ts b/packages/tinacms/src/toolkit/git-client/git-media-store.ts similarity index 98% rename from packages/@tinacms/toolkit/src/git-client/git-media-store.ts rename to packages/tinacms/src/toolkit/git-client/git-media-store.ts index 4a3e6f7c2e..67e4a74992 100644 --- a/packages/@tinacms/toolkit/src/git-client/git-media-store.ts +++ b/packages/tinacms/src/toolkit/git-client/git-media-store.ts @@ -4,7 +4,7 @@ import { Media, MediaListOptions, MediaList, -} from '@/core' +} from '@toolkit/core' import { GitClient } from './git-client' export class GitMediaStore implements MediaStore { diff --git a/packages/@tinacms/toolkit/src/git-client/index.ts b/packages/tinacms/src/toolkit/git-client/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/git-client/index.ts rename to packages/tinacms/src/toolkit/git-client/index.ts diff --git a/packages/@tinacms/toolkit/src/git-client/use-git-file.ts b/packages/tinacms/src/toolkit/git-client/use-git-file.ts similarity index 88% rename from packages/@tinacms/toolkit/src/git-client/use-git-file.ts rename to packages/tinacms/src/toolkit/git-client/use-git-file.ts index 52fddd5cd7..6baadeb69e 100644 --- a/packages/@tinacms/toolkit/src/git-client/use-git-file.ts +++ b/packages/tinacms/src/toolkit/git-client/use-git-file.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { useCMS } from '@/react-core' +import { useCMS } from '@toolkit/react-core' import { GitFile } from './git-file' export function useGitFile( diff --git a/packages/@tinacms/toolkit/src/global.css b/packages/tinacms/src/toolkit/global.css similarity index 100% rename from packages/@tinacms/toolkit/src/global.css rename to packages/tinacms/src/toolkit/global.css diff --git a/packages/@tinacms/toolkit/src/hooks/use-field-reference.ts b/packages/tinacms/src/toolkit/hooks/use-field-reference.ts similarity index 95% rename from packages/@tinacms/toolkit/src/hooks/use-field-reference.ts rename to packages/tinacms/src/toolkit/hooks/use-field-reference.ts index 0ed6c95154..f08ccf9213 100644 --- a/packages/@tinacms/toolkit/src/hooks/use-field-reference.ts +++ b/packages/tinacms/src/toolkit/hooks/use-field-reference.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { MutationSignalContext } from '@/components/mutation-signal' +import { MutationSignalContext } from '@toolkit/components/mutation-signal' /** * If the DOM wrapped by Tina contains an element with a diff --git a/packages/@tinacms/toolkit/src/hooks/use-local-storage.ts b/packages/tinacms/src/toolkit/hooks/use-local-storage.ts similarity index 100% rename from packages/@tinacms/toolkit/src/hooks/use-local-storage.ts rename to packages/tinacms/src/toolkit/hooks/use-local-storage.ts diff --git a/packages/@tinacms/toolkit/src/icons/Add.tsx b/packages/tinacms/src/toolkit/icons/Add.tsx similarity index 70% rename from packages/@tinacms/toolkit/src/icons/Add.tsx rename to packages/tinacms/src/toolkit/icons/Add.tsx index 33ece8ef77..1f7b78d91d 100644 --- a/packages/@tinacms/toolkit/src/icons/Add.tsx +++ b/packages/tinacms/src/toolkit/icons/Add.tsx @@ -13,7 +13,10 @@ export const AddIcon = ({ ...props }) => ( xmlns="http://www.w3.org/2000/svg" {...props} > - + ) diff --git a/packages/@tinacms/toolkit/src/icons/Alert.tsx b/packages/tinacms/src/toolkit/icons/Alert.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Alert.tsx rename to packages/tinacms/src/toolkit/icons/Alert.tsx diff --git a/packages/@tinacms/toolkit/src/icons/AlignCenter.tsx b/packages/tinacms/src/toolkit/icons/AlignCenter.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/AlignCenter.tsx rename to packages/tinacms/src/toolkit/icons/AlignCenter.tsx diff --git a/packages/@tinacms/toolkit/src/icons/AlignLeft.tsx b/packages/tinacms/src/toolkit/icons/AlignLeft.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/AlignLeft.tsx rename to packages/tinacms/src/toolkit/icons/AlignLeft.tsx diff --git a/packages/@tinacms/toolkit/src/icons/AlignRight.tsx b/packages/tinacms/src/toolkit/icons/AlignRight.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/AlignRight.tsx rename to packages/tinacms/src/toolkit/icons/AlignRight.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Bold.tsx b/packages/tinacms/src/toolkit/icons/Bold.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Bold.tsx rename to packages/tinacms/src/toolkit/icons/Bold.tsx diff --git a/packages/@tinacms/toolkit/src/icons/ChevronDown.tsx b/packages/tinacms/src/toolkit/icons/ChevronDown.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/ChevronDown.tsx rename to packages/tinacms/src/toolkit/icons/ChevronDown.tsx diff --git a/packages/@tinacms/toolkit/src/icons/ChevronLeft.tsx b/packages/tinacms/src/toolkit/icons/ChevronLeft.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/ChevronLeft.tsx rename to packages/tinacms/src/toolkit/icons/ChevronLeft.tsx diff --git a/packages/@tinacms/toolkit/src/icons/ChevronRight.tsx b/packages/tinacms/src/toolkit/icons/ChevronRight.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/ChevronRight.tsx rename to packages/tinacms/src/toolkit/icons/ChevronRight.tsx diff --git a/packages/@tinacms/toolkit/src/icons/ChevronUp.tsx b/packages/tinacms/src/toolkit/icons/ChevronUp.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/ChevronUp.tsx rename to packages/tinacms/src/toolkit/icons/ChevronUp.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Circle.tsx b/packages/tinacms/src/toolkit/icons/Circle.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Circle.tsx rename to packages/tinacms/src/toolkit/icons/Circle.tsx diff --git a/packages/@tinacms/toolkit/src/icons/CircleCheck.tsx b/packages/tinacms/src/toolkit/icons/CircleCheck.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/CircleCheck.tsx rename to packages/tinacms/src/toolkit/icons/CircleCheck.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Close.tsx b/packages/tinacms/src/toolkit/icons/Close.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Close.tsx rename to packages/tinacms/src/toolkit/icons/Close.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Code.tsx b/packages/tinacms/src/toolkit/icons/Code.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Code.tsx rename to packages/tinacms/src/toolkit/icons/Code.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Drag.tsx b/packages/tinacms/src/toolkit/icons/Drag.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Drag.tsx rename to packages/tinacms/src/toolkit/icons/Drag.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Duplicate.tsx b/packages/tinacms/src/toolkit/icons/Duplicate.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Duplicate.tsx rename to packages/tinacms/src/toolkit/icons/Duplicate.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Edit.tsx b/packages/tinacms/src/toolkit/icons/Edit.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Edit.tsx rename to packages/tinacms/src/toolkit/icons/Edit.tsx diff --git a/packages/@tinacms/toolkit/src/icons/EllipsisVertical.tsx b/packages/tinacms/src/toolkit/icons/EllipsisVertical.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/EllipsisVertical.tsx rename to packages/tinacms/src/toolkit/icons/EllipsisVertical.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Error.tsx b/packages/tinacms/src/toolkit/icons/Error.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Error.tsx rename to packages/tinacms/src/toolkit/icons/Error.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Exit.tsx b/packages/tinacms/src/toolkit/icons/Exit.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Exit.tsx rename to packages/tinacms/src/toolkit/icons/Exit.tsx diff --git a/packages/@tinacms/toolkit/src/icons/File.tsx b/packages/tinacms/src/toolkit/icons/File.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/File.tsx rename to packages/tinacms/src/toolkit/icons/File.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Folder.tsx b/packages/tinacms/src/toolkit/icons/Folder.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Folder.tsx rename to packages/tinacms/src/toolkit/icons/Folder.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Hamburger.tsx b/packages/tinacms/src/toolkit/icons/Hamburger.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Hamburger.tsx rename to packages/tinacms/src/toolkit/icons/Hamburger.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Heading.tsx b/packages/tinacms/src/toolkit/icons/Heading.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Heading.tsx rename to packages/tinacms/src/toolkit/icons/Heading.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Info.tsx b/packages/tinacms/src/toolkit/icons/Info.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Info.tsx rename to packages/tinacms/src/toolkit/icons/Info.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Italic.tsx b/packages/tinacms/src/toolkit/icons/Italic.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Italic.tsx rename to packages/tinacms/src/toolkit/icons/Italic.tsx diff --git a/packages/@tinacms/toolkit/src/icons/LeftArrow.tsx b/packages/tinacms/src/toolkit/icons/LeftArrow.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/LeftArrow.tsx rename to packages/tinacms/src/toolkit/icons/LeftArrow.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Link.tsx b/packages/tinacms/src/toolkit/icons/Link.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Link.tsx rename to packages/tinacms/src/toolkit/icons/Link.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Lock.tsx b/packages/tinacms/src/toolkit/icons/Lock.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Lock.tsx rename to packages/tinacms/src/toolkit/icons/Lock.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Markdown.tsx b/packages/tinacms/src/toolkit/icons/Markdown.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Markdown.tsx rename to packages/tinacms/src/toolkit/icons/Markdown.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Media.tsx b/packages/tinacms/src/toolkit/icons/Media.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Media.tsx rename to packages/tinacms/src/toolkit/icons/Media.tsx diff --git a/packages/@tinacms/toolkit/src/icons/OrderedList.tsx b/packages/tinacms/src/toolkit/icons/OrderedList.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/OrderedList.tsx rename to packages/tinacms/src/toolkit/icons/OrderedList.tsx diff --git a/packages/@tinacms/toolkit/src/icons/PullRequest.tsx b/packages/tinacms/src/toolkit/icons/PullRequest.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/PullRequest.tsx rename to packages/tinacms/src/toolkit/icons/PullRequest.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Quote.tsx b/packages/tinacms/src/toolkit/icons/Quote.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Quote.tsx rename to packages/tinacms/src/toolkit/icons/Quote.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Redo.tsx b/packages/tinacms/src/toolkit/icons/Redo.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Redo.tsx rename to packages/tinacms/src/toolkit/icons/Redo.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Reorder.tsx b/packages/tinacms/src/toolkit/icons/Reorder.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Reorder.tsx rename to packages/tinacms/src/toolkit/icons/Reorder.tsx diff --git a/packages/@tinacms/toolkit/src/icons/ReorderRow.tsx b/packages/tinacms/src/toolkit/icons/ReorderRow.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/ReorderRow.tsx rename to packages/tinacms/src/toolkit/icons/ReorderRow.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Reset.tsx b/packages/tinacms/src/toolkit/icons/Reset.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Reset.tsx rename to packages/tinacms/src/toolkit/icons/Reset.tsx diff --git a/packages/@tinacms/toolkit/src/icons/RightArrow.tsx b/packages/tinacms/src/toolkit/icons/RightArrow.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/RightArrow.tsx rename to packages/tinacms/src/toolkit/icons/RightArrow.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Settings.tsx b/packages/tinacms/src/toolkit/icons/Settings.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Settings.tsx rename to packages/tinacms/src/toolkit/icons/Settings.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Strikethrough.tsx b/packages/tinacms/src/toolkit/icons/Strikethrough.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Strikethrough.tsx rename to packages/tinacms/src/toolkit/icons/Strikethrough.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Table.tsx b/packages/tinacms/src/toolkit/icons/Table.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Table.tsx rename to packages/tinacms/src/toolkit/icons/Table.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Tina.tsx b/packages/tinacms/src/toolkit/icons/Tina.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Tina.tsx rename to packages/tinacms/src/toolkit/icons/Tina.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Trash.tsx b/packages/tinacms/src/toolkit/icons/Trash.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Trash.tsx rename to packages/tinacms/src/toolkit/icons/Trash.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Underline.tsx b/packages/tinacms/src/toolkit/icons/Underline.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Underline.tsx rename to packages/tinacms/src/toolkit/icons/Underline.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Undo.tsx b/packages/tinacms/src/toolkit/icons/Undo.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Undo.tsx rename to packages/tinacms/src/toolkit/icons/Undo.tsx diff --git a/packages/@tinacms/toolkit/src/icons/UnorderedList.tsx b/packages/tinacms/src/toolkit/icons/UnorderedList.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/UnorderedList.tsx rename to packages/tinacms/src/toolkit/icons/UnorderedList.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Upload.tsx b/packages/tinacms/src/toolkit/icons/Upload.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Upload.tsx rename to packages/tinacms/src/toolkit/icons/Upload.tsx diff --git a/packages/@tinacms/toolkit/src/icons/Warning.tsx b/packages/tinacms/src/toolkit/icons/Warning.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/icons/Warning.tsx rename to packages/tinacms/src/toolkit/icons/Warning.tsx diff --git a/packages/@tinacms/toolkit/src/icons/index.ts b/packages/tinacms/src/toolkit/icons/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/icons/index.ts rename to packages/tinacms/src/toolkit/icons/index.ts diff --git a/packages/@tinacms/toolkit/src/index.ts b/packages/tinacms/src/toolkit/index.ts similarity index 50% rename from packages/@tinacms/toolkit/src/index.ts rename to packages/tinacms/src/toolkit/index.ts index 82d8f99a46..93d9d17113 100644 --- a/packages/@tinacms/toolkit/src/index.ts +++ b/packages/tinacms/src/toolkit/index.ts @@ -1,45 +1,54 @@ /** * Export @tinacms internal packages */ -export * from '@/react-modals' +export * from '@toolkit/react-modals' export type { Media, MediaUploadOptions, MediaStore, MediaListOptions, MediaList, -} from '@/core' -export { MdxFieldPluginExtendible } from '@/fields/plugins/mdx-field-plugin' +} from '@toolkit/core' +export { MdxFieldPluginExtendible } from '@toolkit/fields/plugins/mdx-field-plugin' +export type { CloudConfigPlugin } from '@toolkit/react-cloud-config' +export type { Plugin } from '@toolkit/core' export { MediaManager, MediaListError, EventBus, DummyMediaStore, TinaMediaStore, -} from '@/core' -export * from '@/alerts' -export * from '@/styles' -export { useScreenPlugin } from '@/react-screens' -export type { ScreenPlugin } from '@/react-screens' -export * from '@/fields' -export * from '@/form-builder' -export type { ContentCreatorPlugin as AddContentPlugin } from '@/forms' -export type { ContentCreatorPlugin } from '@/forms' +} from '@toolkit/core' +export * from '@toolkit/alerts' +export * from '@toolkit/styles' +export { useScreenPlugin } from '@toolkit/react-screens' +export type { ScreenPlugin } from '@toolkit/react-screens' +export * from '@toolkit/fields' +export * from '@toolkit/form-builder' +export type { ContentCreatorPlugin as AddContentPlugin } from '@toolkit/forms' +export type { ContentCreatorPlugin } from '@toolkit/forms' export type { TinaState } from './tina-state' -export * from '@/forms' -export * from '@/icons' -export * from '@/react-dismissible' -export { Nav, LocalWarning, BillingWarning, SyncStatus } from '@/react-sidebar' +export * from '@toolkit/forms' +export * from '@toolkit/icons' +export * from '@toolkit/react-dismissible' +export { + Nav, + LocalWarning, + BillingWarning, + SyncStatus, +} from '@toolkit/react-sidebar' + +export { useCMS } from '@toolkit/react-core' /** * Custom `tinacms` things */ -export * from './react-tinacms' +// export * from './react-tinacms' export { TinaCMS } from './tina-cms' export type { TinaCMSConfig } from './tina-cms' -export { GlobalFormPlugin } from '@/plugin-screens' -export { FormMetaPlugin } from '@/plugin-form-meta' -export * from '@/plugin-branch-switcher' +export { GlobalFormPlugin } from '@toolkit/plugin-screens' +export { FormMetaPlugin } from '@toolkit/plugin-form-meta' +export * from '@toolkit/plugin-branch-switcher' export { TinaProvider, // Deprecated aliases to the previous exports diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/README.md b/packages/tinacms/src/toolkit/plugin-branch-switcher/README.md similarity index 100% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/README.md rename to packages/tinacms/src/toolkit/plugin-branch-switcher/README.md diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-banner.tsx b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-banner.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-banner.tsx rename to packages/tinacms/src/toolkit/plugin-branch-switcher/branch-banner.tsx index b762118d52..5ab0bec9db 100644 --- a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-banner.tsx +++ b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-banner.tsx @@ -7,9 +7,9 @@ import { } from 'react-icons/bi' import { useBranchData } from './branch-data' import { BranchModal } from './branch-modal' -import { Button } from '@/styles' +import { Button } from '@toolkit/styles' import { useWindowWidth } from '@react-hook/window-size' -import { useCMS } from '@/react-tinacms/use-cms' +import { useCMS } from '@toolkit/react-tinacms/use-cms' // trim 'tina/' prefix from branch name const trimPrefix = (branchName: string) => { diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-button.tsx b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-button.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-button.tsx rename to packages/tinacms/src/toolkit/plugin-branch-switcher/branch-button.tsx index 1b132b7a24..156708e395 100644 --- a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-button.tsx +++ b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-button.tsx @@ -2,7 +2,7 @@ import * as React from 'react' import { BiChevronDown, BiGitBranch, BiLockAlt } from 'react-icons/bi' import { useBranchData } from './branch-data' import { BranchModal } from './branch-modal' -import { useCMS } from '@/react-tinacms' +import { useCMS } from '@toolkit/react-tinacms' // trim 'tina/' prefix from branch name const trimPrefix = (branchName: string) => { diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-data.tsx b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-data.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-data.tsx rename to packages/tinacms/src/toolkit/plugin-branch-switcher/branch-data.tsx index f1794b8866..672d7c1df8 100644 --- a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-data.tsx +++ b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-data.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { BranchChangeEvent } from './types' -import { useEvent } from '@/react-core' +import { useEvent } from '@toolkit/react-core' export interface BranchContextData { currentBranch: string diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-modal.tsx b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-modal.tsx similarity index 86% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-modal.tsx rename to packages/tinacms/src/toolkit/plugin-branch-switcher/branch-modal.tsx index 10a444c0bf..30fd6080c7 100644 --- a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-modal.tsx +++ b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-modal.tsx @@ -1,6 +1,11 @@ import * as React from 'react' -import { Modal, ModalBody, ModalHeader, PopupModal } from '@/react-modals' -import { useCMS } from '@/react-tinacms' +import { + Modal, + ModalBody, + ModalHeader, + PopupModal, +} from '@toolkit/react-modals' +import { useCMS } from '@toolkit/react-tinacms' import { useBranchData } from './branch-data' import { BranchSwitcher } from './branch-switcher' diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher-legacy.tsx b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher-legacy.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher-legacy.tsx rename to packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher-legacy.tsx index 6bb7d3465e..ce69d57fd1 100644 --- a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher-legacy.tsx +++ b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher-legacy.tsx @@ -1,9 +1,9 @@ import * as React from 'react' import { BranchSwitcherProps, Branch } from './types' import { useBranchData } from './branch-data' -import { BaseTextField, Input } from '@/fields' -import { Button } from '@/styles' -import { LoadingDots } from '@/form-builder' +import { BaseTextField, Input } from '@toolkit/fields' +import { Button } from '@toolkit/styles' +import { LoadingDots } from '@toolkit/form-builder' import { BiError, BiGitBranch, @@ -15,7 +15,7 @@ import { GrCircleQuestion } from 'react-icons/gr' import { MdArrowForward, MdOutlineClear } from 'react-icons/md' import { AiFillWarning } from 'react-icons/ai' import { FaSpinner } from 'react-icons/fa' -import { useCMS } from '@/react-core' +import { useCMS } from '@toolkit/react-core' type ListState = 'loading' | 'ready' | 'error' diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.test.tsx b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher.test.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.test.tsx rename to packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher.test.tsx diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.tsx b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.tsx rename to packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher.tsx index a0ac5b7652..f562d1c3eb 100644 --- a/packages/@tinacms/toolkit/src/plugin-branch-switcher/branch-switcher.tsx +++ b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher.tsx @@ -1,9 +1,9 @@ import * as React from 'react' import { BranchSwitcherProps, Branch } from './types' import { useBranchData } from './branch-data' -import { BaseTextField, FieldLabel, Select } from '@/fields' -import { Button, OverflowMenu } from '@/styles' -import { LoadingDots, PrefixedTextField } from '@/form-builder' +import { BaseTextField, FieldLabel, Select } from '@toolkit/fields' +import { Button, OverflowMenu } from '@toolkit/styles' +import { LoadingDots, PrefixedTextField } from '@toolkit/form-builder' import { BiError, BiGitBranch, @@ -17,7 +17,7 @@ import { GrCircleQuestion } from 'react-icons/gr' import { MdArrowForward, MdOutlineClear } from 'react-icons/md' import { AiFillWarning } from 'react-icons/ai' import { FaSpinner } from 'react-icons/fa' -import { useCMS } from '@/react-core' +import { useCMS } from '@toolkit/react-core' import { BranchSwitcherLegacy } from './branch-switcher-legacy' import { formatDistanceToNow } from 'date-fns' diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/index.ts b/packages/tinacms/src/toolkit/plugin-branch-switcher/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/index.ts rename to packages/tinacms/src/toolkit/plugin-branch-switcher/index.ts diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/plugin.tsx b/packages/tinacms/src/toolkit/plugin-branch-switcher/plugin.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/plugin.tsx rename to packages/tinacms/src/toolkit/plugin-branch-switcher/plugin.tsx index dbb9b3feb2..9e7eb61c59 100644 --- a/packages/@tinacms/toolkit/src/plugin-branch-switcher/plugin.tsx +++ b/packages/tinacms/src/toolkit/plugin-branch-switcher/plugin.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { BiGitRepoForked } from 'react-icons/bi' -import { ScreenPlugin } from '@/react-screens' +import { ScreenPlugin } from '@toolkit/react-screens' import { BranchSwitcher } from './branch-switcher' import { BranchSwitcherProps } from './types' diff --git a/packages/@tinacms/toolkit/src/plugin-branch-switcher/types.ts b/packages/tinacms/src/toolkit/plugin-branch-switcher/types.ts similarity index 100% rename from packages/@tinacms/toolkit/src/plugin-branch-switcher/types.ts rename to packages/tinacms/src/toolkit/plugin-branch-switcher/types.ts diff --git a/packages/@tinacms/toolkit/src/plugin-fields/index.ts b/packages/tinacms/src/toolkit/plugin-fields/index.ts similarity index 92% rename from packages/@tinacms/toolkit/src/plugin-fields/index.ts rename to packages/tinacms/src/toolkit/plugin-fields/index.ts index 6c15b53828..ff4cea10ca 100644 --- a/packages/@tinacms/toolkit/src/plugin-fields/index.ts +++ b/packages/tinacms/src/toolkit/plugin-fields/index.ts @@ -12,4 +12,4 @@ export { DateFieldPlugin, CheckboxGroupFieldPlugin, ReferenceFieldPlugin, -} from '@/fields' +} from '@toolkit/fields' diff --git a/packages/@tinacms/toolkit/src/plugin-fields/markdown.tsx b/packages/tinacms/src/toolkit/plugin-fields/markdown.tsx similarity index 96% rename from packages/@tinacms/toolkit/src/plugin-fields/markdown.tsx rename to packages/tinacms/src/toolkit/plugin-fields/markdown.tsx index 473d4aeed1..cb0fefa0e2 100644 --- a/packages/@tinacms/toolkit/src/plugin-fields/markdown.tsx +++ b/packages/tinacms/src/toolkit/plugin-fields/markdown.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { FieldMeta } from '@/fields' +import { FieldMeta } from '@toolkit/fields' export const MarkdownFieldPlaceholder = { __type: 'field', diff --git a/packages/@tinacms/toolkit/src/plugin-form-meta/index.tsx b/packages/tinacms/src/toolkit/plugin-form-meta/index.tsx similarity index 84% rename from packages/@tinacms/toolkit/src/plugin-form-meta/index.tsx rename to packages/tinacms/src/toolkit/plugin-form-meta/index.tsx index aa219e3259..d6395a5862 100644 --- a/packages/@tinacms/toolkit/src/plugin-form-meta/index.tsx +++ b/packages/tinacms/src/toolkit/plugin-form-meta/index.tsx @@ -1,4 +1,4 @@ -import { Plugin } from '@/core' +import { Plugin } from '@toolkit/core' export class FormMetaPlugin implements Plugin { __type: string = 'form:meta' diff --git a/packages/@tinacms/toolkit/src/plugin-screens/index.tsx b/packages/tinacms/src/toolkit/plugin-screens/index.tsx similarity index 79% rename from packages/@tinacms/toolkit/src/plugin-screens/index.tsx rename to packages/tinacms/src/toolkit/plugin-screens/index.tsx index 1d647740e7..30d7fdb44f 100644 --- a/packages/@tinacms/toolkit/src/plugin-screens/index.tsx +++ b/packages/tinacms/src/toolkit/plugin-screens/index.tsx @@ -6,10 +6,10 @@ import * as React from 'react' import { MdOutlineSettings } from 'react-icons/md' -import { Form } from '@/forms' -import { ScreenPlugin } from '@/react-screens' -import { FormBuilder } from '@/form-builder' -import { useCMS } from '@/react-tinacms' +import { Form } from '@toolkit/forms' +import { ScreenPlugin } from '@toolkit/react-screens' +import { FormBuilder } from '@toolkit/form-builder' +import { useCMS } from '@toolkit/react-tinacms' export class GlobalFormPlugin implements ScreenPlugin { __type: ScreenPlugin['__type'] = 'screen' diff --git a/packages/@tinacms/toolkit/src/plugin-screens/media-manager-screen.tsx b/packages/tinacms/src/toolkit/plugin-screens/media-manager-screen.tsx similarity index 67% rename from packages/@tinacms/toolkit/src/plugin-screens/media-manager-screen.tsx rename to packages/tinacms/src/toolkit/plugin-screens/media-manager-screen.tsx index 516c127519..e126c13740 100644 --- a/packages/@tinacms/toolkit/src/plugin-screens/media-manager-screen.tsx +++ b/packages/tinacms/src/toolkit/plugin-screens/media-manager-screen.tsx @@ -1,6 +1,6 @@ import { MdOutlinePhotoLibrary } from 'react-icons/md' -import { createScreen } from '@/react-screens' -import { MediaPicker } from '@/components/media/media-manager' +import { createScreen } from '@toolkit/react-screens' +import { MediaPicker } from '@toolkit/components/media/media-manager' export const MediaManagerScreenPlugin = createScreen({ name: 'Media Manager', diff --git a/packages/@tinacms/toolkit/src/preflight.css b/packages/tinacms/src/toolkit/preflight.css similarity index 100% rename from packages/@tinacms/toolkit/src/preflight.css rename to packages/tinacms/src/toolkit/preflight.css diff --git a/packages/@tinacms/toolkit/src/react-alerts/alerts.test.tsx b/packages/tinacms/src/toolkit/react-alerts/alerts.test.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-alerts/alerts.test.tsx rename to packages/tinacms/src/toolkit/react-alerts/alerts.test.tsx diff --git a/packages/@tinacms/toolkit/src/react-alerts/alerts.tsx b/packages/tinacms/src/toolkit/react-alerts/alerts.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/react-alerts/alerts.tsx rename to packages/tinacms/src/toolkit/react-alerts/alerts.tsx index d4f9161060..cc97d4e6dd 100644 --- a/packages/@tinacms/toolkit/src/react-alerts/alerts.tsx +++ b/packages/tinacms/src/toolkit/react-alerts/alerts.tsx @@ -1,14 +1,14 @@ import React from 'react' -import { Alerts as AlertsCollection, AlertLevel } from '@/alerts' -import { useSubscribable } from '@/react-core' +import { Alerts as AlertsCollection, AlertLevel } from '@toolkit/alerts' +import { useSubscribable } from '@toolkit/react-core' import { Modal, ModalActions, ModalBody, ModalHeader, PopupModal, -} from '@/react-modals' -import { Button } from '@/styles' +} from '@toolkit/react-modals' +import { Button } from '@toolkit/styles' import { BiCheckCircle, BiError, BiInfoCircle, BiX } from 'react-icons/bi' export interface AlertsProps { diff --git a/packages/@tinacms/toolkit/src/react-alerts/index.ts b/packages/tinacms/src/toolkit/react-alerts/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-alerts/index.ts rename to packages/tinacms/src/toolkit/react-alerts/index.ts diff --git a/packages/@tinacms/toolkit/src/react-cloud-config/cloud-config-plugin.tsx b/packages/tinacms/src/toolkit/react-cloud-config/cloud-config-plugin.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/react-cloud-config/cloud-config-plugin.tsx rename to packages/tinacms/src/toolkit/react-cloud-config/cloud-config-plugin.tsx index 023dc3588b..d4689809a5 100644 --- a/packages/@tinacms/toolkit/src/react-cloud-config/cloud-config-plugin.tsx +++ b/packages/tinacms/src/toolkit/react-cloud-config/cloud-config-plugin.tsx @@ -1,6 +1,6 @@ import { MdOutlineCloud } from 'react-icons/md' -import { Plugin } from '@/core' +import { Plugin } from '@toolkit/core' /** * Represents a Tina Cloud Config that should be accessible via the CMS. diff --git a/packages/@tinacms/toolkit/src/react-cloud-config/index.ts b/packages/tinacms/src/toolkit/react-cloud-config/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-cloud-config/index.ts rename to packages/tinacms/src/toolkit/react-cloud-config/index.ts diff --git a/packages/@tinacms/toolkit/src/react-cloud-config/use-cloud-config-plugin.tsx b/packages/tinacms/src/toolkit/react-cloud-config/use-cloud-config-plugin.tsx similarity index 86% rename from packages/@tinacms/toolkit/src/react-cloud-config/use-cloud-config-plugin.tsx rename to packages/tinacms/src/toolkit/react-cloud-config/use-cloud-config-plugin.tsx index 34091199d5..4fd875ab58 100644 --- a/packages/@tinacms/toolkit/src/react-cloud-config/use-cloud-config-plugin.tsx +++ b/packages/tinacms/src/toolkit/react-cloud-config/use-cloud-config-plugin.tsx @@ -1,4 +1,4 @@ -import { usePlugins } from '@/react-core' +import { usePlugins } from '@toolkit/react-core' import { useMemo, DependencyList } from 'react' import { createCloudConfig, CloudConfigOptions } from './cloud-config-plugin' diff --git a/packages/@tinacms/toolkit/src/react-core/index.ts b/packages/tinacms/src/toolkit/react-core/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-core/index.ts rename to packages/tinacms/src/toolkit/react-core/index.ts diff --git a/packages/@tinacms/toolkit/src/react-core/tina-error-boundary.tsx b/packages/tinacms/src/toolkit/react-core/tina-error-boundary.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-core/tina-error-boundary.tsx rename to packages/tinacms/src/toolkit/react-core/tina-error-boundary.tsx diff --git a/packages/@tinacms/toolkit/src/react-core/use-cms-event.ts b/packages/tinacms/src/toolkit/react-core/use-cms-event.ts similarity index 93% rename from packages/@tinacms/toolkit/src/react-core/use-cms-event.ts rename to packages/tinacms/src/toolkit/react-core/use-cms-event.ts index 862b232710..85dbc61c27 100644 --- a/packages/@tinacms/toolkit/src/react-core/use-cms-event.ts +++ b/packages/tinacms/src/toolkit/react-core/use-cms-event.ts @@ -1,5 +1,5 @@ import * as React from 'react' -import { Callback, CMSEvent } from '@/core' +import { Callback, CMSEvent } from '@toolkit/core' import { useCMS } from './use-cms' export function useCMSEvent( diff --git a/packages/@tinacms/toolkit/src/react-core/use-cms.ts b/packages/tinacms/src/toolkit/react-core/use-cms.ts similarity index 87% rename from packages/@tinacms/toolkit/src/react-core/use-cms.ts rename to packages/tinacms/src/toolkit/react-core/use-cms.ts index 1fba23716f..92588292ee 100644 --- a/packages/@tinacms/toolkit/src/react-core/use-cms.ts +++ b/packages/tinacms/src/toolkit/react-core/use-cms.ts @@ -1,6 +1,6 @@ import * as React from 'react' -import { TinaAction, TinaState } from '@/tina-state' -import { TinaCMS } from '@/tina-cms' +import { TinaAction, TinaState } from '@toolkit/tina-state' +import { TinaCMS } from '@toolkit/tina-cms' export const ERROR_MISSING_CMS = `useCMS could not find an instance of CMS` diff --git a/packages/@tinacms/toolkit/src/react-core/use-form.ts b/packages/tinacms/src/toolkit/react-core/use-form.ts similarity index 98% rename from packages/@tinacms/toolkit/src/react-core/use-form.ts rename to packages/tinacms/src/toolkit/react-core/use-form.ts index 190810f035..fb7222b574 100644 --- a/packages/@tinacms/toolkit/src/react-core/use-form.ts +++ b/packages/tinacms/src/toolkit/react-core/use-form.ts @@ -1,4 +1,4 @@ -import { FormOptions, Form, Field } from '@/forms' +import { FormOptions, Form, Field } from '@toolkit/forms' import * as React from 'react' import { usePlugins } from './use-plugin' import { useCMSEvent } from './use-cms-event' diff --git a/packages/@tinacms/toolkit/src/react-core/use-plugin.tsx b/packages/tinacms/src/toolkit/react-core/use-plugin.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/react-core/use-plugin.tsx rename to packages/tinacms/src/toolkit/react-core/use-plugin.tsx index 3fe3f277f9..fd23422aa8 100644 --- a/packages/@tinacms/toolkit/src/react-core/use-plugin.tsx +++ b/packages/tinacms/src/toolkit/react-core/use-plugin.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Plugin } from '@/core' +import { Plugin } from '@toolkit/core' import { useCMS } from './use-cms' /** diff --git a/packages/@tinacms/toolkit/src/react-core/use-subscribable.tsx b/packages/tinacms/src/toolkit/react-core/use-subscribable.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-core/use-subscribable.tsx rename to packages/tinacms/src/toolkit/react-core/use-subscribable.tsx diff --git a/packages/@tinacms/toolkit/src/react-core/use-watch-form-values.ts b/packages/tinacms/src/toolkit/react-core/use-watch-form-values.ts similarity index 94% rename from packages/@tinacms/toolkit/src/react-core/use-watch-form-values.ts rename to packages/tinacms/src/toolkit/react-core/use-watch-form-values.ts index 4d95760a06..288f9ca57d 100644 --- a/packages/@tinacms/toolkit/src/react-core/use-watch-form-values.ts +++ b/packages/tinacms/src/toolkit/react-core/use-watch-form-values.ts @@ -1,4 +1,4 @@ -import { Form } from '@/forms' +import { Form } from '@toolkit/forms' import { FormSubscriber } from 'final-form' import { useEffect } from 'react' diff --git a/packages/@tinacms/toolkit/src/react-core/with-plugin.tsx b/packages/tinacms/src/toolkit/react-core/with-plugin.tsx similarity index 93% rename from packages/@tinacms/toolkit/src/react-core/with-plugin.tsx rename to packages/tinacms/src/toolkit/react-core/with-plugin.tsx index 755d263892..a4584d6280 100644 --- a/packages/@tinacms/toolkit/src/react-core/with-plugin.tsx +++ b/packages/tinacms/src/toolkit/react-core/with-plugin.tsx @@ -1,4 +1,4 @@ -import { Plugin } from '@/core' +import { Plugin } from '@toolkit/core' import { usePlugin } from './use-plugin' import * as React from 'react' diff --git a/packages/@tinacms/toolkit/src/react-datetime/DateTime.jsx b/packages/tinacms/src/toolkit/react-datetime/DateTime.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-datetime/DateTime.jsx rename to packages/tinacms/src/toolkit/react-datetime/DateTime.jsx diff --git a/packages/@tinacms/toolkit/src/react-datetime/parts/ViewNavigation.jsx b/packages/tinacms/src/toolkit/react-datetime/parts/ViewNavigation.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-datetime/parts/ViewNavigation.jsx rename to packages/tinacms/src/toolkit/react-datetime/parts/ViewNavigation.jsx diff --git a/packages/@tinacms/toolkit/src/react-datetime/views/DaysView.jsx b/packages/tinacms/src/toolkit/react-datetime/views/DaysView.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-datetime/views/DaysView.jsx rename to packages/tinacms/src/toolkit/react-datetime/views/DaysView.jsx diff --git a/packages/@tinacms/toolkit/src/react-datetime/views/MonthsView.jsx b/packages/tinacms/src/toolkit/react-datetime/views/MonthsView.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-datetime/views/MonthsView.jsx rename to packages/tinacms/src/toolkit/react-datetime/views/MonthsView.jsx diff --git a/packages/@tinacms/toolkit/src/react-datetime/views/TimeView.jsx b/packages/tinacms/src/toolkit/react-datetime/views/TimeView.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-datetime/views/TimeView.jsx rename to packages/tinacms/src/toolkit/react-datetime/views/TimeView.jsx diff --git a/packages/@tinacms/toolkit/src/react-datetime/views/YearsView.jsx b/packages/tinacms/src/toolkit/react-datetime/views/YearsView.jsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-datetime/views/YearsView.jsx rename to packages/tinacms/src/toolkit/react-datetime/views/YearsView.jsx diff --git a/packages/@tinacms/toolkit/src/react-dismissible/dismissible.tsx b/packages/tinacms/src/toolkit/react-dismissible/dismissible.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-dismissible/dismissible.tsx rename to packages/tinacms/src/toolkit/react-dismissible/dismissible.tsx diff --git a/packages/@tinacms/toolkit/src/react-dismissible/index.ts b/packages/tinacms/src/toolkit/react-dismissible/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-dismissible/index.ts rename to packages/tinacms/src/toolkit/react-dismissible/index.ts diff --git a/packages/@tinacms/toolkit/src/react-forms/form-modal.tsx b/packages/tinacms/src/toolkit/react-forms/form-modal.tsx similarity index 81% rename from packages/@tinacms/toolkit/src/react-forms/form-modal.tsx rename to packages/tinacms/src/toolkit/react-forms/form-modal.tsx index 62048ca542..3a8f7265b1 100644 --- a/packages/@tinacms/toolkit/src/react-forms/form-modal.tsx +++ b/packages/tinacms/src/toolkit/react-forms/form-modal.tsx @@ -1,9 +1,14 @@ import * as React from 'react' -import { Modal, ModalHeader, ModalBody, PopupModal } from '@/react-modals' -import { FormBuilder } from '@/form-builder' +import { + Modal, + ModalHeader, + ModalBody, + PopupModal, +} from '@toolkit/react-modals' +import { FormBuilder } from '@toolkit/form-builder' import { useMemo } from 'react' -import { Form } from '@/forms' -import { useCMS } from '@/react-core' +import { Form } from '@toolkit/forms' +import { useCMS } from '@toolkit/react-core' // Pretty sure this isn't used anymore export const FormModal = ({ plugin, close }: any) => { diff --git a/packages/@tinacms/toolkit/src/react-forms/index.ts b/packages/tinacms/src/toolkit/react-forms/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-forms/index.ts rename to packages/tinacms/src/toolkit/react-forms/index.ts diff --git a/packages/@tinacms/toolkit/src/react-modals/fullscreen-modal.tsx b/packages/tinacms/src/toolkit/react-modals/fullscreen-modal.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-modals/fullscreen-modal.tsx rename to packages/tinacms/src/toolkit/react-modals/fullscreen-modal.tsx diff --git a/packages/@tinacms/toolkit/src/react-modals/index.ts b/packages/tinacms/src/toolkit/react-modals/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-modals/index.ts rename to packages/tinacms/src/toolkit/react-modals/index.ts diff --git a/packages/@tinacms/toolkit/src/react-modals/modal-provider.tsx b/packages/tinacms/src/toolkit/react-modals/modal-provider.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-modals/modal-provider.tsx rename to packages/tinacms/src/toolkit/react-modals/modal-provider.tsx diff --git a/packages/@tinacms/toolkit/src/react-modals/modal/index.ts b/packages/tinacms/src/toolkit/react-modals/modal/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-modals/modal/index.ts rename to packages/tinacms/src/toolkit/react-modals/modal/index.ts diff --git a/packages/@tinacms/toolkit/src/react-modals/modal/modal-actions.tsx b/packages/tinacms/src/toolkit/react-modals/modal/modal-actions.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-modals/modal/modal-actions.tsx rename to packages/tinacms/src/toolkit/react-modals/modal/modal-actions.tsx diff --git a/packages/@tinacms/toolkit/src/react-modals/modal/modal-body.tsx b/packages/tinacms/src/toolkit/react-modals/modal/modal-body.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-modals/modal/modal-body.tsx rename to packages/tinacms/src/toolkit/react-modals/modal/modal-body.tsx diff --git a/packages/@tinacms/toolkit/src/react-modals/modal/modal-header.tsx b/packages/tinacms/src/toolkit/react-modals/modal/modal-header.tsx similarity index 95% rename from packages/@tinacms/toolkit/src/react-modals/modal/modal-header.tsx rename to packages/tinacms/src/toolkit/react-modals/modal/modal-header.tsx index cc7e52d32b..0aaf8617da 100644 --- a/packages/@tinacms/toolkit/src/react-modals/modal/modal-header.tsx +++ b/packages/tinacms/src/toolkit/react-modals/modal/modal-header.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { CloseIcon } from '@/icons' +import { CloseIcon } from '@toolkit/icons' export interface ModalHeaderProps { children: React.ReactChild | React.ReactChild[] diff --git a/packages/@tinacms/toolkit/src/react-modals/modal/modal-overlay.tsx b/packages/tinacms/src/toolkit/react-modals/modal/modal-overlay.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-modals/modal/modal-overlay.tsx rename to packages/tinacms/src/toolkit/react-modals/modal/modal-overlay.tsx diff --git a/packages/@tinacms/toolkit/src/react-modals/modal/modal.tsx b/packages/tinacms/src/toolkit/react-modals/modal/modal.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-modals/modal/modal.tsx rename to packages/tinacms/src/toolkit/react-modals/modal/modal.tsx diff --git a/packages/@tinacms/toolkit/src/react-modals/popup-modal.tsx b/packages/tinacms/src/toolkit/react-modals/popup-modal.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/react-modals/popup-modal.tsx rename to packages/tinacms/src/toolkit/react-modals/popup-modal.tsx diff --git a/packages/@tinacms/toolkit/src/react-screens/components/screen-plugin-modal.tsx b/packages/tinacms/src/toolkit/react-screens/components/screen-plugin-modal.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/react-screens/components/screen-plugin-modal.tsx rename to packages/tinacms/src/toolkit/react-screens/components/screen-plugin-modal.tsx index 7c2643351b..12677346fd 100644 --- a/packages/@tinacms/toolkit/src/react-screens/components/screen-plugin-modal.tsx +++ b/packages/tinacms/src/toolkit/react-screens/components/screen-plugin-modal.tsx @@ -6,7 +6,7 @@ import { ModalBody, ModalFullscreen, ModalPopup, -} from '@/react-modals' +} from '@toolkit/react-modals' import { ScreenPlugin } from '../screen-plugin' export interface ScreenPluginModalProps { diff --git a/packages/@tinacms/toolkit/src/react-screens/index.ts b/packages/tinacms/src/toolkit/react-screens/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-screens/index.ts rename to packages/tinacms/src/toolkit/react-screens/index.ts diff --git a/packages/@tinacms/toolkit/src/react-screens/screen-plugin.tsx b/packages/tinacms/src/toolkit/react-screens/screen-plugin.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/react-screens/screen-plugin.tsx rename to packages/tinacms/src/toolkit/react-screens/screen-plugin.tsx index e8773d3c1c..c461c882ca 100644 --- a/packages/@tinacms/toolkit/src/react-screens/screen-plugin.tsx +++ b/packages/tinacms/src/toolkit/react-screens/screen-plugin.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { Plugin } from '@/core' +import { Plugin } from '@toolkit/core' /** * Represents a Screen that should be accessible via the CMS. diff --git a/packages/@tinacms/toolkit/src/react-screens/use-screen-plugin.tsx b/packages/tinacms/src/toolkit/react-screens/use-screen-plugin.tsx similarity index 85% rename from packages/@tinacms/toolkit/src/react-screens/use-screen-plugin.tsx rename to packages/tinacms/src/toolkit/react-screens/use-screen-plugin.tsx index 636bdd0480..33cef0f00c 100644 --- a/packages/@tinacms/toolkit/src/react-screens/use-screen-plugin.tsx +++ b/packages/tinacms/src/toolkit/react-screens/use-screen-plugin.tsx @@ -1,4 +1,4 @@ -import { usePlugins } from '@/react-core' +import { usePlugins } from '@toolkit/react-core' import { useMemo, DependencyList } from 'react' import { createScreen, ScreenOptions } from './screen-plugin' diff --git a/packages/@tinacms/toolkit/src/react-sidebar/components/form-list.tsx b/packages/tinacms/src/toolkit/react-sidebar/components/form-list.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/react-sidebar/components/form-list.tsx rename to packages/tinacms/src/toolkit/react-sidebar/components/form-list.tsx index c454a51c9a..e5e69bc911 100644 --- a/packages/@tinacms/toolkit/src/react-sidebar/components/form-list.tsx +++ b/packages/tinacms/src/toolkit/react-sidebar/components/form-list.tsx @@ -1,8 +1,8 @@ import * as React from 'react' import { BiEdit } from 'react-icons/bi' import { Transition } from '@headlessui/react' -import { TinaState } from '@/tina-state' -import { useCMS } from '@/react-tinacms' +import { TinaState } from '@toolkit/tina-state' +import { useCMS } from '@toolkit/react-tinacms' type FormListItem = TinaState['formLists'][number]['items'][number] diff --git a/packages/@tinacms/toolkit/src/react-sidebar/components/local-warning.tsx b/packages/tinacms/src/toolkit/react-sidebar/components/local-warning.tsx similarity index 98% rename from packages/@tinacms/toolkit/src/react-sidebar/components/local-warning.tsx rename to packages/tinacms/src/toolkit/react-sidebar/components/local-warning.tsx index 4008da7803..452632af2c 100644 --- a/packages/@tinacms/toolkit/src/react-sidebar/components/local-warning.tsx +++ b/packages/tinacms/src/toolkit/react-sidebar/components/local-warning.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { AiFillWarning } from 'react-icons/ai' import { BiError, BiRightArrowAlt } from 'react-icons/bi' -import { useCMS } from '@/react-core' +import { useCMS } from '@toolkit/react-core' export const LocalWarning = () => { return ( diff --git a/packages/@tinacms/toolkit/src/react-sidebar/components/nav.tsx b/packages/tinacms/src/toolkit/react-sidebar/components/nav.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/react-sidebar/components/nav.tsx rename to packages/tinacms/src/toolkit/react-sidebar/components/nav.tsx index c42521af17..a44aa0600e 100644 --- a/packages/@tinacms/toolkit/src/react-sidebar/components/nav.tsx +++ b/packages/tinacms/src/toolkit/react-sidebar/components/nav.tsx @@ -4,12 +4,12 @@ import { FiMoreVertical, FiInfo } from 'react-icons/fi' import { VscNewFile } from 'react-icons/vsc' import { Menu, Transition } from '@headlessui/react' import { updateBodyDisplacement } from './sidebar' -import { FormModal } from '@/react-forms' +import { FormModal } from '@toolkit/react-forms' import { useEditState } from '@tinacms/sharedctx' -import type { ScreenPlugin } from '@/react-screens' +import type { ScreenPlugin } from '@toolkit/react-screens' import { SyncStatus, SyncErrorWidget, SyncStatusModal } from './sync-status' -import { useCMS } from '@/react-core' -import { CloudConfigPlugin } from '@/react-cloud-config' +import { useCMS } from '@toolkit/react-core' +import { CloudConfigPlugin } from '@toolkit/react-cloud-config' interface NavProps { isLocalMode: boolean diff --git a/packages/@tinacms/toolkit/src/react-sidebar/components/no-forms-placeholder.tsx b/packages/tinacms/src/toolkit/react-sidebar/components/no-forms-placeholder.tsx similarity index 94% rename from packages/@tinacms/toolkit/src/react-sidebar/components/no-forms-placeholder.tsx rename to packages/tinacms/src/toolkit/react-sidebar/components/no-forms-placeholder.tsx index ee109f9a47..f484d29d3a 100644 --- a/packages/@tinacms/toolkit/src/react-sidebar/components/no-forms-placeholder.tsx +++ b/packages/tinacms/src/toolkit/react-sidebar/components/no-forms-placeholder.tsx @@ -5,8 +5,8 @@ */ import * as React from 'react' -import { LoadingDots } from '@/form-builder' -import { Button } from '@/styles' +import { LoadingDots } from '@toolkit/form-builder' +import { Button } from '@toolkit/styles' export const PendingFormsPlaceholder = () => (
    (null) diff --git a/packages/@tinacms/toolkit/src/react-sidebar/components/sync-status.tsx b/packages/tinacms/src/toolkit/react-sidebar/components/sync-status.tsx similarity index 97% rename from packages/@tinacms/toolkit/src/react-sidebar/components/sync-status.tsx rename to packages/tinacms/src/toolkit/react-sidebar/components/sync-status.tsx index 666de4606a..f23f7c4479 100644 --- a/packages/@tinacms/toolkit/src/react-sidebar/components/sync-status.tsx +++ b/packages/tinacms/src/toolkit/react-sidebar/components/sync-status.tsx @@ -1,11 +1,16 @@ import * as React from 'react' import { useState } from 'react' -import { TinaCMS } from '@/tina-cms' +import { TinaCMS } from '@toolkit/tina-cms' import { MdSyncProblem } from 'react-icons/md' import { HiOutlineClipboardList } from 'react-icons/hi' -import { FullscreenModal, Modal, ModalBody, ModalHeader } from '@/react-modals' +import { + FullscreenModal, + Modal, + ModalBody, + ModalHeader, +} from '@toolkit/react-modals' import { BsCheckCircleFill, BsExclamationOctagonFill } from 'react-icons/bs' -import { Button } from '@/styles' +import { Button } from '@toolkit/styles' type EventListState = 'loading' | 'success' | 'error' | 'unauthorized' diff --git a/packages/@tinacms/toolkit/src/react-sidebar/index.ts b/packages/tinacms/src/toolkit/react-sidebar/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-sidebar/index.ts rename to packages/tinacms/src/toolkit/react-sidebar/index.ts diff --git a/packages/@tinacms/toolkit/src/react-sidebar/sidebar.ts b/packages/tinacms/src/toolkit/react-sidebar/sidebar.ts similarity index 100% rename from packages/@tinacms/toolkit/src/react-sidebar/sidebar.ts rename to packages/tinacms/src/toolkit/react-sidebar/sidebar.ts diff --git a/packages/@tinacms/toolkit/src/react-tinacms/index.ts b/packages/tinacms/src/toolkit/react-tinacms/index.ts similarity index 57% rename from packages/@tinacms/toolkit/src/react-tinacms/index.ts rename to packages/tinacms/src/toolkit/react-tinacms/index.ts index 1914acc7d5..d0c508a7cf 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/index.ts +++ b/packages/tinacms/src/toolkit/react-tinacms/index.ts @@ -5,7 +5,7 @@ export * from './use-subscribable' export * from './use-watch-form-values' export * from './with-plugin' export * from './with-tina' -export { useCMSEvent } from '@/react-core' +export { useCMSEvent } from '@toolkit/react-core' -export type { Plugin } from '@/core' -export type { Form, FormOptions, Field } from '@/forms' +export type { Plugin } from '@toolkit/core' +export type { Form, FormOptions, Field } from '@toolkit/forms' diff --git a/packages/tinacms/src/toolkit/react-tinacms/use-cms.ts b/packages/tinacms/src/toolkit/react-tinacms/use-cms.ts new file mode 100644 index 0000000000..8c01c3cdd6 --- /dev/null +++ b/packages/tinacms/src/toolkit/react-tinacms/use-cms.ts @@ -0,0 +1,8 @@ +import { useCMS as useBaseCMS } from '@toolkit/react-core' +import { TinaCMS } from '@toolkit/tina-cms' + +export { ERROR_MISSING_CMS, CMSContext } from '@toolkit/react-core' + +export function useCMS(): TinaCMS { + return useBaseCMS() as TinaCMS +} diff --git a/packages/@tinacms/toolkit/src/react-tinacms/use-form.ts b/packages/tinacms/src/toolkit/react-tinacms/use-form.ts similarity index 73% rename from packages/@tinacms/toolkit/src/react-tinacms/use-form.ts rename to packages/tinacms/src/toolkit/react-tinacms/use-form.ts index 84440b2a10..4e55e500cd 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/use-form.ts +++ b/packages/tinacms/src/toolkit/react-tinacms/use-form.ts @@ -1,9 +1,9 @@ -import { FormOptions, Form } from '@/forms' -import { GlobalFormPlugin } from '@/plugin-screens' +import { FormOptions, Form } from '@toolkit/forms' +import { GlobalFormPlugin } from '@toolkit/plugin-screens' import { useMemo } from 'react' -import { useForm, WatchableFormValue, usePlugins } from '@/react-core' -export { useLocalForm, useForm } from '@/react-core' -export type { WatchableFormValue } from '@/react-core' +import { useForm, WatchableFormValue, usePlugins } from '@toolkit/react-core' +export { useLocalForm, useForm } from '@toolkit/react-core' +export type { WatchableFormValue } from '@toolkit/react-core' /** * @deprecated See https://github.com/tinacms/rfcs/blob/master/0006-form-hook-conventions.md diff --git a/packages/tinacms/src/toolkit/react-tinacms/use-plugin.tsx b/packages/tinacms/src/toolkit/react-tinacms/use-plugin.tsx new file mode 100644 index 0000000000..7acf30b0bb --- /dev/null +++ b/packages/tinacms/src/toolkit/react-tinacms/use-plugin.tsx @@ -0,0 +1 @@ +export { usePlugins, usePlugin } from '@toolkit/react-core' diff --git a/packages/tinacms/src/toolkit/react-tinacms/use-subscribable.tsx b/packages/tinacms/src/toolkit/react-tinacms/use-subscribable.tsx new file mode 100644 index 0000000000..b5db7c7816 --- /dev/null +++ b/packages/tinacms/src/toolkit/react-tinacms/use-subscribable.tsx @@ -0,0 +1 @@ +export { useSubscribable } from '@toolkit/react-core' diff --git a/packages/tinacms/src/toolkit/react-tinacms/use-watch-form-values.ts b/packages/tinacms/src/toolkit/react-tinacms/use-watch-form-values.ts new file mode 100644 index 0000000000..3438702382 --- /dev/null +++ b/packages/tinacms/src/toolkit/react-tinacms/use-watch-form-values.ts @@ -0,0 +1 @@ +export { useWatchFormValues } from '@toolkit/react-core' diff --git a/packages/tinacms/src/toolkit/react-tinacms/with-plugin.tsx b/packages/tinacms/src/toolkit/react-tinacms/with-plugin.tsx new file mode 100644 index 0000000000..2de4e7c1e8 --- /dev/null +++ b/packages/tinacms/src/toolkit/react-tinacms/with-plugin.tsx @@ -0,0 +1 @@ +export { withPlugins, withPlugin } from '@toolkit/react-core' diff --git a/packages/@tinacms/toolkit/src/react-tinacms/with-tina.tsx b/packages/tinacms/src/toolkit/react-tinacms/with-tina.tsx similarity index 86% rename from packages/@tinacms/toolkit/src/react-tinacms/with-tina.tsx rename to packages/tinacms/src/toolkit/react-tinacms/with-tina.tsx index 5d30a405f3..0a84d866f9 100644 --- a/packages/@tinacms/toolkit/src/react-tinacms/with-tina.tsx +++ b/packages/tinacms/src/toolkit/react-tinacms/with-tina.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { TinaProvider } from '../components/tina-provider' -import { TinaCMS, TinaCMSConfig } from '@/tina-cms' +import { TinaCMS, TinaCMSConfig } from '@toolkit/tina-cms' export function withTina(Component: any, config?: TinaCMSConfig) { return (props: any) => { diff --git a/packages/@tinacms/toolkit/src/styles.css b/packages/tinacms/src/toolkit/styles.css similarity index 100% rename from packages/@tinacms/toolkit/src/styles.css rename to packages/tinacms/src/toolkit/styles.css diff --git a/packages/@tinacms/toolkit/src/styles/button.tsx b/packages/tinacms/src/toolkit/styles/button.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/styles/button.tsx rename to packages/tinacms/src/toolkit/styles/button.tsx diff --git a/packages/@tinacms/toolkit/src/styles/container.tsx b/packages/tinacms/src/toolkit/styles/container.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/styles/container.tsx rename to packages/tinacms/src/toolkit/styles/container.tsx diff --git a/packages/@tinacms/toolkit/src/styles/font-loader.tsx b/packages/tinacms/src/toolkit/styles/font-loader.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/styles/font-loader.tsx rename to packages/tinacms/src/toolkit/styles/font-loader.tsx diff --git a/packages/@tinacms/toolkit/src/styles/index.ts b/packages/tinacms/src/toolkit/styles/index.ts similarity index 100% rename from packages/@tinacms/toolkit/src/styles/index.ts rename to packages/tinacms/src/toolkit/styles/index.ts diff --git a/packages/@tinacms/toolkit/src/styles/message.tsx b/packages/tinacms/src/toolkit/styles/message.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/styles/message.tsx rename to packages/tinacms/src/toolkit/styles/message.tsx diff --git a/packages/@tinacms/toolkit/src/styles/overflow-menu.tsx b/packages/tinacms/src/toolkit/styles/overflow-menu.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/styles/overflow-menu.tsx rename to packages/tinacms/src/toolkit/styles/overflow-menu.tsx diff --git a/packages/@tinacms/toolkit/src/tina-cms.ts b/packages/tinacms/src/toolkit/tina-cms.ts similarity index 89% rename from packages/@tinacms/toolkit/src/tina-cms.ts rename to packages/tinacms/src/toolkit/tina-cms.ts index bfaf9dbfd1..e2ed6348be 100644 --- a/packages/@tinacms/toolkit/src/tina-cms.ts +++ b/packages/tinacms/src/toolkit/tina-cms.ts @@ -8,9 +8,9 @@ import { CMSEvent, MediaUploadOptions, PluginType, -} from '@/core' -import { FieldPlugin } from '@/form-builder' -import { ScreenPlugin } from '@/react-screens' +} from '@toolkit/core' +import { FieldPlugin } from '@toolkit/form-builder' +import { ScreenPlugin } from '@toolkit/react-screens' import { TextFieldPlugin, TextareaFieldPlugin, @@ -30,16 +30,16 @@ import { ReferenceFieldPlugin, ButtonToggleFieldPlugin, HiddenFieldPlugin, -} from '@/fields' -import { Form } from '@/forms' -import { Alerts, EventsToAlerts } from '@/alerts' -import { SidebarState, SidebarStateOptions } from '@/react-sidebar' +} from '@toolkit/fields' +import { Form } from '@toolkit/forms' +import { Alerts, EventsToAlerts } from '@toolkit/alerts' +import { SidebarState, SidebarStateOptions } from '@toolkit/react-sidebar' import { MarkdownFieldPlaceholder, HtmlFieldPlaceholder, -} from '@/plugin-fields/markdown' -import { MediaManagerScreenPlugin } from '@/plugin-screens/media-manager-screen' -import { createCloudConfig } from '@/react-cloud-config' +} from '@toolkit/plugin-fields/markdown' +import { MediaManagerScreenPlugin } from '@toolkit/plugin-screens/media-manager-screen' +import { createCloudConfig } from '@toolkit/react-cloud-config' import { TinaAction, TinaState } from './tina-state' const DEFAULT_FIELDS = [ diff --git a/packages/@tinacms/toolkit/src/tina-state.tsx b/packages/tinacms/src/toolkit/tina-state.tsx similarity index 100% rename from packages/@tinacms/toolkit/src/tina-state.tsx rename to packages/tinacms/src/toolkit/tina-state.tsx diff --git a/packages/tinacms/tsconfig.json b/packages/tinacms/tsconfig.json index 60b60d491a..96be0a93f8 100644 --- a/packages/tinacms/tsconfig.json +++ b/packages/tinacms/tsconfig.json @@ -2,7 +2,12 @@ "extends": "../../base.tsconfig.json", "compilerOptions": { "outDir": "dist", - "rootDir": "src" + "rootDir": "src", + "baseUrl": "./", + "paths": { + "@tinacms/toolkit": ["./src/toolkit/index.ts"], + "@toolkit/*": ["./src/toolkit/*"] + }, }, "exclude": ["src/**/*.test.tsx", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.spec.tsx"], "include": ["src"] diff --git a/packages/@tinacms/toolkit/vitest.config.ts b/packages/tinacms/vitest.config.ts similarity index 62% rename from packages/@tinacms/toolkit/vitest.config.ts rename to packages/tinacms/vitest.config.ts index 192991ebec..17dfcd093c 100644 --- a/packages/@tinacms/toolkit/vitest.config.ts +++ b/packages/tinacms/vitest.config.ts @@ -9,7 +9,8 @@ export default defineConfig({ }, resolve: { alias: { - '@': path.resolve(__dirname, './src'), + '@toolkit': path.resolve(__dirname, './src/toolkit'), + '@tinacms/toolkit': path.resolve(__dirname, 'src/toolkit/index.ts'), }, }, }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 840516438a..5bc07813ee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -310,7 +310,6 @@ importers: '@heroicons/react': 1.0.6 '@monaco-editor/react': 4.4.5 '@tinacms/mdx': workspace:* - '@tinacms/toolkit': workspace:* '@types/react': 17.0.47 '@types/react-dom': 17.0.2 '@xstate/react': 3.0.0 @@ -334,7 +333,6 @@ importers: '@heroicons/react': 1.0.6_react@17.0.2 '@monaco-editor/react': 4.4.5_ilaxvrtg3zfidjpyrhsbytq244 '@tinacms/mdx': link:../mdx - '@tinacms/toolkit': link:../toolkit '@xstate/react': 3.0.0_sudpmbbyhqtxq6t4xf6jlicdem final-form: 4.20.7 graphiql: 3.0.0-alpha.1_ahyw56tg4nqq3um635qwsegk3u @@ -963,145 +961,6 @@ importers: react-dom: 17.0.2_react@17.0.2 typescript: 4.3.5 - packages/@tinacms/toolkit: - specifiers: - '@floating-ui/dom': ^1.4.4 - '@floating-ui/react-dom': ^2.0.1 - '@headlessui/react': ^1.5.0 - '@heroicons/react': ^1.0.5 - '@monaco-editor/react': 4.4.5 - '@radix-ui/react-popover': ^1.0.6 - '@react-aria/i18n': ^3.3.4 - '@react-hook/window-size': ^3.0.7 - '@react-types/combobox': ^3.2.0 - '@react-types/shared': ^3.10.0 - '@sambego/storybook-styles': ^1.0.0 - '@testing-library/dom': '^7.21.4 ' - '@testing-library/jest-dom': ^5.16.5 - '@testing-library/react': ^12.0.0 - '@testing-library/user-event': ^12.7.0 - '@tinacms/scripts': workspace:* - '@tinacms/search': workspace:* - '@tinacms/sharedctx': workspace:* - '@types/atob': ^2.1.2 - '@types/codemirror': ^0.0.71 - '@types/color-string': ^1.5.0 - '@types/jest': ^27.0.1 - '@types/lodash.debounce': ^4.0.6 - '@types/lodash.get': ^4.4.5 - '@types/prop-types': ^15.7.4 - '@types/react': 17.0.47 - '@types/react-beautiful-dnd': ^11.0.3 - '@types/react-color': ^3.0.1 - '@types/react-dom': ^17.0.9 - '@types/react-select': ^2.0.11 - '@types/storybook__react': ^4.0.2 - '@udecode/plate-headless': ^21.4.0 - atob: 2.1.2 - color-string: ^1.5.3 - date-fns: 2.30.0 - final-form: ^4.20.2 - final-form-arrays: ^3.0.1 - final-form-set-field-data: ^1.0.2 - happy-dom: ^10.5.2 - is-hotkey: ^0.2.0 - lodash.get: ^4.4.2 - moment: 2.29.4 - monaco-editor: 0.31.0 - prism-react-renderer: ^1.3.5 - prismjs: ^1.28.0 - prop-types: 15.7.2 - react: 17.0.2 - react-beautiful-dnd: ^13.1.0 - react-color: ^2.17.3 - react-datetime: ^2.16.3 - react-dom: 17.0.2 - react-dropzone: 14.2.3 - react-final-form: ^6.3.0 - react-icons: ^4.3.1 - react-onclickoutside: ^6.13.0 - react-textarea-autosize: 8.5.2 - scheduler: 0.19.0 - slate: ^0.94.1 - slate-history: ^0.93.0 - slate-hyperscript: ^0.77.0 - slate-react: ^0.97.1 - tsc-alias: ^1.8.7 - tslib: ^2.3.0 - typescript: 4.3.5 - vite: ^4.3.9 - vitest: ^0.32.2 - webfontloader: 1.6.28 - dependencies: - '@floating-ui/dom': 1.4.4 - '@floating-ui/react-dom': 2.0.1_sfoxds7t5ydpegc3knd667wn6m - '@headlessui/react': 1.6.5_sfoxds7t5ydpegc3knd667wn6m - '@heroicons/react': 1.0.6_react@17.0.2 - '@monaco-editor/react': 4.4.5_ilaxvrtg3zfidjpyrhsbytq244 - '@radix-ui/react-popover': 1.0.6_itbvd6nzuoidgzct3pixmtsxhi - '@react-aria/i18n': 3.4.1_react@17.0.2 - '@react-hook/window-size': 3.0.7_react@17.0.2 - '@react-types/combobox': 3.5.1_react@17.0.2 - '@react-types/shared': 3.13.1_react@17.0.2 - '@sambego/storybook-styles': 1.0.0 - '@tinacms/search': link:../search - '@tinacms/sharedctx': link:../sharedctx - '@udecode/plate-headless': 21.4.0_j2r3whziqbdplsvardcuu7h7q4 - atob: 2.1.2 - color-string: 1.9.1 - date-fns: 2.30.0 - final-form: 4.20.7 - final-form-arrays: 3.0.2_final-form@4.20.7 - final-form-set-field-data: 1.0.2_final-form@4.20.7 - is-hotkey: 0.2.0 - lodash.get: 4.4.2 - moment: 2.29.4 - monaco-editor: 0.31.0 - prism-react-renderer: 1.3.5_react@17.0.2 - prismjs: 1.28.0 - prop-types: 15.7.2 - react-beautiful-dnd: 13.1.0_sfoxds7t5ydpegc3knd667wn6m - react-color: 2.19.3_react@17.0.2 - react-datetime: 2.16.3_tonpzznxmdkdqlpcs7osdmovtq - react-dropzone: 14.2.3_react@17.0.2 - react-final-form: 6.5.9_s44h3cxpdxv6cks4bnqewerqda - react-icons: 4.4.0_react@17.0.2 - react-onclickoutside: 6.13.0_sfoxds7t5ydpegc3knd667wn6m - react-textarea-autosize: 8.5.2_sudpmbbyhqtxq6t4xf6jlicdem - scheduler: 0.19.0 - slate: 0.94.1 - slate-history: 0.93.0_slate@0.94.1 - slate-hyperscript: 0.77.0_slate@0.94.1 - slate-react: 0.97.1_ceyajmovvfljjbz2h2ik5qmoja - webfontloader: 1.6.28 - devDependencies: - '@testing-library/dom': 7.31.2 - '@testing-library/jest-dom': 5.16.5 - '@testing-library/react': 12.1.5_sfoxds7t5ydpegc3knd667wn6m - '@testing-library/user-event': 12.8.3_7izb363m7fjrh7ob6q4a2yqaqe - '@tinacms/scripts': link:../scripts - '@types/atob': 2.1.2 - '@types/codemirror': 0.0.71 - '@types/color-string': 1.5.2 - '@types/jest': 27.5.2 - '@types/lodash.debounce': 4.0.7 - '@types/lodash.get': 4.4.7 - '@types/prop-types': 15.7.5 - '@types/react': 17.0.47 - '@types/react-beautiful-dnd': 11.0.7 - '@types/react-color': 3.0.6 - '@types/react-dom': 17.0.17 - '@types/react-select': 2.0.19 - '@types/storybook__react': 4.0.2 - happy-dom: 10.5.2 - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 - tsc-alias: 1.8.7 - tslib: 2.4.0 - typescript: 4.3.5 - vite: 4.3.9 - vitest: 0.32.2_happy-dom@10.5.2 - packages/@tinacms/vercel-previews: specifiers: '@tinacms/scripts': workspace:* @@ -1160,7 +1019,6 @@ importers: packages/next-tinacms-cloudinary: specifiers: '@tinacms/scripts': workspace:* - '@tinacms/toolkit': workspace:* '@types/crypto-js': ^3.1.47 '@types/js-cookie': ^2.2.6 '@types/node': ^13.13.1 @@ -1176,7 +1034,6 @@ importers: multer: 1.4.5-lts.1 devDependencies: '@tinacms/scripts': link:../@tinacms/scripts - '@tinacms/toolkit': link:../@tinacms/toolkit '@types/crypto-js': 3.1.47 '@types/js-cookie': 2.2.7 '@types/node': 13.13.52 @@ -1190,7 +1047,6 @@ importers: specifiers: '@aws-sdk/client-s3': ^3.357.0 '@tinacms/scripts': workspace:* - '@tinacms/toolkit': workspace:* '@types/crypto-js': ^3.1.47 '@types/js-cookie': ^2.2.6 '@types/node': ^13.13.1 @@ -1205,7 +1061,6 @@ importers: multer: 1.4.5-lts.1 devDependencies: '@tinacms/scripts': link:../@tinacms/scripts - '@tinacms/toolkit': link:../@tinacms/toolkit '@types/crypto-js': 3.1.47 '@types/js-cookie': 2.2.7 '@types/node': 13.13.52 @@ -1220,7 +1075,6 @@ importers: '@aws-sdk/client-s3': ^3.357.0 '@aws-sdk/signature-v4-crt': 3.163.0 '@tinacms/scripts': workspace:* - '@tinacms/toolkit': workspace:* '@types/crypto-js': ^3.1.47 '@types/js-cookie': ^2.2.6 '@types/node': ^13.13.1 @@ -1237,7 +1091,6 @@ importers: multer: 1.4.5-lts.1 devDependencies: '@tinacms/scripts': link:../@tinacms/scripts - '@tinacms/toolkit': link:../@tinacms/toolkit '@types/crypto-js': 3.1.47 '@types/js-cookie': 2.2.7 '@types/node': 13.13.52 @@ -1250,11 +1103,19 @@ importers: packages/tinacms: specifiers: + '@floating-ui/dom': ^1.4.4 + '@floating-ui/react-dom': ^2.0.1 '@graphql-inspector/core': ^4.0.0 '@graphql-tools/utils': ^8.6.1 '@headlessui/react': ^1.5.0 '@heroicons/react': ^1.0.4 + '@monaco-editor/react': 4.4.5 + '@radix-ui/react-popover': ^1.0.6 + '@react-aria/i18n': ^3.3.4 '@react-hook/window-size': ^3.0.7 + '@react-types/combobox': ^3.2.0 + '@react-types/shared': ^3.10.0 + '@sambego/storybook-styles': ^1.0.0 '@testing-library/dom': '^7.21.4 ' '@testing-library/jest-dom': ^5.16.5 '@testing-library/react': ^12.0.0 @@ -1264,52 +1125,124 @@ importers: '@tinacms/scripts': workspace:* '@tinacms/search': workspace:* '@tinacms/sharedctx': workspace:* - '@tinacms/toolkit': workspace:* + '@types/atob': ^2.1.2 + '@types/codemirror': ^0.0.71 + '@types/color-string': ^1.5.0 '@types/jest': ^27.0.1 '@types/lodash': ^4.14.169 + '@types/lodash.debounce': ^4.0.6 + '@types/lodash.get': ^4.4.5 '@types/node': ^14.0.13 + '@types/prop-types': ^15.7.4 '@types/react': 17.0.47 + '@types/react-beautiful-dnd': ^11.0.3 + '@types/react-color': ^3.0.1 + '@types/react-dom': ^17.0.9 + '@types/react-select': ^2.0.11 + '@types/storybook__react': ^4.0.2 '@types/yup': ^0.29.10 + '@udecode/plate-headless': ^21.4.0 + atob: 2.1.2 + color-string: ^1.5.3 crypto-js: ^4.0.0 + date-fns: 2.30.0 encoding: 0.1.13 fetch-ponyfill: ^7.1.0 - final-form: 4.20.1 + final-form: 4.20.4 + final-form-arrays: ^3.0.1 + final-form-set-field-data: ^1.0.2 graphql: 15.8.0 graphql-tag: ^2.11.0 identity-obj-proxy: ^3.0.0 + is-hotkey: ^0.2.0 isomorphic-fetch: ^3.0.0 jest: ^29.5.0 jest-environment-jsdom: ^29.5.0 jest-file-snapshot: ^0.5.0 + lodash.get: ^4.4.2 lodash.set: ^4.3.2 + moment: 2.29.4 + monaco-editor: 0.31.0 next: 12.2.4 prism-react-renderer: ^2.0.6 + prismjs: ^1.28.0 + prop-types: 15.7.2 react: 17.0.2 + react-beautiful-dnd: ^13.1.0 + react-color: ^2.17.3 + react-datetime: ^2.16.3 react-dom: 17.0.2 + react-dropzone: 14.2.3 + react-final-form: ^6.3.0 react-icons: ^4.3.1 + react-is: ^17.0.2 + react-onclickoutside: ^6.13.0 react-router-dom: 6.3.0 + react-textarea-autosize: 8.5.2 + scheduler: 0.19.0 + slate: ^0.94.1 + slate-history: ^0.93.0 + slate-hyperscript: ^0.77.0 + slate-react: ^0.97.1 + tsc-alias: ^1.8.7 + tslib: ^2.3.0 typescript: 4.3.5 + vite: ^4.3.9 + vitest: ^0.32.2 + webfontloader: 1.6.28 yup: ^0.32.0 zod: ^3.14.3 dependencies: + '@floating-ui/dom': 1.4.4 + '@floating-ui/react-dom': 2.0.1_sfoxds7t5ydpegc3knd667wn6m '@graphql-inspector/core': 4.0.0_graphql@15.8.0 '@headlessui/react': 1.7.5_sfoxds7t5ydpegc3knd667wn6m '@heroicons/react': 1.0.6_react@17.0.2 + '@monaco-editor/react': 4.4.5_ilaxvrtg3zfidjpyrhsbytq244 + '@radix-ui/react-popover': 1.0.6_itbvd6nzuoidgzct3pixmtsxhi + '@react-aria/i18n': 3.4.1_react@17.0.2 '@react-hook/window-size': 3.0.7_react@17.0.2 + '@react-types/combobox': 3.5.1_react@17.0.2 + '@react-types/shared': 3.13.1_react@17.0.2 + '@sambego/storybook-styles': 1.0.0 '@tinacms/schema-tools': link:../@tinacms/schema-tools '@tinacms/search': link:../@tinacms/search '@tinacms/sharedctx': link:../@tinacms/sharedctx - '@tinacms/toolkit': link:../@tinacms/toolkit + '@udecode/plate-headless': 21.4.0_j2r3whziqbdplsvardcuu7h7q4 + atob: 2.1.2 + color-string: 1.9.1 crypto-js: 4.1.1 + date-fns: 2.30.0 encoding: 0.1.13 fetch-ponyfill: 7.1.0_encoding@0.1.13 - final-form: 4.20.1 + final-form: 4.20.4 + final-form-arrays: 3.0.2_final-form@4.20.4 + final-form-set-field-data: 1.0.2_final-form@4.20.4 graphql: 15.8.0 graphql-tag: 2.12.6_graphql@15.8.0 + is-hotkey: 0.2.0 + lodash.get: 4.4.2 lodash.set: 4.3.2 + moment: 2.29.4 + monaco-editor: 0.31.0 prism-react-renderer: 2.0.6_react@17.0.2 + prismjs: 1.28.0 + prop-types: 15.7.2 + react-beautiful-dnd: 13.1.0_sfoxds7t5ydpegc3knd667wn6m + react-color: 2.19.3_react@17.0.2 + react-datetime: 2.16.3_tonpzznxmdkdqlpcs7osdmovtq + react-dropzone: 14.2.3_react@17.0.2 + react-final-form: 6.5.9_soexlzopzjzlvc3z6yg6dqhpvi react-icons: 4.4.0_react@17.0.2 + react-onclickoutside: 6.13.0_sfoxds7t5ydpegc3knd667wn6m react-router-dom: 6.3.0_sfoxds7t5ydpegc3knd667wn6m + react-textarea-autosize: 8.5.2_sudpmbbyhqtxq6t4xf6jlicdem + scheduler: 0.19.0 + slate: 0.94.1 + slate-history: 0.93.0_slate@0.94.1 + slate-hyperscript: 0.77.0_slate@0.94.1 + slate-react: 0.97.1_ceyajmovvfljjbz2h2ik5qmoja + webfontloader: 1.6.28 yup: 0.32.11 zod: 3.17.3 devDependencies: @@ -1320,10 +1253,21 @@ importers: '@testing-library/react-hooks': 7.0.2_sfoxds7t5ydpegc3knd667wn6m '@testing-library/user-event': 12.8.3_7izb363m7fjrh7ob6q4a2yqaqe '@tinacms/scripts': link:../@tinacms/scripts + '@types/atob': 2.1.2 + '@types/codemirror': 0.0.71 + '@types/color-string': 1.5.2 '@types/jest': 27.5.2 '@types/lodash': 4.14.182 + '@types/lodash.debounce': 4.0.7 + '@types/lodash.get': 4.4.7 '@types/node': 14.18.21 + '@types/prop-types': 15.7.5 '@types/react': 17.0.47 + '@types/react-beautiful-dnd': 11.0.7 + '@types/react-color': 3.0.6 + '@types/react-dom': 17.0.17 + '@types/react-select': 2.0.19 + '@types/storybook__react': 4.0.2 '@types/yup': 0.29.14 identity-obj-proxy: 3.0.0 isomorphic-fetch: 3.0.0_encoding@0.1.13 @@ -1333,7 +1277,12 @@ importers: next: 12.2.4_sfoxds7t5ydpegc3knd667wn6m react: 17.0.2 react-dom: 17.0.2_react@17.0.2 + react-is: 17.0.2 + tsc-alias: 1.8.7 + tslib: 2.5.0 typescript: 4.3.5 + vite: 4.3.9_@types+node@14.18.21 + vitest: 0.32.2 packages: /@adobe/css-tools/4.2.0: @@ -6234,16 +6183,6 @@ packages: dependencies: regenerator-runtime: 0.13.11 - /@babel/runtime/7.19.0: - resolution: - { - integrity: sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==, - } - engines: { node: '>=6.9.0' } - dependencies: - regenerator-runtime: 0.13.11 - dev: false - /@babel/runtime/7.21.0: resolution: { @@ -7802,7 +7741,7 @@ packages: dependency-graph: 0.11.0 graphql: 15.8.0 object-inspect: 1.12.3 - tslib: 2.4.0 + tslib: 2.5.0 dev: false /@graphql-tools/graphql-file-loader/7.4.0_graphql@15.8.0: @@ -7987,20 +7926,6 @@ packages: graphql: 15.8.0 dev: false - /@headlessui/react/1.6.5_sfoxds7t5ydpegc3knd667wn6m: - resolution: - { - integrity: sha512-3VkKteDxlxf3fE0KbfO9t60KC1lM7YNpZggLpwzVNg1J/zwL+h+4N7MBlFDVpInZI3rKlZGpNx0PWsG/9c2vQg==, - } - engines: { node: '>=10' } - peerDependencies: - react: ^16 || ^17 || ^18 - react-dom: ^16 || ^17 || ^18 - dependencies: - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 - dev: false - /@headlessui/react/1.6.6_sfoxds7t5ydpegc3knd667wn6m: resolution: { @@ -11934,8 +11859,8 @@ packages: } dependencies: '@types/react': 17.0.47 - '@types/react-dom': 17.0.17 - '@types/react-transition-group': 4.4.5 + '@types/react-dom': 18.0.5 + '@types/react-transition-group': 4.4.6 dev: true /@types/react-test-renderer/18.0.0: @@ -11947,10 +11872,10 @@ packages: '@types/react': 17.0.47 dev: true - /@types/react-transition-group/4.4.5: + /@types/react-transition-group/4.4.6: resolution: { - integrity: sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==, + integrity: sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==, } dependencies: '@types/react': 17.0.47 @@ -12049,7 +11974,7 @@ packages: } dependencies: '@types/react': 17.0.47 - '@types/webpack-env': 1.17.0 + '@types/webpack-env': 1.18.1 dev: true /@types/styled-components/5.1.25: @@ -12079,7 +12004,7 @@ packages: integrity: sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg==, } dependencies: - '@types/estree': 0.0.50 + '@types/estree': 1.0.0 /@types/testing-library__jest-dom/5.14.5: resolution: @@ -12118,10 +12043,10 @@ packages: } dev: false - /@types/webpack-env/1.17.0: + /@types/webpack-env/1.18.1: resolution: { - integrity: sha512-eHSaNYEyxRA5IAG0Ym/yCyf86niZUIF/TpWKofQI/CVfh5HsMEUyfE2kwFxha4ow0s5g0LfISQxpDKjbRDrizw==, + integrity: sha512-D0HJET2/UY6k9L6y3f5BL+IDxZmPkYmPT4+qBrRdmRLYRuV0qNKizMgTvYxXZYn+36zjPeoDZAEYBCM6XB+gww==, } dev: true @@ -19460,7 +19385,7 @@ packages: dependencies: to-regex-range: 5.0.1 - /final-form-arrays/3.0.2_final-form@4.20.7: + /final-form-arrays/3.0.2_final-form@4.20.4: resolution: { integrity: sha512-TfO8aZNz3RrsZCDx8GHMQcyztDNpGxSSi9w4wpSNKlmv2PfFWVVM8P7Yj5tj4n0OWax+x5YwTLhT5BnqSlCi+w==, @@ -19468,10 +19393,10 @@ packages: peerDependencies: final-form: ^4.18.2 dependencies: - final-form: 4.20.7 + final-form: 4.20.4 dev: false - /final-form-set-field-data/1.0.2_final-form@4.20.7: + /final-form-set-field-data/1.0.2_final-form@4.20.4: resolution: { integrity: sha512-gAnENimyQ5GW3OEGca5pbwm4lYshW2orzfBlPUYqzcm7ZxkQrVO8FqCAgEcCM+Rq9U1OU0q+D+UkqETvvDY6jw==, @@ -19479,16 +19404,16 @@ packages: peerDependencies: final-form: '>=1.2.0' dependencies: - final-form: 4.20.7 + final-form: 4.20.4 dev: false - /final-form/4.20.1: + /final-form/4.20.4: resolution: { - integrity: sha512-IIsOK3JRxJrN72OBj7vFWZxtGt3xc1bYwJVPchjVWmDol9DlzMSAOPB+vwe75TUYsw1JaH0fTQnIgwSQZQ9Acg==, + integrity: sha512-hyoOVVilPLpkTvgi+FSJkFZrh0Yhy4BhE6lk/NiBwrF4aRV8/ykKEyXYvQH/pfUbRkOosvpESYouFb+FscsLrw==, } dependencies: - '@babel/runtime': 7.18.6 + '@babel/runtime': 7.21.0 dev: false /final-form/4.20.7: @@ -19497,7 +19422,7 @@ packages: integrity: sha512-ii3X9wNfyBYFnDPunYN5jh1/HAvtOZ9aJI/TVk0MB86hZuOeYkb+W5L3icgwW9WWNztZR6MDU3En6eoZTUoFPg==, } dependencies: - '@babel/runtime': 7.19.0 + '@babel/runtime': 7.21.0 dev: false /finalhandler/1.2.0: @@ -20301,20 +20226,6 @@ packages: uglify-js: 3.17.4 dev: true - /happy-dom/10.5.2: - resolution: - { - integrity: sha512-dTA1cDcLOPIkAdykLd9Wo1k8Ly36Hh2OdKGkWEHWuAHb89KcVVRLSj1OFev7ir90xhRLSGCGrEdDvS6u9l13kg==, - } - dependencies: - css.escape: 1.5.1 - entities: 4.5.0 - iconv-lite: 0.6.3 - webidl-conversions: 7.0.0 - whatwg-encoding: 2.0.0 - whatwg-mimetype: 3.0.0 - dev: true - /hard-rejection/2.1.0: resolution: { @@ -25957,17 +25868,6 @@ packages: prettier: 2.8.4 dev: false - /prism-react-renderer/1.3.5_react@17.0.2: - resolution: - { - integrity: sha512-IJ+MSwBWKG+SM3b2SUfdrhC+gu01QkV2KmRQgREThBfSQRoufqRfxfHUxpG1WcaFjP+kojcFyO9Qqtpgt3qLCg==, - } - peerDependencies: - react: '>=0.14.9' - dependencies: - react: 17.0.2 - dev: false - /prism-react-renderer/2.0.6_react@17.0.2: resolution: { @@ -26366,7 +26266,7 @@ packages: create-react-class: 15.7.0 moment: 2.29.4 object-assign: 3.0.0 - prop-types: 15.7.2 + prop-types: 15.8.1 react: 17.0.2 react-dom: 17.0.2_react@17.0.2 react-onclickoutside: 6.13.0_sfoxds7t5ydpegc3knd667wn6m @@ -26426,7 +26326,7 @@ packages: react: 17.0.2 dev: true - /react-final-form/6.5.9_s44h3cxpdxv6cks4bnqewerqda: + /react-final-form/6.5.9_soexlzopzjzlvc3z6yg6dqhpvi: resolution: { integrity: sha512-x3XYvozolECp3nIjly+4QqxdjSSWfcnpGEL5K8OBT6xmGrq5kBqbA6+/tOqoom9NwqIPPbxPNsOViFlbKgowbA==, @@ -26435,8 +26335,8 @@ packages: final-form: ^4.20.4 react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - '@babel/runtime': 7.19.0 - final-form: 4.20.7 + '@babel/runtime': 7.21.0 + final-form: 4.20.4 react: 17.0.2 dev: false @@ -29122,6 +29022,7 @@ packages: { integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, } + dev: false /tslib/2.5.0: resolution: @@ -30364,75 +30265,6 @@ packages: - terser dev: true - /vitest/0.32.2_happy-dom@10.5.2: - resolution: - { - integrity: sha512-hU8GNNuQfwuQmqTLfiKcqEhZY72Zxb7nnN07koCUNmntNxbKQnVbeIS6sqUgR3eXSlbOpit8+/gr1KpqoMgWCQ==, - } - engines: { node: '>=v14.18.0' } - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@vitest/browser': '*' - '@vitest/ui': '*' - happy-dom: '*' - jsdom: '*' - playwright: '*' - safaridriver: '*' - webdriverio: '*' - peerDependenciesMeta: - '@edge-runtime/vm': - optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true - playwright: - optional: true - safaridriver: - optional: true - webdriverio: - optional: true - dependencies: - '@types/chai': 4.3.5 - '@types/chai-subset': 1.3.3 - '@types/node': 18.7.18 - '@vitest/expect': 0.32.2 - '@vitest/runner': 0.32.2 - '@vitest/snapshot': 0.32.2 - '@vitest/spy': 0.32.2 - '@vitest/utils': 0.32.2 - acorn: 8.9.0 - acorn-walk: 8.2.0 - cac: 6.7.14 - chai: 4.3.7 - concordance: 5.0.4 - debug: 4.3.4 - happy-dom: 10.5.2 - local-pkg: 0.4.3 - magic-string: 0.30.0 - pathe: 1.1.1 - picocolors: 1.0.0 - std-env: 3.3.3 - strip-literal: 1.0.1 - tinybench: 2.5.0 - tinypool: 0.5.0 - vite: 4.3.9_@types+node@18.7.18 - vite-node: 0.32.2_@types+node@18.7.18 - why-is-node-running: 2.2.2 - transitivePeerDependencies: - - less - - sass - - stylus - - sugarss - - supports-color - - terser - dev: true - /vm2/3.9.19: resolution: { @@ -30502,7 +30334,10 @@ packages: dev: false /webfontloader/1.6.28: - resolution: { integrity: sha1-23hhKSU8tujq5UwvsF+HCvZnW64= } + resolution: + { + integrity: sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ==, + } dev: false /webidl-conversions/3.0.1: From 8621a0a2a68a39e1466cc81e283755a5ba8b856c Mon Sep 17 00:00:00 2001 From: Jeff See Date: Tue, 25 Jul 2023 16:50:42 -0700 Subject: [PATCH 09/26] Use cleaner paths for nested imports --- .../components/posts/post.tsx | 6 +- packages/tinacms/package.json | 87 +++++++++++------- packages/tinacms/react.d.ts | 1 + packages/tinacms/rich-text.d.ts | 1 + packages/tinacms/rich-text/prism.d.ts | 1 + pnpm-lock.yaml | 89 ++++++++++++++++++- 6 files changed, 148 insertions(+), 37 deletions(-) create mode 100644 packages/tinacms/react.d.ts create mode 100644 packages/tinacms/rich-text.d.ts create mode 100644 packages/tinacms/rich-text/prism.d.ts diff --git a/experimental-examples/tina-cloud-starter/components/posts/post.tsx b/experimental-examples/tina-cloud-starter/components/posts/post.tsx index a05a90375e..60bab4817f 100644 --- a/experimental-examples/tina-cloud-starter/components/posts/post.tsx +++ b/experimental-examples/tina-cloud-starter/components/posts/post.tsx @@ -16,11 +16,13 @@ import { Container } from '../util/container' import { Section } from '../util/section' import { useTheme } from '../layout' import format from 'date-fns/format' -import { TinaMarkdown } from 'tinacms/dist/rich-text' +import { TinaMarkdown } from 'tinacms/rich-text' import { Prism } from 'tinacms/dist/rich-text/prism' import type { TinaMarkdownContent, Components } from 'tinacms/dist/rich-text' import { PostType } from '../../pages/posts/[filename]' -import { tinaField } from 'tinacms/dist/react' +import { tinaField } from 'tinacms/react' + +console.log('hihih', TinaMarkdown) const components: Components<{ BlockQuote: { diff --git a/packages/tinacms/package.json b/packages/tinacms/package.json index de7c03dc46..8f4c690cc2 100644 --- a/packages/tinacms/package.json +++ b/packages/tinacms/package.json @@ -19,11 +19,21 @@ "import": "./dist/edit-state.mjs", "require": "./dist/edit-state.js" }, + "./react": { + "types": "./dist/react.d.ts", + "import": "./dist/react.mjs", + "require": "./dist/react.js" + }, "./dist/react": { "types": "./dist/react.d.ts", "import": "./dist/react.mjs", "require": "./dist/react.js" }, + "./rich-text": { + "types": "./dist/rich-text/index.d.ts", + "import": "./dist/rich-text/index.mjs", + "require": "./dist/rich-text/index.js" + }, "./dist/rich-text": { "types": "./dist/rich-text/index.d.ts", "import": "./dist/rich-text/index.mjs", @@ -34,6 +44,11 @@ "import": "./dist/dev-tools.mjs", "require": "./dist/dev-tools.js" }, + "./rich-text/prism": { + "types": "./dist/rich-text/prism.d.ts", + "import": "./dist/rich-text/prism.mjs", + "require": "./dist/rich-text/prism.js" + }, "./dist/rich-text/prism": { "types": "./dist/rich-text/prism.d.ts", "import": "./dist/rich-text/prism.mjs", @@ -41,7 +56,10 @@ } }, "files": [ - "dist" + "dist", + "rich-text.d.ts", + "react.d.ts", + "rich-text/prism.d.ts" ], "buildConfig": { "entryPoints": [ @@ -62,43 +80,39 @@ "test": "vitest" }, "dependencies": { + "@floating-ui/dom": "^1.4.4", + "@floating-ui/react-dom": "^2.0.1", "@graphql-inspector/core": "^4.0.0", "@headlessui/react": "^1.5.0", "@heroicons/react": "^1.0.4", - "@react-hook/window-size": "^3.0.7", - "@tinacms/search": "workspace:*", - "@tinacms/schema-tools": "workspace:*", - "@tinacms/sharedctx": "workspace:*", - "crypto-js": "^4.0.0", - "encoding": "0.1.13", - "fetch-ponyfill": "^7.1.0", - "final-form": "4.20.4", - "graphql": "15.8.0", - "graphql-tag": "^2.11.0", - "lodash.set": "^4.3.2", - "prism-react-renderer": "^2.0.6", - "react-icons": "^4.3.1", - "react-router-dom": "6.3.0", - "yup": "^0.32.0", - "zod": "^3.14.3", - "@floating-ui/dom": "^1.4.4", - "@floating-ui/react-dom": "^2.0.1", "@monaco-editor/react": "4.4.5", "@radix-ui/react-popover": "^1.0.6", "@react-aria/i18n": "^3.3.4", + "@react-hook/window-size": "^3.0.7", "@react-types/combobox": "^3.2.0", "@react-types/shared": "^3.10.0", "@sambego/storybook-styles": "^1.0.0", + "@tinacms/schema-tools": "workspace:*", + "@tinacms/search": "workspace:*", + "@tinacms/sharedctx": "workspace:*", "@udecode/plate-headless": "^21.4.0", "atob": "2.1.2", "color-string": "^1.5.3", + "crypto-js": "^4.0.0", "date-fns": "2.30.0", + "encoding": "0.1.13", + "fetch-ponyfill": "^7.1.0", + "final-form": "4.20.4", "final-form-arrays": "^3.0.1", "final-form-set-field-data": "^1.0.2", + "graphql": "15.8.0", + "graphql-tag": "^2.11.0", "is-hotkey": "^0.2.0", "lodash.get": "^4.4.2", + "lodash.set": "^4.3.2", "moment": "2.29.4", "monaco-editor": "0.31.0", + "prism-react-renderer": "^2.0.6", "prismjs": "^1.28.0", "prop-types": "15.7.2", "react-beautiful-dnd": "^13.1.0", @@ -106,41 +120,44 @@ "react-datetime": "^2.16.3", "react-dropzone": "14.2.3", "react-final-form": "^6.3.0", + "react-icons": "^4.3.1", "react-onclickoutside": "^6.13.0", + "react-router-dom": "6.3.0", "react-textarea-autosize": "8.5.2", "scheduler": "0.19.0", "slate": "^0.94.1", "slate-history": "^0.93.0", "slate-hyperscript": "^0.77.0", "slate-react": "^0.97.1", - "webfontloader": "1.6.28" + "webfontloader": "1.6.28", + "yup": "^0.32.0", + "zod": "^3.14.3" }, "devDependencies": { + "@graphql-tools/utils": "^8.6.1", + "@testing-library/dom": "^7.21.4 ", + "@testing-library/jest-dom": "^5.16.5", + "@testing-library/react": "^12.0.0", + "@testing-library/react-hooks": "^7.0.2", + "@testing-library/user-event": "^12.7.0", + "@tinacms/scripts": "workspace:*", "@types/atob": "^2.1.2", "@types/codemirror": "^0.0.71", "@types/color-string": "^1.5.0", + "@types/jest": "^27.0.1", + "@types/lodash": "^4.14.169", "@types/lodash.debounce": "^4.0.6", "@types/lodash.get": "^4.4.5", + "@types/node": "^14.0.13", "@types/prop-types": "^15.7.4", + "@types/react": "^16.9.38", "@types/react-beautiful-dnd": "^11.0.3", "@types/react-color": "^3.0.1", "@types/react-dom": "^17.0.9", "@types/react-select": "^2.0.11", "@types/storybook__react": "^4.0.2", - "react-is": "^17.0.2", - "tslib": "^2.3.0", - "@graphql-tools/utils": "^8.6.1", - "@testing-library/jest-dom": "^5.16.5", - "@testing-library/react": "^12.0.0", - "@testing-library/react-hooks": "^7.0.2", - "@testing-library/user-event": "^12.7.0", - "@testing-library/dom": "^7.21.4 ", - "@tinacms/scripts": "workspace:*", - "@types/jest": "^27.0.1", - "@types/lodash": "^4.14.169", - "@types/node": "^14.0.13", - "@types/react": "^16.9.38", "@types/yup": "^0.29.10", + "happy-dom": "^10.5.2", "identity-obj-proxy": "^3.0.0", "isomorphic-fetch": "^3.0.0", "jest": "^29.5.0", @@ -149,8 +166,10 @@ "next": "12.2.4", "react": "17.0.2", "react-dom": "17.0.2", - "typescript": "4.3.5", + "react-is": "^17.0.2", "tsc-alias": "^1.8.7", + "tslib": "^2.3.0", + "typescript": "4.3.5", "vite": "^4.3.9", "vitest": "^0.32.2" }, diff --git a/packages/tinacms/react.d.ts b/packages/tinacms/react.d.ts new file mode 100644 index 0000000000..51d908681f --- /dev/null +++ b/packages/tinacms/react.d.ts @@ -0,0 +1 @@ +export * from './dist/react' diff --git a/packages/tinacms/rich-text.d.ts b/packages/tinacms/rich-text.d.ts new file mode 100644 index 0000000000..1fcd5fd04e --- /dev/null +++ b/packages/tinacms/rich-text.d.ts @@ -0,0 +1 @@ +export * from './dist/rich-text/index.d.ts' diff --git a/packages/tinacms/rich-text/prism.d.ts b/packages/tinacms/rich-text/prism.d.ts new file mode 100644 index 0000000000..ef6ee09e8f --- /dev/null +++ b/packages/tinacms/rich-text/prism.d.ts @@ -0,0 +1 @@ +export * from '../dist/rich-text/prism.d.ts' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5bc07813ee..1a73279c8e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1153,6 +1153,7 @@ importers: final-form-set-field-data: ^1.0.2 graphql: 15.8.0 graphql-tag: ^2.11.0 + happy-dom: ^10.5.2 identity-obj-proxy: ^3.0.0 is-hotkey: ^0.2.0 isomorphic-fetch: ^3.0.0 @@ -1269,6 +1270,7 @@ importers: '@types/react-select': 2.0.19 '@types/storybook__react': 4.0.2 '@types/yup': 0.29.14 + happy-dom: 10.5.2 identity-obj-proxy: 3.0.0 isomorphic-fetch: 3.0.0_encoding@0.1.13 jest: 29.5.0_@types+node@14.18.21 @@ -1282,7 +1284,7 @@ importers: tslib: 2.5.0 typescript: 4.3.5 vite: 4.3.9_@types+node@14.18.21 - vitest: 0.32.2 + vitest: 0.32.2_happy-dom@10.5.2 packages: /@adobe/css-tools/4.2.0: @@ -12168,6 +12170,7 @@ packages: typescript: 4.3.5 transitivePeerDependencies: - supports-color + dev: false /@typescript-eslint/parser/5.53.0_ypn2ylkkyfa5i233caldtndbqa: resolution: @@ -20226,6 +20229,20 @@ packages: uglify-js: 3.17.4 dev: true + /happy-dom/10.5.2: + resolution: + { + integrity: sha512-dTA1cDcLOPIkAdykLd9Wo1k8Ly36Hh2OdKGkWEHWuAHb89KcVVRLSj1OFev7ir90xhRLSGCGrEdDvS6u9l13kg==, + } + dependencies: + css.escape: 1.5.1 + entities: 4.5.0 + iconv-lite: 0.6.3 + webidl-conversions: 7.0.0 + whatwg-encoding: 2.0.0 + whatwg-mimetype: 3.0.0 + dev: true + /hard-rejection/2.1.0: resolution: { @@ -21300,6 +21317,7 @@ packages: whatwg-fetch: 3.6.2 transitivePeerDependencies: - encoding + dev: false /isomorphic-fetch/3.0.0_encoding@0.1.13: resolution: @@ -30265,6 +30283,75 @@ packages: - terser dev: true + /vitest/0.32.2_happy-dom@10.5.2: + resolution: + { + integrity: sha512-hU8GNNuQfwuQmqTLfiKcqEhZY72Zxb7nnN07koCUNmntNxbKQnVbeIS6sqUgR3eXSlbOpit8+/gr1KpqoMgWCQ==, + } + engines: { node: '>=v14.18.0' } + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@vitest/browser': '*' + '@vitest/ui': '*' + happy-dom: '*' + jsdom: '*' + playwright: '*' + safaridriver: '*' + webdriverio: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + playwright: + optional: true + safaridriver: + optional: true + webdriverio: + optional: true + dependencies: + '@types/chai': 4.3.5 + '@types/chai-subset': 1.3.3 + '@types/node': 18.7.18 + '@vitest/expect': 0.32.2 + '@vitest/runner': 0.32.2 + '@vitest/snapshot': 0.32.2 + '@vitest/spy': 0.32.2 + '@vitest/utils': 0.32.2 + acorn: 8.9.0 + acorn-walk: 8.2.0 + cac: 6.7.14 + chai: 4.3.7 + concordance: 5.0.4 + debug: 4.3.4 + happy-dom: 10.5.2 + local-pkg: 0.4.3 + magic-string: 0.30.0 + pathe: 1.1.1 + picocolors: 1.0.0 + std-env: 3.3.3 + strip-literal: 1.0.1 + tinybench: 2.5.0 + tinypool: 0.5.0 + vite: 4.3.9_@types+node@18.7.18 + vite-node: 0.32.2_@types+node@18.7.18 + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /vm2/3.9.19: resolution: { From a78d059d1fe6f22c777f37bd1a7487aea33bc9db Mon Sep 17 00:00:00 2001 From: Jeff See Date: Tue, 25 Jul 2023 17:06:19 -0700 Subject: [PATCH 10/26] Undo cleaner export --- packages/tinacms/jest.config.cjs | 6 - packages/tinacms/package.json | 3 - packages/tinacms/react.d.ts | 1 - packages/tinacms/rich-text.d.ts | 1 - packages/tinacms/rich-text/prism.d.ts | 1 - packages/tinacms/tsconfig.json | 8 +- pnpm-lock.yaml | 347 +------------------------- 7 files changed, 18 insertions(+), 349 deletions(-) delete mode 100644 packages/tinacms/jest.config.cjs delete mode 100644 packages/tinacms/react.d.ts delete mode 100644 packages/tinacms/rich-text.d.ts delete mode 100644 packages/tinacms/rich-text/prism.d.ts diff --git a/packages/tinacms/jest.config.cjs b/packages/tinacms/jest.config.cjs deleted file mode 100644 index 9f9a89c2a7..0000000000 --- a/packages/tinacms/jest.config.cjs +++ /dev/null @@ -1,6 +0,0 @@ -/** - -*/ - -const mod = require('@tinacms/scripts/dist/jest-runner.js') -module.exports = mod.default.config diff --git a/packages/tinacms/package.json b/packages/tinacms/package.json index 8f4c690cc2..ffceeb941e 100644 --- a/packages/tinacms/package.json +++ b/packages/tinacms/package.json @@ -144,7 +144,6 @@ "@types/atob": "^2.1.2", "@types/codemirror": "^0.0.71", "@types/color-string": "^1.5.0", - "@types/jest": "^27.0.1", "@types/lodash": "^4.14.169", "@types/lodash.debounce": "^4.0.6", "@types/lodash.get": "^4.4.5", @@ -160,8 +159,6 @@ "happy-dom": "^10.5.2", "identity-obj-proxy": "^3.0.0", "isomorphic-fetch": "^3.0.0", - "jest": "^29.5.0", - "jest-environment-jsdom": "^29.5.0", "jest-file-snapshot": "^0.5.0", "next": "12.2.4", "react": "17.0.2", diff --git a/packages/tinacms/react.d.ts b/packages/tinacms/react.d.ts deleted file mode 100644 index 51d908681f..0000000000 --- a/packages/tinacms/react.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dist/react' diff --git a/packages/tinacms/rich-text.d.ts b/packages/tinacms/rich-text.d.ts deleted file mode 100644 index 1fcd5fd04e..0000000000 --- a/packages/tinacms/rich-text.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dist/rich-text/index.d.ts' diff --git a/packages/tinacms/rich-text/prism.d.ts b/packages/tinacms/rich-text/prism.d.ts deleted file mode 100644 index ef6ee09e8f..0000000000 --- a/packages/tinacms/rich-text/prism.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '../dist/rich-text/prism.d.ts' diff --git a/packages/tinacms/tsconfig.json b/packages/tinacms/tsconfig.json index 96be0a93f8..c80f035024 100644 --- a/packages/tinacms/tsconfig.json +++ b/packages/tinacms/tsconfig.json @@ -9,6 +9,12 @@ "@toolkit/*": ["./src/toolkit/*"] }, }, - "exclude": ["src/**/*.test.tsx", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.spec.tsx"], + "exclude": [ + "src/**/*.test.tsx", + "src/**/*.test.ts", + "src/**/*.spec.ts", + "src/**/*.spec.tsx", + "dist" + ], "include": ["src"] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1a73279c8e..9de6cf96ab 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1128,7 +1128,6 @@ importers: '@types/atob': ^2.1.2 '@types/codemirror': ^0.0.71 '@types/color-string': ^1.5.0 - '@types/jest': ^27.0.1 '@types/lodash': ^4.14.169 '@types/lodash.debounce': ^4.0.6 '@types/lodash.get': ^4.4.5 @@ -1157,8 +1156,6 @@ importers: identity-obj-proxy: ^3.0.0 is-hotkey: ^0.2.0 isomorphic-fetch: ^3.0.0 - jest: ^29.5.0 - jest-environment-jsdom: ^29.5.0 jest-file-snapshot: ^0.5.0 lodash.get: ^4.4.2 lodash.set: ^4.3.2 @@ -1257,7 +1254,6 @@ importers: '@types/atob': 2.1.2 '@types/codemirror': 0.0.71 '@types/color-string': 1.5.2 - '@types/jest': 27.5.2 '@types/lodash': 4.14.182 '@types/lodash.debounce': 4.0.7 '@types/lodash.get': 4.4.7 @@ -1273,8 +1269,6 @@ importers: happy-dom: 10.5.2 identity-obj-proxy: 3.0.0 isomorphic-fetch: 3.0.0_encoding@0.1.13 - jest: 29.5.0_@types+node@14.18.21 - jest-environment-jsdom: 29.5.0 jest-file-snapshot: 0.5.0 next: 12.2.4_sfoxds7t5ydpegc3knd667wn6m react: 17.0.2 @@ -10980,14 +10974,6 @@ packages: dev: false optional: true - /@tootallnate/once/2.0.0: - resolution: - { - integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==, - } - engines: { node: '>= 10' } - dev: true - /@trysound/sax/0.2.0: resolution: { @@ -11470,17 +11456,6 @@ packages: } dev: true - /@types/jsdom/20.0.1: - resolution: - { - integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==, - } - dependencies: - '@types/node': 14.18.29 - '@types/tough-cookie': 4.0.2 - parse5: 7.1.2 - dev: true - /@types/json-schema/7.0.11: resolution: { @@ -12025,13 +12000,6 @@ packages: dependencies: '@types/node': 14.18.29 - /@types/tough-cookie/4.0.2: - resolution: - { - integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==, - } - dev: true - /@types/unist/2.0.6: resolution: { @@ -12170,7 +12138,6 @@ packages: typescript: 4.3.5 transitivePeerDependencies: - supports-color - dev: false /@typescript-eslint/parser/5.53.0_ypn2ylkkyfa5i233caldtndbqa: resolution: @@ -14208,13 +14175,6 @@ packages: - '@types/react' dev: false - /abab/2.0.6: - resolution: - { - integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==, - } - dev: true - /abbrev/1.1.1: resolution: { @@ -14272,16 +14232,6 @@ packages: mime-types: 2.1.35 negotiator: 0.6.3 - /acorn-globals/7.0.1: - resolution: - { - integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==, - } - dependencies: - acorn: 8.8.2 - acorn-walk: 8.2.0 - dev: true - /acorn-jsx/5.3.2_acorn@7.4.1: resolution: { @@ -16623,30 +16573,6 @@ packages: css-tree: 2.2.1 dev: true - /cssom/0.3.8: - resolution: - { - integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==, - } - dev: true - - /cssom/0.5.0: - resolution: - { - integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==, - } - dev: true - - /cssstyle/2.3.0: - resolution: - { - integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==, - } - engines: { node: '>=8' } - dependencies: - cssom: 0.3.8 - dev: true - /csstype/3.1.0: resolution: { @@ -16819,18 +16745,6 @@ packages: dev: false optional: true - /data-urls/3.0.2: - resolution: - { - integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==, - } - engines: { node: '>=12' } - dependencies: - abab: 2.0.6 - whatwg-mimetype: 3.0.0 - whatwg-url: 11.0.0 - dev: true - /dataloader/2.1.0: resolution: { @@ -17008,13 +16922,6 @@ packages: engines: { node: '>=10' } dev: false - /decimal.js/10.4.3: - resolution: - { - integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==, - } - dev: true - /decode-named-character-reference/1.0.2: resolution: { @@ -17396,16 +17303,6 @@ packages: } dev: true - /domexception/4.0.0: - resolution: - { - integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==, - } - engines: { node: '>=12' } - dependencies: - webidl-conversions: 7.0.0 - dev: true - /domhandler/4.3.1: resolution: { @@ -18136,22 +18033,6 @@ packages: dev: false optional: true - /escodegen/2.0.0: - resolution: - { - integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==, - } - engines: { node: '>=6.0' } - hasBin: true - dependencies: - esprima: 4.0.1 - estraverse: 5.3.0 - esutils: 2.0.3 - optionator: 0.8.3 - optionalDependencies: - source-map: 0.6.1 - dev: true - /eslint-config-next/13.4.7_3rubbgt5ekhqrcgx4uwls3neim: resolution: { @@ -19570,18 +19451,6 @@ packages: mime-types: 2.1.35 dev: true - /form-data/4.0.0: - resolution: - { - integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==, - } - engines: { node: '>= 6' } - dependencies: - asynckit: 0.4.0 - combined-stream: 1.0.8 - mime-types: 2.1.35 - dev: true - /format/0.2.2: resolution: { @@ -20391,16 +20260,6 @@ packages: dependencies: lru-cache: 6.0.0 - /html-encoding-sniffer/3.0.0: - resolution: - { - integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==, - } - engines: { node: '>=12' } - dependencies: - whatwg-encoding: 2.0.0 - dev: true - /html-entities/2.3.3: resolution: { @@ -20475,20 +20334,6 @@ packages: dev: false optional: true - /http-proxy-agent/5.0.0: - resolution: - { - integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==, - } - engines: { node: '>= 6' } - dependencies: - '@tootallnate/once': 2.0.0 - agent-base: 6.0.2 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - dev: true - /http-signature/1.3.6: resolution: { @@ -21121,13 +20966,6 @@ packages: engines: { node: '>=0.10.0' } dev: false - /is-potential-custom-element-name/1.0.1: - resolution: - { - integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==, - } - dev: true - /is-primitive/3.0.1: resolution: { @@ -21317,7 +21155,6 @@ packages: whatwg-fetch: 3.6.2 transitivePeerDependencies: - encoding - dev: false /isomorphic-fetch/3.0.0_encoding@0.1.13: resolution: @@ -21722,32 +21559,6 @@ packages: jest-util: 29.5.0 pretty-format: 29.5.0 - /jest-environment-jsdom/29.5.0: - resolution: - { - integrity: sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==, - } - engines: { node: ^14.15.0 || ^16.10.0 || >=18.0.0 } - peerDependencies: - canvas: ^2.5.0 - peerDependenciesMeta: - canvas: - optional: true - dependencies: - '@jest/environment': 29.5.0 - '@jest/fake-timers': 29.5.0 - '@jest/types': 29.5.0 - '@types/jsdom': 20.0.1 - '@types/node': 14.18.29 - jest-mock: 29.5.0 - jest-util: 29.5.0 - jsdom: 20.0.3 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: true - /jest-environment-node/29.5.0: resolution: { @@ -22256,50 +22067,6 @@ packages: } dev: true - /jsdom/20.0.3: - resolution: - { - integrity: sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==, - } - engines: { node: '>=14' } - peerDependencies: - canvas: ^2.5.0 - peerDependenciesMeta: - canvas: - optional: true - dependencies: - abab: 2.0.6 - acorn: 8.8.2 - acorn-globals: 7.0.1 - cssom: 0.5.0 - cssstyle: 2.3.0 - data-urls: 3.0.2 - decimal.js: 10.4.3 - domexception: 4.0.0 - escodegen: 2.0.0 - form-data: 4.0.0 - html-encoding-sniffer: 3.0.0 - http-proxy-agent: 5.0.0 - https-proxy-agent: 5.0.1 - is-potential-custom-element-name: 1.0.1 - nwsapi: 2.2.5 - parse5: 7.1.2 - saxes: 6.0.0 - symbol-tree: 3.2.4 - tough-cookie: 4.1.3 - w3c-xmlserializer: 4.0.0 - webidl-conversions: 7.0.0 - whatwg-encoding: 2.0.0 - whatwg-mimetype: 3.0.0 - whatwg-url: 11.0.0 - ws: 8.13.0 - xml-name-validator: 4.0.0 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: true - /jsesc/0.5.0: resolution: { @@ -22586,6 +22353,8 @@ packages: dependencies: prelude-ls: 1.1.2 type-check: 0.3.2 + dev: false + optional: true /levn/0.4.1: resolution: @@ -24798,13 +24567,6 @@ packages: engines: { node: '>=0.10.0' } dev: false - /nwsapi/2.2.5: - resolution: - { - integrity: sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==, - } - dev: true - /object-assign/3.0.0: resolution: { @@ -24945,6 +24707,8 @@ packages: prelude-ls: 1.1.2 type-check: 0.3.2 word-wrap: 1.2.3 + dev: false + optional: true /optionator/0.9.1: resolution: @@ -25248,15 +25012,6 @@ packages: json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 - /parse5/7.1.2: - resolution: - { - integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==, - } - dependencies: - entities: 4.5.0 - dev: true - /parseurl/1.3.3: resolution: { @@ -25785,6 +25540,8 @@ packages: integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==, } engines: { node: '>= 0.8.0' } + dev: false + optional: true /prelude-ls/1.2.1: resolution: @@ -26157,13 +25914,6 @@ packages: engines: { node: '>=0.6' } dev: true - /querystringify/2.2.0: - resolution: - { - integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==, - } - dev: true - /queue-lit/1.5.0: resolution: { @@ -27060,13 +26810,6 @@ packages: } dev: false - /requires-port/1.0.0: - resolution: - { - integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==, - } - dev: true - /resolve-alpn/1.2.1: resolution: { @@ -27314,16 +27057,6 @@ packages: dev: false optional: true - /saxes/6.0.0: - resolution: - { - integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==, - } - engines: { node: '>=v12.22.7' } - dependencies: - xmlchars: 2.2.0 - dev: true - /scheduler/0.19.0: resolution: { @@ -28459,13 +28192,6 @@ packages: tslib: 2.5.0 dev: false - /symbol-tree/3.2.4: - resolution: - { - integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==, - } - dev: true - /synckit/0.8.5: resolution: { @@ -28862,19 +28588,6 @@ packages: punycode: 2.1.1 dev: true - /tough-cookie/4.1.3: - resolution: - { - integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==, - } - engines: { node: '>=6' } - dependencies: - psl: 1.9.0 - punycode: 2.1.1 - universalify: 0.2.0 - url-parse: 1.5.10 - dev: true - /tr46/0.0.3: resolution: { @@ -28889,6 +28602,7 @@ packages: engines: { node: '>=12' } dependencies: punycode: 2.1.1 + dev: false /transform-markdown-links/2.0.0: resolution: @@ -29235,6 +28949,8 @@ packages: engines: { node: '>= 0.8.0' } dependencies: prelude-ls: 1.1.2 + dev: false + optional: true /type-check/0.4.0: resolution: @@ -29631,14 +29347,6 @@ packages: engines: { node: '>= 4.0.0' } dev: false - /universalify/0.2.0: - resolution: - { - integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==, - } - engines: { node: '>= 4.0.0' } - dev: true - /universalify/2.0.0: resolution: { @@ -29741,16 +29449,6 @@ packages: } dev: false - /url-parse/1.5.10: - resolution: - { - integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==, - } - dependencies: - querystringify: 2.2.0 - requires-port: 1.0.0 - dev: true - /url-pattern/1.0.3: resolution: { @@ -30393,16 +30091,6 @@ packages: } dev: false - /w3c-xmlserializer/4.0.0: - resolution: - { - integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==, - } - engines: { node: '>=14' } - dependencies: - xml-name-validator: 4.0.0 - dev: true - /walker/1.0.8: resolution: { @@ -30481,6 +30169,7 @@ packages: dependencies: tr46: 3.0.0 webidl-conversions: 7.0.0 + dev: false /whatwg-url/5.0.0: resolution: @@ -30676,6 +30365,7 @@ packages: optional: true utf-8-validate: optional: true + dev: false /ws/8.9.0: resolution: @@ -30693,21 +30383,6 @@ packages: optional: true dev: true - /xml-name-validator/4.0.0: - resolution: - { - integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==, - } - engines: { node: '>=12' } - dev: true - - /xmlchars/2.2.0: - resolution: - { - integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==, - } - dev: true - /xregexp/2.0.0: resolution: { From 4ebcc62db3158335f737cf3d74d00f417a3c7e1b Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 26 Jul 2023 09:20:28 -0700 Subject: [PATCH 11/26] Fix issue where slash was being added to url in rich-text --- .../@tinacms/mdx/src/parse/remarkToPlate.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/@tinacms/mdx/src/parse/remarkToPlate.ts b/packages/@tinacms/mdx/src/parse/remarkToPlate.ts index 5ed4f75855..080b88f03e 100644 --- a/packages/@tinacms/mdx/src/parse/remarkToPlate.ts +++ b/packages/@tinacms/mdx/src/parse/remarkToPlate.ts @@ -526,5 +526,22 @@ const sanitizeUrl = (url: string | undefined) => { return '' } - return parsedUrl.href + /** + * Trailing slash is added from new URL(...) for urls with no pathname, + * if the passed in url had one, keep it there, else just use the origin + * eg: + * + * http://example.com/ -> http://example.com/ + * http://example.com -> http://example.com + * http://example.com/a/b -> http://example.com/a/b + * http://example.com/a/b/ -> http://example.com/a/b/ + */ + if (parsedUrl.pathname === '/') { + if (url.endsWith('/')) { + return parsedUrl.href + } + return parsedUrl.origin + } else { + return parsedUrl.href + } } From a78c81f14584bbc3986ea005cfc00bdee84e2eb3 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 26 Jul 2023 09:40:33 -0700 Subject: [PATCH 12/26] Fix issue where non-object lists weren't handled properly for rich-text embeds --- .changeset/perfect-readers-guess.md | 5 ++ .../next/tests/mdx-table-like-field/field.ts | 59 +++++++++++++++ .../src/next/tests/mdx-table-like-field/in.md | 15 ++++ .../tests/mdx-table-like-field/index.test.ts | 13 ++++ .../next/tests/mdx-table-like-field/node.json | 72 +++++++++++++++++++ .../next/tests/mdx-table-like-field/out.md | 10 +++ packages/@tinacms/mdx/src/parse/acorn.ts | 8 +++ 7 files changed, 182 insertions(+) create mode 100644 .changeset/perfect-readers-guess.md create mode 100644 packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/field.ts create mode 100644 packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/in.md create mode 100644 packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/index.test.ts create mode 100644 packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/node.json create mode 100644 packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/out.md diff --git a/.changeset/perfect-readers-guess.md b/.changeset/perfect-readers-guess.md new file mode 100644 index 0000000000..061b724650 --- /dev/null +++ b/.changeset/perfect-readers-guess.md @@ -0,0 +1,5 @@ +--- +'@tinacms/mdx': patch +--- + +Fix issue where non-object lists weren't handled properly for rich-text embeds diff --git a/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/field.ts b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/field.ts new file mode 100644 index 0000000000..9cb6a9ef42 --- /dev/null +++ b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/field.ts @@ -0,0 +1,59 @@ +import { RichTextField } from '@tinacms/schema-tools' + +export const field: RichTextField = { + name: 'body', + type: 'rich-text', + parser: { type: 'mdx' }, + templates: [ + { + name: 'TestComponent', + label: 'Test component', + fields: [ + { + label: 'Rows', + name: 'rows', + type: 'object', + list: true, + fields: [ + { + label: 'Cells', + name: 'celss', + list: true, + type: 'string', + }, + { + label: 'Is Header', + name: 'isHeader', + type: 'boolean', + }, + ], + }, + ], + }, + { + name: 'TestComponent2', + label: 'Test component 2', + fields: [ + { + label: 'Rows', + name: 'rows', + type: 'object', + list: true, + fields: [ + { + label: 'Cells', + name: 'celss', + list: true, + type: 'number', + }, + { + label: 'Is Header', + name: 'isHeader', + type: 'boolean', + }, + ], + }, + ], + }, + ], +} diff --git a/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/in.md b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/in.md new file mode 100644 index 0000000000..679d4219ca --- /dev/null +++ b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/in.md @@ -0,0 +1,15 @@ +Welcome to the barebones starter for TinaCMS! + + + + diff --git a/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/index.test.ts b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/index.test.ts new file mode 100644 index 0000000000..5bc29f93e2 --- /dev/null +++ b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/index.test.ts @@ -0,0 +1,13 @@ +import { it, expect } from 'vitest' +import { parseMDX } from '../../../parse' +import { stringifyMDX } from '../../../stringify' +import { field } from './field' +import input from './in.md?raw' +import * as util from '../util' + +it('matches input', () => { + const tree = parseMDX(input, field, (v) => v) + expect(util.print(tree)).toMatchFile(util.nodePath(__dirname)) + const string = stringifyMDX(tree, field, (v) => v) + expect(string).toMatchFile(util.mdPath(__dirname)) +}) diff --git a/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/node.json b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/node.json new file mode 100644 index 0000000000..8e7eb06d29 --- /dev/null +++ b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/node.json @@ -0,0 +1,72 @@ +{ + "type": "root", + "children": [ + { + "type": "p", + "children": [ + { + "type": "text", + "text": "Welcome to the barebones starter for TinaCMS!" + } + ] + }, + { + "type": "mdxJsxFlowElement", + "name": "TestComponent", + "children": [ + { + "type": "text", + "text": "" + } + ], + "props": { + "rows": [ + { + "celss": [ + "Three", + "Two", + "One" + ], + "isHeader": true + }, + { + "celss": [ + "C", + "B", + "A" + ] + } + ] + } + }, + { + "type": "mdxJsxFlowElement", + "name": "TestComponent", + "children": [ + { + "type": "text", + "text": "" + } + ], + "props": { + "rows": [ + { + "celss": [ + 1, + 2, + 3 + ], + "isHeader": true + }, + { + "celss": [ + 4, + 5, + 6 + ] + } + ] + } + } + ] +} diff --git a/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/out.md b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/out.md new file mode 100644 index 0000000000..e7807f8325 --- /dev/null +++ b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/out.md @@ -0,0 +1,10 @@ +Welcome to the barebones starter for TinaCMS! + + + + diff --git a/packages/@tinacms/mdx/src/parse/acorn.ts b/packages/@tinacms/mdx/src/parse/acorn.ts index cef5aa726d..5f12ddf35e 100644 --- a/packages/@tinacms/mdx/src/parse/acorn.ts +++ b/packages/@tinacms/mdx/src/parse/acorn.ts @@ -186,6 +186,14 @@ const extractKeyValue = ( const value = extractObjectExpression(property.value, field) return { key, value } } + } else if (field?.list) { + assertType(property.value, 'ArrayExpression') + const value = property.value.elements.map((element) => { + assertHasType(element) + assertType(element, 'Literal') + return element.value + }) + return { key, value } } else { assertType(property.value, 'Literal') return { key, value: property.value.value } From 9794e9042897cd4273091122afeb76a0d02223dd Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 26 Jul 2023 10:28:49 -0700 Subject: [PATCH 13/26] Inclue tinacms as peer depency on media packages --- packages/next-tinacms-cloudinary/package.json | 4 +++- packages/next-tinacms-dos/package.json | 3 +++ packages/next-tinacms-s3/package.json | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/next-tinacms-cloudinary/package.json b/packages/next-tinacms-cloudinary/package.json index 9f1b2bb9ec..3f66ab5e71 100644 --- a/packages/next-tinacms-cloudinary/package.json +++ b/packages/next-tinacms-cloudinary/package.json @@ -36,7 +36,9 @@ "tinacms": "workspace:*", "typescript": "4.3.5" }, - "peerDependencies": {}, + "peerDependencies": { + "tinacms": "workspace:*" + }, "publishConfig": { "registry": "https://registry.npmjs.org" }, diff --git a/packages/next-tinacms-dos/package.json b/packages/next-tinacms-dos/package.json index f5d8f1e643..923e6d9b85 100644 --- a/packages/next-tinacms-dos/package.json +++ b/packages/next-tinacms-dos/package.json @@ -25,6 +25,9 @@ "@aws-sdk/client-s3": "^3.357.0", "multer": "1.4.5-lts.1" }, + "peerDependencies": { + "tinacms": "workspace:*" + }, "devDependencies": { "@tinacms/scripts": "workspace:*", "@types/crypto-js": "^3.1.47", diff --git a/packages/next-tinacms-s3/package.json b/packages/next-tinacms-s3/package.json index bffc7fe9fd..3593721f5c 100644 --- a/packages/next-tinacms-s3/package.json +++ b/packages/next-tinacms-s3/package.json @@ -38,7 +38,9 @@ "tinacms": "workspace:*", "typescript": "4.3.5" }, - "peerDependencies": {}, + "peerDependencies": { + "tinacms": "workspace:*" + }, "publishConfig": { "registry": "https://registry.npmjs.org" }, From bcc0b25b32c6cb6d9f0d72c9e755dffc8cec91a3 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 26 Jul 2023 10:29:57 -0700 Subject: [PATCH 14/26] Swap micromatch for picomatch-browser in schema-tools --- packages/@tinacms/schema-tools/package.json | 2 +- packages/@tinacms/schema-tools/src/schema/TinaSchema.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/@tinacms/schema-tools/package.json b/packages/@tinacms/schema-tools/package.json index 2bed7b0301..ff74f6c3fe 100644 --- a/packages/@tinacms/schema-tools/package.json +++ b/packages/@tinacms/schema-tools/package.json @@ -50,7 +50,7 @@ "directory": "packages/@tinacms/cli" }, "dependencies": { - "micromatch": "4.0.5", + "picomatch-browser": "2.2.6", "url-pattern": "^1.0.3", "zod": "^3.14.3" } diff --git a/packages/@tinacms/schema-tools/src/schema/TinaSchema.ts b/packages/@tinacms/schema-tools/src/schema/TinaSchema.ts index 363269818e..88ca09c569 100644 --- a/packages/@tinacms/schema-tools/src/schema/TinaSchema.ts +++ b/packages/@tinacms/schema-tools/src/schema/TinaSchema.ts @@ -1,4 +1,7 @@ -import micromatch from 'micromatch' +// micromatch/picomatch are not compatible in the browser +// https://github.com/micromatch/picomatch/pull/73#issuecomment-992497433 +import picomatch from 'picomatch-browser' + import { Schema, Collection, @@ -110,7 +113,7 @@ export class TinaSchema { if (collection?.match?.include || collection?.match?.exclude) { // if the collection has a match or exclude, we need to check if the file matches const matches = this.getMatches({ collection }) - const match = micromatch([filepath], matches).length > 0 + const match = picomatch([filepath], matches).length > 0 if (!match) { return false } @@ -472,7 +475,7 @@ export class TinaSchema { files: string[] }) { const matches = this.getMatches({ collection }) - const matchedFiles = micromatch(files, matches) + const matchedFiles = picomatch(files, matches) return matchedFiles } } From b278bd7248edcb0176d5652bd11b117906e607a3 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 26 Jul 2023 10:30:10 -0700 Subject: [PATCH 15/26] Fix console errors in CMS --- packages/tinacms/src/admin/pages/CollectionCreatePage.tsx | 2 +- packages/tinacms/src/admin/pages/CollectionListPage.tsx | 4 ++-- .../tinacms/src/toolkit/components/media/media-manager.tsx | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/tinacms/src/admin/pages/CollectionCreatePage.tsx b/packages/tinacms/src/admin/pages/CollectionCreatePage.tsx index 415dd93ae5..35207abe2c 100644 --- a/packages/tinacms/src/admin/pages/CollectionCreatePage.tsx +++ b/packages/tinacms/src/admin/pages/CollectionCreatePage.tsx @@ -222,7 +222,7 @@ export const RenderForm = ({ ? wrapFieldsWithMeta(({ field, input, meta }) => { return ( ) diff --git a/packages/tinacms/src/admin/pages/CollectionListPage.tsx b/packages/tinacms/src/admin/pages/CollectionListPage.tsx index e0503ede1d..d930f05ce6 100644 --- a/packages/tinacms/src/admin/pages/CollectionListPage.tsx +++ b/packages/tinacms/src/admin/pages/CollectionListPage.tsx @@ -539,7 +539,7 @@ const CollectionListPage = () => { {documents.length > 0 ? ( - {folder.name && !search && ( + {folder.name && !search ? ( - )} + ) : null} {documents.map((document) => { if (document.node.__typename === 'Folder') { return ( diff --git a/packages/tinacms/src/toolkit/components/media/media-manager.tsx b/packages/tinacms/src/toolkit/components/media/media-manager.tsx index 2b30ca0fef..dee60f1ea0 100644 --- a/packages/tinacms/src/toolkit/components/media/media-manager.tsx +++ b/packages/tinacms/src/toolkit/components/media/media-manager.tsx @@ -571,12 +571,13 @@ const UploadButton = ({ onClick, uploading }: any) => { } const LoadingMediaList = (props) => { + const { extraText, ...rest } = props return (
    - {props.extraText &&

    {props.extraText}

    } + {extraText &&

    {props}

    }
    ) From 8489b7711305b988e9777841cfa26ac007813c30 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 26 Jul 2023 10:30:19 -0700 Subject: [PATCH 16/26] Cleanup --- package.json | 6 +- pnpm-lock.yaml | 313 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 205 insertions(+), 114 deletions(-) diff --git a/package.json b/package.json index d142b74c7b..2702398eb9 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "format": "prettier --write .", "postinstall": "husky install" }, - "dependencies": { + "devDependencies": { "@changesets/cli": "^2.26.0", "@typescript-eslint/eslint-plugin": "^5.60.0", "@typescript-eslint/parser": "^5.60.0", @@ -40,9 +40,7 @@ "prettier": "^2.8.4", "pretty-quick": "^3.1.3", "typescript": "4.3.5", - "workspace": "^0.0.1-preview.1" - }, - "devDependencies": { + "workspace": "^0.0.1-preview.1", "@types/jest": "^27.5.2", "cypress": "9.7.0", "husky": "^7.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9de6cf96ab..b4f9e4d8f6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,24 +29,23 @@ importers: turbo: ^1.8.5 typescript: 4.3.5 workspace: ^0.0.1-preview.1 - dependencies: + devDependencies: '@changesets/cli': 2.26.0 + '@types/jest': 27.5.2 '@typescript-eslint/eslint-plugin': 5.60.0_77qnkpnezg256yefn34krfy73a '@typescript-eslint/parser': 5.60.0_ti4q7vly6pc5f5b456fghbmr4m + cypress: 9.7.0 eslint: 8.43.0 eslint-config-prettier: 8.8.0_eslint@8.43.0 eslint-plugin-react: 7.32.2_eslint@8.43.0 eslint-plugin-react-hooks: 4.6.0_eslint@8.43.0 + husky: 7.0.4 mime-types: 2.1.35 prettier: 2.8.4 pretty-quick: 3.1.3_prettier@2.8.4 + turbo: 1.8.5 typescript: 4.3.5 workspace: 0.0.1-preview.1 - devDependencies: - '@types/jest': 27.5.2 - cypress: 9.7.0 - husky: 7.0.4 - turbo: 1.8.5 examples/basic-iframe: specifiers: @@ -833,14 +832,14 @@ importers: '@types/micromatch': ^4.0.2 '@types/yup': ^0.29.10 jest: ^29.5.0 - micromatch: 4.0.5 + picomatch-browser: 2.2.6 react: 17.0.2 typescript: 4.3.5 url-pattern: ^1.0.3 yup: ^0.32.0 zod: ^3.14.3 dependencies: - micromatch: 4.0.5 + picomatch-browser: 2.2.6 url-pattern: 1.0.3 zod: 3.17.3 devDependencies: @@ -6354,7 +6353,7 @@ packages: prettier: 2.8.4 resolve-from: 5.0.0 semver: 7.5.2 - dev: false + dev: true /@changesets/assemble-release-plan/5.2.3: resolution: @@ -6368,7 +6367,7 @@ packages: '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 semver: 7.5.2 - dev: false + dev: true /@changesets/changelog-git/0.1.14: resolution: @@ -6377,7 +6376,7 @@ packages: } dependencies: '@changesets/types': 5.2.1 - dev: false + dev: true /@changesets/cli/2.26.0: resolution: @@ -6419,7 +6418,7 @@ packages: spawndamnit: 2.0.0 term-size: 2.2.1 tty-table: 4.1.6 - dev: false + dev: true /@changesets/config/2.3.0: resolution: @@ -6434,7 +6433,7 @@ packages: '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 micromatch: 4.0.5 - dev: false + dev: true /@changesets/errors/0.1.4: resolution: @@ -6443,7 +6442,7 @@ packages: } dependencies: extendable-error: 0.1.7 - dev: false + dev: true /@changesets/get-dependents-graph/1.3.5: resolution: @@ -6456,7 +6455,7 @@ packages: chalk: 2.4.2 fs-extra: 7.0.1 semver: 7.5.2 - dev: false + dev: true /@changesets/get-release-plan/3.0.16: resolution: @@ -6471,14 +6470,14 @@ packages: '@changesets/read': 0.5.9 '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 - dev: false + dev: true /@changesets/get-version-range-type/0.3.2: resolution: { integrity: sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==, } - dev: false + dev: true /@changesets/git/2.0.0: resolution: @@ -6493,7 +6492,7 @@ packages: is-subdir: 1.2.0 micromatch: 4.0.5 spawndamnit: 2.0.0 - dev: false + dev: true /@changesets/logger/0.0.5: resolution: @@ -6502,7 +6501,7 @@ packages: } dependencies: chalk: 2.4.2 - dev: false + dev: true /@changesets/parse/0.3.16: resolution: @@ -6512,7 +6511,7 @@ packages: dependencies: '@changesets/types': 5.2.1 js-yaml: 3.14.1 - dev: false + dev: true /@changesets/pre/1.0.14: resolution: @@ -6525,7 +6524,7 @@ packages: '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - dev: false + dev: true /@changesets/read/0.5.9: resolution: @@ -6541,21 +6540,21 @@ packages: chalk: 2.4.2 fs-extra: 7.0.1 p-filter: 2.1.0 - dev: false + dev: true /@changesets/types/4.1.0: resolution: { integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==, } - dev: false + dev: true /@changesets/types/5.2.1: resolution: { integrity: sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==, } - dev: false + dev: true /@changesets/write/0.2.3: resolution: @@ -6568,7 +6567,7 @@ packages: fs-extra: 7.0.1 human-id: 1.0.2 prettier: 2.8.4 - dev: false + dev: true /@codemirror/language/6.0.0: resolution: @@ -7299,7 +7298,7 @@ packages: dependencies: eslint: 8.43.0 eslint-visitor-keys: 3.4.1 - dev: false + dev: true /@eslint-community/regexpp/4.5.1: resolution: @@ -7307,6 +7306,7 @@ packages: integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==, } engines: { node: ^12.0.0 || ^14.0.0 || >=16.0.0 } + dev: true /@eslint/eslintrc/0.4.3: resolution: @@ -7366,7 +7366,7 @@ packages: strip-json-comments: 3.1.1 transitivePeerDependencies: - supports-color - dev: false + dev: true /@eslint/js/8.43.0: resolution: @@ -7374,7 +7374,7 @@ packages: integrity: sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==, } engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 } - dev: false + dev: true /@floating-ui/core/1.3.1: resolution: @@ -8062,7 +8062,7 @@ packages: minimatch: 3.1.2 transitivePeerDependencies: - supports-color - dev: false + dev: true /@humanwhocodes/config-array/0.5.0: resolution: @@ -8091,12 +8091,14 @@ packages: integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==, } engines: { node: '>=12.22' } + dev: true /@humanwhocodes/object-schema/1.2.1: resolution: { integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==, } + dev: true /@iarna/toml/2.2.5: resolution: @@ -8533,7 +8535,7 @@ packages: '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 - dev: false + dev: true /@manypkg/get-packages/1.1.3: resolution: @@ -8547,7 +8549,7 @@ packages: fs-extra: 8.1.0 globby: 11.1.0 read-yaml-file: 1.1.0 - dev: false + dev: true /@monaco-editor/loader/1.3.2_monaco-editor@0.31.0: resolution: @@ -11350,7 +11352,7 @@ packages: } dependencies: ci-info: 3.4.0 - dev: false + dev: true /@types/is-hotkey/0.1.7: resolution: @@ -11461,6 +11463,7 @@ packages: { integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==, } + dev: true /@types/json5/0.0.29: resolution: @@ -11622,7 +11625,7 @@ packages: { integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==, } - dev: false + dev: true /@types/minimist/1.2.2: resolution: @@ -11660,7 +11663,7 @@ packages: { integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==, } - dev: false + dev: true /@types/node/13.13.52: resolution: @@ -11906,13 +11909,14 @@ packages: { integrity: sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A==, } - dev: false + dev: true /@types/semver/7.3.12: resolution: { integrity: sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==, } + dev: true /@types/serve-static/1.13.10: resolution: @@ -12138,6 +12142,7 @@ packages: typescript: 4.3.5 transitivePeerDependencies: - supports-color + dev: true /@typescript-eslint/parser/5.53.0_ypn2ylkkyfa5i233caldtndbqa: resolution: @@ -12206,7 +12211,7 @@ packages: typescript: 4.3.5 transitivePeerDependencies: - supports-color - dev: false + dev: true /@typescript-eslint/parser/5.60.0_ypn2ylkkyfa5i233caldtndbqa: resolution: @@ -12251,6 +12256,7 @@ packages: dependencies: '@typescript-eslint/types': 5.60.0 '@typescript-eslint/visitor-keys': 5.60.0 + dev: true /@typescript-eslint/type-utils/5.60.0_ti4q7vly6pc5f5b456fghbmr4m: resolution: @@ -12273,7 +12279,7 @@ packages: typescript: 4.3.5 transitivePeerDependencies: - supports-color - dev: false + dev: true /@typescript-eslint/type-utils/5.60.0_ypn2ylkkyfa5i233caldtndbqa: resolution: @@ -12312,6 +12318,7 @@ packages: integrity: sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==, } engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 } + dev: true /@typescript-eslint/typescript-estree/5.53.0_typescript@4.8.4: resolution: @@ -12359,7 +12366,7 @@ packages: typescript: 4.3.5 transitivePeerDependencies: - supports-color - dev: false + dev: true /@typescript-eslint/typescript-estree/5.60.0_typescript@4.8.4: resolution: @@ -12406,7 +12413,7 @@ packages: transitivePeerDependencies: - supports-color - typescript - dev: false + dev: true /@typescript-eslint/utils/5.60.0_ypn2ylkkyfa5i233caldtndbqa: resolution: @@ -12451,6 +12458,7 @@ packages: dependencies: '@typescript-eslint/types': 5.60.0 eslint-visitor-keys: 3.3.0 + dev: true /@udecode/plate-alignment/21.3.2_nszsoeqh6opcaij3vbhkqtupqm: resolution: @@ -14263,6 +14271,7 @@ packages: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: acorn: 8.8.2 + dev: true /acorn-node/1.8.2: resolution: @@ -14403,6 +14412,7 @@ packages: integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==, } engines: { node: '>=6' } + dev: true /ansi-escapes/4.3.2: resolution: @@ -14562,7 +14572,7 @@ packages: integrity: sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==, } engines: { node: '>=8' } - dev: false + dev: true /array-flatten/1.1.1: resolution: @@ -14583,6 +14593,7 @@ packages: es-abstract: 1.21.1 get-intrinsic: 1.1.3 is-string: 1.0.7 + dev: true /array-union/2.1.0: resolution: @@ -14602,6 +14613,7 @@ packages: define-properties: 1.1.4 es-abstract: 1.21.1 es-shim-unscopables: 1.0.0 + dev: true /array.prototype.flatmap/1.3.1: resolution: @@ -14614,6 +14626,7 @@ packages: define-properties: 1.1.4 es-abstract: 1.21.1 es-shim-unscopables: 1.0.0 + dev: true /array.prototype.tosorted/1.1.1: resolution: @@ -14626,6 +14639,7 @@ packages: es-abstract: 1.21.1 es-shim-unscopables: 1.0.0 get-intrinsic: 1.1.3 + dev: true /arrify/1.0.1: resolution: @@ -14640,7 +14654,7 @@ packages: integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==, } engines: { node: '>=8' } - dev: false + dev: true /asap/2.0.6: resolution: @@ -14796,6 +14810,7 @@ packages: integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==, } engines: { node: '>= 0.4' } + dev: true /aws-crt/1.14.3: resolution: @@ -15142,7 +15157,7 @@ packages: engines: { node: '>=4' } dependencies: is-windows: 1.0.2 - dev: false + dev: true /better-sqlite3/8.4.0: resolution: @@ -15296,7 +15311,7 @@ packages: } dependencies: wcwidth: 1.0.1 - dev: false + dev: true /browser-level/1.0.1: resolution: @@ -15524,6 +15539,7 @@ packages: camelcase: 5.3.1 map-obj: 4.3.0 quick-lru: 4.0.1 + dev: true /camelcase-keys/7.0.2: resolution: @@ -15666,6 +15682,7 @@ packages: dependencies: ansi-styles: 4.3.0 supports-color: 7.2.0 + dev: true /chalk/4.1.2: resolution: @@ -15791,7 +15808,7 @@ packages: { integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==, } - dev: false + dev: true /charwise/3.0.1: resolution: @@ -15950,7 +15967,6 @@ packages: string-width: 4.2.3 strip-ansi: 6.0.1 wrap-ansi: 6.2.0 - dev: false /cliui/7.0.4: resolution: @@ -15977,7 +15993,7 @@ packages: integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==, } engines: { node: '>=0.8' } - dev: false + dev: true /cloudinary-core/2.13.0_lodash@4.17.21: resolution: @@ -16457,7 +16473,7 @@ packages: lru-cache: 4.1.5 shebang-command: 1.2.0 which: 1.3.1 - dev: false + dev: true /cross-spawn/7.0.3: resolution: @@ -16584,21 +16600,21 @@ packages: { integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==, } - dev: false + dev: true /csv-parse/4.16.3: resolution: { integrity: sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==, } - dev: false + dev: true /csv-stringify/5.6.5: resolution: { integrity: sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==, } - dev: false + dev: true /csv/5.5.3: resolution: @@ -16611,7 +16627,7 @@ packages: csv-parse: 4.16.3 csv-stringify: 5.6.5 stream-transform: 2.1.3 - dev: false + dev: true /cypress/10.10.0: resolution: @@ -16985,7 +17001,7 @@ packages: } dependencies: clone: 1.0.4 - dev: false + dev: true /defer-to-connect/2.0.1: resolution: @@ -17107,7 +17123,7 @@ packages: integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==, } engines: { node: '>=8' } - dev: false + dev: true /detect-libc/2.0.1: resolution: @@ -17257,6 +17273,7 @@ packages: engines: { node: '>=0.10.0' } dependencies: esutils: 2.0.3 + dev: true /doctrine/3.0.0: resolution: @@ -17266,6 +17283,7 @@ packages: engines: { node: '>=6.0.0' } dependencies: esutils: 2.0.3 + dev: true /dom-accessibility-api/0.5.14: resolution: @@ -17525,6 +17543,7 @@ packages: engines: { node: '>=8.6' } dependencies: ansi-colors: 4.1.3 + dev: true /entities/2.1.0: resolution: @@ -17603,6 +17622,7 @@ packages: typed-array-length: 1.0.4 unbox-primitive: 1.0.2 which-typed-array: 1.1.9 + dev: true /es-set-tostringtag/2.0.1: resolution: @@ -17614,6 +17634,7 @@ packages: get-intrinsic: 1.2.0 has: 1.0.3 has-tostringtag: 1.0.0 + dev: true /es-shim-unscopables/1.0.0: resolution: @@ -17622,6 +17643,7 @@ packages: } dependencies: has: 1.0.3 + dev: true /es-to-primitive/1.2.1: resolution: @@ -17633,6 +17655,7 @@ packages: is-callable: 1.2.7 is-date-object: 1.0.5 is-symbol: 1.0.4 + dev: true /esbuild-android-64/0.15.12: resolution: @@ -18015,6 +18038,7 @@ packages: integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==, } engines: { node: '>=10' } + dev: true /escodegen/1.14.3: resolution: @@ -18099,7 +18123,7 @@ packages: eslint: '>=7.0.0' dependencies: eslint: 8.43.0 - dev: false + dev: true /eslint-import-resolver-node/0.3.6: resolution: @@ -18341,7 +18365,7 @@ packages: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 dependencies: eslint: 8.43.0 - dev: false + dev: true /eslint-plugin-react/7.32.2_eslint@7.32.0: resolution: @@ -18422,7 +18446,7 @@ packages: resolve: 2.0.0-next.4 semver: 7.5.2 string.prototype.matchall: 4.0.8 - dev: false + dev: true /eslint-scope/5.1.1: resolution: @@ -18433,6 +18457,7 @@ packages: dependencies: esrecurse: 4.3.0 estraverse: 4.3.0 + dev: true /eslint-scope/7.1.1: resolution: @@ -18454,7 +18479,7 @@ packages: dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 - dev: false + dev: true /eslint-utils/2.1.0: resolution: @@ -18501,6 +18526,7 @@ packages: integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==, } engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 } + dev: true /eslint-visitor-keys/3.4.1: resolution: @@ -18508,6 +18534,7 @@ packages: integrity: sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==, } engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 } + dev: true /eslint/7.32.0: resolution: @@ -18661,7 +18688,7 @@ packages: text-table: 0.2.0 transitivePeerDependencies: - supports-color - dev: false + dev: true /espree/7.3.1: resolution: @@ -18697,7 +18724,7 @@ packages: acorn: 8.8.2 acorn-jsx: 5.3.2_acorn@8.8.2 eslint-visitor-keys: 3.4.1 - dev: false + dev: true /esprima/4.0.1: resolution: @@ -18725,7 +18752,7 @@ packages: engines: { node: '>=0.10' } dependencies: estraverse: 5.3.0 - dev: false + dev: true /esrecurse/4.3.0: resolution: @@ -18735,6 +18762,7 @@ packages: engines: { node: '>=4.0' } dependencies: estraverse: 5.3.0 + dev: true /estraverse/4.3.0: resolution: @@ -18749,6 +18777,7 @@ packages: integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==, } engines: { node: '>=4.0' } + dev: true /estree-util-is-identifier-name/2.1.0: resolution: @@ -18849,6 +18878,7 @@ packages: onetime: 5.1.2 signal-exit: 3.0.7 strip-final-newline: 2.0.0 + dev: true /execa/5.1.1: resolution: @@ -18984,7 +19014,7 @@ packages: { integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==, } - dev: false + dev: true /external-editor/3.1.0: resolution: @@ -18996,7 +19026,7 @@ packages: chardet: 0.7.0 iconv-lite: 0.4.24 tmp: 0.0.33 - dev: false + dev: true /extract-zip/2.0.1: resolution: @@ -19215,6 +19245,7 @@ packages: engines: { node: ^10.12.0 || >=12.0.0 } dependencies: flat-cache: 3.0.4 + dev: true /file-selector/0.6.0: resolution: @@ -19365,7 +19396,7 @@ packages: dependencies: micromatch: 4.0.5 pkg-dir: 4.2.0 - dev: false + dev: true /flat-cache/3.0.4: resolution: @@ -19376,6 +19407,7 @@ packages: dependencies: flatted: 3.2.6 rimraf: 3.0.2 + dev: true /flatted/3.2.6: resolution: @@ -19420,6 +19452,7 @@ packages: } dependencies: is-callable: 1.2.7 + dev: true /foreground-child/2.0.0: resolution: @@ -19556,7 +19589,7 @@ packages: graceful-fs: 4.2.10 jsonfile: 4.0.0 universalify: 0.1.2 - dev: false + dev: true /fs-extra/8.1.0: resolution: @@ -19568,7 +19601,6 @@ packages: graceful-fs: 4.2.10 jsonfile: 4.0.0 universalify: 0.1.2 - dev: false /fs-extra/9.1.0: resolution: @@ -19659,6 +19691,7 @@ packages: define-properties: 1.1.4 es-abstract: 1.21.1 functions-have-names: 1.2.3 + dev: true /functional-red-black-tree/1.0.1: resolution: @@ -19671,6 +19704,7 @@ packages: { integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==, } + dev: true /gauge/1.2.7: resolution: @@ -19715,6 +19749,7 @@ packages: function-bind: 1.1.1 has: 1.0.3 has-symbols: 1.0.3 + dev: true /get-intrinsic/1.2.0: resolution: @@ -19766,6 +19801,7 @@ packages: dependencies: call-bind: 1.0.2 get-intrinsic: 1.2.0 + dev: true /get-tsconfig/4.4.0: resolution: @@ -19910,7 +19946,7 @@ packages: engines: { node: '>=8' } dependencies: type-fest: 0.20.2 - dev: false + dev: true /globalthis/1.0.3: resolution: @@ -19920,6 +19956,7 @@ packages: engines: { node: '>= 0.4' } dependencies: define-properties: 1.1.4 + dev: true /globalyzer/0.1.0: resolution: @@ -19970,6 +20007,7 @@ packages: } dependencies: get-intrinsic: 1.2.0 + dev: true /got/11.8.6: resolution: @@ -20002,13 +20040,14 @@ packages: { integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==, } + dev: true /graphemer/1.4.0: resolution: { integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==, } - dev: false + dev: true /graphiql/3.0.0-alpha.1_ahyw56tg4nqq3um635qwsegk3u: resolution: @@ -20130,6 +20169,7 @@ packages: { integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==, } + dev: true /has-flag/3.0.0: resolution: @@ -20159,6 +20199,7 @@ packages: integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==, } engines: { node: '>= 0.4' } + dev: true /has-symbols/1.0.3: resolution: @@ -20175,6 +20216,7 @@ packages: engines: { node: '>= 0.4' } dependencies: has-symbols: 1.0.3 + dev: true /has-unicode/2.0.1: resolution: @@ -20250,6 +20292,7 @@ packages: { integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==, } + dev: true /hosted-git-info/4.1.0: resolution: @@ -20374,7 +20417,7 @@ packages: { integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==, } - dev: false + dev: true /human-signals/1.1.1: resolution: @@ -20382,6 +20425,7 @@ packages: integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==, } engines: { node: '>=8.12.0' } + dev: true /human-signals/2.1.0: resolution: @@ -20511,6 +20555,7 @@ packages: integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==, } engines: { node: '>=8' } + dev: true /indent-string/5.0.0: resolution: @@ -20568,6 +20613,7 @@ packages: get-intrinsic: 1.2.0 has: 1.0.3 side-channel: 1.0.4 + dev: true /internal-slot/1.0.5: resolution: @@ -20579,6 +20625,7 @@ packages: get-intrinsic: 1.2.0 has: 1.0.3 side-channel: 1.0.4 + dev: true /intl-messageformat/9.13.0: resolution: @@ -20684,6 +20731,7 @@ packages: call-bind: 1.0.2 get-intrinsic: 1.2.0 is-typed-array: 1.1.10 + dev: true /is-arrayish/0.2.1: resolution: @@ -20705,6 +20753,7 @@ packages: } dependencies: has-bigints: 1.0.2 + dev: true /is-binary-path/2.1.0: resolution: @@ -20724,6 +20773,7 @@ packages: dependencies: call-bind: 1.0.2 has-tostringtag: 1.0.0 + dev: true /is-buffer/2.0.5: resolution: @@ -20738,6 +20788,7 @@ packages: integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==, } engines: { node: '>= 0.4' } + dev: true /is-ci/3.0.1: resolution: @@ -20747,6 +20798,7 @@ packages: hasBin: true dependencies: ci-info: 3.4.0 + dev: true /is-core-module/2.10.0: resolution: @@ -20755,6 +20807,7 @@ packages: } dependencies: has: 1.0.3 + dev: true /is-core-module/2.12.0: resolution: @@ -20772,6 +20825,7 @@ packages: engines: { node: '>= 0.4' } dependencies: has-tostringtag: 1.0.0 + dev: true /is-decimal/1.0.4: resolution: @@ -20902,6 +20956,7 @@ packages: integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==, } engines: { node: '>= 0.4' } + dev: true /is-number-object/1.0.7: resolution: @@ -20911,6 +20966,7 @@ packages: engines: { node: '>= 0.4' } dependencies: has-tostringtag: 1.0.0 + dev: true /is-number/7.0.0: resolution: @@ -20925,6 +20981,7 @@ packages: integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==, } engines: { node: '>=8' } + dev: true /is-plain-obj/1.1.0: resolution: @@ -20983,6 +21040,7 @@ packages: dependencies: call-bind: 1.0.2 has-tostringtag: 1.0.0 + dev: true /is-relative/1.0.0: resolution: @@ -21001,6 +21059,7 @@ packages: } dependencies: call-bind: 1.0.2 + dev: true /is-stream/2.0.1: resolution: @@ -21017,6 +21076,7 @@ packages: engines: { node: '>= 0.4' } dependencies: has-tostringtag: 1.0.0 + dev: true /is-subdir/1.2.0: resolution: @@ -21026,7 +21086,7 @@ packages: engines: { node: '>=4' } dependencies: better-path-resolve: 1.0.0 - dev: false + dev: true /is-symbol/1.0.4: resolution: @@ -21036,6 +21096,7 @@ packages: engines: { node: '>= 0.4' } dependencies: has-symbols: 1.0.3 + dev: true /is-typed-array/1.1.10: resolution: @@ -21049,6 +21110,7 @@ packages: for-each: 0.3.3 gopd: 1.0.1 has-tostringtag: 1.0.0 + dev: true /is-typedarray/1.0.0: resolution: @@ -21099,6 +21161,7 @@ packages: } dependencies: call-bind: 1.0.2 + dev: true /is-windows/1.0.2: resolution: @@ -21106,7 +21169,6 @@ packages: integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==, } engines: { node: '>=0.10.0' } - dev: false /is-wsl/2.2.0: resolution: @@ -22121,6 +22183,7 @@ packages: { integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==, } + dev: true /json-stringify-safe/5.0.1: resolution: @@ -22152,7 +22215,6 @@ packages: } optionalDependencies: graceful-fs: 4.2.10 - dev: false /jsonfile/6.1.0: resolution: @@ -22194,6 +22256,7 @@ packages: dependencies: array-includes: 3.1.6 object.assign: 4.1.4 + dev: true /keyv/4.5.2: resolution: @@ -22224,7 +22287,6 @@ packages: integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==, } engines: { node: '>=6' } - dev: false /language-subtag-registry/0.3.21: resolution: @@ -22365,6 +22427,7 @@ packages: dependencies: prelude-ls: 1.2.1 type-check: 0.4.0 + dev: true /lilconfig/2.0.6: resolution: @@ -22436,7 +22499,7 @@ packages: js-yaml: 3.14.1 pify: 4.0.1 strip-bom: 3.0.0 - dev: false + dev: true /local-pkg/0.4.3: resolution: @@ -22555,6 +22618,7 @@ packages: { integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==, } + dev: true /lodash.truncate/4.4.2: resolution: @@ -22681,7 +22745,7 @@ packages: dependencies: pseudomap: 1.0.2 yallist: 2.1.2 - dev: false + dev: true /lru-cache/5.1.1: resolution: @@ -23240,7 +23304,7 @@ packages: trim-newlines: 3.0.1 type-fest: 0.13.1 yargs-parser: 18.1.3 - dev: false + dev: true /meow/9.0.0: resolution: @@ -23933,7 +23997,7 @@ packages: integrity: sha512-3KYa4m4Vlqx98GPdOHghxSdNtTvcP8E0kkaJ5Dlh+h2DRzF7zpuVVcA8B0QpKd11YJeP9QQ7ASkKzOeu195Wzw==, } engines: { node: '>= 8.0.0' } - dev: false + dev: true /mkdirp-classic/0.5.3: resolution: @@ -24082,7 +24146,6 @@ packages: integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==, } engines: { node: '>=4' } - dev: false /ms/2.0.0: resolution: @@ -24130,7 +24193,7 @@ packages: array-union: 2.1.0 arrify: 2.0.1 minimatch: 3.1.2 - dev: false + dev: true /mylas/2.1.13: resolution: @@ -24184,6 +24247,7 @@ packages: { integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==, } + dev: true /natural-compare/1.4.0: resolution: @@ -24465,6 +24529,7 @@ packages: resolve: 1.22.2 semver: 7.5.2 validate-npm-package-license: 3.0.4 + dev: true /normalize-package-data/3.0.3: resolution: @@ -24624,6 +24689,7 @@ packages: call-bind: 1.0.2 define-properties: 1.1.4 es-abstract: 1.21.1 + dev: true /object.fromentries/2.0.6: resolution: @@ -24635,6 +24701,7 @@ packages: call-bind: 1.0.2 define-properties: 1.1.4 es-abstract: 1.21.1 + dev: true /object.hasown/1.1.2: resolution: @@ -24644,6 +24711,7 @@ packages: dependencies: define-properties: 1.1.4 es-abstract: 1.21.1 + dev: true /object.values/1.1.6: resolution: @@ -24655,6 +24723,7 @@ packages: call-bind: 1.0.2 define-properties: 1.1.4 es-abstract: 1.21.1 + dev: true /on-finished/2.4.1: resolution: @@ -24723,6 +24792,7 @@ packages: prelude-ls: 1.2.1 type-check: 0.4.0 word-wrap: 1.2.3 + dev: true /os-locale/1.4.0: resolution: @@ -24740,7 +24810,7 @@ packages: integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==, } engines: { node: '>=0.10.0' } - dev: false + dev: true /ospath/1.2.2: resolution: @@ -24754,7 +24824,7 @@ packages: { integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==, } - dev: false + dev: true /p-cancelable/2.1.1: resolution: @@ -24772,7 +24842,7 @@ packages: engines: { node: '>=8' } dependencies: p-map: 2.1.0 - dev: false + dev: true /p-limit/1.3.0: resolution: @@ -24846,7 +24916,7 @@ packages: integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==, } engines: { node: '>=6' } - dev: false + dev: true /p-map/4.0.0: resolution: @@ -25138,6 +25208,14 @@ packages: integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==, } + /picomatch-browser/2.2.6: + resolution: + { + integrity: sha512-0ypsOQt9D4e3hziV8O4elD9uN0z/jtUEfxVRtNaAAtXIyUx9m/SzlO020i8YNL2aL/E6blOvvHQcin6HZlFy/w==, + } + engines: { node: '>=8.6' } + dev: false + /picomatch/2.3.1: resolution: { @@ -25158,7 +25236,6 @@ packages: integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==, } engines: { node: '>=6' } - dev: false /pirates/4.0.5: resolution: @@ -25532,7 +25609,7 @@ packages: find-yarn-workspace-root2: 1.2.16 path-exists: 4.0.0 which-pm: 2.0.0 - dev: false + dev: true /prelude-ls/1.1.2: resolution: @@ -25549,6 +25626,7 @@ packages: integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==, } engines: { node: '>= 0.8.0' } + dev: true /prettier/2.7.1: resolution: @@ -25566,7 +25644,7 @@ packages: } engines: { node: '>=10.13.0' } hasBin: true - dev: false + dev: true /pretty-bytes/5.6.0: resolution: @@ -25641,7 +25719,7 @@ packages: mri: 1.2.0 multimatch: 4.0.0 prettier: 2.8.4 - dev: false + dev: true /prism-react-renderer/2.0.6_react@17.0.2: resolution: @@ -25807,7 +25885,7 @@ packages: { integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==, } - dev: false + dev: true /psl/1.9.0: resolution: @@ -25933,6 +26011,7 @@ packages: integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==, } engines: { node: '>=8' } + dev: true /quick-lru/5.1.1: resolution: @@ -26396,6 +26475,7 @@ packages: find-up: 4.1.0 read-pkg: 5.2.0 type-fest: 0.8.1 + dev: true /read-pkg-up/8.0.0: resolution: @@ -26420,6 +26500,7 @@ packages: normalize-package-data: 2.5.0 parse-json: 5.2.0 type-fest: 0.6.0 + dev: true /read-pkg/6.0.0: resolution: @@ -26445,7 +26526,7 @@ packages: js-yaml: 3.14.1 pify: 4.0.1 strip-bom: 3.0.0 - dev: false + dev: true /readable-stream/1.0.34: resolution: @@ -26544,6 +26625,7 @@ packages: dependencies: indent-string: 4.0.0 strip-indent: 3.0.0 + dev: true /redent/4.0.0: resolution: @@ -26607,6 +26689,7 @@ packages: call-bind: 1.0.2 define-properties: 1.1.4 functions-have-names: 1.2.3 + dev: true /regexpp/3.2.0: resolution: @@ -26808,7 +26891,6 @@ packages: { integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==, } - dev: false /resolve-alpn/1.2.1: resolution: @@ -26879,6 +26961,7 @@ packages: is-core-module: 2.10.0 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 + dev: true /responselike/2.0.1: resolution: @@ -27038,6 +27121,7 @@ packages: call-bind: 1.0.2 get-intrinsic: 1.2.0 is-regex: 1.1.4 + dev: true /safer-buffer/2.1.2: resolution: @@ -27207,7 +27291,6 @@ packages: { integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==, } - dev: false /set-value/4.1.0: resolution: @@ -27259,7 +27342,7 @@ packages: engines: { node: '>=0.10.0' } dependencies: shebang-regex: 1.0.0 - dev: false + dev: true /shebang-command/2.0.0: resolution: @@ -27276,7 +27359,7 @@ packages: integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==, } engines: { node: '>=0.10.0' } - dev: false + dev: true /shebang-regex/3.0.0: resolution: @@ -27498,7 +27581,7 @@ packages: strip-ansi: 6.0.1 wcwidth: 1.0.1 yargs: 15.4.1 - dev: false + dev: true /snake-case/3.0.4: resolution: @@ -27584,7 +27667,7 @@ packages: dependencies: cross-spawn: 5.1.0 signal-exit: 3.0.7 - dev: false + dev: true /spdx-correct/3.1.1: resolution: @@ -27743,7 +27826,7 @@ packages: } dependencies: mixme: 0.5.4 - dev: false + dev: true /streamroller/3.1.1: resolution: @@ -27813,6 +27896,7 @@ packages: internal-slot: 1.0.3 regexp.prototype.flags: 1.4.3 side-channel: 1.0.4 + dev: true /string.prototype.trimend/1.0.6: resolution: @@ -27823,6 +27907,7 @@ packages: call-bind: 1.0.2 define-properties: 1.1.4 es-abstract: 1.21.1 + dev: true /string.prototype.trimstart/1.0.6: resolution: @@ -27833,6 +27918,7 @@ packages: call-bind: 1.0.2 define-properties: 1.1.4 es-abstract: 1.21.1 + dev: true /string_decoder/0.10.31: resolution: @@ -27901,6 +27987,7 @@ packages: integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==, } engines: { node: '>=4' } + dev: true /strip-bom/4.0.0: resolution: @@ -27924,6 +28011,7 @@ packages: engines: { node: '>=8' } dependencies: min-indent: 1.0.1 + dev: true /strip-indent/4.0.0: resolution: @@ -28361,7 +28449,7 @@ packages: integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==, } engines: { node: '>=8' } - dev: false + dev: true /term-vector/1.0.0: resolution: @@ -28387,6 +28475,7 @@ packages: { integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==, } + dev: true /thenify-all/1.6.0: resolution: @@ -28505,7 +28594,7 @@ packages: engines: { node: '>=0.6.0' } dependencies: os-tmpdir: 1.0.2 - dev: false + dev: true /tmp/0.2.1: resolution: @@ -28638,6 +28727,7 @@ packages: integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==, } engines: { node: '>=8' } + dev: true /trim-newlines/4.0.2: resolution: @@ -28805,7 +28895,7 @@ packages: dependencies: tslib: 1.14.1 typescript: 4.3.5 - dev: false + dev: true /tsutils/3.21.0_typescript@4.8.4: resolution: @@ -28835,7 +28925,7 @@ packages: strip-ansi: 6.0.1 wcwidth: 1.0.1 yargs: 17.5.1 - dev: false + dev: true /tunnel-agent/0.6.0: resolution: @@ -28960,6 +29050,7 @@ packages: engines: { node: '>= 0.8.0' } dependencies: prelude-ls: 1.2.1 + dev: true /type-detect/4.0.8: resolution: @@ -28974,7 +29065,7 @@ packages: integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==, } engines: { node: '>=10' } - dev: false + dev: true /type-fest/0.18.1: resolution: @@ -28990,6 +29081,7 @@ packages: integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==, } engines: { node: '>=10' } + dev: true /type-fest/0.21.3: resolution: @@ -29004,6 +29096,7 @@ packages: integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==, } engines: { node: '>=8' } + dev: true /type-fest/0.8.1: resolution: @@ -29011,6 +29104,7 @@ packages: integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==, } engines: { node: '>=8' } + dev: true /type-fest/1.4.0: resolution: @@ -29040,6 +29134,7 @@ packages: call-bind: 1.0.2 for-each: 0.3.3 is-typed-array: 1.1.10 + dev: true /typedarray/0.0.6: resolution: @@ -29084,6 +29179,7 @@ packages: } engines: { node: '>=4.2.0' } hasBin: true + dev: true /typescript/4.7.4: resolution: @@ -29143,6 +29239,7 @@ packages: has-bigints: 1.0.2 has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 + dev: true /unbzip2-stream/1.4.3: resolution: @@ -29345,7 +29442,6 @@ packages: integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==, } engines: { node: '>= 4.0.0' } - dev: false /universalify/2.0.0: resolution: @@ -30106,7 +30202,7 @@ packages: } dependencies: defaults: 1.0.3 - dev: false + dev: true /webfontloader/1.6.28: resolution: @@ -30191,13 +30287,13 @@ packages: is-number-object: 1.0.7 is-string: 1.0.7 is-symbol: 1.0.4 + dev: true /which-module/2.0.0: resolution: { integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==, } - dev: false /which-pm/2.0.0: resolution: @@ -30208,7 +30304,7 @@ packages: dependencies: load-yaml-file: 0.2.0 path-exists: 4.0.0 - dev: false + dev: true /which-typed-array/1.1.9: resolution: @@ -30223,6 +30319,7 @@ packages: gopd: 1.0.1 has-tostringtag: 1.0.0 is-typed-array: 1.1.10 + dev: true /which/1.3.1: resolution: @@ -30232,7 +30329,6 @@ packages: hasBin: true dependencies: isexe: 2.0.0 - dev: false /which/2.0.2: resolution: @@ -30284,7 +30380,7 @@ packages: { integrity: sha512-oPpEvU7NIQ0MW7ReL+EigMUI2JPNp05kmqzWS6zXVUaSq5KxuQzfgxGd8wuurBulBkTaOnEcGge+2rriyDVHkw==, } - dev: false + dev: true /wrap-ansi/2.1.0: resolution: @@ -30410,7 +30506,6 @@ packages: { integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==, } - dev: false /y18n/5.0.8: resolution: @@ -30424,7 +30519,7 @@ packages: { integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==, } - dev: false + dev: true /yallist/3.1.1: resolution: @@ -30461,7 +30556,6 @@ packages: dependencies: camelcase: 5.3.1 decamelize: 1.2.0 - dev: false /yargs-parser/20.2.9: resolution: @@ -30495,7 +30589,6 @@ packages: which-module: 2.0.0 y18n: 4.0.3 yargs-parser: 18.1.3 - dev: false /yargs/16.2.0: resolution: From d769e57cf822a5a4f3c1146760c237e85c5aeca3 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 26 Jul 2023 10:46:01 -0700 Subject: [PATCH 17/26] Fix whitespace on test From 1d64d218b32cd25caa6736f7bb275c1c224cd355 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 26 Jul 2023 10:57:15 -0700 Subject: [PATCH 18/26] Forgot to commit change From fef110f2cd7c1ca62df6896cc2ece1d554548ecb Mon Sep 17 00:00:00 2001 From: James O'Halloran Date: Wed, 26 Jul 2023 15:31:49 -0300 Subject: [PATCH 19/26] fix: Make media grid use clean page-sizes --- .../@tinacms/toolkit/src/components/media/media-manager.tsx | 2 +- packages/@tinacms/toolkit/src/packages/core/media.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@tinacms/toolkit/src/components/media/media-manager.tsx b/packages/@tinacms/toolkit/src/components/media/media-manager.tsx index 5cf1a4e378..411d03f9f6 100644 --- a/packages/@tinacms/toolkit/src/components/media/media-manager.tsx +++ b/packages/@tinacms/toolkit/src/components/media/media-manager.tsx @@ -420,7 +420,7 @@ export function MediaPicker({ } ${ list.items.length > 0 && viewMode === 'grid' && - 'w-full p-4 gap-4 grid grid-cols-1 @sm:grid-cols-2 @lg:grid-cols-3 @2xl:grid-cols-4 @4xl:grid-cols-6 @6xl:grid-cols-8 auto-rows-auto content-start justify-start' + 'w-full p-4 gap-4 grid grid-cols-1 @sm:grid-cols-2 @lg:grid-cols-3 @2xl:grid-cols-4 @4xl:grid-cols-6 @6xl:grid-cols-9 auto-rows-auto content-start justify-start' } ${isDragActive ? `border-2 border-blue-500 rounded-lg` : ``}`} > diff --git a/packages/@tinacms/toolkit/src/packages/core/media.ts b/packages/@tinacms/toolkit/src/packages/core/media.ts index 2ccbc49f67..bd265cf531 100644 --- a/packages/@tinacms/toolkit/src/packages/core/media.ts +++ b/packages/@tinacms/toolkit/src/packages/core/media.ts @@ -113,7 +113,7 @@ export interface MediaList { * ``` */ export class MediaManager implements MediaStore { - private _pageSize: number = 20 + private _pageSize: number = 36 constructor(public store: MediaStore, private events: EventBus) {} From 801dd7714844308942868d702800a4d8444d3ad2 Mon Sep 17 00:00:00 2001 From: James O'Halloran Date: Wed, 26 Jul 2023 15:34:22 -0300 Subject: [PATCH 20/26] chore: changeset --- .changeset/fuzzy-mangos-perform.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/fuzzy-mangos-perform.md diff --git a/.changeset/fuzzy-mangos-perform.md b/.changeset/fuzzy-mangos-perform.md new file mode 100644 index 0000000000..188b27160a --- /dev/null +++ b/.changeset/fuzzy-mangos-perform.md @@ -0,0 +1,5 @@ +--- +'@tinacms/toolkit': patch +--- + +fix: Use clean page-sizes on media manager (to make pagination more obvious) From 767738c96c60e36166f72aee172d70ef95332aeb Mon Sep 17 00:00:00 2001 From: Jeff See Date: Wed, 26 Jul 2023 12:59:31 -0700 Subject: [PATCH 21/26] Get prettier to ginore out.md files --- .prettierignore | 1 + .../mdx/src/next/tests/mdx-table-like-field/out.md | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.prettierignore b/.prettierignore index 68ff929519..ce9b4fe718 100644 --- a/.prettierignore +++ b/.prettierignore @@ -23,3 +23,4 @@ terraform/**/.terraform # Ignore any .next folder **/.next/** examples/hugo-quickstart +**/out.md diff --git a/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/out.md b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/out.md index e7807f8325..e858fdb788 100644 --- a/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/out.md +++ b/packages/@tinacms/mdx/src/next/tests/mdx-table-like-field/out.md @@ -1,10 +1,10 @@ Welcome to the barebones starter for TinaCMS! From 8e666a8f4da398e825ce7e4544a9bc4e5a1dd589 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Thu, 27 Jul 2023 09:29:48 -0700 Subject: [PATCH 22/26] Use vitest run --- packages/tinacms/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tinacms/package.json b/packages/tinacms/package.json index ffceeb941e..8fb96fbc83 100644 --- a/packages/tinacms/package.json +++ b/packages/tinacms/package.json @@ -77,7 +77,8 @@ "scripts": { "types": "pnpm tsc && pnpm tsc-alias", "build": "tinacms-scripts build", - "test": "vitest" + "test": "vitest run", + "test-watch": "vitest" }, "dependencies": { "@floating-ui/dom": "^1.4.4", From 977b0b6f32d7972a64b79af970f291b7ac7d9a50 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Thu, 27 Jul 2023 11:59:48 -0700 Subject: [PATCH 23/26] Remove changesets that reference @tinacms/toolkit --- .changeset/fuzzy-mangos-perform.md | 5 ----- .changeset/lemon-pots-float.md | 5 ----- .changeset/sour-zebras-crash.md | 1 - .changeset/wet-islands-rhyme.md | 4 ++++ 4 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 .changeset/fuzzy-mangos-perform.md delete mode 100644 .changeset/lemon-pots-float.md diff --git a/.changeset/fuzzy-mangos-perform.md b/.changeset/fuzzy-mangos-perform.md deleted file mode 100644 index 188b27160a..0000000000 --- a/.changeset/fuzzy-mangos-perform.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tinacms/toolkit': patch ---- - -fix: Use clean page-sizes on media manager (to make pagination more obvious) diff --git a/.changeset/lemon-pots-float.md b/.changeset/lemon-pots-float.md deleted file mode 100644 index aa233d78e3..0000000000 --- a/.changeset/lemon-pots-float.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@tinacms/toolkit': patch ---- - -Fix issue with uploading media in a folder with tina cloud diff --git a/.changeset/sour-zebras-crash.md b/.changeset/sour-zebras-crash.md index 45547d9d63..66b569e050 100644 --- a/.changeset/sour-zebras-crash.md +++ b/.changeset/sour-zebras-crash.md @@ -1,5 +1,4 @@ --- -'@tinacms/toolkit': patch 'tinacms': patch --- diff --git a/.changeset/wet-islands-rhyme.md b/.changeset/wet-islands-rhyme.md index c55d4aae70..90674797f1 100644 --- a/.changeset/wet-islands-rhyme.md +++ b/.changeset/wet-islands-rhyme.md @@ -9,3 +9,7 @@ --- Absorb @tinacms/toolkit into tinacms + +fix: Use clean page-sizes on media manager (to make pagination more obvious) + +Fix issue with uploading media in a folder with tina cloud From 53dbe056f34cce4a576486b1dedfaf79d14f44ac Mon Sep 17 00:00:00 2001 From: Jeff See Date: Fri, 28 Jul 2023 09:07:34 -0700 Subject: [PATCH 24/26] removle cleaner exports from tinacms package --- packages/tinacms/package.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/packages/tinacms/package.json b/packages/tinacms/package.json index 8fb96fbc83..d0723da858 100644 --- a/packages/tinacms/package.json +++ b/packages/tinacms/package.json @@ -19,21 +19,11 @@ "import": "./dist/edit-state.mjs", "require": "./dist/edit-state.js" }, - "./react": { - "types": "./dist/react.d.ts", - "import": "./dist/react.mjs", - "require": "./dist/react.js" - }, "./dist/react": { "types": "./dist/react.d.ts", "import": "./dist/react.mjs", "require": "./dist/react.js" }, - "./rich-text": { - "types": "./dist/rich-text/index.d.ts", - "import": "./dist/rich-text/index.mjs", - "require": "./dist/rich-text/index.js" - }, "./dist/rich-text": { "types": "./dist/rich-text/index.d.ts", "import": "./dist/rich-text/index.mjs", @@ -44,11 +34,6 @@ "import": "./dist/dev-tools.mjs", "require": "./dist/dev-tools.js" }, - "./rich-text/prism": { - "types": "./dist/rich-text/prism.d.ts", - "import": "./dist/rich-text/prism.mjs", - "require": "./dist/rich-text/prism.js" - }, "./dist/rich-text/prism": { "types": "./dist/rich-text/prism.d.ts", "import": "./dist/rich-text/prism.mjs", From 6ecec41c0eae54c2785ecc1d030e4ebf1bfc724c Mon Sep 17 00:00:00 2001 From: Jeff See Date: Fri, 28 Jul 2023 09:36:36 -0700 Subject: [PATCH 25/26] Remove extra files from manifest --- packages/tinacms/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/tinacms/package.json b/packages/tinacms/package.json index d0723da858..cec3a9ff72 100644 --- a/packages/tinacms/package.json +++ b/packages/tinacms/package.json @@ -41,10 +41,7 @@ } }, "files": [ - "dist", - "rich-text.d.ts", - "react.d.ts", - "rich-text/prism.d.ts" + "dist" ], "buildConfig": { "entryPoints": [ From 6382576be1c601890fbbf2b60e81406831fb09f6 Mon Sep 17 00:00:00 2001 From: Jeff See Date: Fri, 28 Jul 2023 09:58:59 -0700 Subject: [PATCH 26/26] Only replace baseUrl paths for tsc-alias --- packages/tinacms/tsconfig.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/tinacms/tsconfig.json b/packages/tinacms/tsconfig.json index c80f035024..4ce744f4ed 100644 --- a/packages/tinacms/tsconfig.json +++ b/packages/tinacms/tsconfig.json @@ -16,5 +16,12 @@ "src/**/*.spec.tsx", "dist" ], + "tsc-alias": { + "replacers": { + "base-url": { + "enabled": false + } + } + }, "include": ["src"] }
    { />