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

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

@@ -7,7 +7,8 @@ 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 webpack       = require('webpack');
+const webpackStream = require('webpack-stream');
 const imagemin      = require('gulp-imagemin');
 const del           = require('del');
 const bump          = require('gulp-bump');
@@ -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-core": "^6.26.3",
-    "@babel/preset-env": "^7.0.0-beta.31",
+    "babel-loader": "^7.1.4",
-    "@babel/preset-es2015": "^7.0.0-beta.32",
+    "babel-minify-webpack-plugin": "^0.3.1",
-    "babel-loader": "^8.0.0-beta.0",
+    "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({

manager/src/frontend/js/app/api.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import $ from 'jquery';
+const $ = require('jquery');
 
 /**
  * @param {String} message

manager/src/frontend/js/app/controller.js

@@ -1,7 +1,6 @@
 'use strict';
 
-import Backbone from 'backbone';
+const Backbone = require('backbone');
-
 const Cache    = require('./cache');
 
 module.exports = {
@@ -21,8 +20,9 @@ module.exports = {
      * Dashboard
      */
     showDashboard: function () {
+        let controller = this;
         require(['./main', './dashboard/main'], (App, View) => {
-            this.navigate('/');
+            controller.navigate('/');
             App.UI.showMainLoading();
 
             let view = new View();
@@ -39,8 +39,9 @@ module.exports = {
      * Access
      */
     showAccess: function () {
+        let controller = this;
         require(['./main', './access/main'], (App, View) => {
-            this.navigate('/access');
+            controller.navigate('/access');
             App.UI.showMainLoading();
 
             let view = new View();

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

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

manager/src/frontend/js/app/dashboard/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/dashboard/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');
 const AccessListModel = require('../../models/access');

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

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

manager/src/frontend/js/app/host/404_form.js

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

manager/src/frontend/js/app/host/advanced.js

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

manager/src/frontend/js/app/host/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/host/proxy_form.js

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

manager/src/frontend/js/app/host/reconfigure.js

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

manager/src/frontend/js/app/host/redirection_form.js

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

manager/src/frontend/js/app/host/stream_form.js

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

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

@@ -1,9 +1,8 @@
 'use strict';
 
-import $ from 'jquery';
+const $          = require('jquery');
-import _ from 'underscore';
+const _          = require('underscore');
-import Backbone from 'backbone';
+const Backbone   = require('backbone');
-
 const Mn         = require('../lib/marionette');
 const Cache      = require('./cache');
 const Controller = require('./controller');

manager/src/frontend/js/app/ui/header/main.js

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

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

@@ -1,7 +1,6 @@
 'use strict';
 
-import Mn from 'backbone.marionette';
+const Mn         = require('backbone.marionette');
-
 const template   = require('./main.ejs');
 const HeaderView = require('./header/main');
 const Cache      = require('../cache');

manager/src/frontend/js/lib/helpers.js

@@ -1,7 +1,7 @@
 'use strict';
 
-import numeral from 'numeral';
+const numeral = require('numeral');
-import moment from 'moment';
+const moment  = require('moment');
 
 module.exports = {
 

manager/src/frontend/js/lib/marionette.js

@@ -1,7 +1,7 @@
 'use strict';
 
-import _ from 'underscore';
+const _  = require('underscore');
-import Mn from 'backbone.marionette';
+const Mn = require('backbone.marionette');
 
 let render         = Mn.Renderer.render;
 Mn.Renderer.render = function (template, data, view) {

manager/src/frontend/js/main.js

@@ -1,7 +1,7 @@
 'use strict';
 
-import promise from 'es6-promise';
+const promise = require('es6-promise');
-import $ from 'jquery';
+const $       = require('jquery');
 
 global.jQuery = $;
 global.$ = $;

manager/src/frontend/js/models/access.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import Backbone from 'backbone';
+const Backbone = require('backbone');
 
 const model = Backbone.Model.extend({
     idAttribute: '_id',

manager/src/frontend/js/models/access_item.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import Backbone from 'backbone';
+const Backbone = require('backbone');
 
 const model = Backbone.Model.extend({
     idAttribute: 'username',

manager/src/frontend/js/models/host.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import Backbone from 'backbone';
+const Backbone = require('backbone');
 
 const model = Backbone.Model.extend({
     idAttribute: '_id',

manager/webpack.config.js

@@ -1,7 +1,33 @@
+const path       = require('path');
 const webpack    = require('webpack');
 const Visualizer = require('webpack-visualizer-plugin');
 
 module.exports = {
+    entry:     {
+        main:  './src/frontend/js/main.js',
+    },
+    output:    {
+        path:       path.resolve(__dirname, 'dist'),
+        filename:   '[name].js',
+        publicPath: '/'
+    },
+
+    module:    {
+        rules: [
+            {
+                test:    /\.js$/,
+                exclude: /node_modules/,
+                use:     {
+                    loader: 'babel-loader'
+                }
+            },
+            {
+                test:   /\.ejs$/,
+                loader: 'ejs-loader'
+            }
+        ]
+    },
+/*
     context: __dirname + '/src/frontend/js',
     entry:   './main.js',
     output:  {
@@ -15,7 +41,7 @@ module.exports = {
             {
                 test:    /\.js$/,
                 exclude: /(node_modules|bower_components)/,
-                loader:  'babel-loader',
+                loader:  'babel-loader'//,
                 query:   {
                     presets: ['@babel/es2015']
                 }
@@ -26,6 +52,22 @@ module.exports = {
             }
         ]
     },
+*/
+    plugins:   [
+        new webpack.ProvidePlugin({
+            $:      'jquery',
+            jQuery: 'jquery',
+            _:      'underscore'
+        }),
+        new Visualizer({
+            filename: '../webpack_stats.html'
+        }),
+        new webpack.optimize.LimitChunkCountPlugin({
+            maxChunks:    1, // Must be greater than or equal to one
+            minChunkSize: 999999999
+        })
+    ]
+/*
     plugins: [
         new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
         new webpack.optimize.LimitChunkCountPlugin({
@@ -49,4 +91,5 @@ module.exports = {
             }
         })
     ]
+*/
 };