Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ _Released 11/18/2025 (PENDING)_
- The keyboard shortcuts modal now displays the keyboard shortcut for saving Studio changes - `⌘` + `s` for Mac or `Ctrl` + `s` for Windows/Linux. Addressed [#32862](https://github.com/cypress-io/cypress/issues/32862). Addressed in [#32864](https://github.com/cypress-io/cypress/pull/32864).
- The Cursor logo now correctly displays in the External editor dropdown. Addresses [#32062](https://github.com/cypress-io/cypress/issues/32062). Addressed in [#32911](https://github.com/cypress-io/cypress/pull/32911).

**Dependency Updates:**

- Upgraded `mime` from `3.0.0` to `4.1.0`. Addresses [#30144](https://github.com/cypress-io/cypress/issues/30144).

## 15.6.0

_Released 11/4/2025_
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ describe('src/cy/commands/actions/selectFile', () => {
expect($input.files?.[0].name).to.eq('valid.json')
expect($input.files?.[1].name).to.eq('app.js')
expect($input.files?.[0].type).to.eq('application/json')
expect($input.files?.[1].type).to.eq('application/javascript')
expect($input.files?.[1].type).to.eq('text/javascript')
Copy link
Member

@jennifer-shehane jennifer-shehane Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Legacy JavaScript MIME type.

According to RFC 9239 from May 2022, application/javascript is an obsolete alias of text/javascript.

})
})

Expand Down
3 changes: 1 addition & 2 deletions packages/driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"@types/common-tags": "^1.8.0",
"@types/crypto-js": "4.1.1",
"@types/jquery.scrollto": "1.4.29",
"@types/mime": "^3.0.1",
"@types/mocha": "^8.0.3",
"@types/sinonjs__fake-timers": "8.1.1",
"basic-auth": "2.0.1",
Expand Down Expand Up @@ -77,7 +76,7 @@
"md5": "2.3.0",
"method-override": "3.0.0",
"methods": "1.1.2",
"mime": "^3.0.0",
"mime": "^4.1.0",
"minimatch": "3.1.2",
"mocha": "7.2.0",
"multer": "2.0.2",
Expand Down
3 changes: 1 addition & 2 deletions packages/net-stubbing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"is-html": "^2.0.0",
"istextorbinary": "6.0.0",
"lodash": "^4.17.15",
"mime": "^3.0.0",
"mime": "^4.1.0",
"minimatch": "^3.1.2",
"throttle": "^1.0.3"
},
Expand All @@ -27,7 +27,6 @@
"@packages/proxy": "0.0.0-development",
"@packages/server": "0.0.0-development",
"@packages/telemetry": "0.0.0-development",
"@types/mime": "^3.0.1",
"vitest": "^3.2.4"
},
"files": [
Expand Down
3 changes: 1 addition & 2 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"@packages/icons": "0.0.0-development",
"@packages/stderr-filtering": "0.0.0-development",
"@packages/telemetry": "0.0.0-development",
"@types/mime": "^3.0.1",
"ansi_up": "5.0.0",
"ast-types": "0.13.3",
"axios": "^1.11.0",
Expand Down Expand Up @@ -96,7 +95,7 @@
"log-symbols": "2.2.0",
"md5": "2.3.0",
"memfs": "3.5.3",
"mime": "^3.0.0",
"mime": "^4.1.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MikeMcC399 it looks like mime 4+ requires esm support https://github.com/broofa/mime?tab=readme-ov-file#mime. This is fine for the driver because everything gets bundled, but won't work for the server since we can't require it correctly in the ts-node context for our unit tests. https://app.circleci.com/pipelines/github/cypress-io/cypress/77276/workflows/97832e74-5300-4e6a-867e-e5590af97ae1/jobs/3311239 looks like its trying to use the esm loader. It likely works in the server in the binary itself because we use tsx to load the runtime to get bidirectional support https://tsx.is/#seamless-cjs-%E2%86%94-esm-imports.

unfortunately I'm going to have to revert this until we are in a better place with ESM support in the server

CC @jennifer-shehane

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AtofStryker

https://github.com/broofa/mime/blob/main/CHANGELOG.md confirms that [email protected] dropped CJS support.

I did mention that in the issue #30144

Sorry if this update is causing an issue. The CI results looked perfect, so I didn't suspect any issue here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... and unfortunately exactly the test which is failing is not carried out for PR contributions from forks, so it wasn't apparent when the PR was merged.

Possibly there is a need to re-route contributor PRs to a feature branch first and then from there do a separate PR under the ownership of a Cypress.io member?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MikeMcC399 Yah that was the problem, a subset of tests dont run on contributor PRs

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MikeMcC399 no worries the ESM only support felt hidden to me and I didn't notice it the first time around. This wont be the first or last time this happens while we transition to more ECMAScript friendly code.

"mime-db": "1.45.0",
"minimatch": "3.1.2",
"minimist": "1.2.8",
Expand Down
18 changes: 4 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8527,11 +8527,6 @@
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==

"@types/mime@^3.0.1":
version "3.0.4"
resolved "https://registry.npmjs.org/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45"
integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==

"@types/minimatch@*", "@types/[email protected]", "@types/minimatch@^3.0.3":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
Expand Down Expand Up @@ -23392,15 +23387,10 @@ mime@^2.4.6, mime@^2.5.2:
resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==

mime@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==

mime@^4.0.0:
version "4.0.6"
resolved "https://registry.yarnpkg.com/mime/-/mime-4.0.6.tgz#ca83bec0bcf2a02353d0e02da99be05603d04839"
integrity sha512-4rGt7rvQHBbaSOF9POGkk1ocRP16Md1x36Xma8sz8h8/vfCUI2OtEIeCqe4Ofes853x4xDoPiFLIT47J5fI/7A==
mime@^4.0.0, mime@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-4.1.0.tgz#ec55df7aa21832a36d44f0bbee5c04639b27802f"
integrity sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw==

mimic-fn@^1.0.0:
version "1.2.0"
Expand Down