Merge branch 'main' of github.com:Lullabot/drainpipe into justafish/i…

…ssue-204-acquia-integration--v3

.github/workflows/TestFunctional.yml

@@ -171,6 +171,7 @@ jobs:
         run: |
           ddev exec corepack disable
           ddev exec npm i -g [email protected]
+          ddev exec 'rm /usr/local/bin/yarn'
           ddev exec 'ln -s $(npm root -g)/yarn/bin/yarn /usr/local/bin/yarn'
           ddev yarn init -y
           ddev yarn add nightwatch nightwatch-accessibility @lullabot/nightwatch-drupal-commands lodash --dev

.github/workflows/TestMetapackages.yml

@@ -129,6 +129,7 @@ jobs:
         run: |
           ddev exec corepack disable
           ddev exec npm i -g [email protected]
+          ddev exec 'rm /usr/local/bin/yarn'
           ddev exec 'ln -s $(npm root -g)/yarn/bin/yarn /usr/local/bin/yarn'
           ddev exec yarn init -y
           ddev exec yarn add file:./drainpipe/metapackages/sass --dev
@@ -275,6 +276,7 @@ jobs:
         run: |
           ddev exec corepack disable
           ddev exec npm i -g [email protected]
+          ddev exec 'rm /usr/local/bin/yarn'
           ddev exec 'ln -s $(npm root -g)/yarn/bin/yarn /usr/local/bin/yarn'
           ddev exec yarn init -y
           ddev exec yarn add focus-trap@^6.7.3

drainpipe-dev/composer.json

@@ -16,9 +16,9 @@
         "behat/mink": "^1.12.0",
         "behat/mink-browserkit-driver": "^2.2.0",
         "davidrjonas/composer-lock-diff": "^1.7",
-        "drupal/coder": "^8.3.25",
+        "drupal/coder": "^8.3.26",
         "lullabot/drainpipe": "*",
-        "mglaman/phpstan-drupal": "^1.3.1",
+        "mglaman/phpstan-drupal": "^1.3.2",
         "mikey179/vfsstream": "^1.6.12",
         "mockery/mockery": "^1.6.12",
         "phpspec/prophecy-phpunit": "^2",
@@ -27,7 +27,7 @@
         "symfony/phpunit-bridge": "^6|^7",
         "symfony/yaml": "^6|^7",
         "tijsverkoyen/convert-to-junit-xml": "^1.11.0",
-        "vincentlanglet/twig-cs-fixer": "^3.3.1"
+        "vincentlanglet/twig-cs-fixer": "^3.4.0"
     },
     "require-dev": {
         "composer/composer": "^2.8.3"

metapackages/sass/package.json

@@ -12,7 +12,7 @@
     "gulp-sourcemaps": "^3.0.0",
     "modern-normalize": "^3.0.1",
     "postcss": "^8.4.49",
-    "sass": "^1.79.5",
+    "sass": "^1.83.0",
     "yargs": "^17.7.2"
   },
   "repository": {

renovate.json

@@ -1,10 +1,12 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
+    "config:recommended"
   ],
   "rangeStrategy": "bump",
-  "ignoreDeps": ["drainpipe"],
+  "ignoreDeps": [
+    "drainpipe"
+  ],
   "packageRules": [
     {
       "matchPackageNames": [
@@ -15,7 +17,9 @@
         "twig/twig",
         "vlucas/phpdotenv"
       ],
-      "addLabels": ["test only - do not merge"]
+      "addLabels": [
+        "test only - do not merge"
+      ]
     }
   ]
 }

yarn.lock

@@ -388,7 +388,7 @@ __metadata:
     gulp-sourcemaps: "npm:^3.0.0"
     modern-normalize: "npm:^3.0.1"
     postcss: "npm:^8.4.49"
-    sass: "npm:^1.79.5"
+    sass: "npm:^1.83.0"
     yargs: "npm:^17.7.2"
   bin:
     drainpipe-sass: ./gulp.js
@@ -4033,10 +4033,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immutable@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "immutable@npm:4.0.0"
-  checksum: 10c0/964b51a559e026f38835985b892599964e9915a77967b549784878e29b1f95331518b3f64d100faa11054ae5d43a6b1af28e6a7f5bba5463b0ae68a30aa2b1b4
+"immutable@npm:^5.0.2":
+  version: 5.0.3
+  resolution: "immutable@npm:5.0.3"
+  checksum: 10c0/3269827789e1026cd25c2ea97f0b2c19be852ffd49eda1b674b20178f73d84fa8d945ad6f5ac5bc4545c2b4170af9f6e1f77129bc1cae7974a4bf9b04a9cdfb9
   languageName: node
   linkType: hard
 
@@ -7196,17 +7196,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:^1.79.5":
-  version: 1.79.5
-  resolution: "sass@npm:1.79.5"
+"sass@npm:^1.83.0":
+  version: 1.83.0
+  resolution: "sass@npm:1.83.0"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
-    immutable: "npm:^4.0.0"
+    immutable: "npm:^5.0.2"
     source-map-js: "npm:>=0.6.2 <2.0.0"
+  dependenciesMeta:
+    "@parcel/watcher":
+      optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/7331865fd1d0c03e6e180a4fe0e175ac1bf1214f6c77f0d99ad72fbe2ed9ede3fab8a64c0c41471cb8a358a9d11624ec59a49283f9b6070eb99c522b34b814bf
+  checksum: 10c0/4415361229879a9041d77c953da85482e89032aa4321ba13250a9987d39c80fac6c88af3777f2a2d76a4e8b0c8afbd21c1970fdbe84e0b3ec25fb26741f92beb
   languageName: node
   linkType: hard