Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge solana labs #211

Merged
merged 32 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e53479d
publish fork under @solana namespace
jordaaash Feb 1, 2022
0f7c62b
Merge branch 'webpack-output-globalObject' into cherry-pick-64
jordaaash Feb 1, 2022
9a7cc80
Merge pull request #3 from solana-labs/cherry-pick-64
jordaaash Feb 1, 2022
a53a252
publish config
jordaaash Feb 1, 2022
4c89dce
Merge pull request #4 from solana-labs/publish-config
jordaaash Feb 1, 2022
843b66d
don't round pixels
jordaaash Feb 5, 2022
4b0178a
Merge pull request #5 from solana-labs/fix-97
jordaaash Feb 5, 2022
7249676
beta version bump
jordaaash Feb 5, 2022
1d91c08
Update package lockfile to v2
HenkVanMaanen Jun 9, 2022
638824f
Fix wrong orientation of qr code dots
HenkVanMaanen Jun 9, 2022
6d5d5cd
fix svg credits to @iamdangavin
HenkVanMaanen Jul 14, 2022
fb138c4
store build in repo
HenkVanMaanen Jul 14, 2022
1de1cb9
remove fix.patch
HenkVanMaanen Jul 14, 2022
f400491
fix image cut out orientation
HenkVanMaanen Jul 14, 2022
472ff4b
update build
HenkVanMaanen Jul 14, 2022
9ec6fcd
add default image anonymous option
HenkVanMaanen Jul 28, 2022
78070cf
add xlink for image tag and include image as base64 in svg
HenkVanMaanen Jul 28, 2022
66a7728
build new updates
HenkVanMaanen Jul 28, 2022
040bf3a
new build
HenkVanMaanen Jul 28, 2022
a9886ab
Add parsing of hex colors with opacity
HenkVanMaanen Sep 8, 2022
4d1de55
new build
HenkVanMaanen Sep 8, 2022
15e452b
remove debug console log
HenkVanMaanen Sep 15, 2022
b90276e
new build
HenkVanMaanen Sep 15, 2022
32d4ac1
Allow multiple QR codes with different data to render simultaneously
mcintyre94 Feb 14, 2023
e9c374c
Merge pull request #6 from mcintyre94/multi-qr
jordaaash Feb 23, 2023
36a41c7
ran npm audit fix
jordaaash Mar 8, 2023
f85f709
version 1.6.0
jordaaash Mar 8, 2023
ad84541
Add a .node-version file to document supported node version
mcintyre94 Mar 9, 2023
c7612d6
Update package.json
jordaaash May 4, 2023
90b4d5e
Merge pull request #7 from mcintyre94/node-v16
jordaaash May 4, 2023
1f3fded
Chore merge kilian b (#3)
ChielTimmermans Jul 11, 2024
1d58f92
Merge remote-tracking branch 'solana-labs/solana-labs' into chore-mer…
ChielTimmermans Jul 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[*.{js, ts}]
indent_style = space
indent_size = 2
indent_size = 2
end_of_line = lf
11 changes: 9 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,22 @@ module.exports = {
env: {
node: true
},
parser: '@typescript-eslint/parser',
parser: "@typescript-eslint/parser",
extends: [
"eslint:recommended",
"plugin:prettier/recommended",
"plugin:jest/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended"
],
parserOptions: {
sourceType: "module"
},
rules: {
"prettier/prettier": [
"error",
{
endOfLine: "auto"
}
]
}
};
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# IDEA
.idea

# Lib folder
/lib

# npm modules
/node_modules

# Tests coverage results
/coverage
/coverage

.DS_Store
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16
32 changes: 32 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Version 1.0.0 - 27.08.2022

This is the first release of the package with various bug fixes and dependencies updates from the original repo.
This package can be installed by running.

`npm install styled-qr-code` or `yarn add styled-qr-code`

## Breaking change

- removed the deprecated method signature `download(extension: string)`. Now only `download({name: 'qr', extension: 'png')` is supported
- The orientation of the generated qr code has been fixed to generate qr codes compatible with all known scanners see [#49](https://github.com/kozakdenys/qr-code-styling/issues/105) [#105 QR code is not valid by some scanners](https://github.com/kozakdenys/qr-code-styling/issues/105).
An configuration option `useLegacyDotRotation` has been added to restore the previous behavior.
- images options `crossOrigin` are now set to anonymous by default

## Feat

- added optional quality parameter to get getRawData to control the size and quality of the returned image
- added convenience method `toDataUrl` to return a base64 encoded string of the qr code instead of making a detour via a blob
- improved typescript types

- updated lockfile to v2 [1d91c08fabe430911f68e15cc108c5f015b5329c](1d91c08fabe430911f68e15cc108c5f015b5329c)
- fix svg: [1d91c08fabe430911f68e15cc108c5f015b5329c](1d91c08fabe430911f68e15cc108c5f015b5329c)
- svg now includes images as base64 link: [78070cf808e0b60bb2f6ac310083688f1c27cf99](78070cf808e0b60bb2f6ac310083688f1c27cf99)
- images are now correctly cropped [f400491fe13c5969b8a9d8c1e2e7c90b7067c5a59](f400491fe13c5969b8a9d8c1e2e7c90b7067c5a5)

## Dependencies

Updated multiple dependencies and resolved security vulnerabilities. For a full list see: [https://github.com/KilianB/styled-qr-code/commit/535017b1e8dba2eb66666e42eb61e15f8a9866b9#diff-7ae45ad102eab3b6d7e7896acd08c427a9b25b346470d7bc6507b6481575d519](package diff)

## Misc

- update example to include legacy and new qr code generation codes
170 changes: 93 additions & 77 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ module.exports = {
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: "jest-environment-jsdom-fifteen",
// testEnvironment: "jest-environment-jsdom-fifteen",

// Options that will be passed to the testEnvironment
testEnvironmentOptions: {
Expand Down
Loading
Loading