File tree Expand file tree Collapse file tree 2 files changed +17
-2
lines changed Expand file tree Collapse file tree 2 files changed +17
-2
lines changed Original file line number Diff line number Diff line change @@ -170,6 +170,13 @@ describe('build:electron', () => {
170
170
'projectPath/dist_electron/bundled/css/fonts'
171
171
)
172
172
} )
173
+ test ( '.js and .ts are merged into file extensions' , async ( ) => {
174
+ await runCommand ( 'build:electron' )
175
+
176
+ const mainConfig = webpack . mock . calls [ 0 ] [ 0 ]
177
+ // Both .js and .ts are resolved
178
+ expect ( mainConfig . resolve . extensions ) . toEqual ( [ '.js' , '.ts' ] )
179
+ } )
173
180
} )
174
181
175
182
describe ( 'serve:electron' , ( ) => {
@@ -269,6 +276,14 @@ describe('serve:electron', () => {
269
276
// Electron is not launched
270
277
expect ( execa ) . not . toBeCalled ( )
271
278
} )
279
+
280
+ test ( '.js and .ts are merged into file extensions' , async ( ) => {
281
+ await runCommand ( 'serve:electron' )
282
+
283
+ const mainConfig = webpack . mock . calls [ 0 ] [ 0 ]
284
+ // Both .js and .ts are resolved
285
+ expect ( mainConfig . resolve . extensions ) . toEqual ( [ '.js' , '.ts' ] )
286
+ } )
272
287
} )
273
288
274
289
describe ( 'testWithSpectron' , async ( ) => {
Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ module.exports = (api, options) => {
102
102
. use ( webpack . EnvironmentPlugin , [ { NODE_ENV : 'production' } ] )
103
103
mainConfig . entry ( 'background' ) . add ( api . resolve ( mainProcessFile ) )
104
104
if ( usesTypescript ) {
105
- mainConfig . resolve . extensions . merge ( [ '.ts' ] )
105
+ mainConfig . resolve . extensions . merge ( [ '.js' , '. ts'] )
106
106
mainConfig . module
107
107
. rule ( 'ts' )
108
108
. test ( / \. t s $ / )
@@ -232,7 +232,7 @@ module.exports = (api, options) => {
232
232
. use ( webpack . EnvironmentPlugin , [ { NODE_ENV : 'development' } ] )
233
233
mainConfig . entry ( 'background' ) . add ( api . resolve ( mainProcessFile ) )
234
234
if ( usesTypescript ) {
235
- mainConfig . resolve . extensions . merge ( [ '.ts' ] )
235
+ mainConfig . resolve . extensions . merge ( [ '.js' , '. ts'] )
236
236
mainConfig . module
237
237
. rule ( 'ts' )
238
238
. test ( / \. t s $ / )
You can’t perform that action at this time.
0 commit comments