Skip to content

For loader #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

For loader #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdc8c01
enhance ability for loaders
ywang1724 Sep 6, 2015
0aed94e
add loader version management
ywang1724 Sep 9, 2015
c808990
check loader exists in package.json
ywang1724 Sep 10, 2015
279c1eb
watch rebuild on dependencies
ywang1724 Sep 13, 2015
3c00799
pretty code
ywang1724 Sep 14, 2015
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
47 changes: 32 additions & 15 deletions lib/command/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ var ngraph = require('neuron-graph');
var neuron = require('neuronjs');
var util = require('util');
var MD5 = require('MD5');
var tar = require('tar');
var node_zlib = require('zlib');
var request = require('request');
var mkdirp = require('mkdirp');
var depManager = require('../util/dependency-manager.js');
var loaderUtil = require('../util/loader.js');

// @param {Object} options
// see ./lib/option/build.js for details
Expand Down Expand Up @@ -57,17 +63,22 @@ build.run = function(options, callback) {
};

build.read_cortex_config_js = function(options, callback){
// If install from cache, cortex.json will be enhanced json.
var file = node_path.join(options.cwd, 'cortex.config.js');
fs.exists(file, function(exists){
options.build_config = exists ? require(file) : {};
callback(null);
});
var self = this;
loaderUtil.getLoader(self, options, callback);
}

build.get_entries = function(options){
var pkg = options.pkg;
var entries = [].concat(pkg.entries);
if (pkg.main && !~entries.indexOf(pkg.main)) {
entries.push(pkg.main);
}
return entries;
};

build.prepare_build_type = function(options, callback){
var pkg = options.pkg;
var entries = pkg.entries;
var entries = this.get_entries(options);
var csses = pkg.css;
var file = options.file;

Expand All @@ -90,7 +101,7 @@ build.prepare_build_type = function(options, callback){
});
}

