Merge branch 'master' of gitlab.tugraz.at:VPU/WebComponents/Notification

6f9ff1cf · Bekerle, Patrizio · Reiter, Christoph · 877475c3 · 6f9ff1cf · 6f9ff1cf
Commit 6f9ff1cf authored 5 years ago by Bekerle, Patrizio Committed by Reiter, Christoph 4 years ago
--- a/packages/notification/assets/index.html
+++ b/packages/notification/assets/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
    <meta charset="UTF-8">
-    <script type="module" id="vpu-notification-src" src="bundle.js"></script>
+    <script type="module" id="vpu-notification-src" src="vpu-notification-demo.js"></script>
 </head>

 <body>

--- a/packages/notification/package.json
+++ b/packages/notification/package.json
 {
  "name": "vpu-notification",
  "version": "1.0.0",
-  "main": "src/index.js",
+  "main": "src/vpu-notification.js",
  "devDependencies": {
    "karma": "^4.2.0",
    "karma-chai": "^0.1.0",

--- a/packages/notification/rollup.config.js
+++ b/packages/notification/rollup.config.js
@@ -10,42 +10,23 @@ import url from "rollup-plugin-url";
 import consts from 'rollup-plugin-consts';
 import del from 'rollup-plugin-delete';

-const pkg = require('./package.json');
 const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : 'local';
 console.log("build: " + build);

-let manualChunks = Object.keys(pkg.dependencies).reduce(function (acc, item) { acc[item] = [item]; return acc;}, {});
-manualChunks = Object.keys(pkg.devDependencies).reduce(function (acc, item) { if (item.startsWith('vpu-')) acc[item] = [item]; return acc;}, manualChunks);
-
-function getBuildInfo() {
-    const child_process = require('child_process');
-    const url = require('url');
-
-    let remote = child_process.execSync('git config --get remote.origin.url').toString().trim();
-    let commit = child_process.execSync('git rev-parse --short HEAD').toString().trim();
-
-    let parsed = url.parse(remote);
-    let newPath = parsed.path.slice(0, parsed.path.lastIndexOf('.'))
-    let newUrl = parsed.protocol + '//' + parsed.host + newPath + '/commit/' + commit;
-
-    return {
-        info: commit,
-        url: newUrl,
-        env: build
-    }
-}
-
 export default {
-    input: (build != 'test') ? 'src/demo.js' : 'test/**/*.js',
+    input: (build != 'test') ? ['src/vpu-notification.js', 'src/vpu-notification-demo.js'] : 'test/**/*.js',
    output: {
-        file: 'dist/bundle.js',
-        format: 'esm'
+        dir: 'dist',
+        entryFileNames: '[name].js',
+        chunkFileNames: 'shared/[name].[hash].[format].js',
+        format: 'esm',
+        sourcemap: true
    },
    plugins: [
        del({
            targets: 'dist/*'
        }),
-        multiEntry(),
+        (build == 'test') ? multiEntry() : false,
        consts({
            environment: build,
        }),

--- a/packages/notification/src/index.js
+++ b/packages/notification/src/index.js
-import './vpu-notification';
-import { send } from 'vpu-common/notification';
-
-export { send };
--- a/packages/notification/src/vpu-notification.js
+++ b/packages/notification/src/vpu-notification.js
@@ -3,6 +3,9 @@ import {createUUID} from './utils'
 import {css, html} from 'lit-element';
 import VPULitElement from 'vpu-common/vpu-lit-element';
 import * as commonUtils from 'vpu-common/utils';
+import { send } from 'vpu-common/notification';
+
+export { send };

 /**
 * Notification web component