mirror of
https://github.com/meteor/meteor.git
synced 2026-01-10 08:08:24 -05:00
Revert "Fix npm@5.4.0 +x permissions-stripping bug until next pacote release."
This reverts commit 3431b5b81f.
This commit is contained in:
@@ -12,10 +12,6 @@ var packageJson = {
|
||||
// Explicit dependency because we are replacing it with a bundled version
|
||||
// and we want to make sure there are no dependencies on a higher version
|
||||
npm: "5.4.0",
|
||||
// Temporarily fix https://github.com/npm/npm/issues/18324 by pulling
|
||||
// in https://github.com/zkat/pacote/pull/117. Note that this will
|
||||
// require removing node_modules/npm/node_modules/pacote.
|
||||
pacote: "https://github.com/zkat/pacote/tarball/8d619787e9e937c7a22601b025f1aa043a33c853",
|
||||
"node-gyp": "3.6.2",
|
||||
"node-pre-gyp": "0.6.36",
|
||||
"meteor-babel": "0.24.6",
|
||||
|
||||
@@ -164,15 +164,6 @@ cp "$DIR\mongodb\$mongo_name\bin\mongo.exe" $DIR\mongodb\bin
|
||||
rm -Recurse -Force $mongo_zip
|
||||
rm -Recurse -Force "$DIR\mongodb\$mongo_name"
|
||||
|
||||
# Since we install a patched version of pacote in $DIR\lib\node_modules,
|
||||
# we need to remove npm's bundled version to make it use the new one.
|
||||
# https://github.com/npm/npm/issues/18324
|
||||
# https://github.com/zkat/pacote/pull/117
|
||||
cd "$DIR\lib\node_modules"
|
||||
if (Test-Path "pacote") {
|
||||
rm -Recurse -Force "npm\node_modules\pacote"
|
||||
}
|
||||
|
||||
cd $DIR
|
||||
|
||||
# mark the version
|
||||
|
||||
@@ -159,15 +159,6 @@ pushd npm/node_modules
|
||||
ln -s ../../node-gyp ./
|
||||
popd
|
||||
|
||||
# Since we install a patched version of pacote in $DIR/lib/node_modules,
|
||||
# we need to remove npm's bundled version to make it use the new one.
|
||||
# https://github.com/npm/npm/issues/18324
|
||||
# https://github.com/zkat/pacote/pull/117
|
||||
if [ -d "pacote" ]
|
||||
then
|
||||
delete npm/node_modules/pacote
|
||||
fi
|
||||
|
||||
delete sqlite3/deps
|
||||
delete sqlite3/node_modules/node-pre-gyp
|
||||
delete wordwrap/test
|
||||
|
||||
Reference in New Issue
Block a user