Skip to content

Commit 3514607

Browse files
kopaxkopax
authored
Merge pull request #5 from bootstrap-styled/dev
Dev
2 parents 4c425cf + 40ac818 commit 3514607

File tree

10 files changed

+92
-60
lines changed

10 files changed

+92
-60
lines changed

‎.babelrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ sonar-project.properties
33
.gitlab-ci.yml
44
internals
55
.babelrc
6+
babel.ext.json
7+
babel.config.json
68
.editorconfig
79
.eslintignore
810
bundle-stats.html

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
# Job: Release
5959
- stage: release
60-
if: branch = master
60+
if: branch = master AND type = push AND fork = false
6161
node_js:
6262
- 'lts/*'
6363
skip_cleanup: true
@@ -66,7 +66,7 @@ jobs:
6666

6767
# Job: Page
6868
- stage: deploy
69-
if: branch = master
69+
if: branch = master AND type = push AND fork = false
7070
node_js:
7171
- 'lts/*'
7272
script:

‎babel.config.js

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
module.exports = {
2+
only: [
3+
'src',
4+
'styleguide',
5+
],
6+
presets: [
7+
[
8+
'@babel/preset-env',
9+
{
10+
modules: false,
11+
},
12+
],
13+
],
14+
plugins: [
15+
'@babel/plugin-syntax-dynamic-import',
16+
'@babel/plugin-syntax-import-meta',
17+
'@babel/plugin-proposal-class-properties',
18+
'@babel/plugin-proposal-json-strings',
19+
[
20+
'@babel/plugin-proposal-decorators',
21+
{
22+
legacy: true,
23+
},
24+
],
25+
],
26+
env: {
27+
production: {
28+
plugins: [
29+
'add-module-exports',
30+
'@babel/plugin-transform-modules-commonjs',
31+
],
32+
},
33+
test: {
34+
plugins: [
35+
'@babel/plugin-transform-modules-commonjs',
36+
'dynamic-import-node',
37+
],
38+
},
39+
},
40+
};

‎babel.ext.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"presets": [],
3+
"plugins": [
4+
"babel-plugin-array-includes"
5+
]
6+
}

