Update dependencies

This commit is contained in:
QWp6t
2017-03-23 20:33:09 -07:00
parent 6b40db80fd
commit 69c55e9abb
6 changed files with 206 additions and 187 deletions

View File

@@ -1,6 +1,5 @@
const path = require('path');
const argv = require('minimist')(process.argv.slice(2));
const uniq = require('lodash/uniq');
const { argv } = require('yargs');
const merge = require('webpack-merge');
const userConfig = require('../config');

View File

@@ -1,5 +1,3 @@
const qs = require('qs');
/**
* Loop through webpack entry
* and add the hot middleware
@@ -8,10 +6,7 @@ const qs = require('qs');
*/
module.exports = (entry) => {
const results = {};
const hotMiddlewareScript = `webpack-hot-middleware/client?${qs.stringify({
timeout: 20000,
reload: true,
})}`;
const hotMiddlewareScript = 'webpack-hot-middleware/client?timeout=20000&reload=true';
Object.keys(entry).forEach((name) => {
results[name] = Array.isArray(entry[name]) ? entry[name].slice(0) : [entry[name]];

View File

@@ -1,7 +1,6 @@
'use strict'; // eslint-disable-line
const webpack = require('webpack');
const qs = require('qs');
const merge = require('webpack-merge');
const autoprefixer = require('autoprefixer');
const CleanPlugin = require('clean-webpack-plugin');
@@ -28,7 +27,7 @@ let webpackConfig = {
enforce: 'pre',
test: /\.js?$/,
include: config.paths.assets,
loader: 'eslint',
use: 'eslint',
},
{
test: /\.js$/,
@@ -39,10 +38,10 @@ let webpackConfig = {
{
test: /\.css$/,
include: config.paths.assets,
loader: ExtractTextPlugin.extract({
fallbackLoader: 'style',
use: ExtractTextPlugin.extract({
fallback: 'style',
publicPath: '../',
loader: [
use: [
`css?${sourceMapQueryStr}`,
'postcss',
],
@@ -51,10 +50,10 @@ let webpackConfig = {
{
test: /\.scss$/,
include: config.paths.assets,
loader: ExtractTextPlugin.extract({
fallbackLoader: 'style',
use: ExtractTextPlugin.extract({
fallback: 'style',
publicPath: '../',
loader: [
use: [
`css?${sourceMapQueryStr}`,
'postcss',
`resolve-url?${sourceMapQueryStr}`,
@@ -63,27 +62,22 @@ let webpackConfig = {
}),
},
{
test: /\.(png|jpe?g|gif|svg|ico)$/,
test: /\.(ttf|eot|png|jpe?g|gif|svg|ico)$/,
include: config.paths.assets,
loader: `file?${qs.stringify({
loader: 'file',
options: {
name: `[path]${assetsFilenames}.[ext]`,
})}`,
},
{
test: /\.(ttf|eot)$/,
include: config.paths.assets,
loader: `file?${qs.stringify({
name: `[path]${assetsFilenames}.[ext]`,
})}`,
},
},
{
test: /\.woff2?$/,
include: config.paths.assets,
loader: `url?${qs.stringify({
loader: 'url',
options: {
limit: 10000,
mimetype: 'application/font-woff',
name: `[path]${assetsFilenames}.[ext]`,
})}`,
},
},
{
test: /\.(ttf|eot|woff2?|png|jpe?g|gif|svg)$/,

View File

@@ -1,7 +1,7 @@
'use strict'; // eslint-disable-line
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const ImageminPlugin = require('imagemin-webpack-plugin').default;
const { default: ImageminPlugin } = require('imagemin-webpack-plugin');
const imageminMozjpeg = require('imagemin-mozjpeg');
const cssnano = require('cssnano');