Skip to content

Commit

Permalink
fix(script): won't return if deps were loaded(defined in file)
Browse files Browse the repository at this point in the history
  • Loading branch information
popomore committed Jan 13, 2015
1 parent e9e5f15 commit 9326547
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 18 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "grunt-cmd-transport",
"description": "Transport javascript into cmd.",
"version": "0.5.0-rc.1",
"version": "0.5.0-rc.2",
"homepage": "https://github.com/spmjs/grunt-cmd-transport",
"author": {
"name": "Hsiaoming Yang",
Expand Down
25 changes: 16 additions & 9 deletions tasks/lib/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ exports.init = function(grunt) {
var iduri = require('cmd-util').iduri;
var relative = require('relative');
var md5 = require('./util').md5;
var _ = grunt.util._;

return {
jsParser: jsParser
Expand Down Expand Up @@ -218,18 +219,24 @@ exports.init = function(grunt) {
}

var parsed = ast.parse(file.contents);
var ids = parsed.map(function(meta) {
return meta.id;
});
var deps = parsed.map(function(meta) {
return meta.dependencies.map(function(id) {
id = iduri.absolute(alias, id);
id = iduri.appendext(id);
var file = getFileInfo(path.join(fbase, id));
if (!file) return;
return {
id: id,
path: file.path,
hash: file.hash,
contents: file.contents
};
// won't return if deps were loaded(defined in file)
if (!_.contains(ids, id) && !_.contains(ids, id.replace(/\.js$/, ''))) {
id = iduri.appendext(id);
var file = getFileInfo(path.join(fbase, id));
if (!file) return;
return {
id: id,
path: file.path,
hash: file.hash,
contents: file.contents
};
}
});
});
return [{
Expand Down
8 changes: 0 additions & 8 deletions test/cases/project/a-05fba13d.js.expect

This file was deleted.

9 changes: 9 additions & 0 deletions test/cases/project/a-33cd4a1a.js.expect
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
define("family/name/a-33cd4a1a", [ "./a-670b8177.handlebars", "./a-d41d8cd9.json", "./a-2cee5097.html", "./a-d41d8cd9.tpl", "./a-e1f4111c.css", "./b-0ec4c8ca", "arale/base/1.1.1/base", "arale/class/1.1.0/class", "arale/events/1.1.0/events", "alice/loading/1.0.0/loading.css", "arale/dialog/1.3.1/confirmbox", "arale/overlay/1.1.4/overlay", "arale/position/1.0.1/position", "arale/iframe-shim/1.0.2/iframe-shim", "arale/widget/1.1.1/widget", "arale/overlay/1.1.4/mask", "arale/templatable/0.9.2/templatable", "gallery/handlebars/1.0.2/handlebars", "gallery/handlebars/1.0.2/runtime" ], function(require) {
require("./a-670b8177.handlebars");
require("./a-d41d8cd9.json");
require("./a-2cee5097.html");
require("./a-d41d8cd9.tpl");
require("./a-e1f4111c.css");
require("./b-0ec4c8ca.js");
require("arale/dialog/1.3.1/confirmbox");
});

0 comments on commit 9326547

Please sign in to comment.