Skip to content

Commit

Permalink
refactor: 升级 vue、typescript、eslint 相关依赖版本
Browse files Browse the repository at this point in the history
  • Loading branch information
yuntian001 committed Jan 12, 2024
1 parent a21ac98 commit 03374ff
Show file tree
Hide file tree
Showing 11 changed files with 3,407 additions and 3,286 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = {
'error',
{
selector: 'default',
format: ['camelCase'],
format: ['camelCase', 'PascalCase'],
leadingUnderscore: 'allowSingleOrDouble',
filter: {
// you can expand this regex to add more allowed names
Expand Down
6,648 changes: 3,384 additions & 3,264 deletions package-lock.json

Large diffs are not rendered by default.

23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@meadmin-cn/vite-plugin-mock": "^2.9.7",
"@vue/shared": "^3.2.25",
"@vueuse/core": "^9.1.0",
"axios": "^0.27.2",
"axios": "^1.6.5",
"dayjs": "^1.11.3",
"element-plus": "^2.2.25",
"jquery": "^3.6.0",
Expand All @@ -39,7 +39,7 @@
"path-browserify": "^1.0.1",
"pinia": "^2.0.14",
"qs": "^6.11.0",
"vue": "^3.3.2",
"vue": "^3.4.10",
"vue-i18n": "^9.1.10",
"vue-request": "^2.0.1",
"vue-router": "^4.1.1"
Expand All @@ -52,7 +52,7 @@
"@babel/runtime": "^7.21.0",
"@commitlint/cli": "^17.0.3",
"@commitlint/config-conventional": "^17.0.3",
"@release-it/conventional-changelog": "^5.0.0",
"@release-it/conventional-changelog": "^8.0.1",
"@rollup/plugin-babel": "^5.3.1",
"@types/jquery": "^3.5.14",
"@types/js-cookie": "^3.0.2",
Expand All @@ -62,10 +62,10 @@
"@types/nprogress": "^0.2.0",
"@types/path-browserify": "^1.0.0",
"@types/qs": "^6.9.7",
"@typescript-eslint/eslint-plugin": "^5.59.5",
"@typescript-eslint/parser": "^5.59.5",
"@vitejs/plugin-vue": "^4.5.2",
"@vue/eslint-config-typescript": "^11.0.0",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"@vitejs/plugin-vue": "^5.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@yuntian001/vue-setup-extend": "^1.0.0",
"autoprefixer": "^10.4.8",
"core-js": "^3.25.3",
Expand All @@ -76,7 +76,7 @@
"lint-staged": "^13.0.3",
"postcss-plugin-px2rem": "^0.8.1",
"prettier": "2.8.8",
"release-it": "^15.1.1",
"release-it": "^17.0.1",
"rollup-plugin-visualizer": "^5.7.1",
"sass": "^1.53.0",
"terser": "^5.14.2",
Expand All @@ -88,8 +88,8 @@
"vite-plugin-autogeneration-import-file": "^3.0.0",
"vite-plugin-compression": "^0.5.1",
"vite-svg-loader": "^3.4.0",
"vue-eslint-parser": "^9.3.0",
"vue-tsc": "^1.8.24",
"vue-eslint-parser": "^9.3.1",
"vue-tsc": "^1.8.27",
"xregexp": "^5.1.1"
},
"repository": {
Expand All @@ -104,5 +104,8 @@
"lint-staged": {
"**/*": "prettier --cache --write --ignore-unknown",
"*.{vue,ts,tsx}": "eslint --cache --fix"
},
"engines": {
"node": ">=20.10.0"
}
}
1 change: 0 additions & 1 deletion src/components/meSettingMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ const clear = () => {
setting.clearCache();
userStore.logOut();
};
const activeColor = computed(() => themeConfig.value.primaryColor);
</script>
<style lang="scss" scoped>
.content {
Expand Down
2 changes: 1 addition & 1 deletion src/event/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ interface Events {
}; // 路由变更后
[EventEnum.BEFORE_LOCAL_CHANGE]: {
locale: string;
i18n: Composer<unknown, unknown, unknown>;
i18n: Composer<Record<string, any>, Record<string, any>, Record<string, any>, any>;
}; // 全局语言变更前
[EventEnum.INIT_DYNAMIC_VIEWS_MODULES]: DynamicViewsModules;
}
Expand Down
1 change: 0 additions & 1 deletion src/layout/components/header/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<script setup lang="ts" name="LayoutHeader">
import { useSettingStore } from '@/store';
import TopBar from './components/topBar/index.vue';
import TagBar from './components/tagBar/index.vue';
const { themeConfig } = storeToRefs(useSettingStore());
</script>
<style lang="scss" scoped>
Expand Down
2 changes: 1 addition & 1 deletion src/layout/components/menu/components/menuItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</template>
<script setup lang="ts" name="MenuItem">
import { useRouteStore, useSettingStore } from '@/store';
import { useRouteStore } from '@/store';
import { RouteRecordRaw } from 'vue-router';
const routeStore = useRouteStore();
const props = defineProps<{ item: RouteRecordRaw; noChild?: boolean; collapse?: boolean }>();
Expand Down
2 changes: 1 addition & 1 deletion src/locales/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { loading, closeLoading } from '@/utils/loading';
import { Language } from 'element-plus/es/locale';
import { useGlobalStore, useSettingStore } from '@/store';
import log from '@/utils/log';
type GlobaleI18n = Composer<unknown, unknown, unknown, any>;
type GlobaleI18n = Composer<Record<string, any>, Record<string, any>, Record<string, any>, any>;
const messageMap: Map<string, Record<any, any>> = new Map();
export type MessageImport = [(locale: string) => Promise<{ default: LocaleMessages<VueMessageType> }>, string?];

Expand Down
4 changes: 2 additions & 2 deletions src/locales/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const useLocalesI18n = <Options extends UseI18nOptions = UseI18nOptions>(
) => {
const res = useI18n<Options>(Object.assign({ useScope: 'local' }, options));
if (messageImport) {
setLocaleMessage(res, res.locale.value, messageImport);
setLocaleMessage(res, res.locale.value!, messageImport);
mitter.on(
event.BEFORE_LOCAL_CHANGE,
(params) => {
Expand All @@ -47,7 +47,7 @@ export const asyncUseLocalesI18n = async <Options extends UseI18nOptions = UseI1
) => {
const res = useI18n<Options>(Object.assign({ useScope: 'local' }, options));
if (messageImport) {
await setLocaleMessage(res, res.locale.value, messageImport);
await setLocaleMessage(res, res.locale.value!, messageImport);
mitter.on(event.BEFORE_LOCAL_CHANGE, (params) => {
setLocaleMessage(res, params.locale, messageImport);
});
Expand Down
4 changes: 2 additions & 2 deletions src/store/modules/global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ mitter.on(event.RESIZE, () => {
});
export default defineStore('global', {
state: () => {
let _i18n: Composer<unknown, unknown, unknown>;
let _i18n: Composer;
return {
i18n: customRef((track, trigger) => {
return {
get() {
track(); // track 方法放在 get 中,用于提示这个数据是需要追踪变化的
return _i18n;
},
set(i18n: Composer<unknown, unknown, unknown>) {
set(i18n: Composer) {
if (!_i18n) {
// 只初始化一次值
_i18n = i18n;
Expand Down
4 changes: 2 additions & 2 deletions src/utils/request.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { closeLoading, loading } from '@/utils/loading';
import { useUserStore, useGlobalStore } from '@/store';
import axios, { AxiosRequestConfig } from 'axios';
import axios, { AxiosRequestConfig, AxiosRequestHeaders } from 'axios';
import { ElMessage } from 'element-plus';
import log from './log';
import { useRequest, Options, setGlobalOptions } from 'vue-request';
Expand All @@ -16,7 +16,7 @@ service.interceptors.request.use(
(config) => {
// 在发送请求之前做一些事情
if (!config.headers) {
config.headers = {};
config.headers = {} as AxiosRequestHeaders;
}
const userStore = useUserStore();
if (userStore.token) {
Expand Down

0 comments on commit 03374ff

Please sign in to comment.