Showing
3 changed files
with
27 additions
and
43 deletions
| @@ -39,7 +39,6 @@ | @@ -39,7 +39,6 @@ | ||
| 39 | "md5": "^2.1.0", | 39 | "md5": "^2.1.0", |
| 40 | "moment": "^2.14.1", | 40 | "moment": "^2.14.1", |
| 41 | "morgan": "^1.7.0", | 41 | "morgan": "^1.7.0", |
| 42 | - "oneapm": "^1.2.20", | ||
| 43 | "passport": "^0.3.2", | 42 | "passport": "^0.3.2", |
| 44 | "passport-douban": "0.0.1", | 43 | "passport-douban": "0.0.1", |
| 45 | "passport-local": "^1.0.0", | 44 | "passport-local": "^1.0.0", |
| @@ -61,48 +60,46 @@ | @@ -61,48 +60,46 @@ | ||
| 61 | "yoho-zookeeper": "^1.0.8" | 60 | "yoho-zookeeper": "^1.0.8" |
| 62 | }, | 61 | }, |
| 63 | "devDependencies": { | 62 | "devDependencies": { |
| 64 | - "autoprefixer": "^6.3.6", | 63 | + "autoprefixer": "^8.3.0", |
| 65 | "babel-core": "^6.26.0", | 64 | "babel-core": "^6.26.0", |
| 66 | "babel-loader": "^7.1.2", | 65 | "babel-loader": "^7.1.2", |
| 67 | "babel-plugin-transform-regenerator": "^6.26.0", | 66 | "babel-plugin-transform-regenerator": "^6.26.0", |
| 68 | "babel-plugin-transform-runtime": "^6.23.0", | 67 | "babel-plugin-transform-runtime": "^6.23.0", |
| 69 | "babel-preset-env": "^1.6.1", | 68 | "babel-preset-env": "^1.6.1", |
| 70 | "babel-preset-es2015": "^6.24.1", | 69 | "babel-preset-es2015": "^6.24.1", |
| 70 | + "babel-runtime": "^6.26.0", | ||
| 71 | "bootstrap": "^3.3.7", | 71 | "bootstrap": "^3.3.7", |
| 72 | - "css-loader": "^0.27.3", | 72 | + "css-loader": "^0.28.11", |
| 73 | "cssnano": "^3.10.0", | 73 | "cssnano": "^3.10.0", |
| 74 | - "eslint": "^3.16.0", | 74 | + "eslint": "^4.19.1", |
| 75 | "eslint-config-yoho": "^1.0.9", | 75 | "eslint-config-yoho": "^1.0.9", |
| 76 | "eslint-loader": "^1.6.3", | 76 | "eslint-loader": "^1.6.3", |
| 77 | "extract-text-webpack-plugin": "^4.0.0-beta.0", | 77 | "extract-text-webpack-plugin": "^4.0.0-beta.0", |
| 78 | "handlebars": "4.0.5", | 78 | "handlebars": "4.0.5", |
| 79 | - "handlebars-loader": "^1.4.0", | ||
| 80 | - "happypack": "^5.0.0-beta.3", | 79 | + "handlebars-loader": "^1.7.0", |
| 81 | "husky": "^0.11.4", | 80 | "husky": "^0.11.4", |
| 82 | "jquery-ui": "^1.12.1", | 81 | "jquery-ui": "^1.12.1", |
| 83 | - "nodemon": "1.9.2", | ||
| 84 | - "postcss-assets": "^4.0.1", | ||
| 85 | - "postcss-cachebuster": "^0.1.3", | ||
| 86 | - "postcss-calc": "^5.3.1", | 82 | + "nodemon": "^1.17.3", |
| 83 | + "postcss": "^6.0.21", | ||
| 84 | + "postcss-assets": "^5.0.0", | ||
| 85 | + "postcss-calc": "^6.0.1", | ||
| 87 | "postcss-center": "^1.0.0", | 86 | "postcss-center": "^1.0.0", |
| 88 | - "postcss-clearfix": "^1.0.0", | 87 | + "postcss-clearfix": "^2.0.1", |
| 89 | "postcss-crip": "^2.0.1", | 88 | "postcss-crip": "^2.0.1", |
| 90 | - "postcss-import": "^9.1.0", | 89 | + "postcss-import": "^11.1.0", |
| 91 | "postcss-loader": "^2.1.4", | 90 | "postcss-loader": "^2.1.4", |
| 92 | - "postcss-opacity": "^4.0.0", | ||
| 93 | - "postcss-position": "^0.5.0", | ||
| 94 | - "postcss-pxtorem": "^4.0.0", | ||
| 95 | - "postcss-scss": "^1.0.2", | ||
| 96 | - "postcss-short": "^3.0.3", | 91 | + "postcss-opacity": "^5.0.0", |
| 92 | + "postcss-position": "^1.0.0", | ||
| 93 | + "postcss-scss": "^1.0.5", | ||
| 94 | + "postcss-short": "^4.1.0", | ||
| 97 | "postcss-sprites": "^4.2.0", | 95 | "postcss-sprites": "^4.2.0", |
| 98 | - "postcss-use": "^2.3.0", | ||
| 99 | - "precss": "^1.4.0", | ||
| 100 | - "regenerator-runtime": "^0.11.1", | 96 | + "postcss-use": "^3.0.0", |
| 97 | + "precss": "^3.1.2", | ||
| 101 | "rewire": "^2.5.1", | 98 | "rewire": "^2.5.1", |
| 102 | - "shelljs": "^0.7.0", | ||
| 103 | - "style-loader": "^0.16.0", | ||
| 104 | - "stylelint": "^8.4.0", | ||
| 105 | - "stylelint-config-yoho": "^1.2.11", | 99 | + "shelljs": "^0.8.1", |
| 100 | + "style-loader": "^0.21.0", | ||
| 101 | + "stylelint": "^9.2.0", | ||
| 102 | + "stylelint-config-yoho": "^1.3.0", | ||
| 106 | "stylelint-formatter-table": "^1.0.3", | 103 | "stylelint-formatter-table": "^1.0.3", |
| 107 | "webpack": "^4.6.0", | 104 | "webpack": "^4.6.0", |
| 108 | "webpack-cli": "^2.0.15", | 105 | "webpack-cli": "^2.0.15", |
| @@ -6,20 +6,14 @@ | @@ -6,20 +6,14 @@ | ||
| 6 | 6 | ||
| 7 | 'use strict'; | 7 | 'use strict'; |
| 8 | 8 | ||
| 9 | -const os = require('os'); | ||
| 10 | const path = require('path'); | 9 | const path = require('path'); |
| 11 | const shelljs = require('shelljs'); | 10 | const shelljs = require('shelljs'); |
| 12 | const _ = require('lodash'); | 11 | const _ = require('lodash'); |
| 13 | const webpack = require('webpack'); | 12 | const webpack = require('webpack'); |
| 14 | -const HappyPack = require('happypack'); | ||
| 15 | const ExtractTextPlugin = require('extract-text-webpack-plugin'); | 13 | const ExtractTextPlugin = require('extract-text-webpack-plugin'); |
| 16 | const scss = require('postcss-scss'); | 14 | const scss = require('postcss-scss'); |
| 17 | const postcssConfig = require('./postcss.config.js'); | 15 | const postcssConfig = require('./postcss.config.js'); |
| 18 | 16 | ||
| 19 | -const happyThreadPool = HappyPack.ThreadPool({ // eslint-disable-line | ||
| 20 | - size: os.cpus().length | ||
| 21 | -}); | ||
| 22 | - | ||
| 23 | const hbsLoader = { | 17 | const hbsLoader = { |
| 24 | loader: 'handlebars-loader', | 18 | loader: 'handlebars-loader', |
| 25 | options: { | 19 | options: { |
| @@ -108,16 +102,14 @@ module.exports = (env) => { | @@ -108,16 +102,14 @@ module.exports = (env) => { | ||
| 108 | test: /\.js$/, | 102 | test: /\.js$/, |
| 109 | exclude: [/node_modules/], | 103 | exclude: [/node_modules/], |
| 110 | use: [{ | 104 | use: [{ |
| 111 | - loader: 'happypack/loader?id=js' | 105 | + loader: 'babel-loader' |
| 112 | }] | 106 | }] |
| 113 | }, { | 107 | }, { |
| 114 | test: /\.css$/, | 108 | test: /\.css$/, |
| 115 | use: cssLoader(env, 'css') | 109 | use: cssLoader(env, 'css') |
| 116 | }, { | 110 | }, { |
| 117 | test: /\.hbs$/, | 111 | test: /\.hbs$/, |
| 118 | - use: [{ | ||
| 119 | - loader: 'happypack/loader?id=hbs' | ||
| 120 | - }] | 112 | + use: hbsLoader |
| 121 | }] | 113 | }] |
| 122 | }, | 114 | }, |
| 123 | resolve: { | 115 | resolve: { |
| @@ -161,15 +153,10 @@ module.exports = (env) => { | @@ -161,15 +153,10 @@ module.exports = (env) => { | ||
| 161 | maxAssetSize: 512000 | 153 | maxAssetSize: 512000 |
| 162 | }, | 154 | }, |
| 163 | plugins: [ | 155 | plugins: [ |
| 164 | - new HappyPack({ | ||
| 165 | - id: 'js', | ||
| 166 | - threadPool: happyThreadPool, | ||
| 167 | - loaders: ['babel-loader'], | ||
| 168 | - }), | ||
| 169 | - new HappyPack({ | ||
| 170 | - id: 'hbs', | ||
| 171 | - threadPool: happyThreadPool, | ||
| 172 | - loaders: [hbsLoader] | 156 | + new webpack.LoaderOptionsPlugin({ |
| 157 | + options: { | ||
| 158 | + handlebarsLoader: {} | ||
| 159 | + } | ||
| 173 | }), | 160 | }), |
| 174 | new webpack.ProvidePlugin({ | 161 | new webpack.ProvidePlugin({ |
| 175 | $: 'yoho-jquery', | 162 | $: 'yoho-jquery', |
This diff could not be displayed because it is too large.
-
Please register or login to post a comment