WIP chore(#17): pull in upstream foundry changes (#18)

* chore: pull in upstream foundry changes

* fix: npm missing

* fix: run ddev commands from drupal directory

Co-authored-by: Brian Gilbert <[email protected]>
Co-authored-by: Stuart Clark <[email protected]>

Author: BrianGilbert

.gitpod.yml

@@ -1,15 +1,16 @@
-image: drupalpod/drupalpod-gitpod-base:20211116-ready-made-envs
+image:
+  file: .gitpod/Dockerfile
 
 tasks:
   - init: |
       # Installing DDev and Drupal backend.
-      .gitpod/scripts/ddev-setup.sh
-      .gitpod/scripts/drupal-setup.sh
+      $GITPOD_REPO_ROOT/.gitpod/scripts/ddev-setup.sh
+      cd $GITPOD_REPO_ROOT/drupal && ddev drupal-install
       # Installing Nuxt/Druxt frontend.
-      .gitpod/scripts/nuxt-setup.sh
+      $GITPOD_REPO_ROOT/.gitpod/scripts/nuxt-setup.sh
     command: |
-      .gitpod/scripts/ddev-setup.sh
-      .gitpod/scripts/nuxt-setup.sh
+      $GITPOD_REPO_ROOT/.gitpod/scripts/ddev-setup.sh
+      $GITPOD_REPO_ROOT/.gitpod/scripts/nuxt-setup.sh
       cd $GITPOD_REPO_ROOT/nuxt && NUXT_TELEMETRY_DISABLED=1 npm run dev
 
 # VScode xdebug extension

.gitpod/scripts/ddev-setup.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
-# Download ddev's images
-ddev debug download-images
-
 # Set up ddev for use on gitpod
 DRUPAL_DIR="${GITPOD_REPO_ROOT}/drupal"
 
+# Download ddev's images
+cd $DRUPAL_DIR && ddev debug download-images
+
 # Misc housekeeping before start
-ddev config global --instrumentation-opt-in=true
+cd $DRUPAL_DIR && ddev config global --instrumentation-opt-in=true
 
 # Start ddev
 cd $DRUPAL_DIR && ddev start -y

.gitpod/scripts/drupal-setup.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+## Description: Install Drupal
+## Usage: drupal-install
+## Example: "ddev drupal-install"
+
+composer install
+drush -y tome:install
+drush php-eval 'node_access_rebuild();'

drupal/.ddev/commands/web/drupal-install

@@ -1,7 +1,7 @@
-name: Foundry
+name: DruxtFoundry
 type: drupal9
 docroot: web
-php_version: "7.4"
+php_version: "8.1"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"

drupal/.ddev/config.yaml

@@ -1,8 +1,6 @@
-/.ddev/docker-compose.host-docker-internal.yaml
-
 # Ignore directories generated by Composer
-/drush/Commands/contrib/
 /drush/contrib/
+/drush/Commands/contrib/
 /vendor/
 /web/core/
 /web/modules/contrib/
@@ -21,7 +19,11 @@
 
 # Ignore files generated by common IDEs
 /.idea/
-/.vscode/
+.vscode/*
+!.vscode/launch.json
 
 # Ignore .env files as they are personal
 /.env
+
+# Ignore auto-generated environmet files
+/.ddev/docker-compose.host-docker-internal.yaml

drupal/.gitignore

@@ -8,83 +8,89 @@
         "docs": "https://www.drupal.org/docs/user_guide/en/index.html",
         "chat": "https://www.drupal.org/node/314178"
     },
-    "repositories": [
-        {
+    "repositories": {
+        "drupal": {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
         }
-    ],
+    },
     "require": {
-        "composer/installers": "1.12.0",
-        "cweagans/composer-patches": "1.7.2",
+        "php": ">=8.1",
+        "composer/installers": "^2.0",
+        "cweagans/composer-patches": "^1.0",
         "drupal-tome/tome_drush": "dev-master",
-        "drupal/admin_audit_trail": "1.0.0-beta1",
-        "drupal/admin_toolbar": "3.0.3",
-        "drupal/advanced_text_formatter": "2.1.1",
-        "drupal/allowed_formats": "1.3.0",
-        "drupal/anonymous_redirect": "2.2.0-rc1",
-        "drupal/coffee": "1.2.0",
-        "drupal/config_filter": "2.2.0",
-        "drupal/content_lock": "2.2.0",
-        "drupal/core-composer-scaffold": "9.2.8",
-        "drupal/core-project-message": "9.2.8",
-        "drupal/core-recommended": "9.2.8",
-        "drupal/diff": "1.0.0",
-        "drupal/druxt": "1.1.1",
-        "drupal/dynamic_entity_reference": "2.0.0-alpha15",
-        "drupal/entity_browser": "2.6.0",
-        "drupal/entity_browser_enhanced": "1.0.0",
-        "drupal/entity_clone": "1.0.0-beta6",
+        "drupal/admin_audit_trail": "^1.0",
+        "drupal/admin_toolbar": "^3.0",
+        "drupal/advanced_text_formatter": "^2.1",
+        "drupal/allowed_formats": "^1.3",
+        "drupal/anonymous_redirect": "^2.2",
+        "drupal/coffee": "^1.2",
+        "drupal/config_filter": "^2.2",
+        "drupal/config_ignore": "^3.0",
+        "drupal/content_lock": "^2.2",
+        "drupal/core-composer-scaffold": "^9.3",
+        "drupal/core-project-message": "^9.3",
+        "drupal/core-recommended": "^9.3",
+        "drupal/diff": "^1.0",
+        "drupal/druxt": "^1.1.1",
+        "drupal/dynamic_entity_reference": "^2.0",
+        "drupal/entity_browser": "^2.6",
+        "drupal/entity_browser_enhanced": "^1.0",
+        "drupal/entity_clone": "^1.0",
         "drupal/entity_display_mode": "^1.0",
-        "drupal/entity_usage": "2.0.0-beta6",
-        "drupal/environment_indicator": "4.0.3",
-        "drupal/exclude_node_title": "1.3.0",
-        "drupal/field_group": "3.2.0",
-        "drupal/field_tools": "1.0.0-alpha7",
-        "drupal/focal_point": "1.5.0",
-        "drupal/gin": "3.x-dev",
+        "drupal/entity_usage": "^2.0",
+        "drupal/environment_indicator": "^4.0",
+        "drupal/exclude_node_title": "^1.3",
+        "drupal/field_group": "^3.2",
+        "drupal/field_tools": "^1.0",
+        "drupal/focal_point": "^1.5",
+        "drupal/gin": "^3.x-dev",
         "drupal/gin_login": "1.x-dev",
         "drupal/gin_toolbar": "1.x-dev",
-        "drupal/jsonapi_hypermedia": "1.6.0",
-        "drupal/length_indicator": "1.1.0",
-        "drupal/linky": "1.0.0-beta1",
-        "drupal/linky_revision_ui": "2.127.2",
-        "drupal/linkychecker": "2.0.0-beta1",
-        "drupal/linkyreplacer": "2.1.0",
-        "drupal/m4032404": "1.0.0-alpha5",
-        "drupal/masquerade": "2.0.0-beta4",
-        "drupal/maxlength": "2.0.0-rc1",
-        "drupal/media_file_delete": "1.1.0",
-        "drupal/memcache": "2.3.0",
-        "drupal/node_edit_protection": "1.0.0",
-        "drupal/oembed_providers": "2.0.0",
-        "drupal/paragraphs_ee": "1.8.0",
-        "drupal/pathauto": "1.8.0",
-        "drupal/prevent_homepage_deletion": "1.4.0",
-        "drupal/redirect": "1.6.0",
-        "drupal/revision_log_default": "1.2.0",
-        "drupal/role_delegation": "1.1.0",
-        "drupal/scheduled_transitions": "2.1.0",
-        "drupal/schema_metatag": "2.2.0",
-        "drupal/security_review": "1.0.0-alpha2",
-        "drupal/simple_oauth": "5.0.5",
-        "drupal/simple_sitemap": "4.0.0-rc1",
-        "drupal/title_field_for_manage_display": "2.0.0",
-        "drupal/tome": "1.4.0",
-        "drupal/transliterate_filenames": "1.5.0",
-        "drupal/username_enumeration_prevention": "1.2.0",
-        "drupal/viewfield": "3.0.0-beta6"
+        "drupal/jsonapi_hypermedia": "^1.6",
+        "drupal/jsonapi_node_preview": "^1.0@beta",
+        "drupal/jsonapi_node_preview_tab": "1.0.x-dev",
+        "drupal/layout_paragraphs": "2.0.x-dev@dev",
+        "drupal/length_indicator": "^1.2",
+        "drupal/linky": "^1.0",
+        "drupal/linky_revision_ui": "^2.127",
+        "drupal/linkychecker": "^2.0",
+        "drupal/linkyreplacer": "^2.1",
+        "drupal/m4032404": "^1.0",
+        "drupal/masquerade": "^2.0",
+        "drupal/maxlength": "^2.0",
+        "drupal/media_file_delete": "^1.1",
+        "drupal/memcache": "^2.3",
+        "drupal/node_edit_protection": "^1.0",
+        "drupal/oembed_providers": "^2.0",
+        "drupal/paragraphs_ee": "^2.0",
+        "drupal/pathauto": "^1.8",
+        "drupal/prevent_homepage_deletion": "^1.4",
+        "drupal/redirect": "^1.7",
+        "drupal/revision_log_default": "^1.2",
+        "drupal/role_delegation": "^1.1",
+        "drupal/scheduled_transitions": "^2.3",
+        "drupal/schema_metatag": "^2.2",
+        "drupal/security_review": "^1.0",
+        "drupal/simple_oauth": "^5.2",
+        "drupal/simple_sitemap": "^4.x-dev",
+        "drupal/title_field_for_manage_display": "^2.0",
+        "drupal/tome": "^1.4",
+        "drupal/transliterate_filenames": "^2.0",
+        "drupal/username_enumeration_prevention": "^1.2",
+        "drupal/viewfield": "^3.0"
     },
     "require-dev": {
-        "drupal/core-dev": "9.2.8",
-        "drush/drush": "10.6.2"
+        "drupal/core-dev": "^9.3",
+        "drush/drush": "^10.5"
     },
     "conflict": {
         "drupal/drupal": "*"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
+        "php": "8.1",
         "sort-packages": true,
         "allow-plugins": {
             "composer/installers": true,
@@ -157,25 +163,38 @@
         "enable-patching": true,
         "patches": {
             "drupal/core": {
-                "https://www.drupal.org/project/drupal/issues/3247553#comment-14280389": "https://www.drupal.org/files/issues/2021-11-04/3247553-3.patch"
+                "https://www.drupal.org/project/drupal/issues/3247553#comment-14280389": "https://www.drupal.org/files/issues/2021-11-04/3247553-3.patch",
+                "https://www.drupal.org/project/drupal/issues/2350939#comment-14289157": "https://www.drupal.org/files/issues/2021-11-12/2350939-202.patch"
             },
             "drupal/entity_clone": {
-                "Batch field creation https://www.drupal.org/project/entity_clone/issues/2845094#comment-14163283": "https://git.drupalcode.org/project/entity_clone/-/merge_requests/8.diff"
+                "Batch field creation https://www.drupal.org/project/entity_clone/issues/2845094#comment-14163283": "./patch/2845094.diff"
             },
             "drupal/entity_display_mode": {
                 "Automated Drupal Rector fixes https://www.drupal.org/project/entity_display_mode/issues/3140377#comment-13635386": "https://www.drupal.org/files/issues/2020-05-23/entity_display_mode.1.x-dev.rector.patch"
             },
+            "drupal/dynamic_entity_reference": {
+                "https://www.drupal.org/project/dynamic_entity_reference/issues/3262121#comment-14396414": "./patch/3262121-by-realityloop-Rename-Label-to-Item-to.patch"
+            },
             "drupal/focal_point": {
                 "Preview link accidentally closes the media library https://www.drupal.org/project/focal_point/issues/3162210#comment-13855854": "https://www.drupal.org/files/issues/2020-10-11/preview_link_accidentally_closes_the_media_library-3162210-19.patch"
             },
             "drupal/gin": {
-                "https://www.drupal.org/project/gin/issues/3217391#comment-14212917": "https://git.drupalcode.org/project/gin/-/merge_requests/38.diff"
+                "https://www.drupal.org/project/gin/issues/3217391#comment-14212917": "./patch/3217391.diff",
+                "https://www.drupal.org/project/gin/issues/3194226#comment-14415576": "./patch/3194226.diff"
             },
             "drupal/gin_toolbar": {
-                "https://www.drupal.org/project/gin_toolbar/issues/3217393": "https://git.drupalcode.org/project/gin_toolbar/-/merge_requests/9.diff"
+                "https://www.drupal.org/project/gin_toolbar/issues/3217393": "./patch/3217393.diff"
+            },
+            "drupal/layout_paragraphs": {
+                "https://www.drupal.org/project/layout_paragraphs/issues/3259729": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/60.diff",
+                "https://www.drupal.org/project/layout_paragraphs/issues/3265807": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/68.diff",
+                "https://www.drupal.org/project/layout_paragraphs/issues/3214406#comment-14425196": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/70.diff"
             },
             "drupal/node_edit_protection": {
-                "Triggers if button used instead of input https://www.drupal.org/project/node_edit_protection/issues/3208719": "https://git.drupalcode.org/project/node_edit_protection/-/merge_requests/1.diff"
+                "Triggers if button used instead of input https://www.drupal.org/project/node_edit_protection/issues/3208719": "./patch/3208719.diff"
+            },
+            "drupal/tome": {
+                "https://www.drupal.org/project/tome/issues/3257363#comment-14395629": "https://www.drupal.org/files/issues/2022-02-02/3257363-3.patch"
             }
         }
     }