Skip to content

Commit

Permalink
some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
firestar300 committed Jul 26, 2018
1 parent 18c41f4 commit 6213aa1
Show file tree
Hide file tree
Showing 9 changed files with 581 additions and 702 deletions.
7 changes: 4 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
assets/js/vendor/*.js
assets/js/vendor_async/*.js
assets/js/vendor_ie/*.js
src/js/vendor/*.js
src/js/vendor_async/*.js
src/js/vendor_ie/*.js
src/js/polyfill/*.js
21 changes: 2 additions & 19 deletions config/browser-sync.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,12 @@
const BrowserSyncPlugin = require('browser-sync-webpack-plugin')
const config = require('./config')
const webpackDev = require('./webpack.dev')
const svgSprite = require('./../tasks/svg-sprite')

webpackDev.plugins.push(
new BrowserSyncPlugin(
{
host: '0.0.0.0',
port: 3001,
proxy: 'http://localhost:8080/',
files: [
{
match: ['src/**/*.svg', 'src/**/*.pug'],
fn: function(event, file) {
if (event === 'change') {
if (file.includes('.svg')) {
svgSprite()
}
const bs = require('browser-sync').get('bs-webpack-plugin')
setTimeout(() => {
bs.reload()
}, 3000)
}
},
},
],
proxy: 'http://localhost:' + config.devServer.port + '/',
},
{
reload: false,
Expand Down
2 changes: 1 addition & 1 deletion config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ module.exports = {
},
assetsPath: path.resolve('./dist/assets'),
assetsPublicPath: 'assets/',
port: 9090,
dev: process.env.NODE_ENV === 'dev',
devServer: {
contentBase: path.resolve('./dist/'),
overlay: true,
port: 8080,
},
}
2 changes: 1 addition & 1 deletion config/css-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = [
{
loader: 'postcss-loader',
options: {
plugins: loader => [require('css-mqpacker')(), require('autoprefixer')()],
plugins: loader => [require('autoprefixer')()],
},
},
]
6 changes: 4 additions & 2 deletions config/webpack.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ let webpackBase = {
{
test: /\.js$/,
exclude: /(node_modules|bower_components)/,
include: root,
enforce: 'pre',
use: [
{
loader: 'babel-loader',
Expand Down Expand Up @@ -124,6 +122,10 @@ let webpackBase = {
from: 'src/fonts/',
to: 'fonts/',
},
{
from: 'src/img/icons/',
to: 'img/icons/',
},
{
from: 'src/img/bg-sample/',
to: 'img/bg-sample/',
Expand Down
Loading

0 comments on commit 6213aa1

Please sign in to comment.