Skip to content

Commit

Permalink
Merge pull request #2423 from Lumieducation/master
Browse files Browse the repository at this point in the history
Release next version
  • Loading branch information
JPSchellenberg committed Oct 25, 2022
2 parents 9ddf7ba + d84f545 commit 0e775e1
Show file tree
Hide file tree
Showing 51 changed files with 23,216 additions and 20,231 deletions.
11 changes: 11 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
test/data
build
reporter-client/build
/*.js
builder-configs
/h5p
/dist
/scorm-client
/scripts
/test
/server/__mocks__
83 changes: 83 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
const path = require('path');

module.exports = {
env: {
browser: true,
node: true
},
root: true,
extends: [
//'eslint:recommended',
//'plugin:@typescript-eslint/recommended',
'airbnb-typescript',
'prettier'
],
parser: '@typescript-eslint/parser',
parserOptions: {
project: path.join(__dirname, 'tsconfig.json'),
sourceType: 'module'
},
plugins: ['prettier', '@typescript-eslint', 'import', 'react'],
rules: {
'no-script-url': 0,
'no-restricted-syntax': 0,
'@typescript-eslint/lines-between-class-members': 0,
'no-await-in-loop': 1,
'@typescript-eslint/no-loop-func': 0,
'no-return-assign': 1,
'import/prefer-default-export': 0, // TODO: change to 1 later
'@typescript-eslint/no-unused-vars': 1,
'class-methods-use-this': 1,
'no-param-reassign': 1,
'no-nested-ternary': 1,
'no-continue': 0,
'no-case-declarations': 0,
'prettier/prettier': 'error',
'@typescript-eslint/typedef': [
'error',
{
parameter: true,
propertyDeclaration: true,
memberVariableDeclaration: true,
variableDeclarationIgnoreFunction: true
}
],
'@typescript-eslint/explicit-module-boundary-types': [
'error',
{
allowArgumentsExplicitlyTypedAsAny: true,
allowHigherOrderFunctions: true,
allowTypedFunctionExpressions: true
}
],
'@typescript-eslint/explicit-function-return-type': [
'error',
{
allowExpressions: true
}
],
'@typescript-eslint/member-ordering': [
'error',
{
default: [
'public-constructor',
'private-constructor',
'public-static-field',
'private-static-field',
'public-instance-field',
'private-instance-field',
'public-static-method',
'private-static-method',
'public-instance-method',
'private-instance-method'
]
}
],
'class-methods-use-this': 0
},
settings: {
react: {
version: '17.0'
}
}
};
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ jobs:
with:
token: ${{ secrets.NPM_TOKEN }}
- name: install server
run: npm ci
run: npm ci --legacy-peer-deps
env:
NPM_TOKEN: $${ secrets.NPM_TOKEN }
- name: Copy NPM config
run: cp ./.npmrc ./client/.npmrc && cp ./.npmrc ./reporter-client/.npmrc
- name: install client(s)
run: (cd client && npm ci) && (cd ../reporter-client && npm ci)
run: (cd client && npm ci --legacy-peer-deps) && (cd ../reporter-client && npm ci --legacy-peer-deps)
env:
NPM_TOKEN: $${ secrets.NPM_TOKEN }
- name: Build
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ be read in full [here](./CODE-OF-CONDUCT.md).

### Get in touch

[Slack](https://join.slack.com/t/lumi-education/shared_invite/enQtMjY0MTM2NjIwNDU0LWU3YzVhZjdkNGFjZGE1YThjNzBiMmJjY2I2ODk2MzAzNDE3YzI0MmFkOTdmZWZhOTBmY2RjOTc3ZmZmOWMxY2U)
or [c@lumi.education](mailto:c@lumi.education).
Contact us at [c@lumi.education](mailto:c@lumi.education).

## Versioning

Expand Down
Loading

0 comments on commit 0e775e1

Please sign in to comment.