remove classnames dependency

ShMcK · ShMcK · commit ca66ce71f585 · 2016-05-02T09:36:53.000-07:00
diff --git a/lib/components/Alert/index.js b/lib/components/Alert/index.js
@@ -17,7 +17,6 @@ var React = require('react');
 var react_redux_1 = require('react-redux');
 var actions_1 = require('../../actions');
 var Snackbar_1 = require('material-ui/Snackbar');
-var classNames = require('classnames');
 var defaultAlert = {
     message: '',
     open: false,
@@ -30,7 +29,7 @@ var Alert = (function (_super) {
     Alert.prototype.render = function () {
         var _a = this.props, alert = _a.alert, alertToggle = _a.alertToggle;
         var action = alert.action, open = alert.open, message = alert.message, duration = alert.duration;
-        return (React.createElement(Snackbar_1.default, {className: classNames('cr-alert', action), open: open || false, message: message || '', action: action, autoHideDuration: duration || 2000, onActionTouchTap: alertToggle, onRequestClose: alertToggle}));
+        return (React.createElement(Snackbar_1.default, {className: "cr-alert " + action, open: open || false, message: message || '', action: action, autoHideDuration: duration || 2000, onActionTouchTap: alertToggle, onRequestClose: alertToggle}));
     };
     Alert = __decorate([
         react_redux_1.connect(null, function (dispatch) {
diff --git a/lib/services/system.js b/lib/services/system.js
@@ -1,2 +1,2 @@
 "use strict";
-exports.isWindows = navigator.appVersion.indexOf('Win') > -1;
+exports.isWindows = window.navigator.appVersion.indexOf('Win') > -1 || false;
diff --git a/package.json b/package.json
@@ -38,7 +38,6 @@
     "atom": ">=1.0.0 <2.0.0"
   },
   "dependencies": {
-    "classnames": "2.2.4",
     "highlights": "1.3.1",
     "marked": "0.3.5",
     "material-ui": "0.15.0-beta.2",
@@ -49,7 +48,10 @@
     "redux": "3.5.2"
   },
   "scripts": {
-    "test": "ava",
+    "test": "ava src/**/*.spec.js",
     "compile": "tsc"
+  },
+  "devDependencies": {
+    "ava": "^0.14.0"
   }
 }
diff --git a/src/components/Alert/index.tsx b/src/components/Alert/index.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import {alertToggle} from '../../actions';
 import Snackbar from 'material-ui/Snackbar';
-const classNames = require('classnames');
 
 const defaultAlert = {
   message: '',
@@ -22,7 +21,7 @@ export class Alert extends React.Component<{
     const {action, open, message, duration} = alert;
     return (
       <Snackbar
-          className={classNames('cr-alert', action)}
+          className={`cr-alert ${action}`}
           open={open || false}
           message={message || ''}
           action={action}
diff --git a/src/components/Progress/ProgressPage/index.tsx b/src/components/Progress/ProgressPage/index.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import {pageSet, routeSet, testsLoad} from '../../../actions';
-import * as classnames from 'classnames';
 import {ListItem} from 'material-ui/List';
 import {progressIcon} from '../progressIcon';
 import {grey400} from 'material-ui/styles/colors';
diff --git a/src/reducers/reducer.spec.js b/src/reducers/reducer.spec.js
@@ -0,0 +1,25 @@
+// import {expect} from 'chai';
+// import {reducer} from '../../lib/store/';
+//
+// describe('Reducer:', () => {
+//
+//   it('should return the state if the action is not found', () => {
+//     const action = {type: 'NON-EXISTING-ACTION' };
+//     expect(reducer({}, action)).to.be.an('object');
+//   });
+//
+// });
+
+import test from 'ava';
+import {
+	reducer
+} from '../../lib/store/index';
+
+test('returns defaults if the action is not found', t => {
+	const action = {
+		type: 'NON-EXISTING-ACTION'
+	};
+	const state = reducer({}, action);
+	console.log('STATE', state);
+	t.is(typeof state, 'object');
+});
diff --git a/src/reducers/reducer.spec.ts b/src/reducers/reducer.spec.ts
diff --git a/src/reducers/tutorials/check.ts b/src/reducers/tutorials/check.ts
@@ -17,14 +17,18 @@ export function searchForTutorials(deps: Object): Tutorial.Info[] {
 
         // no package.json
         if (!fileExists(pathToTutorialPackageJson)) {
-          console.log(`Error with ${name}: no package.json file found. ${tutorialError}`);
+          console.log(
+            `Error with ${name}: no package.json file found. ${tutorialError}`
+          );
           return {
             name,
             version: 'NOT INSTALLED'
           };
         }
 
-        let tutorialPackageJson = JSON.parse(readFileSync(pathToTutorialPackageJson, 'utf8'));
+        let tutorialPackageJson = JSON.parse(
+          readFileSync(pathToTutorialPackageJson, 'utf8')
+        );
         const version = tutorialPackageJson.version;
 
         return {
diff --git a/src/services/system.ts b/src/services/system.ts
@@ -1 +1 @@
-export const isWindows = navigator.appVersion.indexOf('Win') > -1;
+export const isWindows = window.navigator.appVersion.indexOf('Win') > -1 || false;
diff --git a/src/typings/classnames/classnames.d.ts b/src/typings/classnames/classnames.d.ts
diff --git a/src/typings/tsd.d.ts b/src/typings/tsd.d.ts
@@ -1,6 +1,5 @@
 /// <reference path="assertion-error/assertion-error.d.ts" />
 /// <reference path="atom/atom.d.ts" />
-/// <reference path="classnames/classnames.d.ts" />
 /// <reference path="es6-promise/es6-promise.d.ts" />
 /// <reference path="node/node.d.ts" />
 /// <reference path="react-dom/react-dom.d.ts" />
diff --git a/tsconfig.json b/tsconfig.json
@@ -23,7 +23,6 @@
     "files": [
         "src/typings/assertion-error/assertion-error.d.ts",
         "src/typings/atom/atom.d.ts",
-        "src/typings/classnames/classnames.d.ts",
         "src/typings/cr/cr.d.ts",
         "src/typings/cr/globals.d.ts",
         "src/typings/cr/test.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`"use strict";`
`2`		`-exports.isWindows = navigator.appVersion.indexOf('Win') > -1;`
	`2`	`+exports.isWindows = window.navigator.appVersion.indexOf('Win') > -1 \|\| false;`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export const isWindows = navigator.appVersion.indexOf('Win') > -1;`
	`1`	`+export const isWindows = window.navigator.appVersion.indexOf('Win') > -1 \|\| false;`