From e743b3c95383c147d13bcfa41f017f868985a25b Mon Sep 17 00:00:00 2001 From: Adam Erickson Date: Wed, 17 Feb 2021 15:21:21 -0600 Subject: [PATCH 01/10] fix: correct path for emulsify install --- sous/Starter.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sous/Starter.php b/sous/Starter.php index fa3c67c8..9de71696 100644 --- a/sous/Starter.php +++ b/sous/Starter.php @@ -22,8 +22,9 @@ public static function installTheme() { $drupalFinder->locateRoot(getcwd()); $composerRoot = str_replace('-', '_', strtolower(basename($drupalFinder->getComposerRoot()))); // Execute the Emulsify theme build based on composer create path. - shell_exec ("cd web/themes/contrib/emulsify-design-system/ && php emulsify.php $composerRoot"); - shell_exec ("cd web/themes/contrib/emulsify-design-system/ && npm install"); + shell_exec ("cd web/themes/contrib/emulsify-drupal/ && php emulsify.php $composerRoot"); + shell_exec ("cd web/themes/contrib/emulsify-drupal/ && npm install"); + shell_exec ("cd web/themes/custom/$composerRoot/ && npm install"); // Generate system.theme.yml and append new theme to install. $system_theme_yml = [ "default" => $composerRoot, From f7f69660b98886fd2b02ecfe77ab363ace9aecbd Mon Sep 17 00:00:00 2001 From: Adam Erickson Date: Thu, 25 Feb 2021 09:45:58 -0600 Subject: [PATCH 02/10] remove hypen, underscore, space --- sous/Starter.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sous/Starter.php b/sous/Starter.php index fa3c67c8..f63249ba 100644 --- a/sous/Starter.php +++ b/sous/Starter.php @@ -20,7 +20,8 @@ public static function installTheme() { // New DrupalFinder to get the Composer root path. $drupalFinder = new DrupalFinder(); $drupalFinder->locateRoot(getcwd()); - $composerRoot = str_replace('-', '_', strtolower(basename($drupalFinder->getComposerRoot()))); + $removeChars = array("-", "_", " "); + $composerRoot = str_replace($removeChars, '', strtolower(basename($drupalFinder->getComposerRoot()))); // Execute the Emulsify theme build based on composer create path. shell_exec ("cd web/themes/contrib/emulsify-design-system/ && php emulsify.php $composerRoot"); shell_exec ("cd web/themes/contrib/emulsify-design-system/ && npm install"); From 627f4336ed02eddbc79a21d5029b367a428e05c5 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 20 Apr 2021 15:33:16 -0500 Subject: [PATCH 03/10] fix: php version bump --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a90701a1..19d5ad43 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ } ], "require": { - "php": ">=7.2", + "php": ">=7.3", "fourkitchens/sous-drupal-distro": "2.x-dev", "drupal/config_direct_save": "^1.0", "cweagans/composer-patches": "^1.6.5", From bd8376f25f282067cd41e82d413eae00f23b79eb Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Tue, 20 Jul 2021 14:53:10 -0500 Subject: [PATCH 04/10] fix: missing commands --- package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package.json b/package.json index 12883ffc..967f1005 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,11 @@ "version": "0.0.1", "description": "A starter kit for a Drupal project", "scripts": { + "confim": "./scripts/sous/confim.sh", + "confex": "./scripts/sous/confex.sh", + "import-data": "./scripts/sous/import-data.sh", + "rebuild": "./scripts/sous/rebuild.sh", + "local-data-bak": "./scripts/sous/local-data-bak.sh", "publish": "semantic-release --tag-format '${version}'", "publish-test": "semantic-release --tag-format '${version}' --dry-run --debug", "postinstall": "patch-package" From f56d330d7abf9e13225bc1f1fbf6bb67c61a85e5 Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Fri, 3 Sep 2021 17:23:41 -0500 Subject: [PATCH 05/10] fix: add user:unblock command to pair with blocking the user by default in distro --- scripts/sous/rebuild.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/sous/rebuild.sh b/scripts/sous/rebuild.sh index 440c66df..6ae9cd10 100755 --- a/scripts/sous/rebuild.sh +++ b/scripts/sous/rebuild.sh @@ -1,6 +1,7 @@ #!/bin/bash -composer install -yarn import-data -yarn confim +lando composer install +npm run import-data +npm run confim +lando drush user:unblock superuser_1 lando drush uli From aac9b16cf9be2785ebe75afd9e88d51c004ebe42 Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Fri, 15 Oct 2021 16:59:26 -0500 Subject: [PATCH 06/10] fix: remove masonry layouts cruft --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 5c52618f..73d2cd86 100644 --- a/composer.json +++ b/composer.json @@ -57,9 +57,6 @@ "web/core": [ "type:drupal-core" ], - "web/libraries/masonry": [ - "bower-asset/masonry-layout" - ], "web/libraries/{$name}": [ "type:drupal-library", "type:bower-asset", From 0bf3c26d09ad99fad4d5ac022f7ad5a454626cb7 Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Mon, 18 Oct 2021 11:07:27 -0500 Subject: [PATCH 07/10] fix: upgrade composer version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86f0c389..2cee144f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: steps: - checkout - php/install-composer: - install-version: 2.0.8 + install-version: 2.1.9 - php/install-packages release: executor: From 9f6c48a06565cc062b2e528678741ea648fd0a2c Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Fri, 29 Oct 2021 11:53:52 -0500 Subject: [PATCH 08/10] fix: circleci --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2cee144f..78916b9d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,13 +11,13 @@ jobs: - node/install-packages: cache-path: ~/project/node_modules override-ci-command: npm ci - build_php: - executor: php/default - steps: - - checkout - - php/install-composer: - install-version: 2.1.9 - - php/install-packages +# build_php: +# executor: php/default +# steps: +# - checkout +# - php/install-composer: +# install-version: 2.1.9 +# - php/install-packages release: executor: name: node/default @@ -33,11 +33,11 @@ workflows: build: jobs: - build_node - - build_php +# - build_php - release: requires: - build_node - - build_php +# - build_php filters: branches: only: From 4b6383dfac95e853ad47d007cfe792e39fe97b3c Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Fri, 29 Oct 2021 11:58:23 -0500 Subject: [PATCH 09/10] fix: release --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 78916b9d..ef2b86c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,5 +41,5 @@ workflows: filters: branches: only: - - '+([0-9])?(.{+([0-9]),x}).x' + - '2.x' - 'master' From a237b3e57d2ada6640ea19db8eb78e14509a6608 Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Fri, 29 Oct 2021 12:01:28 -0500 Subject: [PATCH 10/10] fix: semantic release regex --- release.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.config.js b/release.config.js index a2eb0858..f20d199d 100644 --- a/release.config.js +++ b/release.config.js @@ -1,6 +1,6 @@ module.exports = { branches: [ - '+([0-9])?(.{+([0-9]),x}).x', + '2.x', 'master' ], plugins: [