if(hasFile(entries)){
if(hasFile(entries) || depManager.getRoot(file)){
options.build_type = 'js';
}else if(hasFile(csses)){
options.build_type = 'css';
Expand Down Expand Up @@ -493,12 +504,10 @@ build.build_modules = function(options, callback) {
}

var loaders = options.build_config.loaders || [];
var loader_version = options.loader_version || {};

// `pkg.entries` must be an array
var entries = [].concat(pkg.entries);
if (pkg.main && !~entries.indexOf(pkg.main)) {
entries.push(pkg.main);
}
var entries = this.get_entries(options);

if (!entries.length) {
// Pure css package.
Expand All @@ -509,8 +518,12 @@ build.build_modules = function(options, callback) {
var to = options.to;
var self = this;

if(build_type == 'js'){
entries = [node_path.relative(options.cwd, options.file)];
if(build_type === 'js'){
entries = [];
var rootFiles = depManager.getRoot(options.file);
rootFiles.map(function (file) {
entries.push(node_path.relative(options.cwd, file));
});
}

async.eachSeries(entries, function (entry, done) {
Expand All @@ -519,11 +532,15 @@ build.build_modules = function(options, callback) {
cwd: cwd,
targetVersion: pkg.version,
pkg: options.pkg,
loaders: loaders
loaders: loaders,
loader_version: loader_version
})
.on('warn', function (warn) {
self.logger.warn(warn.message || warn);
})
.on('dependency', function(mod, parent){
depManager.add(mod, parent);
})
.parse(from, function (err, content) {
if (err) {
return done(err);
Expand Down
85 changes: 59 additions & 26 deletions lib/command/publish.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,37 +179,70 @@ publish.pack = function(options, callback) {
var file = options.tar = node_path.join(options.temp_dir, 'package.tgz');
var self = this;
var cwd = options.cwd;
var ctxCfgFile = node_path.join(cwd, 'cortex.config.js');
var ignore = [];

pf({
cwd: cwd,
pkg: options.pkg,
more: true,
ignore: '/package.json'
}, function (err, files) {
if (err) {
return callback(err);
fs.exists(ctxCfgFile, function(exists){
if (!exists) {
ignore.push('/package.json');
} else {
var pkg_file = node_path.join(cwd, 'package.json');
fs.readFile(pkg_file, 'UTF-8', function(err, data) {
if (err) {
callback(err);
}
var loader_dependencies = JSON.parse(data).dependencies;
var cortex_config = require(ctxCfgFile);
var loaders = cortex_config.loaders;
if (loaders) {
var loaderObjs = ['commonjs-loader', 'json-loader'];
loaders.map(function(loaderCfg) {
var loadersArr = loaderCfg.loader.split('!');
for (var i = 0; i < loadersArr.length; i++) {
if (loaderObjs.indexOf(loadersArr[i]) < 0) {
var loader = loadersArr[i];
loaderObjs.push(loader);
if (!loader_dependencies[loader]) {
callback(new Error('Can not find ' + loader + ' dependency in package.json'));
}
}
}
});
}
});
}

async.series([
function (done) {
self.copy(files, cwd, temp_package, done);
},
function (done) {
fse.writeJSON(
node_path.join(temp_package, 'cortex.json'),
options.pkg,
done
);
},
function (done) {
self.logger.info(self.logger.template(self.MESSAGE.COMPRESS_TARBALL, {
dir: cwd,
file: file
}));
self._pack(temp_package, file, done);
pf({
cwd: cwd,
pkg: options.pkg,
more: true,
ignore: ignore
}, function (err, files) {
if (err) {
return callback(err);
}

], callback);
async.series([
function (done) {
self.copy(files, cwd, temp_package, done);
},
function (done) {
fse.writeJSON(
node_path.join(temp_package, 'cortex.json'),
options.pkg,
done
);
},
function (done) {
self.logger.info(self.logger.template(self.MESSAGE.COMPRESS_TARBALL, {
dir: cwd,
file: file
}));
self._pack(temp_package, file, done);
}

], callback);
});
});
};

Expand Down
33 changes: 33 additions & 0 deletions lib/util/dependency-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
var dependencyTree = {};

function isArray(o) {
return Object.prototype.toString.call(o) === '[object Array]';
}

var mixArray = function(a, b) {
if (isArray(a) && isArray(b)) {
for (var i = 0; i < b.length; i++) {
if (a.indexOf(b[i]) < 0) {
a.push(b[i]);
}
}
return a;
} else {
console.log('It is not an array!');
}
};

module.exports = {
add: function(mod, root) {
if (dependencyTree[mod]) {
if (dependencyTree[mod].indexOf(root) < 0) {
dependencyTree[mod] = mixArray(dependencyTree[mod], this.getRoot(root));
}
} else {
dependencyTree[mod] = mixArray([], this.getRoot(root) ? this.getRoot(root) : [root]);
}
},
getRoot: function(mod) {
return dependencyTree[mod];
}
}
117 changes: 117 additions & 0 deletions lib/util/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
var fs = require('fs');
var node_path = require('path');
var semver = require('semver-extra');
var async = require('async');
var tar = require('tar');
var node_zlib = require('zlib');
var request = require('request');
var mkdirp = require('mkdirp');

module.exports = {
getLoader: function(self, options, callback) {
var file = node_path.join(options.cwd, 'cortex.config.js');
// If cortex.config.js exists, prepare for building loaders.
fs.exists(file, function(exists) {
options.build_config = exists ? require(file) : {};
var loaders = options.build_config.loaders;
if (loaders) {
var package_json = node_path.join(options.cwd, 'package.json');
fs.readFile(package_json, 'UTF-8', function(err, data) {
if (err) {
callback(err);
}
var loader_skip = ['commonjs-loader', 'json-loader'];
var profile_root = self.profile.get('profile_root');
var pkgDependencies = JSON.parse(data).dependencies;
options.loader_version = {}; // record loaders version for using

loaders.map(function(loaderCfg) {
var loadersArr = loaderCfg.loader.split('!');
for (var i = 0; i < loadersArr.length; i++) {
if (loader_skip.indexOf(loadersArr[i]) < 0) {
var loader_name = loadersArr[i];
var cache_package_json = node_path.join(profile_root, 'loaders', loader_name, 'cache.json');
var package_version = pkgDependencies[loader_name];
loader_skip.push(loader_name);

async.waterfall([
function getLoaderFromCache(cb) {
var cache_version;
if (fs.existsSync(cache_package_json)) {
var result = fs.readFileSync(cache_package_json, 'UTF-8');
cache_version = JSON.parse(result).version;
} else {
cache_version = [];
}
var dist_version = semver.maxSatisfying(cache_version, package_version);
if (!dist_version) {
cb(null, dist_version);
} else {
options.loader_version[loader_name] = node_path.join(profile_root, 'loaders', loader_name, dist_version, 'package');
callback(null);
}
},
function downloadLoader(dist_version, cb) {
var registry_url = options.build_config.registry + loader_name;
request(registry_url, function(error, response, body) {
if (!error && response.statusCode == 200) {
cb(null, dist_version, JSON.parse(body).versions);
} else {
cb(new Error('Can not find the module ' + loader_name + ' in your npm registry.'));
}
});
},
function cacheLoader(dist_version, registry_versions, cb) {
dist_version = semver.maxSatisfying(Object.keys(registry_versions), package_version);
options.loader_version[loader_name] = node_path.join(profile_root, 'loaders', loader_name, dist_version, 'package');
//write cache.json
var cache_json_file = {
'version': []
};
cache_json_file.version.push(dist_version);
mkdirp.sync(node_path.join(profile_root, 'loaders', loader_name));
fs.writeFileSync(cache_package_json, JSON.stringify(cache_json_file));

cb(null, registry_versions, dist_version);
},
function extractLoader(registry_versions, dist_version, cb) {
var reqUrl = registry_versions[dist_version].dist.tarball;
var pkg_root_path = node_path.join(profile_root, 'loaders', loader_name, dist_version);
var extractor = tar.Extract({
path: pkg_root_path
})
.on('end', function() {
var exec = require('child_process').exec,
child;
var opts = {
'cwd': node_path.join(pkg_root_path, 'package')
};
child = exec('npm install', opts,
function(error, stdout, stderr) {
console.log(stdout);
if (error !== null) {
callback(error);
}
callback(null);
});
});

request(reqUrl)
.pipe(node_zlib.Unzip())
.pipe(extractor);
}
], function(err, result) {
if (err) {
callback(err);
}
});
}
}
});
});
} else {
callback(null);
}
});
}
};
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"loggie": "^0.1.8",
"make-array": "^0.1.1",
"mix2": "^1.0.0",
"mkdirp": "^0.5.1",
"neuron-builder": "^4.0.0",
"neuron-graph": "^1.0.0",
"neuronjs": "^8.3.0",
Expand Down