Merge pull request #30 from c-base/modernize_build

Modernize build
This commit is contained in:
Henri Bergius 2018-12-09 22:03:33 +01:00 committed by GitHub
commit b51b8b1e0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 124 additions and 113 deletions

View file

@ -1,2 +1,2 @@
FROM nginx
COPY . /usr/share/nginx/html
COPY dist /usr/share/nginx/html

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base bar stats</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base bar status</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
h2 {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-lab</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-lab</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base event calendar</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="https://www.c-base.org/calendar/exported/events.js"></script>
<script src="../dist/calendar.js"></script>
<script src="../lib/calendar.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
#events {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base he2</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>c-flo info display</title>
<script src="/dist/infodisplay.js" type="text/javascript"></script>
<script src="../lib/infodisplay.js" type="text/javascript"></script>
<style>
::-webkit-scrollbar {
display: none;

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base network traffic</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base life support</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base mainhall</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base mainhall</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base nerdarea</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base nerdarea</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -6,7 +6,7 @@
"scripts": {
"build": "webpack",
"pretest": "eslint index.js lib/*.js elements/*.js infodisplay/*.js events/*.js",
"start": "http-server . -p 3000 -s -c-1",
"start": "webpack-dev-server",
"test": "npm run build"
},
"author": "Henri Bergius <henri.bergius@iki.fi>",
@ -26,12 +26,13 @@
"babel-eslint": "^8.0.2",
"babel-loader": "^8.0.0-beta.0",
"babel-plugin-transform-class-properties": "^6.24.1",
"copy-webpack-plugin": "^4.6.0",
"eslint": "^4.12.0",
"eslint-config-airbnb-base": "^12.1.0",
"eslint-plugin-import": "^2.8.0",
"http-server": "^0.11.0",
"msgflo-nodejs": "^0.11.1",
"webpack": "^4.0.0",
"webpack-cli": "^3.0.0"
"webpack-cli": "^3.0.0",
"webpack-dev-server": "^3.1.10"
}
}

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base robolab</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base robolab</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -1,27 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Components test</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {
display: grid;
grid-template-columns: 50vw 50vw;
grid-template-rows: 80vh 80vh;
padding: 0px;
margin: 0px;
}
</style>
</head>
<body>
<main>
<cbase-heatmap timeseries="crew.online" interpolate></cbase-heatmap>
<cbase-polar timeseries="bar.open" days="90" percentage></cbase-polar>
</main>
</body>
</html>

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base soundlab</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -1,3 +1,6 @@
const path = require('path');
const CopyWebpackPlugin = require('copy-webpack-plugin');
module.exports = {
entry: {
infoscreens: './index.js',
@ -5,11 +8,12 @@ module.exports = {
calendar: './events/calendar.js',
},
output: {
path: __dirname,
filename: 'dist/[name].js',
path: path.resolve(__dirname, 'dist'),
filename: 'lib/[name].js',
library: '[name]',
libraryTarget: 'umd',
},
mode: 'production',
module: {
rules: [
{
@ -20,11 +24,39 @@ module.exports = {
options: {
presets: ['@babel/preset-env'],
plugins: ['transform-class-properties'],
}
}
}
]
},
},
},
],
},
plugins: [
new CopyWebpackPlugin([
{
from: '**/index.html',
to: './',
},
{
from: '**/*.svg',
to: './',
},
{
from: 'theme/*',
to: './',
},
{
from: 'node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js',
to: './vendor/webcomponentsjs/webcomponents-lite.js',
},
{
from: 'node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js',
to: './vendor/webcomponentsjs/custom-elements-es5-adapter.js',
},
{
from: 'node_modules/plotly.js/dist/plotly.min.js',
to: './vendor/plotly.js/plotly.min.js',
},
]),
],
externals: {
newrelic: 'commonjs newrelic',
tv4: 'commonjs tv4',
@ -34,4 +66,9 @@ module.exports = {
node: {
fs: 'empty',
},
devServer: {
host: process.env.HOST || 'localhost',
port: 3000,
inline: true,
},
};

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base weltenbaulab</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base weltenbaulab</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base workshop</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {

View file

@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<title>c-base workshop</title>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../node_modules/plotly.js/dist/plotly.min.js"></script>
<script src="../dist/infoscreens.js"></script>
<script src="../vendor/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../vendor/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="../vendor/plotly.js/plotly.min.js"></script>
<script src="../lib/infoscreens.js"></script>
<link rel="stylesheet" href="../theme/c-base.css">
<style>
main {