Merge pull request #887 from DeeDeeG/upgrade-node-gyp-with-fixes

Upgrade node gyp with fixes

Author: smashwilson

.travis.yml

@@ -7,7 +7,11 @@ notifications:
     on_failure: change
 
 node_js:
-  - "10.2.1"
+  - "10.20.1"
+
+before_install: npm install -g npm
+
+install: npm install
 
 script: ./bin/npm test
 

BUNDLED_NODE_VERSION

@@ -1 +1 @@
-v10.2.1
+v10.20.1

Gruntfile.coffee

@@ -36,4 +36,4 @@ module.exports = (grunt) ->
   grunt.registerTask('lint', ['coffeelint'])
   grunt.registerTask('default', ['coffee', 'lint'])
   grunt.registerTask('test', ['clean', 'default', 'shell:test'])
-  grunt.registerTask('prepublish', ['clean', 'coffee', 'lint'])
+  grunt.registerTask('prepare', ['clean', 'coffee', 'lint'])

appveyor.yml

@@ -7,12 +7,12 @@ platform:
   - x64
 
 environment:
-  nodejs_version: "10.2.1"
+  nodejs_version: "10.20.1"
 
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
   - npm install -g npm
-  - npm install
+  - npm ci
 
 build: off
 

bin/apm

@@ -31,18 +31,6 @@ binDir=`pwd -P`
 # Force npm to use its builtin node-gyp
 unset npm_config_node_gyp
 
-export ATOM_APM_ORIGINAL_PYTHON="${PYTHON:-}"
-
-# Assumption: env iterates through environment variables in the same order that
-# process.env iterates through properties within npm. So, we take the last match.
-for var in $(env | grep -i ^npm_config_python=)
-do
-  ATOM_APM_ORIGINAL_PYTHON="${var#*=}"
-  unset ${var%%=*}
-done
-
-export npm_config_python="${binDir}/python-interceptor.sh"
-
 cliPath="$binDir/../lib/cli.js"
 if [[ $(uname -r) == *-Microsoft ]]; then
   cliPath="$(echo $cliPath | sed 's/\/mnt\/\([a-z]*\)\(.*\)/\1:\2/')"

bin/npm

@@ -5,19 +5,4 @@ export PATH="$SCRIPT_DIR:$PATH"
 # Force npm to use its builtin node-gyp
 unset npm_config_node_gyp
 
-export ATOM_APM_ORIGINAL_PYTHON="${PYTHON:-}"
-
-# Assumption: env iterates through environment variables in the same order that
-# process.env iterates through properties within npm. So, we take the last match.
-for var in $(env | grep -i ^npm_config_python=)
-do
-  ATOM_APM_ORIGINAL_PYTHON="${var#*=}"
-done
-if [ -z "${ATOM_APM_ORIGINAL_PYTHON}" ] && [ -n "${PYTHON:-}" ]
-then
-  ATOM_APM_ORIGINAL_PYTHON="${PYTHON}"
-fi
-
-export npm_config_python="${SCRIPT_DIR}/python-interceptor.sh"
-
 "$SCRIPT_DIR"/../node_modules/.bin/npm $@