From b610ff667e8072401da5ddea9cee7ed16d0e307a Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Thu, 12 Oct 2017 13:29:56 -0500 Subject: [PATCH] Yarn issues --- webpack/entry.tsx | 6 ++-- webpack/i18n.ts | 6 ++-- yarn.lock | 92 +++++++---------------------------------------- 3 files changed, 20 insertions(+), 84 deletions(-) diff --git a/webpack/entry.tsx b/webpack/entry.tsx index c0cc26289..33649fb69 100644 --- a/webpack/entry.tsx +++ b/webpack/entry.tsx @@ -6,15 +6,15 @@ import { RootComponent } from "./routes"; import { store } from "./redux/store"; import { ready } from "./config/actions"; import { detectLanguage } from "./i18n"; -import * as i18next from "i18next"; import { stopIE, attachToRoot, shortRevision } from "./util"; +import { init } from "i18next"; stopIE(); console.log(shortRevision()); -detectLanguage().then((config) => { - i18next.init(config, (err, t) => { +detectLanguage().then(function (config) { + init(config, (err, t) => { attachToRoot(RootComponent, { store }); store.dispatch(ready()); }); diff --git a/webpack/i18n.ts b/webpack/i18n.ts index 289de202f..24fa5c180 100644 --- a/webpack/i18n.ts +++ b/webpack/i18n.ts @@ -1,6 +1,7 @@ import axios from "axios"; import { Session } from "./session"; import { BooleanSetting } from "./session_keys"; +import { InitOptions } from "i18next"; function generateUrl(langCode: string) { const lang = langCode.slice(0, 2); @@ -16,11 +17,12 @@ function getUserLang(langCode = "en_us") { } export function detectLanguage() { - return getUserLang(navigator.language).then(function (lang) { + return getUserLang(navigator.language).then(function (lang): InitOptions { // NOTE: Some international users prefer using the app in English. // This preference is stored in `DISABLE_I18N`. const choice = Session.getBool(BooleanSetting.disableI18n) ? "en" : lang; - const langi = require("../public/app-resources/languages/" + choice + ".js"); + const langi = + require("../public/app-resources/languages/" + choice + ".js"); return { nsSeparator: "", keySeparator: "", diff --git a/yarn.lock b/yarn.lock index 0e23383c5..9fcaf1ec1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -117,13 +117,13 @@ dependencies: axios "^0.16.1" -"@types/mqtt@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@types/mqtt/-/mqtt-2.5.0.tgz#bc54c2d53f509282168da4a9af865de95bee5101" +"@types/mqtt@^0.0.34": + version "0.0.34" + resolved "https://registry.yarnpkg.com/@types/mqtt/-/mqtt-0.0.34.tgz#7865790000cc8a312242ead9a0e209ba2aa686d4" dependencies: - mqtt "*" + "@types/node" "*" -"@types/node@^8.0.34": +"@types/node@*", "@types/node@^8.0.34": version "8.0.34" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.34.tgz#55f801fa2ddb2a40dd6dfc15ecfe1dde9c129fe9" @@ -399,10 +399,6 @@ async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" -async-limiter@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" - async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" @@ -645,12 +641,6 @@ bl@^0.9.1: dependencies: readable-stream "~1.0.26" -bl@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e" - dependencies: - readable-stream "^2.0.5" - blamer@^0.1.9: version "0.1.13" resolved "https://registry.yarnpkg.com/blamer/-/blamer-0.1.13.tgz#61f215f2361bd054e6258c0c5e0086f04074e670" @@ -1114,7 +1104,7 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@^1.4.7, concat-stream@^1.6.0: +concat-stream@^1.4.7: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: @@ -2435,7 +2425,7 @@ hawk@3.1.3, hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" -help-me@^1.0.0, help-me@^1.0.1: +help-me@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/help-me/-/help-me-1.1.0.tgz#8f2d508d0600b4a456da2f086556e7e5c056a3c6" dependencies: @@ -3827,33 +3817,6 @@ mqtt-packet@^3.0.0, mqtt-packet@^3.4.7: bl "^0.9.1" inherits "^2.0.1" -mqtt-packet@^5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-5.4.0.tgz#387104c06aa68fbb9f8159d0c722dd5c3e45df22" - dependencies: - bl "^1.2.1" - inherits "^2.0.3" - process-nextick-args "^1.0.7" - safe-buffer "^5.1.0" - -mqtt@*: - version "2.13.0" - resolved "https://registry.yarnpkg.com/mqtt/-/mqtt-2.13.0.tgz#cbf3fae8f0c48328472b0d5f8e049cc800957d7e" - dependencies: - commist "^1.0.0" - concat-stream "^1.6.0" - end-of-stream "^1.1.0" - help-me "^1.0.1" - inherits "^2.0.3" - minimist "^1.2.0" - mqtt-packet "^5.4.0" - pump "^1.0.2" - readable-stream "^2.3.3" - reinterval "^1.1.0" - split2 "^2.1.1" - websocket-stream "^5.0.1" - xtend "^4.0.1" - mqtt@^1.7.4: version "1.14.1" resolved "https://registry.yarnpkg.com/mqtt/-/mqtt-1.14.1.tgz#7e376987153d01793e946d26d46122ebf0c03554" @@ -4711,7 +4674,7 @@ private@^0.1.6: version "0.1.7" resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" -process-nextick-args@^1.0.7, process-nextick-args@~1.0.6: +process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" @@ -4757,7 +4720,7 @@ public-encrypt@^4.0.0: parse-asn1 "^5.0.0" randombytes "^2.0.1" -pump@^1.0.0, pump@^1.0.1, pump@^1.0.2: +pump@^1.0.0, pump@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51" dependencies: @@ -4970,7 +4933,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -"readable-stream@> 1.0.0 < 3.0.0", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.0, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9, readable-stream@^2.3.3: +"readable-stream@> 1.0.0 < 3.0.0", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9: version "2.3.3" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: @@ -5093,7 +5056,7 @@ regjsparser@^0.1.4: dependencies: jsesc "~0.5.0" -reinterval@^1.0.1, reinterval@^1.1.0: +reinterval@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/reinterval/-/reinterval-1.1.0.tgz#3361ecfa3ca6c18283380dd0bb9546f390f5ece7" @@ -5209,7 +5172,7 @@ safe-buffer@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" -safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -5484,12 +5447,6 @@ split2@^2.0.1: dependencies: through2 "^2.0.2" -split2@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493" - dependencies: - through2 "^2.0.2" - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -5948,10 +5905,6 @@ ultron@1.0.x: version "1.0.2" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" -ultron@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864" - unc-path-regex@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" @@ -6232,17 +6185,6 @@ websocket-stream@^3.0.1: ws "^1.0.1" xtend "^4.0.0" -websocket-stream@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/websocket-stream/-/websocket-stream-5.0.1.tgz#51cb992988c2eeb4525ccd90eafbac52a5ac6700" - dependencies: - duplexify "^3.2.0" - inherits "^2.0.1" - readable-stream "^2.2.0" - safe-buffer "^5.0.1" - ws "^3.0.0" - xtend "^4.0.0" - weinre@^2.0.0-pre-I0Z7U9OV: version "2.0.0-pre-I0Z7U9OV" resolved "https://registry.yarnpkg.com/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz#fef8aa223921f7b40bbbbd4c3ed4302f6fd0a813" @@ -6352,14 +6294,6 @@ ws@^1.0.1: options ">=0.0.5" ultron "1.0.x" -ws@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.2.0.tgz#d5d3d6b11aff71e73f808f40cc69d52bb6d4a185" - dependencies: - async-limiter "~1.0.0" - safe-buffer "~5.1.0" - ultron "~1.1.0" - xml-name-validator@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635" @@ -6377,7 +6311,7 @@ xmlbuilder@^4.1.0: dependencies: lodash "^4.0.0" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: +"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"