Skip to content
This repository has been archived by the owner on Jan 25, 2022. It is now read-only.

Commit

Permalink
Update plugin permissions flow (#87)
Browse files Browse the repository at this point in the history
* update plugin permissions flow

add wallet_installPlugins method
add wallet_enable method
update inpage provider
add LoginPerSite background changes
  • Loading branch information
rekmarks authored Dec 13, 2019
1 parent 7f884a2 commit f501f62
Show file tree
Hide file tree
Showing 471 changed files with 12,804 additions and 9,230 deletions.
70 changes: 49 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: 2
version: 2.1

workflows:
version: 2
test_and_release:
jobs:
- create_release_pull_request:
Expand All @@ -23,6 +22,7 @@ workflows:
- test-lint:
requires:
- prep-deps
- test-lint-shellcheck
# - test-e2e-chrome:
# requires:
# - prep-deps
Expand All @@ -32,6 +32,9 @@ workflows:
- test-unit:
requires:
- prep-deps
- test-unit-global:
requires:
- prep-deps
- test-mozilla-lint:
requires:
- prep-deps
Expand All @@ -47,7 +50,9 @@ workflows:
- all-tests-pass:
requires:
- test-lint
- test-lint-shellcheck
- test-unit
- test-unit-global
- test-mozilla-lint
# - test-e2e-chrome
# - test-e2e-firefox
Expand All @@ -74,7 +79,7 @@ workflows:
jobs:
create_release_pull_request:
docker:
- image: circleci/node:8.15.1-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- run:
Expand All @@ -86,13 +91,13 @@ jobs:
prep-deps:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- run:
name: Install deps
command: |
yarn --frozen-lockfile --har
.circleci/scripts/deps-install.sh
- run:
name: Collect yarn install HAR logs
command: |
Expand All @@ -105,7 +110,7 @@ jobs:

prep-build:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -124,7 +129,7 @@ jobs:

prep-docs:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -139,7 +144,7 @@ jobs:

prep-scss:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -158,18 +163,31 @@ jobs:

test-lint:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Test
name: Lint
command: yarn lint
- run:
name: Verify locales
command: yarn verify-locales --quiet

test-lint-shellcheck:
docker:
- image: circleci/node:10.17-browsers
steps:
- checkout
- run: sudo apt-get install shellcheck
- run:
name: Shellcheck Lint
command: yarn lint:shellcheck

test-deps:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -180,7 +198,7 @@ jobs:

test-e2e-chrome:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -195,7 +213,7 @@ jobs:

test-e2e-firefox:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- run:
Expand All @@ -213,7 +231,7 @@ jobs:

job-publish-prerelease:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand Down Expand Up @@ -243,7 +261,7 @@ jobs:

job-publish-release:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -267,7 +285,7 @@ jobs:

test-unit:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -280,9 +298,19 @@ jobs:
paths:
- .nyc_output
- coverage
test-unit-global:
docker:
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
at: .
- run:
name: test:unit:global
command: yarn test:unit:global
test-mozilla-lint:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -293,7 +321,7 @@ jobs:

test-integration-flat-firefox:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -309,7 +337,7 @@ jobs:
environment:
browsers: '["Chrome"]'
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -320,15 +348,15 @@ jobs:

all-tests-pass:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- run:
name: All Tests Passed
command: echo 'weew - everything passed!'

coveralls-upload:
docker:
- image: circleci/node:10.16-browsers
- image: circleci/node:10.17-browsers
steps:
- checkout
- attach_workspace:
Expand Down
25 changes: 25 additions & 0 deletions .circleci/scripts/deps-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/usr/bin/env bash
set -x

yarn --frozen-lockfile --ignore-scripts --har

# run each in subshell so directory change does not persist
# scripts can be any of:
# preinstall
# install
# postinstall

# for build
(cd node_modules/node-sass && yarn run postinstall)
(cd node_modules/optipng-bin && yarn run postinstall)
(cd node_modules/gifsicle && yarn run postinstall)
(cd node_modules/jpegtran-bin && yarn run postinstall)

# for test
(cd node_modules/scrypt && yarn run install)
(cd node_modules/weak && yarn run install)
(cd node_modules/chromedriver && yarn run install)
(cd node_modules/geckodriver && yarn run postinstall)

# for release
(cd node_modules/@sentry/cli && yarn run install)
2 changes: 1 addition & 1 deletion .circleci/scripts/firefox-install
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
set -u
set -o pipefail

FIREFOX_VERSION='68.0'
FIREFOX_VERSION='70.0'
FIREFOX_BINARY="firefox-${FIREFOX_VERSION}.tar.bz2"
FIREFOX_BINARY_URL="https://ftp.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/${FIREFOX_BINARY}"
FIREFOX_PATH='/opt/firefox'
Expand Down
12 changes: 9 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"mocha",
"chai",
"react",
"json"
"json",
"import"
],

"globals": {
Expand All @@ -44,17 +45,18 @@
},

"rules": {
"import/no-unresolved": ["error", { "commonjs": true }],
"no-restricted-globals": ["error", "event"],
"accessor-pairs": 2,
"arrow-spacing": [2, { "before": true, "after": true }],
"block-spacing": [2, "always"],
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
"brace-style": 2,
"camelcase": [2, { "properties": "never" }],
"comma-dangle": [2, "always-multiline"],
"comma-spacing": [2, { "before": false, "after": true }],
"comma-style": [2, "last"],
"constructor-super": 2,
"curly": [2, "multi-line"],
"curly": 2,
"dot-location": [2, "property"],
"eol-last": 2,
"eqeqeq": [2, "allow-null"],
Expand Down Expand Up @@ -147,7 +149,11 @@
"operator-linebreak": [2, "after", { "overrides": { "?": "ignore", ":": "ignore" } }],
"padded-blocks": "off",
"quotes": [2, "single", {"avoidEscape": true, "allowTemplateLiterals": true}],
"react/jsx-boolean-value": 2,
"react/jsx-curly-brace-presence": [2, { "props": "never", "children": "never" }],
"react/jsx-equals-spacing": 2,
"react/no-deprecated": 0,
"react/default-props-match-prop-types": 2,
"semi": [2, "never"],
"semi-spacing": [2, { "before": false, "after": true }],
"space-before-blocks": [2, "always"],
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ package.json @danjm @whymarrh @Gudahtt
yarn.lock @danjm @whymarrh @Gudahtt
ui/ @danjm @whymarrh @Gudahtt
app/scripts/controllers/transactions @frankiebee

.circleci/scripts/deps-install.sh @kumavis @Gudahtt
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v10.16.3
v10.17.0
2 changes: 1 addition & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"always",
{
"ignore": [
"after-comment",
"after-comment"
]
}
],
Expand Down
Loading

0 comments on commit f501f62

Please sign in to comment.