diff --git a/.env.example b/.env.example index 8e19eccf..e69de29b 100644 --- a/.env.example +++ b/.env.example @@ -1 +0,0 @@ -COUCHDB_URL="http://localhost:5984" diff --git a/.eslintrc.js b/.eslintrc.js index 0b15c56e..dd47d317 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,7 +8,7 @@ module.exports = { ], parser: '@typescript-eslint/parser', parserOptions: { - project: ['./tsconfig.json', './test/tsconfig.json', './src/db/tsconfig.json'], + project: ['./tsconfig.json', './test/tsconfig.json'], tsconfigRootDir: './', }, plugins: ['@typescript-eslint', 'prettier'], diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md index 220fccc7..76ca873d 100644 --- a/.github/ISSUE_TEMPLATE/security.md +++ b/.github/ISSUE_TEMPLATE/security.md @@ -1,6 +1,8 @@ --- name: 👮 Security Issue about: Responsible Disclosure +labels: 'security' + --- ## 👮 [Responsible Disclosure](https://github.com/nodejs/security-wg/blob/master/processes/responsible_disclosure_template.md) @@ -8,4 +10,4 @@ about: Responsible Disclosure Do not open issues that might have security implications. It is critical that security related issues are reported privately so we have time to address them before they become public knowledge. -Vulnerabilities can also be reported by emailing security@hospitalrun.io +Vulnerabilities can also be reported by emailing security@hospitalrun.io diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10095473..558acd59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - node-version: [12.x] + node-version: [10.x, 12.x, 14.x] os: [ubuntu-latest, windows-latest, macOS-latest] # exclude: # - os: windows-latest @@ -36,35 +36,3 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: ./lcov.info - - yarn: - runs-on: ${{ matrix.os }} - strategy: - matrix: - node-version: [12.x] - os: [ubuntu-latest, windows-latest, macOS-latest] - # exclude: - # - os: windows-latest - # node-version: 13.x - steps: - - run: git config --global core.autocrlf false # this is needed to prevent git changing EOL after cloning on Windows OS - - uses: actions/checkout@v2 - - name: Use Node.js - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Init yarn - run: | - npm install -g yarn - - name: Install with yarn - run: | - yarn install - - name: Lint code - run: | - yarn lint - - name: Build - run: | - yarn build:all - - name: Run tests - run: | - yarn test diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 00000000..8df05f7f --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,54 @@ +name: "Code scanning" + +on: + push: + branches: [master] + pull_request: + # The branches below must be a subset of the branches above + branches: [master] + schedule: + - cron: '0 6 * * 6' + +jobs: + CodeQL-Build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + # We must fetch at least the immediate parents so that if this is + # a pull request then we can checkout the head. + fetch-depth: 2 + + # If this run was triggered by a pull request event, then checkout + # the head of the pull request instead of the merge commit. + - run: git checkout HEAD^2 + if: ${{ github.event_name == 'pull_request' }} + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + # Override language selection by uncommenting this and choosing your languages + # with: + # languages: go, javascript, csharp, python, cpp, java + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/.gitignore b/.gitignore index 14bc0e75..71eb1634 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ db/* !db/config.json !db/designs .env +.idea/ diff --git a/.prettierrc b/.prettierrc index 48360d60..87b4a12b 100644 --- a/.prettierrc +++ b/.prettierrc @@ -6,7 +6,7 @@ "trailingComma": "all", "bracketSpacing": true, "jsxBracketSameLine": false, - "arrowParens": "avoid", + "arrowParens": "always", "endOfLine": "lf", "parser": "typescript" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 41a1c654..be9d650f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.0.0-alpha.3](https://github.com/HospitalRun/hospitalrun-server/compare/v2.0.0-alpha.2...v2.0.0-alpha.3) (2020-09-01) + + +### Features + +* add docker compose ([237c1a9](https://github.com/HospitalRun/hospitalrun-server/commit/237c1a99a125fcde565f8e31c5d6186308e9257b)) + ## 2.0.0-alpha.2 (2020-05-17) diff --git a/README.md b/README.md index f1e41551..fcf71fc2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@
HospitalRun Services
.
-(
- doc: P,
- req: CouchDB.RequestObject,
- ) => [Partial