Skip to content

Commit c10d360

Browse files
committed
Restructure the app and cascade eslintrc configuration
1 parent 720b867 commit c10d360

File tree

16 files changed

+15
-6
lines changed

16 files changed

+15
-6
lines changed

.eslintrc

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"root": true,
23
"extends": [
34
"eslint:recommended",
45
"plugin:react/recommended",
@@ -31,8 +32,6 @@
3132
},
3233
"env": {
3334
"es6": true,
34-
"node": true,
35-
"browser": true,
36-
"mocha": true
35+
"node": true
3736
}
3837
}

app/main.js app/main/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ app.on('ready', async () => {
4747
show: false,
4848
});
4949

50-
mainWindow.loadFile(path.join(__dirname, 'index.html'));
50+
mainWindow.loadFile(path.resolve(path.join(__dirname, '../renderer/index.html')));
5151

5252
// show window once on first load
5353
mainWindow.webContents.once('did-finish-load', () => {

app/renderer/.eslintrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"env": {
3+
"browser": true
4+
}
5+
}
File renamed without changes.

app/app.js app/renderer/app.js

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

app/store.js app/renderer/store.js

File renamed without changes.

test/.eslintrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"env": {
3+
"mocha": true
4+
}
5+
}

test/actions/user.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect } from 'chai';
22
import configureMockStore from 'redux-mock-store';
33
import thunk from 'redux-thunk';
4-
import actions from '../../app/actions/user';
4+
import actions from '../../app/renderer/actions/user';
55

66
const mockStore = configureMockStore([thunk]);
77

test/reducers/user.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect } from 'chai';
2-
import reducer from '../../app/reducers/user';
2+
import reducer from '../../app/renderer/reducers/user';
33

44
describe('reducers', () => {
55
describe('user', () => {

0 commit comments

Comments
 (0)