Fix JS build

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

Diff for: Dockerfile

@@ -7,7 +7,7 @@ RUN php -f composer.phar install \
 COPY . .
 RUN php -f composer.phar install --no-dev -o
 
-FROM node:9.5.0 as js-builder
+FROM node:10 as js-builder
 WORKDIR /app
 COPY package*.json /app/
 RUN npm install

Diff for: package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "build": "webpack --progress --hide-modules --config webpack.prod.js",
+    "build": "webpack --progress --config webpack.prod.js",
     "dev": "webpack --progress --watch --config webpack.dev.js"
   },
   "dependencies": {

Diff for: public/img/ajax-loader.gif renamed to src/img/ajax-loader.gif

@@ -15,7 +15,7 @@ body {
 }
 
 .loading {
-  background-image: url('/img/ajax-loader.gif');
+  background-image: url('../img/ajax-loader.gif');
   background-repeat: no-repeat;
   background-position: center;
 }

Diff for: src/style/weinstein.less

@@ -9,7 +9,7 @@ body {
 }
 
 .loading {
-	background-image: url('/img/ajax-loader.gif');
+	background-image: url('./img/ajax-loader.gif');
 	background-repeat: no-repeat;
 	background-position: center;
 }

Diff for: src/weinstein.less

@@ -9,9 +9,6 @@ module.exports = {
         filename: '[name].js',
         path: path.resolve(__dirname, 'public/js')
     },
-    node: {
-        fs: 'empty'
-    },
     module: {
         rules: [
             {

Diff for: webpack.common.js

@@ -1,4 +1,4 @@
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 
 module.exports = merge(common, {

Diff for: webpack.dev.js

@@ -1,7 +1,7 @@
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const common = require('./webpack.common.js')
 
 module.exports = merge(common, {
   mode: 'production',
-  devtool: '#source-map'
+  devtool: 'inline-cheap-module-source-map'
 })

Diff for: webpack.prod.js

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 // webpack.config.js
 const nodeExternals = require('webpack-node-externals')