feat: use hoisted yarn install in binary build (#17285)

Author: tgriesser

__snapshots__/packages-spec.js

@@ -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": {

appveyor.yml

@@ -2,6 +2,7 @@ branches:
  only:
  - master
  - develop
+ - windows-code-signing
  - 9.0-release
  - /win*/
 

circle.yml

@@ -8,7 +8,6 @@ macBuildFilters: &macBuildFilters
  branches:
  only:
  - develop
- - 9.0-release
 
 defaults: &defaults
  parallelism: 1
@@ -42,7 +41,6 @@ onlyMainBranches: &onlyMainBranches
  branches:
  only:
  - develop
- - 9.0-release
  requires:
  - create-build-artifacts
 
@@ -1513,7 +1511,7 @@ jobs:
  - run:
  name: Check current branch to persist artifacts
  command: |
- if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "9.0-release" ]]; then
+ if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tgriesser/build/root-yarn-install" ]]; then
  echo "Not uploading artifacts or posting install comment for this branch."
  circleci-agent step halt
  fi
@@ -2155,7 +2153,6 @@ linux-workflow: &linux-workflow
  branches:
  only:
  - develop
- - 9.0-release
  requires:
  - build
  - test-kitchensink:
@@ -2167,7 +2164,6 @@ linux-workflow: &linux-workflow
  branches:
  only:
  - develop
- - 9.0-release
  requires:
  - build
  - create-build-artifacts:
@@ -2217,15 +2213,13 @@ linux-workflow: &linux-workflow
  branches:
  only:
  - develop
- - 9.0-release
  requires:
  - create-build-artifacts
  - test-npm-module-and-verify-binary:
  filters:
  branches:
  only:
  - develop
- - 9.0-release
  requires:
  - create-build-artifacts
  - test-binary-against-staging:
@@ -2234,7 +2228,6 @@ linux-workflow: &linux-workflow
  branches:
  only:
  - develop
- - 9.0-release
  requires:
  - create-build-artifacts
 
@@ -2259,7 +2252,6 @@ linux-workflow: &linux-workflow
  branches:
  only:
  - develop
- - 9.0-release
  requires:
  - create-build-artifacts
 
@@ -2331,7 +2323,6 @@ mac-workflow: &mac-workflow
  branches:
  only:
  - develop
- - 9.0-release
  requires:
  - darwin-create-build-artifacts
 
@@ -2343,7 +2334,6 @@ mac-workflow: &mac-workflow
  branches:
  only:
  - develop
- - 9.0-release
  requires:
  - darwin-create-build-artifacts
 

cli/lib/tasks/install.js

@@ -38,6 +38,10 @@ const getNpmArgv = () => {
 const getVersionSpecifier = (startDir = path.resolve(__dirname, '../..')) => {
  const argv = getNpmArgv()
 
+ if ((process.env.npm_package_resolved || '').endsWith('cypress.tgz')) {
+ return process.env.npm_package_resolved
+ }
+
  if (argv) {
  const tgz = _.find(argv, (t) => t.endsWith('cypress.tgz'))
 
@@ -81,7 +85,7 @@ const getVersionSpecifier = (startDir = path.resolve(__dirname, '../..')) => {
  })
 }
 
-const betaNpmUrlRe = /^\/beta\/npm\/(?<version>[0-9.]+)\/(?<artifactSlug>[^/]+)\/cypress\.tgz$/
+const betaNpmUrlRe = /^\/beta\/npm\/(?<version>[0-9.]+)\/(?<artifactSlug>.+?)\/cypress\.tgz$/
 
 // convert a prerelease NPM package .tgz URL to the corresponding binary .zip URL
 const getBinaryUrlFromPrereleaseNpmUrl = (npmUrl) => {

cli/package.json

@@ -4,6 +4,7 @@
  "private": true,
  "main": "index.js",
  "scripts": {
+ "clean": "node ./scripts/clean.js",
  "prebuild": "yarn postinstall && node ./scripts/start-build.js",
  "build": "node ./scripts/build.js",
  "dtslint": "dtslint types",
@@ -27,7 +28,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",

cli/scripts/clean.js

@@ -0,0 +1,8 @@
+const shelljs = require('shelljs')
+const { includeTypes } = require('./utils')
+
+shelljs.rm('-rf', 'build')
+
+includeTypes.map((m) => {
+ shelljs.rm('-rf', `types/${m}`)
+})

cli/scripts/post-install.js

@@ -89,7 +89,9 @@ filesToUncomment.forEach((file) => {
  const filePath = join(__dirname, '../types', file)
  const str = fs.readFileSync(filePath).toString()
 
- const result = str.split('\n').map((line) => line.substring(3)).join('\n')
+ const result = str.split('\n').map((line) => {
+ return line.startsWith('// ') ? line.substring(3) : line
+ }).join('\n')
 
  fs.writeFileSync(filePath, result)
 })

cli/test/lib/tasks/install_spec.js

@@ -472,6 +472,9 @@ describe('/lib/tasks/install', function () {
 
  expect(install._getBinaryUrlFromPrereleaseNpmUrl('https://cdn.cypress.io/beta/npm/5.1.1/circle-develop-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.tgz'))
  .to.eq('https://cdn.cypress.io/beta/binary/5.1.1/linux-x64/circle-develop-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.zip')
+
+ expect(install._getBinaryUrlFromPrereleaseNpmUrl('https://cdn.cypress.io/beta/npm/5.1.1/circle-develop/some/branch-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.tgz'))
+ .to.eq('https://cdn.cypress.io/beta/binary/5.1.1/linux-x64/circle-develop/some/branch-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.zip')
  })
 
  it('returns nothing for an invalid url', function () {
@@ -502,6 +505,14 @@ describe('/lib/tasks/install', function () {
  expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('https://foo.com/cypress.tgz')
  })
 
+ it('resolves with cypress.tgz URL if specified in npm env npm_package_resolved', async function () {
+ restoreEnv = mockedEnv({
+ npm_package_resolved: 'https://foo.com/cypress.tgz',
+ })
+
+ expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('https://foo.com/cypress.tgz')
+ })
+
  it('resolves with versionSpecifier from parent pkg.json', async function () {
  fs.readJSON.withArgs('/foo/bar/baz/package.json').resolves({
  dependencies: {

electron-builder.json

@@ -9,19 +9,7 @@
  "hardenedRuntime": true,
  "entitlements": "./scripts/entitlements.mac.inherit.plist",
  "entitlementsInherit": "./scripts/entitlements.mac.inherit.plist",
- "type": "distribution",
- "binaries": [
- "./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",

npm/angular/package.json

@@ -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",