Skip to content

Commit

Permalink
build(merge): merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Dimitri Kopriwa committed Dec 16, 2018
1 parent b3cd7f0 commit 5218eec
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 26 deletions.
5 changes: 4 additions & 1 deletion .npmignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ sonar-project.properties
.gitlab-ci.yml
internals
.babelrc
babel.config.js
babel.ext.json
babel.config.json
.editorconfig
.eslintignore
bundle-stats.html
CODE_OF_CONDUCT.md
CHANGELOG.md
README.md
CONTRIBUTING.md
declination.json
rollup.config.js
/styleguide.config.js
Expand Down
13 changes: 11 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# saga

[![Build Status](https://travis-ci.org/bootstrap-styled/saga.svg?branch=master)](https://travis-ci.org/bootstrap-styled/saga) [![npm Version](https://img.shields.io/npm/v/@bootstrap-styled/saga.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/saga) [![License](https://img.shields.io/npm/l/@bootstrap-styled/saga.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/saga) [![NPM monthly downloads](https://img.shields.io/npm/dm/@bootstrap-styled/saga.svg?style=flat)](https://npmjs.org/package/@bootstrap-styled/saga) [![NPM total downloads](https://img.shields.io/npm/dt/@bootstrap-styled/saga.svg?style=flat)](https://npmjs.org/package/@bootstrap-styled/saga) [![npm Version](https://img.shields.io/node/v/@bootstrap-styled/saga.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/saga) [![Module formats](https://img.shields.io/badge/module%20formats-umd%2C%20cjs%2C%20esm-green.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/saga)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=com.github.bootstrap-styled.saga&metric=coverage)](https://sonarcloud.io/dashboard?id=com.github.bootstrap-styled.saga) [![Quality gate status](https://sonarcloud.io/api/project_badges/measure?project=com.github.bootstrap-styled.saga&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.github.bootstrap-styled.saga) [![Greenkeeper badge](https://badges.greenkeeper.io/bootstrap-styled/saga.svg)](https://greenkeeper.io/)
[![Build Status](https://travis-ci.org/bootstrap-styled/saga.svg?branch=master)](https://travis-ci.org/bootstrap-styled/saga)
[![npm Version](https://img.shields.io/npm/v/@bootstrap-styled/saga.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/saga)
[![License](https://img.shields.io/npm/l/@bootstrap-styled/saga.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/saga)
[![NPM monthly downloads](https://img.shields.io/npm/dm/@bootstrap-styled/saga.svg?style=flat)](https://npmjs.org/package/@bootstrap-styled/saga)
[![NPM total downloads](https://img.shields.io/npm/dt/@bootstrap-styled/saga.svg?style=flat)](https://npmjs.org/package/@bootstrap-styled/saga)
[![npm Version](https://img.shields.io/node/v/@bootstrap-styled/saga.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/saga)
[![Module formats](https://img.shields.io/badge/module%20formats-umd%2C%20cjs%2C%20esm-green.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/saga)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=com.github.bootstrap-styled.saga&metric=coverage)](https://sonarcloud.io/dashboard?id=com.github.bootstrap-styled.saga)
[![Quality gate status](https://sonarcloud.io/api/project_badges/measure?project=com.github.bootstrap-styled.saga&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.github.bootstrap-styled.saga)
[![gitter](https://badges.gitter.im/bootstrap-styled/bootstrap-styled.svg)](https://gitter.im/bootstrap-styled)
[![Greenkeeper badge](https://badges.greenkeeper.io/bootstrap-styled/saga.svg)](https://greenkeeper.io/)

Bootstrap Styled Saga help you pull themes from a server

Expand Down
24 changes: 14 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"jsnext:main": "dist/@bootstrap-styled/saga.es.js",
"module": "dist/@bootstrap-styled/saga.es.js",
"homepage": "https://bootstrap-styled.github.io/saga",
"engines": {
"node": ">=8"
},
"browserslist": [
"IE >= 9",
"last 2 versions"
Expand Down Expand Up @@ -147,12 +150,13 @@
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@bootstrap-styled/documentation": "^1.1.1",
"@bootstrap-styled/redux": "^1.0.12",
"@rollup-umd/documentation": "^1.2.0",
"@semantic-release/changelog": "^3.0.1",
"@semantic-release/git": "^7.0.5",
"@semantic-release/github": "^5.2.1",
"@semantic-release/npm": "^5.1.1",
"@yeutech-lab/rollup-umd-documentation": "^2.4.5",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.4.2",
Expand All @@ -162,7 +166,7 @@
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-plugin-react-transform": "^3.0.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.13",
"bootstrap-styled": "^2.2.5",
"bootstrap-styled": "^2.3.0",
"cz-conventional-changelog": "^2.1.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
Expand All @@ -183,23 +187,23 @@
"raf": "^3.4.0",
"react": "^16.6.3",
"react-redux": "^6.0.0",
"react-styleguidist": "^8.0.4",
"react-styleguidist": "^8.0.6",
"react-test-renderer": "^16.3.2",
"react-transition-group": "^2.2.1",
"redux": "^4.0.1",
"redux-immutable": "^4.0.0",
"redux-saga": "^0.16.0",
"request": "^2.87.0",
"rollup": "^0.68.0",
"rollup-plugin-babel": "^4.0.1",
"rollup-plugin-babel": "^4.1.0",
"rollup-plugin-cleanup": "^3.0.0",
"rollup-plugin-commonjs": "^9.1.0",
"rollup-plugin-inject": "^2.0.0",
"rollup-plugin-commonjs": "^9.2.0",
"rollup-plugin-inject": "^2.2.0",
"rollup-plugin-json": "^3.1.0",
"rollup-plugin-node-builtins": "^2.1.2",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-uglify": "^6.0.0",
"rollup-plugin-replace": "^2.1.0",
"rollup-plugin-terser": "^3.0.0",
"rollup-plugin-visualizer": "^0.9.2",
"rollup-watch": "^4.3.1",
"semantic-release": "^15.8.0",
Expand All @@ -209,14 +213,14 @@
"webpack": "^4.16.1"
},
"dependencies": {
"@bootstrap-styled/toggle": "^1.0.10",
"@bootstrap-styled/toggle": "^1.1.0",
"prop-types": "^15.6.1",
"reselect": "^4.0.0"
},
"peerDependencies": {
"react": "^16.6.3",
"redux": "^4.0.1",
"react-redux": "^5.1.1",
"react-redux": "^6.0.0",
"redux-saga": "^0.16.0",
"styled-components": "^4.1.1",
"@bootstrap-styled/redux": "^1.0.12"
Expand Down
12 changes: 5 additions & 7 deletions rollup.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import commonjs from 'rollup-plugin-commonjs';
import inject from 'rollup-plugin-inject';
import babel from 'rollup-plugin-babel';
import json from 'rollup-plugin-json';
import uglify from 'rollup-plugin-uglify';
import { terser } from 'rollup-plugin-terser';
import cleanup from 'rollup-plugin-cleanup';
import visualizer from 'rollup-plugin-visualizer';
import builtins from 'rollup-plugin-node-builtins';
Expand Down Expand Up @@ -66,11 +66,9 @@ const plugins = [
cleanup(),
];

if (prod) plugins.push(uglify(), visualizer({ filename: './bundle-stats.html' }));

export default {
export default output.map((o) => ({
input: 'src/index.js',
external,
output,
plugins,
};
output: o,
plugins: prod ? plugins.concat([terser(), visualizer({ filename: './bundle-stats.html' })]) : plugins,
}));
8 changes: 2 additions & 6 deletions styleguide.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
const path = require('path');
const { config } = require('@yeutech-lab/rollup-umd-documentation/lib/styleguide.config.js');
const { createConfig } = require('@rollup-umd/documentation');

module.exports = {
...config,
require: [path.resolve(__dirname, 'styleguide/setup.js')],
};
module.exports = createConfig();

0 comments on commit 5218eec

Please sign in to comment.