Skip to content

Commit 870378c

Browse files
committed
fix confilict
2 parents c6e07bd + 06f4344 commit 870378c

File tree

121 files changed

+40106
-0
lines changed

Some content is hidden

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

121 files changed

+40106
-0
lines changed

.eslintignore

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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
28+
node_modules
29+
30+
# OSX
31+
.DS_Store
32+
33+
# flow-typed
34+
flow-typed/npm/*
35+
!flow-typed/npm/module_vx.x.x.js
36+
37+
# App packaged
38+
release
39+
app/main.prod.js
40+
app/main.prod.js.map
41+
app/renderer.prod.js
42+
app/renderer.prod.js.map
43+
app/style.css
44+
app/style.css.map
45+
dist
46+
dll
47+
main.js
48+
main.js.map
49+
50+
.idea
51+
npm-debug.log.*
52+
__snapshots__
53+
54+
# Package.json
55+
package.json
56+
.travis.yml

.eslintrc

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"parser": "babel-eslint",
3+
"parserOptions": {
4+
"sourceType": "module",
5+
"allowImportExportEverywhere": true
6+
},
7+
"extends": ["airbnb", "prettier", "prettier/flowtype", "prettier/react"],
8+
"env": {
9+
"browser": true,
10+
"node": true
11+
},
12+
"rules": {
13+
"arrow-parens": ["off"],
14+
"compat/compat": "error",
15+
"consistent-return": "off",
16+
"comma-dangle": "off",
17+
"flowtype/boolean-style": ["error", "boolean"],
18+
"flowtype/define-flow-type": "warn",
19+
"flowtype/delimiter-dangle": ["error", "never"],
20+
"flowtype/generic-spacing": ["error", "never"],
21+
"flowtype/no-primitive-constructor-types": "error",
22+
"flowtype/no-weak-types": "warn",
23+
"flowtype/object-type-delimiter": ["error", "comma"],
24+
"flowtype/require-parameter-type": "off",
25+
"flowtype/require-return-type": "off",
26+
"flowtype/require-valid-file-annotation": "off",
27+
"flowtype/semi": ["error", "always"],
28+
"flowtype/space-after-type-colon": ["error", "always"],
29+
"flowtype/space-before-generic-bracket": ["error", "never"],
30+
"flowtype/space-before-type-colon": ["error", "never"],
31+
"flowtype/union-intersection-spacing": ["error", "always"],
32+
"flowtype/use-flow-type": "error",
33+
"flowtype/valid-syntax": "error",
34+
"generator-star-spacing": "off",
35+
"import/no-unresolved": "error",
36+
"import/no-extraneous-dependencies": "off",
37+
"jsx-a11y/anchor-is-valid": "off",
38+
"no-console": "off",
39+
"no-use-before-define": "off",
40+
"no-multi-assign": "off",
41+
"promise/param-names": "error",
42+
"promise/always-return": "error",
43+
"promise/catch-or-return": "error",
44+
"promise/no-native": "off",
45+
"react/sort-comp": [
46+
"error",
47+
{
48+
"order": [
49+
"type-annotations",
50+
"static-methods",
51+
"lifecycle",
52+
"everything-else",
53+
"render"
54+
]
55+
}
56+
],
57+
"react/jsx-no-bind": "off",
58+
"react/jsx-filename-extension": [
59+
"error",
60+
{ "extensions": [".js", ".jsx"] }
61+
],
62+
"react/prefer-stateless-function": "off"
63+
},
64+
"plugins": ["flowtype", "import", "promise", "compat", "react"],
65+
"settings": {
66+
"import/resolver": {
67+
"webpack": {
68+
"config": "configs/webpack.config.eslint.js"
69+
}
70+
}
71+
}
72+
}

.flowconfig

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
[ignore]
2+
<PROJECT_ROOT>/app/main.prod.js
3+
<PROJECT_ROOT>/app/main.prod.js.map
4+
<PROJECT_ROOT>/app/dist/.*
5+
<PROJECT_ROOT>/resources/.*
6+
<PROJECT_ROOT>/node_modules/webpack-cli
7+
<PROJECT_ROOT>/release/.*
8+
<PROJECT_ROOT>/dll/.*
9+
<PROJECT_ROOT>/release/.*
10+
<PROJECT_ROOT>/git/.*
11+
12+
[include]
13+
14+
[libs]
15+
16+
[options]
17+
esproposal.class_static_fields=enable
18+
esproposal.class_instance_fields=enable
19+
esproposal.export_star_as=enable
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'
25+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe
26+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue

.gitignore

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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
28+
node_modules
29+
30+
# OSX
31+
.DS_Store
32+
33+
# flow-typed
34+
flow-typed/npm/*
35+
!flow-typed/npm/module_vx.x.x.js
36+
37+
# App packaged
38+
release
39+
app/main.prod.js
40+
app/main.prod.js.map
41+
app/renderer.prod.js
42+
app/renderer.prod.js.map
43+
app/style.css
44+
app/style.css.map
45+
dist
46+
dll
47+
main.js
48+
main.js.map
49+
50+
.idea
51+
npm-debug.log.*

.stylelintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["stylelint-config-standard", "stylelint-config-prettier"]
3+
}

.testcafe-electron-rc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"mainWindowUrl": "./app/app.html",
3+
"appPath": "."
4+
}

.travis.yml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
matrix:
2+
allow_failures:
3+
- os: windows
4+
- node_js: node
5+
include:
6+
- os: osx
7+
language: node_js
8+
node_js:
9+
- node
10+
- 10
11+
env:
12+
- ELECTRON_CACHE=$HOME/.cache/electron
13+
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
14+
15+
- os: linux
16+
language: node_js
17+
node_js:
18+
- node
19+
- 10
20+
addons:
21+
apt:
22+
sources:
23+
- ubuntu-toolchain-r-test
24+
packages:
25+
- gcc-multilib
26+
- g++-8
27+
- g++-multilib
28+
- icnsutils
29+
- graphicsmagick
30+
- xz-utils
31+
- xorriso
32+
- rpm
33+
34+
- os: windows
35+
language: node_js
36+
node_js:
37+
- node
38+
env:
39+
- ELECTRON_CACHE=$HOME/.cache/electron
40+
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
41+
42+
before_cache:
43+
- rm -rf $HOME/.cache/electron-builder/wine
44+
45+
cache:
46+
yarn: true
47+
directories:
48+
- node_modules
49+
- $(npm config get prefix)/lib/node_modules
50+
- flow-typed
51+
- $HOME/.cache/electron
52+
- $HOME/.cache/electron-builder
53+
54+
before_install:
55+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="g++-8"; fi
56+
57+
install:
58+
- yarn --ignore-engines
59+
# On Linux, initialize "virtual display". See before_script
60+
- |
61+
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
62+
/sbin/start-stop-daemon \
63+
--start \
64+
--quiet \
65+
--pidfile /tmp/custom_xvfb_99.pid \
66+
--make-pidfile \
67+
--background \
68+
--exec /usr/bin/Xvfb \
69+
-- :99 -ac -screen 0 1280x1024x16
70+
else
71+
:
72+
fi
73+
74+
before_script:
75+
# On Linux, create a "virtual display". This allows browsers to work properly
76+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
77+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
78+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sleep 3; fi
79+
80+
script:
81+
- yarn package-ci
82+
- yarn lint
83+
- yarn flow
84+
# HACK: Temporarily ignore `yarn test` on linux
85+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then yarn test; fi
86+
- yarn build-e2e
87+
- yarn test-e2e

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015-present C. T. Lin
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

appveyor.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
image: Visual Studio 2017
2+
3+
platform:
4+
- x64
5+
6+
environment:
7+
matrix:
8+
- nodejs_version: 10
9+
10+
cache:
11+
- '%LOCALAPPDATA%/Yarn'
12+
- node_modules -> yarn.lock
13+
- flow-typed
14+
- '%USERPROFILE%\.electron'
15+
16+
matrix:
17+
fast_finish: true
18+
19+
build: off
20+
21+
version: '{build}'
22+
23+
shallow_clone: true
24+
25+
clone_depth: 1
26+
27+
install:
28+
- ps: Install-Product node $env:nodejs_version x64
29+
- set CI=true
30+
- yarn
31+
32+
test_script:
33+
- yarn package-ci
34+
- yarn lint
35+
# - yarn flow
36+
- yarn test
37+
- yarn build-e2e
38+
- yarn test-e2e

0 commit comments

Comments
 (0)