Merge dependabot-npm_and_yarn-vue-tsc-1.8.8 into combine-prs-branch

.github/dependabot.yml

@@ -7,12 +7,11 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+    open-pull-requests-limit: 10
     pull-request-branch-name:
       separator: '-'
     commit-message:
       prefix: 'chore'
     ignore:
       - dependency-name: 'semantic-release' # requires upgrade to node v18 (workarounds: https://semantic-release.gitbook.io/semantic-release/support/node-version#recommended-solution); currently storybook breaks on node v18
       - dependency-name: '@storybook/*'
-    reviewers:
-      - 'archilogic-com/frontend'

.github/workflows/backup.yml

@@ -1,11 +1,26 @@
-name: Backup repo to S3
+name: Backup repo to CodeCommit
 on:
   push:
     branches:
       - main
 jobs:
-  backup_to_codecommit:
-    uses: 'archilogic-com/actions/.github/workflows/backup-repo.yml@main'
-    with:
-      TARGET_REPO_URL: 'honeycomb'
-    secrets: inherit
+  to_codecommit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-access-key-id: ${{ secrets.BACKUP_AWS_ACCES_KEY }}
+          aws-secret-access-key: ${{ secrets.BACKUP_AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-1
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: pixta-dev/repository-mirroring-action@v1
+        with:
+          target_repo_url:
+            "ssh://git-codecommit.eu-west-1.amazonaws.com/v1/repos/honeycomb"
+          ssh_private_key:
+            ${{ secrets.CODECOMMIT_SSH_PRIVATE_KEY }}
+          ssh_username:
+            ${{ secrets.CODECOMMIT_SSH_PRIVATE_KEY_ID }}

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+# [2.4.0](https://github.com/archilogic-com/honeycomb/compare/v2.3.1...v2.4.0) (2023-07-27)
+
+
+### Features
+
+* **color-circle:** add support for a border color ([#47](https://github.com/archilogic-com/honeycomb/issues/47)) ([fdb4844](https://github.com/archilogic-com/honeycomb/commit/fdb4844f2bdff3872d3ff54597ae96a4bd3d1933))
+
+## [2.3.1](https://github.com/archilogic-com/honeycomb/compare/v2.3.0...v2.3.1) (2023-07-25)
+
+
+### Bug Fixes
+
+* **infra:** Use local workflow for CodeCommit backup ([#35](https://github.com/archilogic-com/honeycomb/issues/35)) ([9b7e036](https://github.com/archilogic-com/honeycomb/commit/9b7e036aaffa34544f7b7532b857b72f67d91971))
+
 # [2.3.0](https://github.com/archilogic-com/honeycomb/compare/v2.2.0...v2.3.0) (2023-07-19)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archilogic/honeycomb",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "publishConfig": {
     "access": "public"
   },
@@ -100,7 +100,7 @@
     "vite-plugin-dts": "3.0.3",
     "vite-svg-loader": "^4.0.0",
     "vitest": "^0.32.2",
-    "vue-tsc": "^1.8.4"
+    "vue-tsc": "^1.8.8"
   },
   "prettier": "@archilogic/prettier"
 }

src/components/ColorCircle.vue

@@ -14,6 +14,10 @@ export default defineComponent({
       type: String as PropType<Colors>,
       default: ''
     },
+    borderColor: {
+      type: String as PropType<Colors>,
+      default: ''
+    },
     /**
      * size of the circle
      * 'md' | 'lg'
@@ -25,11 +29,16 @@ export default defineComponent({
   },
   setup(props) {
     const backgroundColor = computed(() =>
-      props.color ? `background-color: ${colors[props.color] || props.color}` : ''
+      props.color ? `${colors[props.color] || props.color}` : ''
     )
+    const borderColor = computed(() => props.borderColor || backgroundColor.value)
+    const styles = computed(() => ({
+      backgroundColor: backgroundColor.value,
+      border: `1px solid ${borderColor.value}`
+    }))
     return {
       colors,
-      backgroundColor
+      styles
     }
   }
 })
@@ -38,5 +47,5 @@ export default defineComponent({
   <span
     class="inline-block shrink-0 rounded-full"
     :class="size === 'md' ? 'h-2 w-2' : 'h-3 w-3'"
-    :style="backgroundColor"></span>
+    :style="styles"></span>
 </template>

src/stories/ColorCircle.stories.mdx

@@ -11,6 +11,9 @@ import { AColorCircle } from '../components'
     color: {
       control: 'text'
     },
+    borderColor: {
+      control: 'text'
+    },
     size: {
       control: ['md', 'lg']
     }
@@ -88,6 +91,14 @@ as well as [HTML color names](https://en.wikipedia.org/wiki/Web_colors#HTML_colo
     }}>
     {Template.bind({})}
   </Story>
+  <Story
+    name="with border"
+    args={{
+      color: 'white',
+      borderColor: 'mediumblue'
+    }}>
+    {Template.bind({})}
+  </Story>
 </Canvas>
 
 ## Size