[client] Fix vite CJS deprecation errors

This commit is contained in:
Laura Hausmann 2023-12-04 19:21:15 +01:00
parent e8057d890e
commit 731e29c832
No known key found for this signature in database
GPG Key ID: D044E84C5BE01605
5 changed files with 93 additions and 4 deletions

View File

@ -8,7 +8,7 @@ const replace = require("gulp-replace");
const terser = require("gulp-terser"); const terser = require("gulp-terser");
const cssnano = require("gulp-cssnano"); const cssnano = require("gulp-cssnano");
const locales = require("./locales"); const locales = require("./locales/legacy.cjs");
const meta = require("./package.json"); const meta = require("./package.json");
const customDir = process.env.ICESHRIMP_CUSTOM_DIR ?? "./custom"; const customDir = process.env.ICESHRIMP_CUSTOM_DIR ?? "./custom";

View File

@ -2,8 +2,8 @@
* Languages Loader * Languages Loader
*/ */
const fs = require("fs"); import * as fs from 'node:fs';
const yaml = require("js-yaml"); import * as yaml from 'js-yaml';
const languages = []; const languages = [];
const languages_custom = []; const languages_custom = [];
const customDir = process.env.ICESHRIMP_CUSTOM_DIR ?? __dirname + "/../custom"; const customDir = process.env.ICESHRIMP_CUSTOM_DIR ?? __dirname + "/../custom";

88
locales/legacy.cjs Normal file
View File

@ -0,0 +1,88 @@
/**
* Languages Loader
*/
const fs = require("fs");
const yaml = require("js-yaml");
const languages = [];
const languages_custom = [];
const customDir = process.env.ICESHRIMP_CUSTOM_DIR ?? __dirname + "/../custom";
const merge = (...args) =>
args.reduce(
(a, c) => ({
...a,
...c,
...Object.entries(a)
.filter(([k]) => c && typeof c[k] === "object")
.reduce((a, [k, v]) => ((a[k] = merge(v, c[k])), a), {}),
}),
{},
);
fs.readdirSync(__dirname).forEach((file) => {
if (file.includes(".yml")) {
file = file.slice(0, file.indexOf("."));
languages.push(file);
}
});
fs.readdirSync(`${customDir}/locales`).forEach((file) => {
if (file.includes(".yml")) {
file = file.slice(0, file.indexOf("."));
languages_custom.push(file);
}
});
const primaries = {
en: "US",
ja: "JP",
zh: "CN",
};
// 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
const clean = (text) =>
text.replace(new RegExp(String.fromCodePoint(0x08), "g"), "");
const locales = languages.reduce(
(a, c) => (
(a[c] =
yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, "utf-8"))) ||
{}),
a
),
{},
);
const locales_custom = languages_custom.reduce(
(a, c) => (
(a[c] =
yaml.load(
clean(
fs.readFileSync(`${customDir}/locales/${c}.yml`, "utf-8"),
),
) || {}),
a
),
{},
);
Object.assign(locales, locales_custom);
module.exports = Object.entries(locales).reduce(
(a, [k, v]) => (
(a[k] = (() => {
const [lang] = k.split("-");
switch (k) {
case "en-US":
return v;
default:
return merge(
locales["en-US"],
locales[`${lang}-${primaries[lang]}`] || {},
v,
);
}
})()),
a
),
{},
);

View File

@ -9,6 +9,7 @@
"lint:vue": "paralint --ext .vue --fix '**/*.vue' --cache", "lint:vue": "paralint --ext .vue --fix '**/*.vue' --cache",
"format": "biome format * --write && prettier --write '**/*.{scss,vue}' --cache --cache-strategy metadata" "format": "biome format * --write && prettier --write '**/*.{scss,vue}' --cache --cache-strategy metadata"
}, },
"type": "module",
"devDependencies": { "devDependencies": {
"@discordapp/twemoji": "14.1.2", "@discordapp/twemoji": "14.1.2",
"@eslint-sets/eslint-config-vue3": "^5.6.1", "@eslint-sets/eslint-config-vue3": "^5.6.1",

View File

@ -1,6 +1,6 @@
const webpack = require("webpack"); const webpack = require("webpack");
const path = require("path"); const path = require("path");
const locales = require("../../locales"); const locales = require("../../locales/legacy.cjs");
const meta = require("../../package.json"); const meta = require("../../package.json");
const isProduction = process.env.NODE_ENV === "production"; const isProduction = process.env.NODE_ENV === "production";