Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jhen0409 committed Aug 7, 2016
1 parent f3bed2c commit 37aa2b1
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 29 deletions.
8 changes: 6 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
"browser": true,
"node": true
},
"settings": {
"import/core-modules": ["electron"]
},
"rules": {
"react/prefer-stateless-function": 0,
"consistent-return": 0,
"strict": 0,
"no-console": 0,
"no-param-reassign": ["error", { "props": false }],
"import/no-unresolved": [2, { "ignore": ["electron"] }],
"no-underscore-dangle": ["error", { "allow": ["__IS_REDUX_NATIVE_MESSAGE__"] }]
"no-underscore-dangle": ["error", { "allow": ["__IS_REDUX_NATIVE_MESSAGE__"] }],
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"import/prefer-default-export": 0
}
}
4 changes: 1 addition & 3 deletions app/containers/App.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import { ipcRenderer } from 'electron';
import React, { Component } from 'react';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Dock from 'react-dock';
import * as debuggerActions from '../actions/debugger';

import Debugger from './Debugger';
import ReduxDevTools from './ReduxDevTools';
import ReactDevTools from './ReactDevTools';

import { ipcRenderer } from 'electron';

const styles = {
container: {
width: '100%',
Expand Down
6 changes: 3 additions & 3 deletions app/containers/Debugger/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
// Edit from https://github.com/facebook/react-native/blob/master/local-cli/server/util/debugger.html

import WebSocket from 'ws';
import Worker from 'worker?name=debugger.worker.js!./debuggerWorker'; // eslint-disable-line
import { ipcRenderer } from 'electron';
import { Component, PropTypes } from 'react';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Worker from 'worker?name=debugger.worker.js!./debuggerWorker'; // eslint-disable-line
import * as debuggerAtions from '../../actions/debugger';
import { ipcRenderer } from 'electron';

const INITIAL_MESSAGE = 'Waiting, press ⌘R in simulator to reload and connect.';

Expand Down Expand Up @@ -80,7 +80,7 @@ export default class Debugger extends Component {
// This worker will run the application javascript code,
// making sure that it's run in an environment without a global
// document, to make it consistent with the JSC executor environment.
const worker = new Worker;
const worker = new Worker();
worker.addEventListener('message', onmessage);

this.props.actions.debugger.setDebuggerWorker(worker);
Expand Down
10 changes: 5 additions & 5 deletions app/containers/ReactDevTools/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@

// Edit from https://github.com/facebook/react-devtools/blob/master/shells/electron/src/ui.js

/* eslint import/no-extraneous-dependencies: 0 import/no-unresolved: 0 */

import ws from 'ws';
import { connect } from 'react-redux';
import React, { Component, PropTypes } from 'react';

import installGlobalHook from 'react-devtools/backend/installGlobalHook';
installGlobalHook(window);

import React, { Component, PropTypes } from 'react';
import Panel from 'react-devtools/frontend/Panel';

import backendScript from 'raw!react-devtools/shells/electron/build/backend.js';

import { connect } from 'react-redux';
installGlobalHook(window);

const getNewKey = () => `react-panel${Math.random().toString().substr(2, 10)}`;

Expand Down
1 change: 1 addition & 0 deletions app/containers/ReduxDevTools/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export default class ReduxDevTools extends Component {
<TestGenerator
name="default"
store={this.state.store}
isRedux={this.state.store.isRedux()}
useCodemirror
testTemplates={getFromStorage('test-templates')}
selectedTemplate={getFromStorage('test-templates-sel')}
Expand Down
4 changes: 2 additions & 2 deletions app/containers/ReduxDevTools/reduxNativeDevTools.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ function init(options) {
function isFiltered(action) {
if (!action || !action.action || !action.action.type) return false;
return (
filters.whitelist && !action.action.type.match(filters.whitelist.join('|')) ||
filters.blacklist && action.action.type.match(filters.blacklist.join('|'))
(filters.whitelist && !action.action.type.match(filters.whitelist.join('|'))) ||
(filters.blacklist && action.action.type.match(filters.blacklist.join('|')))
);
}

Expand Down
2 changes: 1 addition & 1 deletion app/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { render } from 'react-dom';
import App from './containers/App';
import { Provider } from 'react-redux';
import App from './containers/App';
import configureStore from './store/configureStore';

const store = configureStore();
Expand Down
2 changes: 1 addition & 1 deletion electron/debug.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
require('electron-debug')();
require('electron-debug')(); // eslint-disable-line
2 changes: 1 addition & 1 deletion electron/url-handle/handleURL.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const createHandleURLServer = getWindow =>
socket.end();
}
});
}).listen(0, 'localhost').on('listening', function () {
}).listen(0, 'localhost').on('listening', function server() {
const { port } = this.address();
portfile.write(port);
portfile.watchExists(port);
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@
"babel-eslint": "^6.0.4",
"babel-loader": "^6.2.4",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-preset-es2015-node6": "^0.2.0",
"babel-preset-es2015-node6": "^0.3.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-0": "^6.5.0",
"devtron": "^1.2.0",
"electron": "^1.3.2",
"electron-debug": "^1.0.0",
"electron-packager": "^7.0.2",
"eslint": "^2.11.0",
"eslint-config-airbnb": "^9.0.1",
"eslint-plugin-import": "^1.8.1",
"eslint-plugin-jsx-a11y": "^1.2.2",
"eslint-plugin-react": "^5.1.1",
"electron-packager": "^7.5.1",
"eslint": "^3.2.2",
"eslint-config-airbnb": "^10.0.0",
"eslint-plugin-import": "^1.12.0",
"eslint-plugin-jsx-a11y": "^2.0.1",
"eslint-plugin-react": "^6.0.0",
"expect": "^1.20.2",
"mocha": "^3.0.1",
"raw-loader": "^0.5.1",
Expand All @@ -54,9 +54,9 @@
"worker-loader": "^0.7.0"
},
"dependencies": {
"electron-context-menu": "^0.2.1",
"electron-context-menu": "^0.4.0",
"jsan": "^3.1.2",
"node-watch": "^0.3.5",
"node-watch": "^0.4.0",
"react": "^15.2.0",
"react-addons-create-fragment": "^15.2.0",
"react-dock": "^0.2.3",
Expand All @@ -66,6 +66,6 @@
"redux-devtools-instrument": "^1.0.1",
"remotedev-app": "^0.6.1",
"remotedev-utils": "0.0.3",
"ws": "^1.1.0"
"ws": "^1.1.1"
}
}
3 changes: 2 additions & 1 deletion patch/lib/injectDevToolsMiddleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

const fs = require('fs');
const path = require('path');
const es6Template = require('es6-template');

const template = fs.readFileSync(
path.join(__dirname, 'injectDevToolsMiddleware.tmpl.js'),
'utf-8'
);
const es6Template = require('es6-template');

const name = 'react-native-debugger-patch';
const startFlag = `/* ${name} start */`;
Expand Down
3 changes: 3 additions & 0 deletions test/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"env": {
"mocha": true
},
"rules": {
"import/no-extraneous-dependencies": ["error", {"devDependencies": true}]
}
}
5 changes: 5 additions & 0 deletions webpack/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"import/no-extraneous-dependencies": 0
}
}

0 comments on commit 37aa2b1

Please sign in to comment.