From 50f8e7ea676a8c6fd1880aa79a7f7a95ee86c22b Mon Sep 17 00:00:00 2001 From: Cihad Tekin Date: Fri, 3 Jul 2026 21:57:34 +0300 Subject: [PATCH] Revert "fix(deps): pin sass to 1.99.0 to keep chokidar on CJS-compatible v4" This reverts commit 2ce3d309b8dd1882d8eeee9c3e625a8e24f26b61. --- .github/dependabot.yml | 16 +--------- package-lock.json | 42 ++++++++++++++++++++++---- package.json | 2 +- ui-tests/package-lock.json | 60 ++++++++++++++++++++++++++++++++++---- ui-tests/package.json | 2 +- 5 files changed, 93 insertions(+), 29 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 123ab7bd5a8..bf976fbb00a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,14 +13,7 @@ updates: labels: - dependencies versioning-strategy: increase-if-necessary - ignore: - # sass >= 1.100.0 depends on ESM-only chokidar 5 and requires Node >= 20.19.0. - # The CI container (countly/countly-core:pipelines-*) ships Node 20.18.2, where - # require() of an ESM module throws ERR_REQUIRE_ESM during `countly task dist-all`. - # Keep sass on 1.99.x (chokidar ^4, dual CJS/ESM). Remove once CI Node >= 20.19.0. - - dependency-name: "sass" - versions: [">=1.100.0"] - + - package-ecosystem: npm directory: "/ui-tests" schedule: @@ -33,13 +26,6 @@ updates: labels: - dependencies versioning-strategy: increase-if-necessary - ignore: - # @faker-js/faker >= 10 is ESM-only (no `require` export). The CJS fixture - # generator (require('@faker-js/faker')) throws ERR_REQUIRE_ESM on Node 20.18.2. - # Keep faker on 9.x (dual CJS/ESM). Remove once CI Node >= 20.19.0 or the - # generator scripts are converted to ESM / dynamic import(). - - dependency-name: "@faker-js/faker" - versions: [">=10.0.0"] # API utilities - package-ecosystem: npm diff --git a/package-lock.json b/package-lock.json index b5c112c947f..a86be5fd503 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,7 +63,7 @@ "properties-parser": "0.6.0", "puppeteer": "^24.6.1", "rate-limiter-flexible": "^11.0.0", - "sass": "1.99.0", + "sass": "1.101.0", "semver": "^7.7.1", "sharp": "^0.35.0", "sqlite3": "^5.1.7", @@ -3752,6 +3752,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, "license": "MIT", "dependencies": { "readdirp": "^4.0.1" @@ -11151,6 +11152,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, "license": "MIT", "engines": { "node": ">= 14.18.0" @@ -11435,12 +11437,12 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.99.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.99.0.tgz", - "integrity": "sha512-kgW13M54DUB7IsIRM5LvJkNlpH+WhMpooUcaWGFARkF1Tc82v9mIWkCbCYf+MBvpIUBSeSOTilpZjEPr2VYE6Q==", + "version": "1.101.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.101.0.tgz", + "integrity": "sha512-OL3GoQyoUdDt843DpVmDO6y2k1sc5IhUDSpu8XucEI+35neq5QivZ1iuegnpraEVTJXlQGK1gl27zKcTLEPbQw==", "license": "MIT", "dependencies": { - "chokidar": "^4.0.0", + "chokidar": "^5.0.0", "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, @@ -11448,12 +11450,40 @@ "sass": "sass.js" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.19.0" }, "optionalDependencies": { "@parcel/watcher": "^2.4.1" } }, + "node_modules/sass/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "license": "MIT", + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "license": "MIT", + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/sax": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz", diff --git a/package.json b/package.json index d942c6fcda6..8295555bb79 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "properties-parser": "0.6.0", "puppeteer": "^24.6.1", "rate-limiter-flexible": "^11.0.0", - "sass": "1.99.0", + "sass": "1.101.0", "semver": "^7.7.1", "sharp": "^0.35.0", "sqlite3": "^5.1.7", diff --git a/ui-tests/package-lock.json b/ui-tests/package-lock.json index 896a2e7972f..8b857433010 100644 --- a/ui-tests/package-lock.json +++ b/ui-tests/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@faker-js/faker": "^9.0.0", + "@faker-js/faker": "^10.0.0", "base-64": "^1.0.0", "chai": "^6.0.1", "cypress-file-upload": "^5.0.8", @@ -82,9 +82,9 @@ } }, "node_modules/@faker-js/faker": { - "version": "9.9.0", - "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.9.0.tgz", - "integrity": "sha512-OEl393iCOoo/z8bMezRlJu+GlRGlsKbUAN7jKB6LhnKoqKve5DXRpalbItIIcwnCjs1k/FOPjFzcA6Qn+H+YbA==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-10.5.0.tgz", + "integrity": "sha512-bsxD8WLS5lIj7aaoCx1YJkktqYj5vlBUE6HWzu2Q51ksrGJ0H737ECCKlFU7Yf8Br45z9t99frBp/J7kzbMPAg==", "funding": [ { "type": "opencollective", @@ -93,8 +93,8 @@ ], "license": "MIT", "engines": { - "node": ">=18.0.0", - "npm": ">=9.0.0" + "node": "^20.19.0 || ^22.13.0 || ^23.5.0 || >=24.0.0", + "npm": ">=10" } }, "node_modules/@img/colour": { @@ -215,6 +215,9 @@ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -232,6 +235,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -249,6 +255,9 @@ "ppc64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -266,6 +275,9 @@ "riscv64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -283,6 +295,9 @@ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -300,6 +315,9 @@ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -317,6 +335,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -334,6 +355,9 @@ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -351,6 +375,9 @@ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -374,6 +401,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -397,6 +427,9 @@ "ppc64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -420,6 +453,9 @@ "riscv64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -443,6 +479,9 @@ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -466,6 +505,9 @@ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -489,6 +531,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -512,6 +557,9 @@ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "Apache-2.0", "optional": true, "os": [ diff --git a/ui-tests/package.json b/ui-tests/package.json index 3b8e529d092..24b87d9b043 100644 --- a/ui-tests/package.json +++ b/ui-tests/package.json @@ -10,7 +10,7 @@ }, "license": "ISC", "dependencies": { - "@faker-js/faker": "^9.0.0", + "@faker-js/faker": "^10.0.0", "base-64": "^1.0.0", "chai": "^6.0.1", "cypress-file-upload": "^5.0.8",