From 5d2fb74f7518173498272201a0d5e0d1dc211aad Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 28 Apr 2020 16:09:35 +0200
Subject: [PATCH] Update npm deps; install libgbm1 for chromium in docker
---
packages/common/.gitlab-ci.yml | 2 +-
packages/common/.gitlab-ci/Dockerfile | 2 ++
packages/common/.gitlab-ci/build.sh | 2 +-
packages/common/package.json | 23 ++++++++++++-----------
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/packages/common/.gitlab-ci.yml b/packages/common/.gitlab-ci.yml
index 7dcb7aa6..5cd14136 100644
--- a/packages/common/.gitlab-ci.yml
+++ b/packages/common/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v5
+image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v6
before_script:
- "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules"
diff --git a/packages/common/.gitlab-ci/Dockerfile b/packages/common/.gitlab-ci/Dockerfile
index 74e3b53f..debbcc60 100644
--- a/packages/common/.gitlab-ci/Dockerfile
+++ b/packages/common/.gitlab-ci/Dockerfile
@@ -17,6 +17,8 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
RUN apt-get update && apt-get install -y \
nodejs \
chromium \
+ # libgbm1: newer chromium from puppeteer
+ libgbm1 \
firefox-esr \
composer \
php-zip \
diff --git a/packages/common/.gitlab-ci/build.sh b/packages/common/.gitlab-ci/build.sh
index e204355e..be587c08 100755
--- a/packages/common/.gitlab-ci/build.sh
+++ b/packages/common/.gitlab-ci/build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
set -e
-TAG="registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v5"
+TAG="registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v6"
sudo docker build --tag "${TAG}" --file "Dockerfile" .
echo "Now run: sudo docker push '$TAG'"
diff --git a/packages/common/package.json b/packages/common/package.json
index 74c3637c..2dfc1125 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -3,20 +3,21 @@
"version": "1.0.1",
"module": "index.js",
"devDependencies": {
- "@rollup/plugin-commonjs": "^11.0.0",
- "@rollup/plugin-json": "^4.0.2",
- "@rollup/plugin-node-resolve": "^7.0.0",
+ "@rollup/plugin-commonjs": "^11.1.0",
+ "@rollup/plugin-json": "^4.0.3",
+ "@rollup/plugin-node-resolve": "^7.1.3",
+ "babel-eslint": "^10.1.0",
"chai": "^4.2.0",
"eslint": "^6.8.0",
- "eslint-plugin-jsdoc": "^23.0.0",
+ "eslint-plugin-jsdoc": "^24.0.0",
"karma": "^5.0.1",
"karma-chrome-launcher": "^3.0.0",
"karma-firefox-launcher": "^1.3.0",
- "karma-mocha": "^1.3.0",
- "mocha": "^7.1.0",
- "node-sass": "^4.12.0",
- "puppeteer": "^2.1.1",
- "rollup": "^2.0.3",
+ "karma-mocha": "^2.0.0",
+ "mocha": "^7.1.2",
+ "node-sass": "^4.14.0",
+ "puppeteer": "^3.0.2",
+ "rollup": "^2.7.3",
"rollup-plugin-consts": "^1.0.1",
"rollup-plugin-copy": "^3.1.0",
"rollup-plugin-delete": "^1.1.0",
@@ -32,8 +33,8 @@
},
"dependencies": {
"@open-wc/scoped-elements": "^1.0.8",
- "@sentry/browser": "^5.13.2",
- "i18next": "^19.3.2",
+ "@sentry/browser": "^5.15.5",
+ "i18next": "^19.4.4",
"lit-element": "^2.2.1"
}
}
--
GitLab