From b2b2a9713243147e3a37d601130e128f90be195d Mon Sep 17 00:00:00 2001
From: Tim Griesser <tgriesser10@gmail.com>
Date: Wed, 30 Jun 2021 18:51:37 -0400
Subject: [PATCH] refactor: additional script cleanups

---
 __snapshots__/packages-spec.js            |  9 +++++----
 scripts/after-pack-hook.js                | 13 +++++++++++++
 scripts/binary/index.js                   |  7 +------
 scripts/unit/binary/util/packages-spec.js |  3 +--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/__snapshots__/packages-spec.js b/__snapshots__/packages-spec.js
index 4c8e163f5795..861c2e4248cc 100644
--- a/__snapshots__/packages-spec.js
+++ b/__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": {
diff --git a/scripts/after-pack-hook.js b/scripts/after-pack-hook.js
index 04f9ac78dfe0..a0202046ac42 100644
--- a/scripts/after-pack-hook.js
+++ b/scripts/after-pack-hook.js
@@ -3,6 +3,7 @@ const fs = require('fs-extra')
 const { join } = require('path')
 const globby = require('globby')
 const os = require('os')
+const path = require('path')
 
 module.exports = async function (params) {
   console.log('****************************')
@@ -36,5 +37,17 @@ module.exports = async function (params) {
     await fs.copy(sourceFolder, destinationFolder)
   }
 
+  const distNodeModules = path.join(params.packager.info._appDir, 'node_modules')
+  const appNodeModules = path.join(outputFolder, 'node_modules')
+
+  console.log('copying ', distNodeModules, ' to', appNodeModules)
+
+  await fs.copy(distNodeModules, appNodeModules)
+
+  // const packages = await globby('packages/*/node_modules', {
+  //   cwd: params.packager.info._appDir,
+  //   onlyFiles: false,
+  // })
+
   console.log('all node_modules subfolders copied to', outputFolder)
 }
diff --git a/scripts/binary/index.js b/scripts/binary/index.js
index 50c21ebcc1f5..3a0237e9158a 100644
--- a/scripts/binary/index.js
+++ b/scripts/binary/index.js
@@ -71,12 +71,7 @@ const deploy = {
 
   parseOptions (argv) {
     const opts = minimist(argv, {
-      boolean: ['skip-clean'],
-      default: {
-        'skip-clean': false,
-      },
       alias: {
-        skipClean: 'skip-clean',
         zip: ['zipFile', 'zip-file', 'filename'],
       },
     })
@@ -238,7 +233,7 @@ const deploy = {
     .then(() => {
       debug('building binary: platform %s version %s', options.platform, options.version)
 
-      return build(options.platform, options.version, options)
+      return build.buildCypressApp(options)
     })
   },
 
diff --git a/scripts/unit/binary/util/packages-spec.js b/scripts/unit/binary/util/packages-spec.js
index b0c45122f3ad..a5cb2e61ca42 100644
--- a/scripts/unit/binary/util/packages-spec.js
+++ b/scripts/unit/binary/util/packages-spec.js
@@ -48,9 +48,8 @@ describe('packages', () => {
     .resolves(['./packages/coffee'])
 
     globbyStub
-    .withArgs(['package.json', 'lib', 'src/main.js'])
+    .withArgs(['lib', 'src/main.js'])
     .resolves([
-      'package.json',
       'lib/foo.js',
       'src/main.js',
     ])