Skip to content
Snippets Groups Projects
Commit 7b6a91e0 authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Only allow commonjs modules in external dependencies

parent d3d0afd3
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,9 @@ export default { ...@@ -20,7 +20,9 @@ export default {
plugins: [ plugins: [
multiEntry(), multiEntry(),
resolve(), resolve(),
commonjs(), commonjs({
include: 'node_modules/**'
}),
json(), json(),
replace({ replace({
"process.env.BUILD": '"' + build + '"', "process.env.BUILD": '"' + build + '"',
......
import 'vpu-auth'; import 'vpu-auth';
import './vpu-kb-wpe-view.js'; import './vpu-kb-wpe-view.js';
import utils from './utils.js'; import {setting, getAPiUrl} from './utils.js';
import {i18n} from './i18n'; import {i18n} from './i18n';
import {html, LitElement} from 'lit-element'; import {html, LitElement} from 'lit-element';
import commonUtils from 'vpu-common/utils'; import commonUtils from 'vpu-common/utils';
...@@ -38,17 +38,17 @@ class KnowledgeBaseWebPageElementViewDemo extends LitElement { ...@@ -38,17 +38,17 @@ class KnowledgeBaseWebPageElementViewDemo extends LitElement {
<h1 class="title">KnowledgeBaseWebPageElementView-Demo</h1> <h1 class="title">KnowledgeBaseWebPageElementView-Demo</h1>
</div> </div>
<div class="content"> <div class="content">
<vpu-auth lang="${this.lang}" client-id="${utils.setting('keyCloakClientId')}" load-person force-login></vpu-auth> <vpu-auth lang="${this.lang}" client-id="${setting('keyCloakClientId')}" load-person force-login></vpu-auth>
</div> </div>
<div class="content"> <div class="content">
<h2 class="subtitle">Deutsch</h2> <h2 class="subtitle">Deutsch</h2>
<p>Ein erster Schritt</p> <p>Ein erster Schritt</p>
<vpu-knowledge-base-web-page-element-view lang="de" entry-point-url="${utils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></vpu-knowledge-base-web-page-element-view> <vpu-knowledge-base-web-page-element-view lang="de" entry-point-url="${getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></vpu-knowledge-base-web-page-element-view>
</div> </div>
<div class="content"> <div class="content">
<h2 class="subtitle">Englisch</h2> <h2 class="subtitle">Englisch</h2>
<p>A first step</p> <p>A first step</p>
<vpu-knowledge-base-web-page-element-view lang="en" entry-point-url="${utils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></vpu-knowledge-base-web-page-element-view> <vpu-knowledge-base-web-page-element-view lang="en" entry-point-url="${getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></vpu-knowledge-base-web-page-element-view>
</div> </div>
<hr> <hr>
<div class="content"> <div class="content">
......
const vars = require("./vars"); import vars from './vars.js';
module.exports = { export const getAPiUrl = function(path = "", withPrefix = true) {
getAPiUrl: function(path = "", withPrefix = true) {
return vars.apiBaseUrl + (withPrefix ? vars.apiUrlPrefix : "") + path; return vars.apiBaseUrl + (withPrefix ? vars.apiUrlPrefix : "") + path;
}, }
/** /**
* Reads a setting * Reads a setting
...@@ -11,5 +10,4 @@ module.exports = { ...@@ -11,5 +10,4 @@ module.exports = {
* @param key * @param key
* @returns {*} * @returns {*}
*/ */
setting: (key) => vars[key] export const setting = (key) => vars[key]
};
var config;
switch(process.env.BUILD) { switch(process.env.BUILD) {
case "development": case "development":
module.exports = { config = {
apiBaseUrl: 'https://mw-dev.tugraz.at', apiBaseUrl: 'https://mw-dev.tugraz.at',
apiUrlPrefix: '', apiUrlPrefix: '',
keyCloakClientId: 'auth-dev-mw-frontend', keyCloakClientId: 'auth-dev-mw-frontend',
...@@ -9,14 +10,14 @@ switch(process.env.BUILD) { ...@@ -9,14 +10,14 @@ switch(process.env.BUILD) {
break; break;
case "production": case "production":
module.exports = { config = {
apiBaseUrl: 'https://mw.tugraz.at', apiBaseUrl: 'https://mw.tugraz.at',
apiUrlPrefix: '', apiUrlPrefix: '',
keyCloakClientId: 'auth-prod-mw-frontend', keyCloakClientId: 'auth-prod-mw-frontend',
}; };
break; break;
case "demo": case "demo":
module.exports = { config = {
apiBaseUrl: 'https://api-demo.tugraz.at', apiBaseUrl: 'https://api-demo.tugraz.at',
apiUrlPrefix: '', apiUrlPrefix: '',
keyCloakClientId: 'auth-dev-mw-frontend', keyCloakClientId: 'auth-dev-mw-frontend',
...@@ -24,9 +25,11 @@ switch(process.env.BUILD) { ...@@ -24,9 +25,11 @@ switch(process.env.BUILD) {
break; break;
case "local": case "local":
default: default:
module.exports = { config = {
apiBaseUrl: 'http://127.0.0.1:8000', apiBaseUrl: 'http://127.0.0.1:8000',
apiUrlPrefix: '', apiUrlPrefix: '',
keyCloakClientId: 'auth-dev-mw-frontend-local', keyCloakClientId: 'auth-dev-mw-frontend-local',
}; };
} }
export default config;
...@@ -2,7 +2,7 @@ import {i18n} from './i18n'; ...@@ -2,7 +2,7 @@ import {i18n} from './i18n';
import {html} from 'lit-element'; import {html} from 'lit-element';
// import JSONLD from 'vpu-common/jsonld'; // import JSONLD from 'vpu-common/jsonld';
import VPULitElement from 'vpu-common/vpu-lit-element' import VPULitElement from 'vpu-common/vpu-lit-element'
import utils from "./utils"; import {getAPiUrl} from "./utils";
import commonUtils from "vpu-common/utils"; import commonUtils from "vpu-common/utils";
import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
...@@ -15,7 +15,7 @@ class VPUKnowledgeBaseWebPageElementView extends VPULitElement { ...@@ -15,7 +15,7 @@ class VPUKnowledgeBaseWebPageElementView extends VPULitElement {
this.lang = 'de'; this.lang = 'de';
this.value = ''; this.value = '';
this.html = ''; this.html = '';
this.entryPointUrl = utils.getAPiUrl(); this.entryPointUrl = getAPiUrl();
this.error = ''; this.error = '';
this.eyeClose = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA1ElEQVQ4ja3SMU5CURCF4c+ejpiILe5DZAGyASuJS5CKEoMGKhdAwWKgMkriKjQWFkAkBizgmckNPEgeJ7nVuee/M3eGI2mCehFAHZ/Hgtygizd84wsjPOHsEMgUqx1njvtd4R7uAmSIMipo4SeAHtLwdTCbG8gHLsOdVlJN9LwEY4nSFsh5AhhHwGtinoY/ySDlPEAjMbvByyDDvBbgOZi/eNxUkrUTp9NJw3CCNhbJS0vcBshgWzjqAn28W899Zr1U1dBObR8kT9nGXhWFTIoA/vUHQydS/iUcHx4AAAAASUVORK5CYII='; this.eyeClose = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA1ElEQVQ4ja3SMU5CURCF4c+ejpiILe5DZAGyASuJS5CKEoMGKhdAwWKgMkriKjQWFkAkBizgmckNPEgeJ7nVuee/M3eGI2mCehFAHZ/Hgtygizd84wsjPOHsEMgUqx1njvtd4R7uAmSIMipo4SeAHtLwdTCbG8gHLsOdVlJN9LwEY4nSFsh5AhhHwGtinoY/ySDlPEAjMbvByyDDvBbgOZi/eNxUkrUTp9NJw3CCNhbJS0vcBshgWzjqAn28W899Zr1U1dBObR8kT9nGXhWFTIoA/vUHQydS/iUcHx4AAAAASUVORK5CYII=';
this.eyeOpen = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA5UlEQVQ4jc3SvS7EURAF8B+JioSsCokHUFgNiWewQqvzICRew2v4WLFUnoNS/msrazUaFOYm12RlVeIkk9ycM2fmztzLf8U02tiPaAc3EbM4Rh8fKfo4wdxP5nXcV4YhLnGO54p/wEY2b6akHhYqfR7dVHyriMt4qsQRWtiNaw+wFwWHaaQlcc161l4UblIyXKTcM7hL5FUk14tsgsvNumIhb2NG6ISxiXMrtJI3wErZwyHeK/E2DAWLuKn0F2xLOEgdRriOeK34sc9YsIpT37dd4hFHvj7bRMxElw52sIap3xj/Hp9rzGFBhiMSxAAAAABJRU5ErkJggg=='; this.eyeOpen = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA5UlEQVQ4jc3SvS7EURAF8B+JioSsCokHUFgNiWewQqvzICRew2v4WLFUnoNS/msrazUaFOYm12RlVeIkk9ycM2fmztzLf8U02tiPaAc3EbM4Rh8fKfo4wdxP5nXcV4YhLnGO54p/wEY2b6akHhYqfR7dVHyriMt4qsQRWtiNaw+wFwWHaaQlcc161l4UblIyXKTcM7hL5FUk14tsgsvNumIhb2NG6ISxiXMrtJI3wErZwyHeK/E2DAWLuKn0F2xLOEgdRriOeK34sc9YsIpT37dd4hFHvj7bRMxElw52sIap3xj/Hp9rzGFBhiMSxAAAAABJRU5ErkJggg==';
......
auth @ 2752cf0c
Subproject commit 0daf533bbdca1bcb5b8f5d16bb258b86bdb59242 Subproject commit 2752cf0ce9d1710792cc939f8b26f48641693516
common @ b30eaa64
Subproject commit 68e0a4f1f1a3ef6e05aca5216bf8684578ec2229 Subproject commit b30eaa6475ccc65b5f99d2ead86ddbe2b8e015a7
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment