Skip to content

Commit 9dc8f50

Browse files
committed
feat(gulp-espower): keep paths relative until the end of chain
1 parent 15e1ff4 commit 9dc8f50

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Diff for: index.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ function transform (file, encoding, opt) {
3535
var inMap = file.sourceMap;
3636
var escodegenOptions = {};
3737
var jsCode = file.contents.toString(encoding);
38-
var jsAst = esprima.parse(jsCode, {tolerant: true, loc: true, source: file.path});
38+
39+
// use file.relative to keep paths relative until the end of chain
40+
var jsAst = esprima.parse(jsCode, {tolerant: true, loc: true, source: file.relative});
41+
3942
var espowerOptions = extend(espower.defaultOptions(), opt, {
4043
destructive: true,
4144
path: file.path
@@ -45,7 +48,8 @@ function transform (file, encoding, opt) {
4548
escodegenOptions = extend(escodegenOptions, {
4649
file: file.relative,
4750
sourceMap: true,
48-
sourceMapRoot: file.base,
51+
// do not set sourceMapRoot to keep paths relative until the end of chain
52+
// sourceMapRoot: file.base,
4953
sourceMapWithCode: true
5054
});
5155
}
@@ -66,7 +70,8 @@ function transform (file, encoding, opt) {
6670
}
6771
reMap.setProperty('sources', inMap.sources);
6872
reMap.setProperty('sourcesContent', inMap.sourcesContent);
69-
reMap.setProperty('sourceRoot', file.base);
73+
// do not set sourceMapRoot to keep paths relative until the end of chain
74+
// reMap.setProperty('sourceRoot', file.base);
7075

7176
file.sourceMap = reMap.toObject();
7277
} else {

Diff for: test/test.js

-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ describe("gulp-espower", function () {
8787
],
8888
mappings: 'AAAA,IAAIA,MAAA,GAASC,OAAA,CAAQ,cAAR,CAAb,EACIC,MAAA,GAAS,MADb,EAEIC,KAAA,GAAQ,OAFZ;AAGAH,MAAA,CAAOA,MAAA,CAAAI,KAAA,CAAAJ,MAAA,CAAAK,KAAA,CAAAF,KAAA;AAAA,IAAAG,OAAA;AAAA,IAAAC,QAAA;AAAA,IAAAC,IAAA;AAAA,EAAP,EAHA;AAIAR,MAAA,CAAOS,KAAP,CAAaT,MAAA,CAAAI,KAAA,CAAAJ,MAAA,CAAAK,KAAA,CAAAH,MAAA;AAAA,IAAAI,OAAA;AAAA,IAAAC,QAAA;AAAA,IAAAC,IAAA;AAAA,EAAb,EAAqBR,MAAA,CAAAI,KAAA,CAAAJ,MAAA,CAAAK,KAAA,CAAAF,KAAA;AAAA,IAAAG,OAAA;AAAA,IAAAC,QAAA;AAAA,IAAAC,IAAA;AAAA,EAArB',
8989
file: 'example.js',
90-
sourceRoot: 'test/fixtures',
9190
sourcesContent: [ 'var assert = require(\'power-assert\'),\n truthy = \'true\',\n falsy = \'false\';\nassert(falsy);\nassert.equal(truthy, falsy);\n' ]
9291
});
9392
done();
@@ -187,7 +186,6 @@ describe("gulp-espower", function () {
187186
],
188187
mappings: 'AAAA,IAAIA,OAAA,GAAUC,OAAA,CAAQ,SAAR,CAAd,EACIC,SAAA,GAAYD,OAAA,CAAQ,wBAAR,CADhB,EAEIE,gBAAA,GAAmBF,OAAA,CAAQ,mBAAR,CAFvB,EAGIG,MAAA,GAASJ,OAAA,CAAQG,gBAAA,CAAiBC,MAAzB,EAAiCF,SAAA,EAAjC,EAA8C;AAAA,QAAEG,aAAA,EAAe;AAAA,YAAEC,MAAA,EAAQ,CAAC,QAAD,CAAV;AAAA,YAAsBC,OAAA,EAAS,CAAC,MAAD,CAA/B;AAAA,SAAjB;AAAA,KAA9C,CAHb,EAIIC,MAAA,GAAS,MAJb,EAKIC,KAAA,GAAQ,OALZ;AAMAL,MAAA,CAAOA,MAAA,CAAAM,KAAA,CAAAN,MAAA,CAAAO,KAAA,CAAAH,MAAA;AAAA,IAAAI,OAAA;AAAA,IAAAC,QAAA;AAAA,IAAAC,IAAA;AAAA,EAAP,EANA;AAOAV,MAAA,CAAOW,MAAP,CAAcX,MAAA,CAAAM,KAAA,CAAAN,MAAA,CAAAO,KAAA,CAAAF,KAAA;AAAA,IAAAG,OAAA;AAAA,IAAAC,QAAA;AAAA,IAAAC,IAAA;AAAA,EAAd,EAPA;AAQAV,MAAA,CAAOY,IAAP,CAAYZ,MAAA,CAAAM,KAAA,CAAAN,MAAA,CAAAO,KAAA,CAAAH,MAAA;AAAA,IAAAI,OAAA;AAAA,IAAAC,QAAA;AAAA,IAAAC,IAAA;AAAA,EAAZ,EAAoBV,MAAA,CAAAM,KAAA,CAAAN,MAAA,CAAAO,KAAA,CAAAF,KAAA;AAAA,IAAAG,OAAA;AAAA,IAAAC,QAAA;AAAA,IAAAC,IAAA;AAAA,EAApB',
189188
file: 'customized.js',
190-
sourceRoot: 'test/fixtures',
191189
sourcesContent: [ 'var empower = require(\'empower\'),\n formatter = require(\'power-assert-formatter\'),\n busterAssertions = require("buster-assertions"),\n refute = empower(busterAssertions.refute, formatter(), { targetMethods: { oneArg: [\'isNull\'], twoArgs: [\'same\'] } }),\n truthy = \'true\',\n falsy = \'false\';\nrefute(truthy);\nrefute.isNull(falsy);\nrefute.same(truthy, falsy);\n' ]
192190
});
193191
done();

0 commit comments

Comments
 (0)