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
2 changes: 1 addition & 1 deletion .circleci/cache-version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Bump this version to force CI to re-create the cache from scratch.
10-10-2025
10-14-2025
2 changes: 1 addition & 1 deletion .circleci/src/pipeline/@pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,7 @@ jobs:
source ./scripts/ensure-node.sh
yarn lerna run types
- sanitize-verify-and-store-mocha-results:
expectedResultCount: 8
expectedResultCount: 7

verify-release-readiness:
<<: *defaults
Expand Down
4 changes: 2 additions & 2 deletions guides/esm-migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
- [ ] packages/extension
- [ ] packages/frontend-shared **PARTIAL** - entry point is JS
- [x] packages/electron ✅ **COMPLETED**
- [ ] packages/https-proxy - higher priority
- [x] packages/https-proxy - ✅ **COMPLETED**
- [x] packages/icons ✅ **COMPLETED**
- [x] packages/launcher ✅ **COMPLETED**
- [x] packages/launchpad ✅ **COMPLETED**
Expand Down Expand Up @@ -96,7 +96,7 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
- [x] packages/electron ✅ **COMPLETED**
- [x] packages/error ✅ **COMPLETED**
- [ ] packages/extension
- [ ] packages/https-proxy
- [x] packages/https-proxy ✅ **COMPLETED**
- [x] packages/electron ✅ **COMPLETED**
- [x] packages/icons ✅ **COMPLETED**
- [x] packages/launcher ✅ **COMPLETED**
Expand Down
6 changes: 3 additions & 3 deletions packages/driver/cypress/plugins/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const auth = require('basic-auth')
const bodyParser = require('body-parser')
const express = require('express')
const http = require('http')
const httpsProxy = require('@packages/https-proxy')
const { create: createHttpsServer } = require('@packages/https-proxy/test/helpers/https_server')
const path = require('path')
const Promise = require('bluebird')
const multer = require('multer')
Expand Down Expand Up @@ -377,7 +377,7 @@ const createApp = (port) => {
})

app.get('/aut-commands', async (req, res) => {
const script = (await fs.readFileAsync(path.join(__dirname, '..', 'fixtures', 'aut-commands.js'))).toString()
const script = (await fs.readFile(path.join(__dirname, '..', 'fixtures', 'aut-commands.js'))).toString()

res.send(`
<html>
Expand Down Expand Up @@ -411,7 +411,7 @@ httpPorts.forEach((port) => {
// style to make sure we implement cookie handling correctly
httpsPorts.forEach((port) => {
const httpsApp = createApp(port)
const httpsServer = httpsProxy.httpsServer(httpsApp)
const httpsServer = createHttpsServer(httpsApp)

return httpsServer.listen(port, () => {
// eslint-disable-next-line no-console
Expand Down
3 changes: 3 additions & 0 deletions packages/https-proxy/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
cjs/
esm/
tsconfig.json
2 changes: 2 additions & 0 deletions packages/https-proxy/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
ca/
cjs/
esm/
2 changes: 2 additions & 0 deletions packages/https-proxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ This package enables Cypress to inspect and modify bytes coming in and out of th

## Testing

Since `vitest` runs specs in parallel by default, we get collisions in the `proxy.spec.ts` and `server.spec.ts` as there is a proxy server running in the background for `proxy.spec.ts` while we are testing the implements of `server.spec.ts`. These tests cannot run at the same time, hence why we leverage the `no-file-parallelism` option.

```bash
yarn workspace @packages/https-proxy test
yarn workspace @packages/https-proxy test-watch
Expand Down
13 changes: 0 additions & 13 deletions packages/https-proxy/https.js

This file was deleted.

5 changes: 0 additions & 5 deletions packages/https-proxy/index.js

This file was deleted.

Loading
Loading