Skip to content

Commit

Permalink
Merge 3a0ba57 into f3c21b2
Browse files Browse the repository at this point in the history
  • Loading branch information
mobot11 committed Jan 11, 2019
2 parents f3c21b2 + 3a0ba57 commit 516525d
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ script:
jobs:
include:
- stage: "Fundamental-react: Test & Lint"
script: npm run lint && npm run test:coverage
script: npm run lint && npm run test:coveralls
- stage: Deploy
if: branch = master AND type != pull_request
before_deploy:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[![npm version](https://badge.fury.io/js/fundamental-react.svg)](//www.npmjs.com/package/fundamental-react)
[![Build Status](https://travis-ci.org/SAP/fundamental-react.svg?branch=master)](https://travis-ci.org/SAP/fundamental-react)
[![Coverage Status](https://coveralls.io/repos/github/SAP/fundamental-react/badge.svg?branch=master)](https://coveralls.io/github/SAP/fundamental-react?branch=master)

## Description

Expand Down
40 changes: 40 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"std-version:release": "standard-version -m \"chore(release): version %s\"",
"std-version": "standard-version -m \"chore(release): version %s build ${TRAVIS_BUILD_NUMBER} [ci skip]\"",
"test:coverage": "jest --coverage",
"test:coveralls": "jest --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"test:dev": "jest",
"test": "node scripts/test.js",
"watch-css": "npm run build-css && node-sass-chokidar --include-path ./src --include-path ./node_modules src/ -o src/ --watch --recursive"
Expand All @@ -37,10 +38,10 @@
"react-syntax-highlighter": "^9.0.1"
},
"devDependencies": {
"@babel/core": "7.1.0",
"@svgr/webpack": "2.4.1",
"@babel/cli": "^7.1.5",
"@babel/core": "7.1.0",
"@babel/polyfill": "^7.1.5",
"@svgr/webpack": "2.4.1",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "9.0.0",
"babel-jest": "23.6.0",
Expand All @@ -50,6 +51,7 @@
"bfj": "6.1.1",
"case-sensitive-paths-webpack-plugin": "2.1.2",
"chalk": "2.4.1",
"coveralls": "^3.0.2",
"css-loader": "1.0.0",
"dotenv": "6.0.0",
"dotenv-expand": "4.2.0",
Expand All @@ -59,14 +61,14 @@
"eslint-config-react-app": "^3.0.5",
"eslint-loader": "2.1.1",
"eslint-plugin-flowtype": "2.50.1",
"eslint-plugin-ie11": "^1.0.0",
"eslint-plugin-import": "2.14.0",
"eslint-plugin-jsx-a11y": "6.1.2",
"eslint-plugin-loosely-restrict-imports": "^0.1.15",
"eslint-plugin-react": "7.11.1",
"file-loader": "2.0.0",
"fork-ts-checker-webpack-plugin-alt": "0.4.14",
"fs-extra": "7.0.0",
"eslint-plugin-ie11": "^1.0.0",
"gh-pages": "^2.0.1",
"html-webpack-plugin": "4.0.0-alpha.2",
"identity-obj-proxy": "3.0.0",
Expand All @@ -90,10 +92,10 @@
"react-test-renderer": "^16.6.3",
"resolve": "1.8.1",
"sass-loader": "7.1.0",
"standard-version": "^4.4.0",
"style-loader": "0.23.0",
"terser-webpack-plugin": "1.1.0",
"url-loader": "1.1.1",
"standard-version": "^4.4.0",
"webpack": "4.19.1",
"webpack-dev-server": "^3.1.11",
"webpack-manifest-plugin": "2.0.4",
Expand Down

0 comments on commit 516525d

Please sign in to comment.