diff --git a/.gitignore b/.gitignore index 8c9d79fdc..360499174 100755 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ resources/static/vendor/ .phpstorm.meta.php _ide_helper.php _ide_helper_models.php +.idea/dataSources.xml .idea/deployment.xml .idea/discord.xml .idea/php.xml diff --git a/composer.json b/composer.json index 131a2af8f..688ca9f47 100644 --- a/composer.json +++ b/composer.json @@ -37,10 +37,9 @@ "guzzlehttp/guzzle": "^7", "inertiajs/inertia-laravel": "^0", "innocenzi/laravel-vite": "^0", + "laravel-json-api/laravel": "^2", "laravel/framework": "^8", "laravel/tinker": "^2", - "laravel-json-api/laravel": "^1", - "maicol07/laravel-json-api-resource": "dev-master", "nette/utils": "^3", "riverskies/laravel-mobile-detect": "^1", "spatie/file-system-watcher": "^1.0", @@ -51,11 +50,11 @@ "astrotomic/ignition-stackoverflow": "^1", "barryvdh/laravel-debugbar": "^3", "barryvdh/laravel-ide-helper": "^2", - "spatie/laravel-ignition": "^1", - "friendsofphp/php-cs-fixer": "^3", "kkomelin/laravel-translatable-string-exporter": "^1", + "friendsofphp/php-cs-fixer": "^3", "nunomaduro/collision": "^5", - "roave/security-advisories": "dev-latest" + "roave/security-advisories": "dev-latest", + "spatie/laravel-ignition": "^1" }, "autoload": { "psr-4": { @@ -79,7 +78,10 @@ "config": { "optimize-autoloader": true, "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "wikimedia/composer-merge-plugin": true + } }, "extra": { "merge-plugin": { diff --git a/resources/js/WebComponents/IconButton.ts b/resources/js/WebComponents/IconButton.ts index b5318b9a7..12890fac5 100644 --- a/resources/js/WebComponents/IconButton.ts +++ b/resources/js/WebComponents/IconButton.ts @@ -2,9 +2,9 @@ import {IconButton as MWCIconButton} from '@material/mwc-icon-button'; import styles from '@openstamanager/scss/material/icon-button.scss'; import classnames from 'classnames'; import { + type TemplateResult, css, html, - type TemplateResult, unsafeCSS } from 'lit'; import { diff --git a/vite.config.ts b/vite.config.ts index 0dd3f370f..39a46b1a8 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -5,7 +5,7 @@ import {VitePWA} from 'vite-plugin-pwa'; export default defineConfig(osmConfig({ build: { - minify: true + minify: false }, optimizeDeps: { exclude: [ @@ -38,7 +38,7 @@ export default defineConfig(osmConfig({ ] } })) - // @ts-ignore + // eslint-disable-next-line new-cap .withPlugins(...VitePWA({ includeAssets: [ 'images/favicon/favicon.ico',