From 9e43e628c7fc038670d3aef5e9c152925b968a3e Mon Sep 17 00:00:00 2001
From: Cezar Augusto <boss@cezaraugusto.net>
Date: Fri, 7 Dec 2018 17:36:43 -0200
Subject: [PATCH] Merge pull request #1025 from brave/brave-ui-direct-to-github

Use git commit ref for brave-ui dependency instead of npm-published version
---
 components/webpack/webpack.config.js | 1 +
 package-lock.json                    | 9 ++++-----
 package.json                         | 6 ++++--
 tsconfig.json                        | 5 +++++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/components/webpack/webpack.config.js b/components/webpack/webpack.config.js
index 48115e862d39..6e64df02bbb5 100644
--- a/components/webpack/webpack.config.js
+++ b/components/webpack/webpack.config.js
@@ -11,6 +11,7 @@ module.exports = (env, argv) => ({
     extensions: ['.js', '.tsx', '.ts', '.json'],
     alias: {
       'bittorrent-tracker': path.resolve(__dirname, '../../node_modules/bittorrent-tracker'),
+      'brave-ui': path.resolve(__dirname, '../../node_modules/brave-ui/src'),
       'dgram': 'chrome-dgram',
       'dns': path.resolve(__dirname, '../common/dns.ts'),
       'net': 'chrome-net',
diff --git a/package-lock.json b/package-lock.json
index 10d1a1a62c6a..b0c6c954a52c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -612,7 +612,7 @@
         },
         "util": {
           "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
           "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
           "dev": true,
           "requires": {
@@ -2087,9 +2087,8 @@
       }
     },
     "brave-ui": {
-      "version": "0.34.6",
-      "resolved": "https://registry.npmjs.org/brave-ui/-/brave-ui-0.34.6.tgz",
-      "integrity": "sha512-jjgh71Accmsuawr9FWe0pKHf96PMGPRxBaC79ZBH0biEy+C0wfUEthfmMuYnPYABF7oI+NvROwqhEbNPD8O4eg==",
+      "version": "github:brave/brave-ui#5c2d8a0f669af2e9a68ce0fe38d49a116bc52315",
+      "from": "github:brave/brave-ui#5c2d8a0f669af2e9a68ce0fe38d49a116bc52315",
       "dev": true,
       "requires": {
         "emptykit.css": "1.0.1",
@@ -9729,7 +9728,7 @@
     },
     "stream-browserify": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
diff --git a/package.json b/package.json
index 8b50fb5d9dc8..137d617bbc39 100644
--- a/package.json
+++ b/package.json
@@ -249,7 +249,9 @@
     ],
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|gif|eot|otf|svg|ttf|woff|woff2)$": "<rootDir>/components/test/fileMock.ts",
-      "\\.(css|less)$": "identity-obj-proxy"
+      "\\.(css|less)$": "identity-obj-proxy",
+      "^brave-ui$": "<rootDir>/node_modules/brave-ui/src",
+      "^brave-ui\\/(.*)": "<rootDir>/node_modules/brave-ui/src/$1"
     }
   },
   "devDependencies": {
@@ -272,7 +274,7 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-react-optimize": "^1.0.1",
     "babel-preset-stage-0": "^6.24.1",
-    "brave-ui": "^0.34.6",
+    "brave-ui": "brave/brave-ui#5c2d8a0f669af2e9a68ce0fe38d49a116bc52315",
     "css-loader": "^0.28.9",
     "csstype": "^2.5.5",
     "emptykit.css": "^1.0.1",
diff --git a/tsconfig.json b/tsconfig.json
index b4aea8e771e8..3b349d5ed40c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,6 +13,11 @@
     "allowJs": true,
     "jsx": "react",
     "moduleResolution": "node",
+    "baseUrl": ".",
+    "paths": {
+      "brave-ui": ["node_modules/brave-ui/src"],
+      "brave-ui/*": ["node_modules/brave-ui/src/*"]
+    },
     "typeRoots": [
       "./node_modules/@types",
       "./components/definitions"