Get rid of CommonJS module (#299)

reactjs · Jan 3, 2017 · a776118 · a776118
1 parent b261459
commit a776118
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/lib/components/Modal.js b/lib/components/Modal.js
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
 import ExecutionEnvironment from 'exenv';
 import elementClass from 'element-class';
 import ModalPortal from './ModalPortal';
-import ariaAppHider from '../helpers/ariaAppHider';
+import * as ariaAppHider from '../helpers/ariaAppHider';
 
 const renderSubtreeIntoContainer = ReactDOM.unstable_renderSubtreeIntoContainer;
 

diff --git a/lib/helpers/ariaAppHider.js b/lib/helpers/ariaAppHider.js
@@ -1,6 +1,12 @@
 let globalElement = typeof document !== 'undefined' ? document.body : null;
 
-function setElement (element) {
+function validateElement (appElement) {
+  if (!appElement && !globalElement) {
+    throw new Error('react-modal: You must set an element with `Modal.setAppElement(el)` to make this accessible');
+  }
+}
+
+export function setElement (element) {
   let newElement = element;
   if (typeof newElement === 'string') {
     const el = document.querySelectorAll(element);
@@ -10,34 +16,22 @@ function setElement (element) {
   return globalElement;
 }
 
-function validateElement (appElement) {
-  if (!appElement && !globalElement) {
-    throw new Error('react-modal: You must set an element with `Modal.setAppElement(el)` to make this accessible');
-  }
-}
-
-function hide (appElement) {
+export function hide (appElement) {
   validateElement(appElement);
   (appElement || globalElement).setAttribute('aria-hidden', 'true');
 }
 
-function show (appElement) {
+export function show (appElement) {
   validateElement(appElement);
   (appElement || globalElement).removeAttribute('aria-hidden');
 }
 
-function toggle (shouldHide, appElement) {
+export function toggle (shouldHide, appElement) {
   if (shouldHide) {
     hide(appElement);
   } else { show(appElement); }
 }
 
-function resetForTesting () {
+export function resetForTesting () {
   globalElement = document.body;
 }
-
-exports.toggle = toggle;
-exports.setElement = setElement;
-exports.show = show;
-exports.hide = hide;
-exports.resetForTesting = resetForTesting;
diff --git a/lib/index.js b/lib/index.js
@@ -1,2 +1,3 @@
-module.exports = require('./components/Modal');
+import Modal from './components/Modal';
 
+export default Modal;
diff --git a/specs/Modal.spec.js b/specs/Modal.spec.js
@@ -11,7 +11,7 @@ import sinon from 'sinon';
 import expect from 'expect';
 import ReactDOM from 'react-dom';
 import Modal from '../lib/components/Modal';
-import ariaAppHider from '../lib/helpers/ariaAppHider';
+import * as ariaAppHider from '../lib/helpers/ariaAppHider';
 import { renderModal, unmountModal } from './helper';
 
 const Simulate = TestUtils.Simulate;