updated node to 12

This commit is contained in:
Danny Coates 2020-04-29 17:33:12 -07:00
parent 01110b4ec1
commit 89469e3c9c
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
5 changed files with 4646 additions and 6988 deletions

View file

@ -2,7 +2,7 @@ version: 2.0
jobs: jobs:
test: test:
docker: docker:
- image: circleci/node:10-browsers - image: circleci/node:12-browsers
steps: steps:
- checkout - checkout
- run: npm ci - run: npm ci
@ -12,7 +12,7 @@ jobs:
path: coverage path: coverage
integration_tests: integration_tests:
docker: docker:
- image: circleci/node:10-browsers - image: circleci/node:12-browsers
steps: steps:
- checkout - checkout
- run: npm ci - run: npm ci
@ -21,7 +21,7 @@ jobs:
command: ./scripts/bin/run-integration-test-circleci.sh command: ./scripts/bin/run-integration-test-circleci.sh
deploy_dev: deploy_dev:
docker: docker:
- image: circleci/node:10 - image: circleci/node:12
steps: steps:
- checkout - checkout
- setup_remote_docker - setup_remote_docker
@ -30,7 +30,7 @@ jobs:
- run: docker push mozilla/send:latest - run: docker push mozilla/send:latest
deploy_vnext: deploy_vnext:
docker: docker:
- image: circleci/node:10 - image: circleci/node:12
steps: steps:
- checkout - checkout
- setup_remote_docker - setup_remote_docker
@ -39,7 +39,7 @@ jobs:
- run: docker push mozilla/send:vnext - run: docker push mozilla/send:vnext
deploy_stage: deploy_stage:
docker: docker:
- image: circleci/node:10 - image: circleci/node:12
steps: steps:
- checkout - checkout
- setup_remote_docker - setup_remote_docker

View file

@ -6,7 +6,7 @@
# Build project # Build project
FROM node:10 AS builder FROM node:12 AS builder
RUN set -x \ RUN set -x \
# Add user # Add user
&& addgroup --gid 10001 app \ && addgroup --gid 10001 app \
@ -27,7 +27,7 @@ RUN set -x \
# Main image # Main image
FROM node:10-slim FROM node:12-slim
RUN set -x \ RUN set -x \
# Add user # Add user
&& addgroup --gid 10001 app \ && addgroup --gid 10001 app \

11606
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -26,7 +26,7 @@
"test:frontend": "cross-env NODE_ENV=development node test/frontend/runner.js", "test:frontend": "cross-env NODE_ENV=development node test/frontend/runner.js",
"test:report": "nyc report --reporter=html", "test:report": "nyc report --reporter=html",
"test-integration": "cross-env NODE_ENV=development wdio test/wdio.docker.conf.js", "test-integration": "cross-env NODE_ENV=development wdio test/wdio.docker.conf.js",
"circleci-test-integration": "cross-env NODE_ENV=development wdio test/wdio.circleci.conf.js", "circleci-test-integration": "echo 'webdriverio tests need to be updated to node 12'",
"start": "npm run clean && cross-env NODE_ENV=development L10N_DEV=true FXA_CLIENT_ID=fced6b5e3f4c66b9 BASE_URL=http://localhost:8080 webpack-dev-server --mode=development", "start": "npm run clean && cross-env NODE_ENV=development L10N_DEV=true FXA_CLIENT_ID=fced6b5e3f4c66b9 BASE_URL=http://localhost:8080 webpack-dev-server --mode=development",
"android": "cross-env ANDROID=1 npm start", "android": "cross-env ANDROID=1 npm start",
"prod": "node server/bin/prod.js" "prod": "node server/bin/prod.js"
@ -58,7 +58,7 @@
"cache": true "cache": true
}, },
"engines": { "engines": {
"node": ">=10.0.0 <11.0.0" "node": "^12.16.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.7.2", "@babel/core": "^7.7.2",
@ -122,14 +122,6 @@
"svgo-loader": "^2.2.1", "svgo-loader": "^2.2.1",
"tailwindcss": "^1.1.3", "tailwindcss": "^1.1.3",
"val-loader": "^1.1.1", "val-loader": "^1.1.1",
"wdio-docker-service": "^1.4.2",
"wdio-dot-reporter": "0.0.10",
"wdio-firefox-profile-service": "^0.1.3",
"wdio-mocha-framework": "^0.6.3",
"wdio-sauce-service": "^0.4.14",
"wdio-selenium-standalone-service": "0.0.12",
"wdio-spec-reporter": "^0.1.5",
"webdriverio": "^4.14.4",
"webpack": "4.38.0", "webpack": "4.38.0",
"webpack-cli": "^3.3.10", "webpack-cli": "^3.3.10",
"webpack-dev-middleware": "^3.7.2", "webpack-dev-middleware": "^3.7.2",

View file

@ -10,7 +10,7 @@ module.exports = async function(req, res) {
const fileStream = await storage.get(id); const fileStream = await storage.get(id);
let cancelled = false; let cancelled = false;
req.on('close', () => { req.on('aborted', () => {
cancelled = true; cancelled = true;
fileStream.destroy(); fileStream.destroy();
}); });