merge

entrylabs · May 18, 2016 · ab9d7a0 · ab9d7a0
2 parents 1b714a5 + 3e2be6a
commit ab9d7a0
Show file tree

Hide file tree

Showing 123 changed files with 68,097 additions and 23,100 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,9 @@ node_modules
 
 # external libraries
 extern/closure-library
+
+.DS_Store
+
+*.map
+
+.vscode/*
diff --git a/.jshintrc b/.jshintrc
@@ -9,6 +9,7 @@
     "validthis": true,
     "globals": {
         "goog": true,
+        "acorn": true,
         "createjs": true,
         "Entry": true,
         "Blockly": true,
@@ -25,6 +26,7 @@
         "mina": true,
         "Touch": true,
         "io": true,
-        "ActiveXObject": true
+        "ActiveXObject": true,
+        "CodeMirror": true
     }
 }
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -67,14 +67,15 @@ module.exports = function(grunt) {
                 compilerFile: 'node_modules/closurecompiler/compiler/compiler.jar',
                 checkModified: true,
                 compilerOpts: {
+                    create_source_map: 'entry.js.map',
                     compilation_level: 'SIMPLE_OPTIMIZATIONS',
                     language_in: 'ECMASCRIPT5',
                     language_out: 'ECMASCRIPT5',
                     formatting: 'pretty_print'
                 }
             },
             targetName: {
-                src: ['src/entry.js', 'src/**/*.js'],
+                src: ['src/entry.js', 'src/**/*.js', '!src/workspace/block_entry.js'],
                 dest: 'dist/entry.js'
             },
             dist: {