Skip to content

Commit

Permalink
Merge origin/main
Browse files Browse the repository at this point in the history
  • Loading branch information
cmdcolin committed Oct 28, 2022
2 parents e548f2f + cb4ebf9 commit 5b87421
Show file tree
Hide file tree
Showing 1,855 changed files with 159,306 additions and 91,409 deletions.
7 changes: 7 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
**/node_modules/**
**/build/**
**/dist/**
**/esm/**
**/umd/**
**/lib/**
**/tmp/**
Expand All @@ -12,3 +13,9 @@ products/jbrowse-web/scripts/**
/products/jbrowse-web/config/
products/jbrowse-desktop/public/electron.js
products/jbrowse-desktop/public/generateFastaIndex.js
/demos/
webpack.config.js
craco.config.js
packages/core/util/QuickLRU.js
packages/core/util/QuickLRU.d.ts
**/umd_plugin.js
123 changes: 0 additions & 123 deletions .eslintrc.base.json

This file was deleted.

5 changes: 0 additions & 5 deletions .eslintrc.js

This file was deleted.

133 changes: 133 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"env": {
"browser": true
},
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:monorepo/recommended",
"plugin:prettier/recommended",
"react-app"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"project": "./tsconfig.json"
},
"plugins": ["@typescript-eslint", "eslint-plugin-tsdoc"],
"rules": {
"@typescript-eslint/ban-ts-ignore": "off",
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/ban-types": "off",
"@typescript-eslint/camelcase": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-unused-vars": ["warn"],
"@typescript-eslint/no-unused-expressions": "off",
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-redeclare": "off",

"no-use-before-define": "off",
"curly": "error",
"no-global-assign": "warn",
"no-console": [
"warn",
{
"allow": ["error", "warn"]
}
],
"no-debugger": "warn",
"no-undef": "error",
"no-underscore-dangle": "warn",

"import/no-extraneous-dependencies": "error",
"import/no-anonymous-default-export": "off",
"monorepo/no-internal-import": "off",
"prettier/prettier": "warn",
"react/no-danger": "warn",
"react/prop-types": "off",
"react/destructuring-assignment": "error",
"react/no-unused-prop-types": "error",
"react/no-unused-state": "error",
"react/prefer-stateless-function": "error",
"spaced-comment": [
"error",
"always",
{
"markers": ["/"]
}
]
},
"overrides": [
{
"files": ["**/*.ts", "**/*.tsx"],
"rules": {
"tsdoc/syntax": "warn"
}
},
{
"files": ["**/jbrowse-cli/**/*.test.ts", "**/jbrowse-cli/**/*.test.tsx"],
"rules": {
"tsdoc/syntax": "off"
}
},
{
"files": [
"**/test/**",
"**/*.test.[t,j]s",
"**/*.test.[t,j]sx",
"**/rescripts/*",
"**/tests/util.js",
"**/webpack.config.js",
"**/scripts/notarize.js",
"**/src/testUtil.ts"
],
"env": {
"jest": true
},
"globals": {
"document": true,
"it": true,
"describe": true,
"test": true
},
"rules": {
"import/no-extraneous-dependencies": "off"
}
},
{
"files": ["**/component_test/**"],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"project": "./component_test/tsconfig.json"
}
},
{
"files": ["**/component_test/cypress/**"],
"extends": ["plugin:cypress/recommended"],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"project": "./component_test/cypress/tsconfig.json"
}
},
{
"files": [
"./plugin-development-tools/**/*.[t,j]s",
"./plugin-development-tools/**/*.[t,j]sx"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"project": "./plugin-development-tools/tsconfig.json"
}
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install deps and build (with cache)
uses: bahmutov/npm-install@v1
- name: Lint codebase
run: yarn eslint --config .eslintrc.base.json --no-eslintrc --report-unused-disable-directives --max-warnings 0 --ext .js,.ts,.jsx,.tsx .
run: yarn lint

format:
name: Format on node 14 and ubuntu-latest
Expand Down
26 changes: 15 additions & 11 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
run: yarn typecheck

buildwebsite:
name: Build website on node 14 and ubuntu-latest
name: Build website on node 16 and ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14
- name: Use Node.js 16
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '16'
- name: Install website deps (with cache)
uses: bahmutov/npm-install@v1
with:
Expand All @@ -39,28 +39,32 @@ jobs:
cd website/
yarn build
buildwholerepo:
name: Build whole repo on node 14 and ubuntu-latest
name: Build whole repo on node 16 and ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14
- name: Use Node.js 16
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '16'
- name: Install deps (with cache)
uses: bahmutov/npm-install@v1
- name: Build codebase
run: yarn build
- name: Test build
run: BUILT_TESTS=1 yarn built-test-ci
- name: Test embedded
# CI=false since we have a warning that gets treated as an error under CI
# Warning is: "Critical dependency: the request of a dependency is an expression"
- name: Test embedded lgv
run: |
yarn
CI=false yarn build
yarn build
yarn test:e2e
working-directory: component_tests/lgv
- name: Test embedded cgv
run: |
yarn
yarn build
yarn test:e2e
working-directory: component_test
working-directory: component_tests/cgv

buildjbrowseweb:
name: Build only jbrowse-web and upload to s3 on node 14 and ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '16'
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
Expand Down Expand Up @@ -49,6 +49,6 @@ jobs:
- name: Upload
run: |
cd website/
aws s3 sync build s3://jbrowse.org/jb2/
aws s3 sync --delete build s3://jbrowse.org/jb2/
aws s3 cp jbrowse2.pdf s3://jbrowse.org/jb2/
aws cloudfront create-invalidation --distribution-id E13LGELJOT4GQO --paths "/jb2/*"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ yalc.lock
**/package-lock.json
**/__diff_output__/
**/dist/
**/esm/
lerna-debug.log
.yarn
.yarnrc
*.tsbuildinfo
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

node scripts/pre-commit.js
4 changes: 3 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
**/coverage/
**/umd
**/dist/
**/esm/
**/build/
**/lib/
**/tmp/
**/.docusaurus/**
**/titlemod.md
**/combined.md
**/cli.md

**/.next/
**/_next/
# JSON files we don't want to format
**/*nclist*/**/*.json
**/ensembl_genes/**/*.json
Loading

0 comments on commit 5b87421

Please sign in to comment.