Skip to content

Commit 766636b

Browse files
committed
Bump to v2.1.3 and fix vulnerabilities
1 parent eab18a4 commit 766636b

File tree

5 files changed

+297
-358
lines changed

5 files changed

+297
-358
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## Ver. 2.1.3
4+
5+
- Fixed vulnerabilities in dependencies.
6+
- Updated node-canvas.
7+
38
## Ver. 2.1.2
49

510
- Fixed an issue where the QR codes were not drawing correctly if a logo image was set.

README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ An awesome but simple QR code generator written in JavaScript.
2828
- [correctLevel](#correctlevel)
2929
- [maskPattern](#maskpattern)
3030
- [version](#version)
31-
- [<del>dotScale</del> (DEPRECATED)](#deldotscaledel-deprecated)
3231
- [components](#components)
3332
- [colorDark](#colordark)
3433
- [colorLight](#colorlight)
@@ -41,6 +40,7 @@ An awesome but simple QR code generator written in JavaScript.
4140
- [logoScale](#logoscale)
4241
- [logoMargin](#logomargin)
4342
- [logoCornerRadius](#logocornerradius)
43+
- [<del>dotScale</del> (DEPRECATED)](#deldotscaledel-deprecated)
4444
- [ComponentOptions](#componentoptions)
4545
- [scale](#scale)
4646
- [protectors](#protectors)
@@ -137,7 +137,7 @@ type Options = {
137137
logoScale?: number;
138138
logoMargin?: number;
139139
logoCornerRadius?: number;
140-
dotScale?: number;
140+
dotScale?: number; // DEPRECATED!!
141141
};
142142
```
143143

@@ -217,22 +217,6 @@ Accepts an integer in range [1, 40].
217217
218218
<hr/>
219219

220-
### <del>dotScale</del> (DEPRECATED)
221-
222-
**Type** `number?`
223-
224-
**Default** `0.4`
225-
226-
Use [components](#components) to control the scaling in a more advanced way.
227-
228-
> This option is yet to be removed. You can still use this option to control the scaling of the QR code parts in the lagacy way.
229-
230-
Ratio of the real size to the full size of the blocks.
231-
232-
This can be helpful when you want to make more parts of the background visible.
233-
234-
<hr/>
235-
236220
### components
237221

238222
**Type** [ComponentOptions](#componentoptions)
@@ -359,6 +343,22 @@ Size of margins around the logo image in pixels.
359343

360344
Corner radius of the logo image in pixels.
361345

346+
<hr/>
347+
348+
### <del>dotScale</del> (DEPRECATED)
349+
350+
**Type** `number?`
351+
352+
**Default** `0.4`
353+
354+
Use [components](#components) to control the scaling in a more advanced way.
355+
356+
> This option is yet to be removed. You can still use this option to control the scaling of the QR code parts in the lagacy way.
357+
358+
Ratio of the real size to the full size of the blocks.
359+
360+
This can be helpful when you want to make more parts of the background visible.
361+
362362
## ComponentOptions
363363

364364
> _ComponentOptions_ controls the appearances of parts in the QR code.

dist/awesome-qr.js

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "awesome-qr",
3-
"version": "2.1.2-rc.0",
3+
"version": "2.1.3-rc.0",
44
"description": "An awesome but simple QR code generator written in JavaScript.",
55
"main": "./lib/index.js",
66
"types": "./lib/index.d.ts",
@@ -26,7 +26,7 @@
2626
"homepage": "https://github.com/SumiMakito/Awesome-qr.js#readme",
2727
"dependencies": {
2828
"buffer": "^6.0.3",
29-
"canvas": "^2.6.1",
29+
"canvas": "https://github.com/Automattic/node-canvas.git#6fae569fc5e2ca2d5d81c9d15a0fe49bfb993b51",
3030
"js-binary-schema-parser": "^2.0.0"
3131
},
3232
"devDependencies": {
@@ -37,7 +37,7 @@
3737
"tmp": "^0.2.1",
3838
"ts-loader": "^7.0.5",
3939
"typescript": "^3.9.6",
40-
"webpack": "^4.43.0",
40+
"webpack": "^4.46.0",
4141
"webpack-cli": "^3.3.12"
4242
}
4343
}

0 commit comments

Comments
 (0)