Skip to content

Commit

Permalink
Merge pull request #8 from bootstrap-styled/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
kopax authored Dec 16, 2018
2 parents cd8256d + 0b58d0f commit 8a7c658
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 45 deletions.
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ babel.config.json
.eslintignore
bundle-stats.html
CODE_OF_CONDUCT.md
CONTRIBUTING.md
CHANGELOG.md
README.md
declination.json
rollup.config.js
/styleguide.config.js
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

[![Build Status](https://travis-ci.org/bootstrap-styled/css-utils.svg?branch=master)](https://travis-ci.org/bootstrap-styled/css-utils) [![npm Version](https://img.shields.io/npm/v/@bootstrap-styled/css-utils.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/css-utils) [![License](https://img.shields.io/npm/l/@bootstrap-styled/css-utils.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/css-utils) [![NPM monthly downloads](https://img.shields.io/npm/dm/@bootstrap-styled/css-utils.svg?style=flat)](https://npmjs.org/package/@bootstrap-styled/css-utils) [![NPM total downloads](https://img.shields.io/npm/dt/@bootstrap-styled/css-utils.svg?style=flat)](https://npmjs.org/package/@bootstrap-styled/css-utils) [![npm Version](https://img.shields.io/node/v/@bootstrap-styled/css-utils.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/css-utils) [![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/css-utils)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=com.github.bootstrap-styled.css-utils&metric=coverage)](https://sonarcloud.io/dashboard?id=com.github.bootstrap-styled.css-utils) [![Quality gate status](https://sonarcloud.io/api/project_badges/measure?project=com.github.bootstrap-styled.css-utils&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.github.bootstrap-styled.css-utils)
[![gitter](https://badges.gitter.im/bootstrap-styled/bootstrap-styled.svg)](https://gitter.im/bootstrap-styled)
[![Greenkeeper badge](https://badges.greenkeeper.io/bootstrap-styled/css-utils.svg)](https://greenkeeper.io/)

Bootstrap mixins and utilities in javascript for bootstrap-styled.

Expand Down
81 changes: 43 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"build:dist:watch": "rollup -c --watch",
"build:lib:watch": "npm run build:lib -- --watch",
"test": "npm run lint && npm run test:web",
"test:web": "NODE_ENV=test TEST_REPORT_PATH=reports jest --coverage",
"test:web": "NODE_ENV=test jest --coverage",
"test:clean": "rimraf ./coverage",
"test:watch": "npm run test -- --watch",
"lint": "eslint src",
Expand Down Expand Up @@ -115,62 +115,62 @@
}
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/plugin-external-helpers": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-decorators": "^7.0.0",
"@babel/plugin-proposal-json-strings": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-syntax-import-meta": "^7.0.0",
"@babel/plugin-transform-modules-commonjs": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@bootstrap-styled/documentation": "^1.0.1",
"@rollup-umd/documentation": "^1.0.17",
"@babel/cli": "^7.2.0",
"@babel/core": "^7.2.2",
"@babel/plugin-external-helpers": "^7.2.0",
"@babel/plugin-proposal-class-properties": "^7.2.1",
"@babel/plugin-proposal-decorators": "^7.2.2",
"@babel/plugin-proposal-json-strings": "^7.2.0",
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/plugin-transform-modules-commonjs": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"@bootstrap-styled/documentation": "^1.1.1",
"@rollup-umd/documentation": "^1.2.0",
"@semantic-release/changelog": "^3.0.1",
"@semantic-release/git": "^7.0.5",
"@semantic-release/github": "^5.2.5",
"@semantic-release/npm": "^5.1.1",
"@semantic-release/npm": "^5.1.2",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^9.0.0",
"babel-jest": "^23.4.2",
"babel-loader": "^8.0.0",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.4",
"babel-plugin-add-module-exports": "^1.0.0",
"babel-plugin-array-includes": "^2.0.3",
"babel-plugin-dynamic-import-node": "^1.0.2",
"babel-plugin-dynamic-import-node": "^2.2.0",
"cz-conventional-changelog": "^2.1.0",
"enzyme": "^3.6.0",
"enzyme-adapter-react-16": "^1.5.0",
"eslint": "^5.6.1",
"eslint": "^5.10.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-react": "^7.11.1",
"immutable": "^3.8.1",
"jest-cli": "^22.4.2",
"jest-sonar-reporter": "^1.3.0",
"lint-staged": "^4.1.3",
"jest-cli": "^23.6.0",
"jest-sonar-reporter": "^2.0.0",
"lint-staged": "^8.1.0",
"pre-commit": "^1.2.2",
"react": "^16.6.3",
"react-dom": "^16.6.3",
"react-styleguidist": "^8.0.6",
"rimraf": "^2.6.2",
"rollup": "^0.57.1",
"rollup-plugin-babel": "^4.0.1",
"rollup-plugin-cleanup": "^2.0.0",
"rollup-plugin-commonjs": "^9.1.0",
"rollup-plugin-inject": "^2.0.0",
"rollup-plugin-json": "^2.3.0",
"rollup": "^0.68.0",
"rollup-plugin-babel": "^4.1.0",
"rollup-plugin-cleanup": "^3.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": "^3.3.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-uglify": "^3.0.0",
"rollup-plugin-visualizer": "^0.5.0",
"rollup-plugin-node-resolve": "^4.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.12.4",
"sinon": "^3.3.0",
"semantic-release": "^15.13.0",
"sinon": "^7.2.2",
"toctoc": "^0.3.2",
"webpack": "^4.27.1"
},
Expand Down Expand Up @@ -206,6 +206,11 @@
"testRegex": "tests/.*\\.test\\.js$",
"testResultsProcessor": "jest-sonar-reporter"
},
"jestSonar": {
"reportPath": "reports",
"reportFile": "test-report.xml",
"indent": 2
},
"lint-staged": {
"*.js": [
"eslint --fix",
Expand All @@ -216,8 +221,8 @@
"build:readme"
],
"dependencies": {
"@bootstrap-styled/css-mixins": "1.2.0",
"@bootstrap-styled/utils": "^1.6.4"
"@bootstrap-styled/css-mixins": "1.3.0",
"@bootstrap-styled/utils": "^1.7.0"
},
"publishConfig": {
"registry": "https://registry.npmjs.org",
Expand Down
12 changes: 5 additions & 7 deletions rollup.config.js
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 pkg from './package.json';
Expand Down Expand Up @@ -72,11 +72,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,
}));

0 comments on commit 8a7c658

Please sign in to comment.