Skip to content
This repository was archived by the owner on Aug 7, 2019. It is now read-only.

Fix bug when installing jam using NPM v3 #170

Open
jpstevens wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug when installing jam using NPM v3 #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions lib/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,15 @@ exports.writeMeta = function (package_dir, data, callback) {

// adds RequireJS to project directory
exports.makeRequireJS = function (package_dir, config, callback) {
var source = path.resolve(__dirname,'../node_modules/requirejs/require.js');
var dest = path.resolve(package_dir, 'require.js');
logger.info('updating', path.relative(process.cwd(), dest));
fs.readFile(source, function (err, content) {
if (err) {
return callback(err);
}
try {
var dest = path.resolve(package_dir, 'require.js');
logger.info('updating', path.relative(process.cwd(), dest));
var content = require('requirejs/require.js');
var src = content.toString() + '\n' + config;
fs.writeFile(dest, src, callback);
});
} catch (err) {
return callback(err);
}
};

exports.getAllPackages = function (dir, callback) {
Expand Down Expand Up @@ -223,15 +222,15 @@ exports.updateRequireConfig = function (package_dir, baseurl, /*opt*/rcfg, callb
version: version,
shim: shims
}

// now bring in other require.config.js options to make available
// earlier versions had variable substitution that breaks on r.js compilation
// now there is duplication - however, the original jam has been left untouched.
var cfg = _.clone(rcfg);
cfg.packages = _.union(rcfg.packages || [], packages);
cfg.shim = _.extend({}, rcfg.shim || {}, shims);
var configStr = JSON.stringify(cfg, null, 4);

var src = 'var jam = ' + JSON.stringify(data, null, 4) + ';\n' +
'\n' +
'if (typeof require !== "undefined" && require.config) {\n' +
Expand All @@ -245,7 +244,7 @@ exports.updateRequireConfig = function (package_dir, baseurl, /*opt*/rcfg, callb
'typeof module !== "undefined") {\n' +
' module.exports = jam;\n' +
'}';

var filename = path.resolve(package_dir, 'require.config.js');
mkdirp(package_dir, function (err) {
if (err) {
Expand Down