Yuki Takei 8 лет назад
Родитель
Сommit
e67730db1d
3 измененных файлов с 11 добавлено и 23 удалено
  1. 6 8
      config/webpack.common.js
  2. 4 11
      config/webpack.dev.js
  3. 1 4
      config/webpack.prod.js

+ 6 - 8
config/webpack.common.js

@@ -10,15 +10,13 @@ const helpers = require('./helpers');
  */
  */
 const AssetsPlugin = require('assets-webpack-plugin');
 const AssetsPlugin = require('assets-webpack-plugin');
 const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
 const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 
 /*
 /*
  * Webpack configuration
  * Webpack configuration
  *
  *
  * See: http://webpack.github.io/docs/configuration.html#cli
  * See: http://webpack.github.io/docs/configuration.html#cli
  */
  */
-module.exports = function (options) {
-  isProd = options.env === 'production';
+module.exports = function(options) {
   return {
   return {
     entry: {
     entry: {
       'app':                  './resource/js/app',
       'app':                  './resource/js/app',
@@ -36,9 +34,9 @@ module.exports = function (options) {
     externals: {
     externals: {
       // require("jquery") is external and available
       // require("jquery") is external and available
       //  on the global var jQuery
       //  on the global var jQuery
-      "jquery": "jQuery",
-      "emojione": "emojione",
-      "hljs": "hljs",
+      'jquery': 'jQuery',
+      'emojione': 'emojione',
+      'hljs': 'hljs',
     },
     },
     resolve: {
     resolve: {
       extensions: ['.js', '.json'],
       extensions: ['.js', '.json'],
@@ -107,8 +105,8 @@ module.exports = function (options) {
       new webpack.IgnorePlugin(/^\.\/lib\/deflate\.js/, /markdown-it-plantuml/),
       new webpack.IgnorePlugin(/^\.\/lib\/deflate\.js/, /markdown-it-plantuml/),
 
 
       new webpack.ProvidePlugin({ // refs externals
       new webpack.ProvidePlugin({ // refs externals
-        jQuery: "jquery",
-        $: "jquery",
+        jQuery: 'jquery',
+        $: 'jquery',
       }),
       }),
 
 
     ]
     ]

+ 4 - 11
config/webpack.dev.js

@@ -12,8 +12,6 @@ const commonConfig = require('./webpack.common.js');
 /*
 /*
  * Webpack Plugins
  * Webpack Plugins
  */
  */
-const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const DllBundlesPlugin = require('webpack-dll-bundles-plugin').DllBundlesPlugin;
 const DllBundlesPlugin = require('webpack-dll-bundles-plugin').DllBundlesPlugin;
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 
@@ -22,17 +20,15 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
  */
  */
 const ANALYZE = process.env.ANALYZE;
 const ANALYZE = process.env.ANALYZE;
 const ENV = process.env.ENV = process.env.NODE_ENV = 'development';
 const ENV = process.env.ENV = process.env.NODE_ENV = 'development';
-const HOST = process.env.HOST || '0.0.0.0';
-const PORT = process.env.PORT || 3000;
 
 
 /*
 /*
  * Webpack configuration
  * Webpack configuration
  *
  *
  * See: http://webpack.github.io/docs/configuration.html#cli
  * See: http://webpack.github.io/docs/configuration.html#cli
  */
  */
-module.exports = function (options) {
+module.exports = function(options) {
   return webpackMerge(commonConfig({ env: ENV }), {
   return webpackMerge(commonConfig({ env: ENV }), {
-    devtool: 'source-map',
+    devtool: 'cheap-module-eval-source-map',
     entry: {
     entry: {
       dev: './resource/js/dev',
       dev: './resource/js/dev',
     },
     },
@@ -40,7 +36,6 @@ module.exports = function (options) {
       path: helpers.root('public/js'),
       path: helpers.root('public/js'),
       publicPath: '/js/',
       publicPath: '/js/',
       filename: '[name].bundle.js',
       filename: '[name].bundle.js',
-      sourceMapFilename: '[file].map',
     },
     },
     resolve: {
     resolve: {
       extensions: ['.js', '.json'],
       extensions: ['.js', '.json'],
@@ -51,7 +46,7 @@ module.exports = function (options) {
         {
         {
           test: /\.css$/,
           test: /\.css$/,
           use: [
           use: [
-            { loader: 'style-loader', options: { sourceMap: true } },
+            'style-loader',
             { loader: 'css-loader', options: { sourceMap: true } },
             { loader: 'css-loader', options: { sourceMap: true } },
           ],
           ],
           include: [helpers.root('resource/styles/scss')]
           include: [helpers.root('resource/styles/scss')]
@@ -59,7 +54,7 @@ module.exports = function (options) {
         {
         {
           test: /\.scss$/,
           test: /\.scss$/,
           use: [
           use: [
-            { loader: 'style-loader', options: { sourceMap: true } },
+            'style-loader',
             { loader: 'css-loader', options: { sourceMap: true } },
             { loader: 'css-loader', options: { sourceMap: true } },
             { loader: 'sass-loader', options: { sourceMap: true } },
             { loader: 'sass-loader', options: { sourceMap: true } },
           ],
           ],
@@ -69,8 +64,6 @@ module.exports = function (options) {
     },
     },
     plugins: [
     plugins: [
 
 
-      new ExtractTextPlugin('[name].bundle.css'),
-
       new DllBundlesPlugin({
       new DllBundlesPlugin({
         bundles: {
         bundles: {
           vendor: [
           vendor: [

+ 1 - 4
config/webpack.prod.js

@@ -10,7 +10,6 @@ const commonConfig = require('./webpack.common.js'); // the settings that are co
 /**
 /**
  * Webpack Plugins
  * Webpack Plugins
  */
  */
-const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin');
 const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin');
 const OptimizeJsPlugin = require('optimize-js-plugin');
 const OptimizeJsPlugin = require('optimize-js-plugin');
@@ -21,10 +20,8 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
  */
  */
 const ANALYZE = process.env.ANALYZE;
 const ANALYZE = process.env.ANALYZE;
 const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
 const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
-const HOST = process.env.HOST || 'localhost';
-const PORT = process.env.PORT || 3000;
 
 
-module.exports = function (env) {
+module.exports = function(env) {
   return webpackMerge(commonConfig({ env: ENV }), {
   return webpackMerge(commonConfig({ env: ENV }), {
     devtool: undefined,
     devtool: undefined,
     output: {
     output: {