From 00db36c7d4103bc45091876f68e5dccb4035e447 Mon Sep 17 00:00:00 2001
From: Carson Oldson <carson.oldson@vmlyr.com>
Date: Tue, 25 May 2021 08:51:12 -0500
Subject: [PATCH 1/2] Adding our own cli custom service to include rename
 package. This resolves issue generating themes.

---
 .docksal/docksal.yml             | 3 +++
 .docksal/services/cli/Dockerfile | 4 ++++
 2 files changed, 7 insertions(+)
 create mode 100644 .docksal/services/cli/Dockerfile

diff --git a/.docksal/docksal.yml b/.docksal/docksal.yml
index 7970429..1dc4289 100644
--- a/.docksal/docksal.yml
+++ b/.docksal/docksal.yml
@@ -1,6 +1,9 @@
 version: "2.1"
 
 services:
+  cli:
+    image: ${COMPOSE_PROJECT_NAME_SAFE}_cli
+    build: services/cli
   mail:
     hostname: mail
     image: mailhog/mailhog
diff --git a/.docksal/services/cli/Dockerfile b/.docksal/services/cli/Dockerfile
new file mode 100644
index 0000000..f8aaeab
--- /dev/null
+++ b/.docksal/services/cli/Dockerfile
@@ -0,0 +1,4 @@
+FROM docksal/cli:2.12-php7.4
+
+# Theme generation command (kit/theme) requires rename.
+RUN apt-get install rename

From 1fe0ae5946d67eed738b7db2d7789adf77414860 Mon Sep 17 00:00:00 2001
From: Carson Oldson <carson.oldson@vmlyr.com>
Date: Tue, 25 May 2021 10:55:50 -0500
Subject: [PATCH 2/2] Adding the jquery-ui-touch-punch library.

---
 composer.json |  5 +++++
 composer.lock | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 410500f..c829600 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,10 @@
             "type": "composer",
             "url": "https://packages.drupal.org/8"
         },
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        },
         {
             "type": "package",
             "package": {
@@ -106,6 +110,7 @@
         "drupal/viewsreference": "^2.0@alpha",
         "drupal/viewsreference_filter": "^1.0",
         "drush/drush": "^10.3",
+        "npm-asset/jquery-ui-touch-punch": "^0.2.3",
         "topfloor/composer-cleanup-vcs-dirs": "dev-composer-2",
         "vlucas/phpdotenv": "^5.3",
         "vmlyr-drupal/bazo": "^8.0",
diff --git a/composer.lock b/composer.lock
index 549e5cb..ec68fe8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d1e5c080bef925ef79ca5d4a5d4bb22b",
+    "content-hash": "3a7ac6dd6ff04ea4a4b2a813cf450419",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -8370,6 +8370,18 @@
             ],
             "time": "2021-05-03T19:11:20+00:00"
         },
+        {
+            "name": "npm-asset/jquery-ui-touch-punch",
+            "version": "0.2.3",
+            "dist": {
+                "type": "tar",
+                "url": "https://registry.npmjs.org/jquery-ui-touch-punch/-/jquery-ui-touch-punch-0.2.3.tgz"
+            },
+            "type": "npm-asset",
+            "license": [
+                "Dual licensed under the MIT or GPL Version 2 licenses."
+            ]
+        },
         {
             "name": "oomphinc/composer-installers-extender",
             "version": "2.0.0",