diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 089e574..adb806e 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -11,22 +11,10 @@ module.exports = { parserOptions: { ecmaVersion: 'latest', sourceType: 'module', - project: ['./tsconfig.json'], - extraFileExtensions: ['.svelte'], }, plugins: [ - 'svelte3', - '@typescript-eslint' - ], - overrides: [ - { - files: ['*.svelte'], - processor: 'svelte3/svelte3' - } + '@typescript-eslint', ], rules: { }, - settings: { - 'svelte3/typescript': () => require('typescript'), - }, }; diff --git a/package.json b/package.json index 82100a9..86b6aba 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,8 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "tauri dev", - "build": "tauri build", - "front-dev": "vite", - "front-build": "vite build", + "dev": "vite", + "build": "vite build", "preview": "vite preview", "check": "svelte-check --tsconfig ./tsconfig.json" }, @@ -22,13 +20,10 @@ "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.0.0", "eslint-plugin-import": "^2.25.2", - "eslint-plugin-svelte3": "^4.0.0", "flowbite": "^1.5.3", "flowbite-svelte": "^0.26.7", "postcss": "^8.4.14", - "postcss-import": "^15.0.0", "postcss-load-config": "^4.0.1", - "sass": "^1.54.8", "svelte": "^3.49.0", "svelte-check": "^2.8.0", "svelte-preprocess": "^4.10.7", @@ -36,8 +31,5 @@ "tslib": "^2.4.0", "typescript": "^4.6.4", "vite": "^3.0.7" - }, - "dependencies": { - "@tauri-apps/api": "^1.0.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 27fc3c8..d23894a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,7 +2,6 @@ lockfileVersion: 5.4 specifiers: '@sveltejs/vite-plugin-svelte': ^1.0.1 - '@tauri-apps/api': ^1.0.2 '@tauri-apps/cli': ^1.0.5 '@tsconfig/svelte': ^3.0.0 '@typescript-eslint/eslint-plugin': ^5.13.0 @@ -12,13 +11,10 @@ specifiers: eslint-config-airbnb-base: ^15.0.0 eslint-config-airbnb-typescript: ^17.0.0 eslint-plugin-import: ^2.25.2 - eslint-plugin-svelte3: ^4.0.0 flowbite: ^1.5.3 flowbite-svelte: ^0.26.7 postcss: ^8.4.14 - postcss-import: ^15.0.0 postcss-load-config: ^4.0.1 - sass: ^1.54.8 svelte: ^3.49.0 svelte-check: ^2.8.0 svelte-preprocess: ^4.10.7 @@ -27,9 +23,6 @@ specifiers: typescript: ^4.6.4 vite: ^3.0.7 -dependencies: - '@tauri-apps/api': 1.0.2 - devDependencies: '@sveltejs/vite-plugin-svelte': 1.0.4_svelte@3.50.0+vite@3.0.9 '@tauri-apps/cli': 1.0.5 @@ -41,20 +34,17 @@ devDependencies: eslint-config-airbnb-base: 15.0.0_faomjyrlgqmwswvqymymzkxcqi eslint-config-airbnb-typescript: 17.0.0_nwt6qmnsbmuicuvak5hafgwebq eslint-plugin-import: 2.26.0_wyxuyzvlfep3lsyoibc4fosfq4 - eslint-plugin-svelte3: 4.0.0_sc4laremvjv7grvyfrqmp3xv5q flowbite: 1.5.3 flowbite-svelte: 0.26.7 postcss: 8.4.16 - postcss-import: 15.0.0_postcss@8.4.16 postcss-load-config: 4.0.1_postcss@8.4.16 - sass: 1.54.8 svelte: 3.50.0 - svelte-check: 2.9.0_v34chbti5lxbr2fx7l4eexbxci - svelte-preprocess: 4.10.7_txk6nmahhszebnozg2i76vy7gi + svelte-check: 2.9.0_bx7riipb2q7oyxrjspggwz74se + svelte-preprocess: 4.10.7_74ye76x736w7ze7o2oqux5qyqa tailwindcss: 3.1.8_postcss@8.4.16 tslib: 2.4.0 typescript: 4.8.2 - vite: 3.0.9_sass@1.54.8 + vite: 3.0.9 packages: @@ -185,16 +175,11 @@ packages: magic-string: 0.26.3 svelte: 3.50.0 svelte-hmr: 0.14.12_svelte@3.50.0 - vite: 3.0.9_sass@1.54.8 + vite: 3.0.9 transitivePeerDependencies: - supports-color dev: true - /@tauri-apps/api/1.0.2: - resolution: {integrity: sha512-yuNW0oeJ1/ZA7wNF1KgxhHrSu5viPVzY/UgUczzN5ptLM8dH15Juy5rEGkoHfeXGju90Y/l22hi3BtIrp/za+w==} - engines: {node: '>= 12.22.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} - dev: false - /@tauri-apps/cli-darwin-arm64/1.0.5: resolution: {integrity: sha512-oxpFb9ZeMiC3xPUJ9NsXWCnnwFSVkPbJUvDKpc9IaoDIUpsMTV72W4P0Nh0uQRbyhx4modPpstt7+ONypNVYNg==} engines: {node: '>= 10'} @@ -1146,16 +1131,6 @@ packages: - supports-color dev: true - /eslint-plugin-svelte3/4.0.0_sc4laremvjv7grvyfrqmp3xv5q: - resolution: {integrity: sha512-OIx9lgaNzD02+MDFNLw0GEUbuovNcglg+wnd/UY0fbZmlQSz7GlQiQ1f+yX0XvC07XPcDOnFcichqI3xCwp71g==} - peerDependencies: - eslint: '>=8.0.0' - svelte: ^3.2.0 - dependencies: - eslint: 8.23.0 - svelte: 3.50.0 - dev: true - /eslint-scope/5.1.1: resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} engines: {node: '>=8.0.0'} @@ -1507,10 +1482,6 @@ packages: engines: {node: '>= 4'} dev: true - /immutable/4.1.0: - resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==} - dev: true - /import-fresh/3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} @@ -1929,18 +1900,6 @@ packages: resolve: 1.22.1 dev: true - /postcss-import/15.0.0_postcss@8.4.16: - resolution: {integrity: sha512-Y20shPQ07RitgBGv2zvkEAu9bqvrD77C9axhj/aA1BQj4czape2MdClCExvB27EwYEJdGgKZBpKanb0t1rK2Kg==} - engines: {node: '>=14.0.0'} - peerDependencies: - postcss: ^8.0.0 - dependencies: - postcss: 8.4.16 - postcss-value-parser: 4.2.0 - read-cache: 1.0.0 - resolve: 1.22.1 - dev: true - /postcss-js/4.0.0_postcss@8.4.16: resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==} engines: {node: ^12 || ^14 || >= 16} @@ -2125,16 +2084,6 @@ packages: rimraf: 2.7.1 dev: true - /sass/1.54.8: - resolution: {integrity: sha512-ib4JhLRRgbg6QVy6bsv5uJxnJMTS2soVcCp9Y88Extyy13A8vV0G1fAwujOzmNkFQbR3LvedudAMbtuNRPbQww==} - engines: {node: '>=12.0.0'} - hasBin: true - dependencies: - chokidar: 3.5.3 - immutable: 4.1.0 - source-map-js: 1.0.2 - dev: true - /semver/6.3.0: resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} hasBin: true @@ -2244,7 +2193,7 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte-check/2.9.0_v34chbti5lxbr2fx7l4eexbxci: + /svelte-check/2.9.0_bx7riipb2q7oyxrjspggwz74se: resolution: {integrity: sha512-9AVrtP7WbfDgCdqTZNPdj5CCCy1OrYMxFVWAWzNw7fl93c9klFJFtqzVXa6fovfQ050CcpUyJE2dPFL9TFAREw==} hasBin: true peerDependencies: @@ -2257,7 +2206,7 @@ packages: picocolors: 1.0.0 sade: 1.8.1 svelte: 3.50.0 - svelte-preprocess: 4.10.7_txk6nmahhszebnozg2i76vy7gi + svelte-preprocess: 4.10.7_74ye76x736w7ze7o2oqux5qyqa typescript: 4.8.2 transitivePeerDependencies: - '@babel/core' @@ -2281,7 +2230,7 @@ packages: svelte: 3.50.0 dev: true - /svelte-preprocess/4.10.7_txk6nmahhszebnozg2i76vy7gi: + /svelte-preprocess/4.10.7_74ye76x736w7ze7o2oqux5qyqa: resolution: {integrity: sha512-sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw==} engines: {node: '>= 9.11.2'} requiresBuild: true @@ -2328,7 +2277,6 @@ packages: magic-string: 0.25.9 postcss: 8.4.16 postcss-load-config: 4.0.1_postcss@8.4.16 - sass: 1.54.8 sorcery: 0.10.0 strip-indent: 3.0.0 svelte: 3.50.0 @@ -2459,7 +2407,7 @@ packages: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} dev: true - /vite/3.0.9_sass@1.54.8: + /vite/3.0.9: resolution: {integrity: sha512-waYABTM+G6DBTCpYAxvevpG50UOlZuynR0ckTK5PawNVt7ebX6X7wNXHaGIO6wYYFXSM7/WcuFuO2QzhBB6aMw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -2482,7 +2430,6 @@ packages: postcss: 8.4.16 resolve: 1.22.1 rollup: 2.77.3 - sass: 1.54.8 optionalDependencies: fsevents: 2.3.2 dev: true diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 31b69be..39e4fce 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,8 +1,8 @@ { "$schema": "../node_modules/@tauri-apps/cli/schema.json", "build": { - "beforeBuildCommand": "npm run front-build", - "beforeDevCommand": "npm run front-dev", + "beforeBuildCommand": "", + "beforeDevCommand": "", "devPath": "http://localhost:5173", "distDir": "../dist" },