Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f5d1b56
wip formatting
Mar 18, 2022
f288f13
add settings from flowcrypt-browser
Mar 20, 2022
cff2ce7
wip
Mar 20, 2022
5a45a8e
wip
Mar 21, 2022
5cb6438
wip
Mar 21, 2022
1fffdec
wip
Mar 21, 2022
034ed7f
wip
Mar 21, 2022
5728463
Merge remote-tracking branch 'origin/master' into ip-1376-formatting
Mar 23, 2022
644ed58
fix merge
Mar 23, 2022
5d73ed4
linters progress
Mar 23, 2022
1eca0da
wip
Mar 23, 2022
c347744
wip
Mar 23, 2022
0f48cfd
wip
Mar 23, 2022
ea217b5
wip
Mar 23, 2022
1b85a62
fix eslint issues
Mar 24, 2022
a3c824a
wip
Mar 24, 2022
06cfb66
wip
Mar 24, 2022
598181c
wip
Mar 24, 2022
173c0b0
wip
Mar 24, 2022
8986d61
wip
Mar 24, 2022
584dd96
wip
Mar 24, 2022
e7da9a2
wip
Mar 24, 2022
b5803bf
wip
Mar 24, 2022
e6eb93d
wip
Mar 26, 2022
5255957
wip
Mar 26, 2022
2fd1532
wip
Mar 26, 2022
269e796
wip
Mar 26, 2022
245e208
wip
Mar 26, 2022
7bdc9a9
wip
Mar 28, 2022
4cdd495
wip
Mar 28, 2022
d0b6ed6
Merge remote-tracking branch 'origin/master' into ip-1376-formatting
Apr 2, 2022
97f0dde
wip
Apr 2, 2022
8602bc3
wip
Apr 2, 2022
0334186
wip
Apr 2, 2022
3a513d0
wip
Apr 2, 2022
64c6aa9
wip
Apr 2, 2022
4f290f4
update semaphore
Apr 2, 2022
4d3f970
wip
Apr 2, 2022
b6a18bc
wip
Apr 2, 2022
a02ee12
wip
Apr 2, 2022
e99b407
wip
Apr 2, 2022
5a51d38
wip
Apr 2, 2022
5260240
wip
Apr 5, 2022
5927d0f
wip
Apr 5, 2022
0be8d55
wip
Apr 5, 2022
146b5ae
wip
Apr 5, 2022
1d7d642
wip
Apr 5, 2022
5add082
wip
Apr 5, 2022
2996ef7
wip
Apr 5, 2022
dee0035
wip
Apr 5, 2022
c7de4e9
fix
Apr 6, 2022
d86591d
wip
Apr 6, 2022
3089e81
wip
Apr 6, 2022
76aa50d
wip
Apr 6, 2022
61279a6
wip
Apr 6, 2022
f83f39c
wip
Apr 6, 2022
9479a23
wip
Apr 6, 2022
a614bc1
Merge remote-tracking branch 'origin/master' into ip-1376-formatting
Apr 6, 2022
c6e7dc7
wip
Apr 6, 2022
ff1dc2a
wip
Apr 7, 2022
6c21a29
Merge branch 'master' into ip-1376-formatting
Apr 9, 2022
8d907ff
Merge branch 'master' into ip-1376-formatting
tomholub Apr 9, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,19 @@ blocks:
- checkout && cd ~/git/flowcrypt-ios/
- cache restore && make dependencies && cache store
- sem-version node 16 && mkdir .custom-npm && cd .custom-npm && npm install npm@8.1.2 && cd ..
- ( cd Core && cache restore core-npm && ../.custom-npm/node_modules/.bin/npm install && cache store core-npm node_modules )
jobs:
- name: TypeScript + Swift tests
- name: Code quality
commands:
- cd Core
- ../.custom-npm/node_modules/.bin/npm run tslint
- ../.custom-npm/node_modules/.bin/npm run eslint
- name: TypeScript tests
commands:
- cd Core
- ../.custom-npm/node_modules/.bin/npm test
- name: Swift tests
commands:
- ( cd Core && cache restore core-npm && ../.custom-npm/node_modules/.bin/npm install && cache store core-npm node_modules && ../.custom-npm/node_modules/.bin/npm test )
- bundle exec fastlane test
after_pipeline:
task:
Expand Down
2 changes: 2 additions & 0 deletions Core/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build/
source/core/types
58 changes: 58 additions & 0 deletions Core/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
module.exports = {
parser: '@typescript-eslint/parser',
env: {
browser: true,
node: true,
commonjs: true,
es6: true
},
globals: {
'$': false,
'chrome': false,
'OpenPGP': false
},
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/base'
// 'plugin:@typescript-eslint/recommended'
],
plugins: [
'no-only-tests',
'header'
],
rules: {
'@typescript-eslint/no-unused-vars': ['error'],
'@typescript-eslint/semi': ['error'],
'indent': ['error', 2, { SwitchCase: 1 }],
'max-len': ['error', { code: 120 }],
'no-constant-condition': 0,
'no-prototype-builtins': 0,
'no-unused-vars': 0,
'no-useless-escape': 0,
'no-only-tests/no-only-tests': ['error', { block: ['ava.default'] }],
'require-atomic-updates': 0,
'no-empty-pattern': 0,
'no-fallthrough': 0,
'no-undef': 0,
'no-control-regex': 0,
'prefer-const': ['error', {
destructuring: 'all',
}],
'semi': 0,
'sort-imports': ['off', {
"ignoreCase": false,
"ignoreDeclarationSort": false,
"ignoreMemberSort": false,
"memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
}],
'space-before-blocks': ['error', 'always'],
},
overrides: [
{
'files': ['./source/**/*.ts'],
'rules': {
'header/header': ['error', 'block', ' ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com ']
}
}
]
};
31 changes: 31 additions & 0 deletions Core/.jsbeautifyrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"html": {
"brace_style": "collapse" ,
"indent_char": " ",
"indent_scripts": "normal",
"indent_size": 2,
"max_preserve_newlines": 2,
"preserve_newlines": true,
"unformatted": ["a", "sub", "sup", "b", "i", "u"],
"wrap_line_length": 0,
"end_with_newline": true
},
"css": {
"indent_char": " ",
"indent_size": 2,
"end_with_newline": true
},
"js": {
"space_after_anon_function": false,
"space_before_conditional": false,
"indent_size": 2,
"indent_char": " ",
"indent_level": 0,
"indent_with_tabs": false,
"preserve_newlines": true,
"max_preserve_newlines": 2,
"brace_style": "collapse-preserve-inline",
"jslint_happy": true,
"end_with_newline": true
}
}
1 change: 1 addition & 0 deletions Core/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=true
11 changes: 11 additions & 0 deletions Core/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
{
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"eslint.validate": [
"javascript",
"typescript"
],
"editor.rulers": [
80,
100,
120
]
}
Loading