From ca373bc9ec499284b7307dcfdd71891a8c0cb7ea Mon Sep 17 00:00:00 2001 From: qiang Date: Mon, 23 Aug 2021 16:11:37 +0800 Subject: [PATCH] fix: os-locale-s for Windows --- package.json | 2 +- packages/uni-cli-i18n/lib/locale.js | 2 +- packages/uni-cli-i18n/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index bff3ffa51..786cf9c70 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsdom-global": "^3.0.2", "jsonfile": "^6.0.1", "mustache": "^4.1.0", - "os-locale-s": "^1.0.8", + "os-locale-s-fix": "^1.0.8-fix", "recast": "^0.20.4", "rollup": "^2.6.1", "rollup-plugin-babel": "^4.4.0", diff --git a/packages/uni-cli-i18n/lib/locale.js b/packages/uni-cli-i18n/lib/locale.js index fa9c4051b..3e7f923c3 100644 --- a/packages/uni-cli-i18n/lib/locale.js +++ b/packages/uni-cli-i18n/lib/locale.js @@ -1,5 +1,5 @@ const { format } = require('./lang') -const { osLocale } = require('os-locale-s/cjs') +const { osLocale } = require('os-locale-s-fix/cjs') function getLocale () { return format(process.env.UNI_HBUILDERX_LANGID || osLocale.sync({ spawn: false, cache: false }) || defaultLocale) diff --git a/packages/uni-cli-i18n/package.json b/packages/uni-cli-i18n/package.json index 62cd04c0b..31174c7d2 100644 --- a/packages/uni-cli-i18n/package.json +++ b/packages/uni-cli-i18n/package.json @@ -15,6 +15,6 @@ "license": "Apache-2.0", "dependencies": { "i18n": "^0.13.3", - "os-locale-s": "^1.0.8" + "os-locale-s-fix": "^1.0.8-fix" } } diff --git a/yarn.lock b/yarn.lock index 50c7c1b0e..0b644d3f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6674,10 +6674,10 @@ os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" -os-locale-s@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/os-locale-s/-/os-locale-s-1.0.8.tgz#c44df5e6ff9e6e7c6ac9e2a9fe71c2f43daeb8ed" - integrity sha512-VCVIYgA2Lv/DHedGtaGzUOG9ZV/5g5APvq5aN/dfnz1wxlvMp2ophiycKSDrlA8yEoF9eCx0bAEGDcAeZFMLUA== +os-locale-s-fix@^1.0.8-fix: + version "1.0.8-fix" + resolved "https://registry.yarnpkg.com/os-locale-s-fix/-/os-locale-s-fix-1.0.8-fix.tgz#e9e8ab797072d650fde878692bae2765b804529a" + integrity sha512-00BFYcNU6Cdn8uYNGSNinXMxQtKiA5lqTQKrbhxpHToZ6aCUip6G4ygK4ui+YIkk+xtfPsHy2tETVKIgxd1iAQ== dependencies: lcid "^3.0.0" -- GitLab