Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change value to pass as an argument (for --prefer-ts-exts) #867

Merged
merged 3 commits into from Sep 15, 2019
Merged

change value to pass as an argument (for --prefer-ts-exts) #867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fda8405
change value to pass as an argument (for --prefer-ts-exts)
nana4gonta Aug 16, 2019
d924514
fix test (exec option)
nana4gonta Aug 16, 2019
405dcf6
only pass preferTsExts value
nana4gonta Aug 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/index.spec.ts
View file
Open in desktop
Expand Up @@ -288,6 +288,15 @@ describe('ts-node', function () {
})
})

it('should import ts before js when TS_NODE_PREFER_TS_EXTS env is present', function (done) {
exec(`${BIN_EXEC} tests/import-order/compiled`, { env: { ...process.env, TS_NODE_PREFER_TS_EXTS: 'true' } }, function (err, stdout) {
expect(err).to.equal(null)
expect(stdout).to.equal('Hello, TypeScript!\n')

return done()
})
})

it('should ignore .d.ts files', function (done) {
exec(`${BIN_EXEC} tests/import-order/importer`, function (err, stdout) {
expect(err).to.equal(null)
Expand Down
6 changes: 3 additions & 3 deletions src/index.ts
View file
Open in desktop
Expand Up @@ -401,7 +401,7 @@ export function register (opts: Options = {}): Register {
const register: Register = { cwd, compile, getTypeInfo, extensions, ts }

// Register the extensions.
registerExtensions(opts, extensions, ignore, register, originalJsHandler)
registerExtensions(options.preferTsExts, extensions, ignore, register, originalJsHandler)

return register
}
Expand Down Expand Up @@ -430,7 +430,7 @@ function reorderRequireExtension (ext: string) {
* Register the extensions to support when importing files.
*/
function registerExtensions (
opts: Options,
preferTsExts: boolean | null | undefined,
extensions: string[],
ignore: RegExp[],
register: Register,
Expand All @@ -441,7 +441,7 @@ function registerExtensions (
registerExtension(ext, ignore, register, originalJsHandler)
}

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

Expand Down