Alexey Velikiy 5 лет назад
Родитель
Сommit
9b1443bf0f
4 измененных файлов с 18 добавлено и 40 удалено
  1. 1 1
      app.js
  2. 4 8
      build/webpack.base.conf.js
  3. 1 18
      build/webpack.dev.conf.js
  4. 12 13
      build/webpack.prod.conf.js

+ 1 - 1
app.js

@@ -8,7 +8,7 @@ app.set('view engine', 'ejs');
 app.set('views', resolve(__dirname, '..'));
 
 app.get('/', function(req, res) {
-   res.send("Hello world!");
+  res.send("Hello world!");
 });
 
 app.get('/test-module', function(req, res) {

+ 4 - 8
build/webpack.base.conf.js

@@ -1,10 +1,6 @@
-const path = require('path');
+const resolve = require('path').resolve
 
 
-function resolve(p) {
-  return path.resolve(__dirname, './../', p);
-}
-
 module.exports = {
   target: 'node',
   node: {
@@ -14,6 +10,6 @@ module.exports = {
   entry: [ './app.js' ],
   output: {
     filename: "app.js",
-    path: resolve('dist')
-  },
-}
+    path: resolve(__dirname, './../dist')
+  }
+}

+ 1 - 18
build/webpack.dev.conf.js

@@ -1,11 +1,4 @@
 const base = require('./webpack.base.conf');
-const webpack = require('webpack')
-const path = require('path')
-
-
-function resolve(p) {
-  return path.resolve(__dirname, './../', p);
-}
 
 
 base.mode = 'development';
@@ -19,14 +12,4 @@ base.externals = [
   }
 ]
 
-// base.plugins = [
-//   new webpack.ContextReplacementPlugin(
-//     /express\/lib/,
-//     resolve('node_modules'),
-//     {
-//       'ejs': 'lodash'
-//     }
-//   )
-// ]
-
-module.exports = base;
+module.exports = base;

+ 12 - 13
build/webpack.prod.conf.js

@@ -1,18 +1,17 @@
-var base = require('./webpack.base.conf');
+const base = require('./webpack.base.conf');
+const webpack = require('webpack')
+const resolve = require('path').resolve
 
-base.mode = 'production';
-base.externals = [
-  function(context, request, callback) {
 
-    if(request.toString === './view') {
-      console.log('context: ', context)
-      console.log('request: ', request.toString())
+base.mode = 'production';
+base.plugins = [
+  new webpack.ContextReplacementPlugin(
+    /express\/lib/,
+    resolve(__dirname, '../node_modules'),
+    {
+      'ejs': 'ejs'
     }
-    
-    //callback(null, "require('" + request + "')");
-    callback();
-    
-  }
-],
+  )
+]
 
 module.exports = base;