From f37de606d73e5c5c46d182c08021411670b00099 Mon Sep 17 00:00:00 2001
From: yankouskia <aleksandr.yankovskiy@gmail.com>
Date: Wed, 18 Jul 2018 00:19:07 +0300
Subject: [PATCH 1/3] use only core in browser environment, loader in node env

---
 packages/kbn-i18n/package.json   |  4 ++--
 packages/kbn-i18n/src/browser.js | 22 ++++++++++++++++++++++
 packages/kbn-i18n/src/index.js   |  3 +--
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 packages/kbn-i18n/src/browser.js

diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json
index 2c00f44564bf8..da276e01c8d33 100644
--- a/packages/kbn-i18n/package.json
+++ b/packages/kbn-i18n/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@kbn/i18n",
-  "browser": "./target/web",
-  "main": "./target/node",
+  "browser": "./target/web/browser.js",
+  "main": "./target/node/index.js",
   "module": "./src/index.js",
   "version": "1.0.0",
   "license": "Apache-2.0",
diff --git a/packages/kbn-i18n/src/browser.js b/packages/kbn-i18n/src/browser.js
new file mode 100644
index 0000000000000..baa2cf0d2c868
--- /dev/null
+++ b/packages/kbn-i18n/src/browser.js
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as i18nCore from './core';
+
+export const i18n = i18nCore;
diff --git a/packages/kbn-i18n/src/index.js b/packages/kbn-i18n/src/index.js
index 6988473539b82..f5eb191843659 100644
--- a/packages/kbn-i18n/src/index.js
+++ b/packages/kbn-i18n/src/index.js
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import * as i18nCore from './core';
 import * as loader from './loader';
 
-export const i18n = i18nCore;
 export const i18nLoader = loader;
+export * from './browser';

From 54150f9702ce37ccc35ff84376c730d9d9a25ff8 Mon Sep 17 00:00:00 2001
From: yankouskia <aleksandr.yankovskiy@gmail.com>
Date: Wed, 18 Jul 2018 15:09:02 +0300
Subject: [PATCH 2/3] do not reexport node stuff from browser

---
 packages/kbn-i18n/src/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/kbn-i18n/src/index.js b/packages/kbn-i18n/src/index.js
index f5eb191843659..394810b0bd27b 100644
--- a/packages/kbn-i18n/src/index.js
+++ b/packages/kbn-i18n/src/index.js
@@ -18,6 +18,7 @@
  */
 
 import * as loader from './loader';
+import * as i18nCore from './core';
 
+export const i18n = i18nCore;
 export const i18nLoader = loader;
-export * from './browser';

From dc1a0c67da01b84bd7a85794d6f55c987197160e Mon Sep 17 00:00:00 2001
From: yankouskia <aleksandr.yankovskiy@gmail.com>
Date: Wed, 18 Jul 2018 16:34:00 +0300
Subject: [PATCH 3/3] revert order

---
 packages/kbn-i18n/src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kbn-i18n/src/index.js b/packages/kbn-i18n/src/index.js
index 394810b0bd27b..6988473539b82 100644
--- a/packages/kbn-i18n/src/index.js
+++ b/packages/kbn-i18n/src/index.js
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import * as loader from './loader';
 import * as i18nCore from './core';
+import * as loader from './loader';
 
 export const i18n = i18nCore;
 export const i18nLoader = loader;