Skip to content

Commit

Permalink
fix winPath
Browse files Browse the repository at this point in the history
  • Loading branch information
popomore committed Jul 16, 2014
1 parent aebc1dd commit 373cea0
Show file tree
Hide file tree
Showing 24 changed files with 157 additions and 74 deletions.
3 changes: 2 additions & 1 deletion lib/plugin/include.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var File = require('vinyl');
var join = require('path').join;
var extend = require('extend');
var through = require('through2');
var winPath = require('../util').winPath;
var common = require('../common');
var getDepsPackage = common.getDepsPackage;
var getExtra = common.getExtra;
Expand All @@ -17,7 +18,7 @@ module.exports = function(opt) {
return through.obj(function(file, enc, cb) {
var self = this;
var base = file.base;
var filepath = file.relative;
var filepath = winPath(file.relative);

var endFile = file.clone();
endFile.dependentPath = file.path;
Expand Down
3 changes: 2 additions & 1 deletion lib/plugin/js.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ var template = util.template;
var isRelative = util.isRelative;
var hideExt = util.hideExt;
var resolvePath = util.resolvePath;
var winPath = util.winPath;
var common = require('../common');
var createStream = common.createStream;
var transportDeps = common.transportDeps;
Expand Down Expand Up @@ -59,7 +60,7 @@ function replace(code, fInfo, options) {
function replaceId(id, pkg, options, base) {
if (isRelative(id)) {
id = hideExt(id);
var file = resolvePath(id, base);
var file = winPath(resolvePath(id, base));
file = findFile(file, pkg.files);
return transportId(file, pkg, options);
}
Expand Down
2 changes: 1 addition & 1 deletion test/expected/transport-include-all-ignore.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define("a/1.0.0/index", ["b","c"], function(require, exports, module){
define("a/1.0.0/src/index", ["b","c"], function(require, exports, module){
require('b');
require("a/1.0.0/a");

Expand Down
2 changes: 1 addition & 1 deletion test/expected/transport-include-all-ignore2.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define("a/1.0.0/index", ["c"], function(require, exports, module){
define("a/1.0.0/src/index", ["c"], function(require, exports, module){
require("b/1.0.0/index");
require("a/1.0.0/a");

Expand Down
2 changes: 1 addition & 1 deletion test/expected/transport-include-all.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define("a/1.0.0/index", [], function(require, exports, module){
define("a/1.0.0/src/index", [], function(require, exports, module){
require("b/1.0.0/index");
require("a/1.0.0/a");

Expand Down
2 changes: 1 addition & 1 deletion test/expected/transport-include-relative-ignore.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define("a/1.0.0/index", ["b","c"], function(require, exports, module){
define("a/1.0.0/src/index", ["b","c"], function(require, exports, module){
require('b');
require("a/1.0.0/a");

Expand Down
2 changes: 1 addition & 1 deletion test/expected/transport-include-relative.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define("a/1.0.0/index", ["b/1.0.0/index","c/1.0.0/index"], function(require, exports, module){
define("a/1.0.0/src/index", ["b/1.0.0/index","c/1.0.0/index"], function(require, exports, module){
require("b/1.0.0/index");
require("a/1.0.0/a");

Expand Down
2 changes: 1 addition & 1 deletion test/expected/transport-include-self-ignore.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define("a/1.0.0/index", ["b","c","a/1.0.0/a"], function(require, exports, module){
define("a/1.0.0/src/index", ["b","c","a/1.0.0/a"], function(require, exports, module){
require('b');
require("a/1.0.0/a");

Expand Down
2 changes: 1 addition & 1 deletion test/expected/transport-include-self.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define("a/1.0.0/index", ["b/1.0.0/index","c/1.0.0/index","a/1.0.0/a"], function(require, exports, module){
define("a/1.0.0/src/index", ["b/1.0.0/index","c/1.0.0/index","a/1.0.0/a"], function(require, exports, module){
require("b/1.0.0/index");
require("a/1.0.0/a");

Expand Down
28 changes: 28 additions & 0 deletions test/expected/transport-other-ext-debug.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
define("a/1.0.0/index-debug", [], function(require, exports, module){
require("a/1.0.0/a.runtime-debug");
require("a/1.0.0/jquery.plugin-debug");
require("a/1.0.0/a-debug.tpl");
require("a/1.0.0/src/index-debug");
require("a/1.0.0/src/one.two.three-debug");

});
define("a/1.0.0/a.runtime-debug", [], function(require, exports, module){
console.log('a.runtime.js');

});
define("a/1.0.0/jquery.plugin-debug", [], function(require, exports, module){
console.log('jquery.plugin.js');

});
define("a/1.0.0/a-debug.tpl", [], function(require, exports, module){
module.exports = '<div></div>';

});
define("a/1.0.0/src/index-debug", [], function(require, exports, module){
console.log('src/index.js');

});
define("a/1.0.0/src/one.two.three-debug", [], function(require, exports, module){
console.log('src/one.two.three.js');

});
28 changes: 28 additions & 0 deletions test/expected/transport-other-ext.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
define("a/1.0.0/index", [], function(require, exports, module){
require("a/1.0.0/a.runtime");
require("a/1.0.0/jquery.plugin");
require("a/1.0.0/a.tpl");
require("a/1.0.0/src/index");
require("a/1.0.0/src/one.two.three");

});
define("a/1.0.0/a.runtime", [], function(require, exports, module){
console.log('a.runtime.js');

});
define("a/1.0.0/jquery.plugin", [], function(require, exports, module){
console.log('jquery.plugin.js');

});
define("a/1.0.0/a.tpl", [], function(require, exports, module){
module.exports = '<div></div>';

});
define("a/1.0.0/src/index", [], function(require, exports, module){
console.log('src/index.js');

});
define("a/1.0.0/src/one.two.three", [], function(require, exports, module){
console.log('src/one.two.three.js');

});
1 change: 0 additions & 1 deletion test/fixtures/check-path/a.ext

This file was deleted.

2 changes: 0 additions & 2 deletions test/fixtures/check-path/index.js

This file was deleted.

2 changes: 0 additions & 2 deletions test/fixtures/js-require-js/index.js

This file was deleted.

1 change: 1 addition & 0 deletions test/fixtures/js-require-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "a",
"version": "1.0.0",
"spm": {
"main": "src/index.js",
"dependencies": {
"b": "1.0.0"
}
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/js-require-js/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require('b');
require('../a');
1 change: 1 addition & 0 deletions test/fixtures/require-other-ext/a.runtime.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log('a.runtime.js');
1 change: 1 addition & 0 deletions test/fixtures/require-other-ext/a.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div></div>
5 changes: 5 additions & 0 deletions test/fixtures/require-other-ext/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require('./a.runtime.js');
require('./jquery.plugin');
require('./a.tpl');
require('./src');
require('./src/one.two.three');
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions test/fixtures/require-other-ext/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log('src/index.js');
1 change: 1 addition & 0 deletions test/fixtures/require-other-ext/src/one.two.three.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log('src/one.two.three.js');

0 comments on commit 373cea0

Please sign in to comment.