Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix some eslint errors on touched files

Browse Source 
Also package lock was tricky in how specifically it wanted to be
updated
This commit is contained in:
Matt Hughes
2018-12-03 13:45:45 -05:00
committed by Dave St.Germain
parent 0a33fb6bb6
commit 6264d75f49
4 changed files with 440 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
webpack.dev.config.js
View File

@@ -5,60 +5,59 @@
var Merge = require('webpack-merge');
var path = require('path');
var webpack = require('webpack');
// TODO: remove once common worker settings moved into common
var BundleTracker = require('webpack-bundle-tracker');
var _ = require('underscore');
var commonConfig = require('./webpack.common.config.js');
module.exports = _.values(Merge.smart(commonConfig, {
web: {
output: {
filename: '[name].js'
},
devtool: 'source-map',
plugins: [
new webpack.LoaderOptionsPlugin({
debug: true
}),
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('development')
})
],
module: {
rules: [
{
test: /(.scss|.css)$/,
include: [
/paragon/,
/font-awesome/
],
use: [
'style-loader',
{
loader: 'css-loader',
options: {
sourceMap: true,
modules: true,
localIdentName: '[name]__[local]'
web: {
output: {
filename: '[name].js'
},
devtool: 'source-map',
plugins: [
new webpack.LoaderOptionsPlugin({
debug: true
}),
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('development')
})
],
module: {
rules: [
{
test: /(.scss|.css)$/,
include: [
/paragon/,
/font-awesome/
],
use: [
'style-loader',
{
loader: 'css-loader',
options: {
sourceMap: true,
modules: true,
localIdentName: '[name]__[local]'
}
},
{
loader: 'sass-loader',
options: {
data: '$base-rem-size: 0.625; @import "paragon-reset";',
includePaths: [
path.join(__dirname, './node_modules/@edx/paragon/src/utils'),
path.join(__dirname, './node_modules/')
],
sourceMap: true
}
}
},
{
loader: 'sass-loader',
options: {
data: '$base-rem-size: 0.625; @import "paragon-reset";',
includePaths: [
path.join(__dirname, './node_modules/@edx/paragon/src/utils'),
path.join(__dirname, './node_modules/')
],
sourceMap: true
}
}
]
}
]
},
watchOptions: {
ignored: [/node_modules/, /\.git/]
]
}
]
},
watchOptions: {
ignored: [/node_modules/, /\.git/]
}
}
}}));
}));