Merge branch 'release/3.0.0-beta.16' into v3

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,17 @@
 # SEOmatic Changelog
 
+### 3.0.0-beta.16 - 2018.03.25
+## Changed
+* Fixed an issue where fresh installations were not taken to the Welcome screen
+* Replaced old SEOmatic icon in the Asset Bundle
+* Fixed an issue where Identity and Creator settings were not properly defaulted from the config files on fresh installations
+* Better parsing of the JSON-LD config files
+
+## Added
+* Added Miscellaneous settings with Google Site Links search settings
+* Preserve user settings in the Tracking Scripts when bundles are updated
+* Fleshed out the JSON-LD for `mainEntityOfPage`, `identity`, and `creator`
+
 ### 3.0.0-beta.15 - 2018.03.24
 ## Changed
 * Separated the mainEntityOfPage templates off into a partial

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-seomatic",
     "description": "SEOmatic facilitates modern SEO best practices & implementation for Craft CMS 3. It is a turnkey SEO system that is comprehensive, powerful, and flexible.",
     "type": "craft-plugin",
-    "version": "3.0.0-beta.15",
+    "version": "3.0.0-beta.16",
     "keywords": [
         "craft",
         "cms",

src/Seomatic.php

@@ -181,6 +181,27 @@ public function init()
         if ($this->tableSchemaExists()) {
             $this->installEventListeners();
         }
+        // Handler: EVENT_AFTER_INSTALL_PLUGIN
+        Event::on(
+            Plugins::class,
+            Plugins::EVENT_AFTER_INSTALL_PLUGIN,
+            function (PluginEvent $event) {
+                if ($event->plugin === $this) {
+                    // Invalidate our caches after we've been installed
+                    $this->clearAllCaches();
+                    // Send them to our welcome screen
+                    $request = Craft::$app->getRequest();
+                    if ($request->isCpRequest) {
+                        Craft::$app->getResponse()->redirect(UrlHelper::cpUrl(
+                            'seomatic/dashboard',
+                            [
+                                'showWelcome' => true
+                            ]
+                        ))->send();
+                    }
+                }
+            }
+        );
         // We're loaded
         Craft::info(
             Craft::t(
@@ -312,27 +333,6 @@ function () {
      */
     protected function installGlobalEventListeners()
     {
-        // Handler: EVENT_AFTER_INSTALL_PLUGIN
-        Event::on(
-            Plugins::class,
-            Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
-                if ($event->plugin === $this) {
-                    // Invalidate our caches after we've been installed
-                    $this->clearAllCaches();
-                    // Send them to our welcome screen
-                    $request = Craft::$app->getRequest();
-                    if ($request->isCpRequest) {
-                        Craft::$app->getResponse()->redirect(UrlHelper::cpUrl(
-                            'seomatic/dashboard',
-                            [
-                                'showWelcome' => true
-                            ]
-                        ))->send();
-                    }
-                }
-            }
-        );
         // Handler: Sections::EVENT_AFTER_SAVE_SECTION
         Event::on(
             Sections::class,
@@ -820,6 +820,9 @@ protected function customAdminCpPermissions(): array
                     "seomatic:site-settings:social-media" => [
                         'label' => Craft::t('seomatic', 'Social Media'),
                     ],
+                    "seomatic:site-settings:miscellaneous" => [
+                        'label' => Craft::t('seomatic', 'Miscellaneous'),
+                    ],
                 ],
             ],
             "seomatic:tracking-scripts" => [

src/assetbundles/seomatic/dist/img/Seomatic-icon.svg

@@ -142,6 +142,8 @@ public function debugMetaItem(
         if (is_subclass_of($this, MetaJsonLd::class)) {
             $isMetaJsonLdModel = true;
         }
+        $modelScenarios = $this->scenarios();
+        $scenarios = array_intersect_key($scenarios, $modelScenarios);
         foreach ($scenarios as $scenario => $logLevel) {
             $this->setScenario($scenario);
             if (!$this->validate()) {