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

Standardise webpack configs 

Move webpack configs to a single location, in xpub-styleguide.
Use localIdentName to add module and original class names to the class name.
parent c84b3c22
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 136 additions and 706 deletions
packages/component-authentication/styleguide.config.js
+ 0
− 1
View file @ caa48777
...@@ -5,7 +5,6 @@ module.exports = { ...@@ -5,7 +5,6 @@ module.exports = {
Wrapper: require.resolve('xpub-styleguide/src/components/Wrapper') Wrapper: require.resolve('xpub-styleguide/src/components/Wrapper')
}, },
skipComponentsWithoutExample: true, skipComponentsWithoutExample: true,
webpackConfig: require('./webpack.config.js'),
serverPort: 6061, serverPort: 6061,
theme: { theme: {
fontFamily: { fontFamily: {
......
packages/component-authentication/webpack.config.js
+ 2
− 108
View file @ caa48777
process.env.BABEL_ENV = 'development' const webpackConfig = require('xpub-styleguide/src/webpack-config')
process.env.NODE_ENV = 'development'
const path = require('path') module.exports = webpackConfig(__dirname)
const nodeExternals = require('webpack-node-externals')
const include = [
path.join(__dirname, 'src'),
/xpub-[^/]+\/src/,
]
module.exports = {
entry: './src/index.js',
output: {
filename: 'index.js',
path: path.join(__dirname, 'dist')
},
devtool: 'cheap-module-source-map',
externals: [nodeExternals({
whitelist: [/\.(?!js$).{1,5}$/i]
})],
resolve: {
symlinks: false
},
module: {
rules: [
{
oneOf: [
// ES6 modules
{
test: /\.js$/,
include,
loader: 'babel-loader',
options: {
presets: [
['env', {
modules: false,
}],
'react',
'stage-2'
],
cacheDirectory: true,
},
},
// CSS modules
{
test: /\.local\.css$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
}
}
],
},
// SCSS modules
{
test: /\.local\.scss$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
importLoaders: 1
}
},
'sass-loader'
],
},
// global CSS
{
test: /\.css$/,
use: [
'style-loader',
'css-loader'
],
},
// global SCSS
{
test: /\.scss$/,
use: [
'style-loader',
'css-loader',
'sass-loader'
],
},
// Files
{
exclude: [/\.js$/, /\.html$/, /\.json$/],
loader: 'file-loader',
options: {
name: 'static/media/[name].[hash:8].[ext]',
}
}
]
}
]
}
}
packages/component-dashboard/styleguide.config.js
+ 0
− 1
View file @ caa48777
...@@ -8,7 +8,6 @@ module.exports = { ...@@ -8,7 +8,6 @@ module.exports = {
faker: 'faker' faker: 'faker'
}, },
skipComponentsWithoutExample: true, skipComponentsWithoutExample: true,
webpackConfig: require('./webpack.config.js'),
serverPort: 6062, serverPort: 6062,
theme: { theme: {
fontFamily: { fontFamily: {
......
packages/component-dashboard/webpack.config.js
+ 2
− 96
View file @ caa48777
process.env.BABEL_ENV = 'development' const webpackConfig = require('xpub-styleguide/src/webpack-config')
process.env.NODE_ENV = 'development'
const path = require('path') module.exports = webpackConfig(__dirname)
const webpack = require('webpack')
const nodeExternals = require('webpack-node-externals')
const include = [
path.join(__dirname, 'src'),
/pubsweet-[^/]+\/src/,
/xpub-[^/]+\/src/,
]
module.exports = {
entry: './src/index.js',
output: {
filename: 'index.js',
path: path.join(__dirname, 'dist'),
},
devtool: 'cheap-module-source-map',
externals: [nodeExternals({
whitelist: [/\.(?!js$).{1,5}$/i]
})],
resolve: {
symlinks: false
},
// plugins: [
// new webpack.ProvidePlugin({
// CONFIG: {
// 'pubsweet-server': {}
// }
// }),
// ],
module: {
rules: [
{
oneOf: [
// ES6 modules
{
test: /\.js$/,
include,
loader: 'babel-loader',
options: {
presets: [
['env', { modules: false }],
'react',
'stage-2'
],
cacheDirectory: true,
},
},
// CSS modules
{
test: /\.local\.css$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
}
}
],
},
// SCSS modules
{
test: /\.local\.scss$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
importLoaders: 1
}
},
'sass-loader'
],
},
// Files
{
exclude: [/\.js$/, /\.html$/, /\.json$/],
loader: 'file-loader',
options: {
name: 'static/media/[name].[hash:8].[ext]',
}
}
]
}
]
}
}
packages/component-manuscript/webpack.config.js
+ 3
− 1
View file @ caa48777
...@@ -54,6 +54,7 @@ module.exports = { ...@@ -54,6 +54,7 @@ module.exports = {
loader: 'css-loader', loader: 'css-loader',
options: { options: {
modules: true, modules: true,
localIdentName: '[name]_[local]-[hash:base64:8]',
} }
} }
], ],
...@@ -69,7 +70,8 @@ module.exports = { ...@@ -69,7 +70,8 @@ module.exports = {
loader: 'css-loader', loader: 'css-loader',
options: { options: {
modules: true, modules: true,
importLoaders: 1 localIdentName: '[name]_[local]-[hash:base64:8]',
importLoaders: 1,
} }
}, },
'sass-loader' 'sass-loader'
......
packages/component-review/styleguide.config.js
+ 0
− 1
View file @ caa48777
...@@ -8,7 +8,6 @@ module.exports = { ...@@ -8,7 +8,6 @@ module.exports = {
faker: 'faker' faker: 'faker'
}, },
skipComponentsWithoutExample: true, skipComponentsWithoutExample: true,
webpackConfig: require('./webpack.config.js'),
serverPort: 6065, serverPort: 6065,
theme: { theme: {
fontFamily: { fontFamily: {
......
packages/component-review/webpack.config.js
+ 2
− 111
View file @ caa48777
process.env.BABEL_ENV = 'development' const webpackConfig = require('xpub-styleguide/src/webpack-config')
process.env.NODE_ENV = 'development'
const path = require('path') module.exports = webpackConfig(__dirname)
const nodeExternals = require('webpack-node-externals')
const include = [
path.join(__dirname, 'src'),
/xpub-[^/]+\/src/,
]
module.exports = {
entry: './src/index.js',
output: {
filename: 'index.js',
path: path.join(__dirname, 'dist'),
},
devtool: 'cheap-module-source-map',
externals: [nodeExternals({
whitelist: [/\.(?!js$).{1,5}$/i]
})],
resolve: {
symlinks: false
},
module: {
rules: [
{
oneOf: [
// ES6 modules
{
test: /\.js$/,
include,
loader: 'babel-loader',
options: {
presets: [
['env', { modules: false }],
'react',
'stage-2'
],
cacheDirectory: true,
},
},
// CSS modules
{
test: /\.local\.css$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
}
}
],
},
// SCSS modules
{
test: /\.local\.scss$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
importLoaders: 1
}
},
'sass-loader'
],
},
// global CSS
{
test: /\.css$/,
use: [
'style-loader',
'css-loader'
],
},
// global SCSS
{
test: /\.scss$/,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
importLoaders: 1
}
},
'sass-loader'
],
},
// Files
{
exclude: [/\.js$/, /\.html$/, /\.json$/],
loader: 'file-loader',
options: {
name: 'static/media/[name].[hash:8].[ext]',
}
}
]
}
]
}
}
packages/component-submit/styleguide.config.js
+ 0
− 1
View file @ caa48777
...@@ -8,7 +8,6 @@ module.exports = { ...@@ -8,7 +8,6 @@ module.exports = {
faker: 'faker' faker: 'faker'
}, },
skipComponentsWithoutExample: true, skipComponentsWithoutExample: true,
webpackConfig: require('./webpack.config.js'),
serverPort: 6064, serverPort: 6064,
theme: { theme: {
fontFamily: { fontFamily: {
......
packages/component-submit/webpack.config.js
+ 2
− 111
View file @ caa48777
process.env.BABEL_ENV = 'development' const webpackConfig = require('xpub-styleguide/src/webpack-config')
process.env.NODE_ENV = 'development'
const path = require('path') module.exports = webpackConfig(__dirname)
const nodeExternals = require('webpack-node-externals')
const include = [
path.join(__dirname, 'src'),
/xpub-[^/]+\/src/,
]
module.exports = {
entry: './src/index.js',
output: {
filename: 'index.js',
path: path.join(__dirname, 'dist'),
},
devtool: 'cheap-module-source-map',
externals: [nodeExternals({
whitelist: [/\.(?!js$).{1,5}$/i]
})],
resolve: {
symlinks: false
},
module: {
rules: [
{
oneOf: [
// ES6 modules
{
test: /\.js$/,
include,
loader: 'babel-loader',
options: {
presets: [
['env', { modules: false }],
'react',
'stage-2'
],
cacheDirectory: true,
},
},
// CSS modules
{
test: /\.local\.css$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
}
}
],
},
// SCSS modules
{
test: /\.local\.scss$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
importLoaders: 1
}
},
'sass-loader'
],
},
// global CSS
{
test: /\.css$/,
use: [
'style-loader',
'css-loader'
],
},
// global SCSS
{
test: /\.scss$/,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
importLoaders: 1
}
},
'sass-loader'
],
},
// Files
{
exclude: [/\.js$/, /\.html$/, /\.json$/],
loader: 'file-loader',
options: {
name: 'static/media/[name].[hash:8].[ext]',
}
}
]
}
]
}
}
packages/xpub-edit/styleguide.config.js
+ 0
− 1
View file @ caa48777
...@@ -6,7 +6,6 @@ module.exports = { ...@@ -6,7 +6,6 @@ module.exports = {
}, },
serverPort: 6065, serverPort: 6065,
skipComponentsWithoutExample: true, skipComponentsWithoutExample: true,
webpackConfig: require('./webpack.config.js'),
context: { context: {
faker: 'faker' faker: 'faker'
}, },
......
packages/xpub-edit/webpack.config.js
+ 2
− 87
View file @ caa48777
process.env.BABEL_ENV = 'development' const webpackConfig = require('xpub-styleguide/src/webpack-config')
process.env.NODE_ENV = 'development'
const path = require('path') module.exports = webpackConfig(__dirname)
// const nodeExternals = require('webpack-node-externals')
const include = [
path.join(__dirname, 'src'),
/xpub-[^/]+\/src/,
]
module.exports = {
entry: './src/index.js',
output: {
filename: 'index.js',
path: path.join(__dirname, 'dist')
},
devtool: 'cheap-module-source-map',
// externals: [nodeExternals({
// whitelist: [/\.(?!js$).{1,5}$/i]
// })],
resolve: {
symlinks: false
},
module: {
rules: [
{
oneOf: [
// ES6 modules
{
test: /\.js$/,
include,
loader: 'babel-loader',
options: {
presets: [
['env', { modules: false }],
'react',
'stage-2'
],
cacheDirectory: true,
},
},
// CSS modules
{
test: /\.local\.css$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
}
}
],
},
// SCSS modules
{
test: /\.local\.scss$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
importLoaders: 1
}
},
'sass-loader'
],
},
// Files
{
exclude: [/\.js$/, /\.html$/, /\.json$/],
loader: 'file-loader',
options: {
name: 'static/media/[name].[hash:8].[ext]',
}
}
]
}
]
}
}
packages/xpub-styleguide/src/webpack-config.js 0 → 100644
+ 119
− 0
View file @ caa48777
process.env.BABEL_ENV = 'development'
process.env.NODE_ENV = 'development'
const path = require('path')
// const nodeExternals = require('webpack-node-externals')
module.exports = dir => {
const include = [
path.join(dir, 'src'),
/pubsweet-[^/]+\/src/,
/xpub-[^/]+\/src/,
]
return {
entry: './src/index.js',
output: {
filename: 'index.js',
path: path.join(dir, 'dist')
},
devtool: 'cheap-module-source-map',
// externals: [nodeExternals({
// whitelist: [/\.(?!js$).{1,5}$/i]
// })],
resolve: {
symlinks: false
},
module: {
rules: [
{
oneOf: [
// ES6 modules
{
test: /\.js$/,
include,
loader: 'babel-loader',
options: {
presets: [
['env', {modules: false}],
'react',
'stage-2'
],
cacheDirectory: true,
},
},
// CSS modules
{
test: /\.local\.css$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
// sourceMap: true,
localIdentName: '[name]_[local]-[hash:base64:8]',
}
}
],
},
// SCSS modules
{
test: /\.local\.scss$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
importLoaders: 1,
// sourceMap: true,
localIdentName: '[name]_[local]-[hash:base64:8]',
}
},
'sass-loader'
],
},
// global CSS
{
test: /\.css$/,
use: [
'style-loader',
'css-loader'
],
},
// global SCSS
{
test: /\.scss$/,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
importLoaders: 1,
}
},
'sass-loader'
],
},
// Files
{
exclude: [/\.js$/, /\.html$/, /\.json$/],
loader: 'file-loader',
options: {
name: 'static/media/[name].[hash:8].[ext]',
}
}
]
}
]
}
}
}
packages/xpub-styleguide/webpack.config.js
+ 2
− 75
View file @ caa48777
const path = require('path') const webpackConfig = require('./src/webpack')
const nodeExternals = require('webpack-node-externals')
const include = [ module.exports = webpackConfig(__dirname)
path.join(__dirname, 'src'),
/xpub-[^/]+\/src/,
]
module.exports = {
entry: './src/index.js',
output: {
filename: 'index.js',
path: path.join(__dirname, 'dist'),
},
devtool: 'cheap-module-source-map',
externals: [nodeExternals({
whitelist: [/\.(?!js$).{1,5}$/i]
})],
resolve: {
symlinks: false
},
module: {
rules: [
{
oneOf: [
// ES6 modules
{
test: /\.js$/,
include,
loader: 'babel-loader',
options: {
presets: [
['env', { modules: false }],
'react',
'stage-2'
],
cacheDirectory: true,
},
},
// CSS modules
{
test: /\.local\.css$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
}
}
],
},
// SCSS modules
{
test: /\.local\.scss$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
importLoaders: 1
}
},
'sass-loader'
],
}
]
}
]
}
}
packages/xpub-ui/styleguide.config.js
+ 0
− 1
View file @ caa48777
...@@ -8,7 +8,6 @@ module.exports = { ...@@ -8,7 +8,6 @@ module.exports = {
faker: 'faker', faker: 'faker',
}, },
skipComponentsWithoutExample: true, skipComponentsWithoutExample: true,
webpackConfig: require('./webpack.config.js'),
theme: { theme: {
fontFamily: { fontFamily: {
base: '"Fira Sans", sans-serif' base: '"Fira Sans", sans-serif'
......
packages/xpub-ui/webpack.config.js
+ 2
− 111
View file @ caa48777
process.env.BABEL_ENV = 'development' const webpackConfig = require('xpub-styleguide/src/webpack-config')
process.env.NODE_ENV = 'development'
const path = require('path') module.exports = webpackConfig(__dirname)
const nodeExternals = require('webpack-node-externals')
const include = [
path.join(__dirname, 'src'),
/xpub-[^/]+\/src/,
]
module.exports = {
entry: './src/index.js',
output: {
filename: 'index.js',
path: path.join(__dirname, 'dist')
},
devtool: 'cheap-module-source-map',
externals: [nodeExternals({
whitelist: [/\.(?!js$).{1,5}$/i]
})],
resolve: {
symlinks: false
},
module: {
rules: [
{
oneOf: [
// ES6 modules
{
test: /\.js$/,
include,
loader: 'babel-loader',
options: {
presets: [
['env', { modules: false }],
'react',
'stage-2'
],
cacheDirectory: true,
},
},
// CSS modules
{
test: /\.local\.css$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
}
}
],
},
// SCSS modules
{
test: /\.local\.scss$/,
include,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
importLoaders: 1
}
},
'sass-loader'
],
},
// global CSS
{
test: /\.css$/,
use: [
'style-loader',
'css-loader'
],
},
// global SCSS
{
test: /\.scss$/,
use: [
'style-loader',
{
loader: 'css-loader',
options: {
importLoaders: 1
}
},
'sass-loader'
],
},
// Files
{
exclude: [/\.js$/, /\.html$/, /\.json$/],
loader: 'file-loader',
options: {
name: 'static/media/[name].[hash:8].[ext]',
}
}
]
}
]
}
}
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