Merge cf6ec1f into a6720df

danreeves · Apr 21, 2018 · e3fd4b9 · e3fd4b9
2 parents a6720df + cf6ec1f
commit e3fd4b9
Show file tree

Hide file tree

Showing 3 changed files with 6,205 additions and 4,938 deletions.
diff --git a/bin/test b/bin/test
@@ -1,13 +1,22 @@
 #!/usr/bin/env bash
 
+# Exit if something fails
+set -e
+
+npm run lint
+npm run typescript
+
+# Unit test React 15 and collect coverage
 npm run react:15
 npm run unit -- --coverage
 mv coverage/coverage-final.json coverage/coverage-react15.json
 
+# Unit test React 16 and collect coverage
 npm run react:16
 npm run unit -- --coverage
 mv coverage/coverage-final.json coverage/coverage-react16.json
 
+# Combine unit test coverage
 mkdir -p .nyc_output
 npx istanbul-merge \
   --out .nyc_output/coverage-final.json \
@@ -16,11 +25,15 @@ npx istanbul-merge \
 
 rm -rf coverage
 
+# Report coverage to coveralls.io
 npx nyc report --reporter=text-lcov | npx coveralls
+# Report coverage so that danger-plugin-istanbul-coverage can find it
 npx nyc report --reporter=json-summary
 
+# PR info bot
 npm run danger
 
+# Attempt to run E2E tests
 if [ -z "$SAUCE_USERNAME" ] && [ -z "$SAUCE_ACCESS_KEY"]; then
   echo
   echo "ATTENTION"

diff --git a/example/index.js b/example/index.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import { injectGlobal } from 'styled-components';
-import Theme from './components/theme';
+import ThemeProvider from './components/theme';
 import Body from './components/body';
 import Page from './components/page';
 import PageTitle from './components/page-title';
@@ -30,7 +30,7 @@ const HidesOnMobileSection = Section.extend`
 class App extends Component {
   render() {
     return (
-      <Theme>
+      <ThemeProvider>
         <Body>
           <Page>
             <PageTitle>React Tether</PageTitle>
@@ -83,7 +83,7 @@ class App extends Component {
             </Section>
           </Page>
         </Body>
-      </Theme>
+      </ThemeProvider>
     );
   }
 }