Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
heroku-buildpack-nodejs
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
heroku-buildpack-nodejs
Commits
862e5926
Commit
862e5926
authored
Jul 15, 2015
by
Hunter Loftis
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #246 from heroku/fix-incompat-npm-with-iojs
Fix npm custom installs with iojs
parents
7e0ef6a8
89238602
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
compile
bin/compile
+2
-1
package.json
test/fixtures/iojs/package.json
+2
-1
run
test/run
+1
-0
No files found.
CHANGELOG.md
View file @
862e5926
## v77
-
Skip npm bootstrapping with iojs
## v76
-
Fix caching issues
...
...
bin/compile
View file @
862e5926
...
...
@@ -76,11 +76,12 @@ install_bins() {
if
[
-n
"
$iojs_engine
"
]
;
then
warn_node_engine
"
$iojs_engine
"
install_iojs
"
$iojs_engine
"
"
$BUILD_DIR
/.heroku/node"
echo
"Using bundled npm version for iojs compatibility:
`
npm
--version
`
"
else
warn_node_engine
"
$node_engine
"
install_nodejs
"
$node_engine
"
"
$BUILD_DIR
/.heroku/node"
install_npm
"
$npm_engine
"
"
$BUILD_DIR
/.heroku/node"
fi
install_npm
"
$npm_engine
"
"
$BUILD_DIR
/.heroku/node"
warn_old_npm
}
...
...
test/fixtures/iojs/package.json
View file @
862e5926
...
...
@@ -10,7 +10,8 @@
"hashish"
:
"*"
},
"engines"
:
{
"iojs"
:
"1.0.x"
"iojs"
:
"1.0.x"
,
"npm"
:
"2.11.x"
},
"scripts"
:
{
"postinstall"
:
"echo
\"
detected node version:
\"
`node --version`"
...
...
test/run
View file @
862e5926
...
...
@@ -58,6 +58,7 @@ testIoJs() {
compile
"iojs"
assertCaptured
"engines.iojs (package.json): 1.0."
assertCaptured
"Downloading and installing iojs 1.0."
assertNotCaptured
"Downloading and installing npm"
assertCapturedSuccess
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment