diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a5292ea..24bed892 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,6 +19,8 @@ jobs: working-directory: ./renderer - run: yarn make-index-files working-directory: ./renderer + - run: yarn lint + working-directory: ./renderer - run: yarn build working-directory: ./renderer - uses: actions/upload-artifact@v3 diff --git a/renderer/.browserslistrc b/renderer/.browserslistrc deleted file mode 100644 index 5d234a09..00000000 --- a/renderer/.browserslistrc +++ /dev/null @@ -1 +0,0 @@ -chrome >= 76 diff --git a/renderer/.eslintignore b/renderer/.eslintignore deleted file mode 100644 index 6777f884..00000000 --- a/renderer/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -babel.config.js -postcss.config.js -tailwind.config.js -vue.config.js diff --git a/renderer/babel.config.js b/renderer/babel.config.js deleted file mode 100644 index bb5ee5e8..00000000 --- a/renderer/babel.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - presets: [ - '@vue/app' - ], - plugins: [ - '@babel/plugin-proposal-optional-chaining' - ] -} diff --git a/renderer/public/index.html b/renderer/index.html similarity index 56% rename from renderer/public/index.html rename to renderer/index.html index c7da42d9..8fc67e5a 100644 --- a/renderer/public/index.html +++ b/renderer/index.html @@ -5,14 +5,10 @@ - Awakened PoE Trade -
- + diff --git a/renderer/package.json b/renderer/package.json index fa23bc02..776848a9 100644 --- a/renderer/package.json +++ b/renderer/package.json @@ -3,19 +3,20 @@ "version": "0.0.0", "private": true, "scripts": { - "dev": "vue-cli-service serve", - "build": "vue-cli-service build", + "dev": "vite", + "lint": "eslint --ext .ts,.vue src", + "build": "vue-tsc --noEmit && vite build", "make-index-files": "node src/assets/make-index-files.mjs" }, "dependencies": { - "@bensjoberg/fnv1a": "3.0.0", "@fortawesome/fontawesome-free": "6.x.x", + "@sindresorhus/fnv1a": "^3.0.0", "animate.css": "^4.1.1", "apexcharts": "^3.23.1", "dot-prop": "7.x.x", "luxon": "2.x.x", "object-hash": "^3.0.0", - "tailwindcss": "2.x.x", + "tailwindcss": "3.x.x", "tippy.js": "^6.2.7", "vue": "3.2.x", "vue-i18n": "^9.1.0", @@ -23,30 +24,33 @@ "vuedraggable": "4.0.1" }, "devDependencies": { - "@intlify/vue-i18n-loader": "^4.0.0", + "@intlify/vite-plugin-vue-i18n": "^3.3.1", "@types/luxon": "^2.0.0", "@types/node": "^16.0.0", "@types/object-hash": "^2.0.0", "@typescript-eslint/eslint-plugin": "^5.0.0", "@typescript-eslint/parser": "^5.0.0", - "@vue/cli-plugin-eslint": "^5.0.0", - "@vue/cli-plugin-typescript": "^5.0.0", - "@vue/cli-service": "^5.0.0", - "@vue/compiler-sfc": "^3.0.0", + "@vitejs/plugin-vue": "^2.3.3", + "autoprefixer": "^10.0.2", "eslint": "^7.15.0", "eslint-config-standard-with-typescript": "^21.0.0", "eslint-plugin-import": "^2.20.2", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.0.0", - "eslint-plugin-vue": "^8.0.0", - "postcss-nested": "^5.0.3", - "typescript": "4.4.x" + "eslint-plugin-vue": "^9.1.1", + "postcss": "^8.2.14", + "typescript": "^4.5.4", + "vite": "^2.9.9", + "vue-tsc": "^0.37.0" }, "postcss": { "plugins": { + "tailwindcss/nesting": {}, "tailwindcss": {}, - "postcss-nested": {}, "autoprefixer": {} } - } + }, + "browserslist": [ + "chrome >= 101" + ] } diff --git a/renderer/public/favicon.ico b/renderer/public/favicon.ico deleted file mode 100644 index df36fcfb..00000000 Binary files a/renderer/public/favicon.ico and /dev/null differ diff --git a/renderer/src/assets/data/index.ts b/renderer/src/assets/data/index.ts index 7f582205..37d79a09 100644 --- a/renderer/src/assets/data/index.ts +++ b/renderer/src/assets/data/index.ts @@ -1,4 +1,4 @@ -import fnv1a from '@bensjoberg/fnv1a' +import fnv1a from '@sindresorhus/fnv1a' import type { BaseType, DropEntry, Stat, StatMatcher, TranslationDict } from './interfaces' import { AppConfig } from '@/web/Config' @@ -53,10 +53,10 @@ function ndjsonFindLines (ndjson: string) { } async function loadItems (language: string) { - const ndjson = await (await fetch(`${process.env.BASE_URL}data/${language}/items.ndjson`)).text() + const ndjson = await (await fetch(`${import.meta.env.BASE_URL}data/${language}/items.ndjson`)).text() const INDEX_WIDTH = 2 - const indexNames = new Uint32Array(await (await fetch(`${process.env.BASE_URL}data/${language}/items-name.index.bin`)).arrayBuffer()) - const indexRefNames = new Uint32Array(await (await fetch(`${process.env.BASE_URL}data/${language}/items-ref.index.bin`)).arrayBuffer()) + const indexNames = new Uint32Array(await (await fetch(`${import.meta.env.BASE_URL}data/${language}/items-name.index.bin`)).arrayBuffer()) + const indexRefNames = new Uint32Array(await (await fetch(`${import.meta.env.BASE_URL}data/${language}/items-ref.index.bin`)).arrayBuffer()) function commonFind (index: Uint32Array, prop: 'name' | 'refName') { return function (ns: BaseType['namespace'], name: string): BaseType[] | undefined { @@ -83,10 +83,10 @@ async function loadItems (language: string) { } async function loadStats (language: string) { - const ndjson = await (await fetch(`${process.env.BASE_URL}data/${language}/stats.ndjson`)).text() + const ndjson = await (await fetch(`${import.meta.env.BASE_URL}data/${language}/stats.ndjson`)).text() const INDEX_WIDTH = 2 - const indexRef = new Uint32Array(await (await fetch(`${process.env.BASE_URL}data/${language}/stats-ref.index.bin`)).arrayBuffer()) - const indexMatcher = new Uint32Array(await (await fetch(`${process.env.BASE_URL}data/${language}/stats-matcher.index.bin`)).arrayBuffer()) + const indexRef = new Uint32Array(await (await fetch(`${import.meta.env.BASE_URL}data/${language}/stats-ref.index.bin`)).arrayBuffer()) + const indexMatcher = new Uint32Array(await (await fetch(`${import.meta.env.BASE_URL}data/${language}/stats-matcher.index.bin`)).arrayBuffer()) STAT_BY_REF = function (ref: string) { let start = dataBinarySearch(indexRef, Number(fnv1a(ref, { size: 32 })), 0, INDEX_WIDTH) @@ -136,8 +136,8 @@ export function stat (text: string) { } { /* eslint-disable no-eval */ - CLIENT_STRINGS = (await eval(`import('${process.env.BASE_URL}data/${language}/client_strings.js')`)).default - CLIENT_STRINGS_REF = (await eval(`import('${process.env.BASE_URL}data/en/client_strings.js')`)).default - ITEM_DROP = await (await fetch(`${process.env.BASE_URL}data/item-drop.json`)).json() + CLIENT_STRINGS = (await import(/* @vite-ignore */`${import.meta.env.BASE_URL}data/${language}/client_strings.js`)).default + CLIENT_STRINGS_REF = (await import(/* @vite-ignore */`${import.meta.env.BASE_URL}data/en/client_strings.js`)).default + ITEM_DROP = await (await fetch(`${import.meta.env.BASE_URL}data/item-drop.json`)).json() } })() diff --git a/renderer/src/assets/make-index-files.mjs b/renderer/src/assets/make-index-files.mjs index d5fe6847..3ebc9fc5 100644 --- a/renderer/src/assets/make-index-files.mjs +++ b/renderer/src/assets/make-index-files.mjs @@ -1,6 +1,6 @@ // @ts-check -import fnv1a from '@bensjoberg/fnv1a' +import fnv1a from '@sindresorhus/fnv1a' import fs from 'fs' import path from 'path' diff --git a/renderer/src/main.ts b/renderer/src/main.ts index 3ba90c17..f1919130 100644 --- a/renderer/src/main.ts +++ b/renderer/src/main.ts @@ -2,7 +2,6 @@ import { createApp } from 'vue' import App from './web/App.vue' import i18n from './web/i18n' import uiComponents from './web/ui' -import 'animate.css/animate.css' ;(async function () { createApp(App) diff --git a/renderer/src/web/App.vue b/renderer/src/web/App.vue index dcc8cc02..c2a43d00 100644 --- a/renderer/src/web/App.vue +++ b/renderer/src/web/App.vue @@ -14,7 +14,8 @@ export default defineComponent({