From 5496fde96bee30b7591b16046f7c3de5233123b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:17:00 -0500 Subject: [PATCH 1/7] fix(deps): update dependency sass to ^1.81.0 (#721) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .pnp.cjs | 16 ++++++++-------- metapackages/sass/package.json | 2 +- yarn.lock | 23 +++++++++++++---------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.pnp.cjs b/.pnp.cjs index 7f9befecb..adc945d5d 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -511,7 +511,7 @@ const RAW_RUNTIME_STATE = ["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.81.0"],\ ["yargs", "npm:17.7.2"]\ ],\ "linkType": "SOFT"\ @@ -4640,10 +4640,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["immutable", [\ - ["npm:4.0.0", {\ - "packageLocation": "../../../../cache/others/berry/cache/immutable-npm-4.0.0-74b844f82e-10c0.zip/node_modules/immutable/",\ + ["npm:5.0.3", {\ + "packageLocation": "../../../../cache/others/berry/cache/immutable-npm-5.0.3-c4195fd7f3-10c0.zip/node_modules/immutable/",\ "packageDependencies": [\ - ["immutable", "npm:4.0.0"]\ + ["immutable", "npm:5.0.3"]\ ],\ "linkType": "HARD"\ }]\ @@ -8378,13 +8378,13 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["sass", [\ - ["npm:1.79.5", {\ - "packageLocation": "../../../../cache/others/berry/cache/sass-npm-1.79.5-9f4647a8cf-10c0.zip/node_modules/sass/",\ + ["npm:1.81.0", {\ + "packageLocation": "../../../../cache/others/berry/cache/sass-npm-1.81.0-42587b1ed8-10c0.zip/node_modules/sass/",\ "packageDependencies": [\ - ["sass", "npm:1.79.5"],\ + ["sass", "npm:1.81.0"],\ ["@parcel/watcher", "npm:2.4.1"],\ ["chokidar", "npm:4.0.0"],\ - ["immutable", "npm:4.0.0"],\ + ["immutable", "npm:5.0.3"],\ ["source-map-js", "npm:1.0.2"]\ ],\ "linkType": "HARD"\ diff --git a/metapackages/sass/package.json b/metapackages/sass/package.json index 9864f128a..c0a915bdb 100644 --- a/metapackages/sass/package.json +++ b/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.81.0", "yargs": "^17.7.2" }, "repository": { diff --git a/yarn.lock b/yarn.lock index a17fc2c4e..0161658f6 100644 --- a/yarn.lock +++ b/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.81.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.81.0": + version: 1.81.0 + resolution: "sass@npm:1.81.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/9c59b3c9b4231c18fcb4583cc232dbc4de501ddc11101b7a025e44833e3f3ce6031546dc1cd109ee9f04ebcfb1fe30ff870810af33b8feb9aa9e36dfba9ec1ef languageName: node linkType: hard From f1330a51819ae6094186db2922fad22d909a918a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:36:39 +0000 Subject: [PATCH 2/7] chore(config): migrate renovate config (#750) * chore(config): migrate config renovate.json * remove yarn workaround * remove yarn workaround --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sally Young --- .github/workflows/TestFunctional.yml | 1 + .github/workflows/TestMetapackages.yml | 2 ++ renovate.json | 10 +++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/TestFunctional.yml b/.github/workflows/TestFunctional.yml index d9fed9e26..170c93e01 100644 --- a/.github/workflows/TestFunctional.yml +++ b/.github/workflows/TestFunctional.yml @@ -171,6 +171,7 @@ jobs: run: | ddev exec corepack disable ddev exec npm i -g yarn@1.22.1 + 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 diff --git a/.github/workflows/TestMetapackages.yml b/.github/workflows/TestMetapackages.yml index f4ce934de..5f8055a17 100644 --- a/.github/workflows/TestMetapackages.yml +++ b/.github/workflows/TestMetapackages.yml @@ -129,6 +129,7 @@ jobs: run: | ddev exec corepack disable ddev exec npm i -g yarn@1.22.1 + 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 yarn@1.22.1 + 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 diff --git a/renovate.json b/renovate.json index 3c5aa199c..52811b1ae 100644 --- a/renovate.json +++ b/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" + ] } ] } From ef6693a1f5dc78bbd224165b38e88ed93ffc86b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:54:53 +0000 Subject: [PATCH 3/7] fix(deps): update dependency vincentlanglet/twig-cs-fixer to ^3.4.0 (#748) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sally Young --- drainpipe-dev/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drainpipe-dev/composer.json b/drainpipe-dev/composer.json index b9c9e979c..2f8308567 100644 --- a/drainpipe-dev/composer.json +++ b/drainpipe-dev/composer.json @@ -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" From f11856fbdce47e5715e3cdbc2e11d61319c83dff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:55:15 +0000 Subject: [PATCH 4/7] fix(deps): update dependency sass to ^1.82.0 (#746) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sally Young --- .pnp.cjs | 10 +++++----- metapackages/sass/package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.pnp.cjs b/.pnp.cjs index adc945d5d..b8e9720b4 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -511,7 +511,7 @@ const RAW_RUNTIME_STATE = ["gulp-sourcemaps", "npm:3.0.0"],\ ["modern-normalize", "npm:3.0.1"],\ ["postcss", "npm:8.4.49"],\ - ["sass", "npm:1.81.0"],\ + ["sass", "npm:1.82.0"],\ ["yargs", "npm:17.7.2"]\ ],\ "linkType": "SOFT"\ @@ -8378,10 +8378,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["sass", [\ - ["npm:1.81.0", {\ - "packageLocation": "../../../../cache/others/berry/cache/sass-npm-1.81.0-42587b1ed8-10c0.zip/node_modules/sass/",\ + ["npm:1.82.0", {\ + "packageLocation": "../../../../cache/others/berry/cache/sass-npm-1.82.0-091deac1e0-10c0.zip/node_modules/sass/",\ "packageDependencies": [\ - ["sass", "npm:1.81.0"],\ + ["sass", "npm:1.82.0"],\ ["@parcel/watcher", "npm:2.4.1"],\ ["chokidar", "npm:4.0.0"],\ ["immutable", "npm:5.0.3"],\ @@ -12378,7 +12378,7 @@ class MountFS extends BasePortableFakeFS { if (this.notMount.has(filePath)) continue; try { - if (this.typeCheck !== null && (this.baseFs.lstatSync(filePath).mode & fs.constants.S_IFMT) !== this.typeCheck) { + if (this.typeCheck !== null && (this.baseFs.statSync(filePath).mode & fs.constants.S_IFMT) !== this.typeCheck) { this.notMount.add(filePath); continue; } diff --git a/metapackages/sass/package.json b/metapackages/sass/package.json index c0a915bdb..5e2604c38 100644 --- a/metapackages/sass/package.json +++ b/metapackages/sass/package.json @@ -12,7 +12,7 @@ "gulp-sourcemaps": "^3.0.0", "modern-normalize": "^3.0.1", "postcss": "^8.4.49", - "sass": "^1.81.0", + "sass": "^1.82.0", "yargs": "^17.7.2" }, "repository": { diff --git a/yarn.lock b/yarn.lock index 0161658f6..7365e3ef4 100644 --- a/yarn.lock +++ b/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.81.0" + sass: "npm:^1.82.0" yargs: "npm:^17.7.2" bin: drainpipe-sass: ./gulp.js @@ -7196,9 +7196,9 @@ __metadata: languageName: node linkType: hard -"sass@npm:^1.81.0": - version: 1.81.0 - resolution: "sass@npm:1.81.0" +"sass@npm:^1.82.0": + version: 1.82.0 + resolution: "sass@npm:1.82.0" dependencies: "@parcel/watcher": "npm:^2.4.1" chokidar: "npm:^4.0.0" @@ -7209,7 +7209,7 @@ __metadata: optional: true bin: sass: sass.js - checksum: 10c0/9c59b3c9b4231c18fcb4583cc232dbc4de501ddc11101b7a025e44833e3f3ce6031546dc1cd109ee9f04ebcfb1fe30ff870810af33b8feb9aa9e36dfba9ec1ef + checksum: 10c0/7f86fe6ade4f6018862c448ed69d5c52f485b0125c9dab24e63f679739a04cc7c56562d588e3cf16b5efb4d2c4d0530e62740e1cfd273e2e3707d04d11011736 languageName: node linkType: hard From b614dd1be8a35b4182269aea6377b3727b672dbc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:55:23 +0000 Subject: [PATCH 5/7] fix(deps): update dependency drupal/coder to ^8.3.26 (#742) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sally Young --- drainpipe-dev/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drainpipe-dev/composer.json b/drainpipe-dev/composer.json index 2f8308567..6ef4730b4 100644 --- a/drainpipe-dev/composer.json +++ b/drainpipe-dev/composer.json @@ -16,7 +16,7 @@ "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", "mikey179/vfsstream": "^1.6.12", From 3dd96bab1d634d8116faa9c1fdf83b15473a79de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:41:59 -0500 Subject: [PATCH 6/7] fix(deps): update dependency mglaman/phpstan-drupal to ^1.3.2 (#754) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- drainpipe-dev/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drainpipe-dev/composer.json b/drainpipe-dev/composer.json index 6ef4730b4..34106ecf3 100644 --- a/drainpipe-dev/composer.json +++ b/drainpipe-dev/composer.json @@ -18,7 +18,7 @@ "davidrjonas/composer-lock-diff": "^1.7", "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", From c26269aa1db82bdd8b376765acd11c2c6b5e1815 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 21:27:23 -0500 Subject: [PATCH 7/7] fix(deps): update dependency sass to ^1.83.0 (#755) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .pnp.cjs | 8 ++++---- metapackages/sass/package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.pnp.cjs b/.pnp.cjs index b8e9720b4..f6ec6747c 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -511,7 +511,7 @@ const RAW_RUNTIME_STATE = ["gulp-sourcemaps", "npm:3.0.0"],\ ["modern-normalize", "npm:3.0.1"],\ ["postcss", "npm:8.4.49"],\ - ["sass", "npm:1.82.0"],\ + ["sass", "npm:1.83.0"],\ ["yargs", "npm:17.7.2"]\ ],\ "linkType": "SOFT"\ @@ -8378,10 +8378,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["sass", [\ - ["npm:1.82.0", {\ - "packageLocation": "../../../../cache/others/berry/cache/sass-npm-1.82.0-091deac1e0-10c0.zip/node_modules/sass/",\ + ["npm:1.83.0", {\ + "packageLocation": "../../../../cache/others/berry/cache/sass-npm-1.83.0-cc600b60b7-10c0.zip/node_modules/sass/",\ "packageDependencies": [\ - ["sass", "npm:1.82.0"],\ + ["sass", "npm:1.83.0"],\ ["@parcel/watcher", "npm:2.4.1"],\ ["chokidar", "npm:4.0.0"],\ ["immutable", "npm:5.0.3"],\ diff --git a/metapackages/sass/package.json b/metapackages/sass/package.json index 5e2604c38..4b3db63ba 100644 --- a/metapackages/sass/package.json +++ b/metapackages/sass/package.json @@ -12,7 +12,7 @@ "gulp-sourcemaps": "^3.0.0", "modern-normalize": "^3.0.1", "postcss": "^8.4.49", - "sass": "^1.82.0", + "sass": "^1.83.0", "yargs": "^17.7.2" }, "repository": { diff --git a/yarn.lock b/yarn.lock index 7365e3ef4..6030dc2ca 100644 --- a/yarn.lock +++ b/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.82.0" + sass: "npm:^1.83.0" yargs: "npm:^17.7.2" bin: drainpipe-sass: ./gulp.js @@ -7196,9 +7196,9 @@ __metadata: languageName: node linkType: hard -"sass@npm:^1.82.0": - version: 1.82.0 - resolution: "sass@npm:1.82.0" +"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" @@ -7209,7 +7209,7 @@ __metadata: optional: true bin: sass: sass.js - checksum: 10c0/7f86fe6ade4f6018862c448ed69d5c52f485b0125c9dab24e63f679739a04cc7c56562d588e3cf16b5efb4d2c4d0530e62740e1cfd273e2e3707d04d11011736 + checksum: 10c0/4415361229879a9041d77c953da85482e89032aa4321ba13250a9987d39c80fac6c88af3777f2a2d76a4e8b0c8afbd21c1970fdbe84e0b3ec25fb26741f92beb languageName: node linkType: hard