Merge branch 'master' of github.com:jc21/nginx-proxy-manager

Author: jc21

Jenkinsfile

@@ -63,9 +63,7 @@ pipeline {
               sh 'docker pull jc21/$IMAGE_NAME-base:armhf'
               sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install'
               sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf gulp build'
-              sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf rm -rf node_modules'
               sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install --prod'
-              sh 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS:latest-armhf node-prune'
 
               // Docker Build
               sh 'docker build --pull --no-cache --squash --compress -f Dockerfile.armhf -t $TEMP_IMAGE_NAME_ARM .'

manager/.babelrc

@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["env", {
+      "targets": {
+        "browsers": ["Chrome >= 65"]
+      },
+      "debug": false,
+      "modules": false,
+      "useBuiltIns": "usage"
+    }]
+  ]
+}

manager/gulpfile.js

@@ -2,18 +2,19 @@
 
 'use strict';
 
-const path        = require('path');
-const gulp        = require('gulp');
-const gutil       = require('gulp-util');
-const concat      = require('gulp-concat-util');
-const runSequence = require('run-sequence');
-const webpack     = require('webpack-stream');
-const imagemin    = require('gulp-imagemin');
-const del         = require('del');
-const bump        = require('gulp-bump');
-const sass        = require('gulp-sass');
-const ejs         = require('gulp-ejs');
-const PACKAGE     = require('./package.json');
+const path          = require('path');
+const gulp          = require('gulp');
+const gutil         = require('gulp-util');
+const concat        = require('gulp-concat-util');
+const runSequence   = require('run-sequence');
+const webpack       = require('webpack');
+const webpackStream = require('webpack-stream');
+const imagemin      = require('gulp-imagemin');
+const del           = require('del');
+const bump          = require('gulp-bump');
+const sass          = require('gulp-sass');
+const ejs           = require('gulp-ejs');
+const PACKAGE       = require('./package.json');
 
 const assets = {
     views:  {
@@ -123,7 +124,7 @@ gulp.task('scss', function () {
  */
 gulp.task('js', function () {
     return gulp.src(assets.js.src)
-        .pipe(webpack(require('./webpack.config.js')))
+        .pipe(webpackStream(require('./webpack.config.js'), webpack))
         .pipe(gulp.dest(assets.js.dest))
         .on('error', handleError);
 });

manager/package.json

@@ -19,10 +19,10 @@
     "winston": "^2.4.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0-beta.31",
-    "@babel/preset-env": "^7.0.0-beta.31",
-    "@babel/preset-es2015": "^7.0.0-beta.32",
-    "babel-loader": "^8.0.0-beta.0",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.4",
+    "babel-minify-webpack-plugin": "^0.3.1",
+    "babel-preset-env": "^1.7.0",
     "backbone": "1.3.3",
     "backbone-virtual-collection": "^0.6.15",
     "backbone.marionette": "3.4.1",
@@ -47,7 +47,8 @@
     "prepack-webpack-plugin": "^1.1.0",
     "run-sequence": "^2.2.0",
     "underscore": "^1.8.3",
-    "webpack": "^3.8.1",
+    "webpack": "^4.12.0",
+    "webpack-cli": "^3.0.8",
     "webpack-stream": "^4.0.0",
     "webpack-visualizer-plugin": "^0.1.11"
   },

manager/src/frontend/js/app/access/empty.js

@@ -1,7 +1,6 @@
 'use strict';
 
-import Mn from 'backbone.marionette';
-
+const Mn          = require('backbone.marionette');
 const template    = require('./empty.ejs');
 const AccessModel = require('../../models/access');
 const Controller  = require('../controller');

manager/src/frontend/js/app/access/main.js

@@ -1,7 +1,6 @@
 'use strict';
 
-import Mn from 'backbone.marionette';
-
+const Mn              = require('backbone.marionette');
 const Api             = require('../api');
 const template        = require('./main.ejs');
 const Controller      = require('../controller');

manager/src/frontend/js/app/access/row.js

@@ -1,7 +1,6 @@
 'use strict';
 
-import Mn from 'backbone.marionette';
-
+const Mn         = require('backbone.marionette');
 const template   = require('./row.ejs');
 const Controller = require('../controller');
 

manager/src/frontend/js/app/access_list/delete.js

@@ -1,7 +1,6 @@
 'use strict';
 
-import Mn from 'backbone.marionette';
-
+const Mn         = require('backbone.marionette');
 const template   = require('./delete.ejs');
 const Controller = require('../controller');
 const Api        = require('../api');

manager/src/frontend/js/app/access_list/form.js

@@ -1,7 +1,6 @@
 'use strict';
 
-import Mn from 'backbone.marionette';
-
+const Mn              = require('backbone.marionette');
 const _               = require('lodash');
 const template        = require('./form.ejs');
 const Controller      = require('../controller');

manager/src/frontend/js/app/access_list/item.js

@@ -1,7 +1,6 @@
 'use strict';
 
-import Mn from 'backbone.marionette';
-
+const Mn         = require('backbone.marionette');
 const template   = require('./item.ejs');
 
 module.exports = Mn.View.extend({