Merge 225aad0 into a4c31c2

.gitignore

@@ -1,8 +1,9 @@
-node_modules
+/node_modules
+/dist
+/sauce_connect.log
+/sc.log
+/test-results
+/tmp
+*.peg.js
 .DS_STORE
 ._.DS_STORE
-dist
-sauce_connect.log
-sc.log
-*.peg.js
-test-results

gruntfile.js

@@ -296,18 +296,22 @@ module.exports = function (grunt) {
         }
     },
     atpackager : {
-        runtime : {
             options : {
                 sourceDirectories : ['.'],
                 sourceFiles : ['hsp/**/*.js'],
                 outputDirectory : 'dist/' + pkg.version,
-                defaultBuilder : {
-                    type : "NoderPackage",
-                    cfg : {
-                        outputFileWrapper : "(function(define){$CONTENT$;})(noder.define);"
-                    }
-                },
                 visitors : [{
+                            type : "ImportSourceFile",
+                            cfg : {
+                                sourceFile : "tmp/uglify-js.js",
+                                targetLogicalPath : "uglify-js.js"
+                            }
+                        }, {
+                            type : "NoderExportVars",
+                            cfg : {
+                                files : ["uglify-js.js"]
+                            }
+                        }, {
                             type : "ImportSourceFile",
                             cfg : {
                                 sourceFile : require.resolve("acorn/acorn"),
@@ -318,17 +322,41 @@ module.exports = function (grunt) {
                             cfg : {
                                 noCircularDependencies : false
                             }
-                        }],
-                packages : [{
-                            name : "hashspace-noder.js",
-                            files : ['hsp/*.js', 'hsp/rt/*.js', 'hsp/gestures/*.js']
-                        }, {
-                            name : "hashspace-noder-compiler.js",
-                            files : ['hsp/compiler/compiler.js']
                         }]
+
+            },
+            uglify : {
+                options : {
+                    sourceDirectories : ["node_modules/uglify-js/lib"],
+                    sourceFiles : [],
+                    outputDirectory : 'tmp',
+                    visitors : [],
+                    packages : [{
+                        builder : "Concat",
+                        name : 'uglify-js.js',
+                        files : ["utils.js", "ast.js", "parse.js", "transform.js", "scope.js", "output.js",
+                                "compress.js"]
+                    }]
+                }
+            },
+            runtime : {
+                options : {
+                    defaultBuilder : {
+                        type : "NoderPackage",
+                        cfg : {
+                            outputFileWrapper : "(function(define){$CONTENT$;})(noder.define);"
+                        }
+                    },
+                    packages : [{
+                                name : "hashspace-noder.js",
+                                files : ['hsp/*.js', 'hsp/rt/*.js', 'hsp/gestures/*.js']
+                            }, {
+                                name : "hashspace-noder-compiler.js",
+                                files : ['hsp/compiler/compile.js','hsp/transpiler/transpile.js']
+                            }]
+                }
             }
         }
-    }
   });
 
   // Automatically load all the grunt tasks
@@ -338,7 +366,7 @@ module.exports = function (grunt) {
   require('atpackager').loadNpmPlugin('noder-js');
 
   grunt.registerTask('prepublish', ['peg']);
-  grunt.registerTask('package', ['prepublish', 'browserify', 'atpackager', 'uglify']);
+  grunt.registerTask('package', ['prepublish', 'browserify', 'atpackager:uglify','atpackager:runtime','uglify']);
   grunt.registerTask('mocha', ['peg', 'inittests', 'mochaTest', 'finalizetests']);
   grunt.registerTask('test', ['checkStyle', 'jscs', 'mocha', 'karma:unit']);
   grunt.registerTask('ci', ['checkStyle', 'jscs', 'mocha', 'karma:ci1', 'karma:ci2', 'karma:coverage', 'package']);

hsp/compiler/compile.js

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 Amadeus s.a.s.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var compiler = require("./compiler");
+
+module.exports = function (code, moduleName) {
+    var compileRes = compiler.compile(code, moduleName);
+    return compileRes.code;
+};

hsp/transpiler/transpile.js

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 Amadeus s.a.s.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var processString = require("./processString");
+
+module.exports = function (code, moduleName) {
+    var transpileRes = processString(code, moduleName);
+    return transpileRes.code;
+};

package.json

@@ -40,7 +40,7 @@
     "karma-phantomjs-launcher": "~0.1",
     "load-grunt-tasks": "~0.2.1",
     "expect.js": "0.2.0",
-    "noder-js": "~1.2.0",
+    "noder-js": "1.2.1",
     "jquery": "~1.11.0",
     "grunt-jscs-checker": "~0.4.0",
     "karma-hsp-preprocessor": "~0.0.6"