Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(vite-plugin-vue-i18n): support vue-i18n-bridge module detection #182

Merged
merged 1 commit into from
Sep 26, 2022
+20 −5
Merged

fix(vite-plugin-vue-i18n): support vue-i18n-bridge module detection #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions packages/vite-plugin-vue-i18n/src/check.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// eslint-disable-next-line @typescript-eslint/ban-types
export function checkVueI18nBridgeInstallPackage(debug: Function): boolean {
let ret = false
try {
debug(`vue-i18n-bridge load path: ${require.resolve('vue-i18n-bridge')}`)
ret = true
} catch (e) {
debug(`cannot find 'vue-i18n-bridge'`, e)
}
return ret
}
14 changes: 9 additions & 5 deletions packages/vite-plugin-vue-i18n/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import createDebug from 'debug'
import { normalizePath } from 'vite'
import { RawSourceMap } from 'source-map'
import { parseVueRequest } from './query'
import { checkVueI18nBridgeInstallPackage } from './check'

import type { Plugin, ResolvedConfig, UserConfig } from 'vite'
import type { CodeGenOptions, DevEnv } from '@intlify/bundle-utils'
Expand All @@ -22,6 +23,7 @@ const debug = createDebug('vite-plugin-vue-i18n:index')
const INTLIFY_BUNDLE_IMPORT_ID = '@intlify/vite-plugin-vue-i18n/messages'

const installedPkg = checkInstallPackage('@intlify/vite-plugin-vue-i18n', debug)
const installedVueI18nBridge = checkVueI18nBridgeInstallPackage(debug)

const VIRTUAL_PREFIX = '\0'

Expand Down Expand Up @@ -74,12 +76,14 @@ function pluginI18n(
`[vite-plugin-vue-i18n]: 'useVueI18nImportName' option is experimental`
)
}
// prettier-ignore
const getAliasName = () =>
installedPkg === 'petite-vue-i18n' &&
isBoolean(useVueI18nImportName) &&
useVueI18nImportName
? 'vue-i18n'
: `${installedPkg}`
installedVueI18nBridge && installedPkg === 'vue-i18n'
? 'vue-i18n-bridge'
: installedPkg === 'petite-vue-i18n' && isBoolean(useVueI18nImportName) &&
useVueI18nImportName
? 'vue-i18n'
: `${installedPkg}`
const forceStringify = !!options.forceStringify

let isProduction = false
Expand Down