fix: use @intlify/utils in getLocale (#68)

Author: kazupon

package.json

@@ -21,6 +21,7 @@
     "@intlify/bundle-utils": "^7.3.0",
     "@intlify/core": "^9.4.1",
     "@intlify/shared": "^9.4.1",
+    "@intlify/utils": "0.4.2",
     "@vue/compiler-sfc": "^3.3.4",
     "colorette": "^2.0.20",
     "cosmiconfig": "^7.1.0",

pnpm-lock.yaml

@@ -0,0 +1,8 @@
+declare namespace NodeJS {
+  interface ProcessEnv {
+    LC_ALL?: string
+    LC_MESSAGES?: string
+    LANG?: string
+    LANGUAGE?: string
+  }
+}

src/env.d.ts

@@ -2,6 +2,7 @@ import path from 'pathe'
 import { promises as fs } from 'fs'
 import { isString } from '@intlify/shared'
 import { createCoreContext, translate } from '@intlify/core'
+import { getNavigatorLanguage } from '@intlify/utils/node'
 import createDebug from 'debug'
 import i18nResourceSchema from '../locales/en.json'
 
@@ -48,13 +49,8 @@ async function loadI18nResources(): Promise<
   )
 }
 
-export function getLocale(env?: Record<string, unknown>): Locale {
-  env = env || process.env
-  const raw =
-    ((env.LC_ALL || env.LC_MESSAGES || env.LANG || env.LANGUAGE) as string) ||
-    DEFAULT_LOCALE
-  debug('getLocale', raw)
-  return raw.replace(/\.UTF\-8/g, '').replace(/_/g, '-')
+export function getLocale(): Locale {
+  return getNavigatorLanguage() || DEFAULT_LOCALE
 }
 
 export function t<Key extends keyof I18nReousrceSchema>(

src/i18n.ts

@@ -10,7 +10,8 @@ import { initI18n } from '../../src/i18n'
 const __dirname = dirname(fileURLToPath(import.meta.url))
 const CWD = resolve(__dirname, '../../')
 
-let orgCwd
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let orgCwd: any
 beforeEach(async function () {
   await initI18n()
   orgCwd = process.cwd

test/commands/annotate.test.ts

@@ -10,7 +10,8 @@ import { initI18n } from '../../src/i18n'
 const __dirname = dirname(fileURLToPath(import.meta.url))
 const CWD = resolve(__dirname, '../../')
 
-let orgCwd
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let orgCwd: any
 beforeEach(async () => {
   await initI18n()
   orgCwd = process.cwd

test/commands/compile.test.ts

@@ -1,44 +1,23 @@
-import { assert, beforeEach, afterEach, describe, it } from 'vitest'
+import { afterEach, describe, test, vi, expect } from 'vitest'
 import { getLocale } from '../src/i18n'
 
-let ORG_ENV = {}
-
-beforeEach(function () {
-  ORG_ENV = process.env
-  process.env = {}
-})
-
-afterEach(function () {
-  process.env = ORG_ENV
+afterEach(() => {
+  vi.resetAllMocks()
 })
 
-describe('getLocale', function () {
-  it('default', function () {
-    assert.equal(getLocale(), 'en-US')
-  })
-
-  it('LC_ALL', function () {
-    process.env['LC_ALL'] = 'ja_JP'
-    assert.equal(getLocale(), 'ja-JP')
-  })
-
-  it('LC_MESSAGES', function () {
-    process.env['LC_MESSAGES'] = 'ja_JP'
-    assert.equal(getLocale(), 'ja-JP')
-  })
-
-  it('LANG', function () {
-    process.env['LANG'] = 'ja_JP'
-    assert.equal(getLocale(), 'ja-JP')
-  })
-
-  it('LANGUAGE', function () {
-    process.env['LANGUAGE'] = 'ja_JP'
-    assert.equal(getLocale(), 'ja-JP')
+describe('getLocale', () => {
+  test('default value', () => {
+    vi.spyOn(process, 'env', 'get').mockReturnValue({})
+    expect(getLocale()).toBe('en-US')
   })
 
-  it('BCP-47', function () {
-    process.env['LC_ALL'] = 'ja-JP'
-    assert.equal(getLocale(), 'ja-JP')
+  test('basic', () => {
+    vi.spyOn(process, 'env', 'get').mockReturnValue({
+      LC_ALL: 'en-GB',
+      LC_MESSAGES: 'en-US',
+      LANG: 'ja-JP',
+      LANGUAGE: 'en'
+    })
+    expect(getLocale()).toBe('en-GB')
   })
 })

test/i18n.test.ts

@@ -17,7 +17,7 @@
     // "composite": true,                     /* Enable project compilation */
     // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
     // "removeComments": true,                /* Do not emit comments to output. */
-    // "noEmit": true,                        /* Do not emit outputs. */
+    "noEmit": true,                        /* Do not emit outputs. */
     // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
     // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
@@ -38,8 +38,9 @@
     // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
     // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
 
+    "allowImportingTsExtensions": true,
     /* Module Resolution Options */
-    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "moduleResolution": "Bundler",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
@@ -64,8 +65,5 @@
     /* Experimental Options */
     // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
-  },
-  "include": [
-    "src/**/*"
-  ],
+  }
 }