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(unplugin-vue-i18n): port vue-i18n-bridge module detecting from vite-plugin-vue-i18n #184

Merged
merged 1 commit into from
Sep 26, 2022
Merged

fix(unplugin-vue-i18n): port vue-i18n-bridge module detecting from vite-plugin-vue-i18n #184

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
6 changes: 5 additions & 1 deletion packages/unplugin-vue-i18n/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@
},
"peerDependencies": {
"petite-vue-i18n": "*",
"vue-i18n": "*"
"vue-i18n": "*",
"vue-i18n-bridge": "*"
},
"peerDependenciesMeta": {
"petite-vue-i18n": {
"optional": true
},
"vue-i18n": {
"optional": true
},
"vue-i18n-bridge": {
"optional": true
}
},
"dependencies": {
Expand Down
11 changes: 11 additions & 0 deletions packages/unplugin-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/unplugin-vue-i18n/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { parse } from '@vue/compiler-sfc'
import { parseVueRequest, VueQuery } from './query'
import { createBridgeCodeGenerator } from './legacy'
import { getRaw, warn, error, raiseError } from './utils'
import { checkVueI18nBridgeInstallPackage } from './check'

import type { UnpluginContextMeta, UnpluginOptions } from 'unplugin'
import type { PluginOptions } from './types'
Expand All @@ -36,6 +37,7 @@ const VIRTUAL_PREFIX = '\0'
const debug = createDebug('unplugin-vue-i18n')

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

export const unplugin = createUnplugin<PluginOptions>((options = {}, meta) => {
debug('plugin options:', options, meta.framework)
Expand Down Expand Up @@ -93,12 +95,14 @@ export const unplugin = createUnplugin<PluginOptions>((options = {}, meta) => {
}
debug('useVueI18nImportName', useVueI18nImportName)

// 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 esm = isBoolean(options.esm) ? options.esm : true
debug('esm', esm)
Expand Down
3 changes: 3 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,11 +912,14 @@ __metadata:
peerDependencies:
petite-vue-i18n: "*"
vue-i18n: "*"
vue-i18n-bridge: "*"
peerDependenciesMeta:
petite-vue-i18n:
optional: true
vue-i18n:
optional: true
vue-i18n-bridge:
optional: true
languageName: unknown
linkType: soft

Expand Down