Switch build to use browserify (niklasvh#502)

lewnelson · Feb 3, 2015 · f3b6df2 · f3b6df2
1 parent 60619dc
commit f3b6df2
Show file tree

Hide file tree

Showing 48 changed files with 4,049 additions and 1,239 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "src/fabric"]
 	path = src/fabric
 	url = https://github.com/kangax/fabric.js.git
-[submodule "src/punycode"]
-	path = src/punycode
-	url = https://github.com/bestiejs/punycode.js.git
diff --git a/.jshintrc b/.jshintrc
@@ -15,6 +15,5 @@
     "globals": {
       "jQuery": true
     },
-    "predef": ["NodeParser", "NodeContainer", "Color", "StackingContext", "TextContainer", "PseudoElementContainer", "ImageLoader", "CanvasRenderer", "Renderer", "Support", "bind", "Promise", "getBounds", "offsetBounds", "XHR",
-        "ImageContainer", "ProxyImageContainer", "DummyImageContainer", "Font", "FontMetrics", "GradientContainer", "LinearGradientContainer", "WebkitGradientContainer", "SVGContainer", "SVGNodeContainer", "FrameContainer", "html2canvas", "log", "smallImage", "parseBackgrounds", "loadUrlDocument", "decode64", "Proxy", "ProxyURL"]
+    "predef": ["-Promise"]
 }
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -8,9 +8,7 @@ module.exports = function(grunt) {
         banner: '/*\n  <%= pkg.title || pkg.name %> <%= pkg.version %>' +
             '<%= pkg.homepage ? " <" + pkg.homepage + ">" : "" %>' + '\n' +
             '  Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>' +
-            '\n\n  Released under <%= _.pluck(pkg.licenses, "type").join(", ") %> License\n*/\n',
-        pre: '\n(function(window, document, exports, global, define, undefined){\n\n',
-        post: '\n}).call({}, typeof(window) !== "undefined" ? window : undefined, typeof(document) !== "undefined" ? document : undefined);'
+            '\n\n  Released under <%= _.pluck(pkg.licenses, "type").join(", ") %> License\n*/\n'
     };
 
     var browsers = {
@@ -59,16 +57,15 @@ module.exports = function(grunt) {
 
         pkg: grunt.file.readJSON('package.json'),
 
-        concat: {
+        browserify: {
             dist: {
-                src: [
-                    'src/promise.js', 'src/fallback.js', 'src/punycode/punycode.js', 'src/core.js',  'src/*.js', 'src/renderers/*.js'
-                ],
-                nonull: true,
+                src: ['src/core.js'],
                 dest: 'dist/<%= pkg.name %>.js',
-                options:{
-                    banner: meta.banner + meta.pre,
-                    footer: meta.post
+                options: {
+                    browserifyOptions: {
+                        standalone: 'html2canvas'
+                    },
+                    banner: meta.banner
                 }
             },
             svg: {
@@ -77,8 +74,10 @@ module.exports = function(grunt) {
                 ],
                 dest: 'dist/<%= pkg.name %>.svg.js',
                 options:{
-                    banner: meta.banner + '\n(function(window, document, exports, undefined){\n\n',
-                    footer: '\n}).call({}, window, document, html2canvas);'
+                    browserifyOptions: {
+                        standalone: 'html2canvas.svg'
+                    },
+                    banner: meta.banner
                 }
             }
         },
@@ -149,11 +148,11 @@ module.exports = function(grunt) {
         },
         uglify: {
             dist: {
-                src: ['<%= concat.dist.dest %>'],
+                src: ['<%= browserify.dist.dest %>'],
                 dest: 'dist/<%= pkg.name %>.min.js'
             },
             svg: {
-                src: ['<%= concat.svg.dest %>'],
+                src: ['<%= browserify.svg.dest %>'],
                 dest: 'dist/<%= pkg.name %>.svg.min.js'
             },
             options: {
@@ -165,7 +164,7 @@ module.exports = function(grunt) {
             tasks: ['jshint', 'build']
         },
         jshint: {
-            all: ['src/*.js', 'src/renderers/*.js',  '!src/promise.js'],
+            all: ['src/*.js', 'src/renderers/*.js'],
             options: grunt.file.readJSON('./.jshintrc')
         },
         mochacli: {
@@ -204,17 +203,17 @@ module.exports = function(grunt) {
         });
     });
 
+    grunt.loadNpmTasks('grunt-browserify');
     grunt.loadNpmTasks('grunt-mocha-phantomjs');
     grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-connect');
     grunt.loadNpmTasks('grunt-execute');
     grunt.loadNpmTasks('grunt-mocha-cli');
 
     grunt.registerTask('server', ['connect:cors', 'connect:proxy', 'connect:altServer', 'connect:server']);
-    grunt.registerTask('build', ['execute', 'concat', 'uglify']);
+    grunt.registerTask('build', ['execute', 'browserify', 'uglify']);
     grunt.registerTask('default', ['jshint', 'build', 'mochacli', 'connect:altServer', 'mocha_phantomjs']);
     grunt.registerTask('travis', ['jshint', 'build', 'connect:altServer', 'connect:ci', 'connect:proxy', 'connect:cors', 'mocha_phantomjs', 'webdriver']);