Do not bundle demo and parser together. Refs #15

I was browserifying the parser together with the demo
code and CodeMirror but having the parser bundle
included in the real sqlite-parser.js format has the added
benefit of testing that the library does indeed make itself
available on window.sqliteParser when it is dropped into
a script tag on a web page.

Author: nwronski

Gruntfile.js

@@ -30,8 +30,6 @@ module.exports = function(grunt) {
       interactive: {
         options: {
           alias: {
-            'sqlite-parser': './index',
-            'sqlite-parser-util': './lib/parser-util',
             'codemirror': './node_modules/codemirror/lib/codemirror',
             'foldcode': './node_modules/codemirror/addon/fold/foldcode',
             'foldgutter': './node_modules/codemirror/addon/fold/foldgutter',
@@ -42,7 +40,6 @@ module.exports = function(grunt) {
           },
         },
         require: [
-          'lib/parser-util.js', 'lib/parser.js', './index.js',
           'node_modules/codemirror/lib/codemirror',
           'node_modules/codemirror/addon/fold/foldcode',
           'node_modules/codemirror/addon/fold/foldgutter',
@@ -67,10 +64,15 @@ module.exports = function(grunt) {
       },
       interactive: {
         files: [{
-          src: ['src/demo/index.html'],
-          flatten: true,
+          src: ['index.html'],
           expand: true,
+          cwd: 'src/demo/',
           dest: '.tmp/'
+        }, {
+          src: ['sqlite-parser.js'],
+          expand: true,
+          cwd: 'dist/',
+          dest: '.tmp/js/'
         }],
       },
       demo: {
@@ -159,7 +161,7 @@ module.exports = function(grunt) {
         ],
         tasks: ['build', 'shell:debug']
       },
-      live: {
+      interactive: {
         options: {
           debounceDelay: 1000,
           livereload: {
@@ -168,7 +170,7 @@ module.exports = function(grunt) {
           },
         },
         files: [
-          'index.js', 'src/**/*.{js,pegjs,css,html}', 'Gruntfile.js'
+          'index.js', 'src/**/*.{js,css,html,pegjs}', 'Gruntfile.js'
         ],
         tasks: ['interactive']
       }
@@ -187,7 +189,8 @@ module.exports = function(grunt) {
       },
       demo: {
         files: {
-          'demo/js/sqlite-parser-demo.js': ['.tmp/js/sqlite-parser-demo.js']
+          'demo/js/sqlite-parser-demo.js': ['.tmp/js/sqlite-parser-demo.js'],
+          'demo/js/sqlite-parser.js': ['.tmp/js/sqlite-parser.js']
         }
       }
     },
@@ -229,6 +232,7 @@ module.exports = function(grunt) {
         files: {
           src: [
             'demo/js/sqlite-parser-demo.js',
+            'demo/css/sqlite-parser-demo.css'
           ]
         }
       }
@@ -274,20 +278,20 @@ module.exports = function(grunt) {
     'build', 'shell:rewrite'
   ]);
   grunt.registerTask('interactive', [
-    'clean:interactive', 'default', 'copy:interactive', 'cssmin:interactive',
-    'browserify:interactive'
+    'clean:interactive', 'minidist', 'copy:interactive',
+    'cssmin:interactive', 'browserify:interactive'
   ]);
   grunt.registerTask('live', [
-    'interactive', 'connect:server', 'watch:live'
+    'interactive', 'connect:server', 'watch:interactive'
   ]);
   grunt.registerTask('demo', [
     'interactive', 'clean:demo', 'copy:demo', 'uglify:demo', 'usebanner:demo'
   ]);
   grunt.registerTask('minidist', [
-    'default', 'clean:dist', 'browserify:dist'
+    'default', 'clean:dist', 'browserify:dist', 'replace:dist'
   ]);
   grunt.registerTask('dist', [
-    'minidist', 'uglify:dist', 'replace:dist', 'usebanner:dist'
+    'minidist', 'uglify:dist', 'usebanner:dist'
   ]);
   grunt.registerTask('release', [
     'test', 'dist', 'demo', 'clean:interactive'

src/demo/demo.js

@@ -1,8 +1,6 @@
 /**
 * sqlite-parser demo
 */
-import sqliteParser from 'sqlite-parser';
-import {extend} from 'sqlite-parser-util';
 import CodeMirror from 'codemirror';
 
 require('foldgutter');
@@ -105,10 +103,10 @@ document.addEventListener('DOMContentLoaded', function () {
     tabSize: 4,
     gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   },
-  sql = CodeMirror.fromTextArea(elemSql, extend({
+  sql = CodeMirror.fromTextArea(elemSql, Object.assign({
     mode: 'text/x-plsql'
   }, cmDefaults)),
-  ast = CodeMirror.fromTextArea(elemAst, extend({
+  ast = CodeMirror.fromTextArea(elemAst, Object.assign({
     mode: "application/ld+json",
     foldGutter: true,
     readOnly: true

src/demo/index.html

@@ -57,7 +57,9 @@ <h3>
          &copy; 2015 <a href="http://codeschool.com" title="Code School">Code School</a>
        </h3>
     </footer>
-
+    
+    <!-- sqliteParser Bundle -->
+    <script src="js/sqlite-parser.js"></script>
     <!-- CodeMirror Setup -->
     <script src="js/sqlite-parser-demo.js"></script>
   </body>