Skip to content

Commit 810517e

Browse files
whyboriswhyboris
committed
merge master
2 parents b947d2d + 203e608 commit 810517e

Some content is hidden

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

76 files changed

+1127
-540
lines changed

‎.eslintrc.json

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"node": true,
5+
"es6": true,
6+
"es2017": true
7+
},
8+
"overrides": [
9+
{
10+
"files": ["*.ts"],
11+
"extends": [
12+
"eslint:recommended",
13+
"plugin:@typescript-eslint/eslint-recommended",
14+
"plugin:@typescript-eslint/recommended",
15+
"plugin:@typescript-eslint/recommended-requiring-type-checking"
16+
],
17+
"parser": "@typescript-eslint/parser",
18+
"parserOptions": {
19+
"ecmaVersion": 10,
20+
"project": [
21+
"./tsconfig.serve.json",
22+
"./src/tsconfig.app.json",
23+
"./src/tsconfig.spec.json",
24+
"./e2e/tsconfig.e2e.json"
25+
],
26+
"sourceType": "module",
27+
"ecmaFeatures": {
28+
"modules": true
29+
}
30+
},
31+
"plugins": [
32+
"@typescript-eslint",
33+
"@angular-eslint/eslint-plugin"
34+
],
35+
"rules": {
36+
"@typescript-eslint/indent": [
37+
"error", 2, {
38+
"SwitchCase": 1,
39+
"CallExpression": {"arguments": "first"},
40+
"FunctionExpression": {"parameters": "first"},
41+
"FunctionDeclaration": {"parameters": "first"}
42+
}
43+
],
44+
"@typescript-eslint/no-empty-function": 0,
45+
"@typescript-eslint/no-explicit-any": 0,
46+
"@typescript-eslint/no-var-requires": 0,
47+
"@typescript-eslint/no-unsafe-call": 0,
48+
"@typescript-eslint/no-unsafe-member-access": 0,
49+
"@typescript-eslint/no-unsafe-assignment": 0,
50+
"@typescript-eslint/no-unsafe-return": 0,
51+
"@typescript-eslint/no-floating-promises": 0,
52+
"@typescript-eslint/semi": "error",
53+
"@angular-eslint/use-injectable-provided-in": "error",
54+
"@angular-eslint/no-attribute-decorator": "error"
55+
}
56+
},
57+
{
58+
"files": ["*.component.html"],
59+
"parser": "@angular-eslint/template-parser",
60+
"plugins": ["@angular-eslint/template"],
61+
"rules": {
62+
"@angular-eslint/template/banana-in-box": "error",
63+
"@angular-eslint/template/no-negated-async": "error"
64+
}
65+
}
66+
]
67+
}

‎.github/FUNDING.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: maximegris
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: maximegris # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

‎.github/stale.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 15
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking an issue as stale
10+
staleLabel: wontfix
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when closing a stale issue. Set to `false` to disable
17+
closeComment: false

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/release
99
main.js
1010
src/**/*.js
11+
!src/karma.conf.js
1112
*.js.map
1213

1314
# dependencies
@@ -24,7 +25,7 @@ src/**/*.js
2425

2526
# IDE - VSCode
2627
.vscode/*
27-
!.vscode/settings.json
28+
.vscode/settings.json
2829
!.vscode/tasks.json
2930
!.vscode/launch.json
3031
!.vscode/extensions.json

‎.npmrc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
save=true
2+
save-exact=true

‎.travis.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
os:
2+
- linux
3+
- osx
4+
- windows
15
language: node_js
26
node_js:
3-
- 8
4-
sudo: required
5-
addons:
6-
chrome: stable
7+
- 'lts/*'
8+
services:
9+
- xvfb
710
before_script:
811
- export DISPLAY=:99.0
9-
- sh -e /etc/init.d/xvfb start
1012
install:
1113
- npm set progress=false
1214
- npm install
1315
script:
1416
- ng lint
15-
- npm run test
16-
- npm run e2e
17+
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then npm run test ; fi
18+
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then npm run e2e ; fi
1719
- npm run build

‎.vscode/launch.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Electron Main Renderer",
9+
"type": "node",
10+
"request": "launch",
11+
"protocol": "inspector",
12+
// Prelaunch task compiles main.ts for Electron & starts Angular dev server.
13+
"preLaunchTask": "Build.All",
14+
"cwd": "${workspaceFolder}",
15+
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
16+
"runtimeArgs": [
17+
"--serve",
18+
".",
19+
"--remote-debugging-port=9222"
20+
],
21+
"windows": {
22+
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
23+
}
24+
}, {
25+
"name": "Karma Attach Chrome",
26+
"type": "chrome",
27+
"request": "attach",
28+
"port": 9222,
29+
"webRoot": "${workspaceFolder}/",
30+
"sourceMaps": true,
31+
"timeout": 30000,
32+
"trace": true
33+
}
34+
35+
]
36+
}

‎.vscode/tasks.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "Build.All",
6+
"type": "shell",
7+
"command": "npm run electron:serve-tsc && ng serve",
8+
"isBackground": true,
9+
"group": {
10+
"kind": "build",
11+
"isDefault": true
12+
},
13+
"problemMatcher": {
14+
"owner": "typescript",
15+
"source": "ts",
16+
"applyTo": "closedDocuments",
17+
"fileLocation": ["relative", "${cwd}"],
18+
"pattern": "$tsc",
19+
"background": {
20+
"activeOnStart": true,
21+
"beginsPattern": "^.*",
22+
"endsPattern": "^.*Compiled successfully.*"
23+
}
24+
}
25+
}
26+
]
27+
}

0 commit comments

Comments
 (0)