Skip to content

Commit

Permalink
Merge pull request #764 from CSCfi/develop
Browse files Browse the repository at this point in the history
release v0.13.0
  • Loading branch information
hannyle authored Apr 7, 2022
2 parents b5614bc + 349d253 commit 024d4bc
Show file tree
Hide file tree
Showing 215 changed files with 26,765 additions and 14,664 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/**/*.d.ts
18 changes: 13 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,28 @@
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:flowtype/recommended",
"plugin:import/errors",
"plugin:import/warnings"
"plugin:import/warnings",
"plugin:import/typescript",
"plugin:@typescript-eslint/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": ["react", "jest", "flowtype", "import"],
"plugins": ["react", "jest", "import", "@typescript-eslint", "react-hooks"],
"settings": {
"react": {
"version": "detect"
},
"import/resolver": {
"node": {
"paths": ["src"]
"paths": ["src"],
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
},
Expand All @@ -49,7 +52,12 @@
],
"pathGroupsExcludedImportTypes": ["builtin"]
}
]
],
"no-unused-vars": "off",
"react-hooks/rules-of-hooks": "error",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/explicit-module-boundary-types": "off"
},
"ignorePatterns": ["node_modules/*", "build/*", ".github/*"],
"globals": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["14"]
node: ["16"]
name: ESLint check
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup node ${{ matrix.node }}
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- name: Install dependencies
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/e2etests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["14"]
node: ["16"]
browser: ["firefox", "chrome"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build Frontend
run: |
sudo npm install -g [email protected]
npx --quiet pinst --disable
npm install --production
npm run build --production
Expand All @@ -26,7 +25,7 @@ jobs:
echo "VERSION=develop" >> $GITHUB_ENV
fi
- name: Clone backend
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: 'CSCfi/metadata-submitter'
ref: ${{ env.VERSION }}
Expand All @@ -35,7 +34,7 @@ jobs:
run: |
mkdir -p metadata-submitter/metadata_backend/frontend
cp -r build/* metadata-submitter/metadata_backend/frontend/
docker-compose -f metadata-submitter/docker-compose.yml up -d --build
docker-compose -f metadata-submitter/docker-compose.yml --env-file metadata-submitter/.env.example up -d --build
sleep 30
- uses: cypress-io/github-action@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/formatstyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["14"]
node: ["16"]
name: Prettier check
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup node ${{ matrix.node }}
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- name: Install dependencies
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/typecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["14"]
name: Flow check
node: ["16"]
name: TypeScript check
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup node ${{ matrix.node }}
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- name: Install dependencies
run: |
npm ci
- name: Run type checks with Flow
- name: Run type checks with TSC
run: |
npm run flow:check
npm run tsc
6 changes: 3 additions & 3 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["14"]
node: ["16"]
name: Jest unit tests and coveralls push
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup node ${{ matrix.node }}
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies and coveralls
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm run concurrently -- "npm:lint:check" "npm:format:check" "npm:flow:check" "npm:test:noninteractive"
npm run concurrently -- "npm:lint:check" "npm:format:check" "npm:tsc" "npm:test:noninteractive"
Loading

0 comments on commit 024d4bc

Please sign in to comment.