Skip to content

Commit

Permalink
[merge] chore: use hoisted yarn install in build binary #17132
Browse files Browse the repository at this point in the history 
note: merge commit rather than squash to preserve git mv renames
  • Loading branch information
@tgriesser
tgriesser authored Jul 6, 2021
2 parents 63236d3 + ce28486 commit 6b3ab13
Show file tree
Hide file tree
Showing 22 changed files with 1,113 additions and 1,472 deletions.
9 changes: 5 additions & 4 deletions __snapshots__/packages-spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,19 @@ exports['packages can copy files from package.json 1'] = {
"tmp": {
"packages": {
"coffee": {
"package.json": "{\"main\":\"src/main.js\", \"name\": \"foo\", \"files\": [\"lib\"]}",
"lib": {
"foo.js": "{}"
},
"src": {
"main.js": "console.log()"
},
"lib": {
"foo.js": "{}"
}
"package.json": "{\n \"main\": \"src/main.js\",\n \"name\": \"foo\",\n \"files\": [\n \"lib\"\n ]\n}\n"
}
}
}
}


exports['transformRequires can find and replace symlink requires 1'] = {
"[cwd]": {
"build": {
Expand Down
14 changes: 7 additions & 7 deletions packages/electron/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
"test-watch": "yarn test-unit --watch"
},
"dependencies": {
"@cypress/icons": "0.7.0",
"bluebird": "3.5.3",
"debug": "4.3.2",
"electron-packager": "14.1.1",
"fs-extra": "8.1.0",
"lodash": "4.17.21",
"minimist": "1.2.5"
"@cypress/icons": "^0.7.0",
"bluebird": "^3.5.3",
"debug": "^4.3.2",
"fs-extra": "^8.1.0",
"lodash": "^4.17.21",
"minimist": "^1.2.5"
},
"devDependencies": {
"electron": "12.0.0-beta.14",
"electron-packager": "14.1.1",
"execa": "4.1.0",
"mocha": "3.5.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"watch": "webpack --watch --progress"
},
"dependencies": {
"bluebird": "3.5.3",
"lodash": "4.17.21"
"bluebird": "^3.5.3",
"lodash": "^4.17.21"
},
"devDependencies": {
"@cypress/icons": "0.7.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/https-proxy/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"test-watch": "cross-env NODE_ENV=test mocha --watch"
},
"dependencies": {
"bluebird": "3.5.3",
"debug": "4.3.2",
"fs-extra": "8.1.0",
"lodash": "4.17.21",
"node-forge": "0.10.0",
"semaphore": "1.1.0"
"bluebird": "^3.5.3",
"debug": "^4.3.2",
"fs-extra": "^8.1.0",
"lodash": "^4.17.21",
"node-forge": "^0.10.0",
"semaphore": "^1.1.0"
},
"devDependencies": {
"@cypress/debugging-proxy": "2.0.1",
Expand Down
14 changes: 7 additions & 7 deletions packages/launcher/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"test-unit": "mocha --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json"
},
"dependencies": {
"bluebird": "3.5.3",
"debug": "4.3.2",
"execa": "4.0.0",
"fs-extra": "8.1.0",
"lodash": "4.17.21",
"plist": "3.0.1",
"ramda": "0.27.1"
"bluebird": "^3.5.3",
"debug": "^4.3.2",
"execa": "^4.0.0",
"fs-extra": "^8.1.0",
"lodash": "^4.17.21",
"plist": "^3.0.1",
"ramda": "^0.27.1"
},
"devDependencies": {
"@packages/ts": "0.0.0-development",
Expand Down
8 changes: 4 additions & 4 deletions packages/net-stubbing/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"test": "mocha -r @packages/ts/register --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json --exit test/unit/*"
},
"dependencies": {
"@types/mime-types": "2.1.0",
"@types/mime-types": "^2.1.0",
"is-html": "^2.0.0",
"istextorbinary": "5.12.0",
"lodash": "4.17.15",
"mime-types": "2.1.27",
"istextorbinary": "^5.12.0",
"lodash": "^4.17.15",
"mime-types": "^2.1.27",
"minimatch": "^3.0.4",
"throttle": "^1.0.3"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/network/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"test-watch": "yarn test-unit --watch"
},
"dependencies": {
"@cypress/parse-domain": "2.4.0",
"bluebird": "3.5.3",
"concat-stream": "1.6.2",
"debug": "4.3.2",
"lodash": "4.17.21",
"@cypress/parse-domain": "^2.4.0",
"bluebird": "^3.5.3",
"concat-stream": "^1.6.2",
"debug": "^4.3.2",
"lodash": "^4.17.21",
"proxy-from-env": "1.0.0"
},
"devDependencies": {
Expand Down
20 changes: 10 additions & 10 deletions packages/proxy/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
"test-unit": "yarn run-mocha \"test/unit/**/*.spec.ts\""
},
"dependencies": {
"bluebird": "3.5.3",
"charset": "1.0.1",
"common-tags": "1.8.0",
"debug": "4.3.2",
"grapheme-splitter": "1.0.4",
"iconv-lite": "0.6.2",
"lodash": "4.17.19",
"pumpify": "1.5.1",
"through": "2.3.8",
"utf8-stream": "0.0.0"
"bluebird": "^3.5.3",
"charset": "^1.0.1",
"common-tags": "^1.8.0",
"debug": "^4.3.2",
"grapheme-splitter": "^1.0.4",
"iconv-lite": "^0.6.2",
"lodash": "^4.17.19",
"pumpify": "^1.5.1",
"through": "^2.3.8",
"utf8-stream": "^0.0.0"
},
"devDependencies": {
"@cypress/request": "2.88.5",
Expand Down
16 changes: 8 additions & 8 deletions packages/rewriter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"test": "mocha --reporter mocha-multi-reporters --reporter-options configFile=../../mocha-reporter-config.json"
},
"dependencies": {
"ast-types": "0.13.3",
"bluebird": "3.7.2",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"debug": "4.3.2",
"lodash": "4.17.19",
"parse5-html-rewriting-stream": "5.1.1",
"recast": "0.20.4"
"ast-types": "^0.13.3",
"bluebird": "^3.7.2",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"debug": "^4.3.2",
"lodash": "^4.17.19",
"parse5-html-rewriting-stream": "^5.1.1",
"recast": "^0.20.4"
},
"devDependencies": {
"@cypress/request-promise": "4.2.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/runner-shared/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"classnames": "2.3.1",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.2",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"mobx": "5.15.4",
"mobx-react": "6.1.8",
"mocha": "7.0.1",
Expand Down
18 changes: 9 additions & 9 deletions packages/server-ct/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"test-unit": "mocha -r @packages/ts/register test/**/*.spec.ts --config ./test/.mocharc.js --exit"
},
"dependencies": {
"bluebird": "3.5.3",
"chalk": "2.4.2",
"chokidar": "3.2.2",
"debug": "4.3.2",
"express": "4.17.1",
"http-proxy": "1.18.1",
"human-interval": "1.0.0",
"lodash": "4.17.20",
"send": "0.17.1",
"bluebird": "^3.5.3",
"chalk": "^2.4.2",
"chokidar": "^3.2.2",
"debug": "^4.3.2",
"express": "^4.17.1",
"http-proxy": "^1.18.1",
"human-interval": "^1.0.0",
"lodash": "^4.17.20",
"send": "^0.17.1",
"tslib": "^2.3.0"
},
"devDependencies": {
Expand Down
Loading

1 comment on commit 6b3ab13

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 6b3ab13 Jul 6, 2021

Choose a reason for hiding this comment

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

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/7.7.0/circle-develop-6b3ab13a7836b76c659b62efb959fc768a10814a/cypress.tgz

Please sign in to comment.