Skip to content

Commit

Permalink
Update remotedev-app and monitors
Browse files Browse the repository at this point in the history
  • Loading branch information
zalmoxisus committed Nov 25, 2016
1 parent 822d26a commit c3c47a6
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 12 deletions.
2 changes: 0 additions & 2 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import wrapConfig from './webpack/wrap.config';

function copy(dest) {
gulp.src('./src/assets/**/*').pipe(gulp.dest(dest));
gulp.src('./node_modules/codemirror/lib/codemirror.css').pipe(gulp.dest(`${dest}/css`));
gulp.src('./node_modules/codemirror/theme/night.css').pipe(gulp.dest(`${dest}/css`));
}

/*
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"jsdom": "^9.8.3",
"mocha": "^3.1.2",
"raw-loader": "^0.5.1",
"react-addons-test-utils": "^15.2.1",
"react-addons-test-utils": "^15.4.1",
"react-transform-catch-errors": "^1.0.0",
"react-transform-hmr": "^1.0.1",
"rimraf": "^2.5.3",
Expand All @@ -69,17 +69,17 @@
"webpack": "^1.13.3"
},
"dependencies": {
"codemirror": "^5.16.0",
"jsan": "^3.1.5",
"lodash": "^4.17.2",
"react": "^15.2.1",
"react-dom": "^15.2.1",
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-icons": "^2.2.1",
"react-redux": "^4.4.5",
"redux": "^3.5.2",
"redux-devtools": "^3.3.1",
"redux-devtools-instrument": "^1.3.3",
"remotedev-app": "^0.10.0-beta-2",
"remotedev-app": "^0.10.0",
"remotedev-monitor-components": "^0.0.4",
"remotedev-slider": "^1.1.1",
"remotedev-utils": "0.0.1"
}
Expand Down
3 changes: 1 addition & 2 deletions src/app/containers/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import SliderButton from 'remotedev-app/lib/components/buttons/SliderButton';
import ImportButton from 'remotedev-app/lib/components/buttons/ImportButton';
import ExportButton from 'remotedev-app/lib/components/buttons/ExportButton';
import PrintButton from 'remotedev-app/lib/components/buttons/PrintButton';
import TestGenerator from 'remotedev-app/lib/components/TestGenerator';
import SettingsIcon from 'react-icons/lib/md/settings';
import LeftIcon from 'react-icons/lib/md/border-left';
import RightIcon from 'react-icons/lib/md/border-right';
Expand Down Expand Up @@ -49,7 +48,7 @@ class App extends Component {
liftedState={liftedState}
monitorState={this.props.monitorState}
dispatch={this.props.liftedDispatch}
testComponent={isRedux && TestGenerator}
lib={options.lib}
/>
<Notification />
{sliderIsOpen && options.connectionId &&
Expand Down
1 change: 1 addition & 0 deletions src/browser/extension/window/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'remotedev-monitor-components/lib/presets';
import React from 'react';
import { render } from 'react-dom';
import { Provider } from 'react-redux';
Expand Down
3 changes: 0 additions & 3 deletions src/browser/views/includes/style.pug
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,3 @@ style.
overflow: visible !important;
}
}

link(href='/css/codemirror.css', rel="stylesheet")
link(href='/css/night.css', rel="stylesheet")

0 comments on commit c3c47a6

Please sign in to comment.