mirror of
https://gitlab.com/timvisee/send.git
synced 2024-11-08 12:12:37 +01:00
updated node to 12
This commit is contained in:
parent
01110b4ec1
commit
89469e3c9c
@ -2,7 +2,7 @@ version: 2.0
|
||||
jobs:
|
||||
test:
|
||||
docker:
|
||||
- image: circleci/node:10-browsers
|
||||
- image: circleci/node:12-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- run: npm ci
|
||||
@ -12,7 +12,7 @@ jobs:
|
||||
path: coverage
|
||||
integration_tests:
|
||||
docker:
|
||||
- image: circleci/node:10-browsers
|
||||
- image: circleci/node:12-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- run: npm ci
|
||||
@ -21,7 +21,7 @@ jobs:
|
||||
command: ./scripts/bin/run-integration-test-circleci.sh
|
||||
deploy_dev:
|
||||
docker:
|
||||
- image: circleci/node:10
|
||||
- image: circleci/node:12
|
||||
steps:
|
||||
- checkout
|
||||
- setup_remote_docker
|
||||
@ -30,7 +30,7 @@ jobs:
|
||||
- run: docker push mozilla/send:latest
|
||||
deploy_vnext:
|
||||
docker:
|
||||
- image: circleci/node:10
|
||||
- image: circleci/node:12
|
||||
steps:
|
||||
- checkout
|
||||
- setup_remote_docker
|
||||
@ -39,7 +39,7 @@ jobs:
|
||||
- run: docker push mozilla/send:vnext
|
||||
deploy_stage:
|
||||
docker:
|
||||
- image: circleci/node:10
|
||||
- image: circleci/node:12
|
||||
steps:
|
||||
- checkout
|
||||
- setup_remote_docker
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
|
||||
# Build project
|
||||
FROM node:10 AS builder
|
||||
FROM node:12 AS builder
|
||||
RUN set -x \
|
||||
# Add user
|
||||
&& addgroup --gid 10001 app \
|
||||
@ -27,7 +27,7 @@ RUN set -x \
|
||||
|
||||
|
||||
# Main image
|
||||
FROM node:10-slim
|
||||
FROM node:12-slim
|
||||
RUN set -x \
|
||||
# Add user
|
||||
&& addgroup --gid 10001 app \
|
||||
|
11606
package-lock.json
generated
11606
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
12
package.json
12
package.json
@ -26,7 +26,7 @@
|
||||
"test:frontend": "cross-env NODE_ENV=development node test/frontend/runner.js",
|
||||
"test:report": "nyc report --reporter=html",
|
||||
"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",
|
||||
"android": "cross-env ANDROID=1 npm start",
|
||||
"prod": "node server/bin/prod.js"
|
||||
@ -58,7 +58,7 @@
|
||||
"cache": true
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.0.0 <11.0.0"
|
||||
"node": "^12.16.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.7.2",
|
||||
@ -122,14 +122,6 @@
|
||||
"svgo-loader": "^2.2.1",
|
||||
"tailwindcss": "^1.1.3",
|
||||
"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-cli": "^3.3.10",
|
||||
"webpack-dev-middleware": "^3.7.2",
|
||||
|
@ -10,7 +10,7 @@ module.exports = async function(req, res) {
|
||||
const fileStream = await storage.get(id);
|
||||
let cancelled = false;
|
||||
|
||||
req.on('close', () => {
|
||||
req.on('aborted', () => {
|
||||
cancelled = true;
|
||||
fileStream.destroy();
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user