From 689b5f1c5af731dcce9c8c10030ca8551f10cc65 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 24 Jun 2022 22:23:04 -0700 Subject: [PATCH 1/2] fix: use the bundled node-gyp in apm/npm/pnpm --- bin/apm | 4 +- bin/apm.cmd | 5 +- bin/npm | 4 +- bin/npm.cmd | 5 +- bin/pnpm | 4 +- bin/pnpm.cmd | 5 +- package.json | 4 +- pnpm-lock.yaml | 136 ++++++++++++++++++++++++------------------------- 8 files changed, 83 insertions(+), 84 deletions(-) diff --git a/bin/apm b/bin/apm index f64f042..03cdd0b 100755 --- a/bin/apm +++ b/bin/apm @@ -28,8 +28,8 @@ done binDir=`pwd -P` -# Force npm to use its builtin node-gyp -unset npm_config_node_gyp +# Force npm to use the bundled node-gyp +export npm_config_node_gyp="$SCRIPT_DIR"/../node_modules/node-gyp/bin/node-gyp.js cliPath="$binDir/../lib/cli.js" if [[ $(uname -r) == *-Microsoft ]]; then diff --git a/bin/apm.cmd b/bin/apm.cmd index 6b677d1..4dd5fee 100644 --- a/bin/apm.cmd +++ b/bin/apm.cmd @@ -12,8 +12,9 @@ if not defined apm_git_path ( if defined apm_git_path set "Path=!apm_git_path!;!PATH!" ) -:: Force npm to use its builtin node-gyp -set npm_config_node_gyp= +:: Force npm to use the bundled node-gyp +set npm_config_node_gyp="%~dp0\\..\\node_modules\\node-gyp\\bin\\node-gyp.js" +set "npm_config_node_gyp=%npm_config_node_gyp:\=/%" if exist "%~dp0\node.exe" ( "%~dp0\node.exe" "%~dp0/../lib/cli.js" %* diff --git a/bin/npm b/bin/npm index 3ac72b4..c9e8835 100755 --- a/bin/npm +++ b/bin/npm @@ -2,7 +2,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH="$SCRIPT_DIR:$PATH" -# Force npm to use its builtin node-gyp -unset npm_config_node_gyp +# Force npm to use the bundled node-gyp +export npm_config_node_gyp="$SCRIPT_DIR"/../node_modules/node-gyp/bin/node-gyp.js "$SCRIPT_DIR"/../node_modules/.bin/npm $@ diff --git a/bin/npm.cmd b/bin/npm.cmd index 791d18d..3d07e02 100644 --- a/bin/npm.cmd +++ b/bin/npm.cmd @@ -3,7 +3,8 @@ setlocal EnableDelayedExpansion set "PATH=%~dp0;%PATH%" -:: Force npm to use its builtin node-gyp -set npm_config_node_gyp= +:: Force npm to use the bundled node-gyp +set npm_config_node_gyp="%~dp0\\..\\node_modules\\node-gyp\\bin\\node-gyp.js" +set "npm_config_node_gyp=%npm_config_node_gyp:\=/%" "%~dp0\..\node_modules\.bin\npm.cmd" %* diff --git a/bin/pnpm b/bin/pnpm index 4814005..cac52e8 100755 --- a/bin/pnpm +++ b/bin/pnpm @@ -2,7 +2,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH="$SCRIPT_DIR:$PATH" -# Force npm to use its builtin node-gyp -unset npm_config_node_gyp +# Force npm to use the bundled node-gyp +export npm_config_node_gyp="$SCRIPT_DIR"/../node_modules/node-gyp/bin/node-gyp.js "$SCRIPT_DIR"/../node_modules/.bin/pnpm $@ diff --git a/bin/pnpm.cmd b/bin/pnpm.cmd index 78d6c20..70df13b 100644 --- a/bin/pnpm.cmd +++ b/bin/pnpm.cmd @@ -3,7 +3,8 @@ setlocal EnableDelayedExpansion set "PATH=%~dp0;%PATH%" -:: Force npm to use its builtin node-gyp -set npm_config_node_gyp= +:: Force npm to use the bundled node-gyp +set npm_config_node_gyp="%~dp0\\..\\node_modules\\node-gyp\\bin\\node-gyp.js" +set "npm_config_node_gyp=%npm_config_node_gyp:\=/%" "%~dp0\..\node_modules\.bin\pnpm.cmd" %* diff --git a/package.json b/package.json index fdf99ed..7271ec3 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,10 @@ "keytar": "^7.7.0", "mv": "2.1.1", "ncp": "~2.0.0", + "node-gyp": "^9.0.0", "npm": "^7.24.2", "open": "7.4.2", + "pnpm": "^6.32.23", "q": "~1.5.1", "read": "~1.0.7", "request": "^2.88.2", @@ -87,8 +89,6 @@ "gitly": "^2.1.2", "jasmine-focused": ">=1.0.7 <2.0", "node-downloader-helper": "^2.0.0", - "node-gyp": "^9.0.0", - "pnpm": "^6.32.23", "prettier": "^2.7.1", "prettier-config-atomic": "^3.0.10", "shx": "^0.3.3" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93ecd1b..1cebd35 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -79,8 +79,10 @@ importers: keytar: 7.9.0 mv: 2.1.1 ncp: 2.0.0 + node-gyp: 9.0.0 npm: 7.24.2 open: 7.4.2 + pnpm: 6.32.23 q: 1.5.1 read: 1.0.7 request: 2.88.2 @@ -123,8 +125,6 @@ importers: gitly: 2.2.0 jasmine-focused: 1.0.7 node-downloader-helper: 2.1.1 - node-gyp: 9.0.0 - pnpm: 6.32.23 prettier: 2.7.1 prettier-config-atomic: 3.0.10 shx: 0.3.4 @@ -1657,7 +1657,7 @@ packages: /@gar/promisify/1.1.3: resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==} - dev: true + dev: false /@humanwhocodes/config-array/0.9.5: resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==} @@ -1745,7 +1745,7 @@ packages: dependencies: '@gar/promisify': 1.1.3 semver: 7.3.7 - dev: true + dev: false /@npmcli/move-file/2.0.0: resolution: {integrity: sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==} @@ -1753,12 +1753,12 @@ packages: dependencies: mkdirp: 1.0.4 rimraf: 3.0.2 - dev: true + dev: false /@tootallnate/once/2.0.0: resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==} engines: {node: '>= 10'} - dev: true + dev: false /@types/async/3.2.13: resolution: {integrity: sha512-7Q3awrhnvm89OzfsmqeqRQh8mh+8Pxfgq1UvSAn2nWQ5y/F3+NrbIF0RbkWq8+5dY99ozgap2b3DNBNwjLVOxw==} @@ -2153,6 +2153,7 @@ packages: /abbrev/1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} + dev: false /accepts/1.3.8: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} @@ -2183,7 +2184,7 @@ packages: debug: 4.3.4 transitivePeerDependencies: - supports-color - dev: true + dev: false /agentkeepalive/4.2.1: resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==} @@ -2194,7 +2195,7 @@ packages: humanize-ms: 1.2.1 transitivePeerDependencies: - supports-color - dev: true + dev: false /aggregate-error/3.1.0: resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} @@ -2202,7 +2203,7 @@ packages: dependencies: clean-stack: 2.2.0 indent-string: 4.0.0 - dev: true + dev: false /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} @@ -2224,7 +2225,6 @@ packages: /ansi-regex/5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - dev: true /ansi-styles/2.2.1: resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==} @@ -2257,7 +2257,7 @@ packages: /aproba/2.0.0: resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} - dev: true + dev: false /are-we-there-yet/3.0.0: resolution: {integrity: sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==} @@ -2265,7 +2265,7 @@ packages: dependencies: delegates: 1.0.0 readable-stream: 3.6.0 - dev: true + dev: false /argparse/2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} @@ -2665,7 +2665,7 @@ packages: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} dependencies: balanced-match: 1.0.2 - dev: true + dev: false /braces/3.0.2: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} @@ -2726,7 +2726,7 @@ packages: unique-filename: 1.1.1 transitivePeerDependencies: - bluebird - dev: true + dev: false /call-bind/1.0.2: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} @@ -2829,7 +2829,7 @@ packages: /clean-stack/2.2.0: resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} engines: {node: '>=6'} - dev: true + dev: false /cli/1.0.1: resolution: {integrity: sha512-41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==} @@ -2914,7 +2914,7 @@ packages: /color-support/1.1.3: resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} hasBin: true - dev: true + dev: false /colors/1.4.0: resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==} @@ -2957,7 +2957,7 @@ packages: /console-control-strings/1.1.0: resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} - dev: true + dev: false /content-disposition/0.5.4: resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} @@ -3104,7 +3104,6 @@ packages: optional: true dependencies: ms: 2.1.2 - dev: true /decamelize/1.2.0: resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==} @@ -3161,12 +3160,12 @@ packages: /delegates/1.0.0: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} - dev: true + dev: false /depd/1.1.2: resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} engines: {node: '>= 0.6'} - dev: true + dev: false /depd/2.0.0: resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} @@ -3301,7 +3300,7 @@ packages: /emoji-regex/8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - dev: true + dev: false /emoji-regex/9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} @@ -3318,7 +3317,7 @@ packages: requiresBuild: true dependencies: iconv-lite: 0.6.3 - dev: true + dev: false optional: true /end-of-stream/1.4.4: @@ -3343,11 +3342,11 @@ packages: /env-paths/2.2.1: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} - dev: true + dev: false /err-code/2.0.3: resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} - dev: true + dev: false /error-ex/1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} @@ -4242,7 +4241,7 @@ packages: string-width: 4.2.3 strip-ansi: 6.0.1 wide-align: 1.1.5 - dev: true + dev: false /gaze/0.3.4: resolution: {integrity: sha512-vIK81ZT20o9X0LOHYDGo5Phq6FaQRjDjBN2KkbYSxlaXnN1WDH0Op0tPThqNVA8ZnmN/TYNZfGHAVkBTrdeBIQ==} @@ -4354,7 +4353,7 @@ packages: inherits: 2.0.4 minimatch: 5.1.0 once: 1.4.0 - dev: true + dev: false /globals/11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} @@ -4402,6 +4401,7 @@ packages: /graceful-fs/4.2.10: resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} + dev: false /grim/2.0.3: resolution: {integrity: sha512-FM20Ump11qYLK9k9DbL8yzVpy+YBieya1JG15OeH8s+KbHq8kL4SdwRtURwIUHniSxb24EoBUpwKfFjGNVi4/Q==} @@ -4465,7 +4465,7 @@ packages: /has-unicode/2.0.1: resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} - dev: true + dev: false /has/1.0.3: resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} @@ -4505,7 +4505,7 @@ packages: /http-cache-semantics/4.1.0: resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==} - dev: true + dev: false /http-errors/2.0.0: resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} @@ -4527,7 +4527,7 @@ packages: debug: 4.3.4 transitivePeerDependencies: - supports-color - dev: true + dev: false /http-signature/1.2.0: resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==} @@ -4546,13 +4546,13 @@ packages: debug: 4.3.4 transitivePeerDependencies: - supports-color - dev: true + dev: false /humanize-ms/1.2.1: resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==} dependencies: ms: 2.1.3 - dev: true + dev: false /iconv-lite/0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} @@ -4566,7 +4566,7 @@ packages: engines: {node: '>=0.10.0'} dependencies: safer-buffer: 2.1.2 - dev: true + dev: false optional: true /ieee754/1.2.1: @@ -4589,16 +4589,15 @@ packages: /imurmurhash/0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} - dev: true /indent-string/4.0.0: resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} engines: {node: '>=8'} - dev: true + dev: false /infer-owner/1.0.4: resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==} - dev: true + dev: false /inflight/1.0.6: resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} @@ -4641,7 +4640,7 @@ packages: /ip/1.1.8: resolution: {integrity: sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==} - dev: true + dev: false /ipaddr.js/1.9.1: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} @@ -4712,7 +4711,7 @@ packages: /is-fullwidth-code-point/3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} - dev: true + dev: false /is-glob/4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} @@ -4723,7 +4722,7 @@ packages: /is-lambda/1.0.1: resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==} - dev: true + dev: false /is-negative-zero/2.0.2: resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==} @@ -4797,7 +4796,6 @@ packages: /isexe/2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - dev: true /isstream/0.1.2: resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==} @@ -5029,7 +5027,7 @@ packages: /lru-cache/7.10.1: resolution: {integrity: sha512-BQuhQxPuRl79J5zSXRP+uNzPOyZw2oFI9JLRQ80XswSvg21KMKNtQza9eF42rfI/3Z40RvzBdXgziEkudzjo8A==} engines: {node: '>=12'} - dev: true + dev: false /make-dir/2.1.0: resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==} @@ -5062,7 +5060,7 @@ packages: transitivePeerDependencies: - bluebird - supports-color - dev: true + dev: false /mdast-util-from-markdown/1.2.0: resolution: {integrity: sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==} @@ -5343,7 +5341,7 @@ packages: engines: {node: '>=10'} dependencies: brace-expansion: 2.0.1 - dev: true + dev: false /minimist/1.2.6: resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==} @@ -5353,7 +5351,7 @@ packages: engines: {node: '>= 8'} dependencies: minipass: 3.3.3 - dev: true + dev: false /minipass-fetch/2.1.0: resolution: {integrity: sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==} @@ -5364,28 +5362,28 @@ packages: minizlib: 2.1.2 optionalDependencies: encoding: 0.1.13 - dev: true + dev: false /minipass-flush/1.0.5: resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==} engines: {node: '>= 8'} dependencies: minipass: 3.3.3 - dev: true + dev: false /minipass-pipeline/1.2.4: resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==} engines: {node: '>=8'} dependencies: minipass: 3.3.3 - dev: true + dev: false /minipass-sized/1.0.3: resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==} engines: {node: '>=8'} dependencies: minipass: 3.3.3 - dev: true + dev: false /minipass/3.3.3: resolution: {integrity: sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA==} @@ -5447,11 +5445,9 @@ packages: /ms/2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - dev: true /ms/2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - dev: true /mute-stream/0.0.8: resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==} @@ -5486,7 +5482,6 @@ packages: /negotiator/0.6.3: resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} engines: {node: '>= 0.6'} - dev: true /next-tick/1.1.0: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} @@ -5527,7 +5522,7 @@ packages: transitivePeerDependencies: - bluebird - supports-color - dev: true + dev: false /node-releases/2.0.5: resolution: {integrity: sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==} @@ -5553,7 +5548,7 @@ packages: hasBin: true dependencies: abbrev: 1.1.1 - dev: true + dev: false /normalize-package-data/2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} @@ -5655,7 +5650,7 @@ packages: console-control-strings: 1.1.0 gauge: 4.0.4 set-blocking: 2.0.0 - dev: true + dev: false /number-is-nan/1.0.1: resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==} @@ -5808,7 +5803,7 @@ packages: engines: {node: '>=10'} dependencies: aggregate-error: 3.1.0 - dev: true + dev: false /p-try/1.0.0: resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==} @@ -5895,7 +5890,7 @@ packages: resolution: {integrity: sha512-9fNpN2TmR1zBozE748it2M95BczJQkl/OsWFnlGvynTLzjEPtOlj6O+j86UwafJyCvbfa5bSzk3AyNdeu5Y2sA==} engines: {node: '>=12.17'} hasBin: true - dev: true + dev: false /prebuild-install/7.1.1: resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} @@ -5974,7 +5969,7 @@ packages: peerDependenciesMeta: bluebird: optional: true - dev: true + dev: false /promise-retry/2.0.1: resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==} @@ -5982,7 +5977,7 @@ packages: dependencies: err-code: 2.0.3 retry: 0.12.0 - dev: true + dev: false /prop-types/15.8.1: resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==} @@ -6113,6 +6108,7 @@ packages: inherits: 2.0.4 string_decoder: 1.3.0 util-deprecate: 1.0.2 + dev: false /readdirp/3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} @@ -6260,7 +6256,7 @@ packages: /retry/0.12.0: resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==} engines: {node: '>= 4'} - dev: true + dev: false /reusify/1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} @@ -6382,7 +6378,7 @@ packages: /set-blocking/2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} - dev: true + dev: false /setprototypeof/1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} @@ -6433,7 +6429,7 @@ packages: /signal-exit/3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - dev: true + dev: false /simple-concat/1.0.1: resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} @@ -6460,7 +6456,7 @@ packages: /smart-buffer/4.2.0: resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} - dev: true + dev: false /socks-proxy-agent/7.0.0: resolution: {integrity: sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==} @@ -6471,7 +6467,7 @@ packages: socks: 2.6.2 transitivePeerDependencies: - supports-color - dev: true + dev: false /socks/2.6.2: resolution: {integrity: sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==} @@ -6479,7 +6475,7 @@ packages: dependencies: ip: 1.1.8 smart-buffer: 4.2.0 - dev: true + dev: false /sort-object-keys/1.1.3: resolution: {integrity: sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==} @@ -6547,7 +6543,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: minipass: 3.3.3 - dev: true + dev: false /statuses/2.0.1: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} @@ -6570,7 +6566,7 @@ packages: emoji-regex: 8.0.0 is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 - dev: true + dev: false /string.prototype.matchall/4.0.7: resolution: {integrity: sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==} @@ -6608,6 +6604,7 @@ packages: resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} dependencies: safe-buffer: 5.2.1 + dev: false /strip-ansi/3.0.1: resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==} @@ -6620,7 +6617,6 @@ packages: engines: {node: '>=8'} dependencies: ansi-regex: 5.0.1 - dev: true /strip-bom/3.0.0: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} @@ -6880,13 +6876,13 @@ packages: resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==} dependencies: unique-slug: 2.0.2 - dev: true + dev: false /unique-slug/2.0.2: resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==} dependencies: imurmurhash: 0.1.4 - dev: true + dev: false /unist-util-stringify-position/3.0.2: resolution: {integrity: sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==} @@ -6917,6 +6913,7 @@ packages: /util-deprecate/1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + dev: false /utils-merge/1.0.1: resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=} @@ -7012,13 +7009,12 @@ packages: hasBin: true dependencies: isexe: 2.0.0 - dev: true /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} dependencies: string-width: 4.2.3 - dev: true + dev: false /window-size/0.1.4: resolution: {integrity: sha512-2thx4pB0cV3h+Bw7QmMXcEbdmOzv9t0HFplJH/Lz6yu60hXYy5RT8rUu+wlIreVxWsGN20mo+MHeCSfUpQBwPw==} From 5832fb5477852e658277e2a2a93dd91c7fef71d7 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 24 Jun 2022 23:13:55 -0700 Subject: [PATCH 2/2] fix: force npm to use the bundled node-gyp --- bin/apm | 2 +- bin/apm.cmd | 2 +- bin/npm | 2 +- bin/npm.cmd | 2 +- bin/pnpm | 2 +- bin/pnpm.cmd | 2 +- package.json | 7 ++++++- pnpm-lock.yaml | 3 +++ 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/bin/apm b/bin/apm index 03cdd0b..dd08768 100755 --- a/bin/apm +++ b/bin/apm @@ -28,7 +28,7 @@ done binDir=`pwd -P` -# Force npm to use the bundled node-gyp +# set the path to the node-gyp fallback export npm_config_node_gyp="$SCRIPT_DIR"/../node_modules/node-gyp/bin/node-gyp.js cliPath="$binDir/../lib/cli.js" diff --git a/bin/apm.cmd b/bin/apm.cmd index 4dd5fee..7056ac3 100644 --- a/bin/apm.cmd +++ b/bin/apm.cmd @@ -12,7 +12,7 @@ if not defined apm_git_path ( if defined apm_git_path set "Path=!apm_git_path!;!PATH!" ) -:: Force npm to use the bundled node-gyp +:: set the path to the node-gyp fallback set npm_config_node_gyp="%~dp0\\..\\node_modules\\node-gyp\\bin\\node-gyp.js" set "npm_config_node_gyp=%npm_config_node_gyp:\=/%" diff --git a/bin/npm b/bin/npm index c9e8835..226a740 100755 --- a/bin/npm +++ b/bin/npm @@ -2,7 +2,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH="$SCRIPT_DIR:$PATH" -# Force npm to use the bundled node-gyp +# set the path to the node-gyp fallback export npm_config_node_gyp="$SCRIPT_DIR"/../node_modules/node-gyp/bin/node-gyp.js "$SCRIPT_DIR"/../node_modules/.bin/npm $@ diff --git a/bin/npm.cmd b/bin/npm.cmd index 3d07e02..d67b768 100644 --- a/bin/npm.cmd +++ b/bin/npm.cmd @@ -3,7 +3,7 @@ setlocal EnableDelayedExpansion set "PATH=%~dp0;%PATH%" -:: Force npm to use the bundled node-gyp +:: set the path to the node-gyp fallback set npm_config_node_gyp="%~dp0\\..\\node_modules\\node-gyp\\bin\\node-gyp.js" set "npm_config_node_gyp=%npm_config_node_gyp:\=/%" diff --git a/bin/pnpm b/bin/pnpm index cac52e8..0234bdc 100755 --- a/bin/pnpm +++ b/bin/pnpm @@ -2,7 +2,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH="$SCRIPT_DIR:$PATH" -# Force npm to use the bundled node-gyp +# set the path to the node-gyp fallback export npm_config_node_gyp="$SCRIPT_DIR"/../node_modules/node-gyp/bin/node-gyp.js "$SCRIPT_DIR"/../node_modules/.bin/pnpm $@ diff --git a/bin/pnpm.cmd b/bin/pnpm.cmd index 70df13b..ff81606 100644 --- a/bin/pnpm.cmd +++ b/bin/pnpm.cmd @@ -3,7 +3,7 @@ setlocal EnableDelayedExpansion set "PATH=%~dp0;%PATH%" -:: Force npm to use the bundled node-gyp +:: set the path to the node-gyp fallback set npm_config_node_gyp="%~dp0\\..\\node_modules\\node-gyp\\bin\\node-gyp.js" set "npm_config_node_gyp=%npm_config_node_gyp:\=/%" diff --git a/package.json b/package.json index 7271ec3..c18735b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "scripts": { "build": "npm run clean.lib && npm run tsc", - "build.test": "npm run get.fixtures && shx rm -rf ./dist-spec/ && shx cp -r spec dist-spec && babel ./dist-spec --out-dir ./dist-spec", + "build.test": "npm run get.fixtures && shx rm -rf ./dist-spec/ ./native-module/build && shx cp -r spec dist-spec && babel ./dist-spec --out-dir ./dist-spec", "check-version": "node script/check-version.js", "clean.bin": "shx rm -rf bin/node_darwin_x64 bin/node.exe bin/node", "clean.lib": "shx rm -rf lib/", @@ -92,5 +92,10 @@ "prettier": "^2.7.1", "prettier-config-atomic": "^3.0.10", "shx": "^0.3.3" + }, + "pnpm": { + "overrides": { + "node-gyp": "^9.0.0" + } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1cebd35..5721411 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,8 @@ lockfileVersion: 5.4 +overrides: + node-gyp: ^9.0.0 + importers: .: