From ccb8917be373c777381bf9bcce94bc8cb05027f8 Mon Sep 17 00:00:00 2001 From: Charles de Dreuille Date: Sat, 4 Jan 2025 15:24:13 +0100 Subject: [PATCH] Move to the site to packages Signed-off-by: Charles de Dreuille --- .eslintignore | 2 +- package.json | 9 ++++----- .../canon-website}/.gitignore | 0 .../canon-website}/.prettierignore | 0 .../canon-website}/README.md | 0 .../canon-website}/app/[slug]/page.tsx | 0 .../app/components/[slug]/page.module.css | 0 .../app/components/[slug]/page.tsx | 0 .../canon-website}/app/globals.css | 0 .../canon-website}/app/icon.svg | 0 .../canon-website}/app/layout.tsx | 0 .../canon-website}/app/page.module.css | 0 .../canon-website}/app/page.tsx | 0 .../canon-website}/app/playground/page.tsx | 0 .../app/playground/styles.module.css | 0 .../canon-website}/app/providers.tsx | 0 .../canon-website}/app/theme/[slug]/page.tsx | 0 packages/canon-website/catalog-info.yaml | 9 +++++++++ .../canon-website}/components/Banner/Banner.tsx | 0 .../canon-website}/components/Banner/index.ts | 0 .../components/Banner/styles.module.css | 0 .../canon-website}/components/Chip/Chip.tsx | 0 .../canon-website}/components/Chip/index.ts | 0 .../components/Chip/styles.module.css | 0 .../components/CodeBlock/index.tsx | 0 .../components/CodeBlock/styles.module.css | 0 .../components/Columns/Columns.tsx | 0 .../canon-website}/components/Columns/index.ts | 0 .../components/Columns/styles.css | 0 .../components/DecorativeBox/index.tsx | 0 .../components/DecorativeBox/styles.module.css | 0 .../canon-website}/components/Frame/index.tsx | 0 .../components/HeadlessBanners/BaseUI.tsx | 0 .../HeadlessBanners/styles.module.css | 0 .../components/IconLibrary/IconLibrary.tsx | 0 .../components/IconLibrary/index.ts | 0 .../components/IconLibrary/styles.module.css | 0 .../LayoutComponents.module.css | 0 .../LayoutComponents/LayoutComponents.tsx | 0 .../components/LayoutComponents/index.ts | 0 .../components/LayoutComponents/svgs/box.tsx | 0 .../LayoutComponents/svgs/container.tsx | 0 .../components/LayoutComponents/svgs/grid.tsx | 0 .../components/LayoutComponents/svgs/inline.tsx | 0 .../components/LayoutComponents/svgs/stack.tsx | 0 .../components/PropsTable/PropsTable.tsx | 0 .../components/PropsTable/index.ts | 0 .../components/Roadmap/Roadmap.tsx | 0 .../canon-website}/components/Roadmap/index.ts | 0 .../canon-website}/components/Roadmap/list.ts | 0 .../components/Roadmap/styles.css | 0 .../components/Sidebar/Sidebar.module.css | 0 .../components/Sidebar/Tabs.module.css | 0 .../components/Sidebar/actions.ts | 0 .../canon-website}/components/Sidebar/docs.tsx | 0 .../canon-website}/components/Sidebar/index.tsx | 0 .../components/Sidebar/playground.tsx | 0 .../canon-website}/components/Sidebar/tabs.tsx | 0 .../canon-website}/components/Snippet/index.tsx | 0 .../components/Snippet/styles.module.css | 0 .../canon-website}/components/Story/frame.tsx | 0 .../canon-website}/components/Story/index.tsx | 0 .../components/Story/styles.module.css | 0 .../canon-website}/components/Table/Table.tsx | 0 .../canon-website}/components/Table/index.ts | 0 .../components/Table/styles.module.css | 0 .../canon-website}/components/Tabs/index.tsx | 0 .../canon-website}/components/Tabs/parts.tsx | 0 .../components/Tabs/styles.module.css | 0 .../canon-website}/content/_snippets.ts | 0 .../canon-website}/content/about.mdx | 0 .../canon-website}/content/box.mdx | 0 .../canon-website}/content/button.mdx | 0 .../canon-website}/content/checkbox.mdx | 0 .../canon-website}/content/container.mdx | 0 .../canon-website}/content/grid.mdx | 0 .../canon-website}/content/heading.mdx | 0 .../canon-website}/content/home.mdx | 0 .../canon-website}/content/icon.mdx | 0 .../canon-website}/content/iconography.mdx | 0 .../canon-website}/content/inline.mdx | 0 .../canon-website}/content/layout.mdx | 0 .../canon-website}/content/responsive.mdx | 0 .../canon-website}/content/stack.mdx | 0 .../canon-website}/content/table.mdx | 0 .../canon-website}/content/text.mdx | 0 .../canon-website}/content/theming.mdx | 0 .../canon-website}/content/typography.mdx | 0 .../canon-website}/eslint.config.mjs | 0 .../canon-website}/mdx-components.tsx | 0 .../canon-website}/next.config.ts | 0 .../canon-website}/package.json | 16 +++++++++++++++- .../canon-website}/public/backstage.css | 0 .../canon-website}/public/components.css | 0 .../canon-website}/public/core.css | 0 .../canon-website}/public/header.png | Bin .../canon-website}/scripts/watch-css.js | 4 ++-- .../canon-website}/snippets/box.tsx | 2 +- .../canon-website}/snippets/button.tsx | 2 +- .../canon-website}/snippets/checkbox.tsx | 2 +- .../canon-website}/snippets/container.tsx | 2 +- .../canon-website}/snippets/grid.tsx | 2 +- .../canon-website}/snippets/heading.tsx | 2 +- .../canon-website}/snippets/icon.tsx | 2 +- .../canon-website}/snippets/inline.tsx | 2 +- .../canon-website}/snippets/stack.tsx | 2 +- .../canon-website}/snippets/text.tsx | 2 +- .../canon-website}/tsconfig.json | 0 .../canon-website}/utils/data.ts | 0 .../canon-website}/utils/playground-context.tsx | 0 .../canon-website}/utils/spaceProps.ts | 0 yarn.lock | 12 ++++++++++-- 112 files changed, 51 insertions(+), 21 deletions(-) rename {microsite-canon => packages/canon-website}/.gitignore (100%) rename {microsite-canon => packages/canon-website}/.prettierignore (100%) rename {microsite-canon => packages/canon-website}/README.md (100%) rename {microsite-canon => packages/canon-website}/app/[slug]/page.tsx (100%) rename {microsite-canon => packages/canon-website}/app/components/[slug]/page.module.css (100%) rename {microsite-canon => packages/canon-website}/app/components/[slug]/page.tsx (100%) rename {microsite-canon => packages/canon-website}/app/globals.css (100%) rename {microsite-canon => packages/canon-website}/app/icon.svg (100%) rename {microsite-canon => packages/canon-website}/app/layout.tsx (100%) rename {microsite-canon => packages/canon-website}/app/page.module.css (100%) rename {microsite-canon => packages/canon-website}/app/page.tsx (100%) rename {microsite-canon => packages/canon-website}/app/playground/page.tsx (100%) rename {microsite-canon => packages/canon-website}/app/playground/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/app/providers.tsx (100%) rename {microsite-canon => packages/canon-website}/app/theme/[slug]/page.tsx (100%) create mode 100644 packages/canon-website/catalog-info.yaml rename {microsite-canon => packages/canon-website}/components/Banner/Banner.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Banner/index.ts (100%) rename {microsite-canon => packages/canon-website}/components/Banner/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/components/Chip/Chip.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Chip/index.ts (100%) rename {microsite-canon => packages/canon-website}/components/Chip/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/components/CodeBlock/index.tsx (100%) rename {microsite-canon => packages/canon-website}/components/CodeBlock/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/components/Columns/Columns.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Columns/index.ts (100%) rename {microsite-canon => packages/canon-website}/components/Columns/styles.css (100%) rename {microsite-canon => packages/canon-website}/components/DecorativeBox/index.tsx (100%) rename {microsite-canon => packages/canon-website}/components/DecorativeBox/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/components/Frame/index.tsx (100%) rename {microsite-canon => packages/canon-website}/components/HeadlessBanners/BaseUI.tsx (100%) rename {microsite-canon => packages/canon-website}/components/HeadlessBanners/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/components/IconLibrary/IconLibrary.tsx (100%) rename {microsite-canon => packages/canon-website}/components/IconLibrary/index.ts (100%) rename {microsite-canon => packages/canon-website}/components/IconLibrary/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/components/LayoutComponents/LayoutComponents.module.css (100%) rename {microsite-canon => packages/canon-website}/components/LayoutComponents/LayoutComponents.tsx (100%) rename {microsite-canon => packages/canon-website}/components/LayoutComponents/index.ts (100%) rename {microsite-canon => packages/canon-website}/components/LayoutComponents/svgs/box.tsx (100%) rename {microsite-canon => packages/canon-website}/components/LayoutComponents/svgs/container.tsx (100%) rename {microsite-canon => packages/canon-website}/components/LayoutComponents/svgs/grid.tsx (100%) rename {microsite-canon => packages/canon-website}/components/LayoutComponents/svgs/inline.tsx (100%) rename {microsite-canon => packages/canon-website}/components/LayoutComponents/svgs/stack.tsx (100%) rename {microsite-canon => packages/canon-website}/components/PropsTable/PropsTable.tsx (100%) rename {microsite-canon => packages/canon-website}/components/PropsTable/index.ts (100%) rename {microsite-canon => packages/canon-website}/components/Roadmap/Roadmap.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Roadmap/index.ts (100%) rename {microsite-canon => packages/canon-website}/components/Roadmap/list.ts (100%) rename {microsite-canon => packages/canon-website}/components/Roadmap/styles.css (100%) rename {microsite-canon => packages/canon-website}/components/Sidebar/Sidebar.module.css (100%) rename {microsite-canon => packages/canon-website}/components/Sidebar/Tabs.module.css (100%) rename {microsite-canon => packages/canon-website}/components/Sidebar/actions.ts (100%) rename {microsite-canon => packages/canon-website}/components/Sidebar/docs.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Sidebar/index.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Sidebar/playground.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Sidebar/tabs.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Snippet/index.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Snippet/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/components/Story/frame.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Story/index.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Story/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/components/Table/Table.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Table/index.ts (100%) rename {microsite-canon => packages/canon-website}/components/Table/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/components/Tabs/index.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Tabs/parts.tsx (100%) rename {microsite-canon => packages/canon-website}/components/Tabs/styles.module.css (100%) rename {microsite-canon => packages/canon-website}/content/_snippets.ts (100%) rename {microsite-canon => packages/canon-website}/content/about.mdx (100%) rename {microsite-canon => packages/canon-website}/content/box.mdx (100%) rename {microsite-canon => packages/canon-website}/content/button.mdx (100%) rename {microsite-canon => packages/canon-website}/content/checkbox.mdx (100%) rename {microsite-canon => packages/canon-website}/content/container.mdx (100%) rename {microsite-canon => packages/canon-website}/content/grid.mdx (100%) rename {microsite-canon => packages/canon-website}/content/heading.mdx (100%) rename {microsite-canon => packages/canon-website}/content/home.mdx (100%) rename {microsite-canon => packages/canon-website}/content/icon.mdx (100%) rename {microsite-canon => packages/canon-website}/content/iconography.mdx (100%) rename {microsite-canon => packages/canon-website}/content/inline.mdx (100%) rename {microsite-canon => packages/canon-website}/content/layout.mdx (100%) rename {microsite-canon => packages/canon-website}/content/responsive.mdx (100%) rename {microsite-canon => packages/canon-website}/content/stack.mdx (100%) rename {microsite-canon => packages/canon-website}/content/table.mdx (100%) rename {microsite-canon => packages/canon-website}/content/text.mdx (100%) rename {microsite-canon => packages/canon-website}/content/theming.mdx (100%) rename {microsite-canon => packages/canon-website}/content/typography.mdx (100%) rename {microsite-canon => packages/canon-website}/eslint.config.mjs (100%) rename {microsite-canon => packages/canon-website}/mdx-components.tsx (100%) rename {microsite-canon => packages/canon-website}/next.config.ts (100%) rename {microsite-canon => packages/canon-website}/package.json (73%) rename {microsite-canon => packages/canon-website}/public/backstage.css (100%) rename {microsite-canon => packages/canon-website}/public/components.css (100%) rename {microsite-canon => packages/canon-website}/public/core.css (100%) rename {microsite-canon => packages/canon-website}/public/header.png (100%) rename {microsite-canon => packages/canon-website}/scripts/watch-css.js (94%) rename {microsite-canon => packages/canon-website}/snippets/box.tsx (68%) rename {microsite-canon => packages/canon-website}/snippets/button.tsx (91%) rename {microsite-canon => packages/canon-website}/snippets/checkbox.tsx (82%) rename {microsite-canon => packages/canon-website}/snippets/container.tsx (65%) rename {microsite-canon => packages/canon-website}/snippets/grid.tsx (67%) rename {microsite-canon => packages/canon-website}/snippets/heading.tsx (86%) rename {microsite-canon => packages/canon-website}/snippets/icon.tsx (67%) rename {microsite-canon => packages/canon-website}/snippets/inline.tsx (66%) rename {microsite-canon => packages/canon-website}/snippets/stack.tsx (67%) rename {microsite-canon => packages/canon-website}/snippets/text.tsx (89%) rename {microsite-canon => packages/canon-website}/tsconfig.json (100%) rename {microsite-canon => packages/canon-website}/utils/data.ts (100%) rename {microsite-canon => packages/canon-website}/utils/playground-context.tsx (100%) rename {microsite-canon => packages/canon-website}/utils/spaceProps.ts (100%) diff --git a/.eslintignore b/.eslintignore index 4cb3d34b8a..121623b4c2 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,7 +7,7 @@ **/.git/** **/public/** **/microsite/** -**/microsite-canon/** **/templates/** **/sample-templates/** playwright.config.ts +packages/canon-website/ diff --git a/package.json b/package.json index 73ef634d7b..8ef585a2c9 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,7 @@ "workspaces": { "packages": [ "packages/*", - "plugins/*", - "microsite-canon" + "plugins/*" ] }, "scripts": { @@ -85,9 +84,6 @@ ] }, "prettier": "@backstage/cli/config/prettier", - "jest": { - "rejectFrontendNetworkRequests": true - }, "resolutions": { "@changesets/assemble-release-plan@^6.0.0": "patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch", "@material-ui/pickers@^3.2.10": "patch:@material-ui/pickers@npm%3A3.3.11#./.yarn/patches/@material-ui-pickers-npm-3.3.11-1c8f68ea20.patch", @@ -138,6 +134,9 @@ "sort-package-json": "^2.8.0", "typescript": "~5.2.0" }, + "jest": { + "rejectFrontendNetworkRequests": true + }, "packageManager": "yarn@3.8.1", "engines": { "node": "20 || 22" diff --git a/microsite-canon/.gitignore b/packages/canon-website/.gitignore similarity index 100% rename from microsite-canon/.gitignore rename to packages/canon-website/.gitignore diff --git a/microsite-canon/.prettierignore b/packages/canon-website/.prettierignore similarity index 100% rename from microsite-canon/.prettierignore rename to packages/canon-website/.prettierignore diff --git a/microsite-canon/README.md b/packages/canon-website/README.md similarity index 100% rename from microsite-canon/README.md rename to packages/canon-website/README.md diff --git a/microsite-canon/app/[slug]/page.tsx b/packages/canon-website/app/[slug]/page.tsx similarity index 100% rename from microsite-canon/app/[slug]/page.tsx rename to packages/canon-website/app/[slug]/page.tsx diff --git a/microsite-canon/app/components/[slug]/page.module.css b/packages/canon-website/app/components/[slug]/page.module.css similarity index 100% rename from microsite-canon/app/components/[slug]/page.module.css rename to packages/canon-website/app/components/[slug]/page.module.css diff --git a/microsite-canon/app/components/[slug]/page.tsx b/packages/canon-website/app/components/[slug]/page.tsx similarity index 100% rename from microsite-canon/app/components/[slug]/page.tsx rename to packages/canon-website/app/components/[slug]/page.tsx diff --git a/microsite-canon/app/globals.css b/packages/canon-website/app/globals.css similarity index 100% rename from microsite-canon/app/globals.css rename to packages/canon-website/app/globals.css diff --git a/microsite-canon/app/icon.svg b/packages/canon-website/app/icon.svg similarity index 100% rename from microsite-canon/app/icon.svg rename to packages/canon-website/app/icon.svg diff --git a/microsite-canon/app/layout.tsx b/packages/canon-website/app/layout.tsx similarity index 100% rename from microsite-canon/app/layout.tsx rename to packages/canon-website/app/layout.tsx diff --git a/microsite-canon/app/page.module.css b/packages/canon-website/app/page.module.css similarity index 100% rename from microsite-canon/app/page.module.css rename to packages/canon-website/app/page.module.css diff --git a/microsite-canon/app/page.tsx b/packages/canon-website/app/page.tsx similarity index 100% rename from microsite-canon/app/page.tsx rename to packages/canon-website/app/page.tsx diff --git a/microsite-canon/app/playground/page.tsx b/packages/canon-website/app/playground/page.tsx similarity index 100% rename from microsite-canon/app/playground/page.tsx rename to packages/canon-website/app/playground/page.tsx diff --git a/microsite-canon/app/playground/styles.module.css b/packages/canon-website/app/playground/styles.module.css similarity index 100% rename from microsite-canon/app/playground/styles.module.css rename to packages/canon-website/app/playground/styles.module.css diff --git a/microsite-canon/app/providers.tsx b/packages/canon-website/app/providers.tsx similarity index 100% rename from microsite-canon/app/providers.tsx rename to packages/canon-website/app/providers.tsx diff --git a/microsite-canon/app/theme/[slug]/page.tsx b/packages/canon-website/app/theme/[slug]/page.tsx similarity index 100% rename from microsite-canon/app/theme/[slug]/page.tsx rename to packages/canon-website/app/theme/[slug]/page.tsx diff --git a/packages/canon-website/catalog-info.yaml b/packages/canon-website/catalog-info.yaml new file mode 100644 index 0000000000..bcbbcfb442 --- /dev/null +++ b/packages/canon-website/catalog-info.yaml @@ -0,0 +1,9 @@ +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: canon-website + title: canon-website +spec: + lifecycle: experimental + type: backstage-web-library + owner: maintainers diff --git a/microsite-canon/components/Banner/Banner.tsx b/packages/canon-website/components/Banner/Banner.tsx similarity index 100% rename from microsite-canon/components/Banner/Banner.tsx rename to packages/canon-website/components/Banner/Banner.tsx diff --git a/microsite-canon/components/Banner/index.ts b/packages/canon-website/components/Banner/index.ts similarity index 100% rename from microsite-canon/components/Banner/index.ts rename to packages/canon-website/components/Banner/index.ts diff --git a/microsite-canon/components/Banner/styles.module.css b/packages/canon-website/components/Banner/styles.module.css similarity index 100% rename from microsite-canon/components/Banner/styles.module.css rename to packages/canon-website/components/Banner/styles.module.css diff --git a/microsite-canon/components/Chip/Chip.tsx b/packages/canon-website/components/Chip/Chip.tsx similarity index 100% rename from microsite-canon/components/Chip/Chip.tsx rename to packages/canon-website/components/Chip/Chip.tsx diff --git a/microsite-canon/components/Chip/index.ts b/packages/canon-website/components/Chip/index.ts similarity index 100% rename from microsite-canon/components/Chip/index.ts rename to packages/canon-website/components/Chip/index.ts diff --git a/microsite-canon/components/Chip/styles.module.css b/packages/canon-website/components/Chip/styles.module.css similarity index 100% rename from microsite-canon/components/Chip/styles.module.css rename to packages/canon-website/components/Chip/styles.module.css diff --git a/microsite-canon/components/CodeBlock/index.tsx b/packages/canon-website/components/CodeBlock/index.tsx similarity index 100% rename from microsite-canon/components/CodeBlock/index.tsx rename to packages/canon-website/components/CodeBlock/index.tsx diff --git a/microsite-canon/components/CodeBlock/styles.module.css b/packages/canon-website/components/CodeBlock/styles.module.css similarity index 100% rename from microsite-canon/components/CodeBlock/styles.module.css rename to packages/canon-website/components/CodeBlock/styles.module.css diff --git a/microsite-canon/components/Columns/Columns.tsx b/packages/canon-website/components/Columns/Columns.tsx similarity index 100% rename from microsite-canon/components/Columns/Columns.tsx rename to packages/canon-website/components/Columns/Columns.tsx diff --git a/microsite-canon/components/Columns/index.ts b/packages/canon-website/components/Columns/index.ts similarity index 100% rename from microsite-canon/components/Columns/index.ts rename to packages/canon-website/components/Columns/index.ts diff --git a/microsite-canon/components/Columns/styles.css b/packages/canon-website/components/Columns/styles.css similarity index 100% rename from microsite-canon/components/Columns/styles.css rename to packages/canon-website/components/Columns/styles.css diff --git a/microsite-canon/components/DecorativeBox/index.tsx b/packages/canon-website/components/DecorativeBox/index.tsx similarity index 100% rename from microsite-canon/components/DecorativeBox/index.tsx rename to packages/canon-website/components/DecorativeBox/index.tsx diff --git a/microsite-canon/components/DecorativeBox/styles.module.css b/packages/canon-website/components/DecorativeBox/styles.module.css similarity index 100% rename from microsite-canon/components/DecorativeBox/styles.module.css rename to packages/canon-website/components/DecorativeBox/styles.module.css diff --git a/microsite-canon/components/Frame/index.tsx b/packages/canon-website/components/Frame/index.tsx similarity index 100% rename from microsite-canon/components/Frame/index.tsx rename to packages/canon-website/components/Frame/index.tsx diff --git a/microsite-canon/components/HeadlessBanners/BaseUI.tsx b/packages/canon-website/components/HeadlessBanners/BaseUI.tsx similarity index 100% rename from microsite-canon/components/HeadlessBanners/BaseUI.tsx rename to packages/canon-website/components/HeadlessBanners/BaseUI.tsx diff --git a/microsite-canon/components/HeadlessBanners/styles.module.css b/packages/canon-website/components/HeadlessBanners/styles.module.css similarity index 100% rename from microsite-canon/components/HeadlessBanners/styles.module.css rename to packages/canon-website/components/HeadlessBanners/styles.module.css diff --git a/microsite-canon/components/IconLibrary/IconLibrary.tsx b/packages/canon-website/components/IconLibrary/IconLibrary.tsx similarity index 100% rename from microsite-canon/components/IconLibrary/IconLibrary.tsx rename to packages/canon-website/components/IconLibrary/IconLibrary.tsx diff --git a/microsite-canon/components/IconLibrary/index.ts b/packages/canon-website/components/IconLibrary/index.ts similarity index 100% rename from microsite-canon/components/IconLibrary/index.ts rename to packages/canon-website/components/IconLibrary/index.ts diff --git a/microsite-canon/components/IconLibrary/styles.module.css b/packages/canon-website/components/IconLibrary/styles.module.css similarity index 100% rename from microsite-canon/components/IconLibrary/styles.module.css rename to packages/canon-website/components/IconLibrary/styles.module.css diff --git a/microsite-canon/components/LayoutComponents/LayoutComponents.module.css b/packages/canon-website/components/LayoutComponents/LayoutComponents.module.css similarity index 100% rename from microsite-canon/components/LayoutComponents/LayoutComponents.module.css rename to packages/canon-website/components/LayoutComponents/LayoutComponents.module.css diff --git a/microsite-canon/components/LayoutComponents/LayoutComponents.tsx b/packages/canon-website/components/LayoutComponents/LayoutComponents.tsx similarity index 100% rename from microsite-canon/components/LayoutComponents/LayoutComponents.tsx rename to packages/canon-website/components/LayoutComponents/LayoutComponents.tsx diff --git a/microsite-canon/components/LayoutComponents/index.ts b/packages/canon-website/components/LayoutComponents/index.ts similarity index 100% rename from microsite-canon/components/LayoutComponents/index.ts rename to packages/canon-website/components/LayoutComponents/index.ts diff --git a/microsite-canon/components/LayoutComponents/svgs/box.tsx b/packages/canon-website/components/LayoutComponents/svgs/box.tsx similarity index 100% rename from microsite-canon/components/LayoutComponents/svgs/box.tsx rename to packages/canon-website/components/LayoutComponents/svgs/box.tsx diff --git a/microsite-canon/components/LayoutComponents/svgs/container.tsx b/packages/canon-website/components/LayoutComponents/svgs/container.tsx similarity index 100% rename from microsite-canon/components/LayoutComponents/svgs/container.tsx rename to packages/canon-website/components/LayoutComponents/svgs/container.tsx diff --git a/microsite-canon/components/LayoutComponents/svgs/grid.tsx b/packages/canon-website/components/LayoutComponents/svgs/grid.tsx similarity index 100% rename from microsite-canon/components/LayoutComponents/svgs/grid.tsx rename to packages/canon-website/components/LayoutComponents/svgs/grid.tsx diff --git a/microsite-canon/components/LayoutComponents/svgs/inline.tsx b/packages/canon-website/components/LayoutComponents/svgs/inline.tsx similarity index 100% rename from microsite-canon/components/LayoutComponents/svgs/inline.tsx rename to packages/canon-website/components/LayoutComponents/svgs/inline.tsx diff --git a/microsite-canon/components/LayoutComponents/svgs/stack.tsx b/packages/canon-website/components/LayoutComponents/svgs/stack.tsx similarity index 100% rename from microsite-canon/components/LayoutComponents/svgs/stack.tsx rename to packages/canon-website/components/LayoutComponents/svgs/stack.tsx diff --git a/microsite-canon/components/PropsTable/PropsTable.tsx b/packages/canon-website/components/PropsTable/PropsTable.tsx similarity index 100% rename from microsite-canon/components/PropsTable/PropsTable.tsx rename to packages/canon-website/components/PropsTable/PropsTable.tsx diff --git a/microsite-canon/components/PropsTable/index.ts b/packages/canon-website/components/PropsTable/index.ts similarity index 100% rename from microsite-canon/components/PropsTable/index.ts rename to packages/canon-website/components/PropsTable/index.ts diff --git a/microsite-canon/components/Roadmap/Roadmap.tsx b/packages/canon-website/components/Roadmap/Roadmap.tsx similarity index 100% rename from microsite-canon/components/Roadmap/Roadmap.tsx rename to packages/canon-website/components/Roadmap/Roadmap.tsx diff --git a/microsite-canon/components/Roadmap/index.ts b/packages/canon-website/components/Roadmap/index.ts similarity index 100% rename from microsite-canon/components/Roadmap/index.ts rename to packages/canon-website/components/Roadmap/index.ts diff --git a/microsite-canon/components/Roadmap/list.ts b/packages/canon-website/components/Roadmap/list.ts similarity index 100% rename from microsite-canon/components/Roadmap/list.ts rename to packages/canon-website/components/Roadmap/list.ts diff --git a/microsite-canon/components/Roadmap/styles.css b/packages/canon-website/components/Roadmap/styles.css similarity index 100% rename from microsite-canon/components/Roadmap/styles.css rename to packages/canon-website/components/Roadmap/styles.css diff --git a/microsite-canon/components/Sidebar/Sidebar.module.css b/packages/canon-website/components/Sidebar/Sidebar.module.css similarity index 100% rename from microsite-canon/components/Sidebar/Sidebar.module.css rename to packages/canon-website/components/Sidebar/Sidebar.module.css diff --git a/microsite-canon/components/Sidebar/Tabs.module.css b/packages/canon-website/components/Sidebar/Tabs.module.css similarity index 100% rename from microsite-canon/components/Sidebar/Tabs.module.css rename to packages/canon-website/components/Sidebar/Tabs.module.css diff --git a/microsite-canon/components/Sidebar/actions.ts b/packages/canon-website/components/Sidebar/actions.ts similarity index 100% rename from microsite-canon/components/Sidebar/actions.ts rename to packages/canon-website/components/Sidebar/actions.ts diff --git a/microsite-canon/components/Sidebar/docs.tsx b/packages/canon-website/components/Sidebar/docs.tsx similarity index 100% rename from microsite-canon/components/Sidebar/docs.tsx rename to packages/canon-website/components/Sidebar/docs.tsx diff --git a/microsite-canon/components/Sidebar/index.tsx b/packages/canon-website/components/Sidebar/index.tsx similarity index 100% rename from microsite-canon/components/Sidebar/index.tsx rename to packages/canon-website/components/Sidebar/index.tsx diff --git a/microsite-canon/components/Sidebar/playground.tsx b/packages/canon-website/components/Sidebar/playground.tsx similarity index 100% rename from microsite-canon/components/Sidebar/playground.tsx rename to packages/canon-website/components/Sidebar/playground.tsx diff --git a/microsite-canon/components/Sidebar/tabs.tsx b/packages/canon-website/components/Sidebar/tabs.tsx similarity index 100% rename from microsite-canon/components/Sidebar/tabs.tsx rename to packages/canon-website/components/Sidebar/tabs.tsx diff --git a/microsite-canon/components/Snippet/index.tsx b/packages/canon-website/components/Snippet/index.tsx similarity index 100% rename from microsite-canon/components/Snippet/index.tsx rename to packages/canon-website/components/Snippet/index.tsx diff --git a/microsite-canon/components/Snippet/styles.module.css b/packages/canon-website/components/Snippet/styles.module.css similarity index 100% rename from microsite-canon/components/Snippet/styles.module.css rename to packages/canon-website/components/Snippet/styles.module.css diff --git a/microsite-canon/components/Story/frame.tsx b/packages/canon-website/components/Story/frame.tsx similarity index 100% rename from microsite-canon/components/Story/frame.tsx rename to packages/canon-website/components/Story/frame.tsx diff --git a/microsite-canon/components/Story/index.tsx b/packages/canon-website/components/Story/index.tsx similarity index 100% rename from microsite-canon/components/Story/index.tsx rename to packages/canon-website/components/Story/index.tsx diff --git a/microsite-canon/components/Story/styles.module.css b/packages/canon-website/components/Story/styles.module.css similarity index 100% rename from microsite-canon/components/Story/styles.module.css rename to packages/canon-website/components/Story/styles.module.css diff --git a/microsite-canon/components/Table/Table.tsx b/packages/canon-website/components/Table/Table.tsx similarity index 100% rename from microsite-canon/components/Table/Table.tsx rename to packages/canon-website/components/Table/Table.tsx diff --git a/microsite-canon/components/Table/index.ts b/packages/canon-website/components/Table/index.ts similarity index 100% rename from microsite-canon/components/Table/index.ts rename to packages/canon-website/components/Table/index.ts diff --git a/microsite-canon/components/Table/styles.module.css b/packages/canon-website/components/Table/styles.module.css similarity index 100% rename from microsite-canon/components/Table/styles.module.css rename to packages/canon-website/components/Table/styles.module.css diff --git a/microsite-canon/components/Tabs/index.tsx b/packages/canon-website/components/Tabs/index.tsx similarity index 100% rename from microsite-canon/components/Tabs/index.tsx rename to packages/canon-website/components/Tabs/index.tsx diff --git a/microsite-canon/components/Tabs/parts.tsx b/packages/canon-website/components/Tabs/parts.tsx similarity index 100% rename from microsite-canon/components/Tabs/parts.tsx rename to packages/canon-website/components/Tabs/parts.tsx diff --git a/microsite-canon/components/Tabs/styles.module.css b/packages/canon-website/components/Tabs/styles.module.css similarity index 100% rename from microsite-canon/components/Tabs/styles.module.css rename to packages/canon-website/components/Tabs/styles.module.css diff --git a/microsite-canon/content/_snippets.ts b/packages/canon-website/content/_snippets.ts similarity index 100% rename from microsite-canon/content/_snippets.ts rename to packages/canon-website/content/_snippets.ts diff --git a/microsite-canon/content/about.mdx b/packages/canon-website/content/about.mdx similarity index 100% rename from microsite-canon/content/about.mdx rename to packages/canon-website/content/about.mdx diff --git a/microsite-canon/content/box.mdx b/packages/canon-website/content/box.mdx similarity index 100% rename from microsite-canon/content/box.mdx rename to packages/canon-website/content/box.mdx diff --git a/microsite-canon/content/button.mdx b/packages/canon-website/content/button.mdx similarity index 100% rename from microsite-canon/content/button.mdx rename to packages/canon-website/content/button.mdx diff --git a/microsite-canon/content/checkbox.mdx b/packages/canon-website/content/checkbox.mdx similarity index 100% rename from microsite-canon/content/checkbox.mdx rename to packages/canon-website/content/checkbox.mdx diff --git a/microsite-canon/content/container.mdx b/packages/canon-website/content/container.mdx similarity index 100% rename from microsite-canon/content/container.mdx rename to packages/canon-website/content/container.mdx diff --git a/microsite-canon/content/grid.mdx b/packages/canon-website/content/grid.mdx similarity index 100% rename from microsite-canon/content/grid.mdx rename to packages/canon-website/content/grid.mdx diff --git a/microsite-canon/content/heading.mdx b/packages/canon-website/content/heading.mdx similarity index 100% rename from microsite-canon/content/heading.mdx rename to packages/canon-website/content/heading.mdx diff --git a/microsite-canon/content/home.mdx b/packages/canon-website/content/home.mdx similarity index 100% rename from microsite-canon/content/home.mdx rename to packages/canon-website/content/home.mdx diff --git a/microsite-canon/content/icon.mdx b/packages/canon-website/content/icon.mdx similarity index 100% rename from microsite-canon/content/icon.mdx rename to packages/canon-website/content/icon.mdx diff --git a/microsite-canon/content/iconography.mdx b/packages/canon-website/content/iconography.mdx similarity index 100% rename from microsite-canon/content/iconography.mdx rename to packages/canon-website/content/iconography.mdx diff --git a/microsite-canon/content/inline.mdx b/packages/canon-website/content/inline.mdx similarity index 100% rename from microsite-canon/content/inline.mdx rename to packages/canon-website/content/inline.mdx diff --git a/microsite-canon/content/layout.mdx b/packages/canon-website/content/layout.mdx similarity index 100% rename from microsite-canon/content/layout.mdx rename to packages/canon-website/content/layout.mdx diff --git a/microsite-canon/content/responsive.mdx b/packages/canon-website/content/responsive.mdx similarity index 100% rename from microsite-canon/content/responsive.mdx rename to packages/canon-website/content/responsive.mdx diff --git a/microsite-canon/content/stack.mdx b/packages/canon-website/content/stack.mdx similarity index 100% rename from microsite-canon/content/stack.mdx rename to packages/canon-website/content/stack.mdx diff --git a/microsite-canon/content/table.mdx b/packages/canon-website/content/table.mdx similarity index 100% rename from microsite-canon/content/table.mdx rename to packages/canon-website/content/table.mdx diff --git a/microsite-canon/content/text.mdx b/packages/canon-website/content/text.mdx similarity index 100% rename from microsite-canon/content/text.mdx rename to packages/canon-website/content/text.mdx diff --git a/microsite-canon/content/theming.mdx b/packages/canon-website/content/theming.mdx similarity index 100% rename from microsite-canon/content/theming.mdx rename to packages/canon-website/content/theming.mdx diff --git a/microsite-canon/content/typography.mdx b/packages/canon-website/content/typography.mdx similarity index 100% rename from microsite-canon/content/typography.mdx rename to packages/canon-website/content/typography.mdx diff --git a/microsite-canon/eslint.config.mjs b/packages/canon-website/eslint.config.mjs similarity index 100% rename from microsite-canon/eslint.config.mjs rename to packages/canon-website/eslint.config.mjs diff --git a/microsite-canon/mdx-components.tsx b/packages/canon-website/mdx-components.tsx similarity index 100% rename from microsite-canon/mdx-components.tsx rename to packages/canon-website/mdx-components.tsx diff --git a/microsite-canon/next.config.ts b/packages/canon-website/next.config.ts similarity index 100% rename from microsite-canon/next.config.ts rename to packages/canon-website/next.config.ts diff --git a/microsite-canon/package.json b/packages/canon-website/package.json similarity index 73% rename from microsite-canon/package.json rename to packages/canon-website/package.json index fda500b3f4..c2826cb861 100644 --- a/microsite-canon/package.json +++ b/packages/canon-website/package.json @@ -1,6 +1,9 @@ { - "name": "canon-microsite", + "name": "canon-website", "version": "0.0.0", + "backstage": { + "role": "web-library" + }, "private": true, "license": "Apache-2.0", "scripts": { @@ -37,5 +40,16 @@ "lightningcss": "^1.28.2", "shiki": "^1.24.4", "typescript": "^5" + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/microsite-canon/public/backstage.css b/packages/canon-website/public/backstage.css similarity index 100% rename from microsite-canon/public/backstage.css rename to packages/canon-website/public/backstage.css diff --git a/microsite-canon/public/components.css b/packages/canon-website/public/components.css similarity index 100% rename from microsite-canon/public/components.css rename to packages/canon-website/public/components.css diff --git a/microsite-canon/public/core.css b/packages/canon-website/public/core.css similarity index 100% rename from microsite-canon/public/core.css rename to packages/canon-website/public/core.css diff --git a/microsite-canon/public/header.png b/packages/canon-website/public/header.png similarity index 100% rename from microsite-canon/public/header.png rename to packages/canon-website/public/header.png diff --git a/microsite-canon/scripts/watch-css.js b/packages/canon-website/scripts/watch-css.js similarity index 94% rename from microsite-canon/scripts/watch-css.js rename to packages/canon-website/scripts/watch-css.js index b3cfedd570..b963db672e 100644 --- a/microsite-canon/scripts/watch-css.js +++ b/packages/canon-website/scripts/watch-css.js @@ -3,7 +3,7 @@ const path = require('path'); const chokidar = require('chokidar'); const { bundle } = require('lightningcss'); -const source = '../../packages/canon/src/css'; +const source = '../../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, - `../../packages/canon/.storybook/themes/backstage.css`, + `../../canon/.storybook/themes/backstage.css`, ); const destination3 = path.join(__dirname, `${destination}/backstage.css`); diff --git a/microsite-canon/snippets/box.tsx b/packages/canon-website/snippets/box.tsx similarity index 68% rename from microsite-canon/snippets/box.tsx rename to packages/canon-website/snippets/box.tsx index c41b749337..107f1dac9a 100644 --- a/microsite-canon/snippets/box.tsx +++ b/packages/canon-website/snippets/box.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as BoxStories from '../../packages/canon/src/components/Box/Box.stories'; +import * as BoxStories from '../../canon/src/components/Box/Box.stories'; import { composeStories } from '@storybook/react'; export const BoxPreview = () => { diff --git a/microsite-canon/snippets/button.tsx b/packages/canon-website/snippets/button.tsx similarity index 91% rename from microsite-canon/snippets/button.tsx rename to packages/canon-website/snippets/button.tsx index 63e2c58f69..8ad40a3f4a 100644 --- a/microsite-canon/snippets/button.tsx +++ b/packages/canon-website/snippets/button.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as ButtonStories from '../../packages/canon/src/components/Button/Button.stories'; +import * as ButtonStories from '../../canon/src/components/Button/Button.stories'; import { composeStories } from '@storybook/react'; export const ButtonPreview = () => { diff --git a/microsite-canon/snippets/checkbox.tsx b/packages/canon-website/snippets/checkbox.tsx similarity index 82% rename from microsite-canon/snippets/checkbox.tsx rename to packages/canon-website/snippets/checkbox.tsx index 231ce6864b..bd96188724 100644 --- a/microsite-canon/snippets/checkbox.tsx +++ b/packages/canon-website/snippets/checkbox.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as CheckboxStories from '../../packages/canon/src/components/Checkbox/Checkbox.stories'; +import * as CheckboxStories from '../../canon/src/components/Checkbox/Checkbox.stories'; import { composeStories } from '@storybook/react'; export const CheckboxPreview = () => { diff --git a/microsite-canon/snippets/container.tsx b/packages/canon-website/snippets/container.tsx similarity index 65% rename from microsite-canon/snippets/container.tsx rename to packages/canon-website/snippets/container.tsx index 32205447a1..6bd8f0345a 100644 --- a/microsite-canon/snippets/container.tsx +++ b/packages/canon-website/snippets/container.tsx @@ -1,7 +1,7 @@ 'use client'; import { composeStories } from '@storybook/react'; -import * as ContainerStories from '../../packages/canon/src/components/Container/Container.stories'; +import * as ContainerStories from '../../canon/src/components/Container/Container.stories'; export const ContainerPreview = () => { const { Preview } = composeStories(ContainerStories); diff --git a/microsite-canon/snippets/grid.tsx b/packages/canon-website/snippets/grid.tsx similarity index 67% rename from microsite-canon/snippets/grid.tsx rename to packages/canon-website/snippets/grid.tsx index 8f1a8d64db..069dae195b 100644 --- a/microsite-canon/snippets/grid.tsx +++ b/packages/canon-website/snippets/grid.tsx @@ -1,7 +1,7 @@ 'use client'; import { composeStories } from '@storybook/react'; -import * as GridStories from '../../packages/canon/src/components/Grid/Grid.stories'; +import * as GridStories from '../../canon/src/components/Grid/Grid.stories'; export const GridPreview = () => { const { Default } = composeStories(GridStories); diff --git a/microsite-canon/snippets/heading.tsx b/packages/canon-website/snippets/heading.tsx similarity index 86% rename from microsite-canon/snippets/heading.tsx rename to packages/canon-website/snippets/heading.tsx index 7c9fb23448..4b3d006177 100644 --- a/microsite-canon/snippets/heading.tsx +++ b/packages/canon-website/snippets/heading.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as HeadingStories from '../../packages/canon/src/components/Heading/Heading.stories'; +import * as HeadingStories from '../../canon/src/components/Heading/Heading.stories'; import { composeStories } from '@storybook/react'; export const HeadingPreview = () => { diff --git a/microsite-canon/snippets/icon.tsx b/packages/canon-website/snippets/icon.tsx similarity index 67% rename from microsite-canon/snippets/icon.tsx rename to packages/canon-website/snippets/icon.tsx index 975adfa9e7..4a7c351366 100644 --- a/microsite-canon/snippets/icon.tsx +++ b/packages/canon-website/snippets/icon.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as IconStories from '../../packages/canon/src/components/Icon/Icon.stories'; +import * as IconStories from '../../canon/src/components/Icon/Icon.stories'; import { composeStories } from '@storybook/react'; export const IconPreview = () => { diff --git a/microsite-canon/snippets/inline.tsx b/packages/canon-website/snippets/inline.tsx similarity index 66% rename from microsite-canon/snippets/inline.tsx rename to packages/canon-website/snippets/inline.tsx index 3f5c0f6e64..5e44f01a46 100644 --- a/microsite-canon/snippets/inline.tsx +++ b/packages/canon-website/snippets/inline.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as InlineStories from '../../packages/canon/src/components/Inline/Inline.stories'; +import * as InlineStories from '../../canon/src/components/Inline/Inline.stories'; import { composeStories } from '@storybook/react'; export const InlinePreview = () => { diff --git a/microsite-canon/snippets/stack.tsx b/packages/canon-website/snippets/stack.tsx similarity index 67% rename from microsite-canon/snippets/stack.tsx rename to packages/canon-website/snippets/stack.tsx index 2274a3d434..c64a05783a 100644 --- a/microsite-canon/snippets/stack.tsx +++ b/packages/canon-website/snippets/stack.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as StackStories from '../../packages/canon/src/components/Stack/Stack.stories'; +import * as StackStories from '../../canon/src/components/Stack/Stack.stories'; import { composeStories } from '@storybook/react'; export const StackPreview = () => { diff --git a/microsite-canon/snippets/text.tsx b/packages/canon-website/snippets/text.tsx similarity index 89% rename from microsite-canon/snippets/text.tsx rename to packages/canon-website/snippets/text.tsx index 4ce93c2777..45ab96807f 100644 --- a/microsite-canon/snippets/text.tsx +++ b/packages/canon-website/snippets/text.tsx @@ -1,6 +1,6 @@ 'use client'; -import * as TextStories from '../../packages/canon/src/components/Text/Text.stories'; +import * as TextStories from '../../canon/src/components/Text/Text.stories'; import { composeStories } from '@storybook/react'; export const TextPreview = () => { diff --git a/microsite-canon/tsconfig.json b/packages/canon-website/tsconfig.json similarity index 100% rename from microsite-canon/tsconfig.json rename to packages/canon-website/tsconfig.json diff --git a/microsite-canon/utils/data.ts b/packages/canon-website/utils/data.ts similarity index 100% rename from microsite-canon/utils/data.ts rename to packages/canon-website/utils/data.ts diff --git a/microsite-canon/utils/playground-context.tsx b/packages/canon-website/utils/playground-context.tsx similarity index 100% rename from microsite-canon/utils/playground-context.tsx rename to packages/canon-website/utils/playground-context.tsx diff --git a/microsite-canon/utils/spaceProps.ts b/packages/canon-website/utils/spaceProps.ts similarity index 100% rename from microsite-canon/utils/spaceProps.ts rename to packages/canon-website/utils/spaceProps.ts diff --git a/yarn.lock b/yarn.lock index f89e6a7243..a783c3f91b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24612,9 +24612,9 @@ __metadata: languageName: node linkType: hard -"canon-microsite@workspace:microsite-canon": +"canon-website@workspace:packages/canon-website": version: 0.0.0-use.local - resolution: "canon-microsite@workspace:microsite-canon" + resolution: "canon-website@workspace:packages/canon-website" dependencies: "@backstage/canon": "workspace:^" "@base-ui-components/react": ^1.0.0-alpha.4 @@ -24640,6 +24640,14 @@ __metadata: react-frame-component: ^5.2.7 shiki: ^1.24.4 typescript: ^5 + peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft