Upgrade remotedev-app to v0.10.1

jhen0409 · Nov 26, 2016 · 1e2380b · 1e2380b
1 parent 75eb6bc
commit 1e2380b
Show file tree

Hide file tree

Showing 9 changed files with 236 additions and 183 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ node_modules
 npm-debug.log
 .DS_Store
 dist/**
+!dist/css
 !dist/package.json
 !dist/app.html
 !dist/logo.png

diff --git a/app/containers/ReduxDevTools.js b/app/containers/ReduxDevTools.js
@@ -1,3 +1,5 @@
+import 'remotedev-monitor-components/lib/presets';
+
 import React, { Component, PropTypes } from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -14,7 +16,6 @@ import Dispatcher from 'remotedev-app/lib/containers/monitors/Dispatcher';
 import Notification from 'remotedev-app/lib/components/Notification';
 import Instances from 'remotedev-app/lib/components/Instances';
 import MonitorSelector from 'remotedev-app/lib/components/MonitorSelector';
-import TestGenerator from 'remotedev-app/lib/components/TestGenerator';
 
 // Button bar
 import DispatcherButton from 'remotedev-app/lib/components/buttons/DispatcherButton';
@@ -87,7 +88,7 @@ export default class ReduxDevTools extends Component {
           liftedState={liftedState}
           monitorState={monitorState}
           dispatch={liftedDispatch}
-          testComponent={isRedux && TestGenerator}
+          lib={options.lib}
         />
         <Notification />
         {sliderIsOpen && options.connectionId &&

diff --git a/dist/app.html b/dist/app.html
@@ -3,64 +3,7 @@
   <head>
     <meta charset=utf-8>
     <title>React Native Debugger</title>
-    <link href="css/codemirror.css" rel="stylesheet" />
-    <link href="css/night.css" rel="stylesheet" />
-    <style type="text/css">
-      html, body {
-        font-family: monaco, Consolas, Lucida Console, monospace;
-        overflow-y: hidden;
-        font-size: 100%;
-        margin: 0;
-        padding: 0;
-        width: 100%;
-        background-color: rgb(53, 59, 70);
-      }
-      #root {
-        width: 100%;
-        height: 100%;
-      }
-      #logs {
-        position: fixed;
-        top: 0;
-        left: 0;
-        white-space: pre;
-      }
-      @media print {
-        @page {
-          size: auto;
-          margin: 0;
-        }
-        body {
-          position: static;
-        }
-        /* Hide all elements except remotedev-app */
-        #root > div > div:not(:nth-child(1)) {
-          display: none !important;
-        }
-        .redux-container {
-          width: 100%;
-          height: 100%;
-          overflow: visible !important;
-          position: absolute !important;
-          z-index: 2147483647;
-          page-break-after: avoid;
-        }
-        .redux-container * {
-          overflow: visible !important;
-        }
-        .redux-buttonbar {
-          display: none !important;
-        }
-      }
-      .ReactCodeMirror {
-        overflow: auto;
-        flex: 1;
-      }
-      .CodeMirror {
-        font-family: monaco, Consolas, Lucida Console, monospace;
-        height: 100%;
-      }
-    </style>
+    <link href='css/style.css' rel="stylesheet" />
   </head>
   <body>
     <div id="root"></div>

diff --git a/electron/app.html b/electron/app.html
@@ -3,64 +3,7 @@
   <head>
     <meta charset=utf-8>
     <title>React Native Debugger</title>
-    <link href="../node_modules/codemirror/lib/codemirror.css" rel="stylesheet" />
-    <link href="../node_modules/codemirror/theme/night.css" rel="stylesheet" />
-    <style type="text/css">
-      html, body {
-        font-family: monaco, Consolas, Lucida Console, monospace;
-        overflow-y: hidden;
-        font-size: 100%;
-        margin: 0;
-        padding: 0;
-        width: 100%;
-        background-color: rgb(53, 59, 70);
-      }
-      #root {
-        width: 100%;
-        height: 100%;
-      }
-      #logs {
-        position: fixed;
-        top: 0;
-        left: 0;
-        white-space: pre;
-      }
-      @media print {
-        @page {
-          size: auto;
-          margin: 0;
-        }
-        body {
-          position: static;
-        }
-        /* Hide all elements except remotedev-app */
-        #root > div > div:not(:nth-child(1)) {
-          display: none !important;
-        }
-        .redux-container {
-          width: 100%;
-          height: 100%;
-          overflow: visible !important;
-          position: absolute !important;
-          z-index: 2147483647;
-          page-break-after: avoid;
-        }
-        .redux-container * {
-          overflow: visible !important;
-        }
-        .redux-buttonbar {
-          display: none !important;
-        }
-      }
-      .ReactCodeMirror {
-        overflow: auto;
-        flex: 1;
-      }
-      .CodeMirror {
-        font-family: monaco, Consolas, Lucida Console, monospace;
-        height: 100%;
-      }
-    </style>
+    <link href='../dist/css/style.css' rel="stylesheet" />
   </head>
   <body>
     <div id="root"></div>

diff --git a/package.json b/package.json
@@ -14,7 +14,6 @@
     "build:devtools": "cross-env NODE_ENV=production webpack --config webpack/devtools.backend.babel.js --progress --profile --colors",
     "build:main": "cross-env NODE_ENV=production webpack --config webpack/main.prod.babel.js --progress --profile --colors",
     "build:renderer": "cross-env NODE_ENV=production webpack --config webpack/renderer.prod.babel.js --progress --profile --colors",
-    "prebuild": "node scripts/prebuild.js",
     "build": "npm run build:main && npm run build:renderer",
     "dev:webpack": "npm run build:devtools && webpack-dev-server --config webpack/renderer.dev.babel.js --hot --inline --colors",
     "dev:electron": "cross-env NODE_ENV=development electron -r babel-core/register -r ./electron/debug .",
@@ -56,6 +55,7 @@
     "mocha": "^3.0.1",
     "raw-loader": "^0.5.1",
     "spectron": "^3.2.4",
+    "style-loader": "^0.13.1",
     "webpack": "^1.13.1",
     "webpack-dev-server": "^1.14.1",
     "worker-loader": "^0.7.0"
@@ -73,7 +73,8 @@
     "redux": "^3.5.2",
     "redux-devtools-instrument": "^1.0.1",
     "redux-persist": "^4.0.0-beta1",
-    "remotedev-app": "^0.10.0-beta-4",
+    "remotedev-app": "^0.10.1",
+    "remotedev-monitor-components": "0.0.4",
     "remotedev-slider": "^1.1.1",
     "remotedev-utils": "0.0.5",
     "ws": "^1.1.1"

diff --git a/scripts/prebuild.js b/scripts/prebuild.js
diff --git a/webpack/renderer.dev.babel.js b/webpack/renderer.dev.babel.js
@@ -13,6 +13,15 @@ export default {
     ...baseConfig.output,
     publicPath: `http://localhost:${port}/js/`,
   },
+  module: {
+    loaders: [
+      ...baseConfig.module.loaders,
+      {
+        test: /\.css?$/,
+        loaders: ['style', 'raw'],
+      },
+    ],
+  },
   plugins: [
     ...baseConfig.plugins,
     new webpack.NoErrorsPlugin(),

diff --git a/webpack/renderer.prod.babel.js b/webpack/renderer.prod.babel.js
@@ -9,6 +9,15 @@ export default {
     ...baseConfig.output,
     publicPath: 'js/',
   },
+  module: {
+    loaders: [
+      ...baseConfig.module.loaders,
+      {
+        test: /\.css?$/,
+        loaders: ['style', 'raw'],
+      },
+    ],
+  },
   plugins: [
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.optimize.DedupePlugin(),