Skip to content
Snippets Groups Projects
Commit ecfae39b authored by Steinwender, Tamara's avatar Steinwender, Tamara
Browse files

Merge branch 'master' of gitlab.tugraz.at:dbp/web-components/toolkit

parents 8c5a325e d72b5d5b
Branches
No related tags found
No related merge requests found
Showing
with 46 additions and 13242 deletions
This diff is collapsed.
image: registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v5
before_script:
- "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules"
- git submodule sync
- git submodule update --init
stages:
- test
test:
stage: test
script:
- npm install
- npm run build
- npm test
linting:
stage: test
allow_failure: true
script:
- npm install
- npm run lint
\ No newline at end of file
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^13.0.0", "@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.1.0", "@rollup/plugin-node-resolve": "^8.1.0",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"chai": "^4.2.0", "chai": "^4.2.0",
"eslint": "^7.3.1", "eslint": "^7.3.1",
"eslint-plugin-jsdoc": "^28.5.1", "eslint-plugin-jsdoc": "^29.2.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"karma": "^5.1.0", "karma": "^5.1.0",
"karma-chrome-launcher": "^3.0.0", "karma-chrome-launcher": "^3.0.0",
...@@ -23,19 +23,19 @@ ...@@ -23,19 +23,19 @@
"rollup-plugin-consts": "^1.0.1", "rollup-plugin-consts": "^1.0.1",
"rollup-plugin-copy": "^3.1.0", "rollup-plugin-copy": "^3.1.0",
"rollup-plugin-delete": "^2.0.0", "rollup-plugin-delete": "^2.0.0",
"rollup-plugin-serve": "^1.0.1", "rollup-plugin-serve": "^1.0.1"
"dbp-auth": "^1.0.0",
"dbp-common": "^1.0.0",
"dbp-language-select": "^1.0.0",
"dbp-notification": "^1.0.0",
"dbp-person-profile": "^1.0.0"
}, },
"dependencies": { "dependencies": {
"@open-wc/scoped-elements": "^1.1.1", "@open-wc/scoped-elements": "^1.1.1",
"i18next": "^19.5.3", "i18next": "^19.5.3",
"lit-element": "^2.3.1", "lit-element": "^2.3.1",
"lit-html": "^1.1.1", "lit-html": "^1.1.1",
"universal-router": "^9.0.1" "universal-router": "^9.0.1",
"dbp-auth": "^1.0.0",
"dbp-common": "^1.0.0",
"dbp-language-select": "^1.0.0",
"dbp-notification": "^1.0.0",
"dbp-person-profile": "^1.0.0"
}, },
"scripts": { "scripts": {
"build": "npm run build-local", "build": "npm run build-local",
......
image: registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v1
before_script:
- "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules"
- git submodule sync
- git submodule update --init
stages:
- test
test:
stage: test
script:
- npm install
- npm run build
- npm test
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^13.0.0", "@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.1.0", "@rollup/plugin-node-resolve": "^8.1.0",
"@rollup/plugin-replace": "^2.3.3", "@rollup/plugin-replace": "^2.3.3",
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"chai": "^4.2.0", "chai": "^4.2.0",
"eslint": "^7.3.1", "eslint": "^7.3.1",
"eslint-plugin-jsdoc": "^28.5.1", "eslint-plugin-jsdoc": "^29.2.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"i18next-scanner": "^2.10.2", "i18next-scanner": "^2.10.2",
"karma": "^5.1.0", "karma": "^5.1.0",
...@@ -21,22 +21,20 @@ ...@@ -21,22 +21,20 @@
"karma-chrome-launcher": "^3.0.0", "karma-chrome-launcher": "^3.0.0",
"karma-mocha": "^2.0.1", "karma-mocha": "^2.0.1",
"mocha": "^8.0.1", "mocha": "^8.0.1",
"node-sass": "^4.12.0",
"puppeteer": "^2.1.1", "puppeteer": "^2.1.1",
"rollup": "^2.19.0", "rollup": "^2.19.0",
"rollup-plugin-consts": "^1.0.1", "rollup-plugin-consts": "^1.0.1",
"rollup-plugin-copy": "^3.1.0", "rollup-plugin-copy": "^3.1.0",
"rollup-plugin-delete": "^2.0.0", "rollup-plugin-delete": "^2.0.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-serve": "^1.0.1", "rollup-plugin-serve": "^1.0.1",
"rollup-plugin-terser": "^6.1.0", "rollup-plugin-terser": "^6.1.0"
"dbp-common": "^1.0.0"
}, },
"dependencies": { "dependencies": {
"@open-wc/scoped-elements": "^1.1.1", "@open-wc/scoped-elements": "^1.1.1",
"event-target-shim": "^5.0.1", "event-target-shim": "^5.0.1",
"keycloak-js": "^10.0.2", "keycloak-js": "^10.0.2",
"lit-element": "^2.3.1" "lit-element": "^2.3.1",
"dbp-common": "^1.0.0"
}, },
"scripts": { "scripts": {
"clean": "rm dist/*", "clean": "rm dist/*",
......
image: registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v6
before_script:
- "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules"
- git submodule sync
- git submodule update --init
stages:
- test
test:
stage: test
script:
- npm install
- npm test
FROM debian:buster
ENV LANG C.UTF-8
ENV DEBIAN_FRONTEND noninteractive
# https://github.com/karma-runner/karma-firefox-launcher/issues/104
ENV MOZ_FORCE_DISABLE_E10S true
RUN apt-get update && apt-get install -y \
git \
curl \
&& rm -rf /var/lib/apt/lists/*
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
&& rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y \
nodejs \
chromium \
# libgbm1: newer chromium from puppeteer
libgbm1 \
firefox-esr \
composer \
php-zip \
rsync \
sudo \
&& rm -rf /var/lib/apt/lists/*
RUN useradd -u 1000 -ms /bin/bash user
RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER user
WORKDIR /home/user
# Install deployer globally and add it to PATH
ENV COMPOSER_HOME="/home/user/.composer"
RUN mkdir -p "${COMPOSER_HOME}"
ADD composer.lock "${COMPOSER_HOME}"
ADD composer.json "${COMPOSER_HOME}"
RUN composer global install
ENV PATH "${COMPOSER_HOME}/vendor/bin:${PATH}"
\ No newline at end of file
* In case of an incompatible change increase the tag version number in build.sh
* ./build.sh
* (first time) sudo docker login registry.gitlab.tugraz.at
* sudo docker push registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v1
\ No newline at end of file
#!/bin/bash
set -e
TAG="registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v6"
sudo docker build --tag "${TAG}" --file "Dockerfile" .
echo "Now run: sudo docker push '$TAG'"
{
"require": {
"symfony/process": " ^4.4",
"symfony/console": " ^4.4",
"symfony/yaml": " ^4.4",
"deployer/deployer": " ^6.4",
"deployer/recipes": " ^6.2"
}
}
This diff is collapsed.
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^13.0.0", "@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.1.0", "@rollup/plugin-node-resolve": "^8.1.0",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"chai": "^4.2.0", "chai": "^4.2.0",
"eslint": "^7.3.1", "eslint": "^7.3.1",
"eslint-plugin-jsdoc": "^28.5.1", "eslint-plugin-jsdoc": "^29.2.0",
"karma": "^5.1.0", "karma": "^5.1.0",
"karma-chrome-launcher": "^3.0.0", "karma-chrome-launcher": "^3.0.0",
"karma-firefox-launcher": "^1.3.0", "karma-firefox-launcher": "^1.3.0",
......
image: registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v1
before_script:
- "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules"
- git submodule sync
- git submodule update --init
stages:
- test
test:
stage: test
script:
- npm install
- npm run build
- npm test
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.1.0",
"@rollup/plugin-url": "^5.0.1",
"chai": "^4.2.0", "chai": "^4.2.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"i18next-scanner": "^2.10.2", "i18next-scanner": "^2.10.2",
...@@ -12,20 +16,13 @@ ...@@ -12,20 +16,13 @@
"karma-chrome-launcher": "^3.0.0", "karma-chrome-launcher": "^3.0.0",
"karma-mocha": "^2.0.1", "karma-mocha": "^2.0.1",
"mocha": "^8.0.1", "mocha": "^8.0.1",
"node-sass": "^4.12.0",
"puppeteer": "^2.1.1", "puppeteer": "^2.1.1",
"rollup": "^2.19.0", "rollup": "^2.19.0",
"@rollup/plugin-commonjs": "^13.0.0",
"rollup-plugin-consts": "^1.0.1", "rollup-plugin-consts": "^1.0.1",
"rollup-plugin-copy": "^3.1.0", "rollup-plugin-copy": "^3.1.0",
"rollup-plugin-delete": "^2.0.0", "rollup-plugin-delete": "^2.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.1.0",
"rollup-plugin-serve": "^1.0.1", "rollup-plugin-serve": "^1.0.1",
"rollup-plugin-terser": "^6.1.0", "rollup-plugin-terser": "^6.1.0"
"@rollup/plugin-url": "^5.0.1",
"dbp-auth": "^1.0.0",
"dbp-common": "^1.0.0"
}, },
"dependencies": { "dependencies": {
"@open-wc/scoped-elements": "^1.1.1", "@open-wc/scoped-elements": "^1.1.1",
...@@ -38,7 +35,9 @@ ...@@ -38,7 +35,9 @@
"jquery": "^3.4.1", "jquery": "^3.4.1",
"jszip": "^3.2.2", "jszip": "^3.2.2",
"lit-element": "^2.3.1", "lit-element": "^2.3.1",
"lit-html": "^1.1.1" "lit-html": "^1.1.1",
"dbp-auth": "^1.0.0",
"dbp-common": "^1.0.0"
}, },
"scripts": { "scripts": {
"clean": "rm -r dist/*", "clean": "rm -r dist/*",
......
image: debian:buster
before_script:
- apt update
- apt install -y git
- "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules"
- git submodule sync
- git submodule update --init
stages:
- test
test:
stage: test
script:
- apt update
- apt install -y npm chromium
- npm install
- npm run build
- npm test
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^13.0.0", "@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-json": "^4.0.2", "@rollup/plugin-json": "^4.0.2",
"@rollup/plugin-node-resolve": "^8.1.0", "@rollup/plugin-node-resolve": "^8.1.0",
"chai": "^4.2.0", "chai": "^4.2.0",
...@@ -15,15 +15,13 @@ ...@@ -15,15 +15,13 @@
"karma-chrome-launcher": "^3.0.0", "karma-chrome-launcher": "^3.0.0",
"karma-mocha": "^2.0.0", "karma-mocha": "^2.0.0",
"mocha": "^8.0.1", "mocha": "^8.0.1",
"node-sass": "^4.12.0",
"puppeteer": "^2.1.1", "puppeteer": "^2.1.1",
"rollup": "^2.18.0", "rollup": "^2.18.0",
"rollup-plugin-consts": "^1.0.1", "rollup-plugin-consts": "^1.0.1",
"rollup-plugin-copy": "^3.1.0", "rollup-plugin-copy": "^3.1.0",
"rollup-plugin-delete": "^2.0.0", "rollup-plugin-delete": "^2.0.0",
"rollup-plugin-serve": "^1.0.1", "rollup-plugin-serve": "^1.0.1",
"rollup-plugin-terser": "^6.1.0", "rollup-plugin-terser": "^6.1.0"
"dbp-common": "^1.0.0"
}, },
"dependencies": { "dependencies": {
"@open-wc/scoped-elements": "^1.0.8", "@open-wc/scoped-elements": "^1.0.8",
...@@ -34,7 +32,8 @@ ...@@ -34,7 +32,8 @@
"lit-html": "^1.1.1", "lit-html": "^1.1.1",
"material-design-icons-svg": "^3.0.0", "material-design-icons-svg": "^3.0.0",
"tabulator-tables": "^4.7.0", "tabulator-tables": "^4.7.0",
"webdav": "^3.3.0" "webdav": "^3.3.0",
"dbp-common": "^1.0.0"
}, },
"scripts": { "scripts": {
"clean": "rm dist/*", "clean": "rm dist/*",
......
image: debian:buster
before_script:
- apt update
- apt install -y git
- "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules"
- git submodule sync
- git submodule update --init
stages:
- test
test:
stage: test
script:
- apt update
- apt install -y npm chromium
- npm install
- npm run build
- npm test
...@@ -5,35 +5,33 @@ ...@@ -5,35 +5,33 @@
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.1.0",
"@rollup/plugin-url": "^5.0.1",
"chai": "^4.2.0", "chai": "^4.2.0",
"karma": "^5.1.0", "karma": "^5.1.0",
"karma-chai": "^0.1.0", "karma-chai": "^0.1.0",
"karma-chrome-launcher": "^3.0.0", "karma-chrome-launcher": "^3.0.0",
"karma-mocha": "^2.0.1", "karma-mocha": "^2.0.1",
"mocha": "^8.0.1", "mocha": "^8.0.1",
"node-sass": "^4.12.0",
"puppeteer": "^2.1.1", "puppeteer": "^2.1.1",
"rollup": "^2.19.0", "rollup": "^2.19.0",
"@rollup/plugin-commonjs": "^13.0.0",
"rollup-plugin-consts": "^1.0.1", "rollup-plugin-consts": "^1.0.1",
"rollup-plugin-copy": "^3.1.0", "rollup-plugin-copy": "^3.1.0",
"rollup-plugin-delete": "^2.0.0", "rollup-plugin-delete": "^2.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.1.0",
"rollup-plugin-postcss": "^3.1.2", "rollup-plugin-postcss": "^3.1.2",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-serve": "^1.0.1", "rollup-plugin-serve": "^1.0.1",
"rollup-plugin-terser": "^6.1.0", "rollup-plugin-terser": "^6.1.0"
"@rollup/plugin-url": "^5.0.1",
"dbp-auth": "^1.0.0",
"dbp-common": "^1.0.0"
}, },
"dependencies": { "dependencies": {
"@open-wc/scoped-elements": "^1.1.1", "@open-wc/scoped-elements": "^1.1.1",
"i18next": "^19.5.3", "i18next": "^19.5.3",
"lit-element": "^2.3.1", "lit-element": "^2.3.1",
"lit-html": "^1.1.1", "lit-html": "^1.1.1",
"material-design-icons-svg": "^3.0.0" "material-design-icons-svg": "^3.0.0",
"dbp-auth": "^1.0.0",
"dbp-common": "^1.0.0"
}, },
"scripts": { "scripts": {
"clean": "rm dist/*", "clean": "rm dist/*",
......
image: debian:buster
before_script:
- apt update
- apt install -y git
- "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules"
- git submodule sync
- git submodule update --init
stages:
- test
test:
stage: test
script:
- apt update
- apt install -y npm chromium
- npm install
- npm run build
- npm test
...@@ -5,29 +5,28 @@ ...@@ -5,29 +5,28 @@
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.1.0",
"chai": "^4.2.0",
"i18next-scanner": "^2.10.2",
"karma": "^5.1.0", "karma": "^5.1.0",
"karma-chai": "^0.1.0", "karma-chai": "^0.1.0",
"karma-chrome-launcher": "^3.0.0", "karma-chrome-launcher": "^3.0.0",
"karma-mocha": "^2.0.1", "karma-mocha": "^2.0.1",
"node-sass": "^4.12.0",
"puppeteer": "^2.1.1",
"mocha": "^8.0.1", "mocha": "^8.0.1",
"chai": "^4.2.0", "puppeteer": "^2.1.1",
"rollup": "^2.19.0", "rollup": "^2.19.0",
"@rollup/plugin-commonjs": "^13.0.0",
"@rollup/plugin-node-resolve": "^8.1.0",
"@rollup/plugin-json": "^4.1.0",
"rollup-plugin-consts": "^1.0.1", "rollup-plugin-consts": "^1.0.1",
"rollup-plugin-copy": "^3.1.0", "rollup-plugin-copy": "^3.1.0",
"rollup-plugin-serve": "^1.0.1",
"rollup-plugin-terser": "^6.1.0",
"rollup-plugin-delete": "^2.0.0", "rollup-plugin-delete": "^2.0.0",
"i18next-scanner": "^2.10.2", "rollup-plugin-serve": "^1.0.1",
"dbp-common": "^1.0.0" "rollup-plugin-terser": "^6.1.0"
}, },
"dependencies": { "dependencies": {
"@open-wc/scoped-elements": "^1.1.1", "@open-wc/scoped-elements": "^1.1.1",
"lit-element": "^2.3.1" "lit-element": "^2.3.1",
"dbp-common": "^1.0.0"
}, },
"scripts": { "scripts": {
"clean": "rm dist/*", "clean": "rm dist/*",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment