Skip to content

Commit 8934968

Browse files
committed
add .js to resolve extensions, closes #34
1 parent 0730bc7 commit 8934968

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

__tests__/commands.spec.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ describe('build:electron', () => {
170170
'projectPath/dist_electron/bundled/css/fonts'
171171
)
172172
})
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+
})
173180
})
174181

175182
describe('serve:electron', () => {
@@ -269,6 +276,14 @@ describe('serve:electron', () => {
269276
// Electron is not launched
270277
expect(execa).not.toBeCalled()
271278
})
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+
})
272287
})
273288

274289
describe('testWithSpectron', async () => {

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ module.exports = (api, options) => {
102102
.use(webpack.EnvironmentPlugin, [{ NODE_ENV: 'production' }])
103103
mainConfig.entry('background').add(api.resolve(mainProcessFile))
104104
if (usesTypescript) {
105-
mainConfig.resolve.extensions.merge(['.ts'])
105+
mainConfig.resolve.extensions.merge(['.js', '.ts'])
106106
mainConfig.module
107107
.rule('ts')
108108
.test(/\.ts$/)
@@ -232,7 +232,7 @@ module.exports = (api, options) => {
232232
.use(webpack.EnvironmentPlugin, [{ NODE_ENV: 'development' }])
233233
mainConfig.entry('background').add(api.resolve(mainProcessFile))
234234
if (usesTypescript) {
235-
mainConfig.resolve.extensions.merge(['.ts'])
235+
mainConfig.resolve.extensions.merge(['.js', '.ts'])
236236
mainConfig.module
237237
.rule('ts')
238238
.test(/\.ts$/)

0 commit comments

Comments
 (0)