From 6f9ff1cf4b16df8f6a967599aa14188856cc6bf9 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio.bekerle@tugraz.at>
Date: Fri, 11 Oct 2019 14:09:03 +0200
Subject: [PATCH] Merge branch 'master' of
gitlab.tugraz.at:VPU/WebComponents/Notification
---
packages/notification/assets/index.html | 2 +-
packages/notification/package.json | 2 +-
packages/notification/rollup.config.js | 33 ++++---------------
packages/notification/src/index.js | 4 ---
packages/notification/src/vpu-notification.js | 3 ++
5 files changed, 12 insertions(+), 32 deletions(-)
delete mode 100644 packages/notification/src/index.js
diff --git a/packages/notification/assets/index.html b/packages/notification/assets/index.html
index aba5bddd..96696527 100644
--- 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>
diff --git a/packages/notification/package.json b/packages/notification/package.json
index f120a394..a521c927 100644
--- a/packages/notification/package.json
+++ b/packages/notification/package.json
@@ -1,7 +1,7 @@
{
"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",
diff --git a/packages/notification/rollup.config.js b/packages/notification/rollup.config.js
index 7bb210bc..53bb5df1 100644
--- 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,
}),
diff --git a/packages/notification/src/index.js b/packages/notification/src/index.js
deleted file mode 100644
index bcee6d68..00000000
--- a/packages/notification/src/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import './vpu-notification';
-import { send } from 'vpu-common/notification';
-
-export { send };
diff --git a/packages/notification/src/vpu-notification.js b/packages/notification/src/vpu-notification.js
index 2d368745..95b187db 100644
--- 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
--
GitLab