Merge pull request #40 from kriffe/master

NPM 0.6.0

.npmrc

@@ -0,0 +1 @@
+package-lock=false

build/litegraph.js

@@ -1,5 +1,3 @@
-//packer version
-
 (function(global){
 // *************************************************************
 //   LiteGraph CLASS                                     *******
@@ -340,6 +338,9 @@ var LiteGraph = global.LiteGraph = {
 			type_a == LiteGraph.EVENT && type_b == LiteGraph.ACTION )
         return true;
 
+    type_a = String(type_a) //* Enforce string type to handle toLowerCase call (-1 number not ok)
+    type_b = String(type_b)
+
 		type_a = type_a.toLowerCase();
 		type_b = type_b.toLowerCase();
 		if( type_a.indexOf(",") == -1 && type_b.indexOf(",") == -1 )

gruntfile.js

@@ -12,7 +12,8 @@ module.exports = function (grunt) {
       'src/nodes/gltextures.js',
       'src/nodes/glfx.js',
       'src/nodes/midi.js',
-      'src/nodes/audio.js'
+      'src/nodes/audio.js',
+      'src/nodes/network.js'
     ],
     concat: {
       build: {
@@ -20,9 +21,6 @@ module.exports = function (grunt) {
         dest: 'build/litegraph.js'
       }
     },
-    clean: {
-      build: {src: ['build/*']}
-    },
     closureCompiler: {
 
       options: {
@@ -42,28 +40,8 @@ module.exports = function (grunt) {
     }
   })
 
-  // grunt.registerTask('buildPackage', function () {
-  //   var pkg = grunt.config.data.pkg
-  //   var newPackage = {
-  //     version: pkg.version,
-  //     name: 'litegraph.js', //* Static name without ogranisation
-  //     main: 'litegraph.js',
-  //     description: pkg.description,
-  //     dependencies: pkg.dependencies,
-  //     author: pkg.author,
-  //     license: 'MIT',
-  //     scripts: {
-
-  //     }
-  //   }
-
-  //   grunt.file.write('build/package.json', JSON.stringify(newPackage, undefined, 2))
-  // })
-
   grunt.loadNpmTasks('grunt-contrib-concat')
-  grunt.loadNpmTasks('grunt-contrib-copy')
   grunt.loadNpmTasks('grunt-closure-tools')
-  grunt.loadNpmTasks('grunt-contrib-clean')
 
   grunt.registerTask('build', ['concat:build', 'closureCompiler'])
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "litegraph.js",
-  "version": "0.3.0",
+  "version": "0.6.0",
   "description": "A graph node editor similar to PD or UDK Blueprints, it works in a HTML5 Canvas and allow to exported graphs to be included in applications.",
   "main": "build/litegraph.js",
   "directories": {
@@ -8,9 +8,9 @@
   },
   "private": false,
   "scripts": {
-    "prebuild": "grunt clean:build",
+    "prebuild": "rimraf build",
     "build": "grunt build",
-    "start": "npx nodemon utils/server.js",
+    "start": "nodemon utils/server.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -31,10 +31,10 @@
     "express": "^4.16.2",
     "google-closure-compiler": "^20171112.0.0",
     "grunt": "^1.0.1",
+    "grunt-cli": "^1.2.0",
     "grunt-closure-tools": "^1.0.0",
-    "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-concat": "^1.0.1",
-    "grunt-contrib-copy": "^1.0.0",
-    "nodemon": "^1.14.7"
+    "nodemon": "^1.14.7",
+    "rimraf": "^2.6.2"
   }
 }

src/litegraph.js

@@ -338,6 +338,9 @@ var LiteGraph = global.LiteGraph = {
 			type_a == LiteGraph.EVENT && type_b == LiteGraph.ACTION )
         return true;
 
+    type_a = String(type_a) //* Enforce string type to handle toLowerCase call (-1 number not ok)
+    type_b = String(type_b)
+
 		type_a = type_a.toLowerCase();
 		type_b = type_b.toLowerCase();
 		if( type_a.indexOf(",") == -1 && type_b.indexOf(",") == -1 )

utils/server.js

@@ -1,8 +1,6 @@
 const express = require('express')
 const app = express()
 
-// app.get('/hello', (req, res) => res.send('Hello World!'))
-
 app.use('/css', express.static('css'))
 app.use('/src', express.static('src'))
 app.use('/external', express.static('external'))