From 1a0660dc92ffabd2be09464785dd549ff3ea2890 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 12 Jul 2024 13:57:59 -0500 Subject: [PATCH 1/4] CLDR-17492 deps: update js deps --- tools/cldr-apps/js/package-lock.json | 210 +++++++++++---------------- tools/cldr-apps/js/package.json | 2 +- 2 files changed, 82 insertions(+), 130 deletions(-) diff --git a/tools/cldr-apps/js/package-lock.json b/tools/cldr-apps/js/package-lock.json index 7c59a63a439..f6643d2bdfd 100644 --- a/tools/cldr-apps/js/package-lock.json +++ b/tools/cldr-apps/js/package-lock.json @@ -24,7 +24,7 @@ "css-loader": "^6.8.1", "esm": "^3.2.25", "mocha": "^10.2.0", - "mocha-headless-chrome": "^4.0.0", + "mocha-headless-chrome": "^3.1.0", "style-loader": "^3.3.3", "vue-loader": "^17.0.1", "webpack": "^5.77.0", @@ -734,9 +734,9 @@ } }, "node_modules/@types/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", "dev": true, "optional": true, "dependencies": { @@ -1069,13 +1069,10 @@ } }, "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", + "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", "dev": true, - "dependencies": { - "debug": "4" - }, "engines": { "node": ">= 6.0.0" } @@ -1674,15 +1671,6 @@ "url": "https://opencollective.com/core-js" } }, - "node_modules/cross-fetch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", - "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", - "dev": true, - "dependencies": { - "node-fetch": "2.6.7" - } - }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -1826,12 +1814,6 @@ "node": ">=8" } }, - "node_modules/devtools-protocol": { - "version": "0.0.981744", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz", - "integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==", - "dev": true - }, "node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -2282,16 +2264,16 @@ } }, "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", + "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", "dev": true, "dependencies": { - "agent-base": "6", + "agent-base": "5", "debug": "4" }, "engines": { - "node": ">= 6" + "node": ">= 6.0.0" } }, "node_modules/icss-utils": { @@ -2700,6 +2682,18 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, + "node_modules/mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/mime-db": { "version": "1.45.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", @@ -2815,20 +2809,20 @@ } }, "node_modules/mocha-headless-chrome": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mocha-headless-chrome/-/mocha-headless-chrome-4.0.0.tgz", - "integrity": "sha512-Kw4/Sn3NgV3J2/DBuJrMGdxoul4YLl1RpTR+gftb3TNFXCcJZ1eAjAiMLzl5zd2Oa/w9Iu2V6hwTNOpcdf9VSg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mocha-headless-chrome/-/mocha-headless-chrome-3.1.0.tgz", + "integrity": "sha512-qHz9D+Hzd8tDaNvPooUnvilWvAy1l+cJCBsV7dsme4wDKpvIaKRVGjU8RoirTfWQCkNOpjbweDpuNgo8wuOSHQ==", "dev": true, "dependencies": { "args": "^5.0.1", "mkdirp": "^1.0.4", - "puppeteer": "^13.1.3" + "puppeteer": "^4.0.0" }, "bin": { "mocha-headless-chrome": "bin/start" }, "engines": { - "node": ">=14.0.0" + "node": ">=10.18.1" } }, "node_modules/mocha-headless-chrome/node_modules/mkdirp": { @@ -3031,26 +3025,6 @@ "node": ">=10.5.0" } }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/node-fetch-commonjs": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/node-fetch-commonjs/-/node-fetch-commonjs-3.3.2.tgz", @@ -3413,66 +3387,29 @@ } }, "node_modules/puppeteer": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.7.0.tgz", - "integrity": "sha512-U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA==", - "deprecated": "< 19.4.0 is no longer supported", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-4.0.1.tgz", + "integrity": "sha512-LIiSWTRqpTnnm3R2yAoMBx1inSeKwVZy66RFSkgSTDINzheJZPd5z5mMbPM0FkvwWAZ27a+69j5nZf+Fpyhn3Q==", + "deprecated": "< 22.6.4 is no longer supported", "dev": true, "hasInstallScript": true, "dependencies": { - "cross-fetch": "3.1.5", - "debug": "4.3.4", - "devtools-protocol": "0.0.981744", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.1", - "pkg-dir": "4.2.0", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.5.0" + "debug": "^4.1.0", + "extract-zip": "^2.0.0", + "https-proxy-agent": "^4.0.0", + "mime": "^2.0.3", + "mitt": "^2.0.1", + "progress": "^2.0.1", + "proxy-from-env": "^1.0.0", + "rimraf": "^3.0.2", + "tar-fs": "^2.0.0", + "unbzip2-stream": "^1.3.3", + "ws": "^7.2.3" }, "engines": { "node": ">=10.18.1" } }, - "node_modules/puppeteer/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/puppeteer/node_modules/ws": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", - "dev": true, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/qs": { "version": "6.10.3", "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", @@ -3639,6 +3576,22 @@ "node": ">=8" } }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4058,12 +4011,6 @@ "node": ">=8.0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, "node_modules/traverse": { "version": "0.6.8", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.8.tgz", @@ -4347,12 +4294,6 @@ "integrity": "sha512-zKGJW9r23y3BcJusbgvnOH2OYAW40MXAOi9bi3Gcc7T4Gms9WWgXF8m6adsJWpGJEhgOzCrfiz1IzKowJWrtYw==", "optional": true }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, "node_modules/webpack": { "version": "5.82.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.0.tgz", @@ -4482,16 +4423,6 @@ "node": ">=10.13.0" } }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -4619,6 +4550,27 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "devOptional": true }, + "node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "dev": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/xlsx": { "version": "0.20.2", "resolved": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz", diff --git a/tools/cldr-apps/js/package.json b/tools/cldr-apps/js/package.json index b81d501c702..9e404b9fa6b 100644 --- a/tools/cldr-apps/js/package.json +++ b/tools/cldr-apps/js/package.json @@ -33,7 +33,7 @@ "css-loader": "^6.8.1", "esm": "^3.2.25", "mocha": "^10.2.0", - "mocha-headless-chrome": "^4.0.0", + "mocha-headless-chrome": "^3.1.0", "style-loader": "^3.3.3", "vue-loader": "^17.0.1", "webpack": "^5.77.0", From 4977ed781cc59d4efe43f4fcd5b3ec3d23b52cc3 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 12 Jul 2024 14:12:14 -0500 Subject: [PATCH 2/4] CLDR-17492 chore: update js.yml - deps: nodenv/actions/node-version@v4 - retry js test once if it fails. --- .github/workflows/js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index b3e1ead9337..74678f615a2 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 with: lfs: false # not needed for this job, as we don’t currently do a Java build - - uses: nodenv/actions/node-version@v3 # setup using .node-version + - uses: nodenv/actions/node-version@v4 # setup using .node-version - name: Cache webpack uses: actions/cache@v4 with: @@ -41,6 +41,6 @@ jobs: - name: Run JS tests # stopgap: fail this if it takes too long timeout-minutes: 10 - run: (cd tools/cldr-apps/js && npm t) + run: (cd tools/cldr-apps/js && (npm t || npm t)) - name: Run Webpack production build run: (cd tools/cldr-apps/js && npm run build) From 19e04be44ad2a7ef80e72b2fbc424a59d8a0b4b3 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 12 Jul 2024 14:27:53 -0500 Subject: [PATCH 3/4] CLDR-17492 chore: update js.yml - update puppeteer deps --- .github/workflows/js.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 74678f615a2..85f1d1f3556 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -36,6 +36,8 @@ jobs: restore-keys: | ${{ runner.os }}-lint- lint- + - name: Prepare puppeteer deps + run: sudo apt-get install -q -y ca-certificates fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils - name: Prepare JS tests run: (cd tools/cldr-apps/js && npm ci) - name: Run JS tests From eff401c8730301fe95e3348d000d0e9cb6b83f1a Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 12 Jul 2024 14:33:12 -0500 Subject: [PATCH 4/4] CLDR-17492 attempt to update tests - there's a whole issue about how we invoke FE tests that needs fixing. --- tools/cldr-apps/js/test/Test.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cldr-apps/js/test/Test.html b/tools/cldr-apps/js/test/Test.html index b49494b89ef..500eba8fb1c 100644 --- a/tools/cldr-apps/js/test/Test.html +++ b/tools/cldr-apps/js/test/Test.html @@ -44,8 +44,8 @@

CLDR SurveyTool JavaScript Tests

- - + +