Merge branch 'release/1.5.6' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,10 @@
 # ImageOptimize Changelog
 
+## 1.5.6 - 2019.05.21
+### Changed
+* Fixed an issue where newly added Image Variant blocks had incorrect ids on the Retina checkboxes
+* Updated build system
+
 ## 1.5.5 - 2019.04.22
 ### Changed
 * Updated Twig namespacing to be compliant with deprecated class aliases in 2.7.x

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.5",
+    "version": "1.5.6",
     "keywords": [
         "craft",
         "cms",
@@ -15,8 +15,8 @@
         "imgix"
     ],
     "support": {
-        "docs": "https://github.com/nystudio107/craft-imageoptimize/blob/v1/README.md",
-        "issues": "https://github.com/nystudio107/craft-imageoptimize/issues"
+        "docs": "https://nystudio107.com/plugins/imageoptimize/documentation",
+        "issues": "https://nystudio107.com/plugins/imageoptimize/support"
     },
     "license": "proprietary",
     "authors": [

package.json

@@ -3,10 +3,10 @@
     "version": "1.0.0",
     "description": "Automatically create & optimize responsive image transforms, using either native Craft transforms or a service like Imgix, with zero template changes.",
     "keywords": [],
-    "homepage": "https://github.com/nystudio107/craft-imageoptimize",
+    "homepage": "https://nystudio107.com/plugins/imageoptimize",
     "bugs": {
         "email": "info@nystudio107.com",
-        "url": "https://github.com/nystudio107/craft-imageoptimize/issues"
+        "url": "https://nystudio107.com/plugins/imageoptimize/support"
     },
     "license": "SEE LICENSE IN LICENSE.md",
     "author": {

src/templates/_components/fields/OptimizedImages_settings.twig

@@ -14,6 +14,7 @@
 #}
 
 {% import "_includes/forms" as forms %}
+{% from 'image-optimize/_includes/macros' import checkboxGroupField %}
 
 {% do view.registerAssetBundle("nystudio107\\imageoptimize\\assetbundles\\imageoptimize\\ImageOptimizeAsset") %}
 {% do view.registerAssetBundle("nystudio107\\imageoptimize\\assetbundles\\optimizedimagesfield\\OptimizedImagesFieldAsset") %}
@@ -210,7 +211,7 @@
                                 {% if field.variants[loop.index0]['retinaSizes'] is defined and field.variants[loop.index0]['retinaSizes'] |length %}
                                     {% set retinaValues = field.variants[loop.index0]['retinaSizes'] %}
                                 {% endif %}
-                                {{ forms.checkboxGroupField({
+                                {{ checkboxGroupField({
                                     label: "Retina Sizes"|t('image-optimize'),
                                     instructions: "The additional retina sizes that should be created for this variant."|t('image-optimize'),
                                     id: 'variants-' ~ loop.index0 ~ '-retinaSizes',

src/templates/_includes/checkboxGroup.twig

@@ -0,0 +1,42 @@
+{# @var craft \craft\web\twig\variables\CraftVariable #}
+{#
+/**
+ * Image Optimize plugin for Craft CMS 3.x
+ *
+ * Custom `checkboxGroup` input. Checkbox group doesn't allow access to checkbox, therefore we can't control the ID.
+ * For this reason we use create the a custom `checkboxGroup` that will use Craft native checkboxes.
+ *
+ * @author    nystudio107
+ * @copyright Copyright (c) 2017 nystudio107
+ * @link      https://nystudio107.com
+ * @package   ImageOptimize
+ * @since     1.5.6
+ */
+#}
+
+{% import "_includes/forms" as forms %}
+
+{% if name is defined and name %}
+    <input type="hidden" name="{{ name }}" value="">
+{% endif -%}
+
+{%- set options = (options is defined ? options : []) %}
+{%- set values = (values is defined ? values : []) %}
+{%- set name = (name is defined and name ? name~'[]' : null) %}
+
+<div class="checkbox-group"
+        {%- if block('attr') is defined %} {{ block('attr') }}{% endif %}>
+    {%- for key, option in options %}
+        {%- if option is not iterable %}
+            {%- set option = {label: option, value: key} %}
+        {%- endif %}
+        <div>
+            {{ forms.checkbox({
+                id:       (id is defined ? id ~ '-' ~ key : null),
+                name:      name,
+                checked:   (option.value is defined and option.value in values),
+                autofocus: (autofocus is defined and autofocus and loop.first and not craft.app.request.isMobileBrowser(true))
+            }|merge(option)) }}
+        </div>
+    {%- endfor %}
+</div>

src/templates/_includes/macros.twig

@@ -6,3 +6,13 @@
         {{ false }}
     {%- endif -%}
 {%- endmacro %}
+
+{% macro checkboxGroupField(config) %}
+    {% import "_includes/forms" as forms %}
+    {% import _self as macros %}
+    {{ forms.field(config, macros.checkboxGroup(config)) }}
+{% endmacro %}
+
+{% macro checkboxGroup(config) %}
+    {% include "image-optimize/_includes/checkboxGroup" with config only %}
+{% endmacro %}

webpack.common.js

@@ -16,18 +16,18 @@ const settings = require('./webpack.settings.js');
 const configureBabelLoader = (browserList) => {
     return {
         test: /\.js$/,
-        exclude: /node_modules/,
+        exclude: settings.babelLoaderConfig.exclude,
         use: {
             loader: 'babel-loader',
             options: {
                 presets: [
                     [
                         '@babel/preset-env', {
-                        useBuiltIns: 'usage',
-                        targets: {
-                            browsers: browserList,
-                        },
-                    }
+                            useBuiltIns: 'usage',
+                            targets: {
+                                browsers: browserList,
+                            },
+                        }
                     ],
                 ],
                 plugins: [],

webpack.settings.js

@@ -34,6 +34,11 @@ module.exports = {
         "imageoptimize": "ImageOptimize.js",
         "welcome": "Welcome.js",
     },
+    babelLoaderConfig: {
+        exclude: [
+            /(node_modules|bower_components)/
+        ],
+    },
     copyWebpackConfig: [
     ],
     devServerConfig: {