From 0e28e8fa3dff1b97751d34c0d76d069a0b1f4298 Mon Sep 17 00:00:00 2001
From: Vincent <work@vincenttran.me>
Date: Wed, 14 Mar 2018 00:15:19 +1100
Subject: [PATCH] Moved mock-dev.js and ui-dev.js to development folder.

---
 mock-dev.js => development/mock-dev.js | 22 +++++++++++-----------
 ui-dev.js => development/ui-dev.js     | 10 +++++-----
 package.json                           |  6 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename mock-dev.js => development/mock-dev.js (82%)
 rename ui-dev.js => development/ui-dev.js (89%)

diff --git a/mock-dev.js b/development/mock-dev.js
similarity index 82%
rename from mock-dev.js
rename to development/mock-dev.js
index 6627c1153..a1fb3a86d 100644
--- a/mock-dev.js
+++ b/development/mock-dev.js
@@ -15,16 +15,16 @@
 const extend = require('xtend')
 const render = require('react-dom').render
 const h = require('react-hyperscript')
-const Root = require('./ui/app/root')
-const configureStore = require('./ui/app/store')
-const actions = require('./ui/app/actions')
-const states = require('./development/states')
-const backGroundConnectionModifiers = require('./development/backGroundConnectionModifiers')
-const Selector = require('./development/selector')
-const MetamaskController = require('./app/scripts/metamask-controller')
-const firstTimeState = require('./app/scripts/first-time-state')
-const ExtensionPlatform = require('./app/scripts/platforms/extension')
-const extension = require('./development/mockExtension')
+const Root = require('../ui/app/root')
+const configureStore = require('../ui/app/store')
+const actions = require('../ui/app/actions')
+const states = require('./states')
+const backGroundConnectionModifiers = require('./backGroundConnectionModifiers')
+const Selector = require('./selector')
+const MetamaskController = require('../app/scripts/metamask-controller')
+const firstTimeState = require('../app/scripts/first-time-state')
+const ExtensionPlatform = require('../app/scripts/platforms/extension')
+const extension = require('./mockExtension')
 const noop = function () {}
 
 const log = require('loglevel')
@@ -51,7 +51,7 @@ function updateQueryParams(newView) {
 // CSS
 //
 
-const MetaMaskUiCss = require('./ui/css')
+const MetaMaskUiCss = require('../ui/css')
 const injectCss = require('inject-css')
 
 //
diff --git a/ui-dev.js b/development/ui-dev.js
similarity index 89%
rename from ui-dev.js
rename to development/ui-dev.js
index 620d81667..cac433909 100644
--- a/ui-dev.js
+++ b/development/ui-dev.js
@@ -17,10 +17,10 @@
 
 const render = require('react-dom').render
 const h = require('react-hyperscript')
-const Root = require('./ui/app/root')
-const configureStore = require('./development/uiStore')
-const states = require('./development/states')
-const Selector = require('./development/selector')
+const Root = require('../ui/app/root')
+const configureStore = require('./uiStore')
+const states = require('./states')
+const Selector = require('./selector')
 
 // logger
 const log = require('loglevel')
@@ -35,7 +35,7 @@ const firstState = states[selectedView]
 updateQueryParams(selectedView)
 
 // CSS
-const MetaMaskUiCss = require('./ui/css')
+const MetaMaskUiCss = require('../ui/css')
 const injectCss = require('inject-css')
 
 
diff --git a/package.json b/package.json
index c5d9d3c45..8921cc1b4 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
   "scripts": {
     "start": "npm run dev",
     "dev": "gulp dev --debug",
-    "ui": "npm run test:flat:build:states && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
-    "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
+    "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
+    "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
     "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
     "mascara": "gulp build && METAMASK_DEBUG=true node ./mascara/example/server",
     "dist": "npm run dist:clear && npm install && gulp dist",
@@ -23,7 +23,7 @@
     "test:flat:build": "npm run test:flat:build:ui && npm run test:flat:build:tests",
     "test:flat:build:tests": "node test/integration/index.js",
     "test:flat:build:states": "node development/genStates.js",
-    "test:flat:build:ui": "npm run test:flat:build:states && browserify ./mock-dev.js -o ./development/bundle.js",
+    "test:flat:build:ui": "npm run test:flat:build:states && browserify ./development/mock-dev.js -o ./development/bundle.js",
     "test:mascara": "npm run test:mascara:build && karma start test/mascara.conf.js",
     "test:mascara:build": "mkdir -p dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests",
     "test:mascara:build:ui": "browserify mascara/test/test-ui.js -o dist/mascara/ui.js",