Merge 4d92369 into c77374b

Kunstmaan · Sep 18, 2020 · d5e03a5 · d5e03a5
2 parents c77374b + 4d92369
commit d5e03a5
Show file tree

Hide file tree

Showing 15 changed files with 14,450 additions and 7,490 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": [ "es2015" ]
-}
+    "presets": [ "@babel/preset-env" ]
+}
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v8.6
+v12
diff --git a/.travis.yml b/.travis.yml
@@ -105,5 +105,3 @@ jobs:
       php: 7.4
       env: PHPStan=true
       script: vendor/bin/phpstan analyse --no-progress
-
-
diff --git a/groundcontrol/admin-bundle.tasks.js b/groundcontrol/admin-bundle.tasks.js
@@ -6,11 +6,9 @@ import webpack from 'webpack';
 import consoleArguments from './console-arguments';
 
 import createEslintTask from './tasks/eslint';
-import createStylelintTask from './tasks/stylelint';
 import createCopyTask from './tasks/copy';
 import {createCssLocalTask, createCssOptimizedTask} from './tasks/css';
 import createScriptsTask from './tasks/scripts';
-import createServerTask from './tasks/server';
 import createBundleTask, {getBabelLoaderOptions} from './tasks/bundle';
 
 export const adminBundle = {
@@ -23,17 +21,17 @@ export const adminBundle = {
 };
 
 adminBundle.tasks.eslint = createEslintTask({
-    src: adminBundle.config.srcPath + 'jsnext/**/*.js',
+    src: `${adminBundle.config.srcPath}jsnext/**/*.js`,
     failAfterError: !consoleArguments.continueAfterTestError
 });
 
 adminBundle.tasks.copy = gulp.parallel(
-    createCopyTask({src: [adminBundle.config.srcPath + 'img/**'], dest: adminBundle.config.distPath + 'img'})
+    createCopyTask({src: [`${adminBundle.config.srcPath}img/**`], dest: `${adminBundle.config.distPath}img`})
 );
 
-adminBundle.tasks.cssLocal = createCssLocalTask({src: adminBundle.config.srcPath + 'scss/*.scss', dest: adminBundle.config.distPath + 'css'});
+adminBundle.tasks.cssLocal = createCssLocalTask({src: `${adminBundle.config.srcPath}scss/*.scss`, dest: `${adminBundle.config.distPath}css`});
 
-adminBundle.tasks.cssOptimized = createCssOptimizedTask({src: adminBundle.config.srcPath + 'scss/*.scss', dest: adminBundle.config.distPath + 'css'});
+adminBundle.tasks.cssOptimized = createCssOptimizedTask({src: `${adminBundle.config.srcPath}scss/*.scss`, dest: `${adminBundle.config.distPath}css`});
 
 adminBundle.tasks.scripts = createScriptsTask({
     src: [
@@ -51,17 +49,17 @@ adminBundle.tasks.scripts = createScriptsTask({
         './node_modules/jquery.typewatch/jquery.typewatch.js',
         './node_modules/ckeditor/ckeditor.js',
         './node_modules/ckeditor/adapters/jquery.js',
-        adminBundle.config.srcPath + 'js/**/*.js'
+        `${adminBundle.config.srcPath}js/**/*.js`
     ],
-    dest: adminBundle.config.distPath + 'js',
+    dest: `${adminBundle.config.distPath}js`,
     filename: 'admin-bundle.min.js'
 });
 
 adminBundle.tasks.bundle = createBundleTask({
     config: {
-        entry: adminBundle.config.srcPath + 'jsnext/app.js',
+        entry: `${adminBundle.config.srcPath}jsnext/app.js`,
         output: {
-            filename: adminBundle.config.distPath + 'js/admin-bundle.next.js',
+            filename: `${adminBundle.config.distPath}js/admin-bundle.next.js`
         },
         devtool: 'cheap-module-source-map',
         module: {
@@ -81,11 +79,14 @@ adminBundle.tasks.bundle = createBundleTask({
 
 adminBundle.tasks.bundleOptimized = createBundleTask({
     config: {
-        entry: adminBundle.config.srcPath + 'jsnext/app.js',
+        entry: `${adminBundle.config.srcPath}jsnext/app.js`,
         output: {
-            filename: adminBundle.config.distPath + 'js/admin-bundle.next.js',
+            filename: `${adminBundle.config.distPath}js/admin-bundle.next.js`
         },
         devtool: 'source-map',
+        optimization: {
+            minimize: true
+        },
         module: {
             rules: [
                 {
@@ -97,27 +98,21 @@ adminBundle.tasks.bundleOptimized = createBundleTask({
                     })
                 }
             ]
-        },
-        plugins: [
-            new webpack.optimize.UglifyJsPlugin({
-                mangle: true,
-                sourceMap: true,
-                output: {
-                    comments: false
-                }
-            })
-        ]
+        }
     },
     logStats: true
 });
 
 adminBundle.tasks.bundlePolyfills = createBundleTask({
     config: {
-        entry: ['babel-polyfill', adminBundle.config.srcPath + 'jsnext/polyfills.js'],
+        entry: ['babel-polyfill', `${adminBundle.config.srcPath}jsnext/polyfills.js`],
         output: {
-            filename: adminBundle.config.distPath + 'js/admin-bundle-polyfills.js',
+            filename: `${adminBundle.config.distPath}js/admin-bundle-polyfills.js`
         },
         devtool: 'source-map',
+        optimization: {
+            minimize: true
+        },
         module: {
             rules: [
                 {
@@ -129,16 +124,7 @@ adminBundle.tasks.bundlePolyfills = createBundleTask({
                     })
                 }
             ]
-        },
-        plugins: [
-            new webpack.optimize.UglifyJsPlugin({
-                mangle: true,
-                sourceMap: true,
-                output: {
-                    comments: false
-                }
-            })
-        ]
+        }
     },
     logStats: true
 });
diff --git a/groundcontrol/tasks/bundle.js b/groundcontrol/tasks/bundle.js
@@ -14,7 +14,7 @@ export default function createBundleTask({config = undefined, watch = false, log
         } else {
             compiler.run(handleWebpackResult);
         }
-        
+
         function handleWebpackResult(err, stats) {
             if (err) {
                 console.error(err.stack || err);
@@ -47,8 +47,8 @@ export function getBabelLoaderOptions({optimize = false, transpileOnlyForLastChr
         return {
             babelrc: false,
             presets: [
-                ['es2015', {
-                    // TODO
+                ['@babel/preset-env', {
+                    useBuiltIns: 'usage',
                     modules: false
                 }]
             ]
@@ -58,12 +58,17 @@ export function getBabelLoaderOptions({optimize = false, transpileOnlyForLastChr
     return {
         babelrc: false,
         presets: [
-            ['env', {
+            ['@babel/preset-env', {
+                useBuiltIns: 'usage',
                 targets: {
-                    browsers: ['last 2 Chrome versions']
+                    browsers: [
+                        '>0.25%',
+                        'not op_mini all'
+                    ]
                 }
             }]
         ],
+        plugins: ['@babel/plugin-transform-spread'],
         cacheDirectory: true
     };
 }
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -1,17 +1,17 @@
 /* eslint-env node */
 
 import gulp from 'gulp';
-import { adminBundle } from './groundcontrol/admin-bundle.tasks';
-import { dashboardBundle } from './groundcontrol/dashboard-bundle.tasks';
-import { mediaBundle } from './groundcontrol/media-bundle.tasks';
-import { translatorBundle } from './groundcontrol/translator-bundle.tasks';
-import startLocalTask, { buildOnChange } from './groundcontrol/start-local.task';
+import {adminBundle} from './groundcontrol/admin-bundle.tasks';
+import {dashboardBundle} from './groundcontrol/dashboard-bundle.tasks';
+import {mediaBundle} from './groundcontrol/media-bundle.tasks';
+import {translatorBundle} from './groundcontrol/translator-bundle.tasks';
+import startLocalTask, {buildOnChange} from './groundcontrol/start-local.task';
 import createBuildGroundControlSkeletonTask from './groundcontrol/tasks/build-gc-skeleton';
 
 
 // AdminBundle Tasks
 const analyzeAdminBundle = gulp.series(
-    adminBundle.tasks.eslint,
+    adminBundle.tasks.eslint
 );
 
 const buildLocalAdminBundle = gulp.series(
@@ -102,4 +102,4 @@ const startLocal = gulp.series(
 const buildGroundControlSkeleton = gulp.series(createBuildGroundControlSkeletonTask('./src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/groundcontrol'));
 
 // Export public tasks
-export { test, buildOptimized, testAndBuildOptimized, startLocal, buildGroundControlSkeleton };
+export {test, buildOptimized, testAndBuildOptimized, startLocal, buildGroundControlSkeleton};