From 528d91bc3f1d709a77b94289e303ad03771c5c84 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 30 Nov 2022 18:37:52 -0600 Subject: [PATCH] fix build --- .../binary/binary-integrity-check-source.js | 8 +- .../v8-snapshot/src/blueprint/set-globals.js | 6 +- yarn.lock | 104 +++++++++--------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/scripts/binary/binary-integrity-check-source.js b/scripts/binary/binary-integrity-check-source.js index 95e1453807d7..5577614e752b 100644 --- a/scripts/binary/binary-integrity-check-source.js +++ b/scripts/binary/binary-integrity-check-source.js @@ -32,11 +32,11 @@ const stackIntegrityCheck = function stackIntegrityCheck (options) { const expectedFileName = options.stackToMatch[index].fileName const actualFileName = stack[index].getFileName() - if (expectedFunctionName && !actualFunctionName.endsWith(expectedFunctionName)) { + if (expectedFunctionName && actualFunctionName !== expectedFunctionName) { throw new Error(`Integrity check failed with expected function name ${expectedFunctionName} but got ${actualFunctionName}`) } - if (!actualFileName.endsWith(expectedFileName)) { + if (expectedFileName && actualFileName !== expectedFileName) { throw new Error(`Integrity check failed with expected file name ${expectedFileName} but got ${actualFileName}`) } } @@ -81,7 +81,7 @@ function validateCrypto (crypto) { } // eslint-disable-next-line no-unused-vars -function fileIntegrityCheck (options) { +function integrityCheck (options) { const require = options.require const electron = require('electron') const fs = require('fs') @@ -99,7 +99,7 @@ function fileIntegrityCheck (options) { stackIntegrityCheck({ stackToMatch: [ { - functionName: 'fileIntegrityCheck', + functionName: 'integrityCheck', fileName: '', }, { diff --git a/tooling/v8-snapshot/src/blueprint/set-globals.js b/tooling/v8-snapshot/src/blueprint/set-globals.js index ce70612cfba4..799b86b0f1cb 100644 --- a/tooling/v8-snapshot/src/blueprint/set-globals.js +++ b/tooling/v8-snapshot/src/blueprint/set-globals.js @@ -67,9 +67,9 @@ __pathResolver = newPathResolver require = nodeRequire - if (typeof fileIntegrityCheck === 'function') { - // eslint-disable-next-line no-undef - fileIntegrityCheck({ require, pathResolver: __pathResolver }) + if (typeof integrityCheck === 'function') { + // eslint-disable-next-line no-undef + integrityCheck({ require, pathResolver: __pathResolver }) } } })() diff --git a/yarn.lock b/yarn.lock index e51c0268d416..1b63b286143b 100644 --- a/yarn.lock +++ b/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.1": - 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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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/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/unique-selector@0.4.4": version "0.4.4"