Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use hoisted yarn install in binary build #17285

Merged
merged 28 commits into from Nov 20, 2021
Merged

feat: use hoisted yarn install in binary build #17285

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
82ae155
refactor: Loosen semver ranges for deps
tgriesser Jun 30, 2021
c087047
refactor: rename binary script files js -> ts
tgriesser Jun 30, 2021
d740c5f
refactor: update binary script files to be more procedural
tgriesser Jun 30, 2021
1a70c77
refactor: additional script cleanups
tgriesser Jun 30, 2021
b6c6584
yarn lock
tgriesser Jul 12, 2021
e06433b
Update circle/appveyor scripts to build binary
tgriesser Jul 12, 2021
8bc278c
fix mac build
tgriesser Jul 12, 2021
ceedf1e
Fix appveyor?
tgriesser Jul 12, 2021
72a8a77
Merge branch 'develop' into tgriesser/build/root-yarn-install
tgriesser Nov 18, 2021
e3505ee
yarn fix
tgriesser Nov 18, 2021
b6d9310
fix
tgriesser Nov 18, 2021
7f6a9a8
Fix deps
tgriesser Nov 18, 2021
fa8a9cb
Fix
tgriesser Nov 18, 2021
a32e015
fix: revert the semver changes
tgriesser Nov 18, 2021
d66c467
Reorder signing to see if the issue is ffmpeg or all packages
tgriesser Nov 19, 2021
fcc6c01
consolidate lodash versions, don't double-sign items
tgriesser Nov 19, 2021
f2c3d20
Merge branch 'develop' into tgriesser/build/root-yarn-install
tgriesser Nov 19, 2021
46b68ba
^ for debug, bluebird, update electron binary build helpers
tgriesser Nov 19, 2021
5262472
Remove ^ for Bluebird, add app.js for validation
tgriesser Nov 19, 2021
129441d
Revert bundler, add fsevents .node file to binaries
tgriesser Nov 19, 2021
96c3c14
bump electron-builder, electron-notarize
tgriesser Nov 19, 2021
ce8cdc4
fix review
tgriesser Nov 19, 2021
d1b7ce5
Fix #19013, use correct env var for cdn install
tgriesser Nov 20, 2021
e74a183
Allow for prerelease branches with slashes in the git branch name
tgriesser Nov 20, 2021
f39d314
Remove unused dependency
tgriesser Nov 20, 2021
ea65f31
Merge branch 'develop' into tgriesser/build/root-yarn-install
tgriesser Nov 20, 2021
00d15bd
remove branch from appveyor
tgriesser Nov 20, 2021
a2c3255
Fix webpack tests
tgriesser Nov 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions __snapshots__/packages-spec.js
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions appveyor.yml
View file
Open in desktop
Expand Up @@ -2,6 +2,8 @@ branches:
only:
- master
- develop
- windows-code-signing
- tgriesser/build/root-yarn-install
- 9.0-release
- /win*/

Expand Down
1 change: 1 addition & 0 deletions circle.yml
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@ macBuildFilters: &macBuildFilters
branches:
only:
- develop
- tgriesser/build/root-yarn-install
mjhenkes marked this conversation as resolved.
Show resolved Hide resolved
- 9.0-release

