Replace BpkParagraph and BpkHeading with BpkText in template

.travis.yml

@@ -9,6 +9,12 @@ cache:
   - node_modules
   - packages/create-react-app/node_modules
   - packages/react-scripts/node_modules
+# This causes builds for merges and direct pushes to master.
+# Other branches are pull requests and build are triggered via the
+# pull request hook
+branches:
+  only:
+    - master
 install: true
 script:
  - 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'

packages/react-scripts/CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## UNRELEASED
 
-_Nothing yet..._
+- Deprecated BpkHeading and BpkParagraph
+- Added BpkText component
+- Updated all other Backpack dependencies to latest versions
 
 ## 4.0.1 - 2017-07-27
 ### Fixed

packages/react-scripts/package.json

@@ -25,7 +25,7 @@
     "babel-loader": "7.0.0",
     "babel-preset-react-app": "^3.0.1",
     "babel-runtime": "6.23.0",
-    "bpk-mixins": "15.1.0",
+    "bpk-mixins": "16.0.0",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
     "css-loader": "0.28.4",
@@ -62,12 +62,11 @@
     "whatwg-fetch": "2.0.3"
   },
   "devDependencies": {
-    "bpk-component-button": "^1.6.33",
-    "bpk-component-code": "0.1.0",
-    "bpk-component-grid": "^1.1.0",
-    "bpk-component-heading": "^2.1.0",
-    "bpk-component-paragraph": "^0.3.0",
-    "bpk-stylesheets": "^3.2.38",
+    "bpk-component-button": "^1.6.41",
+    "bpk-component-code": "^1.0.2",
+    "bpk-component-grid": "^1.1.8",
+    "bpk-component-text": "^1.0.0",
+    "bpk-stylesheets": "^3.2.46",
     "react": "^15.5.4",
     "react-dom": "^15.5.4"
   },

packages/react-scripts/scripts/init.js

@@ -143,8 +143,7 @@ module.exports = function(
     'bpk-component-button',
     'bpk-component-code',
     'bpk-component-grid',
-    'bpk-component-heading',
-    'bpk-component-paragraph',
+    'bpk-component-text',
     'bpk-mixins',
     'bpk-stylesheets'
   );

packages/react-scripts/template/src/App.jsx

@@ -1,8 +1,7 @@
 import React from 'react';
 import { BpkCode } from 'bpk-component-code';
 import BpkButton from 'bpk-component-button';
-import BpkHeading from 'bpk-component-heading';
-import BpkParagraph from 'bpk-component-paragraph';
+import BpkText from 'bpk-component-text';
 import { BpkGridContainer, BpkGridRow, BpkGridColumn } from 'bpk-component-grid';
 
 import STYLES from './App.scss';
@@ -13,7 +12,7 @@ const App = () => (
       <BpkGridContainer>
         <BpkGridRow>
           <BpkGridColumn width={12}>
-            <BpkHeading level="h1">Welcome to React + Backpack</BpkHeading>
+            <BpkText tagName="h1" textStyle="xxl" className={STYLES.App__heading}>Welcome to React + Backpack</BpkText>
           </BpkGridColumn>
         </BpkGridRow>
       </BpkGridContainer>
@@ -22,9 +21,9 @@ const App = () => (
       <BpkGridContainer>
         <BpkGridRow>
           <BpkGridColumn width={12}>
-            <BpkParagraph>
+            <BpkText tagName="p" className={STYLES.App__text}>
               To get started, edit <BpkCode>src/App.jsx</BpkCode> and save to reload.
-            </BpkParagraph>
+            </BpkText>
             <BpkButton onClick={() => alert('It works!')}>Click me</BpkButton>
           </BpkGridColumn>
         </BpkGridRow>

packages/react-scripts/template/src/App.scss

@@ -19,4 +19,12 @@
   &__main {
     padding: $bpk-spacing-base 0;
   }
+
+  &__heading {
+    margin-bottom: $bpk-spacing-sm;
+  }
+
+  &__text {
+    margin-bottom: $bpk-spacing-sm;
+  }
 }