Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
module.exports = {
extends: [
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
],
extends: ["plugin:@typescript-eslint/recommended", "plugin:react/recommended"],
env: {
mocha: true,
es6: true,
browser: true,
},
ignorePatterns: [
"examples/webpack.dev.js",
".eslintrc.js",
"babel.config.js",
],
ignorePatterns: ["examples/webpack.dev.js", ".eslintrc.js", "babel.config.js"],
parser: "@typescript-eslint/parser",
parserOptions: {
project: ["./tsconfig.json", "./src/visGeometry/workers/tsconfig.json"],
Expand Down Expand Up @@ -62,10 +55,7 @@ module.exports = {
"no-var": ["warn"],
// note you must disable the base rule as it can report incorrect errors
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"warn",
{ argsIgnorePattern: "^_" },
],
"@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_" }],
},
settings: {
react: {
Expand Down
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Bug Report
about: '"Something''s wrong..."'
title: ''
title: ""
labels: bug
assignees: ''

assignees: ""
---

## Description
Expand Down
9 changes: 4 additions & 5 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
name: Feature Request
about: '"It would be really cool if x did y..."'
title: ''
labels: ''
assignees: ''
projects: 'Simularium'

title: ""
labels: ""
assignees: ""
projects: "Simularium"
---

## Use Case
Expand Down
9 changes: 2 additions & 7 deletions .github/ISSUE_TEMPLATE/maintenance_task.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
---
name: Maintenance Task
about: '"The code base needs cleanup, dependency updates, tests, etc...."'
title: ''
title: ""
labels: maintenance
assignees: ''

assignees: ""
---

## What needs to happen?



## Why should we do this?



## When does this need to get done?
47 changes: 24 additions & 23 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,48 +1,49 @@
Time Estimate or Size
=======
How long do you expect it to take a reviewer to review this PR?
# Time Estimate or Size

How long do you expect it to take a reviewer to review this PR?
Alternately, is this PR xsmall, small, medium, large, or xlarge?

Problem
=======
# Problem

What is the problem this work solves, including
[Link to story or ticket](https://my-tracking-system.url/ticket-number)

Solution
========
# Solution

What I/we did to solve this problem

with @pairperson1

## Type of change

Please delete options that are not relevant.

* Bug fix (non-breaking change which fixes an issue)
* New feature (non-breaking change which adds functionality)
* Breaking change (fix or feature that would cause existing functionality to not work as expected)
* This change requires a documentation update
* This change requires updated or new tests
- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing functionality to not work as expected)
- This change requires a documentation update
- This change requires updated or new tests

Change summary:
---------------
* Tidy, well formulated commit message
* Another great commit message
* Something else I/we did
## Change summary:

- Tidy, well formulated commit message
- Another great commit message
- Something else I/we did

## Steps to Verify:

Steps to Verify:
----------------
1. A setup step / beginning state
1. What to do next
1. Any other instructions
1. Expected behavior
1. Suggestions for testing

Screenshots (optional):
-----------------------
## Screenshots (optional):

Show-n-tell images/animations here

Keyfiles (delete if not relevant):
-----------------------
## Keyfiles (delete if not relevant):

1. main file/entry point
2. other important file

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ jobs:
- name: Push to branch
uses: moodiest/push-to-branch-action@develop
env:
REPO: self
BRANCH: build
FOLDER: dev-build
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO: self
BRANCH: build
FOLDER: dev-build
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish-stable:
if: startsWith(github.ref, 'refs/tags/v')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'coverage'
name: "coverage"
on:
pull_request:
branches:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/create-issue.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Create Issue

on:
issues:
types: [opened]
issues:
types: [opened]
jobs:
add-to-project:
name: Add issue to project
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
project-url: https://github.com/orgs/simularium/projects/5
github-token: ${{ secrets.SIMULARIUM }}
add-to-project:
name: Add issue to project
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
project-url: https://github.com/orgs/simularium/projects/5
github-token: ${{ secrets.SIMULARIUM }}
70 changes: 35 additions & 35 deletions .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
name: github pages

on:
schedule:
- cron: "0 0 * * *"
schedule:
- cron: "0 0 * * *"

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "16.x"
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "16.x"

- name: Cache dependencies
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: npm ci
- run: npm run gh-build
- name: Prepare tag
id: prepare_tag
if: startsWith(github.ref, 'refs/tags/')
run: |
TAG_NAME="${GITHUB_REF##refs/tags/}"
echo "::set-output name=tag_name::${TAG_NAME}"
echo "::set-output name=deploy_tag_name::deploy-${TAG_NAME}"
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public
tag_name: ${{ steps.prepare_tag.outputs.deploy_tag_name }}
tag_message: 'Deployment to gh-pages to test new viewer ${{ steps.prepare_tag.outputs.tag_name }}'
- name: Cache dependencies

uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-

- run: npm ci
- run: npm run gh-build
- name: Prepare tag
id: prepare_tag
if: startsWith(github.ref, 'refs/tags/')
run: |
TAG_NAME="${GITHUB_REF##refs/tags/}"
echo "::set-output name=tag_name::${TAG_NAME}"
echo "::set-output name=deploy_tag_name::deploy-${TAG_NAME}"
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public
tag_name: ${{ steps.prepare_tag.outputs.deploy_tag_name }}
tag_message: "Deployment to gh-pages to test new viewer ${{ steps.prepare_tag.outputs.tag_name }}"
4 changes: 2 additions & 2 deletions .lintstagedrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"src/**/*.ts": ["prettier --write"]
}
"src/**/*.ts": ["prettier --write"]
}
7 changes: 4 additions & 3 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"trailingComma": "es5",
"tabWidth": 4
}
"printWidth": 120,
"trailingComma": "es5",
"tabWidth": 4
}
Loading
Loading