Skip to content

Commit e47e7ad

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into dependabot/npm_and_yarn/babel/standalone-7.12.11
2 parents 79a0e3e + dbcfb43 commit e47e7ad

File tree

3 files changed

+56
-51
lines changed

3 files changed

+56
-51
lines changed

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"@babel/core": "^7.12.10",
9696
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
9797
"@babel/plugin-transform-runtime": "^7.12.10",
98-
"@babel/preset-env": "^7.12.10",
98+
"@babel/preset-env": "^7.12.11",
9999
"@babel/standalone": "^7.12.11",
100100
"@nuxt/content": "^1.11.1",
101101
"@nuxtjs/google-analytics": "^2.4.0",
@@ -126,7 +126,7 @@
126126
"eslint-plugin-node": "^11.1.0",
127127
"eslint-plugin-prettier": "^3.3.0",
128128
"eslint-plugin-promise": "^4.2.1",
129-
"eslint-plugin-vue": "^7.2.0",
129+
"eslint-plugin-vue": "^7.3.0",
130130
"esm": "^3.2.25",
131131
"execa": "^5.0.0",
132132
"highlight.js": "^10.4.1",
@@ -137,7 +137,7 @@
137137
"lint-staged": "^10.5.3",
138138
"loader-utils": "^2.0.0",
139139
"lodash": "^4.17.20",
140-
"marked": "^1.2.6",
140+
"marked": "^1.2.7",
141141
"nuxt": "^2.14.11",
142142
"postcss": "^8.2.1",
143143
"postcss-cli": "^8.3.1",

‎src/components/badge/badge.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import { Vue } from '../../vue'
1+
import { Vue, mergeData } from '../../vue'
22
import { NAME_BADGE } from '../../constants/components'
33
import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props'
44
import { omit, sortKeys } from '../../utils/object'
55
import { makeProp, makePropsConfigurable, pluckProps } from '../../utils/props'
66
import { isLink } from '../../utils/router'
7-
import { normalizeSlotMixin } from '../../mixins/normalize-slot'
87
import { BLink, props as BLinkProps } from '../link/link'
98

