Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ElderAS/vue-elder-button
Browse files Browse the repository at this point in the history
  • Loading branch information
crsten committed Mar 18, 2024
2 parents 5db7042 + 9e32c2e commit 50a91d2
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 15 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/semantic-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: CI
on:
push:
branches:
- master
jobs:
deploy:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '18'
- run: npm install
- name: Release
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
run: npx semantic-release
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@
},
"homepage": "https://github.com/ElderAS/vue-elder-button#readme",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.26",
"@fortawesome/free-solid-svg-icons": "^5.2.0",
"@fortawesome/vue-fontawesome": "^0.1.9"
"@kvass/vue2-icon": "^1.0.3"
},
"devDependencies": {
"cz-conventional-changelog": "^3.3.0",
"dotenv-cli": "^4.0.0",
"semantic-release": "^17.3.0",
"semantic-release-cli": "^5.4.0"
},
Expand Down
9 changes: 4 additions & 5 deletions src/component.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<template lang="html">
<template>
<component
:is="tag"
v-bind="{
Expand All @@ -16,7 +16,7 @@
</span>
<span v-if="iconComp || $scopedSlots.icon" class="elder-button__icon">
<slot name="icon" :icon="iconComp" :state="state">
<font-awesome-icon v-bind="iconComp" />
<Icon v-bind="iconComp" />
</slot>
</span>
</slot>
Expand All @@ -25,9 +25,8 @@

<script>
import { Options } from '../index'
import Icon from '@kvass/vue2-icon'
import { iconBinding, Capitalize, isPromise } from './utils'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
import './icons'
const Listeners = {}
Expand Down Expand Up @@ -206,7 +205,7 @@ export default {
Object.entries(Listeners).forEach(([event, callback]) => this.$el.removeEventListener(event, callback))
},
components: {
FontAwesomeIcon,
Icon,
},
}
</script>
Expand Down
6 changes: 0 additions & 6 deletions src/icons.js

This file was deleted.

0 comments on commit 50a91d2

Please sign in to comment.