Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 04f32b9

Browse filesBrowse files
author
Ben Newman
committed
Upgrade dev bundle npm to 2.15.1.
This is the exact version that ships with Node v4.4.4.
1 parent b2717e6 commit 04f32b9
Copy full SHA for 04f32b9

File tree

Expand file treeCollapse file tree

3 files changed

+3
-3
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+3
-3
lines changed

‎scripts/dev-bundle-tool-package.js

Copy file name to clipboardExpand all lines: scripts/dev-bundle-tool-package.js
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var packageJson = {
1111
dependencies: {
1212
// Explicit dependency because we are replacing it with a bundled version
1313
// and we want to make sure there are no dependencies on a higher version
14-
npm: "2.14.22",
14+
npm: "2.15.1",
1515
"node-gyp": "3.3.1",
1616
"node-pre-gyp": "0.6.26",
1717
"meteor-babel": "0.9.3",

‎scripts/generate-dev-bundle.ps1

Copy file name to clipboardExpand all lines: scripts/generate-dev-bundle.ps1
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$PLATFORM = "windows_x86"
44
$MONGO_VERSION = "2.6.7"
55
$NODE_VERSION = "4.4.4"
6-
$NPM_VERSION = "2.14.22"
6+
$NPM_VERSION = "2.15.1"
77
$PYTHON_VERSION = "2.7.10" # For node-gyp
88

99
# take it form the environment if exists

‎scripts/generate-dev-bundle.sh

Copy file name to clipboardExpand all lines: scripts/generate-dev-bundle.sh
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ rm -rf "$DIR/bin/npm3"
141141
# Sanity check to see if we're not breaking anything by replacing npm
142142
INSTALLED_NPM_VERSION=$(cat "$DIR/lib/node_modules/npm/package.json" |
143143
xargs -0 node -e "console.log(JSON.parse(process.argv[1]).version)")
144-
if [ "$INSTALLED_NPM_VERSION" != "2.14.22" ]; then
144+
if [ "$INSTALLED_NPM_VERSION" != "2.15.1" ]; then
145145
echo "Unexpected NPM version in lib/node_modules: $INSTALLED_NPM_VERSION"
146146
echo "We will be replacing it with our own version because the bundled node"
147147
echo "is built using PORTABLE=1, which makes npm look for node relative to"

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.