diff --git a/.eslintrc b/.eslintrc index 25256267..a0b37523 100644 --- a/.eslintrc +++ b/.eslintrc @@ -22,7 +22,7 @@ } } ], - "ignorePatterns": ["bundle", "dist", "dist-electron"], + "ignorePatterns": ["bundle", "dist-main", "dist-preload", "dist-renderer"], "env": { "browser": true, "node": true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a280e4c2..f28ef221 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,8 @@ jobs: - name: Run typecheck run: | - pnpm typecheck:electron + pnpm typecheck:main + pnpm typecheck:preload pnpm typecheck:renderer - name: Run linter diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1739794e..9e24260a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,8 @@ jobs: - name: Run typecheck run: | - pnpm typecheck:electron + pnpm typecheck:main + pnpm typecheck:preload pnpm typecheck:renderer - name: Run linter diff --git a/.gitignore b/.gitignore index 7124113d..7f9c4cb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ -dist-electron/ -dist/ +dist-main/ +dist-preload/ +dist-renderer/ release/ -tsconfig.node.tsbuildinfo +tsconfig.tsbuildinfo .DS_Store @@ -16,9 +17,6 @@ tsconfig.node.tsbuildinfo #Bundled files bundle/ -#Packaged apps -dist/ - # debug files icon-store/ diff --git a/electron-builder.config.js b/electron-builder.config.js index bba2ea62..7b70f7e1 100644 --- a/electron-builder.config.js +++ b/electron-builder.config.js @@ -8,7 +8,7 @@ module.exports = { output: "release", buildResources: "build", }, - files: ["dist-electron/**/*.js", "dist/**/*"], + files: ["dist-main/index.js", "dist-preload/index.js", "dist-renderer/**/*"], extraMetadata: { version: process.env.VITE_APP_VERSION, }, diff --git a/package.json b/package.json index c4ec86ee..2da2fc4c 100644 --- a/package.json +++ b/package.json @@ -8,18 +8,19 @@ "name": "Oliver Schwendener", "url": "https://github.com/oliverschwendener" }, - "main": "dist-electron/main/index.js", + "main": "dist-main/index.js", "scripts": { "build": "vite build", "dev": "vite", "lint": "eslint . --ext js,ts,tsx", "package:publish": "electron-builder --config electron-builder.config.js --publish always", "package": "electron-builder --config electron-builder.config.js", - "test:coverage": "vitest run --coverage", - "test:watch": "vitest", - "test": "vitest run", - "typecheck:electron": "tsc -p tsconfig.node.json --noEmit", - "typecheck:renderer": "tsc -p tsconfig.json --noEmit" + "test:coverage": "vitest run --root=src --coverage", + "test:watch": "vitest --root=src", + "test": "vitest run --root=src", + "typecheck:main": "tsc -p src/main/tsconfig.json --noEmit", + "typecheck:preload": "tsc -p src/preload/tsconfig.json --noEmit", + "typecheck:renderer": "tsc -p src/renderer/tsconfig.json --noEmit" }, "devDependencies": { "@types/react": "^18.2.6", @@ -27,18 +28,18 @@ "@types/react-router-dom": "^5.3.3", "@typescript-eslint/eslint-plugin": "^6.0.0", "@typescript-eslint/parser": "^6.0.0", - "@vitejs/plugin-react": "^4.0.0", - "@vitest/coverage-v8": "^0.33.0", + "@vitejs/plugin-react": "^4.1.0", + "@vitest/coverage-v8": "^0.34.6", "electron": "^26.1.0", "electron-builder": "^24.6.3", "eslint": "^8.44.0", "prettier": "^3.0.2", "prettier-plugin-organize-imports": "^3.2.3", "typescript": "^5.1.3", - "vite": "^4.3.9", - "vite-plugin-electron": "^0.11.2", + "vite": "^4.4.11", + "vite-plugin-electron": "^0.14.1", "vite-plugin-electron-renderer": "^0.14.5", - "vitest": "^0.33.0" + "vitest": "^0.34.6" }, "dependencies": { "@fluentui/react-components": "^9.30.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 763bfb37..28bdf6b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,11 +53,11 @@ devDependencies: specifier: ^6.0.0 version: 6.0.0(eslint@8.44.0)(typescript@5.1.3) '@vitejs/plugin-react': - specifier: ^4.0.0 - version: 4.0.0(vite@4.3.9) + specifier: ^4.1.0 + version: 4.1.0(vite@4.4.11) '@vitest/coverage-v8': - specifier: ^0.33.0 - version: 0.33.0(vitest@0.33.0) + specifier: ^0.34.6 + version: 0.34.6(vitest@0.34.6) electron: specifier: ^26.1.0 version: 26.1.0 @@ -77,17 +77,17 @@ devDependencies: specifier: ^5.1.3 version: 5.1.3 vite: - specifier: ^4.3.9 - version: 4.3.9(@types/node@18.15.11) + specifier: ^4.4.11 + version: 4.4.11(@types/node@18.15.11) vite-plugin-electron: - specifier: ^0.11.2 - version: 0.11.2 + specifier: ^0.14.1 + version: 0.14.1(vite-plugin-electron-renderer@0.14.5) vite-plugin-electron-renderer: specifier: ^0.14.5 version: 0.14.5 vitest: - specifier: ^0.33.0 - version: 0.33.0 + specifier: ^0.34.6 + version: 0.34.6 packages: @@ -100,14 +100,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /@ampproject/remapping@2.2.0: - resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} - engines: {node: '>=6.0.0'} - dependencies: - '@jridgewell/gen-mapping': 0.1.1 - '@jridgewell/trace-mapping': 0.3.17 - dev: true - /@ampproject/remapping@2.2.1: resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} engines: {node: '>=6.0.0'} @@ -116,125 +108,121 @@ packages: '@jridgewell/trace-mapping': 0.3.17 dev: true - /@babel/code-frame@7.21.4: - resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==} + /@babel/code-frame@7.22.13: + resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.18.6 + '@babel/highlight': 7.22.20 + chalk: 2.4.2 dev: true - /@babel/compat-data@7.21.4: - resolution: {integrity: sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==} + /@babel/compat-data@7.22.20: + resolution: {integrity: sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==} engines: {node: '>=6.9.0'} dev: true - /@babel/core@7.21.4: - resolution: {integrity: sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==} + /@babel/core@7.23.0: + resolution: {integrity: sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==} engines: {node: '>=6.9.0'} dependencies: - '@ampproject/remapping': 2.2.0 - '@babel/code-frame': 7.21.4 - '@babel/generator': 7.21.4 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.4) - '@babel/helper-module-transforms': 7.21.2 - '@babel/helpers': 7.21.0 - '@babel/parser': 7.21.4 - '@babel/template': 7.20.7 - '@babel/traverse': 7.21.4 - '@babel/types': 7.21.4 - convert-source-map: 1.9.0 + '@ampproject/remapping': 2.2.1 + '@babel/code-frame': 7.22.13 + '@babel/generator': 7.23.0 + '@babel/helper-compilation-targets': 7.22.15 + '@babel/helper-module-transforms': 7.23.0(@babel/core@7.23.0) + '@babel/helpers': 7.23.1 + '@babel/parser': 7.23.0 + '@babel/template': 7.22.15 + '@babel/traverse': 7.23.0 + '@babel/types': 7.23.0 + convert-source-map: 2.0.0 debug: 4.3.4 gensync: 1.0.0-beta.2 json5: 2.2.3 - semver: 6.3.0 + semver: 6.3.1 transitivePeerDependencies: - supports-color dev: true - /@babel/generator@7.21.4: - resolution: {integrity: sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==} + /@babel/generator@7.23.0: + resolution: {integrity: sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.23.0 '@jridgewell/gen-mapping': 0.3.2 '@jridgewell/trace-mapping': 0.3.17 jsesc: 2.5.2 dev: true - /@babel/helper-compilation-targets@7.21.4(@babel/core@7.21.4): - resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==} + /@babel/helper-compilation-targets@7.22.15: + resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/compat-data': 7.22.20 + '@babel/helper-validator-option': 7.22.15 + browserslist: 4.22.1 + lru-cache: 5.1.1 + semver: 6.3.1 + dev: true + + /@babel/helper-environment-visitor@7.22.20: + resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==} + engines: {node: '>=6.9.0'} + dev: true + + /@babel/helper-function-name@7.23.0: + resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.22.15 + '@babel/types': 7.23.0 + dev: true + + /@babel/helper-hoist-variables@7.22.5: + resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.23.0 + dev: true + + /@babel/helper-module-imports@7.22.15: + resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.23.0 + dev: true + + /@babel/helper-module-transforms@7.23.0(@babel/core@7.23.0): + resolution: {integrity: sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/compat-data': 7.21.4 - '@babel/core': 7.21.4 - '@babel/helper-validator-option': 7.21.0 - browserslist: 4.21.5 - lru-cache: 5.1.1 - semver: 6.3.0 + '@babel/core': 7.23.0 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-module-imports': 7.22.15 + '@babel/helper-simple-access': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/helper-validator-identifier': 7.22.20 dev: true - /@babel/helper-environment-visitor@7.18.9: - resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==} + /@babel/helper-plugin-utils@7.22.5: + resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} engines: {node: '>=6.9.0'} dev: true - /@babel/helper-function-name@7.21.0: - resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==} + /@babel/helper-simple-access@7.22.5: + resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.20.7 - '@babel/types': 7.21.4 + '@babel/types': 7.23.0 dev: true - /@babel/helper-hoist-variables@7.18.6: - resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==} + /@babel/helper-split-export-declaration@7.22.6: + resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 - dev: true - - /@babel/helper-module-imports@7.21.4: - resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.21.4 - dev: true - - /@babel/helper-module-transforms@7.21.2: - resolution: {integrity: sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-module-imports': 7.21.4 - '@babel/helper-simple-access': 7.20.2 - '@babel/helper-split-export-declaration': 7.18.6 - '@babel/helper-validator-identifier': 7.19.1 - '@babel/template': 7.20.7 - '@babel/traverse': 7.21.4 - '@babel/types': 7.21.4 - transitivePeerDependencies: - - supports-color - dev: true - - /@babel/helper-plugin-utils@7.20.2: - resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==} - engines: {node: '>=6.9.0'} - dev: true - - /@babel/helper-simple-access@7.20.2: - resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.21.4 - dev: true - - /@babel/helper-split-export-declaration@7.18.6: - resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.23.0 dev: true /@babel/helper-string-parser@7.19.4: @@ -242,32 +230,42 @@ packages: engines: {node: '>=6.9.0'} dev: true + /@babel/helper-string-parser@7.22.5: + resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==} + engines: {node: '>=6.9.0'} + dev: true + /@babel/helper-validator-identifier@7.19.1: resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==} engines: {node: '>=6.9.0'} dev: true - /@babel/helper-validator-option@7.21.0: - resolution: {integrity: sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==} + /@babel/helper-validator-identifier@7.22.20: + resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} dev: true - /@babel/helpers@7.21.0: - resolution: {integrity: sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==} + /@babel/helper-validator-option@7.22.15: + resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==} + engines: {node: '>=6.9.0'} + dev: true + + /@babel/helpers@7.23.1: + resolution: {integrity: sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.20.7 - '@babel/traverse': 7.21.4 - '@babel/types': 7.21.4 + '@babel/template': 7.22.15 + '@babel/traverse': 7.23.0 + '@babel/types': 7.23.0 transitivePeerDependencies: - supports-color dev: true - /@babel/highlight@7.18.6: - resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==} + /@babel/highlight@7.22.20: + resolution: {integrity: sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.19.1 + '@babel/helper-validator-identifier': 7.22.20 chalk: 2.4.2 js-tokens: 4.0.0 dev: true @@ -280,24 +278,32 @@ packages: '@babel/types': 7.21.4 dev: true - /@babel/plugin-transform-react-jsx-self@7.21.0(@babel/core@7.21.4): - resolution: {integrity: sha512-f/Eq+79JEu+KUANFks9UZCcvydOOGMgF7jBrcwjHa5jTZD8JivnhCJYvmlhR/WTXBWonDExPoW0eO/CR4QJirA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 + /@babel/parser@7.23.0: + resolution: {integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==} + engines: {node: '>=6.0.0'} + hasBin: true dependencies: - '@babel/core': 7.21.4 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/types': 7.23.0 dev: true - /@babel/plugin-transform-react-jsx-source@7.19.6(@babel/core@7.21.4): - resolution: {integrity: sha512-RpAi004QyMNisst/pvSanoRdJ4q+jMCWyk9zdw/CyLB9j8RXEahodR6l2GyttDRyEVWZtbN+TpLiHJ3t34LbsQ==} + /@babel/plugin-transform-react-jsx-self@7.22.5(@babel/core@7.23.0): + resolution: {integrity: sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.21.4 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/core': 7.23.0 + '@babel/helper-plugin-utils': 7.22.5 + dev: true + + /@babel/plugin-transform-react-jsx-source@7.22.5(@babel/core@7.23.0): + resolution: {integrity: sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.23.0 + '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/runtime@7.21.0: @@ -314,27 +320,27 @@ packages: regenerator-runtime: 0.14.0 dev: false - /@babel/template@7.20.7: - resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==} + /@babel/template@7.22.15: + resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.21.4 - '@babel/parser': 7.21.4 - '@babel/types': 7.21.4 + '@babel/code-frame': 7.22.13 + '@babel/parser': 7.23.0 + '@babel/types': 7.23.0 dev: true - /@babel/traverse@7.21.4: - resolution: {integrity: sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==} + /@babel/traverse@7.23.0: + resolution: {integrity: sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.21.4 - '@babel/generator': 7.21.4 - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-function-name': 7.21.0 - '@babel/helper-hoist-variables': 7.18.6 - '@babel/helper-split-export-declaration': 7.18.6 - '@babel/parser': 7.21.4 - '@babel/types': 7.21.4 + '@babel/code-frame': 7.22.13 + '@babel/generator': 7.23.0 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/parser': 7.23.0 + '@babel/types': 7.23.0 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: @@ -350,6 +356,15 @@ packages: to-fast-properties: 2.0.0 dev: true + /@babel/types@7.23.0: + resolution: {integrity: sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.22.5 + '@babel/helper-validator-identifier': 7.22.20 + to-fast-properties: 2.0.0 + dev: true + /@bcoe/v8-coverage@0.2.3: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true @@ -434,8 +449,8 @@ packages: resolution: {integrity: sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==} dev: false - /@esbuild/android-arm64@0.17.18: - resolution: {integrity: sha512-/iq0aK0eeHgSC3z55ucMAHO05OIqmQehiGay8eP5l/5l+iEr4EIbh4/MI8xD9qRFjqzgkc0JkX0LculNC9mXBw==} + /@esbuild/android-arm64@0.18.20: + resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -443,8 +458,8 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.17.18: - resolution: {integrity: sha512-EmwL+vUBZJ7mhFCs5lA4ZimpUH3WMAoqvOIYhVQwdIgSpHC8ImHdsRyhHAVxpDYUSm0lWvd63z0XH1IlImS2Qw==} + /@esbuild/android-arm@0.18.20: + resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -452,8 +467,8 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.17.18: - resolution: {integrity: sha512-x+0efYNBF3NPW2Xc5bFOSFW7tTXdAcpfEg2nXmxegm4mJuVeS+i109m/7HMiOQ6M12aVGGFlqJX3RhNdYM2lWg==} + /@esbuild/android-x64@0.18.20: + resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -461,8 +476,8 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.17.18: - resolution: {integrity: sha512-6tY+djEAdF48M1ONWnQb1C+6LiXrKjmqjzPNPWXhu/GzOHTHX2nh8Mo2ZAmBFg0kIodHhciEgUBtcYCAIjGbjQ==} + /@esbuild/darwin-arm64@0.18.20: + resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -470,8 +485,8 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.17.18: - resolution: {integrity: sha512-Qq84ykvLvya3dO49wVC9FFCNUfSrQJLbxhoQk/TE1r6MjHo3sFF2tlJCwMjhkBVq3/ahUisj7+EpRSz0/+8+9A==} + /@esbuild/darwin-x64@0.18.20: + resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -479,8 +494,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.17.18: - resolution: {integrity: sha512-fw/ZfxfAzuHfaQeMDhbzxp9mc+mHn1Y94VDHFHjGvt2Uxl10mT4CDavHm+/L9KG441t1QdABqkVYwakMUeyLRA==} + /@esbuild/freebsd-arm64@0.18.20: + resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -488,8 +503,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.17.18: - resolution: {integrity: sha512-FQFbRtTaEi8ZBi/A6kxOC0V0E9B/97vPdYjY9NdawyLd4Qk5VD5g2pbWN2VR1c0xhzcJm74HWpObPszWC+qTew==} + /@esbuild/freebsd-x64@0.18.20: + resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -497,8 +512,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.17.18: - resolution: {integrity: sha512-R7pZvQZFOY2sxUG8P6A21eq6q+eBv7JPQYIybHVf1XkQYC+lT7nDBdC7wWKTrbvMXKRaGudp/dzZCwL/863mZQ==} + /@esbuild/linux-arm64@0.18.20: + resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -506,8 +521,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.17.18: - resolution: {integrity: sha512-jW+UCM40LzHcouIaqv3e/oRs0JM76JfhHjCavPxMUti7VAPh8CaGSlS7cmyrdpzSk7A+8f0hiedHqr/LMnfijg==} + /@esbuild/linux-arm@0.18.20: + resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -515,8 +530,8 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.17.18: - resolution: {integrity: sha512-ygIMc3I7wxgXIxk6j3V00VlABIjq260i967Cp9BNAk5pOOpIXmd1RFQJQX9Io7KRsthDrQYrtcx7QCof4o3ZoQ==} + /@esbuild/linux-ia32@0.18.20: + resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -524,8 +539,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.17.18: - resolution: {integrity: sha512-bvPG+MyFs5ZlwYclCG1D744oHk1Pv7j8psF5TfYx7otCVmcJsEXgFEhQkbhNW8otDHL1a2KDINW20cfCgnzgMQ==} + /@esbuild/linux-loong64@0.18.20: + resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -533,8 +548,8 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.17.18: - resolution: {integrity: sha512-oVqckATOAGuiUOa6wr8TXaVPSa+6IwVJrGidmNZS1cZVx0HqkTMkqFGD2HIx9H1RvOwFeWYdaYbdY6B89KUMxA==} + /@esbuild/linux-mips64el@0.18.20: + resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -542,8 +557,8 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.17.18: - resolution: {integrity: sha512-3dLlQO+b/LnQNxgH4l9rqa2/IwRJVN9u/bK63FhOPB4xqiRqlQAU0qDU3JJuf0BmaH0yytTBdoSBHrb2jqc5qQ==} + /@esbuild/linux-ppc64@0.18.20: + resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -551,8 +566,8 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.17.18: - resolution: {integrity: sha512-/x7leOyDPjZV3TcsdfrSI107zItVnsX1q2nho7hbbQoKnmoeUWjs+08rKKt4AUXju7+3aRZSsKrJtaRmsdL1xA==} + /@esbuild/linux-riscv64@0.18.20: + resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -560,8 +575,8 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.17.18: - resolution: {integrity: sha512-cX0I8Q9xQkL/6F5zWdYmVf5JSQt+ZfZD2bJudZrWD+4mnUvoZ3TDDXtDX2mUaq6upMFv9FlfIh4Gfun0tbGzuw==} + /@esbuild/linux-s390x@0.18.20: + resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -569,8 +584,8 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.17.18: - resolution: {integrity: sha512-66RmRsPlYy4jFl0vG80GcNRdirx4nVWAzJmXkevgphP1qf4dsLQCpSKGM3DUQCojwU1hnepI63gNZdrr02wHUA==} + /@esbuild/linux-x64@0.18.20: + resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -578,8 +593,8 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.17.18: - resolution: {integrity: sha512-95IRY7mI2yrkLlTLb1gpDxdC5WLC5mZDi+kA9dmM5XAGxCME0F8i4bYH4jZreaJ6lIZ0B8hTrweqG1fUyW7jbg==} + /@esbuild/netbsd-x64@0.18.20: + resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -587,8 +602,8 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.17.18: - resolution: {integrity: sha512-WevVOgcng+8hSZ4Q3BKL3n1xTv5H6Nb53cBrtzzEjDbbnOmucEVcZeGCsCOi9bAOcDYEeBZbD2SJNBxlfP3qiA==} + /@esbuild/openbsd-x64@0.18.20: + resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -596,8 +611,8 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.17.18: - resolution: {integrity: sha512-Rzf4QfQagnwhQXVBS3BYUlxmEbcV7MY+BH5vfDZekU5eYpcffHSyjU8T0xucKVuOcdCsMo+Ur5wmgQJH2GfNrg==} + /@esbuild/sunos-x64@0.18.20: + resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -605,8 +620,8 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.17.18: - resolution: {integrity: sha512-Kb3Ko/KKaWhjeAm2YoT/cNZaHaD1Yk/pa3FTsmqo9uFh1D1Rfco7BBLIPdDOozrObj2sahslFuAQGvWbgWldAg==} + /@esbuild/win32-arm64@0.18.20: + resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -614,8 +629,8 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.17.18: - resolution: {integrity: sha512-0/xUMIdkVHwkvxfbd5+lfG7mHOf2FRrxNbPiKWg9C4fFrB8H0guClmaM3BFiRUYrznVoyxTIyC/Ou2B7QQSwmw==} + /@esbuild/win32-ia32@0.18.20: + resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -623,8 +638,8 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.17.18: - resolution: {integrity: sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg==} + /@esbuild/win32-x64@0.18.20: + resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -1939,14 +1954,6 @@ packages: '@sinclair/typebox': 0.27.8 dev: true - /@jridgewell/gen-mapping@0.1.1: - resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==} - engines: {node: '>=6.0.0'} - dependencies: - '@jridgewell/set-array': 1.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - /@jridgewell/gen-mapping@0.3.2: resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==} engines: {node: '>=6.0.0'} @@ -2053,6 +2060,35 @@ packages: engines: {node: '>= 10'} dev: true + /@types/babel__core@7.20.2: + resolution: {integrity: sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==} + dependencies: + '@babel/parser': 7.21.4 + '@babel/types': 7.21.4 + '@types/babel__generator': 7.6.5 + '@types/babel__template': 7.4.2 + '@types/babel__traverse': 7.20.2 + dev: true + + /@types/babel__generator@7.6.5: + resolution: {integrity: sha512-h9yIuWbJKdOPLJTbmSpPzkF67e659PbQDba7ifWm5BJ8xTv+sDmS7rFmywkWOvXedGTivCdeGSIIX8WLcRTz8w==} + dependencies: + '@babel/types': 7.21.4 + dev: true + + /@types/babel__template@7.4.2: + resolution: {integrity: sha512-/AVzPICMhMOMYoSx9MoKpGDKdBRsIXMNByh1PXSZoa+v6ZoLa8xxtsT/uLQ/NJm0XVAWl/BvId4MlDeXJaeIZQ==} + dependencies: + '@babel/parser': 7.21.4 + '@babel/types': 7.21.4 + dev: true + + /@types/babel__traverse@7.20.2: + resolution: {integrity: sha512-ojlGK1Hsfce93J0+kn3H5R73elidKUaZonirN33GSmgTUMpzI/MIFfSpF3haANe3G1bEBS9/9/QEqwTzwqFsKw==} + dependencies: + '@babel/types': 7.21.4 + dev: true + /@types/cacheable-request@6.0.3: resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} dependencies: @@ -2279,7 +2315,7 @@ packages: debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.5.0 + semver: 7.5.4 ts-api-utils: 1.0.1(typescript@5.1.3) typescript: 5.1.3 transitivePeerDependencies: @@ -2314,30 +2350,31 @@ packages: eslint-visitor-keys: 3.4.1 dev: true - /@vitejs/plugin-react@4.0.0(vite@4.3.9): - resolution: {integrity: sha512-HX0XzMjL3hhOYm+0s95pb0Z7F8O81G7joUHgfDd/9J/ZZf5k4xX6QAMFkKsHFxaHlf6X7GD7+XuaZ66ULiJuhQ==} + /@vitejs/plugin-react@4.1.0(vite@4.4.11): + resolution: {integrity: sha512-rM0SqazU9iqPUraQ2JlIvReeaxOoRj6n+PzB1C0cBzIbd8qP336nC39/R9yPi3wVcah7E7j/kdU1uCUqMEU4OQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^4.2.0 dependencies: - '@babel/core': 7.21.4 - '@babel/plugin-transform-react-jsx-self': 7.21.0(@babel/core@7.21.4) - '@babel/plugin-transform-react-jsx-source': 7.19.6(@babel/core@7.21.4) + '@babel/core': 7.23.0 + '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.23.0) + '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.23.0) + '@types/babel__core': 7.20.2 react-refresh: 0.14.0 - vite: 4.3.9(@types/node@18.15.11) + vite: 4.4.11(@types/node@18.15.11) transitivePeerDependencies: - supports-color dev: true - /@vitest/coverage-v8@0.33.0(vitest@0.33.0): - resolution: {integrity: sha512-Rj5IzoLF7FLj6yR7TmqsfRDSeaFki6NAJ/cQexqhbWkHEV2htlVGrmuOde3xzvFsCbLCagf4omhcIaVmfU8Okg==} + /@vitest/coverage-v8@0.34.6(vitest@0.34.6): + resolution: {integrity: sha512-fivy/OK2d/EsJFoEoxHFEnNGTg+MmdZBAVK9Ka4qhXR2K3J0DS08vcGVwzDtXSuUMabLv4KtPcpSKkcMXFDViw==} peerDependencies: vitest: '>=0.32.0 <1' dependencies: '@ampproject/remapping': 2.2.1 '@bcoe/v8-coverage': 0.2.3 istanbul-lib-coverage: 3.2.0 - istanbul-lib-report: 3.0.0 + istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 4.0.1 istanbul-reports: 3.1.5 magic-string: 0.30.1 @@ -2345,43 +2382,43 @@ packages: std-env: 3.3.3 test-exclude: 6.0.0 v8-to-istanbul: 9.1.0 - vitest: 0.33.0 + vitest: 0.34.6 transitivePeerDependencies: - supports-color dev: true - /@vitest/expect@0.33.0: - resolution: {integrity: sha512-sVNf+Gla3mhTCxNJx+wJLDPp/WcstOe0Ksqz4Vec51MmgMth/ia0MGFEkIZmVGeTL5HtjYR4Wl/ZxBxBXZJTzQ==} + /@vitest/expect@0.34.6: + resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==} dependencies: - '@vitest/spy': 0.33.0 - '@vitest/utils': 0.33.0 - chai: 4.3.7 + '@vitest/spy': 0.34.6 + '@vitest/utils': 0.34.6 + chai: 4.3.10 dev: true - /@vitest/runner@0.33.0: - resolution: {integrity: sha512-UPfACnmCB6HKRHTlcgCoBh6ppl6fDn+J/xR8dTufWiKt/74Y9bHci5CKB8tESSV82zKYtkBJo9whU3mNvfaisg==} + /@vitest/runner@0.34.6: + resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==} dependencies: - '@vitest/utils': 0.33.0 + '@vitest/utils': 0.34.6 p-limit: 4.0.0 pathe: 1.1.1 dev: true - /@vitest/snapshot@0.33.0: - resolution: {integrity: sha512-tJjrl//qAHbyHajpFvr8Wsk8DIOODEebTu7pgBrP07iOepR5jYkLFiqLq2Ltxv+r0uptUb4izv1J8XBOwKkVYA==} + /@vitest/snapshot@0.34.6: + resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==} dependencies: magic-string: 0.30.1 pathe: 1.1.1 pretty-format: 29.6.1 dev: true - /@vitest/spy@0.33.0: - resolution: {integrity: sha512-Kv+yZ4hnH1WdiAkPUQTpRxW8kGtH8VRTnus7ZTGovFYM1ZezJpvGtb9nPIjPnptHbsyIAxYZsEpVPYgtpjGnrg==} + /@vitest/spy@0.34.6: + resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==} dependencies: tinyspy: 2.1.1 dev: true - /@vitest/utils@0.33.0: - resolution: {integrity: sha512-pF1w22ic965sv+EN6uoePkAOTkAPWM03Ri/jXNyMIKBb/XHLDPfhLvf/Fa9g0YECevAIz56oVYXhodLvLQ/awA==} + /@vitest/utils@0.34.6: + resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==} dependencies: diff-sequences: 29.4.3 loupe: 2.3.6 @@ -2490,7 +2527,7 @@ packages: minimatch: 5.1.6 read-config-file: 6.3.2 sanitize-filename: 1.6.3 - semver: 7.5.0 + semver: 7.5.4 tar: 6.1.13 temp-file: 3.4.0 transitivePeerDependencies: @@ -2587,15 +2624,15 @@ packages: fill-range: 7.0.1 dev: true - /browserslist@4.21.5: - resolution: {integrity: sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==} + /browserslist@4.22.1: + resolution: {integrity: sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001473 - electron-to-chromium: 1.4.348 - node-releases: 2.0.10 - update-browserslist-db: 1.0.10(browserslist@4.21.5) + caniuse-lite: 1.0.30001546 + electron-to-chromium: 1.4.542 + node-releases: 2.0.13 + update-browserslist-db: 1.0.13(browserslist@4.22.1) dev: true /buffer-crc32@0.2.13: @@ -2681,18 +2718,18 @@ packages: engines: {node: '>=6'} dev: true - /caniuse-lite@1.0.30001473: - resolution: {integrity: sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg==} + /caniuse-lite@1.0.30001546: + resolution: {integrity: sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw==} dev: true - /chai@4.3.7: - resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==} + /chai@4.3.10: + resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==} engines: {node: '>=4'} dependencies: assertion-error: 1.1.0 - check-error: 1.0.2 + check-error: 1.0.3 deep-eql: 4.1.3 - get-func-name: 2.0.0 + get-func-name: 2.0.2 loupe: 2.3.6 pathval: 1.1.1 type-detect: 4.0.8 @@ -2715,8 +2752,10 @@ packages: supports-color: 7.2.0 dev: true - /check-error@1.0.2: - resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==} + /check-error@1.0.3: + resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} + dependencies: + get-func-name: 2.0.2 dev: true /chownr@2.0.0: @@ -2811,6 +2850,10 @@ packages: resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /convert-source-map@2.0.0: + resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} + dev: true + /core-util-is@1.0.2: resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==} requiresBuild: true @@ -3010,8 +3053,8 @@ packages: - supports-color dev: true - /electron-to-chromium@1.4.348: - resolution: {integrity: sha512-gM7TdwuG3amns/1rlgxMbeeyNoBFPa+4Uu0c7FeROWh4qWmvSOnvcslKmWy51ggLKZ2n/F/4i2HJ+PVNxH9uCQ==} + /electron-to-chromium@1.4.542: + resolution: {integrity: sha512-6+cpa00G09N3sfh2joln4VUXHquWrOFx3FLZqiVQvl45+zS9DskDBTPvob+BhvFRmTBkyDSk0vvLMMRo/qc6mQ==} dev: true /electron@26.1.0: @@ -3048,34 +3091,34 @@ packages: dev: true optional: true - /esbuild@0.17.18: - resolution: {integrity: sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w==} + /esbuild@0.18.20: + resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.17.18 - '@esbuild/android-arm64': 0.17.18 - '@esbuild/android-x64': 0.17.18 - '@esbuild/darwin-arm64': 0.17.18 - '@esbuild/darwin-x64': 0.17.18 - '@esbuild/freebsd-arm64': 0.17.18 - '@esbuild/freebsd-x64': 0.17.18 - '@esbuild/linux-arm': 0.17.18 - '@esbuild/linux-arm64': 0.17.18 - '@esbuild/linux-ia32': 0.17.18 - '@esbuild/linux-loong64': 0.17.18 - '@esbuild/linux-mips64el': 0.17.18 - '@esbuild/linux-ppc64': 0.17.18 - '@esbuild/linux-riscv64': 0.17.18 - '@esbuild/linux-s390x': 0.17.18 - '@esbuild/linux-x64': 0.17.18 - '@esbuild/netbsd-x64': 0.17.18 - '@esbuild/openbsd-x64': 0.17.18 - '@esbuild/sunos-x64': 0.17.18 - '@esbuild/win32-arm64': 0.17.18 - '@esbuild/win32-ia32': 0.17.18 - '@esbuild/win32-x64': 0.17.18 + '@esbuild/android-arm': 0.18.20 + '@esbuild/android-arm64': 0.18.20 + '@esbuild/android-x64': 0.18.20 + '@esbuild/darwin-arm64': 0.18.20 + '@esbuild/darwin-x64': 0.18.20 + '@esbuild/freebsd-arm64': 0.18.20 + '@esbuild/freebsd-x64': 0.18.20 + '@esbuild/linux-arm': 0.18.20 + '@esbuild/linux-arm64': 0.18.20 + '@esbuild/linux-ia32': 0.18.20 + '@esbuild/linux-loong64': 0.18.20 + '@esbuild/linux-mips64el': 0.18.20 + '@esbuild/linux-ppc64': 0.18.20 + '@esbuild/linux-riscv64': 0.18.20 + '@esbuild/linux-s390x': 0.18.20 + '@esbuild/linux-x64': 0.18.20 + '@esbuild/netbsd-x64': 0.18.20 + '@esbuild/openbsd-x64': 0.18.20 + '@esbuild/sunos-x64': 0.18.20 + '@esbuild/win32-arm64': 0.18.20 + '@esbuild/win32-ia32': 0.18.20 + '@esbuild/win32-x64': 0.18.20 dev: true /escalade@3.1.1: @@ -3375,8 +3418,8 @@ packages: engines: {node: 6.* || 8.* || >= 10.*} dev: true - /get-func-name@2.0.0: - resolution: {integrity: sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==} + /get-func-name@2.0.2: + resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} dev: true /get-intrinsic@1.2.0: @@ -3430,7 +3473,7 @@ packages: es6-error: 4.1.1 matcher: 3.0.0 roarr: 2.15.4 - semver: 7.5.0 + semver: 7.5.4 serialize-error: 7.0.1 dev: true optional: true @@ -3693,12 +3736,12 @@ packages: engines: {node: '>=8'} dev: true - /istanbul-lib-report@3.0.0: - resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==} - engines: {node: '>=8'} + /istanbul-lib-report@3.0.1: + resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==} + engines: {node: '>=10'} dependencies: istanbul-lib-coverage: 3.2.0 - make-dir: 3.1.0 + make-dir: 4.0.0 supports-color: 7.2.0 dev: true @@ -3718,7 +3761,7 @@ packages: engines: {node: '>=8'} dependencies: html-escaper: 2.0.2 - istanbul-lib-report: 3.0.0 + istanbul-lib-report: 3.0.1 dev: true /jake@10.8.5: @@ -3843,7 +3886,7 @@ packages: /loupe@2.3.6: resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==} dependencies: - get-func-name: 2.0.0 + get-func-name: 2.0.2 dev: true /lowercase-keys@2.0.0: @@ -3871,11 +3914,11 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true - /make-dir@3.1.0: - resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} - engines: {node: '>=8'} + /make-dir@4.0.0: + resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} + engines: {node: '>=10'} dependencies: - semver: 6.3.0 + semver: 7.5.4 dev: true /matcher@3.0.0: @@ -4008,8 +4051,8 @@ packages: dev: true optional: true - /node-releases@2.0.10: - resolution: {integrity: sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==} + /node-releases@2.0.13: + resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==} dev: true /normalize-url@6.1.0: @@ -4137,8 +4180,8 @@ packages: xmlbuilder: 15.1.1 dev: true - /postcss@8.4.23: - resolution: {integrity: sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==} + /postcss@8.4.31: + resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.6 @@ -4371,8 +4414,8 @@ packages: dev: true optional: true - /rollup@3.21.6: - resolution: {integrity: sha512-SXIICxvxQxR3D4dp/3LDHZIJPC8a4anKMHd4E3Jiz2/JnY+2bEjqrOokAauc5ShGVNFHlEFjBXAXlaxkJqIqSg==} + /rollup@3.29.4: + resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -4429,6 +4472,11 @@ packages: hasBin: true dev: true + /semver@6.3.1: + resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true + dev: true + /semver@7.5.0: resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==} engines: {node: '>=10'} @@ -4633,8 +4681,8 @@ packages: resolution: {integrity: sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==} dev: true - /tinypool@0.6.0: - resolution: {integrity: sha512-FdswUUo5SxRizcBc6b1GSuLpLjisa8N8qMyYoP3rl+bym+QauhtJP5bvZY1ytt8krKGmMLYIRl36HBZfeAoqhQ==} + /tinypool@0.7.0: + resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==} engines: {node: '>=14.0.0'} dev: true @@ -4737,13 +4785,13 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /update-browserslist-db@1.0.10(browserslist@4.21.5): - resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==} + /update-browserslist-db@1.0.13(browserslist@4.22.1): + resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.21.5 + browserslist: 4.22.1 escalade: 3.1.1 picocolors: 1.0.0 dev: true @@ -4793,8 +4841,8 @@ packages: dev: true optional: true - /vite-node@0.33.0(@types/node@18.15.11): - resolution: {integrity: sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==} + /vite-node@0.34.6(@types/node@18.15.11): + resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==} engines: {node: '>=v14.18.0'} hasBin: true dependencies: @@ -4803,10 +4851,11 @@ packages: mlly: 1.4.0 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.3.9(@types/node@18.15.11) + vite: 4.4.11(@types/node@18.15.11) transitivePeerDependencies: - '@types/node' - less + - lightningcss - sass - stylus - sugarss @@ -4818,17 +4867,25 @@ packages: resolution: {integrity: sha512-EQ7ORuPp8vFPCqfuGnVo7d36fXS0IFH4/RUlKb1drseix3TQEPcgwEuFADdXBxRgqMp70njz/1m0kdf5lEsm8w==} dev: true - /vite-plugin-electron@0.11.2: - resolution: {integrity: sha512-umQRmSuA80JVxKB3PfO55o8mFTrW+sEtu7kZ5TYKAnkuYpKw7qgxl4f/65gp8x5BGHJjYh/iIRIE26x3Xqc4mQ==} + /vite-plugin-electron@0.14.1(vite-plugin-electron-renderer@0.14.5): + resolution: {integrity: sha512-QGQ2nJ4wjMf1FaDSkdoC/UskQGiYGcAToATJqJXvqrL4Jmt0CFaZqoDjh1xLicUWEo/X7urHYjhKTqwEeP7F7g==} + peerDependencies: + vite-plugin-electron-renderer: '*' + peerDependenciesMeta: + vite-plugin-electron-renderer: + optional: true + dependencies: + vite-plugin-electron-renderer: 0.14.5 dev: true - /vite@4.3.9(@types/node@18.15.11): - resolution: {integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==} + /vite@4.4.11(@types/node@18.15.11): + resolution: {integrity: sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: '@types/node': '>= 14' less: '*' + lightningcss: ^1.21.0 sass: '*' stylus: '*' sugarss: '*' @@ -4838,6 +4895,8 @@ packages: optional: true less: optional: true + lightningcss: + optional: true sass: optional: true stylus: @@ -4848,15 +4907,15 @@ packages: optional: true dependencies: '@types/node': 18.15.11 - esbuild: 0.17.18 - postcss: 8.4.23 - rollup: 3.21.6 + esbuild: 0.18.20 + postcss: 8.4.31 + rollup: 3.29.4 optionalDependencies: fsevents: 2.3.2 dev: true - /vitest@0.33.0: - resolution: {integrity: sha512-1CxaugJ50xskkQ0e969R/hW47za4YXDUfWJDxip1hwbnhUjYolpfUn2AMOulqG/Dtd9WYAtkHmM/m3yKVrEejQ==} + /vitest@0.34.6: + resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==} engines: {node: '>=v14.18.0'} hasBin: true peerDependencies: @@ -4889,15 +4948,15 @@ packages: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 '@types/node': 18.15.11 - '@vitest/expect': 0.33.0 - '@vitest/runner': 0.33.0 - '@vitest/snapshot': 0.33.0 - '@vitest/spy': 0.33.0 - '@vitest/utils': 0.33.0 + '@vitest/expect': 0.34.6 + '@vitest/runner': 0.34.6 + '@vitest/snapshot': 0.34.6 + '@vitest/spy': 0.34.6 + '@vitest/utils': 0.34.6 acorn: 8.10.0 acorn-walk: 8.2.0 cac: 6.7.14 - chai: 4.3.7 + chai: 4.3.10 debug: 4.3.4 local-pkg: 0.4.3 magic-string: 0.30.1 @@ -4906,12 +4965,13 @@ packages: std-env: 3.3.3 strip-literal: 1.0.1 tinybench: 2.5.0 - tinypool: 0.6.0 - vite: 4.3.9(@types/node@18.15.11) - vite-node: 0.33.0(@types/node@18.15.11) + tinypool: 0.7.0 + vite: 4.4.11(@types/node@18.15.11) + vite-node: 0.34.6(@types/node@18.15.11) why-is-node-running: 2.2.2 transitivePeerDependencies: - less + - lightningcss - sass - stylus - sugarss diff --git a/common/ContextBridge.ts b/src/common/ContextBridge.ts similarity index 100% rename from common/ContextBridge.ts rename to src/common/ContextBridge.ts diff --git a/common/ExecutionArgument.ts b/src/common/ExecutionArgument.ts similarity index 100% rename from common/ExecutionArgument.ts rename to src/common/ExecutionArgument.ts diff --git a/common/OperatingSystem.ts b/src/common/OperatingSystem.ts similarity index 100% rename from common/OperatingSystem.ts rename to src/common/OperatingSystem.ts diff --git a/common/SearchResultItem.ts b/src/common/SearchResultItem.ts similarity index 100% rename from common/SearchResultItem.ts rename to src/common/SearchResultItem.ts diff --git a/common/Searchable.ts b/src/common/Searchable.ts similarity index 100% rename from common/Searchable.ts rename to src/common/Searchable.ts diff --git a/common/Settings.ts b/src/common/Settings.ts similarity index 100% rename from common/Settings.ts rename to src/common/Settings.ts diff --git a/common/UeliPlugin.ts b/src/common/UeliPlugin.ts similarity index 85% rename from common/UeliPlugin.ts rename to src/common/UeliPlugin.ts index 3fdccd2c..4b07581f 100644 --- a/common/UeliPlugin.ts +++ b/src/common/UeliPlugin.ts @@ -1,5 +1,5 @@ -import type { OperatingSystem } from "@common/OperatingSystem"; import type { PluginDependencies } from "../electron/main/Plugins"; +import type { OperatingSystem } from "./OperatingSystem"; export interface UeliPlugin { readonly id: string; diff --git a/electron/main/BrowserWindow/index.ts b/src/main/BrowserWindow/index.ts similarity index 88% rename from electron/main/BrowserWindow/index.ts rename to src/main/BrowserWindow/index.ts index 3aac5708..be379de2 100644 --- a/electron/main/BrowserWindow/index.ts +++ b/src/main/BrowserWindow/index.ts @@ -18,9 +18,7 @@ export const useBrowserWindow = async ({ nativeTheme: NativeTheme; settingsManager: SettingsManager; }): Promise => { - const preloadScriptFilePath = app.isPackaged - ? join(__dirname, "..", "..", "dist-electron", "preload", "index.js") - : join(__dirname, "..", "preload", "index.js"); + const preloadScriptFilePath = join(__dirname, "..", "dist-preload", "index.js"); const browserWindowConstructorOptionsMap: Record = { macOS: { @@ -58,6 +56,6 @@ export const useBrowserWindow = async ({ nativeTheme.addListener("updated", () => browserWindow.webContents.send("nativeThemeChanged")); app.isPackaged - ? await browserWindow.loadFile(join(__dirname, "..", "..", "dist", "index.html")) + ? await browserWindow.loadFile(join(__dirname, "..", "dist-renderer", "index.html")) : await browserWindow.loadURL(process.env.VITE_DEV_SERVER_URL); }; diff --git a/electron/main/EventEmitter/EventEmitter.ts b/src/main/EventEmitter/EventEmitter.ts similarity index 100% rename from electron/main/EventEmitter/EventEmitter.ts rename to src/main/EventEmitter/EventEmitter.ts diff --git a/electron/main/EventEmitter/MittEventEmitter.test.ts b/src/main/EventEmitter/MittEventEmitter.test.ts similarity index 100% rename from electron/main/EventEmitter/MittEventEmitter.test.ts rename to src/main/EventEmitter/MittEventEmitter.test.ts diff --git a/electron/main/EventEmitter/MittEventEmitter.ts b/src/main/EventEmitter/MittEventEmitter.ts similarity index 100% rename from electron/main/EventEmitter/MittEventEmitter.ts rename to src/main/EventEmitter/MittEventEmitter.ts diff --git a/electron/main/EventEmitter/index.ts b/src/main/EventEmitter/index.ts similarity index 100% rename from electron/main/EventEmitter/index.ts rename to src/main/EventEmitter/index.ts diff --git a/electron/main/EventEmitter/useEventEmitter.ts b/src/main/EventEmitter/useEventEmitter.ts similarity index 100% rename from electron/main/EventEmitter/useEventEmitter.ts rename to src/main/EventEmitter/useEventEmitter.ts diff --git a/electron/main/EventSubscriber/EventSubscriber.ts b/src/main/EventSubscriber/EventSubscriber.ts similarity index 100% rename from electron/main/EventSubscriber/EventSubscriber.ts rename to src/main/EventSubscriber/EventSubscriber.ts diff --git a/electron/main/EventSubscriber/MittEventSubscriber.test.ts b/src/main/EventSubscriber/MittEventSubscriber.test.ts similarity index 100% rename from electron/main/EventSubscriber/MittEventSubscriber.test.ts rename to src/main/EventSubscriber/MittEventSubscriber.test.ts diff --git a/electron/main/EventSubscriber/MittEventSubscriber.ts b/src/main/EventSubscriber/MittEventSubscriber.ts similarity index 100% rename from electron/main/EventSubscriber/MittEventSubscriber.ts rename to src/main/EventSubscriber/MittEventSubscriber.ts diff --git a/electron/main/EventSubscriber/index.ts b/src/main/EventSubscriber/index.ts similarity index 100% rename from electron/main/EventSubscriber/index.ts rename to src/main/EventSubscriber/index.ts diff --git a/electron/main/EventSubscriber/useEventSubscriber.ts b/src/main/EventSubscriber/useEventSubscriber.ts similarity index 100% rename from electron/main/EventSubscriber/useEventSubscriber.ts rename to src/main/EventSubscriber/useEventSubscriber.ts diff --git a/electron/main/Executor/ExecutionServices/CommandlineExecutionService.test.ts b/src/main/Executor/ExecutionServices/CommandlineExecutionService.test.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/CommandlineExecutionService.test.ts rename to src/main/Executor/ExecutionServices/CommandlineExecutionService.test.ts diff --git a/electron/main/Executor/ExecutionServices/CommandlineExecutionService.ts b/src/main/Executor/ExecutionServices/CommandlineExecutionService.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/CommandlineExecutionService.ts rename to src/main/Executor/ExecutionServices/CommandlineExecutionService.ts diff --git a/electron/main/Executor/ExecutionServices/ExecutionService.ts b/src/main/Executor/ExecutionServices/ExecutionService.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/ExecutionService.ts rename to src/main/Executor/ExecutionServices/ExecutionService.ts diff --git a/electron/main/Executor/ExecutionServices/FilePathExecutionService.test.ts b/src/main/Executor/ExecutionServices/FilePathExecutionService.test.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/FilePathExecutionService.test.ts rename to src/main/Executor/ExecutionServices/FilePathExecutionService.test.ts diff --git a/electron/main/Executor/ExecutionServices/FilePathExecutionService.ts b/src/main/Executor/ExecutionServices/FilePathExecutionService.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/FilePathExecutionService.ts rename to src/main/Executor/ExecutionServices/FilePathExecutionService.ts diff --git a/electron/main/Executor/ExecutionServices/PowershellExecutionService.test.ts b/src/main/Executor/ExecutionServices/PowershellExecutionService.test.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/PowershellExecutionService.test.ts rename to src/main/Executor/ExecutionServices/PowershellExecutionService.test.ts diff --git a/electron/main/Executor/ExecutionServices/PowershellExecutionService.ts b/src/main/Executor/ExecutionServices/PowershellExecutionService.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/PowershellExecutionService.ts rename to src/main/Executor/ExecutionServices/PowershellExecutionService.ts diff --git a/electron/main/Executor/ExecutionServices/UrlExecutionService.test.ts b/src/main/Executor/ExecutionServices/UrlExecutionService.test.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/UrlExecutionService.test.ts rename to src/main/Executor/ExecutionServices/UrlExecutionService.test.ts diff --git a/electron/main/Executor/ExecutionServices/UrlExecutionService.ts b/src/main/Executor/ExecutionServices/UrlExecutionService.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/UrlExecutionService.ts rename to src/main/Executor/ExecutionServices/UrlExecutionService.ts diff --git a/electron/main/Executor/ExecutionServices/index.ts b/src/main/Executor/ExecutionServices/index.ts similarity index 100% rename from electron/main/Executor/ExecutionServices/index.ts rename to src/main/Executor/ExecutionServices/index.ts diff --git a/electron/main/Executor/Executor.test.ts b/src/main/Executor/Executor.test.ts similarity index 100% rename from electron/main/Executor/Executor.test.ts rename to src/main/Executor/Executor.test.ts diff --git a/electron/main/Executor/Executor.ts b/src/main/Executor/Executor.ts similarity index 100% rename from electron/main/Executor/Executor.ts rename to src/main/Executor/Executor.ts diff --git a/electron/main/Executor/index.ts b/src/main/Executor/index.ts similarity index 100% rename from electron/main/Executor/index.ts rename to src/main/Executor/index.ts diff --git a/electron/main/Executor/useExecutor.test.ts b/src/main/Executor/useExecutor.test.ts similarity index 100% rename from electron/main/Executor/useExecutor.test.ts rename to src/main/Executor/useExecutor.test.ts diff --git a/electron/main/Executor/useExecutor.ts b/src/main/Executor/useExecutor.ts similarity index 100% rename from electron/main/Executor/useExecutor.ts rename to src/main/Executor/useExecutor.ts diff --git a/electron/main/NativeTheme/index.ts b/src/main/NativeTheme/index.ts similarity index 100% rename from electron/main/NativeTheme/index.ts rename to src/main/NativeTheme/index.ts diff --git a/electron/main/NativeTheme/useNativeTheme.test.ts b/src/main/NativeTheme/useNativeTheme.test.ts similarity index 100% rename from electron/main/NativeTheme/useNativeTheme.test.ts rename to src/main/NativeTheme/useNativeTheme.test.ts diff --git a/electron/main/NativeTheme/useNativeTheme.ts b/src/main/NativeTheme/useNativeTheme.ts similarity index 100% rename from electron/main/NativeTheme/useNativeTheme.ts rename to src/main/NativeTheme/useNativeTheme.ts diff --git a/electron/main/OperatingSystem/index.ts b/src/main/OperatingSystem/index.ts similarity index 100% rename from electron/main/OperatingSystem/index.ts rename to src/main/OperatingSystem/index.ts diff --git a/electron/main/OperatingSystem/useCurrentOperatingSystem.test.ts b/src/main/OperatingSystem/useCurrentOperatingSystem.test.ts similarity index 100% rename from electron/main/OperatingSystem/useCurrentOperatingSystem.test.ts rename to src/main/OperatingSystem/useCurrentOperatingSystem.test.ts diff --git a/electron/main/OperatingSystem/useCurrentOperatingSystem.ts b/src/main/OperatingSystem/useCurrentOperatingSystem.ts similarity index 100% rename from electron/main/OperatingSystem/useCurrentOperatingSystem.ts rename to src/main/OperatingSystem/useCurrentOperatingSystem.ts diff --git a/electron/main/PluginCacheFolder/index.ts b/src/main/PluginCacheFolder/index.ts similarity index 100% rename from electron/main/PluginCacheFolder/index.ts rename to src/main/PluginCacheFolder/index.ts diff --git a/electron/main/PluginCacheFolder/usePluginCacheFolder.test.ts b/src/main/PluginCacheFolder/usePluginCacheFolder.test.ts similarity index 100% rename from electron/main/PluginCacheFolder/usePluginCacheFolder.test.ts rename to src/main/PluginCacheFolder/usePluginCacheFolder.test.ts diff --git a/electron/main/PluginCacheFolder/usePluginCacheFolder.ts b/src/main/PluginCacheFolder/usePluginCacheFolder.ts similarity index 100% rename from electron/main/PluginCacheFolder/usePluginCacheFolder.ts rename to src/main/PluginCacheFolder/usePluginCacheFolder.ts diff --git a/electron/main/Plugins/Helpers/addPluginSearchResultItemsToSearchIndex.ts b/src/main/Plugins/Helpers/addPluginSearchResultItemsToSearchIndex.ts similarity index 100% rename from electron/main/Plugins/Helpers/addPluginSearchResultItemsToSearchIndex.ts rename to src/main/Plugins/Helpers/addPluginSearchResultItemsToSearchIndex.ts diff --git a/electron/main/Plugins/Helpers/getEnabledPlugins.ts b/src/main/Plugins/Helpers/getEnabledPlugins.ts similarity index 100% rename from electron/main/Plugins/Helpers/getEnabledPlugins.ts rename to src/main/Plugins/Helpers/getEnabledPlugins.ts diff --git a/electron/main/Plugins/Helpers/getSupportedPlugins.ts b/src/main/Plugins/Helpers/getSupportedPlugins.ts similarity index 100% rename from electron/main/Plugins/Helpers/getSupportedPlugins.ts rename to src/main/Plugins/Helpers/getSupportedPlugins.ts diff --git a/electron/main/Plugins/Helpers/index.ts b/src/main/Plugins/Helpers/index.ts similarity index 100% rename from electron/main/Plugins/Helpers/index.ts rename to src/main/Plugins/Helpers/index.ts diff --git a/electron/main/Plugins/Helpers/serializePluginToIpcEventReturnValue.ts b/src/main/Plugins/Helpers/serializePluginToIpcEventReturnValue.ts similarity index 100% rename from electron/main/Plugins/Helpers/serializePluginToIpcEventReturnValue.ts rename to src/main/Plugins/Helpers/serializePluginToIpcEventReturnValue.ts diff --git a/electron/main/Plugins/Helpers/setPluginDependencies.ts b/src/main/Plugins/Helpers/setPluginDependencies.ts similarity index 100% rename from electron/main/Plugins/Helpers/setPluginDependencies.ts rename to src/main/Plugins/Helpers/setPluginDependencies.ts diff --git a/electron/main/Plugins/Helpers/subscribeToIpcMainEvents.ts b/src/main/Plugins/Helpers/subscribeToIpcMainEvents.ts similarity index 100% rename from electron/main/Plugins/Helpers/subscribeToIpcMainEvents.ts rename to src/main/Plugins/Helpers/subscribeToIpcMainEvents.ts diff --git a/electron/main/Plugins/PluginDependencies.ts b/src/main/Plugins/PluginDependencies.ts similarity index 100% rename from electron/main/Plugins/PluginDependencies.ts rename to src/main/Plugins/PluginDependencies.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/Application.test.ts b/src/main/Plugins/Plugins/ApplicationSearch/Application.test.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/Application.test.ts rename to src/main/Plugins/Plugins/ApplicationSearch/Application.test.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/Application.ts b/src/main/Plugins/Plugins/ApplicationSearch/Application.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/Application.ts rename to src/main/Plugins/Plugins/ApplicationSearch/Application.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/ApplicationRepository.ts b/src/main/Plugins/Plugins/ApplicationSearch/ApplicationRepository.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/ApplicationRepository.ts rename to src/main/Plugins/Plugins/ApplicationSearch/ApplicationRepository.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/ApplicationSearchPlugin.ts b/src/main/Plugins/Plugins/ApplicationSearch/ApplicationSearchPlugin.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/ApplicationSearchPlugin.ts rename to src/main/Plugins/Plugins/ApplicationSearch/ApplicationSearchPlugin.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/MacOsApplicationIconGenerator.ts b/src/main/Plugins/Plugins/ApplicationSearch/MacOsApplicationIconGenerator.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/MacOsApplicationIconGenerator.ts rename to src/main/Plugins/Plugins/ApplicationSearch/MacOsApplicationIconGenerator.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/MacOsApplicationRepository.ts b/src/main/Plugins/Plugins/ApplicationSearch/MacOsApplicationRepository.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/MacOsApplicationRepository.ts rename to src/main/Plugins/Plugins/ApplicationSearch/MacOsApplicationRepository.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/WindowsApplicationRepository.ts b/src/main/Plugins/Plugins/ApplicationSearch/WindowsApplicationRepository.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/WindowsApplicationRepository.ts rename to src/main/Plugins/Plugins/ApplicationSearch/WindowsApplicationRepository.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/WindowsApplicationRetrieverResult.ts b/src/main/Plugins/Plugins/ApplicationSearch/WindowsApplicationRetrieverResult.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/WindowsApplicationRetrieverResult.ts rename to src/main/Plugins/Plugins/ApplicationSearch/WindowsApplicationRetrieverResult.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/index.ts b/src/main/Plugins/Plugins/ApplicationSearch/index.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/index.ts rename to src/main/Plugins/Plugins/ApplicationSearch/index.ts diff --git a/electron/main/Plugins/Plugins/ApplicationSearch/usePowershellScripts.ts b/src/main/Plugins/Plugins/ApplicationSearch/usePowershellScripts.ts similarity index 100% rename from electron/main/Plugins/Plugins/ApplicationSearch/usePowershellScripts.ts rename to src/main/Plugins/Plugins/ApplicationSearch/usePowershellScripts.ts diff --git a/electron/main/Plugins/Plugins/SystemColorThemeSwitcher/SystemColorThemeSwitcher.ts b/src/main/Plugins/Plugins/SystemColorThemeSwitcher/SystemColorThemeSwitcher.ts similarity index 100% rename from electron/main/Plugins/Plugins/SystemColorThemeSwitcher/SystemColorThemeSwitcher.ts rename to src/main/Plugins/Plugins/SystemColorThemeSwitcher/SystemColorThemeSwitcher.ts diff --git a/electron/main/Plugins/Plugins/SystemColorThemeSwitcher/index.ts b/src/main/Plugins/Plugins/SystemColorThemeSwitcher/index.ts similarity index 100% rename from electron/main/Plugins/Plugins/SystemColorThemeSwitcher/index.ts rename to src/main/Plugins/Plugins/SystemColorThemeSwitcher/index.ts diff --git a/electron/main/Plugins/Plugins/index.ts b/src/main/Plugins/Plugins/index.ts similarity index 100% rename from electron/main/Plugins/Plugins/index.ts rename to src/main/Plugins/Plugins/index.ts diff --git a/electron/main/Plugins/index.ts b/src/main/Plugins/index.ts similarity index 100% rename from electron/main/Plugins/index.ts rename to src/main/Plugins/index.ts diff --git a/electron/main/Plugins/usePlugins.ts b/src/main/Plugins/usePlugins.ts similarity index 100% rename from electron/main/Plugins/usePlugins.ts rename to src/main/Plugins/usePlugins.ts diff --git a/electron/main/SearchIndex/InMemoryIndex.ts b/src/main/SearchIndex/InMemoryIndex.ts similarity index 100% rename from electron/main/SearchIndex/InMemoryIndex.ts rename to src/main/SearchIndex/InMemoryIndex.ts diff --git a/electron/main/SearchIndex/InMemorySearchIndex.test.ts b/src/main/SearchIndex/InMemorySearchIndex.test.ts similarity index 100% rename from electron/main/SearchIndex/InMemorySearchIndex.test.ts rename to src/main/SearchIndex/InMemorySearchIndex.test.ts diff --git a/electron/main/SearchIndex/InMemorySearchIndex.ts b/src/main/SearchIndex/InMemorySearchIndex.ts similarity index 100% rename from electron/main/SearchIndex/InMemorySearchIndex.ts rename to src/main/SearchIndex/InMemorySearchIndex.ts diff --git a/electron/main/SearchIndex/SearchIndex.ts b/src/main/SearchIndex/SearchIndex.ts similarity index 100% rename from electron/main/SearchIndex/SearchIndex.ts rename to src/main/SearchIndex/SearchIndex.ts diff --git a/electron/main/SearchIndex/index.ts b/src/main/SearchIndex/index.ts similarity index 100% rename from electron/main/SearchIndex/index.ts rename to src/main/SearchIndex/index.ts diff --git a/electron/main/Settings/SettingsFileReader.test.ts b/src/main/Settings/SettingsFileReader.test.ts similarity index 100% rename from electron/main/Settings/SettingsFileReader.test.ts rename to src/main/Settings/SettingsFileReader.test.ts diff --git a/electron/main/Settings/SettingsFileReader.ts b/src/main/Settings/SettingsFileReader.ts similarity index 100% rename from electron/main/Settings/SettingsFileReader.ts rename to src/main/Settings/SettingsFileReader.ts diff --git a/electron/main/Settings/SettingsFileWriter.test.ts b/src/main/Settings/SettingsFileWriter.test.ts similarity index 100% rename from electron/main/Settings/SettingsFileWriter.test.ts rename to src/main/Settings/SettingsFileWriter.test.ts diff --git a/electron/main/Settings/SettingsFileWriter.ts b/src/main/Settings/SettingsFileWriter.ts similarity index 100% rename from electron/main/Settings/SettingsFileWriter.ts rename to src/main/Settings/SettingsFileWriter.ts diff --git a/electron/main/Settings/SettingsManager.test.ts b/src/main/Settings/SettingsManager.test.ts similarity index 100% rename from electron/main/Settings/SettingsManager.test.ts rename to src/main/Settings/SettingsManager.test.ts diff --git a/electron/main/Settings/SettingsManager.ts b/src/main/Settings/SettingsManager.ts similarity index 100% rename from electron/main/Settings/SettingsManager.ts rename to src/main/Settings/SettingsManager.ts diff --git a/electron/main/Settings/SettingsReader.ts b/src/main/Settings/SettingsReader.ts similarity index 100% rename from electron/main/Settings/SettingsReader.ts rename to src/main/Settings/SettingsReader.ts diff --git a/electron/main/Settings/SettingsWriter.ts b/src/main/Settings/SettingsWriter.ts similarity index 100% rename from electron/main/Settings/SettingsWriter.ts rename to src/main/Settings/SettingsWriter.ts diff --git a/electron/main/Settings/index.ts b/src/main/Settings/index.ts similarity index 100% rename from electron/main/Settings/index.ts rename to src/main/Settings/index.ts diff --git a/electron/main/Settings/useSettingsManager.ts b/src/main/Settings/useSettingsManager.ts similarity index 100% rename from electron/main/Settings/useSettingsManager.ts rename to src/main/Settings/useSettingsManager.ts diff --git a/electron/main/Utilities/CommandlineUtility.ts b/src/main/Utilities/CommandlineUtility.ts similarity index 100% rename from electron/main/Utilities/CommandlineUtility.ts rename to src/main/Utilities/CommandlineUtility.ts diff --git a/electron/main/Utilities/FileSystemUtility.ts b/src/main/Utilities/FileSystemUtility.ts similarity index 100% rename from electron/main/Utilities/FileSystemUtility.ts rename to src/main/Utilities/FileSystemUtility.ts diff --git a/electron/main/Utilities/RealCommandlineUtility.ts b/src/main/Utilities/RealCommandlineUtility.ts similarity index 100% rename from electron/main/Utilities/RealCommandlineUtility.ts rename to src/main/Utilities/RealCommandlineUtility.ts diff --git a/electron/main/Utilities/RealFileSystemUtility.ts b/src/main/Utilities/RealFileSystemUtility.ts similarity index 100% rename from electron/main/Utilities/RealFileSystemUtility.ts rename to src/main/Utilities/RealFileSystemUtility.ts diff --git a/electron/main/Utilities/index.ts b/src/main/Utilities/index.ts similarity index 100% rename from electron/main/Utilities/index.ts rename to src/main/Utilities/index.ts diff --git a/electron/main/index.ts b/src/main/index.ts similarity index 100% rename from electron/main/index.ts rename to src/main/index.ts diff --git a/src/main/tsconfig.json b/src/main/tsconfig.json new file mode 100644 index 00000000..3cf87db5 --- /dev/null +++ b/src/main/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "../../tsconfig.node.json", + "include": [".", "../common"] +} diff --git a/electron/preload/index.ts b/src/preload/index.ts similarity index 100% rename from electron/preload/index.ts rename to src/preload/index.ts diff --git a/src/preload/tsconfig.json b/src/preload/tsconfig.json new file mode 100644 index 00000000..3cf87db5 --- /dev/null +++ b/src/preload/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "../../tsconfig.node.json", + "include": [".", "../common"] +} diff --git a/src/App.tsx b/src/renderer/App.tsx similarity index 100% rename from src/App.tsx rename to src/renderer/App.tsx diff --git a/src/Hooks/index.ts b/src/renderer/Hooks/index.ts similarity index 100% rename from src/Hooks/index.ts rename to src/renderer/Hooks/index.ts diff --git a/src/Hooks/useContextBridge.ts b/src/renderer/Hooks/useContextBridge.ts similarity index 100% rename from src/Hooks/useContextBridge.ts rename to src/renderer/Hooks/useContextBridge.ts diff --git a/src/Hooks/useScrollbar.test.ts b/src/renderer/Hooks/useScrollbar.test.ts similarity index 100% rename from src/Hooks/useScrollbar.test.ts rename to src/renderer/Hooks/useScrollbar.test.ts diff --git a/src/Hooks/useScrollbar.ts b/src/renderer/Hooks/useScrollbar.ts similarity index 100% rename from src/Hooks/useScrollbar.ts rename to src/renderer/Hooks/useScrollbar.ts diff --git a/src/Hooks/useSearchResultItems.ts b/src/renderer/Hooks/useSearchResultItems.ts similarity index 100% rename from src/Hooks/useSearchResultItems.ts rename to src/renderer/Hooks/useSearchResultItems.ts diff --git a/src/Hooks/useSetting.ts b/src/renderer/Hooks/useSetting.ts similarity index 100% rename from src/Hooks/useSetting.ts rename to src/renderer/Hooks/useSetting.ts diff --git a/src/Hooks/useTheme.ts b/src/renderer/Hooks/useTheme.ts similarity index 100% rename from src/Hooks/useTheme.ts rename to src/renderer/Hooks/useTheme.ts diff --git a/src/I18n/getBrowserLanguage.ts b/src/renderer/I18n/getBrowserLanguage.ts similarity index 100% rename from src/I18n/getBrowserLanguage.ts rename to src/renderer/I18n/getBrowserLanguage.ts diff --git a/src/I18n/getDefaultLanguage.ts b/src/renderer/I18n/getDefaultLanguage.ts similarity index 100% rename from src/I18n/getDefaultLanguage.ts rename to src/renderer/I18n/getDefaultLanguage.ts diff --git a/src/I18n/index.ts b/src/renderer/I18n/index.ts similarity index 100% rename from src/I18n/index.ts rename to src/renderer/I18n/index.ts diff --git a/src/I18n/resources.ts b/src/renderer/I18n/resources.ts similarity index 100% rename from src/I18n/resources.ts rename to src/renderer/I18n/resources.ts diff --git a/src/I18n/supportedLanguages.ts b/src/renderer/I18n/supportedLanguages.ts similarity index 100% rename from src/I18n/supportedLanguages.ts rename to src/renderer/I18n/supportedLanguages.ts diff --git a/src/I18n/useI18n.ts b/src/renderer/I18n/useI18n.ts similarity index 100% rename from src/I18n/useI18n.ts rename to src/renderer/I18n/useI18n.ts diff --git a/src/Search/FavoritesList.tsx b/src/renderer/Search/FavoritesList.tsx similarity index 100% rename from src/Search/FavoritesList.tsx rename to src/renderer/Search/FavoritesList.tsx diff --git a/src/Search/Helpers/elementIsVisible.ts b/src/renderer/Search/Helpers/elementIsVisible.ts similarity index 100% rename from src/Search/Helpers/elementIsVisible.ts rename to src/renderer/Search/Helpers/elementIsVisible.ts diff --git a/src/Search/Helpers/filterSearchResultItemsBySearchTerm.ts b/src/renderer/Search/Helpers/filterSearchResultItemsBySearchTerm.ts similarity index 100% rename from src/Search/Helpers/filterSearchResultItemsBySearchTerm.ts rename to src/renderer/Search/Helpers/filterSearchResultItemsBySearchTerm.ts diff --git a/src/Search/Helpers/fitlerSearchResultItemsBySearchTerm.test.ts b/src/renderer/Search/Helpers/fitlerSearchResultItemsBySearchTerm.test.ts similarity index 100% rename from src/Search/Helpers/fitlerSearchResultItemsBySearchTerm.test.ts rename to src/renderer/Search/Helpers/fitlerSearchResultItemsBySearchTerm.test.ts diff --git a/src/Search/Helpers/index.ts b/src/renderer/Search/Helpers/index.ts similarity index 100% rename from src/Search/Helpers/index.ts rename to src/renderer/Search/Helpers/index.ts diff --git a/src/Search/Search.tsx b/src/renderer/Search/Search.tsx similarity index 100% rename from src/Search/Search.tsx rename to src/renderer/Search/Search.tsx diff --git a/src/Search/SearchResultList.tsx b/src/renderer/Search/SearchResultList.tsx similarity index 100% rename from src/Search/SearchResultList.tsx rename to src/renderer/Search/SearchResultList.tsx diff --git a/src/Search/SearchResultListItem.tsx b/src/renderer/Search/SearchResultListItem.tsx similarity index 100% rename from src/Search/SearchResultListItem.tsx rename to src/renderer/Search/SearchResultListItem.tsx diff --git a/src/Search/index.ts b/src/renderer/Search/index.ts similarity index 100% rename from src/Search/index.ts rename to src/renderer/Search/index.ts diff --git a/src/Settings/Header.tsx b/src/renderer/Settings/Header.tsx similarity index 100% rename from src/Settings/Header.tsx rename to src/renderer/Settings/Header.tsx diff --git a/src/Settings/Navigation.tsx b/src/renderer/Settings/Navigation.tsx similarity index 100% rename from src/Settings/Navigation.tsx rename to src/renderer/Settings/Navigation.tsx diff --git a/src/Settings/Pages/About.tsx b/src/renderer/Settings/Pages/About.tsx similarity index 100% rename from src/Settings/Pages/About.tsx rename to src/renderer/Settings/Pages/About.tsx diff --git a/src/Settings/Pages/Appearance.tsx b/src/renderer/Settings/Pages/Appearance.tsx similarity index 100% rename from src/Settings/Pages/Appearance.tsx rename to src/renderer/Settings/Pages/Appearance.tsx diff --git a/src/Settings/Pages/General.tsx b/src/renderer/Settings/Pages/General.tsx similarity index 100% rename from src/Settings/Pages/General.tsx rename to src/renderer/Settings/Pages/General.tsx diff --git a/src/Settings/Pages/Plugins.tsx b/src/renderer/Settings/Pages/Plugins.tsx similarity index 100% rename from src/Settings/Pages/Plugins.tsx rename to src/renderer/Settings/Pages/Plugins.tsx diff --git a/src/Settings/Pages/SearchEngine.tsx b/src/renderer/Settings/Pages/SearchEngine.tsx similarity index 100% rename from src/Settings/Pages/SearchEngine.tsx rename to src/renderer/Settings/Pages/SearchEngine.tsx diff --git a/src/Settings/Pages/Window.tsx b/src/renderer/Settings/Pages/Window.tsx similarity index 100% rename from src/Settings/Pages/Window.tsx rename to src/renderer/Settings/Pages/Window.tsx diff --git a/src/Settings/Pages/index.tsx b/src/renderer/Settings/Pages/index.tsx similarity index 100% rename from src/Settings/Pages/index.tsx rename to src/renderer/Settings/Pages/index.tsx diff --git a/src/Settings/Section.tsx b/src/renderer/Settings/Section.tsx similarity index 100% rename from src/Settings/Section.tsx rename to src/renderer/Settings/Section.tsx diff --git a/src/Settings/SectionList.tsx b/src/renderer/Settings/SectionList.tsx similarity index 100% rename from src/Settings/SectionList.tsx rename to src/renderer/Settings/SectionList.tsx diff --git a/src/Settings/Settings.tsx b/src/renderer/Settings/Settings.tsx similarity index 100% rename from src/Settings/Settings.tsx rename to src/renderer/Settings/Settings.tsx diff --git a/src/Settings/index.ts b/src/renderer/Settings/index.ts similarity index 100% rename from src/Settings/index.ts rename to src/renderer/Settings/index.ts diff --git a/src/Theme/ThemeName.ts b/src/renderer/Theme/ThemeName.ts similarity index 100% rename from src/Theme/ThemeName.ts rename to src/renderer/Theme/ThemeName.ts diff --git a/src/Theme/getTheme.ts b/src/renderer/Theme/getTheme.ts similarity index 100% rename from src/Theme/getTheme.ts rename to src/renderer/Theme/getTheme.ts diff --git a/src/Theme/index.ts b/src/renderer/Theme/index.ts similarity index 100% rename from src/Theme/index.ts rename to src/renderer/Theme/index.ts diff --git a/src/ThemeContext.tsx b/src/renderer/ThemeContext.tsx similarity index 100% rename from src/ThemeContext.tsx rename to src/renderer/ThemeContext.tsx diff --git a/index.html b/src/renderer/index.html similarity index 94% rename from index.html rename to src/renderer/index.html index 9c2868eb..5477a431 100644 --- a/index.html +++ b/src/renderer/index.html @@ -32,6 +32,6 @@
- + diff --git a/src/index.tsx b/src/renderer/index.tsx similarity index 100% rename from src/index.tsx rename to src/renderer/index.tsx diff --git a/src/renderer/tsconfig.json b/src/renderer/tsconfig.json new file mode 100644 index 00000000..21682dc7 --- /dev/null +++ b/src/renderer/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "../../tsconfig.renderer.json", + "include": [".", "../common"] +} diff --git a/src/vite-env.d.ts b/src/renderer/vite-env.d.ts similarity index 100% rename from src/vite-env.d.ts rename to src/renderer/vite-env.d.ts diff --git a/src/window.d.ts b/src/renderer/window.d.ts similarity index 100% rename from src/window.d.ts rename to src/renderer/window.d.ts diff --git a/tsconfig.node.json b/tsconfig.node.json index eb3fb307..0d70d007 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -5,9 +5,9 @@ "moduleResolution": "Node", "resolveJsonModule": true, "allowSyntheticDefaultImports": true, + "rootDir": "./src", "paths": { - "@common/*": ["./common/*"] + "@common/*": ["./src/common/*"] } - }, - "include": ["vite.config.ts", "package.json", "electron", "common"] + } } diff --git a/tsconfig.json b/tsconfig.renderer.json similarity index 84% rename from tsconfig.json rename to tsconfig.renderer.json index 87ed38eb..4e017cc5 100644 --- a/tsconfig.json +++ b/tsconfig.renderer.json @@ -15,10 +15,9 @@ "isolatedModules": true, "noEmit": true, "jsx": "react-jsx", - "baseUrl": "./", + "rootDir": "./src", "paths": { - "@common/*": ["./common/*"] + "@common/*": ["./src/common/*"] } - }, - "include": ["src", "common"] + } } diff --git a/vite.config.ts b/vite.config.ts index dc0b9dd9..bfaee336 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,34 +1,37 @@ import react from "@vitejs/plugin-react"; import { rmSync } from "fs"; import { join } from "path"; -import { AliasOptions, defineConfig, type ConfigEnv, type ServerOptions, type UserConfig } from "vite"; +import { defineConfig, type AliasOptions } from "vite"; import electron from "vite-plugin-electron"; import renderer from "vite-plugin-electron-renderer"; import pkg from "./package.json"; -export default defineConfig(({ command }: ConfigEnv): UserConfig => { - rmSync("dist-electron", { recursive: true, force: true }); +export default defineConfig(({ command }) => { + rmSync("dist-main", { recursive: true, force: true }); + rmSync("dist-preload", { recursive: true, force: true }); const isServe = command === "serve"; const isBuild = command === "build"; - const sourcemap = isServe; + const sourcemap = isServe ? "inline" : undefined; const resolve: { alias: AliasOptions } = { alias: { - "@common": join(__dirname, "common"), + "@common": join(__dirname, "src", "common"), }, }; return { + root: "src/renderer", resolve, build: { + outDir: "../../dist-renderer", chunkSizeWarningLimit: 1000, }, plugins: [ react(), electron([ { - entry: "electron/main/index.ts", + entry: "src/main/index.ts", onstart(options) { options.startup(); }, @@ -37,7 +40,7 @@ export default defineConfig(({ command }: ConfigEnv): UserConfig => { build: { sourcemap, minify: isBuild, - outDir: "dist-electron/main", + outDir: "dist-main", rollupOptions: { external: Object.keys("dependencies" in pkg ? pkg.dependencies : {}), }, @@ -45,7 +48,7 @@ export default defineConfig(({ command }: ConfigEnv): UserConfig => { }, }, { - entry: "electron/preload/index.ts", + entry: "src/preload/index.ts", onstart(options) { // Notify the Renderer-Process to reload the page when the Preload-Scripts build is complete, // instead of restarting the entire Electron App. @@ -54,9 +57,9 @@ export default defineConfig(({ command }: ConfigEnv): UserConfig => { vite: { resolve, build: { - sourcemap: sourcemap ? "inline" : undefined, + sourcemap, minify: isBuild, - outDir: "dist-electron/preload", + outDir: "dist-preload", rollupOptions: { external: Object.keys("dependencies" in pkg ? pkg.dependencies : {}), }, @@ -66,12 +69,10 @@ export default defineConfig(({ command }: ConfigEnv): UserConfig => { ]), renderer(), ], - server: ((): ServerOptions => { - return { - host: "127.0.0.1", - port: 7777, - }; - })(), + server: (() => ({ + host: "127.0.0.1", + port: 7777, + }))(), clearScreen: false, }; });