From 9143c015594e6b5e41eba921c93ed5a7eb2ff43e Mon Sep 17 00:00:00 2001
From: yyq <kingcoon@163.com>
Date: Tue, 12 Sep 2017 10:21:17 +0800
Subject: [PATCH] pack config
---
.npmrc | 1 +
public/build/dev-info.js | 12 ------------
public/build/postcss.config.js | 2 +-
public/build/webpack.base.config.js | 7 -------
public/build/webpack.dev.config.js | 21 +++------------------
5 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/.npmrc b/.npmrc
index 7cb3fa2..ceb5120 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
phantomjs_cdnurl=http://npm.taobao.org/mirrors/phantomjs
+registry=http://npm.yoho.cn
diff --git a/public/build/dev-info.js b/public/build/dev-info.js
index c914d81..57bb790 100644
--- a/public/build/dev-info.js
+++ b/public/build/dev-info.js
@@ -1,19 +1,7 @@
-const fs = require('fs');
-const path = require('path');
-
const info = {
host: '127.0.0.1',
port: 5002,
publicPath: 'http://127.0.0.1:5002'
};
-try {
- let dev = JSON.parse(fs.readFileSync(path.join(__dirname, '../../.devhost')));
-
- info.host = dev.host;
- info.publicPath = `http://${info.host}:${info.port}/`;
-} catch (e) {
- console.log(e);
-}
-
module.exports = info;
diff --git a/public/build/postcss.config.js b/public/build/postcss.config.js
index cdd2136..9086423 100644
--- a/public/build/postcss.config.js
+++ b/public/build/postcss.config.js
@@ -37,7 +37,7 @@ exports.postcssPlugin = (et) => {
return Promise.reject();
},
groupBy(file) {
- let dir = _.slice(file.styleFilePath.split('/'), -2);
+ let dir = _.slice(file.styleFilePath.split(path.sep), -2);
let group = dir[0];
file.retina = true;
diff --git a/public/build/webpack.base.config.js b/public/build/webpack.base.config.js
index 015ab84..be01902 100644
--- a/public/build/webpack.base.config.js
+++ b/public/build/webpack.base.config.js
@@ -51,13 +51,6 @@ const cssLoader = (env, type) => {
});
}
- if (env === 'dev') {
- loaders.unshift({
- loader: 'style-loader'
- });
- return loaders;
- }
-
return ExtractTextPlugin.extract({
fallback: type === 'css' ? 'style-loader' : 'vue-style-loader',
use: loaders
diff --git a/public/build/webpack.dev.config.js b/public/build/webpack.dev.config.js
index 50762cb..fe99539 100644
--- a/public/build/webpack.dev.config.js
+++ b/public/build/webpack.dev.config.js
@@ -3,7 +3,7 @@
const path = require('path');
const _ = require('lodash');
const webpack = require('webpack');
-const StyleLintPlugin = require('stylelint-webpack-plugin');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
const devInfo = require('./dev-info.js');
let baseConfig = require('./webpack.base.config.js');
@@ -14,20 +14,8 @@ _.mergeWith(baseConfig, {
output: {
publicPath: devInfo.publicPath
},
- module: {
- rules: [{
- enforce: 'pre',
- test: /(\.js|\.vue)$/,
- exclude: /node_modules/,
- loader: 'eslint-loader',
- options: {
- cache: true,
- formatter: require('eslint/lib/formatters/codeframe')
- }
- }]
- },
devServer: {
- host: '0.0.0.0',
+ host: '127.0.0.1',
port: devInfo.port,
publicPath: devInfo.publicPath,
contentBase: [path.join(__dirname, './bundle/'), path.join(__dirname, '../')],
@@ -45,10 +33,7 @@ _.mergeWith(baseConfig, {
}
},
plugins: [
- new StyleLintPlugin({
- files: ['public/scss/**/*.css', 'public/vue/**/*.vue'],
- syntax: 'scss'
- }),
+ new ExtractTextPlugin('[name].css'),
new webpack.HotModuleReplacementPlugin()
]
}, function customizer(objValue, srcValue) {
--
libgit2 0.24.0