Skip to content
Snippets Groups Projects
Commit 4123adec authored by Alf Eaton's avatar Alf Eaton
Browse files

Move components to authentication component and add styleguide

parent f128dd64
No related branches found
No related tags found
No related merge requests found
import React from 'react' import React from 'react'
// import { Router, createMemoryHistory } from 'react-router'
import { Provider } from 'react-redux' import { Provider } from 'react-redux'
import { reducer as formReducer } from 'redux-form' import { reducer as formReducer } from 'redux-form'
import { createStore, combineReducers } from 'redux' import { createStore, combineReducers } from 'redux'
...@@ -21,14 +20,4 @@ const Wrapper = ({ children }) => ( ...@@ -21,14 +20,4 @@ const Wrapper = ({ children }) => (
</Provider> </Provider>
) )
/*const Wrapper = ({ children }) => (
<Provider store={store}>
<Router history={createMemoryHistory()}>
<div className={classes.root}>
{children}
</div>
</Router>
</Provider>
)*/
export default Wrapper export default Wrapper
module.exports = {
StyleGuideRenderer: require('./StyleGuideRenderer'),
Wrapper: require('./Wrapper')
}
module.exports = require('./components')
process.env.BABEL_ENV = 'development'
process.env.NODE_ENV = 'development'
const path = require('path')
const nodeExternals = require('webpack-node-externals')
module.exports = {
entry: './src/index.js',
output: {
filename: 'index.js',
path: path.join(__dirname, 'dist'),
library: 'xpub-styleguide',
libraryTarget: 'commonjs2'
},
devtool: 'cheap-module-source-map',
externals: [nodeExternals({
whitelist: [/\.(?!js$).{1,5}$/i]
})],
resolve: {
symlinks: false
},
module: {
rules: [
{
oneOf: [
// ES6 modules
{
test: /\.js$/,
include: [
path.join(__dirname, 'src'),
],
loader: 'babel-loader',
options: {
presets: [
['env', { modules: false }],
'react',
'stage-2'
],
cacheDirectory: true,
},
},
// CSS modules
{
test: /\.local\.css$/,
include: [
path.join(__dirname, 'src'),
],
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
}
}
],
}
]
}
]
}
}
...@@ -9,26 +9,28 @@ ...@@ -9,26 +9,28 @@
"main": "src", "main": "src",
"jsnext:main": "src", "jsnext:main": "src",
"dependencies": { "dependencies": {
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"classnames": "^2.2.5", "classnames": "^2.2.5",
"css-loader": "^0.28.5",
"file-loader": "^0.11.2",
"lodash": "^4.17.4",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"react": "^15.6.1", "react": "^15.6.1",
"react-dom": "^15.6.1", "react-dom": "^15.6.1",
"react-redux": "^5.0.6", "react-redux": "^5.0.6",
"react-router": "^3.0.5", "react-router": "^3.0.5",
"redux": "^3.6.0", "redux": "^3.6.0",
"redux-form": "^7.0.3",
"style-loader": "^0.18.2",
"xpub-fonts": "^0.0.2" "xpub-fonts": "^0.0.2"
}, },
"devDependencies": { "devDependencies": {
"babel-preset-react-app": "^3.0.2", "babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.0",
"babel-preset-minify": "^0.2.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"css-loader": "^0.28.4",
"faker": "^4.1.0", "faker": "^4.1.0",
"file-loader": "^0.11.2",
"xpub-styleguide": "^0.0.2",
"react-styleguidist": "^6.0.8", "react-styleguidist": "^6.0.8",
"style-loader": "^0.18.2",
"webpack": "^3.5.5", "webpack": "^3.5.5",
"webpack-node-externals": "^1.6.0" "webpack-node-externals": "^1.6.0"
}, },
......
export { default as AppBar } from './molecules/AppBar' export { default as AppBar } from './molecules/AppBar'
export { default as Login } from './molecules/Login'
export { default as Signup } from './molecules/Signup'
export { default as YesOrNo } from './molecules/YesOrNo' export { default as YesOrNo } from './molecules/YesOrNo'
const path = require('path') const styleguideComponents = require('xpub-styleguide')
module.exports = { module.exports = {
title: 'xpub-ui style guide', title: 'xpub-ui style guide',
styleguideComponents: { styleguideComponents,
StyleGuideRenderer: path.join(__dirname, 'lib/styleguide/StyleGuideRenderer'),
Wrapper: path.join(__dirname, 'lib/styleguide/Wrapper'),
},
context: { context: {
faker: 'faker', faker: 'faker',
}, },
......
...@@ -16,6 +16,9 @@ module.exports = { ...@@ -16,6 +16,9 @@ module.exports = {
externals: [nodeExternals({ externals: [nodeExternals({
whitelist: [/\.(?!js$).{1,5}$/i] whitelist: [/\.(?!js$).{1,5}$/i]
})], })],
resolve: {
symlinks: false
},
module: { module: {
rules: [ rules: [
{ {
...@@ -25,12 +28,14 @@ module.exports = { ...@@ -25,12 +28,14 @@ module.exports = {
test: /\.js$/, test: /\.js$/,
include: [ include: [
path.join(__dirname, 'src'), path.join(__dirname, 'src'),
path.join(__dirname, 'lib'), /xpub-[^/]+\/src/,
], ],
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {
presets: [ presets: [
'react-app', ['env', { modules: false }],
'react',
'stage-2'
], ],
cacheDirectory: true, cacheDirectory: true,
}, },
...@@ -41,7 +46,7 @@ module.exports = { ...@@ -41,7 +46,7 @@ module.exports = {
test: /\.local\.css$/, test: /\.local\.css$/,
include: [ include: [
path.join(__dirname, 'src'), path.join(__dirname, 'src'),
path.join(__dirname, 'lib'), /xpub-[^/]+\/src/,
], ],
use: [ use: [
'style-loader', 'style-loader',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment