Browse Source

added external webform libraries to composer.json with merge

bach 2 years ago
parent
commit
890a6121d2
3 changed files with 397 additions and 153 deletions
  1. 2 4
      composer.json
  2. 390 145
      composer.lock
  3. 5 4
      web/sites/default/default.services.yml

+ 2 - 4
composer.json

@@ -225,7 +225,8 @@
         },
         "merge-plugin": {
             "include": [
-              "web/profiles/d8-starterkit-profile/composer.json"
+              "web/profiles/d8-starterkit-profile/composer.json",
+              "web/modules/contrib/webform/composer.libraries.json"
             ],
             "recurse": true,
             "replace": false,
@@ -260,9 +261,6 @@
             "drupal/commerce_license": {
               "expected argument of type array or Traversable and ArrayAccess, string given https://www.drupal.org/project/commerce_license/issues/3252431":"https://www.drupal.org/files/issues/2021-12-03/commerce_license-expected-argument-of-type-array-3252431-1.patch"
             },
-            "drupal/commerce_pricelist": {
-              "expected argument of type array or Traversable and ArrayAccess, string given":"https://www.drupal.org/files/issues/2022-02-24/price_list-routing-parameters.patch"
-            },
             "drupal/commerce_stripe" : {
               "Allow off_session payment intents for recurring payments https://www.drupal.org/project/commerce_stripe/issues/3171408": "https://www.drupal.org/files/issues/2021-10-04/commerce_stripe-allow-off_session-payment-intents-for-recurring-payments-3171408-34.patch"
             },

File diff suppressed because it is too large
+ 390 - 145
composer.lock


+ 5 - 4
web/sites/default/default.services.yml

@@ -70,7 +70,7 @@ parameters:
     # For more information about debugging Twig templates, see
     # https://www.drupal.org/node/1906392.
     #
-    # Not recommended in production environments
+    # Enabling Twig debugging is not recommended in production environments.
     # @default false
     debug: false
     # Twig auto-reload:
@@ -79,7 +79,7 @@ parameters:
     # If you don't provide a value for auto_reload, it will be determined
     # based on the value of debug.
     #
-    # Not recommended in production environments
+    # Enabling auto-reload is not recommended in production environments.
     # @default null
     auto_reload: null
     # Twig cache:
@@ -90,7 +90,7 @@ parameters:
     # auto_reload setting above should be enabled rather than disabling the
     # Twig cache.
     #
-    # Not recommended in production environments
+    # Disabling the Twig cache is not recommended in production environments.
     # @default true
     cache: true
   renderer.config:
@@ -141,7 +141,8 @@ parameters:
   # For more information about debugging cacheable responses, see
   # https://www.drupal.org/developing/api/8/response/cacheable-response-interface
   #
-  # Not recommended in production environments
+  # Enabling cacheability debugging is not recommended in production
+  # environments.
   # @default false
   http.response.debug_cacheability_headers: false
   factory.keyvalue: {}

Some files were not shown because too many files changed in this diff