diff --git a/packages/provider/package.json b/packages/provider/package.json
index afd332e96426a6b58d46004369341646bc19b10a..647487ff6afa808a98af31fa11798e17bcd6cb63 100644
--- a/packages/provider/package.json
+++ b/packages/provider/package.json
@@ -1,20 +1,20 @@
{
- "name": "dbp-provider",
- "version": "1.0.0",
+ "name": "@dbp-toolkit/provider",
+ "version": "0.1.0",
"main": "src/index.js",
"license": "LGPL-2.1-or-later",
"private": true,
"devDependencies": {
- "@rollup/plugin-commonjs": "^15.1.0",
+ "@rollup/plugin-commonjs": "^16.0.0",
"@rollup/plugin-json": "^4.1.0",
- "@rollup/plugin-node-resolve": "^9.0.0",
+ "@rollup/plugin-node-resolve": "^10.0.0",
"@rollup/plugin-url": "^5.0.1",
"chai": "^4.2.0",
"glob": "^7.1.6",
- "i18next-scanner": "^2.10.2",
+ "i18next-scanner": "^3.0.0",
"karma": "^5.1.0",
"karma-chrome-launcher": "^3.0.0",
- "karma-firefox-launcher": "^1.3.0",
+ "karma-firefox-launcher": "^2.1.0",
"karma-mocha": "^2.0.1",
"mocha": "^8.0.1",
"rollup": "^2.19.0",
@@ -25,10 +25,10 @@
"rollup-plugin-terser": "^7.0.2"
},
"dependencies": {
+ "@dbp-toolkit/auth": "^0.1.0",
+ "@dbp-toolkit/common": "^0.1.0",
"@open-wc/scoped-elements": "^1.1.1",
- "lit-element": "^2.3.1",
- "dbp-auth": "^1.0.0",
- "dbp-common": "^1.0.0"
+ "lit-element": "^2.3.1"
},
"scripts": {
"clean": "rm dist/*",
diff --git a/packages/provider/rollup.config.js b/packages/provider/rollup.config.js
index 4923379d8411fdbcbb6a79e2172460b41d456da3..75560d89d352a8bca7770c648b1fd2cc1815cc85 100644
--- a/packages/provider/rollup.config.js
+++ b/packages/provider/rollup.config.js
@@ -9,7 +9,7 @@ import url from "@rollup/plugin-url";
import consts from 'rollup-plugin-consts';
import del from 'rollup-plugin-delete';
import emitEJS from 'rollup-plugin-emit-ejs'
-import {getPackagePath} from '../../rollup.utils.js';
+import {getPackagePath, getDistPath} from '../../rollup.utils.js';
const pkg = require('./package.json');
const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : 'local';
@@ -94,7 +94,7 @@ export default (async () => {
copy({
targets: [
{src: 'assets/index.html', dest: 'dist'},
- {src: await getPackagePath('dbp-common', 'assets/icons/*.svg'), dest: 'dist/local/dbp-common/icons'},
+ {src: await getPackagePath('@dbp-toolkit/common', 'assets/icons/*.svg'), dest: 'dist/' + await getDistPath('@dbp-toolkit/common', 'icons')},
{src: 'assets/favicon.ico', dest:'dist'},
],
}),
diff --git a/packages/provider/src/dbp-provider-demo.js b/packages/provider/src/dbp-provider-demo.js
index b11ddd908fb2ed5234839dbab5566d9b67a26041..1a124acc14f8c8faaa792a0a94aec7e12f395ba8 100644
--- a/packages/provider/src/dbp-provider-demo.js
+++ b/packages/provider/src/dbp-provider-demo.js
@@ -1,10 +1,10 @@
import {i18n} from './i18n.js';
import {css, html, LitElement} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {AuthKeycloak, LoginButton} from 'dbp-auth';
-import * as commonUtils from 'dbp-common/utils';
-import * as commonStyles from 'dbp-common/styles';
-import {Provider} from 'dbp-provider';
+import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
+import {Provider} from '@dbp-toolkit/provider';
class ProviderDemo extends ScopedElementsMixin(LitElement) {
diff --git a/packages/provider/src/dbp-provider.js b/packages/provider/src/dbp-provider.js
index ea220fe5630d0dae7fd2f90447dd3552e3c49021..4913dc0d174eb4f71624088e498e2413b414e0da 100644
--- a/packages/provider/src/dbp-provider.js
+++ b/packages/provider/src/dbp-provider.js
@@ -1,4 +1,4 @@
-import * as commonUtils from 'dbp-common/utils';
+import * as commonUtils from '@dbp-toolkit/common/utils';
import {Provider} from './provider.js';
commonUtils.defineCustomElement('dbp-provider', Provider);
diff --git a/packages/provider/src/i18n.js b/packages/provider/src/i18n.js
index 3fb3a1afd97f502121cf5f938fa17ae4ae5bcbef..498d9f037b0a5ca481ec8de5df24640900285808 100644
--- a/packages/provider/src/i18n.js
+++ b/packages/provider/src/i18n.js
@@ -1,4 +1,4 @@
-import {createInstance} from 'dbp-common/i18next.js';
+import {createInstance} from '@dbp-toolkit/common/i18next.js';
import de from './i18n/de/translation.json';
import en from './i18n/en/translation.json';
diff --git a/yarn.lock b/yarn.lock
index 4c175dbf59fc209b65fe36700e406f8c887b7031..04cf9db946227329677791a1ba40c348c78a0d2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1023,7 +1023,7 @@
resolved "https://registry.yarnpkg.com/@open-wc/dedupe-mixin/-/dedupe-mixin-1.3.0.tgz#0df5d438285fc3482838786ee81895318f0ff778"
integrity sha512-UfdK1MPnR6T7f3svzzYBfu3qBkkZ/KsPhcpc3JYhsUY4hbpwNF9wEQtD4Z+/mRqMTJrKg++YSxIxE0FBhY3RIw==
-"@open-wc/scoped-elements@^1.3.2":
+"@open-wc/scoped-elements@^1.1.1", "@open-wc/scoped-elements@^1.3.2":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-1.3.2.tgz#6ae54c49731bbe8c3e0b5383c989f983dcdfacf5"
integrity sha512-DoP3XA8r03tGx+IrlJwP/voLuDFkyS56kvwhmXIhpESo7M5jMt5e0zScNrawj7EMe4b5gDaJjorx2Jza8FLaLw==
@@ -1181,7 +1181,12 @@
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
-"@types/node@*", "@types/node@>= 8":
+"@types/node@*":
+ version "14.14.8"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz#2127bd81949a95c8b7d3240f3254352d72563aec"
+ integrity sha512-z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA==
+
+"@types/node@>= 8":
version "14.14.7"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"
integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==
@@ -4160,14 +4165,7 @@ i18next-scanner@^3.0.0:
vinyl "^2.2.0"
vinyl-fs "^3.0.1"
-i18next@*:
- version "19.8.3"
- resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.8.3.tgz#10df7222db8c23389b13bceb9ba67a5e20a0241e"
- integrity sha512-eVrqAw2gGGYYJaJMYw4VM1FNFawLD4b84IsoTZMVXeWHaxAM2gyTa34j2Sip15UkBz/LrSxdFJj0Jhlrz7EvHA==
- dependencies:
- "@babel/runtime" "^7.12.0"
-
-i18next@^19.8.4:
+i18next@*, i18next@^19.8.4:
version "19.8.4"
resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.8.4.tgz#447718f2a26319b8debdbcc6fbc1a9761be7316b"
integrity sha512-FfVPNWv+felJObeZ6DSXZkj9QM1Ivvh7NcFCgA8XPtJWHz0iXVa9BUy+QY8EPrCLE+vWgDfV/sc96BgXVo6HAA==
@@ -7260,7 +7258,7 @@ rollup-pluginutils@^2.8.2:
dependencies:
estree-walker "^0.6.1"
-rollup@^2.33.3:
+rollup@^2.19.0, rollup@^2.33.3:
version "2.33.3"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.3.tgz#ae72ce31f992b09a580072951bfea76e9df17342"
integrity sha512-RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==