Skip to content
This repository has been archived by the owner on Sep 19, 2021. It is now read-only.

Commit

Permalink
upgrade packages and fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
RoshanSyed committed Apr 30, 2021
2 parents 8f4ab06 + fbc7dcc commit 3ba34a8
Show file tree
Hide file tree
Showing 271 changed files with 27,372 additions and 15,309 deletions.
14 changes: 0 additions & 14 deletions .env

This file was deleted.

134 changes: 67 additions & 67 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,73 +11,73 @@
"browser": true
},
"rules": {
"jsx-quotes": [2, "prefer-single"],
"react/jsx-curly-spacing": [2, "always"],
"react/prefer-stateless-function": "off",
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"react/no-deprecated": "off",
"jsx-a11y/href-no-hash": "off",
"no-throw-literal": "off",
"operator-assignment": "off",
"no-unused-vars": ["error", {
"vars": "all", "args": "after-used"
}],
"comma-dangle": "error",
"indent": ["error", 2, {"SwitchCase": 1}],
"quotes": ["error", "single"],
"semi": ["error", "always"],
"no-console": "off",
"camelcase": "off",
"object-curly-spacing": ["error", "never"],
"prefer-const": "off",
"no-underscore-dangle": "off",
"no-param-reassign": "off",
"no-plusplus": "off",
"no-trailing-spaces": "error",
"no-useless-escape": "off",
"no-restricted-properties": "off",
"consistent-return": "off",
"guard-for-in": "off",
"no-loop-func": "off",
"curly": ["error", "all"],
"brace-style": ["error", "1tbs"],
"default-case": "error",
"prefer-destructuring": "off",
"padding-line-between-statements": [
"error",
{ "blankLine": "always", "prev": "*", "next": "block-like" },
{ "blankLine": "always", "prev": "block-like", "next": "*" }
],
"max-len": ["error", {"code": 200}],
"implicit-arrow-linebreak": ["error", "beside"],
"no-control-regex": "off",
"arrow-parens": ["error", "always"],
"jsdoc/check-alignment": "warn", // Recommended
"jsdoc/check-examples": 0,
"jsdoc/check-indentation": "warn",
"jsdoc/check-param-names": "warn", // Recommended
"jsdoc/check-syntax": "warn",
"jsdoc/check-tag-names": "warn", // Recommended
"jsdoc/check-types": "warn", // Recommended
"jsdoc/implements-on-classes": "warn", // Recommended
"jsdoc/match-description": "warn",
"jsdoc/newline-after-description": "warn", // Recommended
"jsdoc/no-types": 0,
"jsdoc/no-undefined-types": "warn", // Recommended
"jsdoc/require-description": 0,
"jsdoc/require-description-complete-sentence": "warn",
"jsdoc/require-example": 0,
"jsdoc/require-hyphen-before-param-description": "warn",
"jsdoc/require-jsdoc": "warn", // Recommended
"jsdoc/require-param": "warn", // Recommended
"jsdoc/require-param-description": "warn", // Recommended
"jsdoc/require-param-name": "warn", // Recommended
"jsdoc/require-param-type": "warn", // Recommended
"jsdoc/require-returns": "warn", // Recommended
"jsdoc/require-returns-check": "warn", // Recommended
"jsdoc/require-returns-description": 0, // Recommended
"jsdoc/require-returns-type": "warn", // Recommended
"jsdoc/valid-types": "warn" // Recommended
// "jsx-quotes": [2, "prefer-single"],
// "react/jsx-curly-spacing": [2, "always"],
// "react/prefer-stateless-function": "off",
// "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
// "react/no-deprecated": "off",
// "jsx-a11y/href-no-hash": "off",
// "no-throw-literal": "off",
// "operator-assignment": "off",
// "no-unused-vars": ["error", {
// "vars": "all", "args": "after-used"
// }],
// "comma-dangle": "error",
// "indent": ["error", 2, {"SwitchCase": 1}],
// "quotes": ["error", "single"],
// "semi": ["error", "always"],
// "no-console": "off",
// "camelcase": "off",
// "object-curly-spacing": ["error", "never"],
// "prefer-const": "off",
// "no-underscore-dangle": "off",
// "no-param-reassign": "off",
// "no-plusplus": "off",
// "no-trailing-spaces": "error",
// "no-useless-escape": "off",
// "no-restricted-properties": "off",
// "consistent-return": "off",
// "guard-for-in": "off",
// "no-loop-func": "off",
// "curly": ["error", "all"],
// "brace-style": ["error", "1tbs"],
// "default-case": "error",
// "prefer-destructuring": "off",
// "padding-line-between-statements": [
// "error",
// { "blankLine": "always", "prev": "*", "next": "block-like" },
// { "blankLine": "always", "prev": "block-like", "next": "*" }
// ],
// "max-len": ["error", {"code": 200}],
// "implicit-arrow-linebreak": ["error", "beside"],
// "no-control-regex": "off",
// "arrow-parens": ["error", "always"],
// "jsdoc/check-alignment": "warn", // Recommended
// "jsdoc/check-examples": 0,
// "jsdoc/check-indentation": "warn",
// "jsdoc/check-param-names": "warn", // Recommended
// "jsdoc/check-syntax": "warn",
// "jsdoc/check-tag-names": "warn", // Recommended
// "jsdoc/check-types": "warn", // Recommended
// "jsdoc/implements-on-classes": "warn", // Recommended
// "jsdoc/match-description": "warn",
// "jsdoc/newline-after-description": "warn", // Recommended
// "jsdoc/no-types": 0,
// "jsdoc/no-undefined-types": "warn", // Recommended
// "jsdoc/require-description": 0,
// "jsdoc/require-description-complete-sentence": "warn",
// "jsdoc/require-example": 0,
// "jsdoc/require-hyphen-before-param-description": "warn",
// "jsdoc/require-jsdoc": "warn", // Recommended
// "jsdoc/require-param": "warn", // Recommended
// "jsdoc/require-param-description": "warn", // Recommended
// "jsdoc/require-param-name": "warn", // Recommended
// "jsdoc/require-param-type": "warn", // Recommended
// "jsdoc/require-returns": "warn", // Recommended
// "jsdoc/require-returns-check": "warn", // Recommended
// "jsdoc/require-returns-description": 0, // Recommended
// "jsdoc/require-returns-type": "warn", // Recommended
// "jsdoc/valid-types": "warn" // Recommended
},
"settings": {
"import/resolver": "webpack",
Expand Down
67 changes: 67 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ develop ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ develop ]
schedule:
- cron: '36 3 * * 4'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# 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
44 changes: 44 additions & 0 deletions .github/workflows/ossar-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# This workflow integrates a collection of open source static analysis tools
# with GitHub code scanning. For documentation, or to provide feedback, visit
# https://github.com/github/ossar-action
name: OSSAR

