Merge branch 'release/1.5.2' into v1

Author: khalwat

.stylelintrc.json

@@ -0,0 +1,14 @@
+{
+  "extends": "stylelint-config-recommended",
+  "rules": {
+    "at-rule-no-unknown": [ true, {
+      "ignoreAtRules": [
+        "screen",
+        "extends",
+        "responsive",
+        "tailwind"
+      ]
+    }],
+    "block-no-empty": null
+  }
+}

CHANGELOG.md

@@ -1,5 +1,9 @@
 # ImageOptimize Changelog
 
+## 1.5.2 - 2019.02.07
+### Changed
+* If you're using Craft 3.1, ImageOptimize will use Craft [environmental variables](https://docs.craftcms.com/v3/config/environments.html#control-panel-settings) for secrets
+
 ## 1.5.1 - 2018.12.28
 ### Changed
 * Refactored the Imgix and Thumbor Image Transforms out to external packages

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-imageoptimize",
     "description": "Automatically create & optimize responsive image transforms, using either native Craft transforms or a service like Imgix, with zero template changes.",
     "type": "craft-plugin",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "keywords": [
         "craft",
         "cms",

package.json

@@ -84,6 +84,8 @@
         "purgecss-whitelister": "^2.2.0",
         "resolve-url-loader": "^3.0.0",
         "sane": "^4.0.1",
+        "stylelint": "^9.9.0",
+        "stylelint-config-recommended": "^2.1.0",
         "style-loader": "^0.23.0",
         "terser-webpack-plugin": "^1.1.0",
         "vue-loader": "^15.4.2",

postcss.config.js

@@ -1,7 +1,16 @@
 module.exports = {
     plugins: [
-        require("postcss-import"),
-        require('postcss-preset-env'),
-        require('tailwindcss')('./tailwind.config.js')
+        require('postcss-import')({
+            plugins: [
+                require('stylelint')
+            ]
+        }),
+        require('tailwindcss')('./tailwind.config.js'),
+        require('postcss-preset-env')({
+            autoprefixer: { grid: true },
+            features: {
+                'nesting-rules': true
+            }
+        })
     ]
 };

src/ImageOptimize.php

@@ -98,6 +98,11 @@ class ImageOptimize extends Plugin
      */
     public static $generatePlaceholders = true;
 
+    /**
+     * @var bool
+     */
+    public static $craft31 = false;
+
     // Public Methods
     // =========================================================================
 
@@ -108,6 +113,7 @@ public function init()
     {
         parent::init();
         self::$plugin = $this;
+        self::$craft31 = version_compare(Craft::$app->getVersion(), '3.1', '>=');
         // Handle any console commands
         $request = Craft::$app->getRequest();
         if ($request->getIsConsoleRequest()) {

src/variables/ImageOptimizeVariable.php

@@ -89,4 +89,14 @@ public function createImageTransformType($config): ImageTransformInterface
     {
         return ImageOptimize::$plugin->optimize->createImageTransformType($config);
     }
+
+    /**
+     * Return whether we are running Craft 3.1 or later
+     *
+     * @return bool
+     */
+    public function craft31(): bool
+    {
+        return ImageOptimize::$craft31;
+    }
 }

webpack.dev.js

@@ -22,6 +22,7 @@ const configureDevServer = () => {
         host: settings.devServerConfig.host(),
         port: settings.devServerConfig.port(),
         https: !!parseInt(settings.devServerConfig.https()),
+        disableHostCheck: true,
         quiet: true,
         hot: true,
         hotOnly: true,