File tree 2 files changed +15
-9
lines changed
2 files changed +15
-9
lines changed Original file line number Diff line number Diff line change 3
3
const Mocha = require ( 'mocha' )
4
4
const errors = require ( 'mocha/lib/errors' )
5
5
const { resolve } = require ( 'path' )
6
+ const { existsSync } = require ( 'fs' )
6
7
7
8
const {
8
9
handleRequires,
@@ -16,15 +17,24 @@ const {
16
17
ONE_AND_DONES
17
18
} = require ( 'mocha/lib/cli/one-and-dones' )
18
19
20
+ const cwd = process . cwd ( )
21
+
22
+ const handleLegacyRequires = async ( mods ) => {
23
+ for ( let mod of mods ) {
24
+ if ( existsSync ( mod , { cwd } ) || existsSync ( `${ mod } .js` , { cwd } ) ) {
25
+ mod = resolve ( mod )
26
+ }
27
+ require ( mod )
28
+ }
29
+ }
30
+
19
31
const runMocha = async ( argv , done ) => {
20
32
Error . stackTraceLimit = Infinity
21
33
22
34
if ( process . type === 'renderer' ) {
23
35
// Node.js ESM loader is not available in Electron Renderer
24
36
// so we require dependencies explicitly here.
25
- for ( const mod of argv . require ) {
26
- require ( resolve ( mod ) )
27
- }
37
+ await handleLegacyRequires ( argv . require )
28
38
} else {
29
39
await handleRequires ( argv . require )
30
40
}
@@ -50,6 +60,7 @@ module.exports = {
50
60
errors,
51
61
helpers : {
52
62
handleRequires,
63
+ handleLegacyRequires,
53
64
runMocha
54
65
}
55
66
}
Original file line number Diff line number Diff line change @@ -130,9 +130,6 @@ exports.builder = yargs => {
130
130
argv . inspect = true
131
131
}
132
132
133
- if ( argv [ 'require-main' ] ) {
134
- argv [ 'require-main' ] = argv [ 'require-main' ] . map ( script => resolve ( script ) )
135
- }
136
133
if ( argv . script ) {
137
134
argv . script = argv . script . map ( script => resolve ( script ) )
138
135
}
@@ -152,9 +149,7 @@ exports.builder = yargs => {
152
149
exports . handler = async argv => {
153
150
try {
154
151
if ( argv [ 'require-main' ] ) {
155
- for ( const mod of argv [ 'require-main' ] ) {
156
- require ( mod )
157
- }
152
+ await helpers . handleLegacyRequires ( argv [ 'require-main' ] )
158
153
}
159
154
160
155
await app . whenReady ( )
You can’t perform that action at this time.
0 commit comments