Use single webpack and npm config

.gitignore

@@ -15,17 +15,8 @@ web/typo3conf/ext/*
 !web/typo3conf/ext/ep_products/
 !web/typo3conf/ext/ep_theme/
 !web/typo3conf/ext/ep_track/
-web/typo3conf/ext/ep_events/Resources/Public/manifest.json
+web/typo3conf/ext/ep_events/Resources/Public/*
-web/typo3conf/ext/ep_events/Resources/Public/css/*
+web/typo3conf/ext/ep_theme/Resources/Public/*
-web/typo3conf/ext/ep_events/Resources/Public/fonts/*
-web/typo3conf/ext/ep_events/Resources/Public/images/*
-web/typo3conf/ext/ep_events/Resources/Public/js/*
-web/typo3conf/ext/ep_theme/Resources/Public/manifest.json
-web/typo3conf/ext/ep_theme/Resources/Public/css/*
-web/typo3conf/ext/ep_theme/Resources/Public/fonts/*
-web/typo3conf/ext/ep_theme/Resources/Public/images/*
-web/typo3conf/ext/ep_theme/Resources/Public/js/*
-!.gitkeep
 web/typo3conf/LocalConfiguration.php
 web/typo3conf/AdditionalConfiguration.php
 web/typo3conf/PackageStates.php

package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "epreisen",
+  "name": "epevents",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -44,9 +44,9 @@
       }
     },
     "@types/node": {
-      "version": "9.6.5",
+      "version": "9.6.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.5.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.6.tgz",
-      "integrity": "sha512-NOLEgsT6UiDTjnWG5Hd2Mg25LRyz/oe8ql3wbjzgSFeRzRROhPmtlsvIrei4B46UjERF0td9SZ1ZXPLOdcrBHg==",
+      "integrity": "sha512-SJe0g5cZeGNDP5sD8mIX3scb+eq8LQQZ60FXiKZHipYSeEFZ5EKml+NNMiO76F74TY4PoMWlNxF/YRY40FOvZQ==",
       "dev": true
     },
     "@types/tapable": {
@@ -78,7 +78,7 @@
       "integrity": "sha512-6a+XQjFMAJekCE7IxkDavoX8cGCEmTE+MrKeUK4CL0Q7SL9w4c5TdrYrUEzcJx3GX3I0fTIC79x0C07Pi5VmlA==",
       "dev": true,
       "requires": {
-        "@types/node": "9.6.5",
+        "@types/node": "9.6.6",
         "@types/tapable": "0.2.5",
         "@types/uglify-js": "3.0.2",
         "source-map": "0.6.1"
@@ -2047,7 +2047,7 @@
         "create-hmac": "1.1.7",
         "diffie-hellman": "5.0.3",
         "inherits": "2.0.3",
-        "pbkdf2": "3.0.14",
+        "pbkdf2": "3.0.16",
         "public-encrypt": "4.0.2",
         "randombytes": "2.0.6",
         "randomfill": "1.0.4"
@@ -4418,6 +4418,12 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
       "dev": true
     },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true
+    },
     "handle-thing": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
@@ -5259,16 +5265,16 @@
       "dev": true
     },
     "jquery": {
-      "version": "2.2.4",
+      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
-      "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI="
+      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
     },
     "jquery-lazy": {
       "version": "1.7.7",
       "resolved": "https://registry.npmjs.org/jquery-lazy/-/jquery-lazy-1.7.7.tgz",
       "integrity": "sha512-XPPWWMMQ0QPpjv2psFVOT2phmwSCwMQ9G+3QPpnOBFd7mVCnrfqoNKjZgbfKNo+Ely0q3bPCquRMTf99qqn5Dw==",
       "requires": {
-        "jquery": "2.2.4"
+        "jquery": "3.3.1"
       }
     },
     "js-base64": {
@@ -6173,6 +6179,18 @@
         }
       }
     },
+    "node-notifier": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz",
+      "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==",
+      "dev": true,
+      "requires": {
+        "growly": "1.3.0",
+        "semver": "5.5.0",
+        "shellwords": "0.1.1",
+        "which": "1.3.0"
+      }
+    },
     "node-sass": {
       "version": "4.8.3",
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.8.3.tgz",
@@ -6260,6 +6278,11 @@
         "sort-keys": "1.1.2"
       }
     },
+    "normalize.css": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-7.0.0.tgz",
+      "integrity": "sha1-q/sd2CRwZ04DIrU86xqvQSk45L8="
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -6527,7 +6550,7 @@
         "browserify-aes": "1.2.0",
         "create-hash": "1.2.0",
         "evp_bytestokey": "1.0.3",
-        "pbkdf2": "3.0.14"
+        "pbkdf2": "3.0.16"
       }
     },
     "parse-glob": {
@@ -6646,9 +6669,9 @@
       }
     },
     "pbkdf2": {
-      "version": "3.0.14",
+      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
-      "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
+      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
       "dev": true,
       "requires": {
         "create-hash": "1.2.0",
@@ -7009,7 +7032,7 @@
         "caniuse-api": "1.6.1",
         "postcss": "5.2.18",
         "postcss-selector-parser": "2.2.3",
-        "vendors": "1.0.1"
+        "vendors": "1.0.2"
       },
       "dependencies": {
         "browserslist": {
@@ -8475,6 +8498,12 @@
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
       "dev": true
     },
+    "shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true
+    },
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
@@ -8917,6 +8946,11 @@
         }
       }
     },
+    "sticky-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/sticky-js/-/sticky-js-1.2.0.tgz",
+      "integrity": "sha1-2lTs4DTMkGZG/KjDa8e19I7sVeI="
+    },
     "stream-browserify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
@@ -9561,9 +9595,9 @@
       "dev": true
     },
     "vendors": {
-      "version": "1.0.1",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
-      "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=",
+      "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==",
       "dev": true
     },
     "verror": {
@@ -9680,6 +9714,11 @@
         }
       }
     },
+    "vue-session": {
+      "version": "0.9.10",
+      "resolved": "https://registry.npmjs.org/vue-session/-/vue-session-0.9.10.tgz",
+      "integrity": "sha1-C/Wi3E5uZCFlHqCu+mj69uvD/rw="
+    },
     "vue-style-loader": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.0.tgz",
@@ -10037,6 +10076,17 @@
         }
       }
     },
+    "webpack-notifier": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/webpack-notifier/-/webpack-notifier-1.6.0.tgz",
+      "integrity": "sha1-/6yOVf+MRpdSuMG7sBGhbxCYbgI=",
+      "dev": true,
+      "requires": {
+        "node-notifier": "5.2.1",
+        "object-assign": "4.1.1",
+        "strip-ansi": "3.0.1"
+      }
+    },
     "webpack-sources": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz",

package.json

@@ -20,7 +20,13 @@
     "slick-carousel": "^1.8.0",
     "sticky-js": "^1.2.0",
     "vue": "^2.5.11",
-    "vue-session": "^0.9.10"
+    "vue-session": "^0.9.10",
+    "@fancyapps/fancybox": "^3.2.5",
+    "bootstrap": "^3.3.7",
+    "font-awesome": "^4.7.0",
+    "iframe-resizer": "^3.5.5",
+    "moment": "^2.19.4",
+    "picturefill": "^3.0.2"
   },
   "devDependencies": {
     "@symfony/webpack-encore": "^0.19.0",

web/typo3conf/ext/ep_events/webpack.config.js

@@ -1,21 +0,0 @@
-const Encore = require('@symfony/webpack-encore');
-
-Encore
-    .setOutputPath('./Resources/Public/')
-    .setPublicPath('/typo3conf/ext/ep_events/Resources/Public/')
-    .addEntry('main', './Resources/Private/Assets/js/main.js')
-    .addStyleEntry('rte', './Resources/Private/Assets/css/rte.css')
-    .enableSassLoader()
-    .enableVueLoader()
-    .autoProvidejQuery()
-    .enableSourceMaps(!Encore.isProduction())
-    .cleanupOutputBeforeBuild()
-    .enablePostCssLoader()
-    .configureFilenames({
-        js: 'js/[name].js',
-        css: 'css/[name].css',
-        images: 'images/[name].[ext]'
-    })
-;
-
-module.exports = Encore.getWebpackConfig();

web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js

@@ -10,6 +10,13 @@ require('../images/de.png');
 require('../images/fr.png');
 require('../images/badge_skipass.png');
 
+require('../images/logo_boarderweek.svg');
+require('../images/favicon_sbw.ico');
+require('../images/logo_snowzone.svg');
+require('../images/favicon_sz.ico');
+require('../images/logo_uni_champ.svg');
+require('../images/favicon_uch.ico');
+
 // Import dependencies
 import Vue from 'vue'
 import $ from 'jquery'

web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js

@@ -1,7 +0,0 @@
-'use strict';
-
-require('./app');
-
-require('../images/logo_boarderweek.svg');
-require('../images/favicon_sbw.ico');
-require('../scss/main_boarderweek.scss');

web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js

@@ -1,7 +0,0 @@
-'use strict';
-
-require('./app');
-
-require('../images/logo_snowzone.svg');
-require('../images/favicon_sz.ico');
-require('../scss/main_snowzone.scss');

web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js

@@ -1,8 +0,0 @@
-'use strict';
-
-require('./app');
-
-require('../images/logo_uni_champ.svg');
-require('../images/favicon_uch.ico');
-require('../scss/main_unichamp.scss');
-

web/typo3conf/ext/ep_theme/package.json

@@ -1,37 +0,0 @@
-{
-  "name": "epreisen",
-  "description": "EP Reisen TYPO3 website theme",
-  "version": "2.0.0",
-  "author": "Björn Fromme, [email protected]",
-  "license": "WTFPL",
-  "repository": "https://gitlab.com/dreipunktnull/ep_theme.git",
-  "scripts": {
-    "dev": "./node_modules/.bin/encore dev",
-    "build": "./node_modules/.bin/encore production"
-  },
-  "devDependencies": {
-    "@symfony/webpack-encore": "^0.19.0",
-    "autoprefixer": "^8.2.0",
-    "node-sass": "^4.8.3",
-    "postcss-loader": "^2.1.3",
-    "sass-loader": "^6.0.7",
-    "vue-loader": "^14.2.2",
-    "vue-template-compiler": "^2.5.16"
-  },
-  "dependencies": {
-    "@fancyapps/fancybox": "^3.2.5",
-    "@fengyuanchen/datepicker": "^0.6.4",
-    "bootstrap": "^3.3.7",
-    "bourbon": "^4.3.2",
-    "cookieconsent": "^3.0.4",
-    "font-awesome": "^4.7.0",
-    "iframe-resizer": "^3.5.5",
-    "jquery": "2",
-    "jquery-lazy": "^1.7.7",
-    "moment": "^2.19.4",
-    "picturefill": "^3.0.2",
-    "sass-mq": "^3.3.2",
-    "slick-carousel": "^1.7.0",
-    "vue": "^2.5.11"
-  }
-}

web/typo3conf/ext/ep_theme/postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-    parser: false,
-    plugins: {
-        'autoprefixer': {},
-    }
-};

web/typo3conf/ext/ep_theme/webpack.config.js

@@ -1,30 +0,0 @@
-const Encore = require('@symfony/webpack-encore');
-const webpack = require('webpack');
-
-Encore
-    .setOutputPath('./Resources/Public/')
-    .setPublicPath('/typo3conf/ext/ep_theme/Resources/Public/')
-    .addEntry('main', './Resources/Private/Assets/js/main.js')
-    .addEntry('boarderweek', './Resources/Private/Assets/js/boarderweek.js')
-    .addEntry('snowzone', './Resources/Private/Assets/js/snowzone.js')
-    .addEntry('unichamp', './Resources/Private/Assets/js/unichamp.js')
-    .addStyleEntry('rte', './Resources/Private/Assets/css/rte.css')
-    .createSharedEntry('vendor', [
-        'jquery', 'vue', 'bootstrap/dist/js/bootstrap', 'slick-carousel',
-        'moment', 'cookieconsent', 'picturefill', '@fancyapps/fancybox'
-    ])
-    .addPlugin(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
-    .enableSassLoader()
-    .enableVueLoader()
-    .autoProvidejQuery()
-    .enableSourceMaps(!Encore.isProduction())
-    .cleanupOutputBeforeBuild()
-    .enablePostCssLoader()
-    .configureFilenames({
-        js: 'js/[name].js',
-        css: 'css/[name].css',
-        images: 'images/[name].[ext]'
-    })
-;
-
-module.exports = Encore.getWebpackConfig();

webpack.config.js

@@ -0,0 +1,58 @@
+const Encore = require('@symfony/webpack-encore');
+const webpack = require('webpack');
+
+// Create webpack config for ext:ep_theme
+Encore
+    .setOutputPath('./web/typo3conf/ext/ep_theme/Resources/Public/')
+    .setPublicPath('/typo3conf/ext/ep_theme/Resources/Public/')
+    .addEntry('main', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js')
+    .addStyleEntry('boarderweek', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss')
+    .addStyleEntry('snowzone', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss')
+    .addStyleEntry('unichamp', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss')
+    .addStyleEntry('rte', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/css/rte.css')
+    .createSharedEntry('vendor', [
+        'jquery', 'vue', 'bootstrap/dist/js/bootstrap', 'slick-carousel',
+        'moment', 'cookieconsent', 'picturefill', '@fancyapps/fancybox'
+    ])
+    .addPlugin(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
+    .enableSassLoader()
+    .enableVueLoader()
+    .autoProvidejQuery()
+    .enableSourceMaps(!Encore.isProduction())
+    .cleanupOutputBeforeBuild()
+    .enablePostCssLoader()
+    .configureFilenames({
+        js: 'js/[name].js',
+        css: 'css/[name].css',
+        images: 'images/[name].[ext]'
+    })
+;
+
+const EpThemeConfig = Encore.getWebpackConfig();
+EpThemeConfig.name = 'EpThemeConfig';
+
+Encore.reset();
+
+// Create config for ext:ep_events
+Encore
+    .setOutputPath('./web/typo3conf/ext/ep_events/Resources/Public/')
+    .setPublicPath('/typo3conf/ext/ep_events/Resources/Public/')
+    .addEntry('main', './web/typo3conf/ext/ep_events/Resources/Private/Assets/js/main.js')
+    .addStyleEntry('rte', './web/typo3conf/ext/ep_events/Resources/Private/Assets/css/rte.css')
+    .enableSassLoader()
+    .enableVueLoader()
+    .autoProvidejQuery()
+    .enableSourceMaps(!Encore.isProduction())
+    .cleanupOutputBeforeBuild()
+    .enablePostCssLoader()
+    .configureFilenames({
+        js: 'js/[name].js',
+        css: 'css/[name].css',
+        images: 'images/[name].[ext]'
+    })
+;
+
+const EpEventsConfig = Encore.getWebpackConfig();
+EpEventsConfig.name = 'EpEventsConfig';
+
+module.exports = [EpThemeConfig, EpEventsConfig];