Skip to content

Commit

Permalink
Merge branch 'develop' into feature/support-watchlists
Browse files Browse the repository at this point in the history
  • Loading branch information
“Anton committed Jun 30, 2022
2 parents bff95ab + a4c32cd commit df60310
Show file tree
Hide file tree
Showing 66 changed files with 2,003 additions and 1,394 deletions.
20 changes: 12 additions & 8 deletions .depcheckrc.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
ignores: [
# These are dependencies for vite and vite plugins that depcheck doesn't recognize as being used
"postcss-scss",
"stylelint-order",
"stylelint-config-recommended-scss",
"stylelint-declaration-strict-value",
"stylelint-scss",
'postcss-scss',
'stylelint-order',
'stylelint-config-recommended-scss',
'stylelint-declaration-strict-value',
'stylelint-scss',
# This is used by commitlint in .commitlintrc.js
" @commitlint/config-conventional",
' @commitlint/config-conventional',
# These are vite aliases / tsconfig paths that point to specific local directories
# Note the \\ is apparently necessary to escape the # or the ignore doesn't work
"\\#src",
"\\#test",
"\\#types"
]
"\\#types",
# To support e2e-reports
'allure-commandline',
# To run linting checks
'npm-run-all',
]
8 changes: 8 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Modules
node_modules/

# Test
coverage/

# Build output
build/
43 changes: 20 additions & 23 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ module.exports = {
env: {
// Browser conf
browser: true,
es6 : true,
es6: true,
},

rules : {
rules: {
// Prevent development/debugging statements
'no-console' : ['error', { allow: ['warn', 'error', 'info', 'debug'] }],
'no-alert' : 'error',
'no-console': ['error', { allow: ['warn', 'error', 'info', 'debug'] }],
'no-alert': 'error',
'no-debugger': 'error',

// Prevent usage of confusing globals
Expand All @@ -48,25 +48,25 @@ module.exports = {
'import/order': [
'warn',
{
groups : ['builtin', 'external', 'parent', 'sibling', 'index'],
pathGroups : [
groups: ['builtin', 'external', 'parent', 'sibling', 'index'],
pathGroups: [
// Sort absolute root imports before parent imports
{
pattern : '/**',
group : 'parent',
pattern: '/**',
group: 'parent',
position: 'before',
},
],
'newlines-between': 'always',
},
],
// Not needed in React 17
'react/react-in-jsx-scope': 'off'
'react/react-in-jsx-scope': 'off',
},
overrides: [
{
files: ['*.js'],
env : {
env: {
// We may still use CJS in .js files (eg. local scripts)
commonjs: true,
},
Expand All @@ -83,27 +83,24 @@ module.exports = {
'@typescript-eslint/no-implicit-any-catch': 'error',

// These are handled by TS
'@typescript-eslint/no-explicit-any' : [
'warn',
{ ignoreRestArgs: true },
],
'@typescript-eslint/no-explicit-any': ['warn', { ignoreRestArgs: true }],
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-inferrable-types' : 'off',
'@typescript-eslint/ban-ts-comment' : 'off',
'@typescript-eslint/no-unused-vars' : 'off',
'import/no-unresolved' : 'off',
'@typescript-eslint/no-inferrable-types': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'import/no-unresolved': 'off',
},
},
{
files : ['*.jsx', '*.tsx'],
files: ['*.jsx', '*.tsx'],
plugins: [
// Enable linting React code
'react',
'react-hooks',
],
rules : {
rules: {
// Help with Hooks syntax
'react-hooks/rules-of-hooks' : 'error',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'error',

// Handled by Typescript
Expand All @@ -115,9 +112,9 @@ module.exports = {
},
],

settings : {
settings: {
react: {
pragma : 'React',
pragma: 'React',
version: '17',
},
},
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ name: 'Version Bump'
on:
# Triggers the workflow on push or pull request events but only for the "develop" branch
push:
branches: [ "develop" ]
branches: ['develop']

jobs:
bump-version:
name: 'Bump Version on develop'
Expand All @@ -21,3 +21,4 @@ jobs:
uses: TriPSs/conventional-changelog-action@v3
with:
github-token: ${{ secrets.ACTION_TOKEN }}
release-count: '0'
12 changes: 8 additions & 4 deletions .github/workflows/codeceptjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ on: [pull_request]

jobs:
build:

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
node-version: [14.x]
node-version: [16.x]
config: [desktop, mobile]

steps:
Expand All @@ -27,5 +26,10 @@ jobs:
run: yarn start &
- name: Run tests
run: wait-on -v -t 30000 -c ./scripts/waitOnConfig.js http-get://localhost:8080 && yarn codecept:${{ matrix.config }}
env:
CI: true
- name: Uploading artifact
if: always()
uses: actions/upload-artifact@v3
with:
name: allure-report-${{ matrix.config }}
path: ./test-e2e/output/${{ matrix.config }}
retention-days: 7
2 changes: 1 addition & 1 deletion .github/workflows/lhci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 16.x
- name: yarn install, build
run: |
yarn install
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Linting

on: [pull_request]

jobs:
lint:
runs-on: macos-latest

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: yarn install, lint
run: |
yarn install
yarn lint
env:
CI: true
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ on: [pull_request]

jobs:
build:

runs-on: macos-latest

strategy:
matrix:
node-version: [14.x]
node-version: [16.x]

steps:
- uses: actions/checkout@v1
Expand Down
8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Modules
node_modules/

# Test
coverage/

# Build output
build/
Loading

0 comments on commit df60310

Please sign in to comment.