canrd-outside / order-erp-front · Commits

Commit 5212ea79b43c832a5136354b549de8f89b6e2156

Authored by vben
1 parent cda0f9c1

fix: build error

Inline Side-by-side
Showing 3 changed files with 8 additions and 8 deletions
package.json
  View file @5212ea7
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 "stylelint-order": "^4.1.0", 111 "stylelint-order": "^4.1.0",
112 "ts-node": "^10.0.0", 112 "ts-node": "^10.0.0",
113 "typescript": "4.3.2", 113 "typescript": "4.3.2",
114 - "vite": "2.3.6", 114 + "vite": "2.3.3",
115 "vite-plugin-compression": "^0.2.5", 115 "vite-plugin-compression": "^0.2.5",
116 "vite-plugin-html": "^2.0.7", 116 "vite-plugin-html": "^2.0.7",
117 "vite-plugin-imagemin": "^0.3.2", 117 "vite-plugin-imagemin": "^0.3.2",
src/locales/useLocale.ts
  View file @5212ea7
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 */ 3 */
4 import type { LocaleType } from '/#/config'; 4 import type { LocaleType } from '/#/config';
5 5
6 -import { updateLocale } from 'moment'; 6 +import moment from 'moment';
7 7
8 import { i18n } from './setupI18n'; 8 import { i18n } from './setupI18n';
9 import { useLocaleStoreWithOut } from '/@/store/modules/locale'; 9 import { useLocaleStoreWithOut } from '/@/store/modules/locale';
@@ -56,7 +56,7 @@ export function useLocale() { @@ -56,7 +56,7 @@ export function useLocale() {
56 const { message, momentLocale, momentLocaleName } = langModule; 56 const { message, momentLocale, momentLocaleName } = langModule;
57 57
58 globalI18n.setLocaleMessage(locale, message); 58 globalI18n.setLocaleMessage(locale, message);
59 - updateLocale(momentLocaleName, momentLocale); 59 + moment.updateLocale(momentLocaleName, momentLocale);
60 loadLocalePool.push(locale); 60 loadLocalePool.push(locale);
61 61
62 setI18nLanguage(locale); 62 setI18nLanguage(locale);
yarn.lock
  View file @5212ea7
@@ -10662,12 +10662,12 @@ vite-plugin-windicss@^1.0.1: @@ -10662,12 +10662,12 @@ vite-plugin-windicss@^1.0.1:
10662 debug "^4.3.2" 10662 debug "^4.3.2"
10663 windicss "^3.1.0" 10663 windicss "^3.1.0"
10664 10664
10665 -vite@2.3.6:  
10666 - version "2.3.6"  
10667 - resolved "https://registry.npmjs.org/vite/-/vite-2.3.6.tgz#1f7cfde88a51a802d69000c7bac85d481c2e871c"  
10668 - integrity sha512-fsEpNKDHgh3Sn66JH06ZnUBnIgUVUtw6ucDhlOj1CEqxIkymU25yv1/kWDPlIjyYHnalr0cN6V+zzUJ+fmWHYw== 10665 +vite@2.3.3:
  10666 + version "2.3.3"
  10667 + resolved "https://registry.yarnpkg.com/vite/-/vite-2.3.3.tgz#7e88a71abd03985c647789938d784cce0ee3b0fd"
  10668 + integrity sha512-eO1iwRbn3/BfkNVMNJDeANAFCZ5NobYOFPu7IqfY7DcI7I9nFGjJIZid0EViTmLDGwwSUPmRAq3cRBbO3+DsMA==
10669 dependencies: 10669 dependencies:
10670 - esbuild "^0.12.5" 10670 + esbuild "^0.11.23"
10671 postcss "^8.2.10" 10671 postcss "^8.2.10"
10672 resolve "^1.19.0" 10672 resolve "^1.19.0"
10673 rollup "^2.38.5" 10673 rollup "^2.38.5"