on:
push:
branches: [ develop ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ develop ]
schedule:
- cron: '30 9 * * 4'

jobs:
OSSAR-Scan:
# OSSAR runs on windows-latest.
# ubuntu-latest and macos-latest support coming soon
runs-on: windows-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Ensure a compatible version of dotnet is installed.
# The [Microsoft Security Code Analysis CLI](https://aka.ms/mscadocs) is built with dotnet v3.1.201.
# A version greater than or equal to v3.1.201 of dotnet must be installed on the agent in order to run this action.
# GitHub hosted runners already have a compatible version of dotnet installed and this step may be skipped.
# For self-hosted runners, ensure dotnet version 3.1.201 or later is installed by including this action:
# - name: Install .NET
# uses: actions/setup-dotnet@v1
# with:
# dotnet-version: '3.1.x'

# Run open source static analysis tools
- name: Run OSSAR
uses: github/ossar-action@v1
id: ossar

# Upload results to the Security tab
- name: Upload OSSAR results
uses: github/codeql-action/upload-sarif@v1
with:
sarif_file: ${{ steps.ossar.outputs.sarifFile }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
node_modules/

.DS_Store
.env
59 changes: 59 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# gitlab scanning
include:
- template: Dependency-Scanning.gitlab-ci.yml
- template: License-Management.gitlab-ci.yml
- template: SAST.gitlab-ci.yml
- template: Code-Quality.gitlab-ci.yml
- template: DAST.gitlab-ci.yml

variables:
SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task
DAST_WEBSITE: $WEBSITE

retire-js-dependency_scanning:
before_script:
- apk add autoconf libtool automake build-base gcc

dast:
before_script:
- echo "$WEBSITE" > environment_url.txt

# node docker image on which this would be run
image: node:12.18.4

stages:
- test
- deployDev
- dast

# builds app
build:
stage: test
script:
- npm install

tags:
- docker

deploy:
stage: deployDev
script:
- deploy_peerid
tags:
- peerid-runner
only:
refs:
- develop

sonarcloud-check:
image:
name: sonarsource/sonar-scanner-cli:latest
entrypoint: [""]
cache:
key: "${CI_JOB_NAME}"
paths:
- .sonar/cache
script:
- sonar-scanner
when: manual
Loading

0 comments on commit 3ba34a8

Please sign in to comment.