Merge branch 'maintenance'

ddanh85 · Mar 23, 2018 · b991994 · b991994
2 parents f78c087 + 963e7a4
commit b991994
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 521 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     }
   },
   "require": {
-    "php": ">=7",
+    "php": ">=7.1",
     "composer/installers": "~1.0",
     "illuminate/support": "5.4.*",
     "roots/sage-lib": "~9.0.0-beta.4",

diff --git a/composer.lock b/composer.lock
diff --git a/resources/assets/build/webpack.config.optimize.js b/resources/assets/build/webpack.config.optimize.js
@@ -11,7 +11,9 @@ module.exports = {
       optipng: { optimizationLevel: 7 },
       gifsicle: { optimizationLevel: 3 },
       pngquant: { quality: '65-90', speed: 4 },
-      svgo: { removeUnknownsAndDefaults: false, cleanupIDs: false },
+      svgo: {
+        plugins: [{ removeUnknownsAndDefaults: false }, { cleanupIDs: false }],
+      },
       plugins: [imageminMozjpeg({ quality: 75 })],
       disable: (config.enabled.watcher),
     }),