Skip to content

Commit 7041167

Browse files
committed
fix(deps): bump dependencies, pass $attrs as domProps
1 parent dc731e0 commit 7041167

File tree

11 files changed

+210
-188
lines changed

11 files changed

+210
-188
lines changed

.eslintrc.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
1+
const fs = require('fs')
2+
const path = require('path')
3+
14
const { overrides } = require('@1stg/eslint-config/overrides')
25

36
module.exports = {
47
extends: '@1stg',
5-
overrides,
8+
overrides: [
9+
...overrides,
10+
{
11+
files: '**/docs/*.ts',
12+
settings: {
13+
node: {
14+
allowModules: fs
15+
.readdirSync('packages')
16+
.map(
17+
pkg =>
18+
require(path.resolve('packages', pkg, 'package.json')).name,
19+
),
20+
},
21+
},
22+
},
23+
],
624
}

.remarkrc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"plugins": [
3-
"preset-lint-consistent",
4-
"preset-lint-recommended",
5-
"preset-lint-markdown-style-guide",
6-
"preset-prettier"
3+
"@1stg/remark-config"
74
]
85
}

package.json

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@
2020
"build:docs": "parcel build packages/*/docs/index.html",
2121
"build": "rimraf dist packages/*/lib && run-p build:**",
2222
"serve": "serve dist",
23-
"type-coverage": "type-coverage --cache --ignore-catch --detail --ignore-files *.d.ts --strict"
23+
"type-coverage": "type-coverage --cache --detail --ignore-catch --ignore-files *.d.ts --strict"
2424
},
2525
"devDependencies": {
2626
"@1stg/babel-preset": "^0.6.0",
2727
"@1stg/browserslist-config": "^0.2.1",
28-
"@1stg/eslint-config": "^0.8.1",
28+
"@1stg/eslint-config": "^0.9.2",
2929
"@1stg/husky-config": "^0.3.0",
3030
"@1stg/lint-staged": "^0.6.0",
3131
"@1stg/postcss-config": "^0.2.0",
3232
"@1stg/prettier-config": "^0.2.0",
33-
"@1stg/rollup-config": "^0.4.1",
33+
"@1stg/remark-config": "^0.2.1",
34+
"@1stg/rollup-config": "^0.8.0",
3435
"@1stg/stylelint-config": "^0.6.0",
35-
"@1stg/tsconfig": "^0.4.0",
36+
"@1stg/tsconfig": "^0.5.0",
3637
"@1stg/tslint-config": "^0.3.0",
3738
"@babel/core": "^7.6.0",
3839
"@commitlint/cli": "^8.1.0",
@@ -60,19 +61,15 @@
6061
"prettier": "^1.18.2",
6162
"qrcode": "^1.4.1",
6263
"qrious": "^4.0.2",
63-
"remark-preset-lint-consistent": "^2.0.3",
64-
"remark-preset-lint-markdown-style-guide": "^2.1.3",
65-
"remark-preset-lint-recommended": "^3.0.3",
66-
"remark-preset-prettier": "^0.1.1",
6764
"rimraf": "^3.0.0",
68-
"rollup": "^1.20.3",
65+
"rollup": "^1.21.2",
6966
"rxjs": "^6.5.3",
7067
"sanitize.css": "^11.0.0",
7168
"sass": "^1.23.0-module.beta.1",
7269
"serve": "^11.1.0",
7370
"stylelint": "^10.1.0",
7471
"ts-node": "^8.3.0",
75-
"tslint": "^5.19.0",
72+
"tslint": "^5.20.0",
7673
"type-coverage": "^2.2.0",
7774
"typescript": "^3.6.2",
7875
"vue": "^2.6.10",
@@ -88,7 +85,7 @@
8885
]
8986
},
9087
"browserslist": [
91-
"extends @1stg/browserslist-config/modern"
88+
"extends @1stg/browserslist-config"
9289
],
9390
"commitlint": {
9491
"extends": [

packages/vue-qrcode/docs/index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,12 @@ <h1>VueQrcode</h1>
7373
<li>
7474
<label>
7575
value
76-
<button v-if="manualMode" @click="addValue" is="button">+</button>
76+
<button v-if="manualMode" @click="addValue">+</button>
7777
</label>
7878
<ul v-if="manualMode">
7979
<li v-for="(v, index) of value">
8080
<label v-if="value.length">
81-
maskPattern
82-
<button @click="removeValue(index)" is="button">-</button>
81+
<button @click="removeValue(index)">-</button>
8382
</label>
8483
<div>
8584
<label>mode</label>

packages/vue-qrcode/src/index.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import qrcode, {
1+
import QRCode, {
22
QRCodeErrorCorrectionLevel,
33
QRCodeSegment as _QRCodeSegment,
44
QRCodeToDataURLOptions,
@@ -46,6 +46,7 @@ export const TYPES = Object.freeze([
4646

4747
export type QRCodeProps = Omit<QRCodeToDataURLOptions, 'renderOptions'> & {
4848
quality?: number
49+
value: QRCodeValue
4950
}
5051

5152
export default ({
@@ -115,24 +116,23 @@ export default ({
115116
methods: {
116117
toDataURL(this: { $props: QRCodeProps; dataUrl: string; value: string }) {
117118
const { quality, ...props } = this.$props
118-
return qrcode
119-
.toDataURL(
120-
this.value,
121-
Object.assign(
122-
props,
123-
quality == null || {
124-
renderOptions: {
125-
quality,
126-
},
119+
return QRCode.toDataURL(
120+
this.value,
121+
Object.assign(
122+
props,
123+
quality == null || {
124+
renderOptions: {
125+
quality,
127126
},
128-
),
129-
)
130-
.then(dataUrl => (this.dataUrl = dataUrl))
127+
},
128+
),
129+
).then(dataUrl => (this.dataUrl = dataUrl))
131130
},
132131
},
133132
render(this: Vue & { dataUrl: string }) {
134133
return this.$createElement('img', {
135134
domProps: {
135+
...this.$attrs,
136136
src: this.dataUrl,
137137
},
138138
})

packages/vue-qrcode/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"rootDir": "src",
66
"outDir": "lib"
77
},
8-
"exclude": ["docs"]
8+
"exclude": ["docs", "lib"]
99
}

packages/vue-qrious/package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
"repository": "git@github.com:rx-ts/vue.git",
66
"author": "JounQin <admin@1stg.me>",
77
"license": "MIT",
8-
"main": "lib/cjs.js",
9-
"module": "lib/index.js",
10-
"browser": "lib/umd.js",
11-
"unpkg": "lib/umd.min.js",
12-
"es2015": "lib/es2015.js",
13-
"esm5": "lib/index.js",
14-
"fesm5": "lib/esm.js",
15-
"types": "lib/index.d.ts",
8+
"main": "lib/cjs",
9+
"module": "lib",
10+
"jsdelivr": "lib/umd",
11+
"unpkg": "lib/umd",
12+
"es2015": "lib/es2015",
13+
"fesm5": "lib/esm",
14+
"types": "lib",
1615
"files": [
1716
"lib",
1817
"src",

packages/vue-qrious/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ export default {
4848
render(this: Vue & { dataUrl: string }) {
4949
return this.$createElement('img', {
5050
domProps: {
51+
...this.$attrs,
5152
src: this.dataUrl,
5253
},
53-
attrs: this.$attrs,
5454
})
5555
},
5656
}

packages/vue-qrious/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"rootDir": "src",
66
"outDir": "lib"
77
},
8-
"exclude": ["docs"]
8+
"exclude": ["docs", "lib"]
99
}

tsconfig.base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": "@1stg/tsconfig"
2+
"extends": "@1stg/tsconfig/tsconfig.json"
33
}

0 commit comments

Comments
 (0)