diff --git a/.eslintignore b/.eslintignore index 121623b4c2..f1e92792b3 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,7 +7,7 @@ **/.git/** **/public/** **/microsite/** +**/canon-website/** **/templates/** **/sample-templates/** playwright.config.ts -packages/canon-website/ diff --git a/packages/canon-website/.gitignore b/canon-website/.gitignore similarity index 100% rename from packages/canon-website/.gitignore rename to canon-website/.gitignore diff --git a/packages/canon-website/.prettierignore b/canon-website/.prettierignore similarity index 100% rename from packages/canon-website/.prettierignore rename to canon-website/.prettierignore diff --git a/packages/canon-website/README.md b/canon-website/README.md similarity index 100% rename from packages/canon-website/README.md rename to canon-website/README.md diff --git a/packages/canon-website/app/[slug]/page.tsx b/canon-website/app/[slug]/page.tsx similarity index 100% rename from packages/canon-website/app/[slug]/page.tsx rename to canon-website/app/[slug]/page.tsx diff --git a/packages/canon-website/app/components/[slug]/page.module.css b/canon-website/app/components/[slug]/page.module.css similarity index 100% rename from packages/canon-website/app/components/[slug]/page.module.css rename to canon-website/app/components/[slug]/page.module.css diff --git a/packages/canon-website/app/components/[slug]/page.tsx b/canon-website/app/components/[slug]/page.tsx similarity index 100% rename from packages/canon-website/app/components/[slug]/page.tsx rename to canon-website/app/components/[slug]/page.tsx diff --git a/packages/canon-website/app/globals.css b/canon-website/app/globals.css similarity index 100% rename from packages/canon-website/app/globals.css rename to canon-website/app/globals.css diff --git a/packages/canon-website/app/icon.svg b/canon-website/app/icon.svg similarity index 100% rename from packages/canon-website/app/icon.svg rename to canon-website/app/icon.svg diff --git a/packages/canon-website/app/layout.tsx b/canon-website/app/layout.tsx similarity index 100% rename from packages/canon-website/app/layout.tsx rename to canon-website/app/layout.tsx diff --git a/packages/canon-website/app/page.module.css b/canon-website/app/page.module.css similarity index 100% rename from packages/canon-website/app/page.module.css rename to canon-website/app/page.module.css diff --git a/packages/canon-website/app/page.tsx b/canon-website/app/page.tsx similarity index 100% rename from packages/canon-website/app/page.tsx rename to canon-website/app/page.tsx diff --git a/packages/canon-website/app/playground/page.tsx b/canon-website/app/playground/page.tsx similarity index 100% rename from packages/canon-website/app/playground/page.tsx rename to canon-website/app/playground/page.tsx diff --git a/packages/canon-website/app/playground/styles.module.css b/canon-website/app/playground/styles.module.css similarity index 100% rename from packages/canon-website/app/playground/styles.module.css rename to canon-website/app/playground/styles.module.css diff --git a/packages/canon-website/app/providers.tsx b/canon-website/app/providers.tsx similarity index 100% rename from packages/canon-website/app/providers.tsx rename to canon-website/app/providers.tsx diff --git a/packages/canon-website/app/theme/[slug]/page.tsx b/canon-website/app/theme/[slug]/page.tsx similarity index 100% rename from packages/canon-website/app/theme/[slug]/page.tsx rename to canon-website/app/theme/[slug]/page.tsx diff --git a/packages/canon-website/catalog-info.yaml b/canon-website/catalog-info.yaml similarity index 100% rename from packages/canon-website/catalog-info.yaml rename to canon-website/catalog-info.yaml diff --git a/packages/canon-website/components/Banner/Banner.tsx b/canon-website/components/Banner/Banner.tsx similarity index 100% rename from packages/canon-website/components/Banner/Banner.tsx rename to canon-website/components/Banner/Banner.tsx diff --git a/packages/canon-website/components/Banner/index.ts b/canon-website/components/Banner/index.ts similarity index 100% rename from packages/canon-website/components/Banner/index.ts rename to canon-website/components/Banner/index.ts diff --git a/packages/canon-website/components/Banner/styles.module.css b/canon-website/components/Banner/styles.module.css similarity index 100% rename from packages/canon-website/components/Banner/styles.module.css rename to canon-website/components/Banner/styles.module.css diff --git a/packages/canon-website/components/Chip/Chip.tsx b/canon-website/components/Chip/Chip.tsx similarity index 100% rename from packages/canon-website/components/Chip/Chip.tsx rename to canon-website/components/Chip/Chip.tsx diff --git a/packages/canon-website/components/Chip/index.ts b/canon-website/components/Chip/index.ts similarity index 100% rename from packages/canon-website/components/Chip/index.ts rename to canon-website/components/Chip/index.ts diff --git a/packages/canon-website/components/Chip/styles.module.css b/canon-website/components/Chip/styles.module.css similarity index 100% rename from packages/canon-website/components/Chip/styles.module.css rename to canon-website/components/Chip/styles.module.css diff --git a/packages/canon-website/components/CodeBlock/index.tsx b/canon-website/components/CodeBlock/index.tsx similarity index 100% rename from packages/canon-website/components/CodeBlock/index.tsx rename to canon-website/components/CodeBlock/index.tsx diff --git a/packages/canon-website/components/CodeBlock/styles.module.css b/canon-website/components/CodeBlock/styles.module.css similarity index 100% rename from packages/canon-website/components/CodeBlock/styles.module.css rename to canon-website/components/CodeBlock/styles.module.css diff --git a/packages/canon-website/components/Columns/Columns.tsx b/canon-website/components/Columns/Columns.tsx similarity index 100% rename from packages/canon-website/components/Columns/Columns.tsx rename to canon-website/components/Columns/Columns.tsx diff --git a/packages/canon-website/components/Columns/index.ts b/canon-website/components/Columns/index.ts similarity index 100% rename from packages/canon-website/components/Columns/index.ts rename to canon-website/components/Columns/index.ts diff --git a/packages/canon-website/components/Columns/styles.css b/canon-website/components/Columns/styles.css similarity index 100% rename from packages/canon-website/components/Columns/styles.css rename to canon-website/components/Columns/styles.css diff --git a/packages/canon-website/components/DecorativeBox/index.tsx b/canon-website/components/DecorativeBox/index.tsx similarity index 100% rename from packages/canon-website/components/DecorativeBox/index.tsx rename to canon-website/components/DecorativeBox/index.tsx diff --git a/packages/canon-website/components/DecorativeBox/styles.module.css b/canon-website/components/DecorativeBox/styles.module.css similarity index 100% rename from packages/canon-website/components/DecorativeBox/styles.module.css rename to canon-website/components/DecorativeBox/styles.module.css diff --git a/packages/canon-website/components/Frame/index.tsx b/canon-website/components/Frame/index.tsx similarity index 100% rename from packages/canon-website/components/Frame/index.tsx rename to canon-website/components/Frame/index.tsx diff --git a/packages/canon-website/components/HeadlessBanners/BaseUI.tsx b/canon-website/components/HeadlessBanners/BaseUI.tsx similarity index 100% rename from packages/canon-website/components/HeadlessBanners/BaseUI.tsx rename to canon-website/components/HeadlessBanners/BaseUI.tsx diff --git a/packages/canon-website/components/HeadlessBanners/styles.module.css b/canon-website/components/HeadlessBanners/styles.module.css similarity index 100% rename from packages/canon-website/components/HeadlessBanners/styles.module.css rename to canon-website/components/HeadlessBanners/styles.module.css diff --git a/packages/canon-website/components/IconLibrary/IconLibrary.tsx b/canon-website/components/IconLibrary/IconLibrary.tsx similarity index 100% rename from packages/canon-website/components/IconLibrary/IconLibrary.tsx rename to canon-website/components/IconLibrary/IconLibrary.tsx diff --git a/packages/canon-website/components/IconLibrary/index.ts b/canon-website/components/IconLibrary/index.ts similarity index 100% rename from packages/canon-website/components/IconLibrary/index.ts rename to canon-website/components/IconLibrary/index.ts diff --git a/packages/canon-website/components/IconLibrary/styles.module.css b/canon-website/components/IconLibrary/styles.module.css similarity index 100% rename from packages/canon-website/components/IconLibrary/styles.module.css rename to canon-website/components/IconLibrary/styles.module.css diff --git a/packages/canon-website/components/LayoutComponents/LayoutComponents.module.css b/canon-website/components/LayoutComponents/LayoutComponents.module.css similarity index 100% rename from packages/canon-website/components/LayoutComponents/LayoutComponents.module.css rename to canon-website/components/LayoutComponents/LayoutComponents.module.css diff --git a/packages/canon-website/components/LayoutComponents/LayoutComponents.tsx b/canon-website/components/LayoutComponents/LayoutComponents.tsx similarity index 100% rename from packages/canon-website/components/LayoutComponents/LayoutComponents.tsx rename to canon-website/components/LayoutComponents/LayoutComponents.tsx diff --git a/packages/canon-website/components/LayoutComponents/index.ts b/canon-website/components/LayoutComponents/index.ts similarity index 100% rename from packages/canon-website/components/LayoutComponents/index.ts rename to canon-website/components/LayoutComponents/index.ts diff --git a/packages/canon-website/components/LayoutComponents/svgs/box.tsx b/canon-website/components/LayoutComponents/svgs/box.tsx similarity index 100% rename from packages/canon-website/components/LayoutComponents/svgs/box.tsx rename to canon-website/components/LayoutComponents/svgs/box.tsx diff --git a/packages/canon-website/components/LayoutComponents/svgs/container.tsx b/canon-website/components/LayoutComponents/svgs/container.tsx similarity index 100% rename from packages/canon-website/components/LayoutComponents/svgs/container.tsx rename to canon-website/components/LayoutComponents/svgs/container.tsx diff --git a/packages/canon-website/components/LayoutComponents/svgs/grid.tsx b/canon-website/components/LayoutComponents/svgs/grid.tsx similarity index 100% rename from packages/canon-website/components/LayoutComponents/svgs/grid.tsx rename to canon-website/components/LayoutComponents/svgs/grid.tsx diff --git a/packages/canon-website/components/LayoutComponents/svgs/inline.tsx b/canon-website/components/LayoutComponents/svgs/inline.tsx similarity index 100% rename from packages/canon-website/components/LayoutComponents/svgs/inline.tsx rename to canon-website/components/LayoutComponents/svgs/inline.tsx diff --git a/packages/canon-website/components/LayoutComponents/svgs/stack.tsx b/canon-website/components/LayoutComponents/svgs/stack.tsx similarity index 100% rename from packages/canon-website/components/LayoutComponents/svgs/stack.tsx rename to canon-website/components/LayoutComponents/svgs/stack.tsx diff --git a/packages/canon-website/components/PropsTable/PropsTable.tsx b/canon-website/components/PropsTable/PropsTable.tsx similarity index 100% rename from packages/canon-website/components/PropsTable/PropsTable.tsx rename to canon-website/components/PropsTable/PropsTable.tsx diff --git a/packages/canon-website/components/PropsTable/index.ts b/canon-website/components/PropsTable/index.ts similarity index 100% rename from packages/canon-website/components/PropsTable/index.ts rename to canon-website/components/PropsTable/index.ts diff --git a/packages/canon-website/components/Roadmap/Roadmap.tsx b/canon-website/components/Roadmap/Roadmap.tsx similarity index 100% rename from packages/canon-website/components/Roadmap/Roadmap.tsx rename to canon-website/components/Roadmap/Roadmap.tsx diff --git a/packages/canon-website/components/Roadmap/index.ts b/canon-website/components/Roadmap/index.ts similarity index 100% rename from packages/canon-website/components/Roadmap/index.ts rename to canon-website/components/Roadmap/index.ts diff --git a/packages/canon-website/components/Roadmap/list.ts b/canon-website/components/Roadmap/list.ts similarity index 100% rename from packages/canon-website/components/Roadmap/list.ts rename to canon-website/components/Roadmap/list.ts diff --git a/packages/canon-website/components/Roadmap/styles.css b/canon-website/components/Roadmap/styles.css similarity index 100% rename from packages/canon-website/components/Roadmap/styles.css rename to canon-website/components/Roadmap/styles.css diff --git a/packages/canon-website/components/Sidebar/Sidebar.module.css b/canon-website/components/Sidebar/Sidebar.module.css similarity index 100% rename from packages/canon-website/components/Sidebar/Sidebar.module.css rename to canon-website/components/Sidebar/Sidebar.module.css diff --git a/packages/canon-website/components/Sidebar/Tabs.module.css b/canon-website/components/Sidebar/Tabs.module.css similarity index 100% rename from packages/canon-website/components/Sidebar/Tabs.module.css rename to canon-website/components/Sidebar/Tabs.module.css diff --git a/packages/canon-website/components/Sidebar/actions.ts b/canon-website/components/Sidebar/actions.ts similarity index 100% rename from packages/canon-website/components/Sidebar/actions.ts rename to canon-website/components/Sidebar/actions.ts diff --git a/packages/canon-website/components/Sidebar/docs.tsx b/canon-website/components/Sidebar/docs.tsx similarity index 100% rename from packages/canon-website/components/Sidebar/docs.tsx rename to canon-website/components/Sidebar/docs.tsx diff --git a/packages/canon-website/components/Sidebar/index.tsx b/canon-website/components/Sidebar/index.tsx similarity index 100% rename from packages/canon-website/components/Sidebar/index.tsx rename to canon-website/components/Sidebar/index.tsx diff --git a/packages/canon-website/components/Sidebar/playground.tsx b/canon-website/components/Sidebar/playground.tsx similarity index 100% rename from packages/canon-website/components/Sidebar/playground.tsx rename to canon-website/components/Sidebar/playground.tsx diff --git a/packages/canon-website/components/Sidebar/tabs.tsx b/canon-website/components/Sidebar/tabs.tsx similarity index 100% rename from packages/canon-website/components/Sidebar/tabs.tsx rename to canon-website/components/Sidebar/tabs.tsx diff --git a/packages/canon-website/components/Snippet/index.tsx b/canon-website/components/Snippet/index.tsx similarity index 100% rename from packages/canon-website/components/Snippet/index.tsx rename to canon-website/components/Snippet/index.tsx diff --git a/packages/canon-website/components/Snippet/styles.module.css b/canon-website/components/Snippet/styles.module.css similarity index 100% rename from packages/canon-website/components/Snippet/styles.module.css rename to canon-website/components/Snippet/styles.module.css diff --git a/packages/canon-website/components/Story/frame.tsx b/canon-website/components/Story/frame.tsx similarity index 100% rename from packages/canon-website/components/Story/frame.tsx rename to canon-website/components/Story/frame.tsx diff --git a/packages/canon-website/components/Story/index.tsx b/canon-website/components/Story/index.tsx similarity index 100% rename from packages/canon-website/components/Story/index.tsx rename to canon-website/components/Story/index.tsx diff --git a/packages/canon-website/components/Story/styles.module.css b/canon-website/components/Story/styles.module.css similarity index 100% rename from packages/canon-website/components/Story/styles.module.css rename to canon-website/components/Story/styles.module.css diff --git a/packages/canon-website/components/Table/Table.tsx b/canon-website/components/Table/Table.tsx similarity index 100% rename from packages/canon-website/components/Table/Table.tsx rename to canon-website/components/Table/Table.tsx diff --git a/packages/canon-website/components/Table/index.ts b/canon-website/components/Table/index.ts similarity index 100% rename from packages/canon-website/components/Table/index.ts rename to canon-website/components/Table/index.ts diff --git a/packages/canon-website/components/Table/styles.module.css b/canon-website/components/Table/styles.module.css similarity index 100% rename from packages/canon-website/components/Table/styles.module.css rename to canon-website/components/Table/styles.module.css diff --git a/packages/canon-website/components/Tabs/index.tsx b/canon-website/components/Tabs/index.tsx similarity index 100% rename from packages/canon-website/components/Tabs/index.tsx rename to canon-website/components/Tabs/index.tsx diff --git a/packages/canon-website/components/Tabs/parts.tsx b/canon-website/components/Tabs/parts.tsx similarity index 100% rename from packages/canon-website/components/Tabs/parts.tsx rename to canon-website/components/Tabs/parts.tsx diff --git a/packages/canon-website/components/Tabs/styles.module.css b/canon-website/components/Tabs/styles.module.css similarity index 100% rename from packages/canon-website/components/Tabs/styles.module.css rename to canon-website/components/Tabs/styles.module.css diff --git a/packages/canon-website/content/_snippets.ts b/canon-website/content/_snippets.ts similarity index 100% rename from packages/canon-website/content/_snippets.ts rename to canon-website/content/_snippets.ts diff --git a/packages/canon-website/content/about.mdx b/canon-website/content/about.mdx similarity index 100% rename from packages/canon-website/content/about.mdx rename to canon-website/content/about.mdx diff --git a/packages/canon-website/content/box.mdx b/canon-website/content/box.mdx similarity index 100% rename from packages/canon-website/content/box.mdx rename to canon-website/content/box.mdx diff --git a/packages/canon-website/content/button.mdx b/canon-website/content/button.mdx similarity index 100% rename from packages/canon-website/content/button.mdx rename to canon-website/content/button.mdx diff --git a/packages/canon-website/content/checkbox.mdx b/canon-website/content/checkbox.mdx similarity index 100% rename from packages/canon-website/content/checkbox.mdx rename to canon-website/content/checkbox.mdx diff --git a/packages/canon-website/content/container.mdx b/canon-website/content/container.mdx similarity index 100% rename from packages/canon-website/content/container.mdx rename to canon-website/content/container.mdx diff --git a/packages/canon-website/content/grid.mdx b/canon-website/content/grid.mdx similarity index 100% rename from packages/canon-website/content/grid.mdx rename to canon-website/content/grid.mdx diff --git a/packages/canon-website/content/heading.mdx b/canon-website/content/heading.mdx similarity index 100% rename from packages/canon-website/content/heading.mdx rename to canon-website/content/heading.mdx diff --git a/packages/canon-website/content/home.mdx b/canon-website/content/home.mdx similarity index 100% rename from packages/canon-website/content/home.mdx rename to canon-website/content/home.mdx diff --git a/packages/canon-website/content/icon.mdx b/canon-website/content/icon.mdx similarity index 100% rename from packages/canon-website/content/icon.mdx rename to canon-website/content/icon.mdx diff --git a/packages/canon-website/content/iconography.mdx b/canon-website/content/iconography.mdx similarity index 100% rename from packages/canon-website/content/iconography.mdx rename to canon-website/content/iconography.mdx diff --git a/packages/canon-website/content/inline.mdx b/canon-website/content/inline.mdx similarity index 100% rename from packages/canon-website/content/inline.mdx rename to canon-website/content/inline.mdx diff --git a/packages/canon-website/content/layout.mdx b/canon-website/content/layout.mdx similarity index 100% rename from packages/canon-website/content/layout.mdx rename to canon-website/content/layout.mdx diff --git a/packages/canon-website/content/responsive.mdx b/canon-website/content/responsive.mdx similarity index 100% rename from packages/canon-website/content/responsive.mdx rename to canon-website/content/responsive.mdx diff --git a/packages/canon-website/content/stack.mdx b/canon-website/content/stack.mdx similarity index 100% rename from packages/canon-website/content/stack.mdx rename to canon-website/content/stack.mdx diff --git a/packages/canon-website/content/table.mdx b/canon-website/content/table.mdx similarity index 100% rename from packages/canon-website/content/table.mdx rename to canon-website/content/table.mdx diff --git a/packages/canon-website/content/text.mdx b/canon-website/content/text.mdx similarity index 100% rename from packages/canon-website/content/text.mdx rename to canon-website/content/text.mdx diff --git a/packages/canon-website/content/theming.mdx b/canon-website/content/theming.mdx similarity index 100% rename from packages/canon-website/content/theming.mdx rename to canon-website/content/theming.mdx diff --git a/packages/canon-website/content/typography.mdx b/canon-website/content/typography.mdx similarity index 100% rename from packages/canon-website/content/typography.mdx rename to canon-website/content/typography.mdx diff --git a/packages/canon-website/eslint.config.mjs b/canon-website/eslint.config.mjs similarity index 100% rename from packages/canon-website/eslint.config.mjs rename to canon-website/eslint.config.mjs diff --git a/packages/canon-website/mdx-components.tsx b/canon-website/mdx-components.tsx similarity index 100% rename from packages/canon-website/mdx-components.tsx rename to canon-website/mdx-components.tsx diff --git a/packages/canon-website/next.config.ts b/canon-website/next.config.ts similarity index 100% rename from packages/canon-website/next.config.ts rename to canon-website/next.config.ts diff --git a/packages/canon-website/package.json b/canon-website/package.json similarity index 100% rename from packages/canon-website/package.json rename to canon-website/package.json diff --git a/packages/canon-website/public/backstage.css b/canon-website/public/backstage.css similarity index 100% rename from packages/canon-website/public/backstage.css rename to canon-website/public/backstage.css diff --git a/packages/canon-website/public/components.css b/canon-website/public/components.css similarity index 100% rename from packages/canon-website/public/components.css rename to canon-website/public/components.css diff --git a/packages/canon-website/public/core.css b/canon-website/public/core.css similarity index 100% rename from packages/canon-website/public/core.css rename to canon-website/public/core.css diff --git a/packages/canon-website/public/header.png b/canon-website/public/header.png similarity index 100% rename from packages/canon-website/public/header.png rename to canon-website/public/header.png diff --git a/packages/canon-website/scripts/watch-css.js b/canon-website/scripts/watch-css.js similarity index 94% rename from packages/canon-website/scripts/watch-css.js rename to canon-website/scripts/watch-css.js index b963db672e..b3cfedd570 100644 --- a/packages/canon-website/scripts/watch-css.js +++ b/canon-website/scripts/watch-css.js @@ -3,7 +3,7 @@ const path = require('path'); const chokidar = require('chokidar'); const { bundle } = require('lightningcss'); -const source = '../../canon/src/css'; +const source = '../../packages/canon/src/css'; const destination = '../public'; const source1 = path.join(__dirname, `${source}/core.css`); @@ -12,7 +12,7 @@ const source2 = path.join(__dirname, `${source}/components.css`); const destination2 = path.join(__dirname, `${destination}/components.css`); const source3 = path.join( __dirname, - `../../canon/.storybook/themes/backstage.css`, + `../../packages/canon/.storybook/themes/backstage.css`, ); const destination3 = path.join(__dirname, `${destination}/backstage.css`); diff --git a/packages/canon-website/snippets/box.tsx b/canon-website/snippets/box.tsx similarity index 68% rename from packages/canon-website/snippets/box.tsx rename to canon-website/snippets/box.tsx index 107f1dac9a..c41b749337 100644 --- a/packages/canon-website/snippets/box.tsx +++ b/canon-website/snippets/box.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as BoxStories from '../../canon/src/components/Box/Box.stories'; +import * as BoxStories from '../../packages/canon/src/components/Box/Box.stories'; import { composeStories } from '@storybook/react'; export const BoxPreview = () => { diff --git a/packages/canon-website/snippets/button.tsx b/canon-website/snippets/button.tsx similarity index 91% rename from packages/canon-website/snippets/button.tsx rename to canon-website/snippets/button.tsx index 8ad40a3f4a..63e2c58f69 100644 --- a/packages/canon-website/snippets/button.tsx +++ b/canon-website/snippets/button.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as ButtonStories from '../../canon/src/components/Button/Button.stories'; +import * as ButtonStories from '../../packages/canon/src/components/Button/Button.stories'; import { composeStories } from '@storybook/react'; export const ButtonPreview = () => { diff --git a/packages/canon-website/snippets/checkbox.tsx b/canon-website/snippets/checkbox.tsx similarity index 82% rename from packages/canon-website/snippets/checkbox.tsx rename to canon-website/snippets/checkbox.tsx index bd96188724..231ce6864b 100644 --- a/packages/canon-website/snippets/checkbox.tsx +++ b/canon-website/snippets/checkbox.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as CheckboxStories from '../../canon/src/components/Checkbox/Checkbox.stories'; +import * as CheckboxStories from '../../packages/canon/src/components/Checkbox/Checkbox.stories'; import { composeStories } from '@storybook/react'; export const CheckboxPreview = () => { diff --git a/packages/canon-website/snippets/container.tsx b/canon-website/snippets/container.tsx similarity index 65% rename from packages/canon-website/snippets/container.tsx rename to canon-website/snippets/container.tsx index 6bd8f0345a..32205447a1 100644 --- a/packages/canon-website/snippets/container.tsx +++ b/canon-website/snippets/container.tsx @@ -1,7 +1,7 @@ 'use client'; import { composeStories } from '@storybook/react'; -import * as ContainerStories from '../../canon/src/components/Container/Container.stories'; +import * as ContainerStories from '../../packages/canon/src/components/Container/Container.stories'; export const ContainerPreview = () => { const { Preview } = composeStories(ContainerStories); diff --git a/packages/canon-website/snippets/grid.tsx b/canon-website/snippets/grid.tsx similarity index 67% rename from packages/canon-website/snippets/grid.tsx rename to canon-website/snippets/grid.tsx index 069dae195b..8f1a8d64db 100644 --- a/packages/canon-website/snippets/grid.tsx +++ b/canon-website/snippets/grid.tsx @@ -1,7 +1,7 @@ 'use client'; import { composeStories } from '@storybook/react'; -import * as GridStories from '../../canon/src/components/Grid/Grid.stories'; +import * as GridStories from '../../packages/canon/src/components/Grid/Grid.stories'; export const GridPreview = () => { const { Default } = composeStories(GridStories); diff --git a/packages/canon-website/snippets/heading.tsx b/canon-website/snippets/heading.tsx similarity index 86% rename from packages/canon-website/snippets/heading.tsx rename to canon-website/snippets/heading.tsx index 4b3d006177..7c9fb23448 100644 --- a/packages/canon-website/snippets/heading.tsx +++ b/canon-website/snippets/heading.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as HeadingStories from '../../canon/src/components/Heading/Heading.stories'; +import * as HeadingStories from '../../packages/canon/src/components/Heading/Heading.stories'; import { composeStories } from '@storybook/react'; export const HeadingPreview = () => { diff --git a/packages/canon-website/snippets/icon.tsx b/canon-website/snippets/icon.tsx similarity index 67% rename from packages/canon-website/snippets/icon.tsx rename to canon-website/snippets/icon.tsx index 4a7c351366..975adfa9e7 100644 --- a/packages/canon-website/snippets/icon.tsx +++ b/canon-website/snippets/icon.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as IconStories from '../../canon/src/components/Icon/Icon.stories'; +import * as IconStories from '../../packages/canon/src/components/Icon/Icon.stories'; import { composeStories } from '@storybook/react'; export const IconPreview = () => { diff --git a/packages/canon-website/snippets/inline.tsx b/canon-website/snippets/inline.tsx similarity index 66% rename from packages/canon-website/snippets/inline.tsx rename to canon-website/snippets/inline.tsx index 5e44f01a46..3f5c0f6e64 100644 --- a/packages/canon-website/snippets/inline.tsx +++ b/canon-website/snippets/inline.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as InlineStories from '../../canon/src/components/Inline/Inline.stories'; +import * as InlineStories from '../../packages/canon/src/components/Inline/Inline.stories'; import { composeStories } from '@storybook/react'; export const InlinePreview = () => { diff --git a/packages/canon-website/snippets/stack.tsx b/canon-website/snippets/stack.tsx similarity index 67% rename from packages/canon-website/snippets/stack.tsx rename to canon-website/snippets/stack.tsx index c64a05783a..2274a3d434 100644 --- a/packages/canon-website/snippets/stack.tsx +++ b/canon-website/snippets/stack.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as StackStories from '../../canon/src/components/Stack/Stack.stories'; +import * as StackStories from '../../packages/canon/src/components/Stack/Stack.stories'; import { composeStories } from '@storybook/react'; export const StackPreview = () => { diff --git a/packages/canon-website/snippets/text.tsx b/canon-website/snippets/text.tsx similarity index 89% rename from packages/canon-website/snippets/text.tsx rename to canon-website/snippets/text.tsx index 45ab96807f..4ce93c2777 100644 --- a/packages/canon-website/snippets/text.tsx +++ b/canon-website/snippets/text.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as TextStories from '../../canon/src/components/Text/Text.stories'; +import * as TextStories from '../../packages/canon/src/components/Text/Text.stories'; import { composeStories } from '@storybook/react'; export const TextPreview = () => { diff --git a/packages/canon-website/tsconfig.json b/canon-website/tsconfig.json similarity index 100% rename from packages/canon-website/tsconfig.json rename to canon-website/tsconfig.json diff --git a/packages/canon-website/utils/data.ts b/canon-website/utils/data.ts similarity index 100% rename from packages/canon-website/utils/data.ts rename to canon-website/utils/data.ts diff --git a/packages/canon-website/utils/playground-context.tsx b/canon-website/utils/playground-context.tsx similarity index 100% rename from packages/canon-website/utils/playground-context.tsx rename to canon-website/utils/playground-context.tsx diff --git a/packages/canon-website/utils/spaceProps.ts b/canon-website/utils/spaceProps.ts similarity index 100% rename from packages/canon-website/utils/spaceProps.ts rename to canon-website/utils/spaceProps.ts diff --git a/package.json b/package.json index 8ef585a2c9..890a2cc289 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "workspaces": { "packages": [ "packages/*", - "plugins/*" + "plugins/*", + "canon-website" ] }, "scripts": { diff --git a/packages/repo-tools/src/commands/peer-deps/peer-deps.ts b/packages/repo-tools/src/commands/peer-deps/peer-deps.ts index 87bcc898bf..70e566dd32 100644 --- a/packages/repo-tools/src/commands/peer-deps/peer-deps.ts +++ b/packages/repo-tools/src/commands/peer-deps/peer-deps.ts @@ -104,11 +104,6 @@ export default async ({ fix }: { fix: boolean }) => { const packagesWithRelevantDependencies = []; for (const pkg of packages) { - if (pkg.dir.includes('packages/canon-website')) { - // Canon website is a special case and should not be checked. - continue; - } - if (isStandaloneApplication(pkg.packageJson as ExtendedPackageJSON)) { // Standalone applications are not expected to have peer dependencies. continue; diff --git a/yarn.lock b/yarn.lock index a783c3f91b..583357a7bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24612,9 +24612,9 @@ __metadata: languageName: node linkType: hard -"canon-website@workspace:packages/canon-website": +"canon-website@workspace:canon-website": version: 0.0.0-use.local - resolution: "canon-website@workspace:packages/canon-website" + resolution: "canon-website@workspace:canon-website" dependencies: "@backstage/canon": "workspace:^" "@base-ui-components/react": ^1.0.0-alpha.4