From 1683c2e58f78c04203f52d05cf42fe35c602064e Mon Sep 17 00:00:00 2001 From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> Date: Fri, 7 Mar 2025 19:10:10 +0100 Subject: [PATCH 1/5] test: prettier format example json files (#1389) --- .prettierignore | 2 ++ examples/start-and-pnpm-workspaces/package.json | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index b680f365a..29c08b29c 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,7 @@ /LICENSE.md +/renovate.json examples/**/*.js examples/**/*.?js +**/package-lock.json **/pnpm-lock.yaml diff --git a/examples/start-and-pnpm-workspaces/package.json b/examples/start-and-pnpm-workspaces/package.json index 9b06cd3f3..bb1839f46 100644 --- a/examples/start-and-pnpm-workspaces/package.json +++ b/examples/start-and-pnpm-workspaces/package.json @@ -4,6 +4,8 @@ "description": "example using pnpm with workspaces", "private": true, "pnpm": { - "onlyBuiltDependencies": ["cypress"] + "onlyBuiltDependencies": [ + "cypress" + ] } } From 676ecbb91af8e948b2d2a5bcadeb20327f4796da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 10:36:45 -0400 Subject: [PATCH 2/5] chore(deps): update dependency eslint-plugin-cypress to v4.2.0 (#1391) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0c9e1c08..0fca77cf1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "@types/node": "22.13.9", "@vercel/ncc": "0.38.1", "eslint": "9.21.0", - "eslint-plugin-cypress": "4.1.0", + "eslint-plugin-cypress": "4.2.0", "globals": "16.0.0", "husky": "9.1.7", "markdown-link-check": "3.13.6", @@ -1918,9 +1918,9 @@ } }, "node_modules/eslint-plugin-cypress": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-4.1.0.tgz", - "integrity": "sha512-JhqkMY02mw74USwK9OFhectx3YSj6Co1NgWBxlGdKvlqiAp9vdEuQqt33DKGQFvvGS/NWtduuhWXWNnU29xDSg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-4.2.0.tgz", + "integrity": "sha512-v5cyt0VYb1tEEODBJSE44PocYOwQsckyexJhCs7LtdD3FGO6D2GjnZB2s2Sts4RcxdxECTWX01nObOZRs26bQw==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 65fdea702..a2d24414f 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@types/node": "22.13.9", "@vercel/ncc": "0.38.1", "eslint": "9.21.0", - "eslint-plugin-cypress": "4.1.0", + "eslint-plugin-cypress": "4.2.0", "globals": "16.0.0", "husky": "9.1.7", "markdown-link-check": "3.13.6", From dc9977a3cdd6a4d2f773edaf6ddda34fef3d9121 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 10:37:13 -0400 Subject: [PATCH 3/5] chore(deps): update dependency @types/node to v22.13.10 (#1392) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0fca77cf1..25aff9496 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "devDependencies": { "@eslint/js": "9.21.0", "@stylistic/eslint-plugin": "4.2.0", - "@types/node": "22.13.9", + "@types/node": "22.13.10", "@vercel/ncc": "0.38.1", "eslint": "9.21.0", "eslint-plugin-cypress": "4.2.0", @@ -1080,9 +1080,9 @@ } }, "node_modules/@types/node": { - "version": "22.13.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.9.tgz", - "integrity": "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==", + "version": "22.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", + "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" diff --git a/package.json b/package.json index a2d24414f..61f478ccc 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "devDependencies": { "@eslint/js": "9.21.0", "@stylistic/eslint-plugin": "4.2.0", - "@types/node": "22.13.9", + "@types/node": "22.13.10", "@vercel/ncc": "0.38.1", "eslint": "9.21.0", "eslint-plugin-cypress": "4.2.0", From 23d18decc04756e6e142196b55fb7eff7d3e8ca2 Mon Sep 17 00:00:00 2001 From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:46:15 +0100 Subject: [PATCH 4/5] ci: self-lint eslint config style (#1394) --- .prettierignore | 1 + eslint.config.mjs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.prettierignore b/.prettierignore index 29c08b29c..588d6e598 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ +/eslint.config.*js /LICENSE.md /renovate.json diff --git a/eslint.config.mjs b/eslint.config.mjs index 547b4b59c..624eb4ef8 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -8,26 +8,26 @@ export default [ pluginCypress.configs.recommended, { name: 'global-ignores', - ignores: ['dist/', 'examples/nextjs/src/app/'] + ignores: ['dist/', 'examples/nextjs/src/app/'], }, { name: 'all-js', languageOptions: { globals: { ...globals.browser, - ...globals.node - } - } + ...globals.node, + }, + }, }, { - name: 'examples-style', - files: ['examples/**/*.js'], + name: 'style', + files: ['eslint.config.mjs', 'examples/**/*.js'], ...stylistic.configs.recommended, rules: { '@stylistic/indent': ['error', 2], '@stylistic/comma-dangle': ['error', 'always-multiline'], '@stylistic/quotes': ['error', 'single'], '@stylistic/semi': ['error', 'never'], - } - } + }, + }, ] From 108b8684ae52e735ff7891524cbffbcd4be5b19f Mon Sep 17 00:00:00 2001 From: mungodewar <89925955+mungodewar@users.noreply.github.com> Date: Mon, 10 Mar 2025 14:46:34 +0000 Subject: [PATCH 5/5] fix: pass baseUrl into Octokit constructor (#1395) Co-authored-by: Jennifer Shehane --- dist/index.js | 6 ++++-- index.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index 51b127067..f109744df 100644 --- a/dist/index.js +++ b/dist/index.js @@ -93785,7 +93785,8 @@ const getCiBuildId = async () => { GITHUB_SHA, GITHUB_TOKEN, GITHUB_RUN_ID, - GITHUB_REPOSITORY + GITHUB_REPOSITORY, + GITHUB_API_URL } = process.env const [owner, repo] = GITHUB_REPOSITORY.split('/') @@ -93798,7 +93799,8 @@ const getCiBuildId = async () => { ) const client = new Octokit({ - auth: GITHUB_TOKEN + auth: GITHUB_TOKEN, + baseUrl: GITHUB_API_URL }) const resp = await client.request( diff --git a/index.js b/index.js index 3ddccadc2..3ff8a12f3 100644 --- a/index.js +++ b/index.js @@ -522,7 +522,8 @@ const getCiBuildId = async () => { GITHUB_SHA, GITHUB_TOKEN, GITHUB_RUN_ID, - GITHUB_REPOSITORY + GITHUB_REPOSITORY, + GITHUB_API_URL } = process.env const [owner, repo] = GITHUB_REPOSITORY.split('/') @@ -535,7 +536,8 @@ const getCiBuildId = async () => { ) const client = new Octokit({ - auth: GITHUB_TOKEN + auth: GITHUB_TOKEN, + baseUrl: GITHUB_API_URL }) const resp = await client.request(