Merge branch 'release/1.0.16'

nystudio107 · May 24, 2018 · d0672ab · d0672ab
2 parents 8f3d079 + c2ff166
commit d0672ab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # nystudio107/craft Change Log
 
+## 1.0.16 - 2018.05.24
+### Changed
+* Removed references to the Craft RC in the `composer.json`
+* Added SEOmatic to the list of base plugins
+* Change the Critical CSS loader to `onload="this.onload=null;this.rel='stylesheet'"` for IE 11 compatibility
+
 ## 1.0.15 - 2018.02.19
 ### Changed
 * Updated `composer.json` to reflect the updated dependencies

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
   },
   "minimum-stability": "RC",
   "require": {
-    "craftcms/cms": "^3.0.0-RC7",
+    "craftcms/cms": "^3.0.0",
     "vlucas/phpdotenv": "^2.4.0",
     "yiisoft/yii2-redis": "^2.0.6",
     "nystudio107/craft3-multi-environment": "^1.0.5",
@@ -28,6 +28,7 @@
     "nystudio107/craft-imageoptimize": "^1.3.2",
     "nystudio107/craft-minify": "^1.2.5",
     "nystudio107/craft-routemap": "^1.0.0",
+    "nystudio107/craft-seomatic": "^1.0.0",
     "nystudio107/craft-typogrify": "^1.1.1",
     "ostark/craft-async-queue": "^1.3.0"
   },

diff --git a/nys-setup b/nys-setup
@@ -19,6 +19,7 @@ const INSTALL_PLUGINS = [
     'image-optimize',
     'minify',
     'routemap',
+    'seomatic',
     'typogrify',
 ];
 

diff --git a/templates/_layouts/_layout.twig b/templates/_layouts/_layout.twig
@@ -42,7 +42,7 @@
             {# -- Inline CSS block used by templates for Critical CSS #}
             {% block _inline_css %}
             {% endblock %}
-        <link rel="preload" href="{{ baseUrl }}css/site.combined.min.{{staticAssetsVersion}}.css" as="style" onload="this.rel='stylesheet'">
+        <link rel="preload" href="{{ baseUrl }}css/site.combined.min.{{staticAssetsVersion}}.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
         <noscript><link rel="stylesheet" href="{{ baseUrl }}css/site.combined.min.{{staticAssetsVersion}}.css"></noscript>
         <script>
             {{ source("_inlinejs/loadCSS.min.js") }}