109
// --- Props ---
@@ -28,28 +27,29 @@ export const props = makePropsConfigurable(
2827
// @vue/component
2928
export const BBadge = /*#__PURE__*/ Vue.extend({
3029
name: NAME_BADGE,
31-
mixins: [normalizeSlotMixin],
30+
functional: true,
3231
props,
33-
render(h) {
34-
const { variant, $props } = this
35-
const link = isLink($props)
36-
const tag = link ? BLink : this.tag
32+
render(h, { props, data, children }) {
33+
const { active, disabled } = props
34+
const link = isLink(props)
35+
const tag = link ? BLink : props.tag
36+
const variant = props.variant || 'secondary'
3737

3838
return h(
3939
tag,
40-
{
40+
mergeData(data, {
4141
staticClass: 'badge',
4242
class: [
43-
variant ? `badge-${variant}` : 'badge-secondary',
43+
`badge-${variant}`,
4444
{
45-
'badge-pill': this.pill,
46-
active: this.active,
47-
disabled: this.disabled
45+
'badge-pill': props.pill,
46+
active,
47+
disabled
4848
}
4949
],
50-
props: link ? pluckProps(linkProps, $props) : {}
51-
},
52-
this.normalizeSlot()
50+
props: link ? pluckProps(linkProps, props) : {}
51+
}),
52+
children
5353
)
5454
}
5555
})

‎yarn.lock

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,15 @@
230230
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
231231
integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
232232

233-
"@babel/helper-validator-option@^7.12.1":
234-
version "7.12.1"
235-
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
236-
integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==
233+
"@babel/helper-validator-identifier@^7.12.11":
234+
version "7.12.11"
235+
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
236+
integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
237+
238+
"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11":
239+
version "7.12.11"
240+
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f"
241+
integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==
237242

238243
"@babel/helper-wrap-function@^7.10.4":
239244
version "7.12.3"
@@ -519,10 +524,10 @@
519524
dependencies:
520525
"@babel/helper-plugin-utils" "^7.10.4"
521526

522-
"@babel/plugin-transform-block-scoping@^7.12.1":
523-
version "7.12.1"
524-
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
525-
integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==
527+
"@babel/plugin-transform-block-scoping@^7.12.11":
528+
version "7.12.11"
529+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.11.tgz#83ae92a104dbb93a7d6c6dd1844f351083c46b4f"
530+
integrity sha512-atR1Rxc3hM+VPg/NvNvfYw0npQEAcHuJ+MGZnFn6h3bo+1U3BWXMdFMlvVRApBTWKQMX7SOwRJZA5FBF/JQbvA==
526531
dependencies:
527532
"@babel/helper-plugin-utils" "^7.10.4"
528533

@@ -754,16 +759,16 @@
754759
"@babel/helper-create-regexp-features-plugin" "^7.12.1"
755760
"@babel/helper-plugin-utils" "^7.10.4"
756761

757-
"@babel/preset-env@^7.12.10", "@babel/preset-env@^7.12.7":
758-
version "7.12.10"
759-
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.10.tgz#ca981b95f641f2610531bd71948656306905e6ab"
760-
integrity sha512-Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA==
762+
"@babel/preset-env@^7.12.11", "@babel/preset-env@^7.12.7":
763+
version "7.12.11"
764+
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9"
765+
integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==
761766
dependencies:
762767
"@babel/compat-data" "^7.12.7"
763768
"@babel/helper-compilation-targets" "^7.12.5"
764769
"@babel/helper-module-imports" "^7.12.5"
765770
"@babel/helper-plugin-utils" "^7.10.4"
766-
"@babel/helper-validator-option" "^7.12.1"
771+
"@babel/helper-validator-option" "^7.12.11"
767772
"@babel/plugin-proposal-async-generator-functions" "^7.12.1"
768773
"@babel/plugin-proposal-class-properties" "^7.12.1"
769774
"@babel/plugin-proposal-dynamic-import" "^7.12.1"
@@ -792,7 +797,7 @@
792797
"@babel/plugin-transform-arrow-functions" "^7.12.1"
793798
"@babel/plugin-transform-async-to-generator" "^7.12.1"
794799
"@babel/plugin-transform-block-scoped-functions" "^7.12.1"
795-
"@babel/plugin-transform-block-scoping" "^7.12.1"
800+
"@babel/plugin-transform-block-scoping" "^7.12.11"
796801
"@babel/plugin-transform-classes" "^7.12.1"
797802
"@babel/plugin-transform-computed-properties" "^7.12.1"
798803
"@babel/plugin-transform-destructuring" "^7.12.1"
@@ -822,7 +827,7 @@
822827
"@babel/plugin-transform-unicode-escapes" "^7.12.1"
823828
"@babel/plugin-transform-unicode-regex" "^7.12.1"
824829
"@babel/preset-modules" "^0.1.3"
825-
"@babel/types" "^7.12.10"
830+
"@babel/types" "^7.12.11"
826831
core-js-compat "^3.8.0"
827832
semver "^5.5.0"
828833

@@ -881,12 +886,12 @@
881886
globals "^11.1.0"
882887
lodash "^4.17.19"
883888

884-
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
885-
version "7.12.10"
886-
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
887-
integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
889+
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
890+
version "7.12.11"
891+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce"
892+
integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==
888893
dependencies:
889-
"@babel/helper-validator-identifier" "^7.10.4"
894+
"@babel/helper-validator-identifier" "^7.12.11"
890895
lodash "^4.17.19"
891896
to-fast-properties "^2.0.0"
892897

@@ -5570,15 +5575,15 @@ eslint-plugin-promise@^4.2.1:
55705575
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
55715576
integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
55725577

5573-
eslint-plugin-vue@^7.2.0:
5574-
version "7.2.0"
5575-
resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.2.0.tgz#dd8323fe7ca28fe9377ce3f5f6cf17afe2686f2a"
5576-
integrity sha512-4mt0yIv6rBDNtvis/g22a0ozJ12GfcdEzX77u0ICYjKlxOVtGrKGEvo0cbOObHaKDg9a9kJcoaNodqE4TPfS2A==
5578+
eslint-plugin-vue@^7.3.0:
5579+
version "7.3.0"
5580+
resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.3.0.tgz#0faf0fcf0e1b1052bf800d4dee42d64f50679cb0"
5581+
integrity sha512-4rc9xrZgwT4aLz3XE6lrHu+FZtDLWennYvtzVvvS81kW9c65U4DUzQQWAFjDCgCFvN6HYWxi7ueEtxZVSB+f0g==
55775582
dependencies:
55785583
eslint-utils "^2.1.0"
55795584
natural-compare "^1.4.0"
55805585
semver "^7.3.2"
5581-
vue-eslint-parser "^7.2.0"
5586+
vue-eslint-parser "^7.3.0"
55825587

55835588
eslint-scope@^4.0.3:
55845589
version "4.0.3"
@@ -8996,10 +9001,10 @@ markdown-table@^2.0.0:
89969001
dependencies:
89979002
repeat-string "^1.0.0"
89989003

8999-
marked@^1.2.6:
9000-
version "1.2.6"
9001-
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.6.tgz#fa55cf38ab3585005c9fb3c1ebfb3d4590c29fdc"
9002-
integrity sha512-7vVuSEZ8g/HH3hK/BH/+7u/NJj7x9VY4EHzujLDcqAQLiOUeFJYAsfSAyoWtR17lKrx7b08qyIno4lffwrzTaA==
9004+
marked@^1.2.7:
9005+
version "1.2.7"
9006+
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.7.tgz#6e14b595581d2319cdcf033a24caaf41455a01fb"
9007+
integrity sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==
90039008

90049009
md5.js@^1.3.4:
90059010
version "1.3.5"
@@ -14195,10 +14200,10 @@ vue-client-only@^2.0.0:
1419514200
resolved "https://registry.yarnpkg.com/vue-client-only/-/vue-client-only-2.0.0.tgz#ddad8d675ee02c761a14229f0e440e219de1da1c"
1419614201
integrity sha512-arhk1wtWAfLsJyxGMoEYhoBowM87/i6HLSG2LH/03Yog6i2d9JEN1peMP0Ceis+/n9DxdenGYZZTxbPPJyHciA==
1419714202

14198-
vue-eslint-parser@^7.2.0:
14199-
version "7.2.0"
14200-
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.2.0.tgz#1e17ae94ca71e617025e05143c8ac5593aacb6ef"
14201-
integrity sha512-uVcQqe8sUNzdHGcRHMd2Z/hl6qEaWrAmglTKP92Fnq9TYU9un8xsyFgEdFJaXh/1rd7h8Aic1GaiQow5nVneow==
14203+
vue-eslint-parser@^7.3.0:
14204+
version "7.3.0"
14205+
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz#894085839d99d81296fa081d19643733f23d7559"
14206+
integrity sha512-n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw==
1420214207
dependencies:
1420314208
debug "^4.1.1"
1420414209
eslint-scope "^5.0.0"

0 commit comments

Comments
 (0)