From 5ad745a87cfd07f883b60106f34d0c339216ac8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net> Date: Mon, 25 Nov 2024 11:38:38 -0500 Subject: [PATCH 1/3] Use PoC branch of Project Browser --- project_template/composer.json | 4 ++++ recipes/drupal_cms_forms/recipe.yml | 3 +++ recipes/drupal_cms_starter/composer.json | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/project_template/composer.json b/project_template/composer.json index 6384e3c44..09a0d831b 100644 --- a/project_template/composer.json +++ b/project_template/composer.json @@ -9,6 +9,10 @@ "chat": "https://drupal.org/node/314178" }, "repositories": { + "project_browser": { + "type": "vcs", + "url": "https://git.drupalcode.org/issue/project_browser-3489665.git" + }, "drupal": { "type": "composer", "url": "https://packages.drupal.org/8" diff --git a/recipes/drupal_cms_forms/recipe.yml b/recipes/drupal_cms_forms/recipe.yml index 42277203a..9acb5de16 100644 --- a/recipes/drupal_cms_forms/recipe.yml +++ b/recipes/drupal_cms_forms/recipe.yml @@ -21,6 +21,9 @@ input: arguments: question: 'Do you want to show a CAPTCHA on the contact form?' default: false + form: + '#type': checkbox + '#title': 'Do you want to show a CAPTCHA on the contact form?' default: source: value value: false diff --git a/recipes/drupal_cms_starter/composer.json b/recipes/drupal_cms_starter/composer.json index eb1ed3cff..a6ecc07fb 100644 --- a/recipes/drupal_cms_starter/composer.json +++ b/recipes/drupal_cms_starter/composer.json @@ -19,7 +19,7 @@ "drupal/drupal_cms_dashboard": "*", "drupal/easy_email_express": "^1.0.2", "drupal/pathauto": "^1.13", - "drupal/project_browser": "^2-alpha5" + "drupal/project_browser": "dev-recipe-input-poc" }, "suggest": { "drupal/drupal_cms_accessibility_tools": "Installs and configures tools to help authors make their content accessible.", -- GitLab From b0ff85cbf827a40793ebcb965a497a4943022719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net> Date: Mon, 25 Nov 2024 11:46:36 -0500 Subject: [PATCH 2/3] Use 11.x-dev --- project_template/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project_template/composer.json b/project_template/composer.json index 09a0d831b..fe6575956 100644 --- a/project_template/composer.json +++ b/project_template/composer.json @@ -23,7 +23,7 @@ "cweagans/composer-patches": "^2", "drupal/core-composer-scaffold": "^11.1", "drupal/core-project-message": "^11.1", - "drupal/core-recommended": "^11.1", + "drupal/core-recommended": "11.x-dev", "drupal/drupal_cms_starter": "*", "drupal/drupal_cms_accessibility_tools": "*", "drupal/drupal_cms_blog": "*", -- GitLab From 1bb343c6604d91be0731d0d867931d096cdd22e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net> Date: Mon, 25 Nov 2024 11:53:29 -0500 Subject: [PATCH 3/3] Remove navigation patch ffs --- recipes/drupal_cms_admin_theme/composer.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipes/drupal_cms_admin_theme/composer.json b/recipes/drupal_cms_admin_theme/composer.json index a4dd9bfc6..2d1a016d2 100644 --- a/recipes/drupal_cms_admin_theme/composer.json +++ b/recipes/drupal_cms_admin_theme/composer.json @@ -9,12 +9,5 @@ "drupal/gin": "^3-rc11", "drupal/gin_toolbar": "^1-rc6", "drupal/sam": "^1.2" - }, - "extra": { - "patches": { - "drupal/core": { - "#3395527: Integrate Dashboard with Navigation": "https://www.drupal.org/files/issues/2024-11-14/navigation-dashboard-3395527-11.x.patch" - } - } } } -- GitLab