diff --git a/gulpfile.babel.js b/gulpfile.babel.js index d9e0873..b854c82 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -15,6 +15,9 @@ import projectPaths from './config/projectPaths' gulp.task('build', ['build:core', 'build:react']) gulp.task('build:prod', ['production', 'build']) +gulp.task('build:core', () => buildFile(projectPaths.entry, 'index')) +gulp.task('build:react', () => buildFile(projectPaths.reactEntry, 'react')) + /** * Sets the current chain of tasks to 'production mode'. @@ -30,18 +33,6 @@ gulp.task('production', () => { }) -/** - * Build the core library. - */ -gulp.task('build:core', () => buildFile(projectPaths.entry, 'index')) - - -/** - * Build the react run modules. - */ -gulp.task('build:react', () => buildFile(projectPaths.reactEntry, 'react')) - - /** * Run the test suite once. */ diff --git a/package.json b/package.json index 086a0ef..bc8f770 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "eslint-plugin-react": "^3.5.1", "gulp": "^3.9.0", "gulp-env": "^0.2.0", - "karma": "^0.13.22", + "karma": "^1.1.1", "karma-chrome-launcher": "^0.2.1", "karma-coverage": "^0.5.5", "karma-firefox-launcher": "^0.1.6", @@ -49,6 +49,7 @@ "webpack-stream": "^2.1.1" }, "dependencies": { + "karma": "^1.1.1", "lodash": "^4.2.1", "mediaquery": "0.0.3", "redux": "^3.5.2" diff --git a/src/components/stylesheet.js b/src/components/stylesheet.js index 9c3273a..4468a41 100644 --- a/src/components/stylesheet.js +++ b/src/components/stylesheet.js @@ -1,5 +1,5 @@ // external imports -import {connect} from 'react-redux' +// import {connect} from 'react-redux' import mapValues from 'lodash/mapValues' import sortBy from 'lodash/sortBy' @@ -126,7 +126,7 @@ const defaultOptions = { // export a higher order component export default (stylesheet, opts) => (component) => ( - connect( + require('react-redux').connect( // eslint-disable-line no-undef mapStateToPropsFactory(stylesheet, {...defaultOptions, ...opts}) )(component) ) diff --git a/tests/test_stylesheet.js b/tests/test_stylesheet.js index e7a0348..aa26e10 100644 --- a/tests/test_stylesheet.js +++ b/tests/test_stylesheet.js @@ -1,3 +1,6 @@ + +import 'babel-polyfill' + // local imports import { parsePattern, @@ -5,9 +8,9 @@ import { sortKeys, transformStyle, } from '../src/components/stylesheet' - -// fix the testing environment -import 'babel-polyfill' +// import {parsePattern} from 'components/stylesheet' +// // fix the testing environment +// import foo from 'components/stylesheet' describe('ReactStyleSheet', function () { it("can parse the relevant data from style patterns", function() {