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

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

parents d9d40862 dff3bcfe
Branches
No related tags found
No related merge requests found
Pipeline #14231 passed
...@@ -253,14 +253,14 @@ Dependencies: ...@@ -253,14 +253,14 @@ Dependencies:
}, },
{src: 'node_modules/pdfjs-dist/cmaps/*', dest: 'dist/local/' + pkg.name + '/pdfjs'}, // do we want all map files? {src: 'node_modules/pdfjs-dist/cmaps/*', dest: 'dist/local/' + pkg.name + '/pdfjs'}, // do we want all map files?
{src: 'node_modules/source-sans-pro/WOFF2/OTF/*', dest: 'dist/local/' + pkg.name + '/fonts'}, {src: 'node_modules/source-sans-pro/WOFF2/OTF/*', dest: 'dist/local/' + pkg.name + '/fonts'},
{src: 'node_modules/dbp-common/src/spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'}, {src: 'node_modules/@dbp-toolkit/common/src/spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'},
{src: 'node_modules/dbp-common/misc/browser-check.js', dest: 'dist/local/' + pkg.name, rename: 'browser-check.js'}, {src: 'node_modules/@dbp-toolkit/common/misc/browser-check.js', dest: 'dist/local/' + pkg.name, rename: 'browser-check.js'},
{src: 'assets/icon-*.png', dest: 'dist/local/' + pkg.name}, {src: 'assets/icon-*.png', dest: 'dist/local/' + pkg.name},
{src: 'assets/*-placeholder.png', dest: 'dist/local/' + pkg.name}, {src: 'assets/*-placeholder.png', dest: 'dist/local/' + pkg.name},
{src: 'assets/manifest.json', dest: 'dist', rename: pkg.name + '.manifest.json'}, {src: 'assets/manifest.json', dest: 'dist', rename: pkg.name + '.manifest.json'},
{src: 'assets/*.metadata.json', dest: 'dist'}, {src: 'assets/*.metadata.json', dest: 'dist'},
{src: 'node_modules/dbp-common/assets/icons/*.svg', dest: 'dist/local/dbp-common/icons'}, {src: 'node_modules/@dbp-toolkit/common/assets/icons/*.svg', dest: 'dist/local/@dbp-toolkit/common/icons'},
{src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/dbp-file-source/tabulator-tables'}, {src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/@dbp-toolkit/file-handling/tabulator-tables'},
{src: 'node_modules/qr-scanner/qr-scanner-worker.*', dest: 'dist/local/qr-code-scanner'}, {src: 'node_modules/qr-scanner/qr-scanner-worker.*', dest: 'dist/local/qr-code-scanner'},
], ],
}), }),
......
...@@ -4,6 +4,7 @@ import {ScopedElementsMixin} from '@open-wc/scoped-elements'; ...@@ -4,6 +4,7 @@ import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import {AuthKeycloak} from './auth-keycloak.js'; import {AuthKeycloak} from './auth-keycloak.js';
import {LoginButton} from './login-button.js'; import {LoginButton} from './login-button.js';
import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import {name as pkgName} from './../package.json';
class AuthDemo extends ScopedElementsMixin(LitElement) { class AuthDemo extends ScopedElementsMixin(LitElement) {
constructor() { constructor() {
...@@ -63,7 +64,7 @@ class AuthDemo extends ScopedElementsMixin(LitElement) { ...@@ -63,7 +64,7 @@ class AuthDemo extends ScopedElementsMixin(LitElement) {
} }
render() { render() {
const silentCheckSsoUri = commonUtils.getAssetURL('dbp-auth', 'silent-check-sso.html'); const silentCheckSsoUri = commonUtils.getAssetURL(pkgName, 'silent-check-sso.html');
return html` return html`
<style> <style>
/* from BULMA.CSS */ /* from BULMA.CSS */
......
...@@ -2,6 +2,7 @@ import {html, LitElement, css} from 'lit-element'; ...@@ -2,6 +2,7 @@ import {html, LitElement, css} from 'lit-element';
import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
import {until} from 'lit-html/directives/until.js'; import {until} from 'lit-html/directives/until.js';
import * as commonUtils from '../utils.js'; import * as commonUtils from '../utils.js';
import {name as pkgName} from './../package.json';
// Use in case the icon fails to load // Use in case the icon fails to load
const errorIcon = ` const errorIcon = `
...@@ -18,7 +19,7 @@ const errorIcon = ` ...@@ -18,7 +19,7 @@ const errorIcon = `
`; `;
export function getIconSVGURL(name) { export function getIconSVGURL(name) {
return commonUtils.getAssetURL('dbp-common', 'icons/' + encodeURI(name) + '.svg'); return commonUtils.getAssetURL(pkgName, 'icons/' + encodeURI(name) + '.svg');
} }
export function getIconCSS(name) { export function getIconCSS(name) {
......
...@@ -14,6 +14,7 @@ import en from '../assets/datatables/i18n/English'; ...@@ -14,6 +14,7 @@ import en from '../assets/datatables/i18n/English';
import {getIconSVGURL} from '@dbp-toolkit/common'; import {getIconSVGURL} from '@dbp-toolkit/common';
import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from '@dbp-toolkit/common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import {name as pkgName} from './../package.json';
dt(window, $); dt(window, $);
resp(window, $); resp(window, $);
...@@ -321,9 +322,9 @@ export class DataTableView extends LitElement { ...@@ -321,9 +322,9 @@ export class DataTableView extends LitElement {
} }
render() { render() {
let dt_css = commonUtils.getAssetURL('dbp-data-table-view', 'css/jquery.dataTables.min.css'); let dt_css = commonUtils.getAssetURL(pkgName, 'css/jquery.dataTables.min.css');
let rs_css = commonUtils.getAssetURL('dbp-data-table-view', 'css/responsive.dataTables.min.css'); let rs_css = commonUtils.getAssetURL(pkgName, 'css/responsive.dataTables.min.css');
let bt_css = commonUtils.getAssetURL('dbp-data-table-view', 'css/buttons.dataTables.min.css'); let bt_css = commonUtils.getAssetURL(pkgName, 'css/buttons.dataTables.min.css');
return html` return html`
<link rel="stylesheet" href="${dt_css}"> <link rel="stylesheet" href="${dt_css}">
......
...@@ -9,6 +9,7 @@ import consts from 'rollup-plugin-consts'; ...@@ -9,6 +9,7 @@ import consts from 'rollup-plugin-consts';
import del from 'rollup-plugin-delete'; import del from 'rollup-plugin-delete';
import {getPackagePath} from '../../rollup.utils.js'; import {getPackagePath} from '../../rollup.utils.js';
const pkg = require('./package.json');
const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : 'local'; const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : 'local';
console.log("build: " + build); console.log("build: " + build);
...@@ -50,7 +51,7 @@ export default (async () => { ...@@ -50,7 +51,7 @@ export default (async () => {
{src: 'assets/index.html', dest: 'dist'}, {src: 'assets/index.html', dest: 'dist'},
{src: 'assets/favicon.ico', dest: 'dist'}, {src: 'assets/favicon.ico', dest: 'dist'},
{src: await getPackagePath('@dbp-toolkit/common', 'assets/icons/*.svg'), dest: 'dist/local/dbp-common/icons'}, {src: await getPackagePath('@dbp-toolkit/common', 'assets/icons/*.svg'), dest: 'dist/local/dbp-common/icons'},
{src: await getPackagePath('tabulator-tables', 'dist/css'), dest: 'dist/local/dbp-file-source/tabulator-tables'}, {src: await getPackagePath('tabulator-tables', 'dist/css'), dest: 'dist/local/' + pkg.name + '/tabulator-tables'},
], ],
}), }),
(process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false (process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false
......
...@@ -11,6 +11,7 @@ import {humanFileSize} from '@dbp-toolkit/common/i18next'; ...@@ -11,6 +11,7 @@ import {humanFileSize} from '@dbp-toolkit/common/i18next';
import Tabulator from 'tabulator-tables'; import Tabulator from 'tabulator-tables';
import nextcloudFileURL from 'consts:nextcloudFileURL'; import nextcloudFileURL from 'consts:nextcloudFileURL';
import MicroModal from './micromodal.es'; import MicroModal from './micromodal.es';
import {name as pkgName} from './../package.json';
/** /**
* NextcloudFilePicker web component * NextcloudFilePicker web component
...@@ -1422,7 +1423,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { ...@@ -1422,7 +1423,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
} }
render() { render() {
const tabulatorCss = commonUtils.getAssetURL('local/dbp-file-source/tabulator-tables/css/tabulator.min.css'); const tabulatorCss = commonUtils.getAssetURL(pkgName, 'tabulator-tables/css/tabulator.min.css');
return html` return html`
<div class="wrapper"> <div class="wrapper">
......
...@@ -21,8 +21,15 @@ export function getBuildInfo(build) { ...@@ -21,8 +21,15 @@ export function getBuildInfo(build) {
export async function getPackagePath(packageName, assetPath) { export async function getPackagePath(packageName, assetPath) {
const r = resolve(); const r = resolve();
const resolved = await r.resolveId(packageName);
let packageRoot;
if (resolved !== null) {
const id = (await r.resolveId(packageName)).id; const id = (await r.resolveId(packageName)).id;
const packageInfo = r.getPackageInfoForId(id); const packageInfo = r.getPackageInfoForId(id);
const fullAssetPath = path.join(packageInfo.root, assetPath); packageRoot = packageInfo.root;
return path.relative(process.cwd(), fullAssetPath); } else {
// Non JS packages
packageRoot = path.dirname(require.resolve(packageName + '/package.json'));
}
return path.relative(process.cwd(), path.join(packageRoot, assetPath));
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment