Skip to content

Commit 61e8353

Browse files
committed
Project update
1 parent 6a060ec commit 61e8353

File tree

824 files changed

+11619
-1250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

824 files changed

+11619
-1250
lines changed

.babelrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"presets": [
33
["env", {
4-
"targets": { "node": 6 },
4+
"targets": { "node": 7 },
55
"useBuiltIns": true
66
}],
77
"stage-0",
@@ -17,7 +17,6 @@
1717
"plugins": [
1818
"transform-class-properties",
1919
"transform-es2015-classes",
20-
"react-hot-loader/babel",
2120
["flow-runtime", {
2221
"assert": true,
2322
"annotate": true

.editorconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
root = true
22

33
[*]
4-
indent_style = tab
4+
indent_style = space
5+
indent_size = 2
56
end_of_line = lf
67
charset = utf-8
78
trim_trailing_whitespace = true
89
insert_final_newline = true
910

10-
[*.{json,js,jsx,html,css}]
11+
[*.{json,js,jsx,html,css,yml}]
1112
indent_style = space
1213
indent_size = 2
1314

.eslintignore

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,53 @@
1-
flow-typed/
2-
app/dist/
3-
app/main.js
1+
# Logs
2+
logs
3+
*.log
4+
5+
# Runtime data
6+
pids
7+
*.pid
8+
*.seed
9+
10+
# Directory for instrumented libs generated by jscoverage/JSCover
11+
lib-cov
12+
13+
# Coverage directory used by tools like istanbul
14+
coverage
15+
16+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
17+
.grunt
18+
19+
# node-waf configuration
20+
.lock-wscript
21+
22+
# Compiled binary addons (http://nodejs.org/api/addons.html)
23+
build/Release
24+
.eslintcache
25+
26+
# Dependency directory
27+
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
428
node_modules
29+
app/node_modules
30+
31+
# OSX
32+
.DS_Store
33+
34+
# flow-typed
35+
flow-typed/npm/*
36+
!flow-typed/npm/module_vx.x.x.js
37+
38+
# App packaged
39+
release
40+
app/main.prod.js
41+
app/main.prod.js.map
42+
app/renderer.prod.js
43+
app/renderer.prod.js.map
44+
app/style.css
45+
app/style.css.map
46+
dist
547
dll
48+
main.js
49+
main.js.map
50+
51+
.idea
52+
npm-debug.log.*
653
__snapshots__

.flowconfig

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
[ignore]
2-
.*/node_modules/fbjs/.*
3-
.*/node_modules/stylelint/.*
4-
.*/node_modules/babel-plugin-flow-runtime/.*
5-
.*/app/main.js
6-
.*/app/dist/.*
7-
.*/release/.*
8-
.*/git/.*
2+
<PROJECT_ROOT>/node_modules/*
3+
<PROJECT_ROOT>/app/main.prod.js
4+
<PROJECT_ROOT>/app/main.prod.js.map
5+
<PROJECT_ROOT>/app/dist/.*
6+
<PROJECT_ROOT>/resources/.*
7+
<PROJECT_ROOT>/release/.*
8+
<PROJECT_ROOT>/dll/.*
9+
<PROJECT_ROOT>/release/.*
10+
<PROJECT_ROOT>/git/.*
911

1012
[include]
1113

@@ -15,10 +17,10 @@
1517
esproposal.class_static_fields=enable
1618
esproposal.class_instance_fields=enable
1719
esproposal.export_star_as=enable
18-
module.name_mapper.extension='css' -> '<PROJECT_ROOT>/flow/CSSModule.js.flow'
19-
module.name_mapper.extension='styl' -> '<PROJECT_ROOT>/flow/CSSModule.js.flow'
20-
module.name_mapper.extension='scss' -> '<PROJECT_ROOT>/flow/CSSModule.js.flow'
21-
module.name_mapper.extension='png' -> '<PROJECT_ROOT>/flow/WebpackAsset.js.flow'
22-
module.name_mapper.extension='jpg' -> '<PROJECT_ROOT>/flow/WebpackAsset.js.flow'
20+
module.name_mapper.extension='css' -> '<PROJECT_ROOT>/internals/flow/CSSModule.js.flow'
21+
module.name_mapper.extension='styl' -> '<PROJECT_ROOT>/internals/flow/CSSModule.js.flow'
22+
module.name_mapper.extension='scss' -> '<PROJECT_ROOT>/internals/flow/CSSModule.js.flow'
23+
module.name_mapper.extension='png' -> '<PROJECT_ROOT>/internals/flow/WebpackAsset.js.flow'
24+
module.name_mapper.extension='jpg' -> '<PROJECT_ROOT>/internals/flow/WebpackAsset.js.flow'
2325
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe
2426
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue

.gitignore

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ flow-typed/npm/*
3737

3838
# App packaged
3939
release
40-
app/main.js
41-
app/main.js.map
42-
app/bundle.js
43-
app/bundle.js.map
40+
app/main.prod.js
41+
app/main.prod.js.map
42+
app/renderer.prod.js
43+
app/renderer.prod.js.map
4444
app/style.css
4545
app/style.css.map
4646
dist
@@ -50,4 +50,3 @@ main.js.map
5050

5151
.idea
5252
npm-debug.log.*
53-
__snapshots__

.nvmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.tern-project

Lines changed: 0 additions & 15 deletions
This file was deleted.

.travis.yml

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,14 @@ sudo: false
33
language: node_js
44

55
node_js:
6+
- 8
67
- 7
7-
- 6
88

99
cache:
10+
yarn: true
1011
directories:
1112
- node_modules
12-
13-
# Enable when https://github.com/yarnpkg/yarn/issues/1233 and
14-
# https://github.com/yarnpkg/yarn/issues/1059 are resolved and disable npm cache
15-
#
16-
# cache:
17-
# directories:
18-
# - $HOME/.yarn-cache
13+
- app/node_modules
1914

2015
addons:
2116
apt:
@@ -30,27 +25,18 @@ addons:
3025

3126
install:
3227
- export CXX="g++-4.8"
33-
- npm install -g npm@latest
34-
- npm install
28+
- yarn
29+
- cd app && yarn && cd ..
3530
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
3631

37-
# Enable when https://github.com/yarnpkg/yarn/issues/1233 and
38-
# https://github.com/yarnpkg/yarn/issues/1059 are resolved and disable npm cache
39-
#
40-
# install:
41-
# - export CXX="g++-4.8"
42-
# - npm install -g yarnpkg
43-
# - yarn
44-
# - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
45-
4632
before_script:
4733
- export DISPLAY=:99.0
4834
- sh -e /etc/init.d/xvfb start &
4935
- sleep 3
5036

5137
script:
52-
- npm run lint
53-
- npm run test
54-
- npm run build
55-
- npm run test-e2e
56-
- npm run package
38+
- node --version
39+
- yarn lint
40+
- yarn package
41+
- yarn test
42+
- yarn test-e2e

.vscode/settings.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@
33
"flow.useNPMPackagedFlow": true,
44
"search.exclude": {
55
".git": true,
6-
"node_modules": true,
6+
".eslintcache": true,
7+
"app/dist": true,
8+
"app/main.prod.js": true,
9+
"app/main.prod.js.map": true,
10+
"bower_components": true,
11+
"dll": true,
712
"flow-typed": true,
8-
"__snapshots__": true,
9-
"bower_components": true
13+
"release": true,
14+
"node_modules": true,
15+
"npm-debug.log.*": true,
16+
"test/**/__snapshots__": true,
17+
"yarn.lock": true
1018
}
1119
}

CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
# 0.12.0 (2017.7.8)
2+
3+
#### Misc
4+
- Removed `babel-polyfill`
5+
- Renamed and alphabetized npm scripts
6+
7+
#### Breaking
8+
- Changed node dev `__dirname` and `__filename` to node built in fn's (https://github.com/chentsulin/electron-react-boilerplate/pull/1035)
9+
- Renamed `app/bundle.js` to `app/renderer.prod.js` for consistency
10+
- Renamed `dll/vendor.js` to `dll/renderer.dev.dll.js` for consistency
11+
12+
#### Additions
13+
- Enable node_modules cache on CI
14+
15+
# 0.11.2 (2017.5.1)
16+
17+
Yay! Another patch release. This release mostly includes refactorings and router bug fixes. Huge thanks to @anthonyraymond!
18+
19+
⚠️ Windows electron builds are failing because of [this issue](https://github.com/electron/electron/issues/9321). This is not an issue with the boilerplate ⚠️
20+
21+
#### Breaking
22+
- **Renamed `./app/main.development.js` => `./app/main.{dev,prod}.js`:** [#963](https://github.com/chentsulin/electron-react-boilerplate/pull/963)
23+
24+
#### Fixes
25+
- **Fixed reloading when not on `/` path:** [#958](https://github.com/chentsulin/electron-react-boilerplate/pull/958) [#949](https://github.com/chentsulin/electron-react-boilerplate/pull/949)
26+
27+
#### Additions
28+
- **Added support for stylefmt:** [#960](https://github.com/chentsulin/electron-react-boilerplate/pull/960)
29+
130
# 0.11.1 (2017.4.23)
231

332
You can now debug the production build with devtools like so:

0 commit comments

Comments
 (0)