Merge pull request #295 from jandd/modernize-frontend-build

Modernize frontend build
devdaydresden · Oct 26, 2022 · 4f1bb92 · 4f1bb92
2 parents 26f211e + 4ffc14c
commit 4f1bb92
Show file tree

Hide file tree

Showing 29 changed files with 32,971 additions and 14,678 deletions.
diff --git a/devday/devday/static/css/style.css b/devday/devday/static/css/style.css
diff --git a/devday/devday/static/fonts/fa-brands-400.ttf b/devday/devday/static/fonts/fa-brands-400.ttf
diff --git a/devday/devday/static/fonts/fa-brands-400.woff2 b/devday/devday/static/fonts/fa-brands-400.woff2
diff --git a/devday/devday/static/fonts/fa-regular-400.ttf b/devday/devday/static/fonts/fa-regular-400.ttf
diff --git a/devday/devday/static/fonts/fa-regular-400.woff2 b/devday/devday/static/fonts/fa-regular-400.woff2
diff --git a/devday/devday/static/fonts/fa-solid-900.ttf b/devday/devday/static/fonts/fa-solid-900.ttf
diff --git a/devday/devday/static/fonts/fa-solid-900.woff2 b/devday/devday/static/fonts/fa-solid-900.woff2
diff --git a/devday/devday/static/fonts/fa-v4compatibility.ttf b/devday/devday/static/fonts/fa-v4compatibility.ttf
diff --git a/devday/devday/static/fonts/fa-v4compatibility.woff2 b/devday/devday/static/fonts/fa-v4compatibility.woff2
diff --git a/devday/devday/static/js/jquery.js b/devday/devday/static/js/jquery.js
diff --git a/devday/devday/static/js/main.js b/devday/devday/static/js/main.js
diff --git a/frontend/docker/Dockerfile b/frontend/docker/Dockerfile
@@ -1,17 +1,9 @@
-FROM node:8.12-stretch
+FROM node:lts
 MAINTAINER Jan Dittberner <jan.dittberner@t-systems.com>
 LABEL vendor=T-Systems\ Multimedia\ Solutions\ GmbH
-LABEL devday.release=0.1
 
 VOLUME /app /app/frontend/node_modules
 
-ARG http_proxy
-ARG no_proxy
-
-ENV http_proxy ${http_proxy}
-ENV https_proxy ${http_proxy}
-ENV no_proxy ${no_proxy}
-
 WORKDIR /app/frontend
 
 ENV PATH=/app/frontend/node_modules/.bin:$PATH

diff --git a/frontend/gulp/config.js b/frontend/gulp/config.js
@@ -6,40 +6,38 @@
  *
  */
 
-var basepath           = './';
-var assets             = '../devday/devday/static';
-var srcDir             = 'src';
-var nodemodules        = 'node_modules';
-var srcTest            = 'src-test';
-var fs                 = require('fs');
-var pkg                = JSON.parse(fs.readFileSync('./package.json'));
+const basepath = './';
+const assets = '../devday/devday/static';
+const srcDir = 'src';
+const nodemodules = 'node_modules';
+const fs = require('fs');
+const pkg = JSON.parse(fs.readFileSync('./package.json'));
 
 module.exports = {
     basepath: basepath,
     strings: {
         banner: [
             '/**',
-            ' * Build on <%= new Date().getFullYear() %>-<%= new Date().getMonth() + 1 %>-<%= new Date().getDate() %>',
             ' * @package ' + pkg.name + '',
-            ' * @version v' + pkg.version  + '',
+            ' * @version v' + pkg.version + '',
             ' */',
             ''].join('\n')
     },
 
 
     environment: {
         string: 'env',
-        default: { env: process.env.NODE_ENV || 'development' },
+        default: {env: process.env.NODE_ENV || 'development'},
         production: 'production',
         development: 'development'
     },
 
     sass: {
-        src:  srcDir + '/scss/style.scss',
-        allsrc: [
-                srcDir + '/scss/*.scss',
-                srcDir + '/scss/components/*.scss',
-                nodemodules + '@fortawesome/fontawesome-free/scss/*.scss'
+        src: srcDir + '/scss/style.scss',
+        all_src: [
+            srcDir + '/scss/*.scss',
+            srcDir + '/scss/components/*.scss',
+            nodemodules + '@fortawesome/fontawesome-free/scss/*.scss'
         ],
         dest: assets + '/css',
         options: {
@@ -61,13 +59,13 @@ module.exports = {
             config: srcDir + '/scss/.scss-lint.yml',
             filePipeOutput: 'scss-lint-report.json',
             reporterOutputFormat: 'JSON',
-            maxBuffer: 600*1024,
+            maxBuffer: 600 * 1024,
             endless: true
         }
     },
 
     js: {
-        src:  [
+        src: [
             nodemodules + '/jquery/dist/jquery.js',
             nodemodules + '/popper.js/dist/umd/popper.js',
             nodemodules + '/popper.js/dist/umd/popper-utils.js',
@@ -104,22 +102,22 @@ module.exports = {
     },
 
     jquery: {
-        src:  [
-            'bower_components/jquery/dist/jquery.js'
+        src: [
+            nodemodules + '/jquery/dist/jquery.js'
         ],
-        dest: assets + '/js/'
+        dest: assets + '/js'
     },
 
     images: {
-        src:  [
+        src: [
             srcDir + '/assets/img/*.*',
             nodemodules + '/cropperjs/src/images/bg.png',
         ],
         dest: assets + '/img'
     },
 
     fonts: {
-        src:  [
+        src: [
             srcDir + '/assets/fonts/**/*',
             nodemodules + '/@fortawesome/fontawesome-free/webfonts/*'
         ],

diff --git a/frontend/gulp/tasks/content/copy-assets.js b/frontend/gulp/tasks/content/copy-assets.js
diff --git a/frontend/gulp/tasks/default.js b/frontend/gulp/tasks/default.js
diff --git a/frontend/gulp/tasks/development/clean.js b/frontend/gulp/tasks/development/clean.js
diff --git a/frontend/gulp/tasks/development/dev.js b/frontend/gulp/tasks/development/dev.js
diff --git a/frontend/gulp/tasks/development/fonts.js b/frontend/gulp/tasks/development/fonts.js
diff --git a/frontend/gulp/tasks/development/images.js b/frontend/gulp/tasks/development/images.js
diff --git a/frontend/gulp/tasks/development/jquery.js b/frontend/gulp/tasks/development/jquery.js
diff --git a/frontend/gulp/tasks/development/js.js b/frontend/gulp/tasks/development/js.js
diff --git a/frontend/gulp/tasks/development/lint-js.js b/frontend/gulp/tasks/development/lint-js.js
diff --git a/frontend/gulp/tasks/development/lint-sass.js b/frontend/gulp/tasks/development/lint-sass.js
diff --git a/frontend/gulp/tasks/development/sass.js b/frontend/gulp/tasks/development/sass.js
diff --git a/frontend/gulp/tasks/development/watch.js b/frontend/gulp/tasks/development/watch.js