Skip to content

Commit c12dfff

Browse files
huafuhuafu
committedSep 20, 2018
fix(windows): normalize paths
·
v29.3.025.2.1
1 parent 0141098 commit c12dfff

File tree

8 files changed

+57
-60
lines changed

8 files changed

+57
-60
lines changed
 

‎e2e/__helpers__/test-case/run-result.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default class RunResult {
5757
}
5858
get cmdLine() {
5959
return [this.context.cmd, ...this.context.args]
60-
.filter(a => !['-u', '--updateSnapshot', '--runInBand'].includes(a))
60+
.filter(a => !['-u', '--updateSnapshot', '--runInBand', '--'].includes(a))
6161
.join(' ')
6262
}
6363

‎e2e/__tests__/__snapshots__/hoisting.test.ts.snap

+13-18
Large diffs are not rendered by default.

‎e2e/__tests__/__snapshots__/source-map.test.ts.snap

+13-18
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ exports[`using template "default" should have the source maps comment 1`] = `
1212
throw new Error('WITHIN SOURCE');
1313
}
1414
exports.throwError = throwError;
15-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoibWFpbi50cyIsIm1hcHBpbmdzIjoiOztBQUFBLFNBQWdCLFVBQVU7SUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUM5QixDQUFDO0FBRkQsZ0NBRUM7QUFFRCxTQUFnQixVQUFVO0lBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUE7QUFDbEMsQ0FBQztBQUZELGdDQUVDIiwibmFtZXMiOltdLCJzb3VyY2VSb290IjoiPGN3ZD4vIiwic291cmNlcyI6WyJtYWluLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBmdW5jdGlvbiBjb25zb2xlTG9nKCkge1xuICBjb25zb2xlLmxvZygnV0lUSElOIFNPVVJDRScpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiB0aHJvd0Vycm9yKCkge1xuICB0aHJvdyBuZXcgRXJyb3IoJ1dJVEhJTiBTT1VSQ0UnKVxufVxuIl0sInZlcnNpb24iOjN9
15+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiPGN3ZD4vbWFpbi50cyIsIm1hcHBpbmdzIjoiOztBQUFBLFNBQWdCLFVBQVU7SUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUM5QixDQUFDO0FBRkQsZ0NBRUM7QUFFRCxTQUFnQixVQUFVO0lBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUE7QUFDbEMsQ0FBQztBQUZELGdDQUVDIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbIjxjd2Q+L21haW4udHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGNvbnNvbGVMb2coKSB7XG4gIGNvbnNvbGUubG9nKCdXSVRISU4gU09VUkNFJylcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRocm93RXJyb3IoKSB7XG4gIHRocm93IG5ldyBFcnJvcignV0lUSElOIFNPVVJDRScpXG59XG4iXSwidmVyc2lvbiI6M30=
1616
===[ INLINE SOURCE MAPS ]=======================================================
17-
file: main.ts
17+
file: <cwd>/main.ts
1818
mappings: >-
1919
;;AAAA,SAAgB,UAAU;IACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAC9B,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU;IACxB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;AAClC,CAAC;AAFD,gCAEC
2020
names: []
21-
sourceRoot: <cwd>/
2221
sources:
23-
- main.ts
22+
- <cwd>/main.ts
2423
sourcesContent:
2524
- |
2625
export function consoleLog() {
@@ -101,14 +100,13 @@ exports[`using template "with-babel-6" should have the source maps comment 1`] =
101100
throw new Error('WITHIN SOURCE');
102101
}
103102
exports.throwError = throwError;
104-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJtYXBwaW5ncyI6Ijs7O0FBQUEsU0FBZ0IsVUFBaEIsR0FBMEI7QUFDeEIsWUFBUSxHQUFSLENBQVksZUFBWjtBQUNEO0FBRkQsUUFBQSxVQUFBLEdBQUEsVUFBQTtBQUlBLFNBQWdCLFVBQWhCLEdBQTBCO0FBQ3hCLFVBQU0sSUFBSSxLQUFKLENBQVUsZUFBVixDQUFOO0FBQ0Q7QUFGRCxRQUFBLFVBQUEsR0FBQSxVQUFBIiwibmFtZXMiOltdLCJzb3VyY2VSb290IjoiPGN3ZD4vIiwic291cmNlcyI6WyJtYWluLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBmdW5jdGlvbiBjb25zb2xlTG9nKCkge1xuICBjb25zb2xlLmxvZygnV0lUSElOIFNPVVJDRScpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiB0aHJvd0Vycm9yKCkge1xuICB0aHJvdyBuZXcgRXJyb3IoJ1dJVEhJTiBTT1VSQ0UnKVxufVxuIl0sInZlcnNpb24iOjN9
103+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJtYXBwaW5ncyI6Ijs7O0FBQUEsU0FBZ0IsVUFBaEIsR0FBMEI7QUFDeEIsWUFBUSxHQUFSLENBQVksZUFBWjtBQUNEO0FBRkQsUUFBQSxVQUFBLEdBQUEsVUFBQTtBQUlBLFNBQWdCLFVBQWhCLEdBQTBCO0FBQ3hCLFVBQU0sSUFBSSxLQUFKLENBQVUsZUFBVixDQUFOO0FBQ0Q7QUFGRCxRQUFBLFVBQUEsR0FBQSxVQUFBIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbIjxjd2Q+L21haW4udHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGNvbnNvbGVMb2coKSB7XG4gIGNvbnNvbGUubG9nKCdXSVRISU4gU09VUkNFJylcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRocm93RXJyb3IoKSB7XG4gIHRocm93IG5ldyBFcnJvcignV0lUSElOIFNPVVJDRScpXG59XG4iXSwidmVyc2lvbiI6M30=
105104
===[ INLINE SOURCE MAPS ]=======================================================
106105
mappings: >-
107106
;;;AAAA,SAAgB,UAAhB,GAA0B;AACxB,YAAQ,GAAR,CAAY,eAAZ;AACD;AAFD,QAAA,UAAA,GAAA,UAAA;AAIA,SAAgB,UAAhB,GAA0B;AACxB,UAAM,IAAI,KAAJ,CAAU,eAAV,CAAN;AACD;AAFD,QAAA,UAAA,GAAA,UAAA
108107
names: []
109-
sourceRoot: <cwd>/
110108
sources:
111-
- main.ts
109+
- <cwd>/main.ts
112110
sourcesContent:
113111
- |
114112
export function consoleLog() {
@@ -195,14 +193,13 @@ exports[`using template "with-babel-7" should have the source maps comment 1`] =
195193
}
196194
197195
exports.throwError = throwError;
198-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsU0FBZ0IsVUFBaEIsR0FBMEI7QUFDeEIsRUFBQSxPQUFPLENBQUMsR0FBUixDQUFZLGVBQVo7QUFDRDs7QUFGRCxPQUFBLENBQUEsVUFBQSxHQUFBLFVBQUE7O0FBSUEsU0FBZ0IsVUFBaEIsR0FBMEI7QUFDeEIsUUFBTSxJQUFJLEtBQUosQ0FBVSxlQUFWLENBQU47QUFDRDs7QUFGRCxPQUFBLENBQUEsVUFBQSxHQUFBLFVBQUEiLCJuYW1lcyI6W10sInNvdXJjZVJvb3QiOiI8Y3dkPi8iLCJzb3VyY2VzIjpbIm1haW4udHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGNvbnNvbGVMb2coKSB7XG4gIGNvbnNvbGUubG9nKCdXSVRISU4gU09VUkNFJylcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRocm93RXJyb3IoKSB7XG4gIHRocm93IG5ldyBFcnJvcignV0lUSElOIFNPVVJDRScpXG59XG4iXSwidmVyc2lvbiI6M30=
196+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsU0FBZ0IsVUFBaEIsR0FBMEI7QUFDeEIsRUFBQSxPQUFPLENBQUMsR0FBUixDQUFZLGVBQVo7QUFDRDs7QUFGRCxPQUFBLENBQUEsVUFBQSxHQUFBLFVBQUE7O0FBSUEsU0FBZ0IsVUFBaEIsR0FBMEI7QUFDeEIsUUFBTSxJQUFJLEtBQUosQ0FBVSxlQUFWLENBQU47QUFDRDs7QUFGRCxPQUFBLENBQUEsVUFBQSxHQUFBLFVBQUEiLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiPGN3ZD4vbWFpbi50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gY29uc29sZUxvZygpIHtcbiAgY29uc29sZS5sb2coJ1dJVEhJTiBTT1VSQ0UnKVxufVxuXG5leHBvcnQgZnVuY3Rpb24gdGhyb3dFcnJvcigpIHtcbiAgdGhyb3cgbmV3IEVycm9yKCdXSVRISU4gU09VUkNFJylcbn1cbiJdLCJ2ZXJzaW9uIjozfQ==
199197
===[ INLINE SOURCE MAPS ]=======================================================
200198
mappings: >-
201199
;;;;;;AAAA,SAAgB,UAAhB,GAA0B;AACxB,EAAA,OAAO,CAAC,GAAR,CAAY,eAAZ;AACD;;AAFD,OAAA,CAAA,UAAA,GAAA,UAAA;;AAIA,SAAgB,UAAhB,GAA0B;AACxB,QAAM,IAAI,KAAJ,CAAU,eAAV,CAAN;AACD;;AAFD,OAAA,CAAA,UAAA,GAAA,UAAA
202200
names: []
203-
sourceRoot: <cwd>/
204201
sources:
205-
- main.ts
202+
- <cwd>/main.ts
206203
sourcesContent:
207204
- |
208205
export function consoleLog() {
@@ -282,15 +279,14 @@ exports[`using template "with-jest-22" should have the source maps comment 1`] =
282279
throw new Error('WITHIN SOURCE');
283280
}
284281
exports.throwError = throwError;
285-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoibWFpbi50cyIsIm1hcHBpbmdzIjoiOztBQUFBLFNBQWdCLFVBQVU7SUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUM5QixDQUFDO0FBRkQsZ0NBRUM7QUFFRCxTQUFnQixVQUFVO0lBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUE7QUFDbEMsQ0FBQztBQUZELGdDQUVDIiwibmFtZXMiOltdLCJzb3VyY2VSb290IjoiPGN3ZD4vIiwic291cmNlcyI6WyJtYWluLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBmdW5jdGlvbiBjb25zb2xlTG9nKCkge1xuICBjb25zb2xlLmxvZygnV0lUSElOIFNPVVJDRScpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiB0aHJvd0Vycm9yKCkge1xuICB0aHJvdyBuZXcgRXJyb3IoJ1dJVEhJTiBTT1VSQ0UnKVxufVxuIl0sInZlcnNpb24iOjN9
282+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiPGN3ZD4vbWFpbi50cyIsIm1hcHBpbmdzIjoiOztBQUFBLFNBQWdCLFVBQVU7SUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUM5QixDQUFDO0FBRkQsZ0NBRUM7QUFFRCxTQUFnQixVQUFVO0lBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUE7QUFDbEMsQ0FBQztBQUZELGdDQUVDIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbIjxjd2Q+L21haW4udHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGNvbnNvbGVMb2coKSB7XG4gIGNvbnNvbGUubG9nKCdXSVRISU4gU09VUkNFJylcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRocm93RXJyb3IoKSB7XG4gIHRocm93IG5ldyBFcnJvcignV0lUSElOIFNPVVJDRScpXG59XG4iXSwidmVyc2lvbiI6M30=
286283
===[ INLINE SOURCE MAPS ]=======================================================
287-
file: main.ts
284+
file: <cwd>/main.ts
288285
mappings: >-
289286
;;AAAA,SAAgB,UAAU;IACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAC9B,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU;IACxB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;AAClC,CAAC;AAFD,gCAEC
290287
names: []
291-
sourceRoot: <cwd>/
292288
sources:
293-
- main.ts
289+
- <cwd>/main.ts
294290
sourcesContent:
295291
- |
296292
export function consoleLog() {
@@ -368,15 +364,14 @@ exports[`using template "with-typescript-2-7" should have the source maps commen
368364
throw new Error('WITHIN SOURCE');
369365
}
370366
exports.throwError = throwError;
371-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoibWFpbi50cyIsIm1hcHBpbmdzIjoiOztBQUFBO0lBQ0UsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUM5QixDQUFDO0FBRkQsZ0NBRUM7QUFFRDtJQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUE7QUFDbEMsQ0FBQztBQUZELGdDQUVDIiwibmFtZXMiOltdLCJzb3VyY2VSb290IjoiPGN3ZD4vIiwic291cmNlcyI6WyJtYWluLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBmdW5jdGlvbiBjb25zb2xlTG9nKCkge1xuICBjb25zb2xlLmxvZygnV0lUSElOIFNPVVJDRScpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiB0aHJvd0Vycm9yKCkge1xuICB0aHJvdyBuZXcgRXJyb3IoJ1dJVEhJTiBTT1VSQ0UnKVxufVxuIl0sInZlcnNpb24iOjN9
367+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiPGN3ZD4vbWFpbi50cyIsIm1hcHBpbmdzIjoiOztBQUFBO0lBQ0UsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQTtBQUM5QixDQUFDO0FBRkQsZ0NBRUM7QUFFRDtJQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUE7QUFDbEMsQ0FBQztBQUZELGdDQUVDIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbIjxjd2Q+L21haW4udHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGNvbnNvbGVMb2coKSB7XG4gIGNvbnNvbGUubG9nKCdXSVRISU4gU09VUkNFJylcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRocm93RXJyb3IoKSB7XG4gIHRocm93IG5ldyBFcnJvcignV0lUSElOIFNPVVJDRScpXG59XG4iXSwidmVyc2lvbiI6M30=
372368
===[ INLINE SOURCE MAPS ]=======================================================
373-
file: main.ts
369+
file: <cwd>/main.ts
374370
mappings: >-
375371
;;AAAA;IACE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAC9B,CAAC;AAFD,gCAEC;AAED;IACE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;AAClC,CAAC;AAFD,gCAEC
376372
names: []
377-
sourceRoot: <cwd>/
378373
sources:
379-
- main.ts
374+
- <cwd>/main.ts
380375
sourcesContent:
381376
- |
382377
export function consoleLog() {

‎e2e/__tests__/source-map.test.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { join } from 'path'
2+
13
import { allValidPackageSets } from '../__helpers__/templates'
24
import { configureTestCase } from '../__helpers__/test-case'
35

@@ -20,12 +22,12 @@ testCase.runWithTemplates(allValidPackageSets, 1, (runTest, { templateName }) =>
2022
// and the debugger cannot find the line where to go
2123
it(`should have the source maps comment`, () => {
2224
const io = result.ioFor('main.ts')
25+
const filePath = join(result.cwd, 'main.ts')
2326
expect(io).toMatchSnapshot()
2427
// we could keep only the snapshot testing, but this ensure fixed stuff are the same over versions
2528
expect(io.outputSourceMaps).toMatchObject({
2629
names: [],
27-
sourceRoot: result.cwd,
28-
sources: ['main.ts'],
30+
sources: [filePath],
2931
sourcesContent: [io.inputCode],
3032
version: 3,
3133
})

‎src/compiler.spec.ts

+9-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { LogLevels } from 'bs-logger'
33

44
import * as fakers from './__helpers__/fakers'
55
import { logTargetMock } from './__helpers__/mocks'
6-
import { relativeToRoot, tempDir } from './__helpers__/path'
6+
import { tempDir } from './__helpers__/path'
77
import ProcessedSource from './__helpers__/processed-source'
88
import { createCompiler } from './compiler'
99
import { ConfigSet } from './config/config-set'
@@ -60,7 +60,8 @@ describe('source-maps', () => {
6060
const source = 'const f = (v: number) => v\nconst t: number = f(5)'
6161
const compiled = compiler.compile(source, __filename)
6262
const processed = new ProcessedSource(compiled, __filename)
63-
const expectedFileName = relativeToRoot(__filename)
63+
// const expectedFileName = relativeToRoot(__filename)
64+
const expectedFileName = __filename
6465
expect(processed.outputSourceMaps).toMatchObject({
6566
file: expectedFileName,
6667
sources: [expectedFileName],
@@ -108,14 +109,13 @@ Array [
108109
===[ FILE: src/compiler.spec.ts ]===============================================
109110
"use strict";
110111
console.log("hello");
111-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoic3JjL2NvbXBpbGVyLnNwZWMudHMiLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUEiLCJuYW1lcyI6W10sInNvdXJjZVJvb3QiOiI8Y3dkPi8iLCJzb3VyY2VzIjpbInNyYy9jb21waWxlci5zcGVjLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImNvbnNvbGUubG9nKFwiaGVsbG9cIikiXSwidmVyc2lvbiI6M30=
112+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiPGN3ZD4vc3JjL2NvbXBpbGVyLnNwZWMudHMiLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUEiLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiPGN3ZD4vc3JjL2NvbXBpbGVyLnNwZWMudHMiXSwic291cmNlc0NvbnRlbnQiOlsiY29uc29sZS5sb2coXCJoZWxsb1wiKSJdLCJ2ZXJzaW9uIjozfQ==
112113
===[ INLINE SOURCE MAPS ]=======================================================
113-
file: src/compiler.spec.ts
114+
file: <cwd>/src/compiler.spec.ts
114115
mappings: ';AAAA,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA'
115116
names: []
116-
sourceRoot: <cwd>/
117117
sources:
118-
- src/compiler.spec.ts
118+
- <cwd>/src/compiler.spec.ts
119119
sourcesContent:
120120
- console.log("hello")
121121
version: 3
@@ -138,14 +138,13 @@ describe('isolatedModules', () => {
138138
"use strict";
139139
Object.defineProperty(exports, "__esModule", { value: true });
140140
exports.default = 42;
141-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoic3JjL2NvbXBpbGVyLnNwZWMudHMiLCJtYXBwaW5ncyI6Ijs7QUFBQSxrQkFBZSxFQUFFLENBQUEiLCJuYW1lcyI6W10sInNvdXJjZVJvb3QiOiI8Y3dkPi8iLCJzb3VyY2VzIjpbInNyYy9jb21waWxlci5zcGVjLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBkZWZhdWx0IDQyIl0sInZlcnNpb24iOjN9
141+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiPGN3ZD4vc3JjL2NvbXBpbGVyLnNwZWMudHMiLCJtYXBwaW5ncyI6Ijs7QUFBQSxrQkFBZSxFQUFFLENBQUEiLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiPGN3ZD4vc3JjL2NvbXBpbGVyLnNwZWMudHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGRlZmF1bHQgNDIiXSwidmVyc2lvbiI6M30=
142142
===[ INLINE SOURCE MAPS ]=======================================================
143-
file: src/compiler.spec.ts
143+
file: <cwd>/src/compiler.spec.ts
144144
mappings: ';;AAAA,kBAAe,EAAE,CAAA'
145145
names: []
146-
sourceRoot: <cwd>/
147146
sources:
148-
- src/compiler.spec.ts
147+
- <cwd>/src/compiler.spec.ts
149148
sourcesContent:
150149
- export default 42
151150
version: 3

‎src/compiler.ts

+8-5
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,15 @@ function updateOutput(
300300
/**
301301
* Update the source map contents for improved output.
302302
*/
303-
function updateSourceMap(sourceMapText: string, fileName: string, sourceRoot: string) {
303+
function updateSourceMap(sourceMapText: string, fileName: string, _sourceRoot: string) {
304304
const sourceMap = JSON.parse(sourceMapText)
305-
const relativeFilePath = relative(sourceRoot, fileName)
306-
sourceMap.file = relativeFilePath
307-
sourceMap.sources = [relativeFilePath]
308-
sourceMap.sourceRoot = sourceRoot
305+
// const relativeFilePath = posix.normalize(relative(sourceRoot, fileName))
306+
// sourceMap.file = relativeFilePath
307+
// sourceMap.sources = [relativeFilePath]
308+
// sourceMap.sourceRoot = normalize(sourceRoot)
309+
sourceMap.file = fileName
310+
sourceMap.sources = [fileName]
311+
delete sourceMap.sourceRoot
309312
return stableStringify(sourceMap)
310313
}
311314

‎src/config/config-set.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import { LogContexts, Logger } from 'bs-logger'
1212
import { existsSync, readFileSync } from 'fs'
1313
import json5 from 'json5'
14-
import { dirname, isAbsolute, join, resolve } from 'path'
14+
import { dirname, isAbsolute, join, normalize, resolve } from 'path'
1515
import semver from 'semver'
1616
import {
1717
CompilerOptions,
@@ -461,12 +461,14 @@ export class ConfigSet {
461461
}
462462
}
463463

464+
@Memoize()
464465
get rootDir(): string {
465-
return this.jest.rootDir || this.cwd
466+
return normalize(this.jest.rootDir || this.cwd)
466467
}
467468

469+
@Memoize()
468470
get cwd(): string {
469-
return this.jest.cwd || process.cwd()
471+
return normalize(this.jest.cwd || process.cwd())
470472
}
471473

472474
get isDoctoring() {

‎src/ts-jest-transformer.spec.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
import stringify from 'fast-json-stable-stringify'
2+
import { sep } from 'path'
23
import { ParsedCommandLine } from 'typescript'
34

45
import { logTargetMock } from './__helpers__/mocks'
56
import { TsJestTransformer } from './ts-jest-transformer'
67

78
describe('configFor', () => {
89
it('should return the same config-set for same values', () => {
9-
const obj1 = { cwd: '/foo', rootDir: '/bar', globals: {} }
10+
const obj1 = { cwd: '/foo/.', rootDir: '/bar//dummy/..', globals: {} }
1011
const obj2 = { ...obj1 }
1112
const str = stringify(obj1)
1213
const cs1 = new TsJestTransformer().configsFor(obj1 as any)
1314
const cs2 = new TsJestTransformer().configsFor(obj2 as any)
1415
const cs3 = new TsJestTransformer().configsFor(str)
15-
expect(cs1.cwd).toBe('/foo')
16-
expect(cs1.rootDir).toBe('/bar')
16+
expect(cs1.cwd).toBe(`${sep}foo`)
17+
expect(cs1.rootDir).toBe(`${sep}bar`)
1718
expect(cs2).toBe(cs1)
1819
expect(cs3).toBe(cs1)
1920
})

0 commit comments

Comments
 (0)
Please sign in to comment.