Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ export const defaults: ModuleOptions = {
include: defaultInclude,
exclude: defaultExclude,
namespace: 'el',
defaultLocale: 'en',
appendTo: [],
installMethods: [],
icon: 'ElIcon'
Expand Down
4 changes: 2 additions & 2 deletions src/core/cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { camelize } from '../utils'

export function resolveCache (config: ModuleOptions) {
const { defaultLocale } = config
const locale = camelize(defaultLocale ?? '')
const locale = camelize(defaultLocale)

return {
filename: `${libraryName}-cache.mjs`,
getContents: () => {
return `export * from '${libraryName}';
${defaultLocale
${defaultLocale !== 'en'
? `import ${locale} from '${libraryName}/es/locale/lang/${defaultLocale}.mjs';
export { ${locale} };`
: ''}`
Expand Down
4 changes: 2 additions & 2 deletions src/core/globalConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { camelize, resolveComponentPath } from '../utils'

export function resolveGlobalConfig (config: ModuleOptions) {
const { globalConfig, cache, defaultLocale } = config
const needLocale = !!(cache && defaultLocale)
const locale = camelize(defaultLocale ?? '')
const needLocale = !!(cache && defaultLocale !== 'en')
const locale = camelize(defaultLocale)
let provideConfig = JSON.stringify(globalConfig)

if (needLocale) {
Expand Down
4 changes: 2 additions & 2 deletions src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default defineNuxtModule<ModuleOptions>({
transformDirectives: name => resolveDirectives(options, name)
}))

if (options.defaultLocale && options.defaultLocale !== 'en') {
if (options.defaultLocale !== 'en') {
config.plugins.push(localePlugin.vite({
sourcemap: nuxt.options.sourcemap[mode],
locale: options.defaultLocale
Expand All @@ -88,7 +88,7 @@ export default defineNuxtModule<ModuleOptions>({
transformDirectives: name => resolveDirectives(options, name)
}))

if (options.defaultLocale && options.defaultLocale !== 'en') {
if (options.defaultLocale !== 'en') {
config.plugins.push(localePlugin.webpack({
sourcemap: nuxt.options.sourcemap[mode],
locale: options.defaultLocale
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export interface ModuleOptions extends TransformOptions {
* @default 'en'
* @example 'zh-cn'
*/
defaultLocale?: string
defaultLocale: string
/**
* Set global configuration, such as modifying the default size and z-index of the component.
*
Expand Down