Skip to content

Webpack bundling for distribution #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
felesmortis wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Webpack bundling for distribution #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbee59b
Set up webpack to bundle js and a task to move the html file. Css is not
Mar 8, 2018
258c133
Set up css loading. Removed files not got by package. `yarn run build`
Mar 12, 2018
fd621bb
Merge branch 'webpack'
Mar 12, 2018
57f49b8
Remove old css imports.
Mar 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/gitgraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var gitlost = require('../lib/graph');
import gitlost from '../lib/graph';
settings = JSON.parse(process.argv.slice(2).join(' ') || '{}');
gitlost.graph(settings).then(function (dot) {
console.log(dot);
Expand Down
4 changes: 2 additions & 2 deletions bin/gitlost.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var opn = require('opn');
var server = require("../lib/server.js");
import * as opn from 'opn';
import server from "../lib/server";

opn('http://localhost:6776', {app: 'chrome'});
server.listen(6776);
16 changes: 8 additions & 8 deletions lib/graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
var child_process = require('child_process');
var md5 = require('md5');
"use strict";

import * as child_process from 'child_process';
import * as md5 from 'md5';

var carot = '^';
if (process.platform === 'win32') {
Expand Down Expand Up @@ -64,11 +66,11 @@ function hsl_to_rgb(h, s, l){

var color_hash = function(text) {
text = text.match(/[^\/]+$/)[0];
hash = parseInt('0x' + md5(text).slice(-5));
var hash = parseInt('0x' + md5(text).slice(-5));
var h = (((hash >> 9) & 0x1ff) ^ 0x109) / 512; // map [0,127] to ~[ 0, 1)
var s = ((((hash >> 5) & 0x3f) ^ 0x2f) + 36) / 100; // map [0, 63] to [.36, .99]
var l = ((hash & 0x1f) + 24) / 100; // map [0, 31] to [.24, .55]
rgb = hsl_to_rgb(h, s, l);
var rgb = hsl_to_rgb(h, s, l);
rgb = (rgb[0] << 16) + (rgb[1] << 8) + rgb[2];
//console.log('/* ' + hash.toString(16) + ' - ' + [h, s, l] + '*/')
return '#' + ('000000' + rgb.toString(16)).slice(-6)
Expand Down Expand Up @@ -165,6 +167,7 @@ function graph(settings) {
};
})
.sort(function (a, b) {
var ax, bx;
return ((ax = settings.branches.indexOf(a.ref_short)) !== -1 ? ax : settings.branches.length) - ((bx = settings.branches.indexOf(b.ref_short)) !== -1 ? bx : settings.branches.length);
});
});
Expand Down Expand Up @@ -278,7 +281,4 @@ function graph(settings) {
});
}

module.exports = {
graph: graph,
queue_cmd: queue_cmd
};
export { graph, queue_cmd };
13 changes: 6 additions & 7 deletions lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
var http = require('http');
var child_process = require('child_process');
import * as http from 'http';
var fs = require('fs');
var path = require('path');
var EventEmitter = require('events');
var gitlost = require('./graph');
import * as path from 'path';
import * as EventEmitter from 'events';
import * as gitlost from './graph';

var webdir = path.join(__dirname, '../web');
var webdir = __dirname;
var vizjs = path.join(__dirname, '../node_modules/viz.js/viz.js');

var mimetypes = {
Expand Down Expand Up @@ -280,4 +279,4 @@ server.on('request', function (request, response) {
}
});

module.exports = server;
export default server;
18 changes: 16 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,30 @@
"main": "./lib/graph.js",
"bin": "./bin/gitlost.js",
"dependencies": {
"bootstrap": "^3.0.0",
"bootstrap-menu": "^1.0.14",
"bootstrap3-dialog": "^1.35.3",
"bootstrap-select": "^1.12.4",
"bootstrap3-dialog": "^1.35.4",
"d3": "^4.13.0",
"d3-graphviz": "^1.3.4",
"jquery": "^3.3.1",
"md5": "^2.2.1",
"opn": "^4.0.2",
"sortablejs": "^1.5.1"
},
"devDependencies": {},
"devDependencies": {
"babel-loader": "^7.1.4",
"css-loader": "^0.28.10",
"file-loader": "^1.1.11",
"style-loader": "^0.20.3",
"url-loader": "^1.0.1",
"webpack": "^4.1.1",
"webpack-cli": "^2.0.10",
"webpack-node-externals": "^1.6.0"
},
"scripts": {
"build": "webpack && copy web\\graph.html dist\\graph.html && copy node_modules\\viz.js\\viz.js dist\\viz.js",
"start": "./dist/gitlost.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
Expand Down
Loading