From 02ef62d315e36cdb26da2dba402317c89bfda5f7 Mon Sep 17 00:00:00 2001 From: Tim von Oldenburg Date: Fri, 28 Jul 2017 13:38:46 +0100 Subject: [PATCH 1/3] Replace BpkParagraph and BpkHeading with BpkText in template --- packages/react-scripts/package.json | 13 ++++++------- packages/react-scripts/scripts/init.js | 3 +-- packages/react-scripts/template/src/App.jsx | 9 ++++----- packages/react-scripts/template/src/App.scss | 4 ++++ 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 793d27b042b..17bac1f4a37 100644 --- a/packages/react-scripts/package.json +++ b/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" }, diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js index 11cd60f30ba..a23141dabeb 100644 --- a/packages/react-scripts/scripts/init.js +++ b/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' ); diff --git a/packages/react-scripts/template/src/App.jsx b/packages/react-scripts/template/src/App.jsx index 056600c41bc..4e3fffcf8e1 100644 --- a/packages/react-scripts/template/src/App.jsx +++ b/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 = () => ( - Welcome to React + Backpack + Welcome to React + Backpack @@ -22,9 +21,9 @@ const App = () => ( - + To get started, edit src/App.jsx and save to reload. - + alert('It works!')}>Click me diff --git a/packages/react-scripts/template/src/App.scss b/packages/react-scripts/template/src/App.scss index da6bec77fec..450629b2595 100644 --- a/packages/react-scripts/template/src/App.scss +++ b/packages/react-scripts/template/src/App.scss @@ -19,4 +19,8 @@ &__main { padding: $bpk-spacing-base 0; } + + &__text { + margin-bottom: $bpk-spacing-sm; + } } From 1b0e84af58ef8560daa65d8af3ec8f1cf10f1360 Mon Sep 17 00:00:00 2001 From: Tim von Oldenburg Date: Fri, 28 Jul 2017 13:58:11 +0100 Subject: [PATCH 2/3] Changelog --- packages/react-scripts/CHANGELOG.md | 4 +++- packages/react-scripts/template/src/App.jsx | 2 +- packages/react-scripts/template/src/App.scss | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/react-scripts/CHANGELOG.md b/packages/react-scripts/CHANGELOG.md index 17ee2f45b2c..ce6ed526853 100644 --- a/packages/react-scripts/CHANGELOG.md +++ b/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 diff --git a/packages/react-scripts/template/src/App.jsx b/packages/react-scripts/template/src/App.jsx index 4e3fffcf8e1..ff9aded9ccc 100644 --- a/packages/react-scripts/template/src/App.jsx +++ b/packages/react-scripts/template/src/App.jsx @@ -12,7 +12,7 @@ const App = () => ( - Welcome to React + Backpack + Welcome to React + Backpack diff --git a/packages/react-scripts/template/src/App.scss b/packages/react-scripts/template/src/App.scss index 450629b2595..0fbc7132481 100644 --- a/packages/react-scripts/template/src/App.scss +++ b/packages/react-scripts/template/src/App.scss @@ -20,6 +20,10 @@ padding: $bpk-spacing-base 0; } + &__heading { + margin-bottom: $bpk-spacing-sm; + } + &__text { margin-bottom: $bpk-spacing-sm; } From c4d37dda91daf239547f1fdbf4e25fb042bdd5dc Mon Sep 17 00:00:00 2001 From: Tim von Oldenburg Date: Fri, 28 Jul 2017 14:25:05 +0100 Subject: [PATCH 3/3] Disable branch builds except for master --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 916962234d5..6144272f81f 100644 --- a/.travis.yml +++ b/.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'