Skip to content

Commit

Permalink
Bugfix: Make SVGTypewriter work with browserify (#3115)
Browse files Browse the repository at this point in the history
Make svg-typewriter explicit npm dependency
Remove concat task from Grunt
Add svg-typewriter as dependency in UMD config

fixes #3114
  • Loading branch information
CalvinFernandez authored Nov 22, 2016
1 parent db82c75 commit 1fe321b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1,019 deletions.
9 changes: 3 additions & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ module.exports = function(grunt) {
src: "plottable.js",
objectToExport: "Plottable",
deps: {
"default": ["d3"],
"default": ["d3", "SVGTypewriter"],
"amd": ["d3", "svg-typewriter"],
"cjs": ["d3", "svg-typewriter"]
}
}
};
Expand All @@ -64,10 +66,6 @@ module.exports = function(grunt) {
src: ["license_header.txt", "plottable.js"],
dest: "plottable.js"
},
svgtypewriter: {
src: ["plottable.js", "./node_modules/svg-typewriter/svgtypewriter.js"],
dest: "plottable.js"
},
typings: {
src: ["plottable.d.ts"],
dest: "plottable-npm.d.ts",
Expand Down Expand Up @@ -262,7 +260,6 @@ module.exports = function(grunt) {
]);

grunt.registerTask("generateJS", [
"concat:svgtypewriter",
"umd:all",
"concat:header",
"concat:typings",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
"mocha": "2.2.5",
"requirejs": "2.1.18",
"sinon": "1.16.1",
"svg-typewriter": "0.3.0-beta.0",
"tslint": "3.15.1",
"typescript": "2.0.6"
},
"dependencies": {
"d3": "^3.5.16"
"d3": "^3.5.16",
"svg-typewriter": "^0.3.0-beta.0"
}
}
Loading

0 comments on commit 1fe321b

Please sign in to comment.