aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml32
-rw-r--r--.nvmrc2
-rw-r--r--README.md2
-rw-r--r--package-lock.json24
4 files changed, 29 insertions, 31 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 967844b91..945b62c18 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,7 +80,7 @@ workflows:
jobs:
prep-deps-npm:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- run:
@@ -94,7 +94,7 @@ jobs:
prep-build:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -113,7 +113,7 @@ jobs:
prep-docs:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -128,7 +128,7 @@ jobs:
prep-scss:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -147,7 +147,7 @@ jobs:
test-lint:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -158,7 +158,7 @@ jobs:
test-deps:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -182,7 +182,7 @@ jobs:
# destination: test-artifacts
test-e2e-chrome:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -197,7 +197,7 @@ jobs:
test-e2e-firefox:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- run:
@@ -215,7 +215,7 @@ jobs:
job-screens:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -230,7 +230,7 @@ jobs:
job-publish-prerelease:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -250,7 +250,7 @@ jobs:
job-publish-release:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -267,7 +267,7 @@ jobs:
test-unit:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -277,7 +277,7 @@ jobs:
command: npm run test:coverage
test-mozilla-lint:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -288,7 +288,7 @@ jobs:
test-integration-flat-firefox:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -304,7 +304,7 @@ jobs:
environment:
browsers: '["Chrome"]'
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- checkout
- attach_workspace:
@@ -315,7 +315,7 @@ jobs:
all-tests-pass:
docker:
- - image: circleci/node:8.16-browsers
+ - image: circleci/node:10.16-browsers
steps:
- run:
name: All Tests Passed
diff --git a/.nvmrc b/.nvmrc
index 676dd7eab..f0da09441 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v8.16
+v10.16.0
diff --git a/README.md b/README.md
index 6a0f4fef3..055d9053b 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ To learn how to contribute to the MetaMask project itself, visit our [Internal D
## Building locally
-- Install [Node.js](https://nodejs.org) version 8 and the latest available npm@6
+- Install [Node.js](https://nodejs.org) version 10 and the latest available npm@6
- If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you.
- If you install Node.js manually, ensure you're using npm@6
- Install npm@6 using `npm install -g npm@6`
diff --git a/package-lock.json b/package-lock.json
index 92b8aa3e8..777cf424e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30740,15 +30740,6 @@
"safe-buffer": "^5.0.1"
}
},
- "sha3": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.2.tgz",
- "integrity": "sha1-pmxQmN5MJbyIM27ItIF9AFvKe6k=",
- "dev": true,
- "requires": {
- "nan": "2.10.0"
- }
- },
"shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -48119,11 +48110,18 @@
}
},
"sha3": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.0.tgz",
- "integrity": "sha1-aYnxtwpJhwWHajc+LGKs6WqpOZo=",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.3.tgz",
+ "integrity": "sha512-sOWDZi8cDBRkLfWOw18wvJyNblXDHzwMGnRWut8zNNeIeLnmMRO17bjpLc7OzMuj1ASUgx2IyohzUCAl+Kx5vA==",
"requires": {
- "nan": "^2.0.5"
+ "nan": "2.13.2"
+ },
+ "dependencies": {
+ "nan": {
+ "version": "2.13.2",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
+ "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
+ }
}
},
"shallow-clone": {