From 578df5ce3d23dfa9c7b10c24036479e4942d1ec6 Mon Sep 17 00:00:00 2001 From: Bojan Rajh <117360292+bojanrajh@users.noreply.github.com> Date: Thu, 21 Mar 2024 12:01:37 +0100 Subject: [PATCH] feat: Meteor Icon Kit @ monorepo (#196) * feat: prepare for monorepo * lock * feat: switch monorepo branch * fix: use root path --- .github/scripts/embed.sh | 9 +++++---- .vitepress/config.ts | 4 ++-- .vitepress/navigation.ts | 2 +- .vitepress/portal.json | 4 ++-- README.md | 5 ++--- package.json | 2 +- pnpm-lock.yaml | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/scripts/embed.sh b/.github/scripts/embed.sh index e0e83f59..bfaba71d 100755 --- a/.github/scripts/embed.sh +++ b/.github/scripts/embed.sh @@ -8,7 +8,7 @@ BRANCH_DOCS_64=v6.4 BRANCH_DOCS_63=v6.3.0 BRANCH_FRONTENDS=DX-devhub BRANCH_ADMIN_EXTENSION_SDK=dx-devhub-admin-sdk -BRANCH_METEOR_ICON_KIT=main +BRANCH_METEOR_ICON_KIT=dx/devhub-icon-kit BRANCH_METEOR_COMPONENT_LIBRARY=DX-231 BRANCH_RELEASE_NOTES=main @@ -92,11 +92,12 @@ fi ./docs-cli.cjs clone \ --ci \ - --repository shopware/meteor-icon-kit \ + --repository shopware/meteor \ --branch ${BRANCH_METEOR_ICON_KIT:-main} \ - --src docs \ + --src packages/icon-kit/docs \ --dst resources/meteor-icon-kit \ - --org ${ORG_METEOR_ICON_KIT:-shopware} + --org ${ORG_METEOR_ICON_KIT:-shopware} \ + --root ../.. #./docs-cli.cjs clone \ # --ci \ diff --git a/.vitepress/config.ts b/.vitepress/config.ts index 3193d165..1a1a12e5 100644 --- a/.vitepress/config.ts +++ b/.vitepress/config.ts @@ -161,11 +161,11 @@ const embeds: SwagEmbedsConfig[] = [ folder: 'docs', }, { - repository: 'meteor-icon-kit', + repository: 'meteor', points: { '/resources/meteor-icon-kit/': 'main', }, - folder: 'docs', + folder: 'packages/icon-kit/docs', }, { repository: 'admin-api-reference', diff --git a/.vitepress/navigation.ts b/.vitepress/navigation.ts index 21901c9a..7dbc7c55 100644 --- a/.vitepress/navigation.ts +++ b/.vitepress/navigation.ts @@ -55,7 +55,7 @@ const navigation = buildSidebarNav('./src/', [ { text: "Meteor Icon Kit", link: "/resources/meteor-icon-kit/", - repo: 'shopware/meteor-icon-kit', + repo: 'shopware/meteor', }, { text: "Meteor Component Library", diff --git a/.vitepress/portal.json b/.vitepress/portal.json index 71832c5b..a6a2c83e 100644 --- a/.vitepress/portal.json +++ b/.vitepress/portal.json @@ -125,8 +125,8 @@ ] }, { - "name": "shopware/meteor-icon-kit", - "src": "docs", + "name": "shopware/meteor", + "src": "packages/icon-kit/docs", "dst": "resources/meteor-icon-kit", "branch": [ "env.BRANCH_METEOR_ICON_KIT", diff --git a/README.md b/README.md index 7a99607e..dd6de6bd 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,8 @@ This repository: folder (destination) in this repository: - [shopware/docs](https://github.com/shopware/docs) - [shopware/frontends](https://github.com/shopware/frontends) - - [shopware/admin-extension-sdk](https://github.com/shopware/admin-extension-sdk) - - [shopware/meteor-icon-kit](https://github.com/shopware/meteor-icon-kit) - - [shopware/meteor-component-library](https://github.com/shopware/meteor-component-library) + - [shopware/meteor](https://github.com/shopware/meteor) + - [shopware/release-notes](https://github.com/shopware/release-notes) - [shopware/store-api-reference](https://github.com/shopware/store-api-reference) - [shopware/admin-api-reference](https://github.com/shopware/admin-api-reference) - **has a single deployment workflow** with the build being served from a single diff --git a/package.json b/package.json index bc4be2d4..a6125cd3 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "author": "", "license": "ISC", "dependencies": { - "@shopware-ag/meteor-icon-kit": "^5.2.0", + "@shopware-ag/meteor-icon-kit": "^5.2.1", "cross-env": "^7.0.3", "terser": "^5.27.0", "vitepress": "1.0.0-rc.40", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e79c069b..5c252dc7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: dependencies: '@shopware-ag/meteor-icon-kit': - specifier: ^5.2.0 + specifier: ^5.2.1 version: 5.2.1 cross-env: specifier: ^7.0.3