From 07cec09355591775a47d79eabaea798d06b40151 Mon Sep 17 00:00:00 2001 From: powerivq Date: Thu, 13 Jun 2024 16:17:34 -0700 Subject: [PATCH] Version update for all packages to 2.10.0 --- CHANGELOG.md | 7 + lerna.json | 2 +- package-lock.json | 186 +++---- packages/cache-list/package.json | 4 +- packages/cache-url/package.json | 2 +- packages/cli/package.json | 18 +- .../cloudflare-optimizer-scripts/package.json | 4 +- packages/core/package.json | 2 +- packages/cors/package.json | 8 +- packages/linter/package.json | 10 +- packages/optimizer-docker/package.json | 4 +- packages/optimizer-docker/yarn.lock | 492 +++++++++--------- packages/optimizer-express/package.json | 8 +- packages/optimizer/package.json | 10 +- packages/page-experience/package.json | 4 +- packages/runtime-fetch/package.json | 8 +- .../runtime-version/lib/RuntimeVersion.js | 3 +- packages/runtime-version/package.json | 4 +- packages/script-csp/package.json | 2 +- packages/update-cache/package.json | 6 +- packages/validator-rules/package.json | 2 +- 21 files changed, 402 insertions(+), 384 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4627ce7fd..ecc9dd252 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 2.10.0 (2024-06-07) + +#### :rocket: Enhancement +* `optimizer' + * [#1358](https://github.com/ampproject/amp-toolbox/pull/1358) AMP optimizer to support ampjs.org + * Dependency upgrades + ## 2.9.0 (2022-06-23) #### :rocket: Enhancement diff --git a/lerna.json b/lerna.json index 9a4fb625c..09e01d5c1 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "packages": [ "packages/*" ], - "version": "2.9.0" + "version": "2.10.1" } diff --git a/package-lock.json b/package-lock.json index 7bbfab43b..ac497f414 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8711,11 +8711,13 @@ } }, "node_modules/dom-serializer": { - "version": "1.2.0", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", + "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", "license": "MIT", "dependencies": { "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", + "domhandler": "^4.2.0", "entities": "^2.0.0" }, "funding": { @@ -23412,15 +23414,15 @@ }, "packages/cache-list": { "name": "@ampproject/toolbox-cache-list", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-core": "2.9.0" + "@ampproject/toolbox-core": "2.10.1" } }, "packages/cache-url": { "name": "@ampproject/toolbox-cache-url", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { "punycode": "2.1.1", @@ -23429,17 +23431,17 @@ }, "packages/cli": { "name": "@ampproject/toolbox-cli", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-linter": "2.9.0", - "@ampproject/toolbox-optimizer": "2.9.0", - "@ampproject/toolbox-runtime-fetch": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", - "@ampproject/toolbox-update-cache": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-linter": "2.10.1", + "@ampproject/toolbox-optimizer": "2.10.1", + "@ampproject/toolbox-runtime-fetch": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", + "@ampproject/toolbox-update-cache": "2.10.1", "minimist": "1.2.6", "minimist-options": "4.1.0", "node-fetch": "2.6.7" @@ -23450,7 +23452,7 @@ }, "packages/core": { "name": "@ampproject/toolbox-core", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { "cross-fetch": "3.1.5", @@ -23459,23 +23461,23 @@ }, "packages/cors": { "name": "@ampproject/toolbox-cors", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", - "@ampproject/toolbox-core": "2.9.0" + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", + "@ampproject/toolbox-core": "2.10.1" } }, "packages/linter": { "name": "@ampproject/toolbox-linter", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", - "@ampproject/toolbox-optimizer": "2.9.0", - "@ampproject/toolbox-validator-rules": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", + "@ampproject/toolbox-optimizer": "2.10.1", + "@ampproject/toolbox-validator-rules": "2.10.1", "amphtml-validator": "1.0.35", "chalk": "4.1.0", "cheerio": "1.0.0-rc.12", @@ -23578,13 +23580,13 @@ }, "packages/optimizer": { "name": "@ampproject/toolbox-optimizer", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", - "@ampproject/toolbox-script-csp": "2.9.0", - "@ampproject/toolbox-validator-rules": "2.9.0", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", + "@ampproject/toolbox-script-csp": "2.10.1", + "@ampproject/toolbox-validator-rules": "2.10.1", "abort-controller": "3.0.0", "cross-fetch": "3.1.5", "cssnano-simple": "2.0.0", @@ -23610,21 +23612,21 @@ }, "packages/optimizer-docker": { "name": "toolbox-optimizer-docker", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-optimizer": "2.9.0", + "@ampproject/toolbox-optimizer": "2.10.1", "prom-client": "13.1.0" } }, "packages/optimizer-express": { "name": "@ampproject/toolbox-optimizer-express", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-optimizer": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-optimizer": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", "mime-types": "2.1.29", "whatwg-url": "8.4.0" } @@ -23658,18 +23660,6 @@ "node": ">=10" } }, - "packages/optimizer/node_modules/dom-serializer": { - "version": "1.3.2", - "license": "MIT", - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" - } - }, "packages/optimizer/node_modules/htmlparser2": { "version": "7.2.0", "funding": [ @@ -23732,10 +23722,10 @@ }, "packages/page-experience": { "name": "@ampproject/toolbox-page-experience", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-linter": "2.9.0", + "@ampproject/toolbox-linter": "2.10.1", "cheerio": "1.0.0-rc.12", "css-font-face-src": "1.0.0", "postcss": "8.2.8", @@ -23764,12 +23754,12 @@ }, "packages/runtime-fetch": { "name": "@ampproject/toolbox-runtime-fetch", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", "at-least-node": "1.0.0", "fs-extra": "9.1.0", "node-fetch": "2.6.7" @@ -23797,30 +23787,30 @@ }, "packages/runtime-version": { "name": "@ampproject/toolbox-runtime-version", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-core": "2.9.0" + "@ampproject/toolbox-core": "2.10.1" } }, "packages/script-csp": { "name": "@ampproject/toolbox-script-csp", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0" }, "packages/update-cache": { "name": "@ampproject/toolbox-update-cache", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", "jsrsasign": "10.5.25" } }, "packages/validator-rules": { "name": "@ampproject/toolbox-validator-rules", - "version": "2.9.0", + "version": "2.10.1", "license": "Apache-2.0", "dependencies": { "cross-fetch": "3.1.5" @@ -23879,7 +23869,7 @@ "@ampproject/toolbox-cache-list": { "version": "file:packages/cache-list", "requires": { - "@ampproject/toolbox-core": "2.9.0" + "@ampproject/toolbox-core": "2.10.1" } }, "@ampproject/toolbox-cache-url": { @@ -23892,14 +23882,14 @@ "@ampproject/toolbox-cli": { "version": "file:packages/cli", "requires": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-linter": "2.9.0", - "@ampproject/toolbox-optimizer": "2.9.0", - "@ampproject/toolbox-runtime-fetch": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", - "@ampproject/toolbox-update-cache": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-linter": "2.10.1", + "@ampproject/toolbox-optimizer": "2.10.1", + "@ampproject/toolbox-runtime-fetch": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", + "@ampproject/toolbox-update-cache": "2.10.1", "minimist": "1.2.6", "minimist-options": "4.1.0", "node-fetch": "2.6.7" @@ -23915,18 +23905,18 @@ "@ampproject/toolbox-cors": { "version": "file:packages/cors", "requires": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", - "@ampproject/toolbox-core": "2.9.0" + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", + "@ampproject/toolbox-core": "2.10.1" } }, "@ampproject/toolbox-linter": { "version": "file:packages/linter", "requires": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", - "@ampproject/toolbox-optimizer": "2.9.0", - "@ampproject/toolbox-validator-rules": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", + "@ampproject/toolbox-optimizer": "2.10.1", + "@ampproject/toolbox-validator-rules": "2.10.1", "amphtml-validator": "1.0.35", "chalk": "4.1.0", "cheerio": "1.0.0-rc.12", @@ -23991,10 +23981,10 @@ "@ampproject/toolbox-optimizer": { "version": "file:packages/optimizer", "requires": { - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", - "@ampproject/toolbox-script-csp": "2.9.0", - "@ampproject/toolbox-validator-rules": "2.9.0", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", + "@ampproject/toolbox-script-csp": "2.10.1", + "@ampproject/toolbox-validator-rules": "2.10.1", "abort-controller": "3.0.0", "cross-fetch": "3.1.5", "cssnano-simple": "2.0.0", @@ -24010,14 +24000,6 @@ "terser": "5.5.1" }, "dependencies": { - "dom-serializer": { - "version": "1.3.2", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - } - }, "htmlparser2": { "version": "7.2.0", "requires": { @@ -24057,9 +24039,9 @@ "@ampproject/toolbox-optimizer-express": { "version": "file:packages/optimizer-express", "requires": { - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-optimizer": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-optimizer": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", "mime-types": "2.1.29", "whatwg-url": "8.4.0" }, @@ -24086,7 +24068,7 @@ "@ampproject/toolbox-page-experience": { "version": "file:packages/page-experience", "requires": { - "@ampproject/toolbox-linter": "2.9.0", + "@ampproject/toolbox-linter": "2.10.1", "cheerio": "1.0.0-rc.12", "css-font-face-src": "1.0.0", "postcss": "8.2.8", @@ -24107,9 +24089,9 @@ "@ampproject/toolbox-runtime-fetch": { "version": "file:packages/runtime-fetch", "requires": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", "at-least-node": "1.0.0", "fs-extra": "9.1.0", "node-fetch": "2.6.7" @@ -24132,7 +24114,7 @@ "@ampproject/toolbox-runtime-version": { "version": "file:packages/runtime-version", "requires": { - "@ampproject/toolbox-core": "2.9.0" + "@ampproject/toolbox-core": "2.10.1" } }, "@ampproject/toolbox-script-csp": { @@ -24141,8 +24123,8 @@ "@ampproject/toolbox-update-cache": { "version": "file:packages/update-cache", "requires": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", "jsrsasign": "10.5.25" } }, @@ -30290,10 +30272,12 @@ } }, "dom-serializer": { - "version": "1.2.0", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", + "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", "requires": { "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", + "domhandler": "^4.2.0", "entities": "^2.0.0" } }, @@ -39791,7 +39775,7 @@ "toolbox-optimizer-docker": { "version": "file:packages/optimizer-docker", "requires": { - "@ampproject/toolbox-optimizer": "2.9.0", + "@ampproject/toolbox-optimizer": "2.10.1", "prom-client": "13.1.0" } }, diff --git a/packages/cache-list/package.json b/packages/cache-list/package.json index b99aeed83..12f673acb 100644 --- a/packages/cache-list/package.json +++ b/packages/cache-list/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-cache-list", - "version": "2.9.0", + "version": "2.10.1", "description": "Lists AMP Caches", "main": "index.js", "repository": { @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/cache-list", "dependencies": { - "@ampproject/toolbox-core": "2.9.0" + "@ampproject/toolbox-core": "2.10.1" }, "gitHead": "6103eb57765445355421826791361ac9ed9cf4d8" } diff --git a/packages/cache-url/package.json b/packages/cache-url/package.json index 85e47be5e..e12592a4b 100644 --- a/packages/cache-url/package.json +++ b/packages/cache-url/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-cache-url", - "version": "2.9.0", + "version": "2.10.1", "description": "Transform canonical URLs into AMP Cache URLs", "main": "dist/amp-toolbox-cache-url.cjs.js", "types": "index.d.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index 20f52dc28..17d45476a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-cli", - "version": "2.9.0", + "version": "2.10.1", "description": "A Command Line Interface (CLI) for amp-toolbox", "main": "index.js", "bin": { @@ -27,14 +27,14 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/cli", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-linter": "2.9.0", - "@ampproject/toolbox-optimizer": "2.9.0", - "@ampproject/toolbox-runtime-fetch": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", - "@ampproject/toolbox-update-cache": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-linter": "2.10.1", + "@ampproject/toolbox-optimizer": "2.10.1", + "@ampproject/toolbox-runtime-fetch": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", + "@ampproject/toolbox-update-cache": "2.10.1", "minimist": "1.2.6", "minimist-options": "4.1.0", "node-fetch": "2.6.7" diff --git a/packages/cloudflare-optimizer-scripts/package.json b/packages/cloudflare-optimizer-scripts/package.json index 8b162c43c..c4df13602 100644 --- a/packages/cloudflare-optimizer-scripts/package.json +++ b/packages/cloudflare-optimizer-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/cloudflare-optimizer-scripts", - "version": "2.9.0", + "version": "2.10.1", "description": "Configuration and scripts for cloudflare-amp-optimizer", "main": "./src/index.js", "files": [ @@ -15,7 +15,7 @@ "author": "AMPHTML Team", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-optimizer": "2.9.0" + "@ampproject/toolbox-optimizer": "2.10.1" }, "gitHead": "6103eb57765445355421826791361ac9ed9cf4d8" } diff --git a/packages/core/package.json b/packages/core/package.json index c5c1877cd..91c3fc89e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-core", - "version": "2.9.0", + "version": "2.10.1", "description": "Commonly used functionality for amp-toolbox", "main": "index.js", "repository": { diff --git a/packages/cors/package.json b/packages/cors/package.json index 6b7a7d3fb..836d6464c 100644 --- a/packages/cors/package.json +++ b/packages/cors/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-cors", - "version": "2.9.0", + "version": "2.10.1", "description": "An express middleware implementing the AMP CORS protocol", "main": "index.js", "keywords": [ @@ -19,9 +19,9 @@ "author": "AMPHTML Team", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", - "@ampproject/toolbox-core": "2.9.0" + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", + "@ampproject/toolbox-core": "2.10.1" }, "bugs": { "url": "https://github.com/ampproject/amp-toolbox/issues" diff --git a/packages/linter/package.json b/packages/linter/package.json index 2af76965e..ba61ac0a9 100644 --- a/packages/linter/package.json +++ b/packages/linter/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-linter", - "version": "2.9.0", + "version": "2.10.1", "description": "A linter for AMP documents", "repository": { "type": "git", @@ -11,10 +11,10 @@ "license": "Apache-2.0", "author": "AMPHTML Team", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", - "@ampproject/toolbox-optimizer": "2.9.0", - "@ampproject/toolbox-validator-rules": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", + "@ampproject/toolbox-optimizer": "2.10.1", + "@ampproject/toolbox-validator-rules": "2.10.1", "amphtml-validator": "1.0.35", "chalk": "4.1.0", "cheerio": "1.0.0-rc.12", diff --git a/packages/optimizer-docker/package.json b/packages/optimizer-docker/package.json index 0817cfbcf..6d60165cc 100644 --- a/packages/optimizer-docker/package.json +++ b/packages/optimizer-docker/package.json @@ -1,6 +1,6 @@ { "name": "toolbox-optimizer-docker", - "version": "2.9.0", + "version": "2.10.1", "description": "Thin wrapper around the amp-optimizer", "main": "index.js", "private": true, @@ -28,7 +28,7 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/optimizer", "dependencies": { - "@ampproject/toolbox-optimizer": "2.9.0", + "@ampproject/toolbox-optimizer": "2.10.1", "prom-client": "13.1.0" }, "gitHead": "b86ff10f2a20a9e5f810f31a694c7f020eb291ae" diff --git a/packages/optimizer-docker/yarn.lock b/packages/optimizer-docker/yarn.lock index 5cfffca77..91d938234 100644 --- a/packages/optimizer-docker/yarn.lock +++ b/packages/optimizer-docker/yarn.lock @@ -2,271 +2,299 @@ # yarn lockfile v1 -"@ampproject/toolbox-core@^2.8.0", "@ampproject/toolbox-core@2.8.0": - "integrity" "sha512-YrMRrE9zfAChPlFLT+B4yoGEH6CR/Yerjm6SCxuFSPARK/LaytUV+ZhZ03tlMv5wUHDH2Lq8e/lGymME0CXBhA==" - "resolved" "https://registry.npmjs.org/@ampproject/toolbox-core/-/toolbox-core-2.8.0.tgz" - "version" "2.8.0" +"@ampproject/toolbox-core@2.10.0": + version "2.10.0" + resolved "https://registry.npmjs.org/@ampproject/toolbox-core/-/toolbox-core-2.10.0.tgz" + integrity sha512-opJESdrUUzKNCQNgtlUK/TAVXZVPxNmK00riRoJSJjNrebsJLsGWqzXxUAxmYx8olmbdL/xWox1x8uoB5rrjGA== dependencies: - "cross-fetch" "3.1.2" - "lru-cache" "6.0.0" + cross-fetch "3.1.5" + lru-cache "6.0.0" -"@ampproject/toolbox-optimizer@2.8.10": - "integrity" "sha512-GuXkLHmGJ3pko6aozHa3msxxahiUJM163eG8LEji/MTfNGf0QJCWSQ46a+yHG3tBzYtLexVHWU7A8QMfRbxWGw==" - "resolved" "https://registry.npmjs.org/@ampproject/toolbox-optimizer/-/toolbox-optimizer-2.8.10.tgz" - "version" "2.8.10" +"@ampproject/toolbox-core@2.10.1": + version "2.10.1" + resolved "https://registry.npmjs.org/@ampproject/toolbox-core/-/toolbox-core-2.10.1.tgz" + integrity sha512-GW2qiUmHZCOVZrwjU7v+maap8Ajb4MAbu6GclwAIlIOENeqFCNorUqxBaNNzU5oFBz5xBHEan2hoWTb8ffw+tg== dependencies: - "@ampproject/toolbox-core" "2.8.0" - "@ampproject/toolbox-runtime-version" "2.8.0" - "@ampproject/toolbox-script-csp" "2.8.0" - "@ampproject/toolbox-validator-rules" "2.8.0" - "abort-controller" "3.0.0" - "cross-fetch" "3.1.2" - "cssnano-simple" "2.0.0" - "dom-serializer" "1.3.2" - "domhandler" "4.2.2" - "domutils" "2.8.0" - "htmlparser2" "7.2.0" - "https-proxy-agent" "5.0.0" - "lru-cache" "6.0.0" - "normalize-html-whitespace" "1.0.0" - "postcss" "8.2.13" - "postcss-safe-parser" "5.0.2" - "terser" "5.5.1" - -"@ampproject/toolbox-runtime-version@2.8.0": - "integrity" "sha512-vkotDc6S3Q3Xm6LIPzWo2T1+yxvj+bIDrD4SObk6J4SVqilIlPEunLayS602Su+ZXqNC82VjEeD1ARAtc613dQ==" - "resolved" "https://registry.npmjs.org/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-2.8.0.tgz" - "version" "2.8.0" + cross-fetch "3.1.5" + lru-cache "6.0.0" + +"@ampproject/toolbox-optimizer@2.10.1": + version "2.10.1" + resolved "https://registry.npmjs.org/@ampproject/toolbox-optimizer/-/toolbox-optimizer-2.10.1.tgz" + integrity sha512-dPZzR0XO8Uii11nUEjA71yA2ip0fBMlkuazw7NuTBsg55oFwzE3DknZKptH7hl8CSA28SjbmrbdpvjZlw3u4PA== + dependencies: + "@ampproject/toolbox-core" "2.10.1" + "@ampproject/toolbox-runtime-version" "2.10.1" + "@ampproject/toolbox-script-csp" "2.10.1" + "@ampproject/toolbox-validator-rules" "2.10.1" + abort-controller "3.0.0" + cross-fetch "3.1.5" + cssnano-simple "2.0.0" + dom-serializer "1.3.2" + domhandler "4.2.2" + domutils "2.8.0" + htmlparser2 "7.2.0" + https-proxy-agent "5.0.0" + lru-cache "6.0.0" + normalize-html-whitespace "1.0.0" + postcss "8.2.13" + postcss-safe-parser "5.0.2" + terser "5.5.1" + +"@ampproject/toolbox-runtime-version@2.10.1": + version "2.10.1" + resolved "https://registry.npmjs.org/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-2.10.1.tgz" + integrity sha512-2c35NuOvTUF0Au0tgVOZ/0wu0bvI6VNad51mCNjOkmUwCjhrQBBJ5hFvMOViAglk3cdMMqDbZpmd6Ghkn++UTw== dependencies: - "@ampproject/toolbox-core" "^2.8.0" + "@ampproject/toolbox-core" "2.10.0" -"@ampproject/toolbox-script-csp@2.8.0": - "integrity" "sha512-5/ytdTzhmdIyOkcEBskh5ZlLJ8V4bbe+1pY9LZQ8DfWrSOVD1pJ+LtAO/7lmTM+HXxMAKPYDRpvsJc0vvbY0tw==" - "resolved" "https://registry.npmjs.org/@ampproject/toolbox-script-csp/-/toolbox-script-csp-2.8.0.tgz" - "version" "2.8.0" +"@ampproject/toolbox-script-csp@2.10.1": + version "2.10.1" + resolved "https://registry.npmjs.org/@ampproject/toolbox-script-csp/-/toolbox-script-csp-2.10.1.tgz" + integrity sha512-C2S2ndjlbMpur1ckBgDcbk63jd0Rc1k7vd4MBIDHYq9ppZUkvcAzC2h8kVTFBPQldjq/deLUD5eLKt+dg3X49A== -"@ampproject/toolbox-validator-rules@2.8.0": - "integrity" "sha512-kbInwnzpEPVZkKigpKFkF/DQ2LsuZ5b8vrEFHjJ4P+meKVQg2QF/UWAQpIMMdjGe1AQBT+DWm91n9UyjgqfnWQ==" - "resolved" "https://registry.npmjs.org/@ampproject/toolbox-validator-rules/-/toolbox-validator-rules-2.8.0.tgz" - "version" "2.8.0" +"@ampproject/toolbox-validator-rules@2.10.1": + version "2.10.1" + resolved "https://registry.npmjs.org/@ampproject/toolbox-validator-rules/-/toolbox-validator-rules-2.10.1.tgz" + integrity sha512-JhSXOb+igK6QEzJEjnfbsH+c7fGp9WRbeIeECu5fS2PC2F+4VqWOV1QBA4n3H0nFPexhrJadn6OedaNly7lilA== dependencies: - "cross-fetch" "3.1.2" + cross-fetch "3.1.5" -"abort-controller@3.0.0": - "integrity" "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==" - "resolved" "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz" - "version" "3.0.0" +abort-controller@3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== dependencies: - "event-target-shim" "^5.0.0" + event-target-shim "^5.0.0" -"agent-base@6": - "integrity" "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==" - "resolved" "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" - "version" "6.0.2" +agent-base@6: + version "6.0.2" + resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== dependencies: - "debug" "4" - -"bintrees@1.0.2": - "integrity" "sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==" - "resolved" "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz" - "version" "1.0.2" - -"buffer-from@^1.0.0": - "integrity" "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" - "resolved" "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz" - "version" "1.1.1" - -"caniuse-lite@^1.0.30001202": - "integrity" "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==" - "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz" - "version" "1.0.30001358" - -"colorette@^1.2.2": - "integrity" "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" - "resolved" "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz" - "version" "1.2.2" - -"commander@^2.20.0": - "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - "resolved" "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" - "version" "2.20.3" - -"cross-fetch@3.1.2": - "integrity" "sha512-+JhD65rDNqLbGmB3Gzs3HrEKC0aQnD+XA3SY6RjgkF88jV2q5cTc5+CwxlS3sdmLk98gpPt5CF9XRnPdlxZe6w==" - "resolved" "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.2.tgz" - "version" "3.1.2" + debug "4" + +bintrees@1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz" + integrity sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw== + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +caniuse-lite@^1.0.30001202: + version "1.0.30001358" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz" + integrity sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw== + +colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +cross-fetch@3.1.5: + version "3.1.5" + resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz" + integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== dependencies: - "node-fetch" "2.6.1" + node-fetch "2.6.7" -"cssnano-preset-simple@^2.0.0": - "integrity" "sha512-HkufSLkaBJbKBFx/7aj5HmCK9Ni/JedRQm0mT2qBzMG/dEuJOLnMt2lK6K1rwOOyV4j9aSY+knbW9WoS7BYpzg==" - "resolved" "https://registry.npmjs.org/cssnano-preset-simple/-/cssnano-preset-simple-2.0.0.tgz" - "version" "2.0.0" +cssnano-preset-simple@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/cssnano-preset-simple/-/cssnano-preset-simple-2.0.0.tgz" + integrity sha512-HkufSLkaBJbKBFx/7aj5HmCK9Ni/JedRQm0mT2qBzMG/dEuJOLnMt2lK6K1rwOOyV4j9aSY+knbW9WoS7BYpzg== dependencies: - "caniuse-lite" "^1.0.30001202" + caniuse-lite "^1.0.30001202" -"cssnano-simple@2.0.0": - "integrity" "sha512-0G3TXaFxlh/szPEG/o3VcmCwl0N3E60XNb9YZZijew5eIs6fLjJuOPxQd9yEBaX2p/YfJtt49i4vYi38iH6/6w==" - "resolved" "https://registry.npmjs.org/cssnano-simple/-/cssnano-simple-2.0.0.tgz" - "version" "2.0.0" +cssnano-simple@2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/cssnano-simple/-/cssnano-simple-2.0.0.tgz" + integrity sha512-0G3TXaFxlh/szPEG/o3VcmCwl0N3E60XNb9YZZijew5eIs6fLjJuOPxQd9yEBaX2p/YfJtt49i4vYi38iH6/6w== dependencies: - "cssnano-preset-simple" "^2.0.0" + cssnano-preset-simple "^2.0.0" -"debug@4": - "integrity" "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==" - "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz" - "version" "4.3.1" +debug@4: + version "4.3.1" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: - "ms" "2.1.2" + ms "2.1.2" -"dom-serializer@^1.0.1", "dom-serializer@1.3.2": - "integrity" "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==" - "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz" - "version" "1.3.2" +dom-serializer@^1.0.1, dom-serializer@1.3.2: + version "1.3.2" + resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== dependencies: - "domelementtype" "^2.0.1" - "domhandler" "^4.2.0" - "entities" "^2.0.0" - -"domelementtype@^2.0.1", "domelementtype@^2.2.0": - "integrity" "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" - "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz" - "version" "2.2.0" - -"domhandler@^4.2.0", "domhandler@^4.2.2", "domhandler@4.2.2": - "integrity" "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==" - "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz" - "version" "4.2.2" + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.2.0" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== + +domhandler@^4.2.0, domhandler@^4.2.2, domhandler@4.2.2: + version "4.2.2" + resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz" + integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== dependencies: - "domelementtype" "^2.2.0" + domelementtype "^2.2.0" -"domutils@^2.8.0", "domutils@2.8.0": - "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==" - "resolved" "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz" - "version" "2.8.0" +domutils@^2.8.0, domutils@2.8.0: + version "2.8.0" + resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== dependencies: - "dom-serializer" "^1.0.1" - "domelementtype" "^2.2.0" - "domhandler" "^4.2.0" - -"entities@^2.0.0": - "integrity" "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" - "resolved" "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" - "version" "2.2.0" - -"entities@^3.0.1": - "integrity" "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==" - "resolved" "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz" - "version" "3.0.1" - -"event-target-shim@^5.0.0": - "integrity" "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" - "resolved" "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz" - "version" "5.0.1" - -"htmlparser2@7.2.0": - "integrity" "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==" - "resolved" "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz" - "version" "7.2.0" + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + +entities@^3.0.1: + version "3.0.1" + resolved "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz" + integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== + +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + +htmlparser2@7.2.0: + version "7.2.0" + resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz" + integrity sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog== dependencies: - "domelementtype" "^2.0.1" - "domhandler" "^4.2.2" - "domutils" "^2.8.0" - "entities" "^3.0.1" - -"https-proxy-agent@5.0.0": - "integrity" "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==" - "resolved" "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz" - "version" "5.0.0" + domelementtype "^2.0.1" + domhandler "^4.2.2" + domutils "^2.8.0" + entities "^3.0.1" + +https-proxy-agent@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== dependencies: - "agent-base" "6" - "debug" "4" + agent-base "6" + debug "4" -"lru-cache@6.0.0": - "integrity" "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==" - "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" - "version" "6.0.0" +lru-cache@6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== dependencies: - "yallist" "^4.0.0" - -"ms@2.1.2": - "integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" - "version" "2.1.2" - -"nanoid@^3.1.22": - "integrity" "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" - "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz" - "version" "3.3.4" - -"node-fetch@2.6.1": - "integrity" "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" - "resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz" - "version" "2.6.1" - -"normalize-html-whitespace@1.0.0": - "integrity" "sha512-9ui7CGtOOlehQu0t/OhhlmDyc71mKVlv+4vF+me4iZLPrNtRL2xoquEdfZxasC/bdQi/Hr3iTrpyRKIG+ocabA==" - "resolved" "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-1.0.0.tgz" - "version" "1.0.0" - -"postcss-safe-parser@5.0.2": - "integrity" "sha512-jDUfCPJbKOABhwpUKcqCVbbXiloe/QXMcbJ6Iipf3sDIihEzTqRCeMBfRaOHxhBuTYqtASrI1KJWxzztZU4qUQ==" - "resolved" "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-5.0.2.tgz" - "version" "5.0.2" + yallist "^4.0.0" + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +nanoid@^3.1.22: + version "3.3.4" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz" + integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== + +node-fetch@2.6.7: + version "2.6.7" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: - "postcss" "^8.1.0" + whatwg-url "^5.0.0" -"postcss@^8.1.0", "postcss@^8.2.1", "postcss@^8.2.2", "postcss@8.2.13": - "integrity" "sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==" - "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.2.13.tgz" - "version" "8.2.13" +normalize-html-whitespace@1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-1.0.0.tgz" + integrity sha512-9ui7CGtOOlehQu0t/OhhlmDyc71mKVlv+4vF+me4iZLPrNtRL2xoquEdfZxasC/bdQi/Hr3iTrpyRKIG+ocabA== + +postcss-safe-parser@5.0.2: + version "5.0.2" + resolved "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-5.0.2.tgz" + integrity sha512-jDUfCPJbKOABhwpUKcqCVbbXiloe/QXMcbJ6Iipf3sDIihEzTqRCeMBfRaOHxhBuTYqtASrI1KJWxzztZU4qUQ== dependencies: - "colorette" "^1.2.2" - "nanoid" "^3.1.22" - "source-map" "^0.6.1" - -"prom-client@13.1.0": - "integrity" "sha512-jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng==" - "resolved" "https://registry.npmjs.org/prom-client/-/prom-client-13.1.0.tgz" - "version" "13.1.0" + postcss "^8.1.0" + +postcss@^8.1.0, postcss@^8.2.1, postcss@^8.2.2, postcss@8.2.13: + version "8.2.13" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.2.13.tgz" + integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ== dependencies: - "tdigest" "^0.1.1" + colorette "^1.2.2" + nanoid "^3.1.22" + source-map "^0.6.1" + +prom-client@13.1.0: + version "13.1.0" + resolved "https://registry.npmjs.org/prom-client/-/prom-client-13.1.0.tgz" + integrity sha512-jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng== + dependencies: + tdigest "^0.1.1" -"source-map-support@~0.5.19": - "integrity" "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==" - "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" - "version" "0.5.19" +source-map-support@~0.5.19: + version "0.5.19" + resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== dependencies: - "buffer-from" "^1.0.0" - "source-map" "^0.6.0" - -"source-map@^0.6.0", "source-map@^0.6.1": - "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" - "version" "0.6.1" - -"source-map@~0.7.2": - "integrity" "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" - "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz" - "version" "0.7.3" - -"tdigest@^0.1.1": - "integrity" "sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==" - "resolved" "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz" - "version" "0.1.2" + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0, source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@~0.7.2: + version "0.7.3" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +tdigest@^0.1.1: + version "0.1.2" + resolved "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz" + integrity sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA== dependencies: - "bintrees" "1.0.2" + bintrees "1.0.2" -"terser@5.5.1": - "integrity" "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==" - "resolved" "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz" - "version" "5.5.1" +terser@5.5.1: + version "5.5.1" + resolved "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz" + integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== + dependencies: + commander "^2.20.0" + source-map "~0.7.2" + source-map-support "~0.5.19" + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== dependencies: - "commander" "^2.20.0" - "source-map" "~0.7.2" - "source-map-support" "~0.5.19" - -"yallist@^4.0.0": - "integrity" "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - "resolved" "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" - "version" "4.0.0" + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== diff --git a/packages/optimizer-express/package.json b/packages/optimizer-express/package.json index e001455f9..2264bbc6a 100644 --- a/packages/optimizer-express/package.json +++ b/packages/optimizer-express/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-optimizer-express", - "version": "2.9.0", + "version": "2.10.1", "description": "Express middleware for @ampproject/toolbox-optimizer", "main": "index.js", "repository": { @@ -24,9 +24,9 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/optimizer-express", "dependencies": { - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-optimizer": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-optimizer": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", "mime-types": "2.1.29", "whatwg-url": "8.4.0" }, diff --git a/packages/optimizer/package.json b/packages/optimizer/package.json index 3792bebe7..fad144715 100644 --- a/packages/optimizer/package.json +++ b/packages/optimizer/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-optimizer", - "version": "2.9.0", + "version": "2.10.1", "description": "Server-side rendering for AMPs.", "main": "index.js", "repository": { @@ -31,10 +31,10 @@ } }, "dependencies": { - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", - "@ampproject/toolbox-script-csp": "2.9.0", - "@ampproject/toolbox-validator-rules": "2.9.0", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", + "@ampproject/toolbox-script-csp": "2.10.1", + "@ampproject/toolbox-validator-rules": "2.10.1", "abort-controller": "3.0.0", "cross-fetch": "3.1.5", "cssnano-simple": "2.0.0", diff --git a/packages/page-experience/package.json b/packages/page-experience/package.json index ff1d8a109..2cc7f2863 100644 --- a/packages/page-experience/package.json +++ b/packages/page-experience/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-page-experience", - "version": "2.9.0", + "version": "2.10.1", "description": "Optimize your AMP pages for page experiemnce", "main": "index.js", "scripts": { @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/page-experience", "dependencies": { - "@ampproject/toolbox-linter": "2.9.0", + "@ampproject/toolbox-linter": "2.10.1", "cheerio": "1.0.0-rc.12", "css-font-face-src": "1.0.0", "postcss": "8.2.8", diff --git a/packages/runtime-fetch/package.json b/packages/runtime-fetch/package.json index 6262ce6ff..725005ed4 100644 --- a/packages/runtime-fetch/package.json +++ b/packages/runtime-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-runtime-fetch", - "version": "2.9.0", + "version": "2.10.1", "description": "Download the AMP runtime", "main": "index.js", "keywords": [ @@ -20,9 +20,9 @@ "author": "AMPHTML Team", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-core": "2.9.0", - "@ampproject/toolbox-runtime-version": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-core": "2.10.1", + "@ampproject/toolbox-runtime-version": "2.10.1", "at-least-node": "1.0.0", "fs-extra": "9.1.0", "node-fetch": "2.6.7" diff --git a/packages/runtime-version/lib/RuntimeVersion.js b/packages/runtime-version/lib/RuntimeVersion.js index 4e514e6f1..8a26d4e7e 100644 --- a/packages/runtime-version/lib/RuntimeVersion.js +++ b/packages/runtime-version/lib/RuntimeVersion.js @@ -15,12 +15,11 @@ */ 'use strict'; -const {DEFAULT_AMP_CACHE_HOST} = require('../../optimizer/lib/AmpConstants'); - const log = require('@ampproject/toolbox-core').log.tag('AMP Runtime Version'); const RUNTIME_METADATA_PATH = '/rtv/metadata'; const VERSION_TXT_PATH = '/version.txt'; +const DEFAULT_AMP_CACHE_HOST = 'https://cdn.ampproject.org'; /** * @typedef {number} ReleaseType diff --git a/packages/runtime-version/package.json b/packages/runtime-version/package.json index 9183ec42c..5b67c567f 100644 --- a/packages/runtime-version/package.json +++ b/packages/runtime-version/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-runtime-version", - "version": "2.9.0", + "version": "2.10.1", "description": "AMP Runtime versions", "main": "index.js", "keywords": [ @@ -18,7 +18,7 @@ "author": "AMPHTML Team", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-core": "2.9.0" + "@ampproject/toolbox-core": "2.10.1" }, "bugs": { "url": "https://github.com/ampproject/amp-toolbox/issues" diff --git a/packages/script-csp/package.json b/packages/script-csp/package.json index 71fd3f671..978e1f790 100644 --- a/packages/script-csp/package.json +++ b/packages/script-csp/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-script-csp", - "version": "2.9.0", + "version": "2.10.1", "description": "A library that calculates the CSP hash for amp-script", "main": "index.js", "keywords": [ diff --git a/packages/update-cache/package.json b/packages/update-cache/package.json index cdd271aaa..49794b50b 100644 --- a/packages/update-cache/package.json +++ b/packages/update-cache/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-update-cache", - "version": "2.9.0", + "version": "2.10.1", "description": "Implements the AMP update-cache API, as described at https://developers.google.com/amp/cache/update-cache ", "main": "index.js", "repository": { @@ -25,8 +25,8 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/update-cache", "dependencies": { - "@ampproject/toolbox-cache-list": "2.9.0", - "@ampproject/toolbox-cache-url": "2.9.0", + "@ampproject/toolbox-cache-list": "2.10.1", + "@ampproject/toolbox-cache-url": "2.10.1", "jsrsasign": "10.5.25" }, "gitHead": "6103eb57765445355421826791361ac9ed9cf4d8" diff --git a/packages/validator-rules/package.json b/packages/validator-rules/package.json index f6297e36d..f2d32aacd 100644 --- a/packages/validator-rules/package.json +++ b/packages/validator-rules/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-validator-rules", - "version": "2.9.0", + "version": "2.10.1", "description": "A library that helps query AMP Validator rules", "main": "index.js", "keywords": [