Skip to content

Commit 7fa015c

Browse files
authored
Merge pull request #320 from onflow/staging
Release 0.15.7
2 parents bc0576c + d00fd93 commit 7fa015c

File tree

106 files changed

+8107
-6270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+8107
-6270
lines changed

.eslintrc

+8-19
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,22 @@
11
{
2-
"parser": "babel-eslint",
2+
"parser": "@babel/eslint-parser",
33
"extends": [
4-
"react-app",
5-
"prettier",
6-
"prettier/react",
7-
"prettier/standard",
8-
"prettier/@typescript-eslint",
4+
"eslint:recommended",
5+
"plugin:react/recommended",
6+
"plugin:react-hooks/recommended",
97
"plugin:jsx-a11y/recommended"
108
],
11-
"plugins": ["prettier", "react", "jsx-a11y", "cypress", "graphql"],
12-
"parserOptions": {
13-
"ecmaVersion": 7,
14-
"sourceType": "module",
15-
"ecmaFeatures": {
16-
"jsx": true
17-
}
18-
},
9+
"plugins": ["react", "jsx-a11y"],
1910
"env": {
2011
"browser": true,
2112
"node": true,
2213
"jest": true,
2314
"webextensions": true,
24-
"es6": true,
25-
"cypress/globals": true
15+
"es6": true
2616
},
2717
"globals": {
28-
"Raven": true
18+
"Raven": true,
19+
"globalThis": true
2920
},
3021
"rules": {
3122
"no-undef": 2,
@@ -35,7 +26,6 @@
3526
"ignoreRestSiblings": true
3627
}
3728
],
38-
"prettier/prettier": 2,
3929
"react/button-has-type": 2,
4030
"react/default-props-match-prop-types": 2,
4131
"react/no-access-state-in-setstate": 2,
@@ -81,7 +71,6 @@
8171
"parser": "@typescript-eslint/parser",
8272
"plugins": ["@typescript-eslint"],
8373
"rules": {
84-
"prettier/prettier": 1,
8574
"no-undef": 0,
8675
"no-unused-vars": 0,
8776
"@typescript-eslint/no-unused-vars": 2,

.github/workflows/ci.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@ name: Continuous Integration
33
on:
44
push:
55

6+
env:
7+
PLAYGROUND_API: ''
8+
AVATAAR_URL: ''
9+
GA_TRACKING_CODE: ''
10+
MIXPANEL_TOKEN: ''
11+
DEFAULT_SEO_IMAGE: ''
12+
SENTRY_DSN: ''
13+
614
jobs:
715
test:
8-
name: "Tests"
16+
name: 'Tests'
917
runs-on: ubuntu-latest
1018
strategy:
1119
matrix:

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/src/api/apollo/generated

Makefile

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ install:
2525
$(info Task: install)
2626
$(EXEC) sh -c 'npm install || exit 255'
2727

28+
.PHONY: format
29+
format:
30+
$(info Task: format:check)
31+
$(EXEC) sh -c 'npm run format:check:app || exit 255'
32+
2833
.PHONY: build
2934
build:
3035
$(info Task: build production)
@@ -36,4 +41,4 @@ test:
3641
$(EXEC) sh -c 'npm run test || exit 255'
3742

3843
.PHONY: ci
39-
ci: clean install build test
44+
ci: clean install format build test

0 commit comments

Comments
 (0)