Skip to content

Commit

Permalink
Merge pull request #114 from wharfkit/dev
Browse files Browse the repository at this point in the history
Next release
  • Loading branch information
aaroncox authored Aug 30, 2023
2 parents eeb69b3 + 97b110c commit ff34a50
Show file tree
Hide file tree
Showing 27 changed files with 1,506 additions and 5,905 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@

/test/public/*.js
/test/public/*.js.map
/test/public/storybook

/storybook-static

.DS_Store
22 changes: 0 additions & 22 deletions .storybook/main.ts

This file was deleted.

4 changes: 0 additions & 4 deletions .storybook/preview-head.html

This file was deleted.

24 changes: 0 additions & 24 deletions .storybook/preview.ts

This file was deleted.

Binary file removed .storybook/public/favicon.ico
Binary file not shown.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}
41 changes: 13 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@
"scripts": {
"build": "rollup -c --bundleConfigAsCjs",
"build-test": "rollup -c test/rollup.config.js --bundleConfigAsCjs",
"build-storybook": "storybook build -o test/public/storybook",
"dev": "rollup -c test/rollup.config.js --bundleConfigAsCjs -w",
"serve": "sirv test/public --no-clear --host",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
"serve": "sirv test/public --no-clear --host"
},
"directories": {
"lib": "lib"
Expand Down Expand Up @@ -50,19 +47,10 @@
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-replace": "^5.0.2",
"@rollup/plugin-typescript": "^10",
"@storybook/addon-essentials": "^7.0.0-beta.59",
"@storybook/addon-interactions": "^7.0.0-beta.59",
"@storybook/addon-links": "^7.0.0-beta.59",
"@storybook/addon-svelte-csf": "^3.0.0-next.3",
"@storybook/blocks": "^7.0.0-alpha.8",
"@storybook/svelte": "^7.0.0-beta.59",
"@storybook/svelte-vite": "^7.0.0-beta.59",
"@storybook/testing-library": "^0.0.14-next.1",
"@sveltejs/vite-plugin-svelte": "^2.0.3",
"@tsconfig/svelte": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^5.49.0",
"@typescript-eslint/parser": "^5.49.0",
"@rollup/plugin-typescript": "^11.1.2",
"@tsconfig/svelte": "^5.0.0",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@wharfkit/session": "^1.0.0",
"@wharfkit/transact-plugin-autocorrect": "^1.0.0",
"@wharfkit/transact-plugin-cosigner": "^1.0.0",
Expand All @@ -75,29 +63,26 @@
"@wharfkit/wallet-plugin-mock": "^1.0.0",
"@wharfkit/wallet-plugin-privatekey": "^1.0.0",
"@wharfkit/wallet-plugin-wombat": "^1.0.0",
"core-js": "^3.27.2",
"eslint": "^8.32.0",
"eslint-config-prettier": "^8.6.0",
"core-js": "^3.31.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"node-sass": "^8.0.0",
"prettier": "^2.8.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup": "^2.70.2",
"rollup-plugin-analyzer": "^4.0.0",
"rollup-plugin-dts": "^4.2.1",
"rollup-plugin-gzip": "^3.1.0",
"rollup-plugin-livereload": "^2.0.0",
"rollup-plugin-svelte": "^7.1.0",
"rollup-plugin-svelte": "^7.1.5",
"rollup-plugin-terser": "^7.0.0",
"sass": "^1.58.3",
"sirv-cli": "^2.0.0",
"storybook": "^7.0.0-beta.59",
"svelte": "^3.55.1",
"svelte-preprocess": "^5.0.1",
"svelte": "^4.0.3",
"svelte-preprocess": "^5.0.4",
"sveltekit-i18n": "^2.2.2",
"tslib": "^2.4.1",
"typescript": "^4.9.4",
"tslib": "^2.6.0",
"typescript": "^5.0.0",
"vite": "^4.1.4",
"yarn-deduplicate": "^6.0.1"
},
Expand Down
16 changes: 8 additions & 8 deletions src/lib/qrcode/QRCode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default class QRCode {
this.dataCache = null
}

isDark(row: string | number, col: string | number) {
isDark(row: number, col: number) {
if (row < 0 || this.moduleCount <= row || col < 0 || this.moduleCount <= col) {
throw new Error(row + ',' + col)
}
Expand Down Expand Up @@ -234,7 +234,7 @@ export default class QRCode {
for (let col = this.moduleCount - 1; col > 0; col -= 2) {
if (col == 6) col--

for (;;) {
for (; ;) {
for (let c = 0; c < 2; c++) {
if (this.modules[row][col - c] == null) {
let dark = false
Expand Down Expand Up @@ -294,10 +294,10 @@ export default class QRCode {
if (buffer.getLengthInBits() > totalDataCount * 8) {
throw new Error(
'code length overflow. (' +
buffer.getLengthInBits() +
'>' +
totalDataCount * 8 +
')'
buffer.getLengthInBits() +
'>' +
totalDataCount * 8 +
')'
)
}

Expand All @@ -312,7 +312,7 @@ export default class QRCode {
}

// padding
for (;;) {
for (; ;) {
if (buffer.getLengthInBits() >= totalDataCount * 8) {
break
}
Expand All @@ -327,7 +327,7 @@ export default class QRCode {
return QRCode.createBytes(buffer, rsBlocks)
}

static createBytes(buffer: {buffer: number[]}, rsBlocks: string | any[]) {
static createBytes(buffer: { buffer: number[] }, rsBlocks: string | any[]) {
let offset = 0

let maxDcCount = 0
Expand Down
13 changes: 0 additions & 13 deletions src/stories/Asset.stories.svelte

This file was deleted.

29 changes: 0 additions & 29 deletions src/stories/Button.stories.svelte

This file was deleted.

23 changes: 0 additions & 23 deletions src/stories/ButtonGroup.stories.svelte

This file was deleted.

38 changes: 0 additions & 38 deletions src/stories/Checkbox.stories.svelte

This file was deleted.

48 changes: 0 additions & 48 deletions src/stories/Countdown.stories.svelte

This file was deleted.

31 changes: 0 additions & 31 deletions src/stories/Header.stories.svelte

This file was deleted.

15 changes: 0 additions & 15 deletions src/stories/HeaderButton.stories.svelte

This file was deleted.

Loading

0 comments on commit ff34a50

Please sign in to comment.