Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: badeball/cypress-cucumber-preprocessor
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v20.0.6
Choose a base ref
...
head repository: badeball/cypress-cucumber-preprocessor
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v20.0.7
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 6, 2024

  1. Update patch of @cypress/vite-dev-server

    This now supports the latest version of said package.
    badeball committed Jun 6, 2024
    Copy the full SHA
    982ee5e View commit details
  2. Run *.cmd commands with shell: true

    This bypasses EINVAL [1] errors seen in CI on Windows.
    
    [1] https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
    badeball committed Jun 6, 2024
    Copy the full SHA
    e05488c View commit details

Commits on Jun 14, 2024

  1. Update nearly all dependencies, including esbuild

    This fixes #1198 [1].
    
    [1] #1198
    badeball committed Jun 14, 2024
    Copy the full SHA
    84021c1 View commit details
  2. v20.0.7

    badeball committed Jun 14, 2024
    Copy the full SHA
    6c81d49 View commit details
Showing with 38 additions and 25 deletions.
  1. +4 −0 CHANGELOG.md
  2. +4 −4 ...te-react-ts/patches/{@cypress+vite-dev-server+5.0.5.patch → @cypress+vite-dev-server+5.1.0.patch}
  3. +9 −0 features/support/world.ts
  4. +21 −21 package.json
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

All notable changes to this project will be documented in this file.

## v20.0.7

- Updated all dependencies, fixes [#1198](https://github.com/badeball/cypress-cucumber-preprocessor/issues/1198).

## v20.0.6

- Search for configuration files using strategy `project`, fixes [#1185](https://github.com/badeball/cypress-cucumber-preprocessor/issues/1185).
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/node_modules/@cypress/vite-dev-server/client/initCypressTests.js b/node_modules/@cypress/vite-dev-server/client/initCypressTests.js
index f0602c1..d7f05a0 100644
index 0fbff85..0799f57 100644
--- a/node_modules/@cypress/vite-dev-server/client/initCypressTests.js
+++ b/node_modules/@cypress/vite-dev-server/client/initCypressTests.js
@@ -36,7 +36,7 @@ if (supportFile) {
@@ -51,7 +51,7 @@ if (supportFile) {
// So we use the "@fs" bit to load the test file using its absolute path
// Normalize path to not include a leading slash (different on Win32 vs Unix)
const normalizedAbsolutePath = CypressInstance.spec.absolute.replace(/^\//, '')
-const testFileAbsolutePathRoute = `${devServerPublicPathRoute}/@fs/${normalizedAbsolutePath}`
+const testFileAbsolutePathRoute = `${devServerPublicPathRoute}/@fs/${normalizedAbsolutePath}?import`
-const testFileAbsolutePathRoute = `${devServerPublicPathBase}/@fs/${normalizedAbsolutePath}`
+const testFileAbsolutePathRoute = `${devServerPublicPathBase}/@fs/${normalizedAbsolutePath}?import`

/* Spec file import logic */
// We need a slash before /src/my-spec.js, this does not happen by default.
9 changes: 9 additions & 0 deletions features/support/world.ts
Original file line number Diff line number Diff line change
@@ -97,13 +97,22 @@ export default class CustomWorld implements ICustomWorld {
extraEnv: Record<string, string>;
expectedExitCode?: number;
}) {
const shell = cmd.endsWith(".cmd");

if (shell) {
// https://github.com/nodejs/node/issues/29532
args = args.map((arg) => `"${arg}"`);
}

const child = childProcess.spawn(cmd, args, {
stdio: ["ignore", "pipe", "pipe"],
cwd: this.tmpDir,
env: {
...process.env,
...extraEnv,
},
// https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
shell,
});

const combined = combine(child.stdout, child.stderr);
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@badeball/cypress-cucumber-preprocessor",
"version": "20.0.6",
"version": "20.0.7",
"author": "Jonas Amundsen",
"license": "MIT",
"homepage": "https://github.com/badeball/cypress-cucumber-preprocessor",
@@ -60,67 +60,67 @@
"dependencies": {
"@badeball/cypress-configuration": "^6.1.1",
"@cucumber/ci-environment": "^10.0.1",
"@cucumber/cucumber": "^10.6.0",
"@cucumber/cucumber": "^10.8.0",
"@cucumber/cucumber-expressions": "^17.1.0",
"@cucumber/gherkin": "^28.0.0",
"@cucumber/html-formatter": "^21.3.1",
"@cucumber/message-streams": "^4.0.1",
"@cucumber/messages": "^24.1.0",
"@cucumber/messages": "^25.0.1",
"@cucumber/pretty-formatter": "^1.0.1",
"@cucumber/tag-expressions": "^6.1.0",
"base64-js": "^1.5.1",
"chalk": "^4.1.2",
"cli-table": "^0.3.11",
"common-ancestor-path": "^1.0.1",
"cosmiconfig": "^9.0.0",
"debug": "^4.3.4",
"debug": "^4.3.5",
"error-stack-parser": "^2.1.4",
"esbuild": "^0.20.2",
"glob": "^10.3.12",
"esbuild": "^0.21.5",
"glob": "^10.4.1",
"is-path-inside": "^3.0.3",
"mocha": "^10.4.0",
"seedrandom": "^3.0.5",
"source-map": "^0.7.4",
"split": "^1.0.1",
"uuid": "^9.0.1"
"uuid": "^10.0.0"
},
"devDependencies": {
"@babel/parser": "^7.24.4",
"@babel/types": "^7.24.0",
"@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
"@babel/parser": "^7.24.7",
"@babel/types": "^7.24.7",
"@bahmutov/cypress-esbuild-preprocessor": "^2.2.1",
"@cypress/browserify-preprocessor": "^3.0.2",
"@cypress/webpack-preprocessor": "^6.0.1",
"@testing-library/dom": "^10.0.0",
"@cypress/webpack-preprocessor": "^6.0.2",
"@testing-library/dom": "^10.1.0",
"@types/cli-table": "^0.3.4",
"@types/common-ancestor-path": "^1.0.2",
"@types/debug": "^4.1.12",
"@types/glob": "^8.1.0",
"@types/jsdom": "^21.1.6",
"@types/jsdom": "^21.1.7",
"@types/mocha": "^10.0.6",
"@types/pngjs": "^6.0.4",
"@types/pngjs": "^6.0.5",
"@types/prettier": "^2.7.3",
"@types/seedrandom": "^3.0.8",
"@types/split": "^1.0.5",
"@types/stream-buffers": "^3.0.7",
"@typescript-eslint/eslint-plugin": "^7.7.1",
"@typescript-eslint/parser": "^7.7.1",
"@typescript-eslint/eslint-plugin": "^7.13.0",
"@typescript-eslint/parser": "^7.13.0",
"ast-types": "^0.15.2",
"cypress": "^13.8.1",
"cypress": "^13.11.0",
"eslint": "^8.51.0",
"genversion": "^3.2.0",
"jsdom": "^24.0.0",
"jsdom": "^24.1.0",
"pngjs": "^7.0.0",
"prettier": "^2.8.8",
"recast": "^0.23.6",
"rollup": "^4.16.4",
"recast": "^0.23.9",
"rollup": "^4.18.0",
"stream-buffers": "^3.0.2",
"strip-ansi": "^6.0.1",
"strip-indent": "^3.0.0",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"tsd": "^0.31.0",
"typescript": "^5.4.5",
"webpack": "^5.91.0"
"webpack": "^5.92.0"
},
"peerDependencies": {
"@cypress/browserify-preprocessor": "^3.0.1",