Merge pull request reduxjs#1224 from ashaffer/top-level-imports

Move exported functions to the top-level src folder
possibilities · Jan 12, 2016 · 83353b8 · 83353b8
2 parents 855ac39 + c221a5f
commit 83353b8
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git a/src/utils/applyMiddleware.js → src/applyMiddleware.js b/src/utils/applyMiddleware.js → src/applyMiddleware.js
diff --git a/src/utils/bindActionCreators.js → src/bindActionCreators.js b/src/utils/bindActionCreators.js → src/bindActionCreators.js
@@ -1,4 +1,4 @@
-import mapValues from './mapValues'
+import mapValues from './utils/mapValues'
 
 function bindActionCreator(actionCreator, dispatch) {
   return (...args) => dispatch(actionCreator(...args))

diff --git a/src/utils/combineReducers.js → src/combineReducers.js b/src/utils/combineReducers.js → src/combineReducers.js
@@ -1,7 +1,7 @@
-import { ActionTypes } from '../createStore'
-import isPlainObject from './isPlainObject'
-import mapValues from './mapValues'
-import pick from './pick'
+import { ActionTypes } from './createStore'
+import isPlainObject from './utils/isPlainObject'
+import mapValues from './utils/mapValues'
+import pick from './utils/pick'
 
 /* eslint-disable no-console */
 

diff --git a/src/utils/compose.js → src/compose.js b/src/utils/compose.js → src/compose.js
diff --git a/src/index.js b/src/index.js
@@ -1,8 +1,8 @@
 import createStore from './createStore'
-import combineReducers from './utils/combineReducers'
-import bindActionCreators from './utils/bindActionCreators'
-import applyMiddleware from './utils/applyMiddleware'
-import compose from './utils/compose'
+import combineReducers from './combineReducers'
+import bindActionCreators from './bindActionCreators'
+import applyMiddleware from './applyMiddleware'
+import compose from './compose'
 
 export {
   createStore,

diff --git a/test/utils/applyMiddleware.spec.js → test/applyMiddleware.spec.js b/test/utils/applyMiddleware.spec.js → test/applyMiddleware.spec.js
@@ -1,8 +1,8 @@
 import expect from 'expect'
-import { createStore, applyMiddleware } from '../../src/index'
-import * as reducers from '../helpers/reducers'
-import { addTodo, addTodoAsync, addTodoIfEmpty } from '../helpers/actionCreators'
-import { thunk } from '../helpers/middleware'
+import { createStore, applyMiddleware } from '../src/index'
+import * as reducers from './helpers/reducers'
+import { addTodo, addTodoAsync, addTodoIfEmpty } from './helpers/actionCreators'
+import { thunk } from './helpers/middleware'
 
 describe('applyMiddleware', () => {
   it('wraps dispatch method with middleware once', () => {
@@ -69,7 +69,7 @@ describe('applyMiddleware', () => {
       {
         id: 1,
         text: 'Hello'
-      }, 
+      },
       {
         id: 2,
         text: 'World'
@@ -81,11 +81,11 @@ describe('applyMiddleware', () => {
         {
           id: 1,
           text: 'Hello'
-        }, 
+        },
         {
           id: 2,
           text: 'World'
-        }, 
+        },
         {
           id: 3,
           text: 'Maybe'

diff --git a/test/utils/bindActionCreators.spec.js → test/bindActionCreators.spec.js b/test/utils/bindActionCreators.spec.js → test/bindActionCreators.spec.js
@@ -1,7 +1,7 @@
 import expect from 'expect'
-import { bindActionCreators, createStore } from '../../src'
-import { todos } from '../helpers/reducers'
-import * as actionCreators from '../helpers/actionCreators'
+import { bindActionCreators, createStore } from '../src'
+import { todos } from './helpers/reducers'
+import * as actionCreators from './helpers/actionCreators'
 
 describe('bindActionCreators', () => {
   let store

diff --git a/test/utils/combineReducers.spec.js → test/combineReducers.spec.js b/test/utils/combineReducers.spec.js → test/combineReducers.spec.js
@@ -1,6 +1,6 @@
 import expect from 'expect'
-import { combineReducers } from '../../src'
-import createStore, { ActionTypes } from '../../src/createStore'
+import { combineReducers } from '../src'
+import createStore, { ActionTypes } from '../src/createStore'
 
 describe('Utils', () => {
   describe('combineReducers', () => {

diff --git a/test/utils/compose.spec.js → test/compose.spec.js b/test/utils/compose.spec.js → test/compose.spec.js
@@ -1,5 +1,5 @@
 import expect from 'expect'
-import { compose } from '../../src'
+import { compose } from '../src'
 
 describe('Utils', () => {
   describe('compose', () => {