From 1b482871ac206b4f694080e40508f89b11a6d290 Mon Sep 17 00:00:00 2001 From: Finn Stutzenstein Date: Fri, 5 Feb 2021 12:36:02 +0100 Subject: [PATCH] update client --- .github/workflows/run-tests.yml | 2 +- client/.dockerignore | 1 + client/docker/Dockerfile | 2 +- client/docker/Dockerfile.dev | 2 +- client/package-lock.json | 38 ++++++++++++++++----------------- client/package.json | 1 + 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f9275339b..4b6f9421b 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -59,7 +59,7 @@ jobs: node_modules- - uses: actions/setup-node@v2-beta with: - node-version: "12" + node-version: "14" - name: install client dependencies if: steps.node-module-cache.outputs.cache-hit != 'true' diff --git a/client/.dockerignore b/client/.dockerignore index 75d309b43..531c1e81b 100644 --- a/client/.dockerignore +++ b/client/.dockerignore @@ -1,3 +1,4 @@ .git **/node_modules **/.vscode +build.sh diff --git a/client/docker/Dockerfile b/client/docker/Dockerfile index cc8556755..aced135d4 100644 --- a/client/docker/Dockerfile +++ b/client/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM node:13 AS nodejs +FROM node:14 AS nodejs RUN mkdir -p /build/app WORKDIR /build/app diff --git a/client/docker/Dockerfile.dev b/client/docker/Dockerfile.dev index ac7ce9ee4..0a2ed4eaf 100644 --- a/client/docker/Dockerfile.dev +++ b/client/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM node:13 +FROM node:14 WORKDIR /app diff --git a/client/package-lock.json b/client/package-lock.json index 2f0eaf1c6..187c379f2 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5258,16 +5258,6 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, - "cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "dev": true, - "requires": { - "object-assign": "^4", - "vary": "^1" - } - }, "cosmiconfig": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", @@ -9667,6 +9657,16 @@ "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", "dev": true }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dev": true, + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -9779,6 +9779,12 @@ "is-wsl": "^1.1.0" } }, + "proxy-middleware": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz", + "integrity": "sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=", + "dev": true + }, "readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -12110,9 +12116,9 @@ } }, "pdfjs-dist": { - "version": "2.4.456", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.4.456.tgz", - "integrity": "sha512-yckJEHq3F48hcp6wStEpbN9McOj328Ib09UrBlGAKxvN2k+qYPN5iq6TH6jD1C0pso7zTep+g/CKsYgdrQd5QA==" + "version": "2.5.207", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz", + "integrity": "sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw==" }, "pdfkit": { "version": "0.11.0", @@ -13129,12 +13135,6 @@ "ipaddr.js": "1.9.1" } }, - "proxy-middleware": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz", - "integrity": "sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=", - "dev": true - }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", diff --git a/client/package.json b/client/package.json index d10dd9b53..5e7714b69 100644 --- a/client/package.json +++ b/client/package.json @@ -74,6 +74,7 @@ "ngx-mat-select-search": "^3.0.3", "ngx-material-timepicker": "^5.5.3", "ngx-papaparse": "^4.0.4", + "pdfjs-dist": "2.5.207", "pdfmake": "^0.1.68", "po2json": "^1.0.0-beta-2", "rxjs": "^6.6.2",