Skip to content

Commit

Permalink
Merge pull request #8 from bootstrap-styled/dev
Browse files Browse the repository at this point in the history
feat(babel): upgrade to babel 7 and update @bootstrap-styled/v4
  • Loading branch information
kopax authored Nov 23, 2018
2 parents 953e7c8 + 6315aa4 commit 329d526
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 59 deletions.
35 changes: 0 additions & 35 deletions .babelrc

This file was deleted.

7 changes: 7 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
src
sonar-project.properties
.gitlab-ci.yml
.travis.yml
.npmrc
CONTRIBUTING.md
CODE_OF_CONDUCT.md
CHANGELOG.md
internals
babel.config.js
babel.ext.json
42 changes: 42 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
module.exports = {
only: [
'src',
'styleguide',
],
presets: [
[
'@babel/preset-env',
{
modules: false,
},
],
'@babel/preset-react',
],
plugins: [
'styled-components',
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-json-strings',
[
'@babel/plugin-proposal-decorators',
{
legacy: true,
},
],
],
env: {
production: {
plugins: [
'add-module-exports',
'@babel/plugin-transform-modules-commonjs',
],
},
test: {
plugins: [
'@babel/plugin-transform-modules-commonjs',
'dynamic-import-node',
],
},
},
};
48 changes: 25 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,34 +135,36 @@
]
},
"devDependencies": {
"@semantic-release/changelog": "^2.0.2",
"@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/plugin-transform-react-constant-elements": "^7.0.0",
"@babel/plugin-transform-react-inline-elements": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@semantic-release/changelog": "^3.0.1",
"@semantic-release/exec": "^3.3.0",
"@semantic-release/git": "^5.0.0",
"@semantic-release/git": "^7.0.5",
"@semantic-release/github": "^5.2.1",
"@semantic-release/npm": "^3.3.1",
"@yeutech-lab/rollup-umd-documentation": "^2.4.4",
"babel-cli": "^6.26.0",
"babel-eslint": "^7.2.3",
"babel-jest": "^22.4.1",
"babel-loader": "^7.1.4",
"@semantic-release/npm": "^5.1.1",
"@yeutech-lab/rollup-umd-documentation": "^2.4.5",
"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-plugin-array-includes": "^2.0.3",
"babel-plugin-dynamic-import-node": "^1.1.0",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-react-intl": "^2.4.0",
"babel-plugin-react-transform": "^3.0.0",
"babel-plugin-styled-components": "^1.5.1",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-constant-elements": "^6.23.0",
"babel-plugin-transform-react-inline-elements": "^6.22.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.13",
"babel-preset-env": "^1.6.1",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"babel-preset-stage-3": "^6.24.1",
"cz-conventional-changelog": "^2.1.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
Expand All @@ -187,7 +189,7 @@
"react-test-renderer": "^16.3.2",
"redux": "^4.0.1",
"rollup": "^0.57.1",
"rollup-plugin-babel": "^3.0.3",
"rollup-plugin-babel": "^4.0.1",
"rollup-plugin-cleanup": "^2.0.0",
"rollup-plugin-commonjs": "^9.1.0",
"rollup-plugin-inject": "^2.0.0",
Expand All @@ -198,7 +200,7 @@
"rollup-plugin-uglify": "^3.0.0",
"rollup-plugin-visualizer": "^0.5.0",
"rollup-watch": "^4.3.1",
"semantic-release": "^15.5.2",
"semantic-release": "^15.12.1",
"sinon": "^2.3.2",
"styled-components": "^4.1.1",
"toctoc": "^0.3.2",
Expand All @@ -217,7 +219,7 @@
"extract-intl:doc"
],
"dependencies": {
"@bootstrap-styled/v4": "^1.2.2",
"@bootstrap-styled/v4": "^1.2.6",
"prop-types": "^15.6.1"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const plugins = [
}),
json(),
babel({
plugins: ['external-helpers'],
babelrc: false,
exclude: 'node_modules/**',
}),
cleanup(),
Expand Down

0 comments on commit 329d526

Please sign in to comment.