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
iva2k committed Nov 29, 2024
2 parents d826c68 + ca54079 commit 336b656
Show file tree
Hide file tree
Showing 5 changed files with 1,689 additions and 1,378 deletions.
4 changes: 2 additions & 2 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,11 @@
"resolveSourceMapLocations": null
},
{
"name": "pnpm build",
"name": "pnpm build:base",
"request": "launch",
"type": "node",
"runtimeExecutable": "pnpm",
"runtimeArgs": ["run", "build"],
"runtimeArgs": ["run", "build:base"],
"skipFiles": ["<node_internals>/**"],
"sourceMaps": true,
"resolveSourceMapLocations": null
Expand Down
110 changes: 55 additions & 55 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Cross-platform Desktop / Mobile / Web application starter.",
"version": "0.0.2",
"scripts": {
"postinstall": "echo RUN postinstall && svelte-kit sync && tsx scripts/assets-clean.ts",
"postinstall": "echo RUN postinstall && svelte-kit sync && tsx scripts/assets-clean.ts && pnpm exec playwright install",
"postinstallEMPTY": "echo RUN postinstall && svelte-kit sync",
"svelte:prebuild": "echo RUN svelte:prebuild && rimraf .svelte-kit && rimraf build && svelte-kit sync && tsx scripts/assets-copy.ts",
"svelte:predev": "echo RUN svelte:predev && rimraf dev-dist && svelte-kit sync && tsx scripts/assets-copy.ts",
Expand Down Expand Up @@ -66,25 +66,25 @@
"icons:build": "bash -c \"./scripts/icon-generator.sh .logo/logo.svg .logo/icon.svg .logo/icon_bg.svg .logo/icon+texture.svg .logo/icon+texture-wide.svg \""
},
"dependencies": {
"@capacitor/android": "^6.1.2",
"@capacitor/core": "^6.1.2",
"@capacitor/geolocation": "^6.0.1",
"@capacitor/ios": "^6.1.2",
"@capacitor/android": "^6.2.0",
"@capacitor/core": "^6.2.0",
"@capacitor/geolocation": "^6.0.2",
"@capacitor/ios": "^6.2.0",
"@fontsource/fira-mono": "^5.1.0",
"@ionic/pwa-elements": "^3.3.0",
"qr-scanner": "^1.4.2"
},
"devDependencies": {
"@capacitor/cli": "^6.1.2",
"@capacitor/cli": "^6.2.0",
"@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",
"@eslint/compat": "^1.2.3",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.15.0",
"@neoconfetti/svelte": "^2.2.1",
"@playwright/test": "^1.47.1",
"@rollup/plugin-commonjs": "^26.0.1",
"@rollup/plugin-replace": "^5.0.7",
"@playwright/test": "^1.49.0",
"@rollup/plugin-commonjs": "^28.0.1",
"@rollup/plugin-replace": "^6.0.1",
"@storybook/addon-a11y": "^8.3.1",
"@storybook/addon-controls": "^8.3.1",
"@storybook/addon-docs": "^8.3.1",
Expand All @@ -101,80 +101,80 @@
"@storybook/sveltekit": "^8.3.1",
"@storybook/test": "^8.3.1",
"@storybook/theming": "^8.3.1",
"@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",
"@sveltejs/adapter-auto": "^3.3.1",
"@sveltejs/adapter-netlify": "^4.4.0",
"@sveltejs/adapter-static": "^3.0.6",
"@sveltejs/adapter-vercel": "^5.5.0",
"@sveltejs/kit": "^2.9.0",
"@sveltejs/vite-plugin-svelte": "^5.0.1",
"@tauri-apps/api": "^2.1.1",
"@tauri-apps/cli": "^2.1.0",
"@types/eslint": "^9.6.1",
"@types/glob": "^8.1.0",
"@types/minimist": "^1.2.5",
"@types/node": "^22.5.5",
"@types/node": "^22.10.1",
"@types/object-hash": "^3.0.6",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/parser": "^8.6.0",
"@vite-pwa/sveltekit": "^0.6.5",
"@vitest/coverage-v8": "^2.1.1",
"@typescript-eslint/eslint-plugin": "^8.16.0",
"@typescript-eslint/parser": "^8.16.0",
"@vite-pwa/sveltekit": "^0.6.6",
"@vitest/coverage-v8": "^2.1.6",
"autoprefixer": "^10.4.20",
"backloop.dev": "^2.0.2",
"backloop.dev": "^2.0.4",
"chromatic": "^11.10.2",
"comment-json": "^4.2.5",
"cpy": "^11.1.0",
"cross-env": "^7.0.3",
"eslint": "^9.10.0",
"eslint": "^9.15.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import-x": "^4.2.1",
"eslint-plugin-playwright": "^1.6.2",
"eslint-plugin-storybook": "0.9.0--canary.156.ed236ca.0",
"eslint-plugin-svelte": "^2.44.0",
"eslint-plugin-import-x": "^4.4.3",
"eslint-plugin-playwright": "^2.1.0",
"eslint-plugin-storybook": "^0.11.1",
"eslint-plugin-svelte": "^2.46.0",
"eslint-plugin-vitest": "^0.5.4",
"glob": "^11.0.0",
"globals": "^15.9.0",
"globals": "^15.12.0",
"http-server": "^14.1.1",
"minimist": "^1.2.8",
"object-hash": "^3.0.0",
"pnpm": "^9.10.0",
"postcss": "^8.4.47",
"pnpm": "^9.14.4",
"postcss": "^8.4.49",
"postcss-cli": "^11.0.0",
"postcss-html": "^1.7.0",
"postcss-import": "^16.1.0",
"postcss-nesting": "^13.0.0",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.2.6",
"postcss-nesting": "^13.0.1",
"prettier": "^3.4.1",
"prettier-plugin-svelte": "^3.3.2",
"react": "18.3.1",
"react-dom": "18.3.1",
"rimraf": "^6.0.1",
"sass": "^1.78.0",
"sass": "^1.81.0",
"shx": "^0.3.4",
"storybook": "^8.3.1",
"stylelint": "^16.9.0",
"stylelint": "^16.11.0",
"stylelint-config-html": "^1.1.0",
"stylelint-config-recommended": "^14.0.1",
"stylelint-config-standard": "^36.0.1",
"svelte": "5.0.0-next.246",
"svelte-check": "^4.0.2",
"svelte": "^5.2.11",
"svelte-check": "^4.1.0",
"svgo": "^3.3.2",
"ts-node": "^10.9.2",
"tslib": "^2.7.0",
"tsx": "^4.19.1",
"typescript": "^5.6.2",
"typescript-eslint": "^8.6.0",
"tslib": "^2.8.1",
"tsx": "^4.19.2",
"typescript": "^5.7.2",
"typescript-eslint": "^8.16.0",
"typescript-eslint-parser-for-extra-files": "^0.7.0",
"unplugin-icons": "^0.19.3",
"unplugin-icons": "^0.20.2",
"vanilla-lazyload": "^19.1.3",
"vite": "^5.4.6",
"vite-plugin-pwa": "^0.20.5",
"vite-plugin-static-copy": "^1.0.6",
"vitest": "^2.1.1",
"workbox-build": "^7.1.1",
"workbox-core": "^7.1.0",
"workbox-precaching": "^7.1.0",
"workbox-routing": "^7.1.0",
"workbox-window": "^7.1.0"
"vite": "^6.0.1",
"vite-plugin-pwa": "^0.21.1",
"vite-plugin-static-copy": "^2.2.0",
"vitest": "^2.1.6",
"workbox-build": "^7.3.0",
"workbox-core": "^7.3.0",
"workbox-precaching": "^7.3.0",
"workbox-routing": "^7.3.0",
"workbox-window": "^7.3.0"
},
"packageManager": "[email protected]",
"engines": {
Expand Down
Loading

0 comments on commit 336b656

Please sign in to comment.