attempt to fix tests

scripts/binary/smoke.js

@@ -263,9 +263,15 @@ const runIntegrityTest = async function (buildAppExecutable, buildAppDir, e2e) {
   const testCorruptingFile = async (file, errorMessage) => {
     const contents = await fs.readFile(file)
 
+    // Backup state
+    await fs.move(file, `${file}.bak`)
+
+    // Modify app
     await fs.writeFile(file, Buffer.concat([contents, Buffer.from(`\nconsole.log('modified code')`)]))
     await runErroringProjectTest(buildAppExecutable, e2e, `corrupting ${file}`, errorMessage)
-    await fs.writeFile(file, contents)
+
+    // Restore original state
+    await fs.move(`${file}.bak`, file)
   }
 
   await testCorruptingFile(path.join(buildAppDir, 'index.js'), 'Error: Integrity check failed for main index.js file')
@@ -275,14 +281,20 @@ const runIntegrityTest = async function (buildAppExecutable, buildAppDir, e2e) {
   const testAlteringEntryPoint = async (additionalCode, errorMessage) => {
     const packageJsonContents = await fs.readJSON(path.join(buildAppDir, 'package.json'))
 
+    // Backup state
+    await fs.move(path.join(buildAppDir, 'package.json'), path.join(buildAppDir, 'package.json.bak'))
+
+    // Modify app
     await fs.writeJSON(path.join(buildAppDir, 'package.json'), {
       ...packageJsonContents,
       main: 'index2.js',
     })
 
     await fs.writeFile(path.join(buildAppDir, 'index2.js'), `${additionalCode}\nrequire("./index.js")`)
     await runErroringProjectTest(buildAppExecutable, e2e, 'altering entry point', errorMessage)
-    await fs.writeJson(path.join(buildAppDir, 'package.json'), packageJsonContents, { spaces: 2 })
+
+    // Restore original state
+    await fs.move(path.join(buildAppDir, 'package.json'), path.join(buildAppDir, 'package.json.bak'))
     await fs.remove(path.join(buildAppDir, 'index2.js'))
   }
 

tooling/v8-snapshot/package.json

@@ -25,6 +25,7 @@
     "resolve-from": "^5.0.0",
     "source-map-js": "^0.6.2",
     "temp-dir": "^2.0.0",
+    "terser": "^5.7.0",
     "tslib": "^2.0.1",
     "worker-nodes": "^2.3.0"
   },

yarn.lock

@@ -2470,70 +2470,70 @@
   resolved "https://registry.yarnpkg.com/@cypress/sinon-chai/-/sinon-chai-2.9.1.tgz#1705c0341bc286740979b1b1cac89b7f5d34d6bc"
   integrity sha512-qwFQ1urghF3mv7CFSDw/LEqIQP12qqKLuW7p6mXR92HP5fPNlgNiZVITWVsupDg7JpOEKfeRTVearo9mkk/5eg==
 
-"@cypress/snapbuild-android-arm64@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-android-arm64/-/snapbuild-android-arm64-1.0.2.tgz#43d0e193c13930b8900ade8200a8aa15c0ef73c9"
-  integrity sha512-msqrFAt4ioonTsAaZbiohfYXPVlsLo3saSiO0Ko7pw9l5O1Zeiqbb6t0hNwl7OC7fYjC7anxc0jePLm0K6/New==
+"@cypress/snapbuild-android-arm64@1.0.":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-android-arm64/-/snapbuild-android-arm64-1.0.1.tgz#f4f67ee22e4dcd4738499dc6e16af6dd50dc3268"
+  integrity sha512-I8gM7t63gL78+NcP1zNQBgzsyp7xRlFiZhMzn5F0LAX/TrT8tZGctZEWNjPbl3M8JLCPtat/HrCbhaP1h+0Y4g==
 
-"@cypress/snapbuild-darwin-64@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-darwin-64/-/snapbuild-darwin-64-1.0.2.tgz#3379c2d3c09440ed29e5ea0c8b84053aa545aa49"
-  integrity sha512-9qoWohdHKb6HsMdROQBBDlT6CmJXT3FMQSbN1pQpe37S9JxYoFEiJlQ13x+MI58TeqeGrLxoMk1z1bZ78kUBNA==
+"@cypress/snapbuild-darwin-64@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-darwin-64/-/snapbuild-darwin-64-1.0.1.tgz#ce4a7b9734fcc569e5084d25deabb8a7e57c5c39"
+  integrity sha512-wOZgJ1Hp7I5hent4LLmhlh61vomkHUe7J013pjwQ6JJc+PhAjxFc3h6HocvY4IzRXR1JnvL/9yJjmyY090ahKw==
 
-"@cypress/snapbuild-darwin-arm64@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-darwin-arm64/-/snapbuild-darwin-arm64-1.0.2.tgz#d66ff4ada6322186539c669ed269bb47a740f866"
-  integrity sha512-XYj/paXiw4T4WMpcRnip/RqZNwkJv3Hdwm/KDIyD4lij4TetQuma80JtGa97P5DGZfYwdHpDlBzg6Sy3XlCL7Q==
+"@cypress/snapbuild-darwin-arm64@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-darwin-arm64/-/snapbuild-darwin-arm64-1.0.1.tgz#a98b61d2732941e69315dc83f4e1cec9b6fdd27d"
+  integrity sha512-gPYdoOzTyVcs93HTgfhMmEgcH5QP95/fAfcLeFSIVaNYhgIMg0YeyysmjLRcHdYaJ7m31px307+q6zvMYY/paw==
 
-"@cypress/snapbuild-freebsd-64@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-freebsd-64/-/snapbuild-freebsd-64-1.0.2.tgz#7890dac920fc79c9deb310b88e0a48aa90ed62cc"
-  integrity sha512-sFUFXmrVkgmXCsGAElDkvH2iSY+GozAhZqB3pkNh59Acu6baBytbBkW4G6fTUti+YOI9wDxm3nbnYQmGqHAepw==
+"@cypress/snapbuild-freebsd-64@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-freebsd-64/-/snapbuild-freebsd-64-1.0.1.tgz#dd3416a8ed04e7994285a441b329e8c141493415"
+  integrity sha512-wtW0oLRH9qjGp2oAQLEnCNXX8sUHXkY1QAUvV26TWBf7f3WODxZ7MAjSVV8L7wYKRcxUnLebcCQ/sYmbAg00cQ==
 
-"@cypress/snapbuild-freebsd-arm64@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-freebsd-arm64/-/snapbuild-freebsd-arm64-1.0.2.tgz#a3e60568cb011d3a4bb06840838361ef33940ec9"
-  integrity sha512-tQFo2uTCb4QHpPMC6aD0FyR3oJjIjM5IxDqLf0kVDI1x1zJ0fyZgyADo6npXPBpLu9VXW2wHL5yGLmzS7T5FgA==
+"@cypress/snapbuild-freebsd-arm64@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-freebsd-arm64/-/snapbuild-freebsd-arm64-1.0.1.tgz#87d821d8216d17efb9c54a73f435b9123067fe9f"
+  integrity sha512-44wIjpi3BShIFmRJd1VCj2dAO02DNxkzYDp0vdMvNRflBr2pXDWdT/TdTkj4l9vBRymQTGCPS/swjlLACCwoqg==
 
-"@cypress/snapbuild-linux-32@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-32/-/snapbuild-linux-32-1.0.2.tgz#16145141473f95401ef317e67f9add58018b9973"
-  integrity sha512-WiyHQoOVwLhf/KyvMzFQAx1WoPtKg4OX5MbcYks+O6Bl1nT5Sj8nYVm5MkreIeGSIXpCSlN1hjafVidpYx/YlA==
+"@cypress/snapbuild-linux-32@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-32/-/snapbuild-linux-32-1.0.1.tgz#ff5b0abbb84d2e1a726f9cd9145c5cfe4f2f2b1a"
+  integrity sha512-Mo74hBFwFzr//pX8OuTj3wGxLbngQDAX61gL72HOcgI33gdDXiSyvasuChs8uiH1H3BDxVUvRMxKBSbRVowF4g==
 
-"@cypress/snapbuild-linux-64@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-64/-/snapbuild-linux-64-1.0.2.tgz#cf7a37ae3f49082e617394a35c4ff77d92f7e140"
-  integrity sha512-ibye7rd4XV5qAjXt3ObDM9mnslXz7JO7G2C8Ch12hDkNOu5TaAg8qwDD+M4wpTLonplmr/SM2OH9l8498NfsUg==
+"@cypress/snapbuild-linux-64@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-64/-/snapbuild-linux-64-1.0.1.tgz#be1a0a2c83d27594a1f63c95ed26a70236e7e359"
+  integrity sha512-tYPA+O/BiRwOy97H8t7/tdWXVSBJSBHzxngRUPVioIG7Y7HCw9jkIgDV4U8l9uYhmYgDmHFeq6TaJOxmW7bMBg==
 
-"@cypress/snapbuild-linux-arm64@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-arm64/-/snapbuild-linux-arm64-1.0.2.tgz#e3dde3094a78913919bf71786fb62162e30a271c"
-  integrity sha512-jP1p2+6kpLX+TlCXl3E3xH8roM7wyzH/j2ztkFTqqHo+BqESigkJDgrepV2AwnTssc2i8BGyUr4mMW/09KUNog==
+"@cypress/snapbuild-linux-arm64@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-arm64/-/snapbuild-linux-arm64-1.0.1.tgz#f1ce2e0d13907fb8f7c936422f510175bcbb9e83"
+  integrity sha512-y8P0ZVtVtUNTInNWjmxUi0yieD4ci6Gq3zP5uirFO0bwQArEq5IqBAbXuvOY3gu6sMwgnP9bPUTkqOhFPjlJ3w==
 
-"@cypress/snapbuild-linux-arm@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-arm/-/snapbuild-linux-arm-1.0.2.tgz#67500718f9e8f15838f89e8c0c1dce4f679aac75"
-  integrity sha512-JZL2A9T7E9ILxgYJhFW1All5P6ERLpKJ78HC1G0Rar9X+cMGVFN6TCJ4rY5lpHlGFg77oIKKo028fCD/ag6lgw==
+"@cypress/snapbuild-linux-arm@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-arm/-/snapbuild-linux-arm-1.0.1.tgz#89ffb6ee61eee79f99ceb5b0ac1472b52b3f3811"
+  integrity sha512-0DPe2yE7ZpCU1y1QPps5Yiry0yvQk9EtOxnhLzI7gbKgyLo2rBekNY2Vp3/ImdiITod6sG0RjaOuFAQl5xaYcw==
 
-"@cypress/snapbuild-linux-mips64le@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-mips64le/-/snapbuild-linux-mips64le-1.0.2.tgz#86b29af61536d961951e547247b7903c72ea4614"
-  integrity sha512-ZdIcO6/lRoxxSBnC7Rytgvi1+H6flWmEVpJN72DSbWOXdq9J3tH5kNfZvBUQMmaUEot0HJocvWJw37JpI5SpQQ==
+"@cypress/snapbuild-linux-mips64le@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-mips64le/-/snapbuild-linux-mips64le-1.0.1.tgz#88b82e2381e06ea2f5e871c27c95fc89a9d538eb"
+  integrity sha512-0F40yjlA0rtuF1jyfcQgAalE8eOTysiiOr6Gpi7JYHKGajWU4/uvA25woT9pwWRyyVznGvXun6O8bSspV0FyvQ==
 
-"@cypress/snapbuild-linux-ppc64le@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-ppc64le/-/snapbuild-linux-ppc64le-1.0.2.tgz#0d69e5fc037813227aba9722dd8966a2df68a853"
-  integrity sha512-AJYB7ImnUVvIwkde0005i+5yW9F7P35XLOAY9GbXng+otwWYMpdH0OO9pLrQW8dV0L2af2ZnxNMxIl78VOFNYw==
+"@cypress/snapbuild-linux-ppc64le@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-linux-ppc64le/-/snapbuild-linux-ppc64le-1.0.1.tgz#14ebed384a0dd9591439ab9e4142d38626c55e11"
+  integrity sha512-DxQXKFI8BEjFt0id0joDNHiNIM59kZgJxO10BoArGV/xXMR2VjTHjNQRIoMD/sM6GgpJwC2gF6dRXm9LY9ej0w==
 
-"@cypress/snapbuild-windows-32@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-windows-32/-/snapbuild-windows-32-1.0.2.tgz#5b308a25bbbcffbe2f53ceba310b78f8d6a8785b"
-  integrity sha512-lxMeAuD+aNqoGiK38EclkrnA8uFB9HGe/8N1plq/rJ0PSX9AmsfsjZfcdTStoIK9ATV39J1WO5rdFwPH1SUr+g==
+"@cypress/snapbuild-windows-32@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-windows-32/-/snapbuild-windows-32-1.0.1.tgz#ca1137ee529d5250a71845de1b7eefd458d64cf9"
+  integrity sha512-FIBdE1Ie0rfhIpE5cBRwNIjcPxwOPMrZ0ppUIOXxTdBTRaSEOO5/bfsGV6Mntg/XMIJRGUGaIKmBoudcnyhkgA==
 
-"@cypress/snapbuild-windows-64@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-windows-64/-/snapbuild-windows-64-1.0.2.tgz#cdca8da74f20e5b2926a06b4d2b91ebbe444694e"
-  integrity sha512-5GPLRFLKFz6sn/Nh44s7aWpj18LQBmIh086wbVhGk4RlM29C9iDk3xobAy4WNJbAdLXZsutOT7BtkiRRlEfwtw==
+"@cypress/snapbuild-windows-64@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/snapbuild-windows-64/-/snapbuild-windows-64-1.0.1.tgz#0e03d39f91fe7724c353db863154ea8848140004"
+  integrity sha512-lEg02qY4GgaAg7An1EAJSq2AFb1L7v7sARaofyj/R0kYh8PHyOQAOF2Jn9cfI8ltveJ1mh0Nu/ayg24FpwS/sA==
 
 "@cypress/unique-selector@0.4.4":
   version "0.4.4"
@@ -4219,24 +4219,54 @@
     "@babel/runtime" "^7.7.2"
     regenerator-runtime "^0.13.3"
 
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72"
-  integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.10"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186"
-  integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==
+"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/trace-mapping@0.3.9", "@jridgewell/trace-mapping@^0.3.0":
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
+"@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
   integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
 "@kwsites/file-exists@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99"
@@ -32449,14 +32479,14 @@ terser@^4.1.2, terser@^4.6.3:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.10.0, terser@^5.7.2:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c"
-  integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==
+terser@^5.10.0, terser@^5.7.0, terser@^5.7.2:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.0.tgz#29362c6f5506e71545c73b069ccd199bb28f7f54"
+  integrity sha512-KjTV81QKStSfwbNiwlBXfcgMcOloyuRdb62/iLFPGBcVNF4EXjhdYBhYHmbJpiBrVxZhDvltE11j+LBQUxEEJg==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
 test-exclude@^5.2.3: