From d640afacfa5df3497e109501cd2451ac7776c1d7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 18:41:16 +0000 Subject: [PATCH 1/3] chore(deps): update dependency netlify-cli to v21 --- e2e-report/package-lock.json | 16 ++++++++-------- e2e-report/package.json | 2 +- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/e2e-report/package-lock.json b/e2e-report/package-lock.json index 684ab2ae5b..e11a8e99ca 100644 --- a/e2e-report/package-lock.json +++ b/e2e-report/package-lock.json @@ -18,7 +18,7 @@ "daisyui": "^4.12.2", "eslint": "^8.57.0", "eslint-config-next": "^14.2.4", - "netlify-cli": "^20.1.1", + "netlify-cli": "^21.0.1", "postcss": "^8.4.38", "sass": "^1.77.1", "tailwindcss": "^3.4.4" @@ -3629,9 +3629,9 @@ "dev": true }, "node_modules/netlify-cli": { - "version": "20.1.1", - "resolved": "https://registry.npmjs.org/netlify-cli/-/netlify-cli-20.1.1.tgz", - "integrity": "sha512-TyOaHXN8CwesnTiavZQtXquzarJ8Bxu1ufa9SdEcJ/g7usy4/OIBrOVQiAk2RdOHn2gGV07ttJ1KxHt+RP9xew==", + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/netlify-cli/-/netlify-cli-21.0.1.tgz", + "integrity": "sha512-qgdbrOPzgu2qt7fyM6pGMvbbLyFEaKjdTcyGfNV15ElyQEQ5aRIXr1ggK6Yg0Mr4VQplW0caipz+XlKmBPo1dA==", "dev": true, "hasInstallScript": true, "hasShrinkwrap": true, @@ -3643,7 +3643,7 @@ "@netlify/build-info": "9.0.4", "@netlify/config": "22.0.1", "@netlify/edge-bundler": "13.0.2", - "@netlify/edge-functions": "2.11.1", + "@netlify/edge-functions": "2.12.0", "@netlify/headers-parser": "8.0.0", "@netlify/local-functions-proxy": "2.0.3", "@netlify/redirect-parser": "14.5.1", @@ -5883,9 +5883,9 @@ } }, "node_modules/netlify-cli/node_modules/@netlify/edge-functions": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/@netlify/edge-functions/-/edge-functions-2.11.1.tgz", - "integrity": "sha512-pyQOTZ8a+ge5lZlE+H/UAHyuqQqtL5gE0pXrHT9mOykr3YQqnkB2hZMtx12odatZ87gHg4EA+UPyMZUbLfnXvw==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/@netlify/edge-functions/-/edge-functions-2.12.0.tgz", + "integrity": "sha512-6EWKqCQvOWyM6CHOofvDglX8qkBL2xcMF2T0h7kzZRrdBvHMRgxTk6BmPlBGt8z4LubSQo6vDAb46MYNJ7ZyaA==", "dev": true }, "node_modules/netlify-cli/node_modules/@netlify/framework-info": { diff --git a/e2e-report/package.json b/e2e-report/package.json index 826d57b0e0..8cd584a6b3 100644 --- a/e2e-report/package.json +++ b/e2e-report/package.json @@ -19,7 +19,7 @@ "daisyui": "^4.12.2", "eslint": "^8.57.0", "eslint-config-next": "^14.2.4", - "netlify-cli": "^20.1.1", + "netlify-cli": "^21.0.1", "postcss": "^8.4.38", "sass": "^1.77.1", "tailwindcss": "^3.4.4" diff --git a/package-lock.json b/package-lock.json index a422c91f93..5af0d3bb55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "memfs": "^4.9.2", "mock-require": "^3.0.3", "msw": "^2.0.7", - "netlify-cli": "^20.1.1", + "netlify-cli": "^21.0.1", "next": "^15.0.0-canary.28", "next-with-cache-handler-v2": "npm:next@15.3.0-canary.13", "os": "^0.1.2", @@ -14277,9 +14277,9 @@ } }, "node_modules/netlify-cli": { - "version": "20.1.1", - "resolved": "https://registry.npmjs.org/netlify-cli/-/netlify-cli-20.1.1.tgz", - "integrity": "sha512-TyOaHXN8CwesnTiavZQtXquzarJ8Bxu1ufa9SdEcJ/g7usy4/OIBrOVQiAk2RdOHn2gGV07ttJ1KxHt+RP9xew==", + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/netlify-cli/-/netlify-cli-21.0.1.tgz", + "integrity": "sha512-qgdbrOPzgu2qt7fyM6pGMvbbLyFEaKjdTcyGfNV15ElyQEQ5aRIXr1ggK6Yg0Mr4VQplW0caipz+XlKmBPo1dA==", "dev": true, "hasInstallScript": true, "hasShrinkwrap": true, @@ -14290,7 +14290,7 @@ "@netlify/build-info": "9.0.4", "@netlify/config": "22.0.1", "@netlify/edge-bundler": "13.0.2", - "@netlify/edge-functions": "2.11.1", + "@netlify/edge-functions": "2.12.0", "@netlify/headers-parser": "8.0.0", "@netlify/local-functions-proxy": "2.0.3", "@netlify/redirect-parser": "14.5.1", @@ -16530,9 +16530,9 @@ } }, "node_modules/netlify-cli/node_modules/@netlify/edge-functions": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/@netlify/edge-functions/-/edge-functions-2.11.1.tgz", - "integrity": "sha512-pyQOTZ8a+ge5lZlE+H/UAHyuqQqtL5gE0pXrHT9mOykr3YQqnkB2hZMtx12odatZ87gHg4EA+UPyMZUbLfnXvw==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/@netlify/edge-functions/-/edge-functions-2.12.0.tgz", + "integrity": "sha512-6EWKqCQvOWyM6CHOofvDglX8qkBL2xcMF2T0h7kzZRrdBvHMRgxTk6BmPlBGt8z4LubSQo6vDAb46MYNJ7ZyaA==", "dev": true }, "node_modules/netlify-cli/node_modules/@netlify/framework-info": { @@ -44964,9 +44964,9 @@ } }, "netlify-cli": { - "version": "20.1.1", - "resolved": "https://registry.npmjs.org/netlify-cli/-/netlify-cli-20.1.1.tgz", - "integrity": "sha512-TyOaHXN8CwesnTiavZQtXquzarJ8Bxu1ufa9SdEcJ/g7usy4/OIBrOVQiAk2RdOHn2gGV07ttJ1KxHt+RP9xew==", + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/netlify-cli/-/netlify-cli-21.0.1.tgz", + "integrity": "sha512-qgdbrOPzgu2qt7fyM6pGMvbbLyFEaKjdTcyGfNV15ElyQEQ5aRIXr1ggK6Yg0Mr4VQplW0caipz+XlKmBPo1dA==", "dev": true, "requires": { "@fastify/static": "7.0.4", @@ -44975,7 +44975,7 @@ "@netlify/build-info": "9.0.4", "@netlify/config": "22.0.1", "@netlify/edge-bundler": "13.0.2", - "@netlify/edge-functions": "2.11.1", + "@netlify/edge-functions": "2.12.0", "@netlify/headers-parser": "8.0.0", "@netlify/local-functions-proxy": "2.0.3", "@netlify/redirect-parser": "14.5.1", @@ -46489,9 +46489,9 @@ } }, "@netlify/edge-functions": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/@netlify/edge-functions/-/edge-functions-2.11.1.tgz", - "integrity": "sha512-pyQOTZ8a+ge5lZlE+H/UAHyuqQqtL5gE0pXrHT9mOykr3YQqnkB2hZMtx12odatZ87gHg4EA+UPyMZUbLfnXvw==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/@netlify/edge-functions/-/edge-functions-2.12.0.tgz", + "integrity": "sha512-6EWKqCQvOWyM6CHOofvDglX8qkBL2xcMF2T0h7kzZRrdBvHMRgxTk6BmPlBGt8z4LubSQo6vDAb46MYNJ7ZyaA==", "dev": true }, "@netlify/framework-info": { diff --git a/package.json b/package.json index a0c28ae9d0..941d0a5227 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "memfs": "^4.9.2", "mock-require": "^3.0.3", "msw": "^2.0.7", - "netlify-cli": "^20.1.1", + "netlify-cli": "^21.0.1", "next": "^15.0.0-canary.28", "next-with-cache-handler-v2": "npm:next@15.3.0-canary.13", "os": "^0.1.2", From a91d7fbe699df0d756e9216d15bff195e539ece7 Mon Sep 17 00:00:00 2001 From: Mateusz Bocian Date: Tue, 6 May 2025 15:55:54 -0400 Subject: [PATCH 2/3] test: adjust regex for finding site name and deploy id --- tests/netlify-deploy.ts | 2 +- tests/utils/create-e2e-fixture.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/netlify-deploy.ts b/tests/netlify-deploy.ts index d7e4b76c88..f1c979375c 100644 --- a/tests/netlify-deploy.ts +++ b/tests/netlify-deploy.ts @@ -148,7 +148,7 @@ export class NextDeployInstance extends NextInstance { try { const deployUrlRegex = new RegExp( - /https:\/\/app\.netlify\.com\/sites\/(?.+)\/deploys\/(?[0-9a-f]+)/gm, + /https:\/\/app\.netlify\.com\/sites\/(?[^\/]+)\/deploys\/(?[0-9a-f]+)/gm, ).exec(deployRes.stdout) const [buildLogsUrl] = deployUrlRegex || [] const { deployID, siteName } = deployUrlRegex?.groups || {} diff --git a/tests/utils/create-e2e-fixture.ts b/tests/utils/create-e2e-fixture.ts index d9dd509708..cf89c4939a 100644 --- a/tests/utils/create-e2e-fixture.ts +++ b/tests/utils/create-e2e-fixture.ts @@ -280,7 +280,7 @@ async function deploySite( const output = await readFile(join(siteDir, outputFile), 'utf-8') const { siteName, deployID } = - new RegExp(/app\.netlify\.com\/sites\/(?.+)\/deploys\/(?[0-9a-f]+)/gm).exec( + new RegExp(/app\.netlify\.com\/sites\/(?[^\/]+)\/deploys\/(?[0-9a-f]+)/gm).exec( output, )?.groups || {} From 475dc2422bf057dfba1ba6b73ce00bddca324b89 Mon Sep 17 00:00:00 2001 From: Mateusz Bocian Date: Tue, 6 May 2025 15:59:15 -0400 Subject: [PATCH 3/3] chore: format fix --- tests/utils/create-e2e-fixture.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/utils/create-e2e-fixture.ts b/tests/utils/create-e2e-fixture.ts index cf89c4939a..9ec2bfd92c 100644 --- a/tests/utils/create-e2e-fixture.ts +++ b/tests/utils/create-e2e-fixture.ts @@ -280,9 +280,9 @@ async function deploySite( const output = await readFile(join(siteDir, outputFile), 'utf-8') const { siteName, deployID } = - new RegExp(/app\.netlify\.com\/sites\/(?[^\/]+)\/deploys\/(?[0-9a-f]+)/gm).exec( - output, - )?.groups || {} + new RegExp( + /app\.netlify\.com\/sites\/(?[^\/]+)\/deploys\/(?[0-9a-f]+)/gm, + ).exec(output)?.groups || {} if (!deployID) { throw new Error('Could not extract DeployID from the build logs')