Skip to content
This repository was archived by the owner on Aug 15, 2018. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ specs := $(shell find ./tests -name '*.js' ! -path "*node_modules/*" ! -path "*s
reporter = spec
test:
./node_modules/.bin/istanbul cover \
./node_modules/.bin/_mocha -- -R ${reporter} -t 20000 ${specs}
./node_modules/.bin/_mocha -- -R ${reporter} -t 20000 ${specs} --inline-diffs

debug:
./node_modules/.bin/_mocha -R ${reporter} ${specs}
Expand Down
6 changes: 3 additions & 3 deletions lib/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,10 @@ function checkDuplicate(files, pkg) {
var versions = Object.keys(dup[k]);
if (versions.length > 1) {
log.warn('dulplicate',
'version %s of package %s have been required while building %s'.to.yellow.color,
versions.join(', '),
'%s (%s) while building %s'.to.yellow.color,
k,
file.filepath
versions.join(', '),
file.path
);
}
}
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
"gulp-jsbeautify": "~0.1.1",
"gulp-load-plugins": "~0.5.3",
"gulp-mirror": "~0.2.0",
"gulp-size2": "^0.4.0",
"gulp-template": "^1.0.0",
"gulp-transport": "~0.6.0",
"gulp-size2": "~0.4.0",
"gulp-template": "~1.0.0",
"gulp-transport": "~0.7.0",
"gulp-uglify": "~0.2.1",
"gulp-zip": "~0.3.4",
"inherits": "~1.0.0",
"inquirer": "^0.6.0",
"inquirer": "~0.6.0",
"jscoverage": "~0.3.8",
"lodash": "~2.4.1",
"mocha-browser-for-spm": "~0.2.3",
Expand All @@ -56,9 +56,9 @@
"semver": "~2.2.1",
"serve-spm": "~0.5.0",
"spm-client": "~0.2.0",
"spmrc": "^1.2.0",
"spmrc": "~1.2.0",
"tar": "~0.1.19",
"umi": "~0.5.0",
"umi": "~0.6.0",
"whoami": "~0.0.3",
"win-spawn": "~2.0.0"
},
Expand All @@ -69,7 +69,7 @@
"should": "*",
"ls-archive": "~1.0.0",
"istanbul": "*",
"muk": "^0.3.1",
"muk": "~0.3.1",
"gulp-unzip": "~0.1.1"
},
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion tests/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ describe('build', function() {
var opt = {
cwd: join(base, 'build-js'),
dest: dest,
zip: true,
zip: true
};
build(opt, function(err) {
should.not.exist(err);
Expand Down
1 change: 1 addition & 0 deletions tests/build/build-css/a.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import url("./b.css");
@import url("b");
@import url("b/extra.css");

body {
background: none;
Expand Down
1 change: 1 addition & 0 deletions tests/build/build-css/spm_modules/b/1.1.0/extra.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.extra {color:red;}
1 change: 1 addition & 0 deletions tests/build/build-js/relative.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
console.log('relative');
require('b');
require('b/src/extra');
1 change: 1 addition & 0 deletions tests/build/build-js/spm_modules/b/1.1.0/src/extra.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log('b-extra');
2 changes: 2 additions & 0 deletions tests/build/expect/build-css-all/a/1.0.0/a-debug.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ li {
color: red;
}

.extra {color:red;}

body {
background: none;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/build/expect/build-css-all/a/1.0.0/a.css
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ul{margin:0}li{color:red}body{background:0 0}
ul{margin:0}.extra,li{color:red}body{background:0 0}
4 changes: 2 additions & 2 deletions tests/build/expect/build-css-all/a/1.0.0/index-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define("a/1.0.0/index-debug", [], function(require, exports, module) {
require("a/1.0.0/a-debug.css.js");
});
define("a/1.0.0/a-debug.css.js", [], function(require, exports, module) {
require("import-style/1.0.0/index-debug")('ul{margin:0;}li{color:blue;}li{color:red;}body{background:none;}');
require("import-style/1.0.0/index-debug")('ul{margin:0;}li{color:blue;}li{color:red;}.extra{color:red;}body{background:none;}');
});
define("import-style/1.0.0/index-debug", [], function(require, exports, module) {
/**
Expand Down Expand Up @@ -47,4 +47,4 @@ define("import-style/1.0.0/index-debug", [], function(require, exports, module)
styleNode = element;
}
}
});
});
2 changes: 1 addition & 1 deletion tests/build/expect/build-css-all/a/1.0.0/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions tests/build/expect/build-css/a/1.0.0/a-debug.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ li {
color: red;
}

.extra {color:red;}

body {
background: none;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/build/expect/build-css/a/1.0.0/a.css
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ul{margin:0}li{color:red}body{background:0 0}
ul{margin:0}.extra,li{color:red}body{background:0 0}
4 changes: 2 additions & 2 deletions tests/build/expect/build-css/a/1.0.0/index-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ define("a/1.0.0/index-debug", ["import-style/1.0.0/index-debug"], function(requi
require("a/1.0.0/a-debug.css.js");
});
define("a/1.0.0/a-debug.css.js", ["import-style/1.0.0/index-debug"], function(require, exports, module) {
require("import-style/1.0.0/index-debug")('ul{margin:0;}li{color:blue;}li{color:red;}body{background:none;}');
});
require("import-style/1.0.0/index-debug")('ul{margin:0;}li{color:blue;}li{color:red;}.extra{color:red;}body{background:none;}');
});
2 changes: 1 addition & 1 deletion tests/build/expect/build-css/a/1.0.0/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ define("a/1.0.0/index-debug", ["b", "c", "d"], function(require, exports, module
define("a/1.0.0/relative-debug", ["b", "c", "d"], function(require, exports, module) {
console.log('relative');
require('b');
require("b/src/extra.js");
});
define("d/0.1.1/index-debug", [], function(require, exports, module) {
exports.d = function() {
Expand Down
2 changes: 1 addition & 1 deletion tests/build/expect/build-js-all-ignore/a/1.0.0/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion tests/build/expect/build-js-all/a/1.0.0/index-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ define("a/1.0.0/index-debug", [], function(require, exports, module) {
define("a/1.0.0/relative-debug", [], function(require, exports, module) {
console.log('relative');
require("b/1.1.0/src/b-debug");
require("b/1.1.0/src/extra-debug");
});
define("b/1.1.0/src/b-debug", [], function(require, exports, module) {
require("c/1.1.1/index-debug");
Expand All @@ -21,8 +22,11 @@ define("d/0.1.0/index-debug", [], function(require, exports, module) {
define("b/1.1.0/src/b-debug.tpl", [], function(require, exports, module) {
module.exports = '<div></div>';
});
define("b/1.1.0/src/extra-debug", [], function(require, exports, module) {
console.log('b-extra');
});
define("d/0.1.1/index-debug", [], function(require, exports, module) {
exports.d = function() {
console.log('0.1.1');
};
});
});
2 changes: 1 addition & 1 deletion tests/build/expect/build-js-all/a/1.0.0/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
define("a/1.0.0/relative-debug", [], function(require, exports, module) {
console.log('relative');
require("b/1.1.0/src/b-debug");
require("b/1.1.0/src/extra-debug");
});
define("b/1.1.0/src/b-debug", [], function(require, exports, module) {
require("c/1.1.1/index-debug");
Expand All @@ -97,10 +98,13 @@
define("b/1.1.0/src/b-debug.tpl", [], function(require, exports, module) {
module.exports = '<div></div>';
});
define("b/1.1.0/src/extra-debug", [], function(require, exports, module) {
console.log('b-extra');
});
define("d/0.1.1/index-debug", [], function(require, exports, module) {
exports.d = function() {
console.log('0.1.1');
};
});
require("a/1.0.0/index-debug");
})();
})();
2 changes: 1 addition & 1 deletion tests/build/expect/build-js-standalone/a/1.0.0/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c", "d", "d/0.1.1/index-debug"], function(require, exports, module) {
define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c", "d", "b/1.1.0/src/extra-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
require("a/1.0.0/relative-debug");
require("d/0.1.1/index-debug");
});
define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c", "d"], function(require, exports, module) {
define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c", "d", "b/1.1.0/src/extra-debug"], function(require, exports, module) {
console.log('relative');
require("b/1.1.0/src/b-debug");
require("b/1.1.0/src/extra-debug");
});

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions tests/build/expect/build-js-with-deps/a/1.0.0/index-debug.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "b/1.1.0/src/extra-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
require("a/1.0.0/relative-debug");
require("d/0.1.1/index-debug");
});
define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug"], function(require, exports, module) {
define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "b/1.1.0/src/extra-debug"], function(require, exports, module) {
console.log('relative');
require("b/1.1.0/src/b-debug");
require("b/1.1.0/src/extra-debug");
});
2 changes: 1 addition & 1 deletion tests/build/expect/build-js-with-deps/a/1.0.0/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions tests/build/expect/build-js/a/1.0.0/index-debug.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "b/1.1.0/src/extra-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
require("a/1.0.0/relative-debug");
require("d/0.1.1/index-debug");
});
define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug"], function(require, exports, module) {
define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "b/1.1.0/src/extra-debug"], function(require, exports, module) {
console.log('relative');
require("b/1.1.0/src/b-debug");
});
require("b/1.1.0/src/extra-debug");
});
2 changes: 1 addition & 1 deletion tests/build/expect/build-js/a/1.0.0/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.