Skip to content

Commit a7aa0af

Browse files
authored
Switch from bundled createRequire shim to npm "create-require" (#1156)
* Switch from bundled createRequire shim to npm create-require * Fix linter failures
1 parent 8b9489a commit a7aa0af

File tree

6 files changed

+14
-42
lines changed

6 files changed

+14
-42
lines changed

dist-raw/node-createrequire.js

-29
This file was deleted.

package-lock.json

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
},
112112
"dependencies": {
113113
"arg": "^4.1.0",
114+
"create-require": "^1.1.0",
114115
"diff": "^4.0.1",
115116
"make-error": "^1.1.1",
116117
"source-map-support": "^0.5.17",

src/index.spec.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import type * as tsNodeTypes from './index'
88
import { unlinkSync, existsSync, lstatSync } from 'fs'
99
import * as promisify from 'util.promisify'
1010
import { sync as rimrafSync } from 'rimraf'
11-
import { createRequire, createRequireFromPath } from 'module'
11+
import type _createRequire from 'create-require'
12+
const createRequire: typeof _createRequire = require('create-require')
1213
import { pathToFileURL } from 'url'
1314
import Module = require('module')
1415

@@ -22,7 +23,7 @@ const BIN_SCRIPT_PATH = join(TEST_DIR, 'node_modules/.bin/ts-node-script')
2223
const SOURCE_MAP_REGEXP = /\/\/# sourceMappingURL=data:application\/json;charset=utf\-8;base64,[\w\+]+=*$/
2324

2425
// `createRequire` does not exist on older node versions
25-
const testsDirRequire = (createRequire || createRequireFromPath)(join(TEST_DIR, 'index.js')) // tslint:disable-line
26+
const testsDirRequire = createRequire(join(TEST_DIR, 'index.js')) // tslint:disable-line
2627

2728
// Set after ts-node is installed locally
2829
let { register, create, VERSION }: typeof tsNodeTypes = {} as any

src/index.ts

+4-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ import { BaseError } from 'make-error'
55
import * as util from 'util'
66
import { fileURLToPath } from 'url'
77
import type * as _ts from 'typescript'
8-
import * as Module from 'module'
8+
import { Module, createRequire as nodeCreateRequire, createRequireFromPath as nodeCreateRequireFromPath } from 'module'
9+
import type _createRequire from 'create-require'
10+
// tslint:disable-next-line
11+
const createRequire = nodeCreateRequire ?? nodeCreateRequireFromPath ?? require('create-require') as typeof _createRequire
912

1013
/**
1114
* Does this version of node obey the package.json "type" field
@@ -1215,12 +1218,3 @@ function getTokenAtPosition (ts: typeof _ts, sourceFile: _ts.SourceFile, positio
12151218
return current
12161219
}
12171220
}
1218-
1219-
let nodeCreateRequire: (path: string) => NodeRequire
1220-
function createRequire (filename: string) {
1221-
if (!nodeCreateRequire) {
1222-
// tslint:disable-next-line
1223-
nodeCreateRequire = Module.createRequire || Module.createRequireFromPath || require('../dist-raw/node-createrequire').createRequireFromPath
1224-
}
1225-
return nodeCreateRequire(filename)
1226-
}

tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "./tsconfig.schemastore-schema.json",
33
"compilerOptions": {
44
"target": "es2015",
5-
"lib": ["es2015"],
5+
"lib": ["es2015", "dom"],
66
"rootDir": "src",
77
"outDir": "dist",
88
"module": "commonjs",

0 commit comments

Comments
 (0)