Skip to content

Commit b01b629

Browse files
nana4gontablakeembrey
authored andcommittedSep 15, 2019
Fix prefer TS exts via env variables (#867)
1 parent ebbcf39 commit b01b629

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed
 

‎src/index.spec.ts

+9
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,15 @@ describe('ts-node', function () {
288288
})
289289
})
290290

291+
it('should import ts before js when TS_NODE_PREFER_TS_EXTS env is present', function (done) {
292+
exec(`${BIN_EXEC} tests/import-order/compiled`, { env: { ...process.env, TS_NODE_PREFER_TS_EXTS: 'true' } }, function (err, stdout) {
293+
expect(err).to.equal(null)
294+
expect(stdout).to.equal('Hello, TypeScript!\n')
295+
296+
return done()
297+
})
298+
})
299+
291300
it('should ignore .d.ts files', function (done) {
292301
exec(`${BIN_EXEC} tests/import-order/importer`, function (err, stdout) {
293302
expect(err).to.equal(null)

‎src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ export function register (opts: Options = {}): Register {
417417
const register: Register = { cwd, compile, getTypeInfo, extensions, ts }
418418

419419
// Register the extensions.
420-
registerExtensions(opts, extensions, ignore, register, originalJsHandler)
420+
registerExtensions(options.preferTsExts, extensions, ignore, register, originalJsHandler)
421421

422422
return register
423423
}
@@ -446,7 +446,7 @@ function reorderRequireExtension (ext: string) {
446446
* Register the extensions to support when importing files.
447447
*/
448448
function registerExtensions (
449-
opts: Options,
449+
preferTsExts: boolean | null | undefined,
450450
extensions: string[],
451451
ignore: RegExp[],
452452
register: Register,
@@ -457,7 +457,7 @@ function registerExtensions (
457457
registerExtension(ext, ignore, register, originalJsHandler)
458458
}
459459

460-
if (opts.preferTsExts) {
460+
if (preferTsExts) {
461461
// tslint:disable-next-line
462462
const preferredExtensions = new Set([...extensions, ...Object.keys(require.extensions)])
463463

0 commit comments

Comments
 (0)
Please sign in to comment.