From 2c8a66ed9dd379bfd976e31ae9ca220694858cb2 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 18 Dec 2022 11:03:08 -0800 Subject: [PATCH] feat: :package: upgrade to vite 4 --- package.json | 10 ++-- packages/backend/package.json | 50 +++++++++---------- .../backend/src/server/web/views/base.pug | 8 ++- packages/client/package.json | 36 ++++++------- packages/client/src/init.ts | 3 ++ packages/sw/package.json | 2 +- 6 files changed, 55 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 6c1bb6332..e9794c30a 100644 --- a/package.json +++ b/package.json @@ -45,12 +45,12 @@ "@bull-board/ui": "^4.6.4", "@tensorflow/tfjs": "^3.21.0", "calckey-js": "^0.0.17", - "eslint": "^8.28.0", + "eslint": "^8.30.0", "execa": "5.1.1", "gulp": "4.0.2", "gulp-cssnano": "2.1.3", "gulp-rename": "2.0.0", - "gulp-replace": "1.1.3", + "gulp-replace": "1.1.4", "gulp-terser": "2.1.0", "js-yaml": "4.1.0", "long": "^5.2.1", @@ -60,11 +60,11 @@ "devDependencies": { "@types/gulp": "4.0.10", "@types/gulp-rename": "2.0.1", - "@typescript-eslint/parser": "5.43.0", + "@typescript-eslint/parser": "5.46.1", "cross-env": "7.0.3", "cypress": "10.11.0", - "start-server-and-test": "1.14.0", - "typescript": "4.9.3", + "start-server-and-test": "1.15.2", + "typescript": "4.9.4", "vue-eslint-parser": "^9.1.0" } } diff --git a/packages/backend/package.json b/packages/backend/package.json index cb34d142a..695fc57d6 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -28,7 +28,7 @@ "@discordapp/twemoji": "14.0.2", "@elastic/elasticsearch": "7.17.0", "@koa/cors": "3.4.3", - "@koa/multer": "3.0.0", + "@koa/multer": "3.0.2", "@koa/router": "9.4.0", "@peertube/http-signature": "1.7.0", "@sinonjs/fake-timers": "9.1.2", @@ -37,14 +37,14 @@ "archiver": "5.3.1", "autobind-decorator": "2.4.0", "autwh": "0.1.0", - "aws-sdk": "2.1258.0", + "aws-sdk": "2.1277.0", "bcryptjs": "2.4.3", "blurhash": "1.1.5", - "bull": "4.10.1", + "bull": "4.10.2", "cacheable-lookup": "7.0.0", "calckey-js": "^0.0.17", "cbor": "8.1.0", - "chalk": "5.1.2", + "chalk": "5.2.0", "chalk-template": "0.4.0", "chokidar": "3.5.3", "cli-highlight": "2.1.11", @@ -62,12 +62,12 @@ "ip-cidr": "3.0.11", "is-svg": "4.3.2", "js-yaml": "4.1.0", - "jsdom": "20.0.2", - "json5": "2.2.1", + "jsdom": "20.0.3", + "json5": "2.2.2", "json5-loader": "4.0.1", "jsonld": "6.0.0", - "jsrsasign": "10.6.0", - "koa": "2.13.4", + "jsrsasign": "10.6.1", + "koa": "2.14.1", "koa-bodyparser": "4.3.0", "koa-favicon": "2.1.0", "koa-json-body": "5.3.0", @@ -78,7 +78,7 @@ "koa-views": "7.0.2", "mfm-js": "0.23.0", "mime-types": "2.1.35", - "mocha": "10.1.0", + "mocha": "10.2.0", "multer": "1.4.4-lts.1", "nested-property": "4.0.0", "node-fetch": "3.3.0", @@ -86,7 +86,7 @@ "nsfwjs": "2.4.2", "oauth": "^0.10.0", "os-utils": "0.0.14", - "parse5": "7.1.1", + "parse5": "7.1.2", "pg": "8.8.0", "private-ip": "2.3.4", "probe-image-size": "7.2.3", @@ -97,14 +97,14 @@ "qrcode": "1.5.1", "random-seed": "0.3.0", "ratelimiter": "3.4.1", - "re2": "1.17.7", + "re2": "1.18.0", "redis-lock": "0.1.4", "reflect-metadata": "0.1.13", "rename": "1.0.4", "rndstr": "1.0.0", "rss-parser": "3.12.0", "s-age": "1.1.2", - "sanitize-html": "2.7.3", + "sanitize-html": "2.8.0", "semver": "7.3.8", "sharp": "0.31.2", "speakeasy": "2.0.0", @@ -112,16 +112,16 @@ "stringz": "2.1.0", "summaly": "2.7.0", "syslog-pro": "1.0.0", - "systeminformation": "5.13.5", + "systeminformation": "5.16.6", "tesseract.js": "^3.0.3", "tinycolor2": "1.4.2", "tmp": "0.2.1", - "ts-loader": "9.4.1", + "ts-loader": "9.4.2", "ts-node": "10.9.1", - "tsc-alias": "1.7.1", - "tsconfig-paths": "4.1.0", + "tsc-alias": "1.8.2", + "tsconfig-paths": "4.1.1", "twemoji-parser": "14.0.0", - "typeorm": "0.3.10", + "typeorm": "0.3.11", "ulid": "2.3.0", "unzipper": "0.10.11", "uuid": "9.0.0", @@ -139,7 +139,7 @@ "@types/fluent-ffmpeg": "2.1.20", "@types/js-yaml": "4.0.5", "@types/jsdom": "20.0.1", - "@types/jsonld": "1.5.7", + "@types/jsonld": "1.5.8", "@types/jsrsasign": "10.5.4", "@types/koa": "2.13.5", "@types/koa-bodyparser": "4.3.10", @@ -153,9 +153,9 @@ "@types/koa__multer": "2.0.4", "@types/koa__router": "8.0.11", "@types/mocha": "9.1.1", - "@types/node": "18.11.9", + "@types/node": "18.11.17", "@types/node-fetch": "3.0.3", - "@types/nodemailer": "6.4.6", + "@types/nodemailer": "6.4.7", "@types/oauth": "0.9.1", "@types/pug": "2.0.6", "@types/punycode": "2.1.0", @@ -164,7 +164,7 @@ "@types/ratelimiter": "3.4.4", "@types/redis": "4.0.11", "@types/rename": "1.0.4", - "@types/sanitize-html": "2.6.2", + "@types/sanitize-html": "2.8.0", "@types/semver": "7.3.13", "@types/sharp": "0.31.0", "@types/sinonjs__fake-timers": "8.1.2", @@ -175,12 +175,12 @@ "@types/web-push": "3.3.2", "@types/websocket": "1.0.5", "@types/ws": "8.5.3", - "@typescript-eslint/eslint-plugin": "5.43.0", - "@typescript-eslint/parser": "5.43.0", + "@typescript-eslint/eslint-plugin": "5.46.1", + "@typescript-eslint/parser": "5.46.1", "cross-env": "7.0.3", - "eslint": "8.28.0", + "eslint": "8.30.0", "eslint-plugin-import": "2.26.0", "execa": "6.1.0", - "typescript": "4.9.3" + "typescript": "4.9.4" } } diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index d4ffdd63e..25c2cb38e 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -41,11 +41,9 @@ html link(rel='stylesheet' href=`/static-assets/instance.css?${ timestamp }`) link(rel='modulepreload' href=`/assets/${clientEntry.file}`) - each href in clientEntry.css - link(rel='preload' href=`/assets/${href}` as='style') - - each href in clientEntry.css - link(rel='preload' href=`/assets/${href}` as='style') + if Array.isArray(clientEntry.css) + each href in clientEntry.css + link(rel='stylesheet' href=`/assets/${href}`) title block title diff --git a/packages/client/package.json b/packages/client/package.json index d8d57ddde..8aaece884 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -12,7 +12,7 @@ "@rollup/plugin-json": "4.1.0", "@rollup/pluginutils": "^4.2.1", "@syuilo/aiscript": "0.11.1", - "@vitejs/plugin-vue": "3.2.0", + "@vitejs/plugin-vue": "4.0.0", "@vue/compiler-sfc": "3.2.45", "autobind-decorator": "2.4.0", "autosize": "5.0.2", @@ -20,7 +20,7 @@ "broadcast-channel": "4.18.1", "browser-image-resizer": "https://github.com/misskey-dev/browser-image-resizer.git#commit=0380d12c8e736788ea7f4e6e985175521ea7b23c", "calckey-js": "^0.0.17", - "chart.js": "4.0.1", + "chart.js": "4.1.1", "chartjs-adapter-date-fns": "2.0.1", "chartjs-plugin-gradient": "0.5.1", "chartjs-plugin-zoom": "1.2.1", @@ -31,33 +31,33 @@ "eventemitter3": "4.0.7", "idb-keyval": "6.2.0", "insert-text-at-cursor": "0.3.0", - "json5": "2.2.1", - "katex": "0.16.3", + "json5": "2.2.2", + "katex": "0.16.4", "matter-js": "0.18.0", "mfm-js": "0.23.0", - "photoswipe": "5.3.3", + "photoswipe": "5.3.4", "prismjs": "1.29.0", "punycode": "2.1.1", "querystring": "0.2.1", "rndstr": "1.0.0", "s-age": "1.1.2", - "sass": "1.56.1", + "sass": "1.57.0", "seedrandom": "3.0.5", "strict-event-emitter-types": "2.0.0", "stringz": "2.1.0", - "swiper": "^8.4.4", + "swiper": "^8.4.5", "syuilo-password-strength": "0.0.1", "textarea-caret": "3.1.0", "three": "0.146.0", "throttle-debounce": "5.0.0", "tinycolor2": "1.4.2", - "tsc-alias": "1.7.1", - "tsconfig-paths": "4.1.0", + "tsc-alias": "1.8.2", + "tsconfig-paths": "4.1.1", "twemoji-parser": "14.0.0", - "typescript": "4.9.3", + "typescript": "4.9.4", "uuid": "9.0.0", - "vanilla-tilt": "1.7.3", - "vite": "^3.2.4", + "vanilla-tilt": "1.8.0", + "vite": "^4.0.2", "vue": "3.2.45", "vue-isyourpasswordsafe": "^2.0.0", "vue-plyr": "^7.0.0", @@ -76,14 +76,14 @@ "@types/throttle-debounce": "5.0.0", "@types/tinycolor2": "1.4.3", "@types/uuid": "8.3.4", - "@typescript-eslint/eslint-plugin": "5.43.0", - "@typescript-eslint/parser": "5.43.0", + "@typescript-eslint/eslint-plugin": "5.46.1", + "@typescript-eslint/parser": "5.46.1", "cross-env": "7.0.3", "cypress": "10.11.0", - "eslint": "8.28.0", + "eslint": "8.30.0", "eslint-plugin-import": "2.26.0", - "eslint-plugin-vue": "9.7.0", - "rollup": "2.79.1", - "start-server-and-test": "1.14.0" + "eslint-plugin-vue": "9.8.0", + "rollup": "3.7.5", + "start-server-and-test": "1.15.2" } } diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts index 8bff608e7..d25fca8af 100644 --- a/packages/client/src/init.ts +++ b/packages/client/src/init.ts @@ -2,6 +2,9 @@ * Client entry point */ +// https://vitejs.dev/config/build-options.html#build-modulepreload +import 'vite/modulepreload-polyfill'; + import '@/style.scss'; import '@/icons.scss'; diff --git a/packages/sw/package.json b/packages/sw/package.json index ea9b7e508..3b3f3d350 100644 --- a/packages/sw/package.json +++ b/packages/sw/package.json @@ -12,6 +12,6 @@ "idb-keyval": "^6.2.0" }, "devDependencies": { - "eslint": "^8.28.0" + "eslint": "^8.30.0" } }