WIP

iliakan · iliakan · commit 18bc82229925 · 2018-09-05T13:44:52.000+03:00
diff --git a/dev.cmd b/dev.cmd
@@ -3,11 +3,10 @@
 set NODE_LANG=%1
 @set NODE_ENV=development
 @set ASSET_VERSIONING=query
-@set WATCH=1
 @set NODE_PRESERVE_SYMLINKS=1
 @set NODE_PATH=./modules
 
-call gulp dev
+call gulp dev | bunyan
 
 goto :eof
 
diff --git a/edit.cmd b/edit.cmd
@@ -1,24 +1,23 @@
 @if "%~1"=="" goto usage
 
-@set TUTORIAL_ROOT="../javascript-tutorial-%1"
+@set TUTORIAL_ROOT=../javascript-tutorial-%1
 
 @if "%~2"=="" (
-    @set NODE_LANG=en
+    set NODE_LANG=en
 ) else (
-    @set NODE_LANG=%2
+    set NODE_LANG=%2
 )
 
 @set NODE_ENV=production
 @set TUTORIAL_EDIT=1
 @set ASSET_VERSIONING=query
-@set WATCH=1
 @set NODE_PRESERVE_SYMLINKS=1
 @set NODE_PATH=./modules
 
-call gulp edit
+call gulp edit | bunyan
 
 goto :eof
 
 :usage
-echo Usage: %0 <tutorial language> [<server language>]
-exit /B 1
+@echo "Usage: %0 <tutorial language> [<server language>]"
+@exit /B 1
diff --git a/modules/config/webpack.js b/modules/config/webpack.js
@@ -133,10 +133,6 @@ module.exports = function (config) {
 
     module: {
       rules:   [
-        {
-          test: /\.json$/,
-          use:  'json-loader'
-        },
         {
           test: /\.yml$/,
           use:  ['json-loader', 'yaml-loader']
diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "trace": "^3.1.0",
     "uglify-es": "^3",
     "uglifyjs-webpack-plugin": "^1",
-    "webpack": "^4",
+    "webpack": ">=4.17.2",
     "yaml-loader": "^0.5.0"
   },
   "engineStrict": true,
