Replace require with import

README.md

@@ -211,10 +211,6 @@ Manual test in browser:
 
     open dist/demo/index.html
 
-Manual test in Node.js:
-
-    node dist/demo/index.js
-
 
 ## Release
 

bin/mermaid.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 
-var chalk = require('chalk')
-var cli = require('../lib/cli.js')
-var lib = require('../lib')
+import chalk from 'chalk'
+
+import cli from '../lib/cli'
+import lib from '../lib'
 
 cli.parse(process.argv.slice(2), function (err, message, options) {
   if (err) {

gulpfile.js

@@ -1,6 +1,6 @@
-const gulp = require('gulp')
-const jison = require('gulp-jison')
-const filelog = require('gulp-filelog')
+import gulp from 'gulp'
+import jison from 'gulp-jison'
+import filelog from 'gulp-filelog'
 
 gulp.task('jison', function () {
   return gulp.src('./src/**/*.jison')

karma.conf.js

@@ -1,7 +1,7 @@
 // Karma configuration
 // Generated on Mon Nov 03 2014 07:53:38 GMT+0100 (CET)
 
-import { jsConfig } from './webpack.config.base.js'
+import { jsConfig } from './webpack.config.base'
 
 const webpackConfig = jsConfig()
 

lib/cli.js

@@ -1,10 +1,11 @@
-var fs = require('fs')
+import fs from 'fs'
+import chalk from 'chalk'
+import which from 'which'
+import parseArgs from 'minimist'
+import semver from 'semver'
+import path from 'path'
+
 var exec = require('child_process').exec
-var chalk = require('chalk')
-var which = require('which')
-var parseArgs = require('minimist')
-var semver = require('semver')
-var path = require('path')
 
 var PHANTOM_VERSION = '^2.1.0'
 

lib/index.js

@@ -1,7 +1,7 @@
-var path = require('path')
-var spawn = require('child_process').spawn
+import path from 'path'
+import mkdirp from 'mkdirp'
 
-var mkdirp = require('mkdirp')
+var spawn = require('child_process').spawn
 
 var phantomscript = path.join(__dirname, 'phantomscript.js')
 

lib/phantomscript.js

@@ -5,6 +5,9 @@
  * - Thanks to the grunticon project for some guidance
  *   https://github.com/filamentgroup/grunticon
  */
+import system from 'system'
+import fs from 'fs'
+import webpage from 'webpage'
 
 window.phantom.onError = function (msg, trace) {
   var msgStack = ['PHANTOM ERROR: ' + msg]
@@ -24,10 +27,6 @@ window.phantom.onError = function (msg, trace) {
   window.phantom.exit(1)
 }
 
-var system = require('system')
-var fs = require('fs')
-var webpage = require('webpage')
-
 var page = webpage.create()
 var files = system.args.slice(10, system.args.length)
 var width = system.args[8]

src/d3.js

@@ -1,6 +1,4 @@
-const d3 = require('d3')
-
-module.exports = d3;
+import d3 from 'd3'
 
 /*
  D3 Text Wrap
@@ -445,3 +443,5 @@ module.exports = d3;
     }
   }
 })()
+
+export default d3

src/diagrams/classDiagram/classDb.js

@@ -1,6 +1,6 @@
 
-var Logger = require('../../logger')
-var log = Logger.Log
+import { logger } from '../../logger'
+
 var relations = []
 
 var classes
@@ -41,7 +41,7 @@ module.exports.getRelations = function () {
 }
 
 exports.addRelation = function (relation) {
-  log.warn('Adding relation: ' + JSON.stringify(relation))
+  logger.warn('Adding relation: ' + JSON.stringify(relation))
   module.exports.addClass(relation.id1)
   module.exports.addClass(relation.id2)
 

src/diagrams/classDiagram/classDiagram.spec.js

@@ -1,7 +1,4 @@
 /* eslint-env jasmine */
-/**
- * Created by knut on 14-11-18.
- */
 describe('class diagram, ', function () {
   describe('when parsing an info graph it', function () {
     var cd, cDDb

src/diagrams/classDiagram/classRenderer.js

@@ -1,14 +1,12 @@
-/**
- * Created by knut on 14-11-23.
- */
 
+import dagre from 'dagre-layout'
+
+import cDDb from './classDb'
+import d3 from '../../d3'
+import { logger } from '../../logger'
 var cd = require('./parser/classDiagram').parser
-var cDDb = require('./classDb')
+
 cd.yy = cDDb
-var d3 = require('../../d3')
-var Logger = require('../../logger')
-var log = Logger.Log
-var dagre = require('dagre-layout')
 
 var idCache
 idCache = {}
@@ -208,7 +206,7 @@ var drawEdge = function (elem, path, relation) {
 }
 
 var drawClass = function (elem, classDef) {
-  log.info('Rendering class ' + classDef)
+  logger.info('Rendering class ' + classDef)
 
   var addTspan = function (textEl, txt, isFirst) {
     var tSpan = textEl.append('tspan')
@@ -309,7 +307,7 @@ module.exports.draw = function (text, id) {
   cd.yy.clear()
   cd.parse(text)
 
-  log.info('Rendering diagram ' + text)
+  logger.info('Rendering diagram ' + text)
 
   /// / Fetch the default direction, use TD if none was found
   var diagram = d3.select('#' + id)
@@ -340,23 +338,23 @@ module.exports.draw = function (text, id) {
     // metadata about the node. In this case we're going to add labels to each of
     // our nodes.
     g.setNode(node.id, node)
-    log.info('Org height: ' + node.height)
+    logger.info('Org height: ' + node.height)
   }
 
   var relations = cDDb.getRelations()
   relations.forEach(function (relation) {
-    log.info('tjoho' + getGraphId(relation.id1) + getGraphId(relation.id2) + JSON.stringify(relation))
+    logger.info('tjoho' + getGraphId(relation.id1) + getGraphId(relation.id2) + JSON.stringify(relation))
     g.setEdge(getGraphId(relation.id1), getGraphId(relation.id2), { relation: relation })
   })
   dagre.layout(g)
   g.nodes().forEach(function (v) {
     if (typeof v !== 'undefined') {
-      log.debug('Node ' + v + ': ' + JSON.stringify(g.node(v)))
+      logger.debug('Node ' + v + ': ' + JSON.stringify(g.node(v)))
       d3.select('#' + v).attr('transform', 'translate(' + (g.node(v).x - (g.node(v).width / 2)) + ',' + (g.node(v).y - (g.node(v).height / 2)) + ' )')
     }
   })
   g.edges().forEach(function (e) {
-    log.debug('Edge ' + e.v + ' -> ' + e.w + ': ' + JSON.stringify(g.edge(e)))
+    logger.debug('Edge ' + e.v + ' -> ' + e.w + ': ' + JSON.stringify(g.edge(e)))
     drawEdge(diagram, g.edge(e), g.edge(e).relation)
   })
 

src/diagrams/classDiagram/classRenderer.spec.js

@@ -1,8 +1,4 @@
 /* eslint-env jasmine */
-/**
- * Created by knut on 14-11-18.
- */
-
 describe('class diagram, ', function () {
   describe('when rendering a classDiagram', function () {
     beforeEach(function () {

src/diagrams/example/example.spec.js

@@ -1,7 +1,4 @@
 /* eslint-env jasmine */
-/**
- * Created by knut on 14-11-18.
- */
 describe('when parsing an info graph it', function () {
   var ex
   beforeEach(function () {

src/diagrams/example/exampleDb.js

@@ -1,14 +1,10 @@
-/**
- * Created by knut on 15-01-14.
- */
-var Logger = require('../../logger')
-var log = Logger.Log
+import { logger } from '../../logger'
 
 var message = ''
 var info = false
 
 exports.setMessage = function (txt) {
-  log.debug('Setting message to: ' + txt)
+  logger.debug('Setting message to: ' + txt)
   message = txt
 }
 

src/diagrams/example/exampleRenderer.js

@@ -1,12 +1,8 @@
-/**
- * Created by knut on 14-12-11.
- */
-var db = require('./exampleDb')
-var exampleParser = require('./parser/example.js')
-var d3 = require('../../d3')
+import db from './exampleDb'
+import exampleParser from './parser/example.js'
+import d3 from '../../d3'
 
-var Logger = require('../../logger')
-var log = Logger.Log
+import { logger } from '../../logger'
 
 /**
  * Draws a an info picture in the tag with id: id based on the graph definition in text.
@@ -17,7 +13,7 @@ exports.draw = function (txt, id, ver) {
   var parser
   parser = exampleParser.parser
   parser.yy = db
-  log.debug('Renering example diagram')
+  logger.debug('Renering example diagram')
   // Parse the graph definition
   parser.parse(txt)
 

src/diagrams/flowchart/flowRenderer.js

@@ -1,13 +1,9 @@
-/**
- * Created by knut on 14-12-11.
- */
-var graph = require('./graphDb')
-var flow = require('./parser/flow')
-var dot = require('./parser/dot')
-var d3 = require('../../d3')
-var dagreD3 = require('dagre-d3-renderer')
-var Logger = require('../../logger')
-var log = Logger.Log
+import graph from './graphDb'
+import flow from './parser/flow'
+import dot from './parser/dot'
+import d3 from '../../d3'
+import dagreD3 from 'dagre-d3-renderer'
+import { logger } from '../../logger'
 
 var conf = {
 }
@@ -251,7 +247,7 @@ module.exports.getClasses = function (text, isDot) {
  * @param id
  */
 module.exports.draw = function (text, id, isDot) {
-  log.debug('Drawing flowchart')
+  logger.debug('Drawing flowchart')
   var parser
   graph.clear()
   if (isDot) {
@@ -265,7 +261,7 @@ module.exports.draw = function (text, id, isDot) {
   try {
     parser.parse(text)
   } catch (err) {
-    log.debug('Parsing failed')
+    logger.debug('Parsing failed')
   }
 
   // Fetch the default direction, use TD if none was found

src/diagrams/flowchart/graphDb.js

@@ -1,11 +1,7 @@
-/**
- * Created by knut on 14-11-03.
- */
-var Logger = require('../../logger')
-var log = Logger.Log
-var utils = require('../../utils')
+import { logger } from '../../logger'
+import utils from '../../utils'
+import d3 from '../../d3'
 
-var d3 = require('../../d3')
 var vertices = {}
 var edges = []
 var classes = []
@@ -68,7 +64,7 @@ exports.addVertex = function (id, text, type, style) {
  * @param linktext
  */
 exports.addLink = function (start, end, type, linktext) {
-  log.info('Got edge...', start, end)
+  logger.info('Got edge...', start, end)
   var edge = { start: start, end: end, type: undefined, text: '' }
   linktext = type.text
 

src/diagrams/flowchart/parser/flow.spec.js

@@ -1,9 +1,5 @@
-/**
-* Created by knut on 14-11-03.
-*/
-
-var graph = require('../graphDb')
-var flow = require('./flow')
+import graph from '../graphDb'
+import flow from './flow'
 
 describe('when parsing ', function () {
   beforeEach(function () {

src/diagrams/gantt/gantt.spec.js

@@ -1,7 +1,4 @@
 /* eslint-env jasmine */
-/**
- * Created by knut on 14-11-18.
- */
 describe('when parsing a gantt diagram it', function () {
   var gantt
   beforeEach(function () {

src/diagrams/gantt/ganttDb.js

@@ -1,9 +1,5 @@
-/**
- * Created by knut on 15-01-14.
- */
-var moment = require('moment')
-var Logger = require('../../logger')
-var log = Logger.Log
+import moment from 'moment'
+import { logger } from '../../logger'
 
 var dateFormat = ''
 var title = ''
@@ -78,8 +74,8 @@ var getStartDate = function (prevTime, dateFormat, str) {
   if (moment(str, dateFormat.trim(), true).isValid()) {
     return moment(str, dateFormat.trim(), true).toDate()
   } else {
-    log.debug('Invalid date:' + str)
-    log.debug('With date format:' + dateFormat.trim())
+    logger.debug('Invalid date:' + str)
+    logger.debug('With date format:' + dateFormat.trim())
   }
 
   // Default date - now

src/diagrams/gantt/ganttDb.spec.js

@@ -1,7 +1,4 @@
 /* eslint-env jasmine */
-/**
- * Created by knut on 14-11-18.
- */
 describe('when using the ganttDb', function () {
   var gDb
   var moment = require('moment')

src/diagrams/gantt/ganttRenderer.js

@@ -1,7 +1,9 @@
+
+import moment from 'moment'
+
+import d3 from '../../d3'
 var gantt = require('./parser/gantt').parser
 gantt.yy = require('./ganttDb')
-var d3 = require('../../d3')
-var moment = require('moment')
 
 var daysInChart
 var conf = {