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

Commit 0e3a3a8

Browse files
committed
Merge pull request #856 from spmjs/option-skip
add skip
2 parents 39ab656 + 28eec7a commit 0e3a3a8

File tree

8 files changed

+47
-2
lines changed

8 files changed

+47
-2
lines changed

bin/spm-build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ commander
1717
.option('-f, --force', 'force option')
1818
.option('--include [include]', 'determine which files will be included, optional: self, relative, all, standalone')
1919
.option('--ignore [ignore]', 'determine which id will not be transported')
20+
.option('--skip [skip]', 'determine which id will not be parsed when analyse')
2021
.option('--idleading [idleading]', 'prefix of module name, default: {{name}}/{{version}}')
2122
.option('--zip', 'archive by zip')
2223
.parse(process.argv);
@@ -41,6 +42,7 @@ var args = {
4142
cwd: commander.inputDirectory,
4243
include: commander.include,
4344
ignore: commander.ignore,
45+
skip: commander.skip,
4446
idleading: commander.idleading,
4547
zip: commander.zip,
4648
force: commander.force,

lib/build.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ function build(args, cb) {
4040
// add package info
4141
try {
4242
var pkg = new Package(args.cwd, {
43-
extraDeps: {handlebars: 'handlebars-runtime'}
43+
extraDeps: {handlebars: 'handlebars-runtime'},
44+
skip: args.skip
4445
});
4546
log.info('package', 'analyse infomation');
4647
log.info('package', 'dependencies: ' + Object.keys(pkg.dependencies));

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"serve-spm": "^0.3.1",
5656
"spmrc": "~1.0.0",
5757
"tar": "~0.1.19",
58-
"umi": "~0.3.0",
58+
"umi": "~0.4.0",
5959
"vinyl-source-stream": "~0.1.0",
6060
"win-spawn": "~2.0.0"
6161
},

tests/build.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,19 @@ describe('build', function() {
184184
});
185185
});
186186

187+
it('can ignore when parse', function(done) {
188+
var opt = {
189+
cwd: join(base, 'ignore'),
190+
dest: dest,
191+
skip: ['crypto']
192+
};
193+
build(opt, function(err) {
194+
should.not.exist(err);
195+
assets('ignore', dest);
196+
done();
197+
});
198+
});
199+
187200
function assets(prefix, dest) {
188201
var expect = join(base, 'expect', prefix);
189202
glob.sync('**/*', {cwd: expect})
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
define("a/1.0.0/index-debug", [], function(require, exports, module) {
2+
(function() {
3+
var _rng;
4+
if (typeof require === 'function') {
5+
try {
6+
var _rb = require("crypto").randomBytes;
7+
_rng = _rb && function() {
8+
return _rb(16);
9+
};
10+
} catch (e) {}
11+
}
12+
})();
13+
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
define("a/1.0.0/index",[],function(n){!function(){var t;if("function"==typeof n)try{var c=n("crypto").randomBytes;t=c&&function(){return c(16)}}catch(f){}}()});

tests/build/ignore/index.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
(function() {
2+
var _rng;
3+
if (typeof require === 'function') {
4+
try {
5+
var _rb = require('crypto').randomBytes;
6+
_rng = _rb && function() {
7+
return _rb(16);
8+
};
9+
} catch (e) {}
10+
}
11+
})();

tests/build/ignore/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "a",
3+
"version": "1.0.0"
4+
}

0 commit comments

Comments
 (0)