[SRM-665] Ckeditor5 and Claro upgrade (#124)

* remove unused inkit patch

* Update linkit

* Read the config from /config/ directory only

* lint

* update preview link block

* put the patch back

* lint and skip unsupported test

composer.json

@@ -15,7 +15,17 @@
     "repositories": {
         "drupal": {
             "type": "composer",
-            "url": "https://packages.drupal.org/8"
+            "url": "https://packages.drupal.org/8",
+            "canonical": false
+        },
+        "drupal/entity_embed": {
+            "type": "git",
+            "url": "https://git.drupalcode.org/issue/entity_embed-3272732.git"
+        },
+        "drupal/video_embed_field": {
+            "type": "vcs",
+            "no-api": true,
+            "url": "https://git.drupalcode.org/issue/video_embed_field-3311063.git"
         }
     },
     "extra": {

config/install/linkit.linkit_profile.site_content.yml

@@ -3,8 +3,6 @@ status: true
 dependencies:
   module:
     - node
-_core:
-  default_config_hash: i9NpUDkHXWv0nBVl_hba1YmpdozfyJrBYe5-8njLB4E
 id: site_content
 label: 'Site Content'
 description: ''
@@ -20,4 +18,13 @@ matchers:
       group_by_bundle: true
       substitution_type: canonical
       limit: 100
-
+  e91d515d-454e-47d4-adf7-6fc13b8f66cd:
+    id: email
+    uuid: e91d515d-454e-47d4-adf7-6fc13b8f66cd
+    settings: {  }
+    weight: 0
+  7802f100-9fda-4458-8416-0f537a7b851d:
+    id: phone
+    uuid: 7802f100-9fda-4458-8416-0f537a7b851d
+    settings: {  }
+    weight: 0

modules/tide_site_preview/config/optional/block.block.seven_tide_site_preview_links.yml → modules/tide_site_preview/config/optional/block.block.claro_tide_site_preview_links.yml

@@ -4,9 +4,9 @@ dependencies:
   module:
     - tide_site_preview
   theme:
-    - seven
-id: seven_tide_site_preview_links
-theme: seven
+    - claro
+id: claro_tide_site_preview_links
+theme: claro
 region: highlighted
 weight: -3
 provider: null

modules/tide_site_preview/tide_site_preview.info.yml

@@ -9,4 +9,4 @@ dependencies:
 config_devel:
   install: {  }
   optional:
-    - block.block.seven_tide_site_preview_links
+    - block.block.claro_tide_site_preview_links

modules/tide_site_preview/tide_site_preview.install

@@ -6,6 +6,7 @@
  */
 
 use Drupal\user\Entity\Role;
+use Drupal\block\Entity\Block;
 
 /**
  * Implements hook_install().
@@ -21,3 +22,30 @@ function tide_site_preview_install() {
     }
   }
 }
+
+/**
+ * Remove block.block.seven_tide_site_preview_links.
+ */
+function tide_site_preview_update_8001() {
+  $block = Block::load('seven_tide_site_preview_links');
+  if ($block !== NULL) {
+    $block->delete();
+  }
+}
+
+/**
+ * Install block.block.claro_tide_site_preview_links.
+ */
+function tide_site_preview_update_8002() {
+  \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/helpers');
+  $config_location = [\Drupal::service('extension.list.module')->getPath('tide_site_preview') . '/config/optional'];
+  $storage = \Drupal::entityTypeManager()->getStorage('block');
+  $id = 'claro_tide_site_preview_links';
+  $config_entity = $storage->load($id);
+  if ($config_entity !== NULL) {
+    $storage->delete([$config_entity]);
+  }
+  $config_read = _tide_read_config('block.block.claro_tide_site_preview_links', $config_location, FALSE);
+  $new_config_entity = $storage->createFromStorageRecord($config_read);
+  $new_config_entity->save();
+}

patches/composer-patches/fix-applied-patches.patch

@@ -0,0 +1,13 @@
+diff --git a/src/Patches.php b/src/Patches.php
+index 70c5b83..53da82c 100644
+--- a/src/Patches.php
++++ b/src/Patches.php
+@@ -115,7 +115,7 @@ class Patches implements PluginInterface, EventSubscriberInterface {
+           $this->installedPatches[$package->getName()] = $extra['patches'];
+         }
+         $patches = isset($extra['patches']) ? $extra['patches'] : array();
+-        $tmp_patches = array_merge_recursive($tmp_patches, $patches);
++        $tmp_patches = $this->arrayMergeRecursiveDistinct($tmp_patches, $patches);
+       }
+
+       if ($tmp_patches == FALSE) {