From f85755367e525ceb75ddd0b1a6ce4768f86d9f42 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 02:18:05 +0000 Subject: [PATCH 1/2] fix(deps): update netlify packages --- package-lock.json | 110 +++++++++++++++++++++++----------------------- package.json | 8 ++-- 2 files changed, 60 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index b66ac48978e..9bc90ca1182 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,13 +13,13 @@ "@bugsnag/js": "7.23.0", "@fastify/static": "7.0.4", "@netlify/blobs": "7.3.0", - "@netlify/build": "29.47.3", + "@netlify/build": "29.48.1", "@netlify/build-info": "7.13.2", - "@netlify/config": "20.15.2", + "@netlify/config": "20.15.3", "@netlify/edge-bundler": "12.0.1", "@netlify/edge-functions": "2.8.1", "@netlify/local-functions-proxy": "1.1.1", - "@netlify/zip-it-and-ship-it": "9.34.4", + "@netlify/zip-it-and-ship-it": "9.37.0", "@octokit/rest": "20.1.1", "@opentelemetry/api": "1.8.0", "ansi-escapes": "7.0.0", @@ -86,7 +86,7 @@ "maxstache": "1.0.7", "maxstache-stream": "1.0.4", "multiparty": "4.2.3", - "netlify": "13.1.18", + "netlify": "13.1.19", "netlify-headers-parser": "7.1.4", "netlify-redirect-parser": "14.3.0", "netlify-redirector": "0.5.0", @@ -2531,22 +2531,22 @@ } }, "node_modules/@netlify/build": { - "version": "29.47.3", - "resolved": "https://registry.npmjs.org/@netlify/build/-/build-29.47.3.tgz", - "integrity": "sha512-9SD+zZJgAtH0YDLb2NzoD7UYuE+kRGK5TzvRMnva7Yld4kjQv+DgCa5D6q8qLoFHQ6hzpUCuTkBDzfYWb00pFQ==", + "version": "29.48.1", + "resolved": "https://registry.npmjs.org/@netlify/build/-/build-29.48.1.tgz", + "integrity": "sha512-W0zr2XJNM7/PclXTjVAvsBui2WNaNy1dGbf7i/uwrcB2HeezJEKL5raZeEV6kPPHKz7I0i4FQmrgPzkSVnT4YA==", "dependencies": { "@bugsnag/js": "^7.0.0", "@netlify/blobs": "^7.3.0", "@netlify/cache-utils": "^5.1.5", - "@netlify/config": "^20.15.2", + "@netlify/config": "^20.15.3", "@netlify/edge-bundler": "12.0.1", "@netlify/framework-info": "^9.8.13", - "@netlify/functions-utils": "^5.2.64", + "@netlify/functions-utils": "^5.2.68", "@netlify/git-utils": "^5.1.1", "@netlify/opentelemetry-utils": "^1.2.1", "@netlify/plugins-list": "^6.80.0", "@netlify/run-utils": "^5.1.1", - "@netlify/zip-it-and-ship-it": "9.34.4", + "@netlify/zip-it-and-ship-it": "9.37.0", "@sindresorhus/slugify": "^2.0.0", "ansi-escapes": "^6.0.0", "chalk": "^5.0.0", @@ -3083,9 +3083,9 @@ } }, "node_modules/@netlify/config": { - "version": "20.15.2", - "resolved": "https://registry.npmjs.org/@netlify/config/-/config-20.15.2.tgz", - "integrity": "sha512-nPakZuXLiQ6b5OshwB7Jmbjirj15E3/yMlBqx6VUrSln8cE/aohtmH157ZZdw9RKqk5Fd71kDFZmhAhmarhvmg==", + "version": "20.15.3", + "resolved": "https://registry.npmjs.org/@netlify/config/-/config-20.15.3.tgz", + "integrity": "sha512-+aLUs5t8wSKfauEs0W4cs8wTJOTEqNrWsoqzbCJoZoVrGr2+t1X7JmF5al/eJjKPR9m0BMP2yCJaJOVZugM11w==", "dependencies": { "@iarna/toml": "^2.2.5", "chalk": "^5.0.0", @@ -3101,7 +3101,7 @@ "is-plain-obj": "^4.0.0", "js-yaml": "^4.0.0", "map-obj": "^5.0.0", - "netlify": "^13.1.18", + "netlify": "^13.1.19", "netlify-headers-parser": "^7.1.4", "netlify-redirect-parser": "^14.3.0", "node-fetch": "^3.3.1", @@ -4208,11 +4208,11 @@ } }, "node_modules/@netlify/functions-utils": { - "version": "5.2.64", - "resolved": "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-5.2.64.tgz", - "integrity": "sha512-fVSEGX4Oi4mtwnTRUpTE9xLR7Pcf3wSoAggrlB1O0SfZXetwSc9duLKU2sbl3kNHYDqp251Fhaznq5oMZqO94g==", + "version": "5.2.68", + "resolved": "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-5.2.68.tgz", + "integrity": "sha512-pzViRvJz2tMT8dOdwPt8hXegY6afuWV0BC9tLyM1/VZsHJIJO9OLiBT/M5PG2gWuSvGn0mR2nmmkMKLaGj6aBA==", "dependencies": { - "@netlify/zip-it-and-ship-it": "9.34.4", + "@netlify/zip-it-and-ship-it": "9.37.0", "cpy": "^9.0.0", "path-exists": "^5.0.0" }, @@ -4550,9 +4550,9 @@ } }, "node_modules/@netlify/open-api": { - "version": "2.32.0", - "resolved": "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.32.0.tgz", - "integrity": "sha512-pw3tfLvKm/6RwF2fNAXe1tJyf6R9OgU/wuGz//N3jhig0FGVNusbt+bwcj5eTzwOvCb0KkUh0OLT8e1gSSz8qQ==", + "version": "2.33.0", + "resolved": "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.33.0.tgz", + "integrity": "sha512-GGIoUb/ARY4pxVgxp8RWDBV4nm1iMzJTuhYpQoOwWoJPKYlCykOMm0PpL0MLuPHzwrF/Q6N3C+fit5nQIVJ83g==", "engines": { "node": ">=14" } @@ -4686,9 +4686,9 @@ } }, "node_modules/@netlify/zip-it-and-ship-it": { - "version": "9.34.4", - "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-9.34.4.tgz", - "integrity": "sha512-Lh7mOVQgiuQFUzSdRMk7AOq0GkT2B0+EUcufH8MAGKUnTmxIujXAjQ5dfA6qrzqjA3cGIUoUrpW/yKYTPmRXdg==", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-9.37.0.tgz", + "integrity": "sha512-YRM7GjpEMLH6gmCGO9ouJYdGWIwgib8fMn3/1FPri5Rf7ekkUizk951q3WZ3a1pnJO7l9ROiMNnyhSKDaoKZRA==", "dependencies": { "@babel/parser": "^7.22.5", "@babel/types": "7.24.6", @@ -4722,7 +4722,8 @@ "toml": "^3.0.0", "unixify": "^1.0.0", "urlpattern-polyfill": "8.0.2", - "yargs": "^17.0.0" + "yargs": "^17.0.0", + "zod": "^3.23.8" }, "bin": { "zip-it-and-ship-it": "bin.js" @@ -18742,11 +18743,11 @@ "integrity": "sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==" }, "node_modules/netlify": { - "version": "13.1.18", - "resolved": "https://registry.npmjs.org/netlify/-/netlify-13.1.18.tgz", - "integrity": "sha512-1IDnULb21Fx1CVCBEhMwwKA8uZwhSmsqWzrfhvaWuUYQMHIjEhs9dPSci09I8zWOrAIiRI1mQSG1ZfnmqFZE+Q==", + "version": "13.1.19", + "resolved": "https://registry.npmjs.org/netlify/-/netlify-13.1.19.tgz", + "integrity": "sha512-po4fWl2QcN+A4lFRMDHdq2D6gWNE1cqavD3rW++dVTakDzibmkHRJZ4L5C7SfI5ovbU0hAEeERjWnYgESA3/3g==", "dependencies": { - "@netlify/open-api": "^2.32.0", + "@netlify/open-api": "^2.33.0", "lodash-es": "^4.17.21", "micro-api-client": "^3.3.0", "node-fetch": "^3.0.0", @@ -26935,22 +26936,22 @@ "integrity": "sha512-wN/kNTZo4xjlUM/C0WILOkJbe8p4AFquSGkZEIoIcgnsx5ikp2GyqGiq1WMLee7QdbnqeIV2g2hn/PjT324E5w==" }, "@netlify/build": { - "version": "29.47.3", - "resolved": "https://registry.npmjs.org/@netlify/build/-/build-29.47.3.tgz", - "integrity": "sha512-9SD+zZJgAtH0YDLb2NzoD7UYuE+kRGK5TzvRMnva7Yld4kjQv+DgCa5D6q8qLoFHQ6hzpUCuTkBDzfYWb00pFQ==", + "version": "29.48.1", + "resolved": "https://registry.npmjs.org/@netlify/build/-/build-29.48.1.tgz", + "integrity": "sha512-W0zr2XJNM7/PclXTjVAvsBui2WNaNy1dGbf7i/uwrcB2HeezJEKL5raZeEV6kPPHKz7I0i4FQmrgPzkSVnT4YA==", "requires": { "@bugsnag/js": "^7.0.0", "@netlify/blobs": "^7.3.0", "@netlify/cache-utils": "^5.1.5", - "@netlify/config": "^20.15.2", + "@netlify/config": "^20.15.3", "@netlify/edge-bundler": "12.0.1", "@netlify/framework-info": "^9.8.13", - "@netlify/functions-utils": "^5.2.64", + "@netlify/functions-utils": "^5.2.68", "@netlify/git-utils": "^5.1.1", "@netlify/opentelemetry-utils": "^1.2.1", "@netlify/plugins-list": "^6.80.0", "@netlify/run-utils": "^5.1.1", - "@netlify/zip-it-and-ship-it": "9.34.4", + "@netlify/zip-it-and-ship-it": "9.37.0", "@sindresorhus/slugify": "^2.0.0", "ansi-escapes": "^6.0.0", "chalk": "^5.0.0", @@ -27291,9 +27292,9 @@ } }, "@netlify/config": { - "version": "20.15.2", - "resolved": "https://registry.npmjs.org/@netlify/config/-/config-20.15.2.tgz", - "integrity": "sha512-nPakZuXLiQ6b5OshwB7Jmbjirj15E3/yMlBqx6VUrSln8cE/aohtmH157ZZdw9RKqk5Fd71kDFZmhAhmarhvmg==", + "version": "20.15.3", + "resolved": "https://registry.npmjs.org/@netlify/config/-/config-20.15.3.tgz", + "integrity": "sha512-+aLUs5t8wSKfauEs0W4cs8wTJOTEqNrWsoqzbCJoZoVrGr2+t1X7JmF5al/eJjKPR9m0BMP2yCJaJOVZugM11w==", "requires": { "@iarna/toml": "^2.2.5", "chalk": "^5.0.0", @@ -27309,7 +27310,7 @@ "is-plain-obj": "^4.0.0", "js-yaml": "^4.0.0", "map-obj": "^5.0.0", - "netlify": "^13.1.18", + "netlify": "^13.1.19", "netlify-headers-parser": "^7.1.4", "netlify-redirect-parser": "^14.3.0", "node-fetch": "^3.3.1", @@ -27943,11 +27944,11 @@ } }, "@netlify/functions-utils": { - "version": "5.2.64", - "resolved": "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-5.2.64.tgz", - "integrity": "sha512-fVSEGX4Oi4mtwnTRUpTE9xLR7Pcf3wSoAggrlB1O0SfZXetwSc9duLKU2sbl3kNHYDqp251Fhaznq5oMZqO94g==", + "version": "5.2.68", + "resolved": "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-5.2.68.tgz", + "integrity": "sha512-pzViRvJz2tMT8dOdwPt8hXegY6afuWV0BC9tLyM1/VZsHJIJO9OLiBT/M5PG2gWuSvGn0mR2nmmkMKLaGj6aBA==", "requires": { - "@netlify/zip-it-and-ship-it": "9.34.4", + "@netlify/zip-it-and-ship-it": "9.37.0", "cpy": "^9.0.0", "path-exists": "^5.0.0" }, @@ -28127,9 +28128,9 @@ "integrity": "sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==" }, "@netlify/open-api": { - "version": "2.32.0", - "resolved": "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.32.0.tgz", - "integrity": "sha512-pw3tfLvKm/6RwF2fNAXe1tJyf6R9OgU/wuGz//N3jhig0FGVNusbt+bwcj5eTzwOvCb0KkUh0OLT8e1gSSz8qQ==" + "version": "2.33.0", + "resolved": "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.33.0.tgz", + "integrity": "sha512-GGIoUb/ARY4pxVgxp8RWDBV4nm1iMzJTuhYpQoOwWoJPKYlCykOMm0PpL0MLuPHzwrF/Q6N3C+fit5nQIVJ83g==" }, "@netlify/opentelemetry-utils": { "version": "1.2.1", @@ -28215,9 +28216,9 @@ } }, "@netlify/zip-it-and-ship-it": { - "version": "9.34.4", - "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-9.34.4.tgz", - "integrity": "sha512-Lh7mOVQgiuQFUzSdRMk7AOq0GkT2B0+EUcufH8MAGKUnTmxIujXAjQ5dfA6qrzqjA3cGIUoUrpW/yKYTPmRXdg==", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-9.37.0.tgz", + "integrity": "sha512-YRM7GjpEMLH6gmCGO9ouJYdGWIwgib8fMn3/1FPri5Rf7ekkUizk951q3WZ3a1pnJO7l9ROiMNnyhSKDaoKZRA==", "requires": { "@babel/parser": "^7.22.5", "@babel/types": "7.24.6", @@ -28251,7 +28252,8 @@ "toml": "^3.0.0", "unixify": "^1.0.0", "urlpattern-polyfill": "8.0.2", - "yargs": "^17.0.0" + "yargs": "^17.0.0", + "zod": "^3.23.8" }, "dependencies": { "@netlify/serverless-functions-api": { @@ -38148,11 +38150,11 @@ "integrity": "sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==" }, "netlify": { - "version": "13.1.18", - "resolved": "https://registry.npmjs.org/netlify/-/netlify-13.1.18.tgz", - "integrity": "sha512-1IDnULb21Fx1CVCBEhMwwKA8uZwhSmsqWzrfhvaWuUYQMHIjEhs9dPSci09I8zWOrAIiRI1mQSG1ZfnmqFZE+Q==", + "version": "13.1.19", + "resolved": "https://registry.npmjs.org/netlify/-/netlify-13.1.19.tgz", + "integrity": "sha512-po4fWl2QcN+A4lFRMDHdq2D6gWNE1cqavD3rW++dVTakDzibmkHRJZ4L5C7SfI5ovbU0hAEeERjWnYgESA3/3g==", "requires": { - "@netlify/open-api": "^2.32.0", + "@netlify/open-api": "^2.33.0", "lodash-es": "^4.17.21", "micro-api-client": "^3.3.0", "node-fetch": "^3.0.0", diff --git a/package.json b/package.json index cb3e9844a52..57e3b494761 100644 --- a/package.json +++ b/package.json @@ -73,13 +73,13 @@ "@bugsnag/js": "7.23.0", "@fastify/static": "7.0.4", "@netlify/blobs": "7.3.0", - "@netlify/build": "29.47.3", + "@netlify/build": "29.48.1", "@netlify/build-info": "7.13.2", - "@netlify/config": "20.15.2", + "@netlify/config": "20.15.3", "@netlify/edge-bundler": "12.0.1", "@netlify/edge-functions": "2.8.1", "@netlify/local-functions-proxy": "1.1.1", - "@netlify/zip-it-and-ship-it": "9.34.4", + "@netlify/zip-it-and-ship-it": "9.37.0", "@octokit/rest": "20.1.1", "@opentelemetry/api": "1.8.0", "ansi-escapes": "7.0.0", @@ -146,7 +146,7 @@ "maxstache": "1.0.7", "maxstache-stream": "1.0.4", "multiparty": "4.2.3", - "netlify": "13.1.18", + "netlify": "13.1.19", "netlify-headers-parser": "7.1.4", "netlify-redirect-parser": "14.3.0", "netlify-redirector": "0.5.0", From 1d059577f706b0704833547ef6072ac3ff2b66af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Tue, 18 Jun 2024 09:19:59 +0100 Subject: [PATCH 2/2] chore: fix type imports --- src/utils/deploy/hash-fns.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/utils/deploy/hash-fns.ts b/src/utils/deploy/hash-fns.ts index fb9c85ccbd4..9a06a28c63e 100644 --- a/src/utils/deploy/hash-fns.ts +++ b/src/utils/deploy/hash-fns.ts @@ -2,9 +2,7 @@ import { readFile } from 'fs/promises' import path from 'path' import { promisify } from 'util' -import { zipFunctions } from '@netlify/zip-it-and-ship-it' -import type { TrafficRules } from '@netlify/zip-it-and-ship-it/dist/manifest.js' -import type { FunctionResult } from '@netlify/zip-it-and-ship-it/dist/utils/format_result.js' +import { zipFunctions, type FunctionResult, type TrafficRules } from '@netlify/zip-it-and-ship-it' // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'from... Remove this comment to see the full error message import fromArray from 'from2-array' // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pump... Remove this comment to see the full error message