‎docs/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[![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 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)
1+
[![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 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)
22

33
Bootstrap global utilities for bootstrap-styled. Toggle them individually in the [BootstrapProvider](https://bootstrap-styled.github.io/provider/) to permit or not their access globally in your application.

‎package.json

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929
"lint": "eslint src",
3030
"prepublish": "npm run build",
3131
"lint-staged": "lint-staged",
32+
"jsdoc-documentation": "jsdoc-documentation",
33+
"jsdoc": "jsdoc-documentation --file",
34+
"prestyleguide": "npm run jsdoc",
3235
"styleguide": "styleguidist server",
36+
"prestyleguide:build": "npm run jsdoc",
3337
"styleguide:build": "styleguidist build"
3438
},
3539
"repository": {
@@ -111,27 +115,30 @@
111115
}
112116
},
113117
"devDependencies": {
114-
"@semantic-release/changelog": "^3.0.0",
115-
"@semantic-release/git": "^7.0.5",
116-
"@semantic-release/github": "^5.2.1",
117-
"@semantic-release/npm": "^4.0.0",
118+
"@babel/cli": "^7.0.0",
119+
"@babel/core": "^7.0.0",
120+
"@babel/plugin-external-helpers": "^7.0.0",
121+
"@babel/plugin-proposal-class-properties": "^7.0.0",
122+
"@babel/plugin-proposal-decorators": "^7.0.0",
123+
"@babel/plugin-proposal-json-strings": "^7.0.0",
124+
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
125+
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
126+
"@babel/plugin-syntax-import-meta": "^7.0.0",
127+
"@babel/plugin-transform-modules-commonjs": "^7.0.0",
128+
"@babel/preset-env": "^7.0.0",
129+
"@bootstrap-styled/documentation": "^1.0.1",
118130
"@rollup-umd/documentation": "^1.0.17",
119-
"babel-cli": "^6.26.0",
120-
"babel-core": "^6.26.0",
121-
"babel-eslint": "^7.2.3",
122-
"babel-jest": "^22.4.1",
123-
"babel-loader": "^7.1.2",
131+
"@semantic-release/changelog": "^3.0.1",
132+
"@semantic-release/git": "^7.0.5",
133+
"@semantic-release/github": "^5.2.5",
134+
"@semantic-release/npm": "^5.1.1",
135+
"babel-core": "^7.0.0-bridge.0",
136+
"babel-eslint": "^9.0.0",
137+
"babel-jest": "^23.4.2",
138+
"babel-loader": "^8.0.0",
124139
"babel-plugin-add-module-exports": "^0.2.1",
125140
"babel-plugin-array-includes": "^2.0.3",
126141
"babel-plugin-dynamic-import-node": "^1.0.2",
127-
"babel-plugin-external-helpers": "^6.22.0",
128-
"babel-plugin-transform-class-properties": "^6.24.1",
129-
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
130-
"babel-plugin-transform-object-rest-spread": "^6.26.0",
131-
"babel-preset-env": "^1.6.0",
132-
"babel-preset-es2015": "^6.24.1",
133-
"babel-preset-stage-2": "^6.24.1",
134-
"babel-preset-stage-3": "^6.24.1",
135142
"cz-conventional-changelog": "^2.1.0",
136143
"enzyme": "^3.6.0",
137144
"enzyme-adapter-react-16": "^1.5.0",
@@ -148,10 +155,10 @@
148155
"pre-commit": "^1.2.2",
149156
"react": "^16.6.3",
150157
"react-dom": "^16.6.3",
151-
"react-styleguidist": "^8.0.4",
158+
"react-styleguidist": "^8.0.6",
152159
"rimraf": "^2.6.2",
153160
"rollup": "^0.57.1",
154-
"rollup-plugin-babel": "^3.0.3",
161+
"rollup-plugin-babel": "^4.0.1",
155162
"rollup-plugin-cleanup": "^2.0.0",
156163
"rollup-plugin-commonjs": "^9.1.0",
157164
"rollup-plugin-inject": "^2.0.0",
@@ -162,10 +169,10 @@
162169
"rollup-plugin-uglify": "^3.0.0",
163170
"rollup-plugin-visualizer": "^0.5.0",
164171
"rollup-watch": "^4.3.1",
165-
"semantic-release": "^15.8.0",
172+
"semantic-release": "^15.12.4",
166173
"sinon": "^3.3.0",
167174
"toctoc": "^0.3.2",
168-
"webpack": "^4.16.1"
175+
"webpack": "^4.27.1"
169176
},
170177
"jest": {
171178
"roots": [
@@ -209,9 +216,8 @@
209216
"build:readme"
210217
],
211218
"dependencies": {
212-
"@bootstrap-styled/utils": "^1.6.4",
213-
"@bootstrap-styled/css-mixins": "1.1.2",
214-
"color": "^1.0.3"
219+
"@bootstrap-styled/css-mixins": "1.2.0",
220+
"@bootstrap-styled/utils": "^1.6.4"
215221
},
216222
"publishConfig": {
217223
"registry": "https://registry.npmjs.org",

‎rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const plugins = [
6565
process: processShim,
6666
}),
6767
babel({
68-
plugins: ['external-helpers'],
68+
babelrc: false,
6969
exclude: 'node_modules/**',
7070
}),
7171
json(),

‎src/tests/index.test.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
const exported = require('../index');
2+
3+
describe('text exports', () => {
4+
Object.keys(exported).forEach((e) => {
5+
it(`${e} should be exported`, () => {
6+
expect(e).toBeDefined();
7+
});
8+
});
9+
});

‎styleguide/jsdoc.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
#!/usr/bin/env bash
2+
set -e

0 commit comments

Comments
 (0)