📦 ⚡ Significantly restructure the directories

cooperka · cooperka · commit 18b629758604 · 2017-10-09T21:01:23.000-04:00
Subfolders for each type of list.

No longer export ImmutableListView as a default; name everything.
diff --git a/.npmignore b/.npmignore
@@ -1 +1,3 @@
-**/__tests__
+**/__tests__/
+/scripts/
+src/test-utils.js
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   "jest": {
     "preset": "react-native",
     "setupFiles": [
-      "./src/__tests__/setup.js"
+      "./scripts/setup-jest.js"
     ],
     "testRegex": "/src/.*__tests__/.+\\.test\\.js$",
     "modulePathIgnorePatterns": [
diff --git a/scripts/setup-jest.js b/scripts/setup-jest.js
diff --git a/src/ImmutableListView/EmptyListView.js b/src/ImmutableListView/EmptyListView.js
@@ -5,8 +5,8 @@ import { Text, ListView } from 'react-native';
 
 import ImmutableListView from './ImmutableListView';
 
-import styles from './styles';
-import utils from './utils';
+import styles from '../styles';
+import utils from '../utils';
 
 /**
  * A ListView that displays a single item showing that there is nothing to display.
@@ -84,4 +84,4 @@ class EmptyListView extends PureComponent {
 
 }
 
-export default EmptyListView;
+export { EmptyListView };
diff --git a/src/ImmutableListView/ImmutableListView.js b/src/ImmutableListView/ImmutableListView.js
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import React, { PureComponent } from 'react';
 import { Text, ListView, InteractionManager } from 'react-native';
 
-import styles from './styles';
-import utils from './utils';
+import styles from '../styles';
+import utils from '../utils';
 
-import EmptyListView from './EmptyListView';
+import { EmptyListView } from './EmptyListView';
 
 /**
  * A ListView capable of displaying {@link https://facebook.github.io/immutable-js/ Immutable} data
diff --git a/src/ImmutableListView/__tests__/EmptyListView.test.js b/src/ImmutableListView/__tests__/EmptyListView.test.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
 
-import { renderers } from './testUtils';
+import { renderers } from '../../test-utils';
 
-import EmptyListView from '../EmptyListView';
+import { EmptyListView } from '../EmptyListView';
 
 describe('EmptyListView', () => {
   it('renders with default text', () => {
diff --git a/src/ImmutableListView/__tests__/ImmutableListView.test.js b/src/ImmutableListView/__tests__/ImmutableListView.test.js
@@ -4,7 +4,7 @@ import renderer from 'react-test-renderer';
 
 import ImmutableListView from '../ImmutableListView';
 
-import { data, renderers, expectors } from './testUtils';
+import { data, renderers, expectors } from '../../test-utils';
 
 describe('ImmutableListView', () => {
   it('renders with empty data', () => {
diff --git a/src/ImmutableListView/__tests__/__snapshots__/EmptyListView.test.js.snap b/src/ImmutableListView/__tests__/__snapshots__/EmptyListView.test.js.snap
diff --git a/src/ImmutableListView/__tests__/__snapshots__/ImmutableListView.test.js.snap b/src/ImmutableListView/__tests__/__snapshots__/ImmutableListView.test.js.snap
diff --git a/src/ImmutableListView/index.js b/src/ImmutableListView/index.js
@@ -0,0 +1,2 @@
+export { default } from './ImmutableListView';
+export * from './EmptyListView';
diff --git a/src/ImmutableVirtualizedList/EmptyVirtualizedList.js b/src/ImmutableVirtualizedList/EmptyVirtualizedList.js
@@ -5,8 +5,8 @@ import { Text, VirtualizedList } from 'react-native';
 
 import ImmutableVirtualizedList from './ImmutableVirtualizedList';
 
-import styles from './styles';
-import utils from './utils';
+import styles from '../styles';
+import utils from '../utils';
 
 /**
  * A VirtualizedList that displays a single item showing that there is nothing to display.
@@ -83,4 +83,4 @@ class EmptyVirtualizedList extends PureComponent {
 
 }
 
-export default EmptyVirtualizedList;
+export { EmptyVirtualizedList };
diff --git a/src/ImmutableVirtualizedList/ImmutableVirtualizedList.js b/src/ImmutableVirtualizedList/ImmutableVirtualizedList.js
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import React, { PureComponent } from 'react';
 import { Text, VirtualizedList } from 'react-native';
 
-import styles from './styles';
-import utils from './utils';
+import styles from '../styles';
+import utils from '../utils';
 
-import EmptyVirtualizedList from './EmptyVirtualizedList';
+import { EmptyVirtualizedList } from './EmptyVirtualizedList';
 
 /**
  * A VirtualizedList capable of displaying {@link https://facebook.github.io/immutable-js/ Immutable} data
diff --git a/src/ImmutableVirtualizedList/__tests__/EmptyVirtualizedList.test.js b/src/ImmutableVirtualizedList/__tests__/EmptyVirtualizedList.test.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
 
-import { renderers } from './testUtils';
+import { renderers } from '../../test-utils';
 
-import EmptyVirtualizedList from '../EmptyVirtualizedList';
+import { EmptyVirtualizedList } from '../EmptyVirtualizedList';
 
 describe('EmptyVirtualizedList', () => {
   it('renders with default text', () => {
diff --git a/src/ImmutableVirtualizedList/__tests__/ImmutableVirtualizedList.test.js b/src/ImmutableVirtualizedList/__tests__/ImmutableVirtualizedList.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
 
-import { data, renderers, expectors } from './testUtils';
+import { data, renderers, expectors } from '../../test-utils';
 
 import ImmutableVirtualizedList from '../ImmutableVirtualizedList';
 
diff --git a/src/ImmutableVirtualizedList/__tests__/__snapshots__/EmptyVirtualizedList.test.js.snap b/src/ImmutableVirtualizedList/__tests__/__snapshots__/EmptyVirtualizedList.test.js.snap
diff --git a/src/ImmutableVirtualizedList/__tests__/__snapshots__/ImmutableVirtualizedList.test.js.snap b/src/ImmutableVirtualizedList/__tests__/__snapshots__/ImmutableVirtualizedList.test.js.snap
diff --git a/src/ImmutableVirtualizedList/index.js b/src/ImmutableVirtualizedList/index.js
@@ -0,0 +1,2 @@
+export { default } from './ImmutableVirtualizedList';
+export * from './EmptyVirtualizedList';
diff --git a/src/__tests__/comparison.test.js b/src/__tests__/comparison.test.js
@@ -1,4 +1,4 @@
-import { data, expectors } from './testUtils';
+import { data, expectors } from '../test-utils';
 
 describe('ImmutableListView vs. ListView', () => {
   it('renders the same as ListView with empty data', () => {
diff --git a/src/__tests__/utils.test.js b/src/__tests__/utils.test.js
@@ -1,6 +1,6 @@
 import Immutable from 'immutable';
 
-import { data } from './testUtils';
+import { data } from '../test-utils';
 
 import utils from '../utils';
 
diff --git a/src/index.js b/src/index.js
@@ -1,6 +1,9 @@
-export { default } from './ImmutableListView';
-export { default as ImmutableListView } from './ImmutableListView';
-export { default as EmptyListView } from './EmptyListView';
+export {
+  default as ImmutableListView,
+  EmptyListView,
+} from './ImmutableListView';
 
-export { default as ImmutableVirtualizedList } from './ImmutableVirtualizedList';
-export { default as EmptyVirtualizedList } from './EmptyVirtualizedList';
+export {
+  default as ImmutableVirtualizedList,
+  EmptyVirtualizedList,
+} from './ImmutableVirtualizedList';
diff --git a/src/test-utils.js b/src/test-utils.js
@@ -1,10 +1,12 @@
+/* eslint-disable import/no-extraneous-dependencies */
 import Immutable from 'immutable';
 import React from 'react';
 import { Text, ListView } from 'react-native';
 import renderer from 'react-test-renderer';
+/* eslint-enable */
 
-import ImmutableListView from '../ImmutableListView';
-import ImmutableVirtualizedList from '../ImmutableVirtualizedList';
+import ImmutableListView from './ImmutableListView';
+import ImmutableVirtualizedList from './ImmutableVirtualizedList';
 
 /**
  * Some common types of data you may want to render with ImmutableListView.
@@ -105,7 +107,7 @@ const mocks = {
     jest.doMock('ScrollView', () => mockScrollView);
 
     // eslint-disable-next-line global-require
-    return require('../ImmutableListView').default;
+    return require('./ImmutableListView').default;
   },
 
 };

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export { default } from './ImmutableListView';`
	`2`	`+export * from './EmptyListView';`