Skip to content

Commit

Permalink
Merge pull request #622 from GoOz/fix/ReactDocs
Browse files Browse the repository at this point in the history
fix: 🐛 Update dependencies for Styleguidist
  • Loading branch information
GoOz authored Oct 4, 2018
2 parents e05492c + ebdb44f commit 1f3f87a
Show file tree
Hide file tree
Showing 5 changed files with 2,677 additions and 966 deletions.
21 changes: 18 additions & 3 deletions docs/styleguide.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,22 @@ module.exports = {
}
],
components: '../react/**/*.jsx',
template: 'template.html',
template: {
head: {
meta: [
{
name: 'viewport',
content: 'width=device-width, initial-scale=1.0'
}
],
links: [
{
rel: 'stylesheet',
href: 'https://fonts.googleapis.com/css?family=Lato:400,700,300'
}
]
}
},
theme: {
fontFamily: {
base: 'Lato, sans-serif'
Expand All @@ -92,8 +107,8 @@ module.exports = {
path.join(__dirname, './style.styl'),
path.join(__dirname, './styleguide.setup')
],
showCode: false,
showUsage: false,
exampleMode: 'collapse',
usageMode: 'collapse',
context: {
utils: path.resolve(__dirname, 'utils'),
isTesting: path.resolve(__dirname, 'false'),
Expand Down
6 changes: 3 additions & 3 deletions docs/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ExtractTextPlugin = require('extract-text-webpack-plugin')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')

module.exports = {
resolve: {
Expand All @@ -18,7 +18,7 @@ module.exports = {
{
test: /\.styl$/,
loader: [
'style-loader',
MiniCssExtractPlugin.loader,
{
loader: 'css-loader',
options: {
Expand All @@ -36,5 +36,5 @@ module.exports = {
}
]
},
plugins: [new ExtractTextPlugin('[name].css')]
plugins: [new MiniCssExtractPlugin('[name].css')]
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"enzyme-adapter-react-15": "^1.0.5",
"eslint": "^4.18.2",
"eslint-config-cozy-app": "^0.5.1",
"extract-text-webpack-plugin": "^3.0.0",
"git-directory-deploy": "^1.5.1",
"husky": "^0.14.3",
"identity-obj-proxy": "^3.0.0",
Expand All @@ -71,13 +70,13 @@
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-redux": "^5.0.3",
"react-styleguidist": "^6.0.24",
"react-styleguidist": "7.3.8",
"react-test-renderer": "15.6.1",
"redux": "^3.6.0",
"semantic-release": "^15.5.0",
"style-loader": "^0.18.2",
"stylint": "^1.5.9",
"stylus-loader": "^3.0.1",
"stylus-loader": "^3.0.2",
"svg-sprite-loader": "^3.9.2",
"travis-deploy-once": "^5.0.0",
"webpack": "^4.17.2"
Expand All @@ -88,6 +87,7 @@
"date-fns": "^1.28.5",
"hammerjs": "^2.0.8",
"md5": "^2.2.0",
"mini-css-extract-plugin": "^0.4.3",
"normalize.css": "^7.0.0",
"preact-portal": "^1.1.2",
"pretty": "^2.0.0",
Expand Down
Loading

0 comments on commit 1f3f87a

Please sign in to comment.