Skip to content

Commit

Permalink
Merge branch 'main' into storybook
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	pnpm-lock.yaml
  • Loading branch information
iva2k committed Sep 17, 2024
2 parents d14913a + 198bd03 commit d826c68
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 50 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@
"devDependencies": {
"@capacitor/cli": "^6.1.2",
"@chromatic-com/storybook": "^2.0.2",
"@double-great/stylelint-a11y": "^3.0.2",
"@eslint/compat": "^1.1.1",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.10.0",
"@neoconfetti/svelte": "^2.2.1",
"@playwright/test": "^1.47.1",
"@rollup/plugin-commonjs": "^26.0.1",
"@rollup/plugin-replace": "^5.0.7",
"@double-great/stylelint-a11y": "^3.0.2",
"@storybook/addon-a11y": "^8.3.1",
"@storybook/addon-controls": "^8.3.1",
"@storybook/addon-docs": "^8.3.1",
Expand All @@ -101,11 +101,11 @@
"@storybook/sveltekit": "^8.3.1",
"@storybook/test": "^8.3.1",
"@storybook/theming": "^8.3.1",
"@sveltejs/adapter-auto": "^3.2.4",
"@sveltejs/adapter-netlify": "^4.3.3",
"@sveltejs/adapter-static": "^3.0.4",
"@sveltejs/adapter-vercel": "^5.4.3",
"@sveltejs/kit": "^2.5.27",
"@sveltejs/adapter-auto": "^3.2.5",
"@sveltejs/adapter-netlify": "^4.3.4",
"@sveltejs/adapter-static": "^3.0.5",
"@sveltejs/adapter-vercel": "^5.4.4",
"@sveltejs/kit": "^2.5.28",
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.7",
"@tauri-apps/api": "2.0.0-rc.0",
"@tauri-apps/cli": "2.0.0-rc.0",
Expand Down
80 changes: 36 additions & 44 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d826c68

Please sign in to comment.