From c194eb829c2d0d4cda21c961107d73bd7528f53f Mon Sep 17 00:00:00 2001 From: Sebastian Benz Date: Mon, 22 Jun 2020 21:51:41 +0200 Subject: [PATCH] v2.5.4 --- lerna.json | 2 +- packages/cache-list/package.json | 15 ++++++++--- packages/cache-url/package.json | 15 ++++++++--- packages/cli/package.json | 29 +++++++++++++-------- packages/core/package.json | 11 +++++--- packages/cors/package.json | 18 ++++++++----- packages/lighthouse-plugin-amp/package.json | 2 +- packages/linter/package.json | 6 ++--- packages/optimizer-express/package.json | 19 +++++++++----- packages/optimizer/package-lock.json | 2 +- packages/optimizer/package.json | 10 +++---- packages/runtime-fetch/package.json | 19 +++++++++----- packages/runtime-version/package.json | 13 ++++++--- packages/script-csp/package.json | 11 +++++--- packages/update-cache/package.json | 18 +++++++++---- packages/validator-rules/package.json | 11 +++++--- 16 files changed, 136 insertions(+), 65 deletions(-) diff --git a/lerna.json b/lerna.json index 75c92f370..c8a37ffd4 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "packages": [ "packages/*" ], - "version": "2.5.3" + "version": "2.5.4" } diff --git a/packages/cache-list/package.json b/packages/cache-list/package.json index f159d30b6..3e0a49398 100644 --- a/packages/cache-list/package.json +++ b/packages/cache-list/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-cache-list", - "version": "2.5.1", + "version": "2.5.4", "description": "Lists AMP Caches", "main": "index.js", "repository": { @@ -8,8 +8,15 @@ "url": "git+https://github.com/ampproject/amp-toolbox.git", "directory": "packages/cache-list" }, - "keywords": ["amp", "amp-toolbox", "amp-cache"], - "files": ["index.js", "lib"], + "keywords": [ + "amp", + "amp-toolbox", + "amp-cache" + ], + "files": [ + "index.js", + "lib" + ], "author": "AMPHTML Team", "license": "Apache-2.0", "bugs": { @@ -17,7 +24,7 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/cache-list", "dependencies": { - "@ampproject/toolbox-core": "^2.5.1" + "@ampproject/toolbox-core": "^2.5.4" }, "gitHead": "d5517559fb1c2e1be4d3c3e9df756cdce82a432a" } diff --git a/packages/cache-url/package.json b/packages/cache-url/package.json index 85b2fcace..7573dbe0e 100644 --- a/packages/cache-url/package.json +++ b/packages/cache-url/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-cache-url", - "version": "2.3.0", + "version": "2.5.4", "description": "Transform canonical URLs into AMP Cache URLs", "main": "dist/amp-toolbox-cache-url.cjs.js", "types": "index.d.ts", @@ -16,8 +16,17 @@ "url": "git+https://github.com/ampproject/amp-toolbox.git", "directory": "packages/cache-url" }, - "keywords": ["amp", "amp-toolbox", "amp-url-api"], - "files": ["dist", "package.json", "../LICENSE", "README.md"], + "keywords": [ + "amp", + "amp-toolbox", + "amp-url-api" + ], + "files": [ + "dist", + "package.json", + "../LICENSE", + "README.md" + ], "author": "AMPHTML Team", "license": "Apache-2.0", "bugs": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 2b2fe4a6c..c07b39b64 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-cli", - "version": "2.5.3", + "version": "2.5.4", "description": "A Command Line Interface (CLI) for amp-toolbox", "main": "index.js", "bin": { @@ -11,8 +11,15 @@ "url": "git+https://github.com/ampproject/amp-toolbox.git", "directory": "packages/cli" }, - "keywords": ["amp-toolbox", "cli"], - "files": ["index.js", "lib", "bin"], + "keywords": [ + "amp-toolbox", + "cli" + ], + "files": [ + "index.js", + "lib", + "bin" + ], "author": "AMPHTML Team", "license": "Apache-2.0", "bugs": { @@ -20,14 +27,14 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/cli", "dependencies": { - "@ampproject/toolbox-cache-list": "^2.5.1", - "@ampproject/toolbox-cache-url": "^2.3.0", - "@ampproject/toolbox-core": "^2.5.1", - "@ampproject/toolbox-linter": "^2.5.2", - "@ampproject/toolbox-optimizer": "^2.5.3", - "@ampproject/toolbox-runtime-fetch": "^2.5.1", - "@ampproject/toolbox-runtime-version": "^2.5.1", - "@ampproject/toolbox-update-cache": "^2.5.1", + "@ampproject/toolbox-cache-list": "^2.5.4", + "@ampproject/toolbox-cache-url": "^2.5.4", + "@ampproject/toolbox-core": "^2.5.4", + "@ampproject/toolbox-linter": "^2.5.4", + "@ampproject/toolbox-optimizer": "^2.5.4", + "@ampproject/toolbox-runtime-fetch": "^2.5.4", + "@ampproject/toolbox-runtime-version": "^2.5.4", + "@ampproject/toolbox-update-cache": "^2.5.4", "minimist": "1.2.5", "minimist-options": "4.1.0", "node-fetch": "2.6.0" diff --git a/packages/core/package.json b/packages/core/package.json index 6a6913fe3..0144ac54b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-core", - "version": "2.5.1", + "version": "2.5.4", "description": "Commonly used functionality for amp-toolbox", "main": "index.js", "repository": { @@ -8,8 +8,13 @@ "url": "git+https://github.com/ampproject/amp-toolbox.git", "directory": "packages/core" }, - "keywords": ["amp"], - "files": ["index.js", "lib"], + "keywords": [ + "amp" + ], + "files": [ + "index.js", + "lib" + ], "author": "AMPHTML Team", "license": "Apache-2.0", "bugs": { diff --git a/packages/cors/package.json b/packages/cors/package.json index f9961a1c3..5d98753ca 100644 --- a/packages/cors/package.json +++ b/packages/cors/package.json @@ -1,10 +1,16 @@ { "name": "@ampproject/toolbox-cors", - "version": "2.5.1", + "version": "2.5.4", "description": "An express middleware implementing the AMP CORS protocol", "main": "index.js", - "keywords": ["amp", "cors"], - "files": ["index.js", "lib"], + "keywords": [ + "amp", + "cors" + ], + "files": [ + "index.js", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/ampproject/amp-toolbox.git", @@ -13,9 +19,9 @@ "author": "AMPHTML Team", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-cache-list": "^2.5.1", - "@ampproject/toolbox-cache-url": "^2.3.0", - "@ampproject/toolbox-core": "^2.5.1" + "@ampproject/toolbox-cache-list": "^2.5.4", + "@ampproject/toolbox-cache-url": "^2.5.4", + "@ampproject/toolbox-core": "^2.5.4" }, "bugs": { "url": "https://github.com/ampproject/amp-toolbox/issues" diff --git a/packages/lighthouse-plugin-amp/package.json b/packages/lighthouse-plugin-amp/package.json index 98fa030d3..dd9c824bd 100644 --- a/packages/lighthouse-plugin-amp/package.json +++ b/packages/lighthouse-plugin-amp/package.json @@ -10,7 +10,7 @@ "amphtml-validator": "1.0.31", "node-fetch": "2.6.0" }, - "version": "2.5.1", + "version": "2.5.4", "main": "./plugin.js", "peerDependencies": { "lighthouse": ">=6.0.0" diff --git a/packages/linter/package.json b/packages/linter/package.json index ffcc25737..8a91f74b5 100644 --- a/packages/linter/package.json +++ b/packages/linter/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-linter", - "version": "2.5.2", + "version": "2.5.4", "description": "A linter for AMP documents", "repository": { "type": "git", @@ -11,8 +11,8 @@ "license": "Apache-2.0", "author": "AMPHTML Team", "dependencies": { - "@ampproject/toolbox-cache-list": "^2.5.1", - "@ampproject/toolbox-cache-url": "^2.3.0", + "@ampproject/toolbox-cache-list": "^2.5.4", + "@ampproject/toolbox-cache-url": "^2.5.4", "amphtml-validator": "1.0.31", "chalk": "4.1.0", "cheerio": "1.0.0-rc.3", diff --git a/packages/optimizer-express/package.json b/packages/optimizer-express/package.json index d2da06046..d811be0b5 100644 --- a/packages/optimizer-express/package.json +++ b/packages/optimizer-express/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-optimizer-express", - "version": "2.5.3", + "version": "2.5.4", "description": "Express middleware for @ampproject/toolbox-optimizer", "main": "index.js", "repository": { @@ -8,8 +8,15 @@ "url": "git+https://github.com/ampproject/amp-toolbox.git", "directory": "packages/optimizer-express" }, - "keywords": ["amp", "amp-optimizer", "amp-toolbox"], - "files": ["index.js", "lib"], + "keywords": [ + "amp", + "amp-optimizer", + "amp-toolbox" + ], + "files": [ + "index.js", + "lib" + ], "author": "AMPHTML Team", "license": "Apache-2.0", "bugs": { @@ -17,9 +24,9 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/optimizer-express", "dependencies": { - "@ampproject/toolbox-core": "^2.5.1", - "@ampproject/toolbox-optimizer": "^2.5.3", - "@ampproject/toolbox-runtime-version": "^2.5.1", + "@ampproject/toolbox-core": "^2.5.4", + "@ampproject/toolbox-optimizer": "^2.5.4", + "@ampproject/toolbox-runtime-version": "^2.5.4", "mime-types": "2.1.27", "whatwg-url": "8.1.0" }, diff --git a/packages/optimizer/package-lock.json b/packages/optimizer/package-lock.json index 80adb3215..231701a9d 100644 --- a/packages/optimizer/package-lock.json +++ b/packages/optimizer/package-lock.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-optimizer", - "version": "2.5.3", + "version": "2.5.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/optimizer/package.json b/packages/optimizer/package.json index 91cf10962..44f57346f 100644 --- a/packages/optimizer/package.json +++ b/packages/optimizer/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-optimizer", - "version": "2.5.3", + "version": "2.5.4", "description": "Server-side rendering for AMPs.", "main": "index.js", "repository": { @@ -29,10 +29,10 @@ } }, "dependencies": { - "@ampproject/toolbox-core": "^2.5.1", - "@ampproject/toolbox-runtime-version": "^2.5.1", - "@ampproject/toolbox-script-csp": "^2.3.0", - "@ampproject/toolbox-validator-rules": "^2.3.0", + "@ampproject/toolbox-core": "^2.5.4", + "@ampproject/toolbox-runtime-version": "^2.5.4", + "@ampproject/toolbox-script-csp": "^2.5.4", + "@ampproject/toolbox-validator-rules": "^2.5.4", "abort-controller": "3.0.0", "cross-fetch": "3.0.5", "cssnano": "4.1.10", diff --git a/packages/runtime-fetch/package.json b/packages/runtime-fetch/package.json index 838a3d8c5..30f9219b0 100644 --- a/packages/runtime-fetch/package.json +++ b/packages/runtime-fetch/package.json @@ -1,10 +1,17 @@ { "name": "@ampproject/toolbox-runtime-fetch", - "version": "2.5.1", + "version": "2.5.4", "description": "Download the AMP runtime", "main": "index.js", - "keywords": ["amp", "download", "runtime"], - "files": ["index.js", "lib"], + "keywords": [ + "amp", + "download", + "runtime" + ], + "files": [ + "index.js", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/ampproject/amp-toolbox.git", @@ -13,9 +20,9 @@ "author": "AMPHTML Team", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-cache-list": "^2.5.1", - "@ampproject/toolbox-core": "^2.5.1", - "@ampproject/toolbox-runtime-version": "^2.5.1", + "@ampproject/toolbox-cache-list": "^2.5.4", + "@ampproject/toolbox-core": "^2.5.4", + "@ampproject/toolbox-runtime-version": "^2.5.4", "at-least-node": "1.0.0", "cross-fetch": "3.0.5", "fs-extra": "9.0.1" diff --git a/packages/runtime-version/package.json b/packages/runtime-version/package.json index 4c6b750b8..d7b408dfc 100644 --- a/packages/runtime-version/package.json +++ b/packages/runtime-version/package.json @@ -1,10 +1,15 @@ { "name": "@ampproject/toolbox-runtime-version", - "version": "2.5.1", + "version": "2.5.4", "description": "AMP Runtime versions", "main": "index.js", - "keywords": ["amp"], - "files": ["index.js", "lib"], + "keywords": [ + "amp" + ], + "files": [ + "index.js", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/ampproject/amp-toolbox.git", @@ -13,7 +18,7 @@ "author": "AMPHTML Team", "license": "Apache-2.0", "dependencies": { - "@ampproject/toolbox-core": "^2.5.1" + "@ampproject/toolbox-core": "^2.5.4" }, "bugs": { "url": "https://github.com/ampproject/amp-toolbox/issues" diff --git a/packages/script-csp/package.json b/packages/script-csp/package.json index dc80b0433..48c92c416 100644 --- a/packages/script-csp/package.json +++ b/packages/script-csp/package.json @@ -1,10 +1,15 @@ { "name": "@ampproject/toolbox-script-csp", - "version": "2.3.0", + "version": "2.5.4", "description": "A library that calculates the CSP hash for amp-script", "main": "index.js", - "keywords": ["amp"], - "files": ["index.js", "lib"], + "keywords": [ + "amp" + ], + "files": [ + "index.js", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/ampproject/amp-toolbox.git", diff --git a/packages/update-cache/package.json b/packages/update-cache/package.json index 3f40ce22e..564ea11ae 100644 --- a/packages/update-cache/package.json +++ b/packages/update-cache/package.json @@ -1,6 +1,6 @@ { "name": "@ampproject/toolbox-update-cache", - "version": "2.5.1", + "version": "2.5.4", "description": "Implements the AMP update-cache API, as described at https://developers.google.com/amp/cache/update-cache ", "main": "index.js", "repository": { @@ -8,8 +8,16 @@ "url": "git+https://github.com/ampproject/amp-toolbox.git", "directory": "packages/update-cache" }, - "keywords": ["amp", "amp-toolbox", "amp-cache", "update-cache"], - "files": ["index.js", "lib"], + "keywords": [ + "amp", + "amp-toolbox", + "amp-cache", + "update-cache" + ], + "files": [ + "index.js", + "lib" + ], "author": "AMPHTML Team", "license": "Apache-2.0", "bugs": { @@ -17,8 +25,8 @@ }, "homepage": "https://github.com/ampproject/amp-toolbox/tree/main/packages/update-cache", "dependencies": { - "@ampproject/toolbox-cache-list": "^2.5.1", - "@ampproject/toolbox-cache-url": "^2.3.0", + "@ampproject/toolbox-cache-list": "^2.5.4", + "@ampproject/toolbox-cache-url": "^2.5.4", "jsrsasign": "8.0.18" }, "gitHead": "c0ba2297de1e3cd583018880e2ea6c7fe5fd7905" diff --git a/packages/validator-rules/package.json b/packages/validator-rules/package.json index b67f0da67..ba79d12fb 100644 --- a/packages/validator-rules/package.json +++ b/packages/validator-rules/package.json @@ -1,13 +1,18 @@ { "name": "@ampproject/toolbox-validator-rules", - "version": "2.3.0", + "version": "2.5.4", "description": "A library that helps query AMP Validator rules", "main": "index.js", - "keywords": ["amp"], + "keywords": [ + "amp" + ], "scripts": { "fetchRules": "curl https://cdn.ampproject.org/v0/validator.json --output validator.json" }, - "files": ["index.js", "lib"], + "files": [ + "index.js", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/ampproject/amp-toolbox.git",