defaults: &defaults
Expand Down
3 changes: 1 addition & 2 deletions cli/package.json
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
"@types/sizzle": "^2.3.2",
"arch": "^2.2.0",
"blob-util": "^2.0.2",
"bluebird": "^3.7.2",
"bluebird": "3.7.2",
"cachedir": "^2.3.0",
"chalk": "^4.1.0",
"check-more-types": "^2.24.0",
Expand Down Expand Up @@ -71,7 +71,6 @@
"@types/chai": "4.2.15",
"@types/chai-jquery": "1.1.40",
"@types/jquery": "3.3.31",
"@types/lodash": "4.14.168",
tgriesser marked this conversation as resolved.
Show resolved Hide resolved
"@types/minimatch": "3.0.3",
"@types/mocha": "8.0.3",
"@types/sinon": "7.5.1",
Expand Down
14 changes: 1 addition & 13 deletions electron-builder.json
View file
Open in desktop
Expand Up @@ -9,19 +9,7 @@
"hardenedRuntime": true,
"entitlements": "./scripts/entitlements.mac.inherit.plist",
"entitlementsInherit": "./scripts/entitlements.mac.inherit.plist",
"type": "distribution",
"binaries": [
flotwig marked this conversation as resolved.
Show resolved Hide resolved
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/babel-plugin-add-module-exports/node_modules/fsevents/build/Release/.node",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/babel-plugin-add-module-exports/node_modules/fsevents/build/Release/fse.node",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/@ffmpeg-installer/darwin-x64/ffmpeg",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/watchpack-chokidar2/node_modules/fsevents/build/Release/.node",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/watchpack-chokidar2/node_modules/fsevents/build/Release/fse.node",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/registry-js/build/Release/registry.node",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/term-size/vendor/macos/term-size",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/trash/lib/macos-trash",
"./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/fsevents/fsevents.node",
"./build/mac/Cypress.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Helpers/chrome_crashpad_handler"
]
"type": "distribution"
},
"linux": {
"target": "dir",
Expand Down
2 changes: 1 addition & 1 deletion npm/angular/package.json
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
},
"dependencies": {
"@cypress/mount-utils": "0.0.0-development",
"debug": "4.3.2"
"debug": "^4.3.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1102.12",
Expand Down
2 changes: 1 addition & 1 deletion npm/create-cypress-tests/package.json
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
"@babel/plugin-transform-typescript": "^7.2.0",
"@babel/template": "^7.5.4",
"@babel/types": "^7.5.0",
"bluebird": "^3.7.2",
"bluebird": "3.7.2",
"chalk": "4.1.0",
"cli-highlight": "2.1.10",
"commander": "6.1.0",
Expand Down
2 changes: 1 addition & 1 deletion npm/eslint-plugin-dev/package.json
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
"test": "jest"
},
"dependencies": {
"bluebird": "^3.5.5",
"bluebird": "3.5.5",
"chalk": "^2.4.2",
"eslint-rule-composer": "^0.3.0",
"lodash": "^4.17.15",
Expand Down
4 changes: 2 additions & 2 deletions npm/react/package.json
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
},
"dependencies": {
"@cypress/mount-utils": "0.0.0-development",
"debug": "4.3.2",
"debug": "^4.3.2",
"find-webpack": "2.2.1",
"find-yarn-workspace-root": "2.0.0"
},
Expand Down Expand Up @@ -66,7 +66,7 @@
"date-fns": "2.13.0",
"framer-motion": "2.6.13",
"i18next": "19.7.0",
"lodash": "4.17.15",
"lodash": "^4.17.15",
"mobx": "6.0.0",
"mobx-react-lite": "3.0.0",
"mocha-junit-reporter": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion npm/vue/package.json
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@
"babel-preset-typescript-vue3": "^2.0.14",
"css-loader": "3.4.2",
"cypress": "0.0.0-development",
"debug": "4.3.2",
"debug": "^4.3.2",
"eslint-plugin-vue": "^6.2.2",
"find-webpack": "2.1.0",
"mocha": "7.1.1",
Expand Down
2 changes: 1 addition & 1 deletion npm/webpack-dev-server/package.json
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
"watch": "tsc -w"
},
"dependencies": {
"debug": "4.3.2",
"debug": "^4.3.2",
"semver": "^7.3.4",
"webpack-merge": "^5.4.0"
},
Expand Down
4 changes: 2 additions & 2 deletions npm/webpack-preprocessor/package.json
View file
Open in desktop
Expand Up @@ -20,8 +20,8 @@
"watch": "yarn build --watch"
},
"dependencies": {
"bluebird": "^3.7.1",
"debug": "4.3.2",
"bluebird": "3.7.1",
"debug": "^4.3.2",
"lodash": "^4.17.20"
},
"devDependencies": {
Expand Down
12 changes: 5 additions & 7 deletions package.json
View file
Open in desktop
Expand Up @@ -88,7 +88,7 @@
"@types/execa": "0.9.0",
"@types/fs-extra": "^8.0.1",
"@types/glob": "7.1.1",
"@types/lodash": "4.14.168",
"@types/lodash": "^4.14.168",
"@types/markdown-it": "0.0.9",
"@types/mini-css-extract-plugin": "1.2.3",
"@types/mocha": "8.0.3",
Expand All @@ -115,10 +115,10 @@
"commander": "6.2.1",
"common-tags": "1.8.0",
"conventional-recommended-bump": "6.1.0",
"debug": "4.3.2",
"debug": "^4.3.2",
"del": "3.0.0",
"electron-builder": "22.9.1",
"electron-notarize": "1.0.0",
"electron-builder": "^22.13.1",
"electron-notarize": "^1.1.1",
"enzyme-adapter-react-16": "1.12.1",
"eslint": "7.22.0",
"eslint-plugin-cypress": "2.11.2",
Expand Down Expand Up @@ -154,7 +154,7 @@
"lerna": "3.20.2",
"lint-staged": "11.1.2",
"listr2": "3.8.3",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"make-empty-github-commit": "cypress-io/make-empty-github-commit#4a592aedb776ba2f4cc88979055315a53eec42ee",
"minimist": "1.2.5",
"mocha": "3.5.3",
Expand Down Expand Up @@ -226,8 +226,6 @@
"system-tests"
],
"nohoist": [
"**/@ffmpeg-installer",
"**/@ffmpeg-installer/**",
"**/webpack-preprocessor/babel-loader",
"**/webpack-batteries-included-preprocessor/ts-loader",
"**/@vue/runtime-dom",
Expand Down
4 changes: 2 additions & 2 deletions packages/config/package.json
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@
"dependencies": {
"check-more-types": "2.24.0",
"common-tags": "1.8.0",
"debug": "4.3.2",
"lodash": "4.17.21"
"debug": "^4.3.2",
"lodash": "^4.17.21"
},
"devDependencies": {
"@packages/ts": "0.0.0-development",
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-gui/package.json
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@
"dayjs": "^1.9.3",
"gravatar": "1.8.0",
"human-interval": "1.0.0",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"markdown-it": "11.0.0",
"mobx": "5.15.4",
"mobx-react": "6.1.8",
Expand Down
5 changes: 2 additions & 3 deletions packages/driver/package.json
View file
Open in desktop
Expand Up @@ -28,7 +28,6 @@
"@types/chalk": "^2.2.0",
"@types/common-tags": "^1.8.0",
"@types/jquery.scrollto": "1.4.29",
"@types/lodash": "^4.14.168",
"@types/mocha": "^8.0.3",
"@types/underscore.string": "0.0.38",
"angular": "1.8.0",
Expand All @@ -47,7 +46,7 @@
"cors": "2.8.5",
"cypress-multi-reporters": "1.4.0",
"dayjs": "^1.10.3",
"debug": "4.3.2",
"debug": "^4.3.2",
"error-stack-parser": "2.0.6",
"errorhandler": "1.5.1",
"eventemitter2": "6.4.2",
Expand All @@ -58,7 +57,7 @@
"js-cookie": "2.2.1",
"jsdom": "14.1.0",
"json-stable-stringify": "1.0.1",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"md5": "2.3.0",
"method-override": "3.0.0",
"methods": "1.1.2",
Expand Down
Empty file added packages/electron/app/app.js
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions packages/electron/package.json
View file
Open in desktop
Expand Up @@ -17,14 +17,14 @@
"dependencies": {
"@cypress/icons": "0.7.0",
"bluebird": "3.5.3",
"debug": "4.3.2",
"electron-packager": "14.1.1",
"debug": "^4.3.2",
"fs-extra": "8.1.0",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"minimist": "1.2.5"
},
"devDependencies": {
"electron": "15.2.0",
"electron-packager": "14.1.1",
"execa": "4.1.0",
"mocha": "3.5.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/extension/package.json
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
},
"dependencies": {
"bluebird": "3.5.3",
"lodash": "4.17.21"
"lodash": "^4.17.21"
},
"devDependencies": {
"@cypress/icons": "0.7.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/https-proxy/package.json
View file
Open in desktop
Expand Up @@ -15,9 +15,9 @@
},
"dependencies": {
"bluebird": "3.5.3",
"debug": "4.3.2",
"debug": "^4.3.2",
"fs-extra": "8.1.0",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"node-forge": "0.10.0",
"semaphore": "1.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion ...uncher/lib/darwin/detection-workaround.js → ...uncher/lib/darwin/detection-workaround.ts
View file
Open in desktop
@@ -1,4 +1,4 @@
const { detect } = require('../detect')
import { detect } from '../detect'

detect(undefined, false).then((browsers) => {
// eslint-disable-next-line no-console
Expand Down
2 changes: 1 addition & 1 deletion packages/launcher/lib/darwin/util.ts
View file
Open in desktop
Expand Up @@ -115,7 +115,7 @@ export async function darwinDetectionWorkaround (): Promise<FoundBrowser[]> {
let args = ['./detection-workaround.js']

if (process.env.CYPRESS_INTERNAL_ENV === 'development') {
args = ['-r', '@packages/ts/register.js'].concat(args)
args = ['-r', '@packages/ts/register.js'].concat(['./detection-workaround.ts'])
tgriesser marked this conversation as resolved.
Show resolved Hide resolved
}

const { stdout } = await utils.execa(nodePath, args, { cwd: __dirname })
Expand Down
4 changes: 2 additions & 2 deletions packages/launcher/package.json
View file
Open in desktop
Expand Up @@ -13,10 +13,10 @@
},
"dependencies": {
"bluebird": "3.5.3",
"debug": "4.3.2",
"debug": "^4.3.2",
"execa": "4.0.0",
"fs-extra": "8.1.0",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"plist": "3.0.1",
"semver": "7.3.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/net-stubbing/package.json
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
"@types/mime-types": "2.1.0",
"is-html": "^2.0.0",
"istextorbinary": "6.0.0",
"lodash": "4.17.15",
"lodash": "^4.17.15",
"mime-types": "2.1.27",
"minimatch": "^3.0.4",
"throttle": "^1.0.3"
Expand Down
4 changes: 2 additions & 2 deletions packages/network/package.json
View file
Open in desktop
Expand Up @@ -16,9 +16,9 @@
"@cypress/parse-domain": "2.4.0",
"bluebird": "3.5.3",
"concat-stream": "1.6.2",
"debug": "4.3.2",
"debug": "^4.3.2",
"fs-extra": "8.1.0",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"node-forge": "0.10.0",
"proxy-from-env": "1.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/proxy/package.json
View file
Open in desktop
Expand Up @@ -15,10 +15,10 @@
"bluebird": "3.5.3",
"charset": "1.0.1",
"common-tags": "1.8.0",
"debug": "4.3.2",
"debug": "^4.3.2",
"grapheme-splitter": "1.0.4",
"iconv-lite": "0.6.2",
"lodash": "4.17.19",
"lodash": "^4.17.19",
"pumpify": "1.5.1",
"through": "2.3.8",
"utf8-stream": "0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/reporter/package.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"css-element-queries": "1.2.3",
"cypress-multi-reporters": "1.4.0",
"cypress-real-events": "1.4.0",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"markdown-it": "11.0.0",
"mobx": "5.15.4",
"mobx-react": "6.1.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/rewriter/package.json
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@
"bluebird": "3.7.2",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"debug": "4.3.2",
"lodash": "4.17.19",
"debug": "^4.3.2",
"lodash": "^4.17.19",
"parse5-html-rewriting-stream": "5.1.1",
"recast": "0.20.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/runner-shared/package.json
View file
Open in desktop
Expand Up @@ -21,7 +21,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
4 changes: 2 additions & 2 deletions packages/runner/package.json
View file
Open in desktop
Expand Up @@ -42,12 +42,12 @@
"classnames": "2.3.1",
"common-tags": "1.8.0",
"cross-env": "6.0.3",
"debug": "4.3.2",
"debug": "^4.3.2",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.2",
"jquery": "3.1.1",
"jsdom": "14.1.0",
"lodash": "4.17.21",
"lodash": "^4.17.21",
"mobx": "5.15.4",
"mobx-react": "6.1.8",
"mocha": "7.0.1",
Expand Down