From 73b6212a984d75b522062b5675742cebfa274d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Tue, 4 Feb 2020 20:47:12 +0100 Subject: [PATCH] Update build tools, configure webpack polling --- package-lock.json | 49 +---------------------------------------------- package.json | 10 +++++----- webpack.config.js | 11 ++++++++--- 3 files changed, 14 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index 126c6305..c4470cd5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -261,8 +261,7 @@ "@babel/helper-plugin-utils": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", - "dev": true + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" }, "@babel/helper-regex": { "version": "7.8.3", @@ -433,7 +432,6 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz", "integrity": "sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==", - "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-syntax-object-rest-spread": "^7.8.0" @@ -509,7 +507,6 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.0" } @@ -1757,38 +1754,6 @@ "object.assign": "^4.1.0" } }, - "babel-plugin-syntax-dynamic-import": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", - "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=", - "dev": true - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", - "dev": true - }, - "babel-plugin-transform-object-rest-spread": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", - "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", - "dev": true, - "requires": { - "babel-plugin-syntax-object-rest-spread": "^6.8.0", - "babel-runtime": "^6.26.0" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -2762,12 +2727,6 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", "dev": true }, - "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", - "dev": true - }, "core-js-compat": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz", @@ -8422,12 +8381,6 @@ "regenerate": "^1.4.0" } }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, "regenerator-transform": { "version": "0.14.1", "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz", diff --git a/package.json b/package.json index b2adccad..a989fa94 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "epevents", "description": "EP Reisen TYPO3 website package", - "version": "3.0.0", + "version": "4.0.0", "author": "Björn Fromme, fromme@dreipunktnull.com", "license": "WTFPL", "repository": "https://gitlab.com/dreipunktnull/ep_theme.git", "scripts": { - "dev": "./node_modules/.bin/encore dev --watch --watch-poll 500", + "dev": "./node_modules/.bin/encore dev --watch", "build": "./node_modules/.bin/encore production" }, "dependencies": { @@ -33,10 +33,10 @@ "vuex": "^3.1.0" }, "devDependencies": { + "@babel/plugin-proposal-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@symfony/webpack-encore": "^0.28.2", "autoprefixer": "^8.6.5", - "babel-plugin-syntax-dynamic-import": "^6.18.0", - "babel-plugin-transform-object-rest-spread": "^6.26.0", "node-sass": "^4.11.0", "postcss-loader": "^3.0.0", "sass-loader": "^7.3.1", @@ -45,6 +45,6 @@ }, "browserslist": [ "last 2 versions", - "ios >= 8" + "ios >= 9" ] } diff --git a/webpack.config.js b/webpack.config.js index e8b687f8..835266ad 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -23,7 +23,10 @@ Encore images: 'images/[name].[ext]' }) .configureBabel(function (babelConfig) { - babelConfig.plugins = [ 'transform-object-rest-spread', 'syntax-dynamic-import' ] + babelConfig.plugins = [ '@babel/plugin-proposal-object-rest-spread', '@babel/plugin-syntax-dynamic-import' ] + }) + .configureWatchOptions(function (options) { + options.poll = 250; }); const EpThemeConfig = Encore.getWebpackConfig(); @@ -53,9 +56,11 @@ Encore images: 'images/[name].[ext]' }) .configureBabel(function (babelConfig) { - babelConfig.plugins = [ 'transform-object-rest-spread', 'syntax-dynamic-import' ] + babelConfig.plugins = [ '@babel/plugin-proposal-object-rest-spread', '@babel/plugin-syntax-dynamic-import' ] }) -; + .configureWatchOptions(function (options) { + options.poll = 250; + }); const EpEventsConfig = Encore.getWebpackConfig(); EpEventsConfig.name = 'EpEventsConfig';