Merge pull request #2867 from palantir/r1.15.0

Release version 1.15.0

Gruntfile.js

@@ -51,32 +51,12 @@ module.exports = function(grunt) {
     }
   };
 
-  var prefixMatch = "\\n *(function |var |static )?";
-  var varNameMatch = "[^(:;]*(\\([^)]*\\))?"; // catch function args too
-  var nestedBraceMatch = ": \\{[^{}]*\\}";
-  var typeNameMatch = ": [^;]*";
-  var finalMatch = "((" + nestedBraceMatch + ")|(" + typeNameMatch + "))?\\n?;";
-  var jsdocInit = "\\n *\\/\\*\\* *\\n";
-  var jsdocMid = "( *\\*[^\\n]*\\n)+";
-  var jsdocEnd = " *\\*\\/ *";
-  var jsdoc = "(" + jsdocInit + jsdocMid + jsdocEnd + ")?";
-
   var sedConfig = {
-    privateDefinitions: {
-      pattern: jsdoc + prefixMatch + "private " + varNameMatch + finalMatch,
-      replacement: "",
-      path: "build/plottable.d.ts"
-    },
     definitions: {
       pattern: '/// *<reference path=[\'"].*[\'"] */>',
       replacement: "",
       path: "build/plottable.d.ts"
     },
-    sublime: {
-      pattern: "(.*\\.ts)",
-      replacement: '/// <reference path="../$1" />',
-      path: "build/sublime.d.ts"
-    },
     versionNumber: {
       pattern: "@VERSION",
       replacement: "<%= pkg.version %>",
@@ -92,7 +72,7 @@ module.exports = function(grunt) {
   // on each recompile
   var updateTsFiles = function() {
     tsFiles = grunt.file.read("src/reference.ts")
-      .split("\n")
+      .split(grunt.util.linefeed)
       .filter(function(s) {
         return s !== "";
       }).map(function(s) {
@@ -104,7 +84,7 @@ module.exports = function(grunt) {
   var testTsFiles;
   var updateTestTsFiles = function() {
     testTsFiles = grunt.file.read("test/testReference.ts")
-      .split("\n")
+      .split(grunt.util.linefeed)
       .filter(function(s) {
         return s !== "";
       }).map(function(s) {
@@ -271,12 +251,6 @@ module.exports = function(grunt) {
     }
   };
 
-  var shellConfig = {
-    sublime: {
-      command: "(echo 'src/reference.ts'; find typings -name '*.d.ts') > build/sublime.d.ts"
-    }
-  };
-
   var saucelabsMochaConfig = {
     all: {
       options: {
@@ -325,7 +299,6 @@ module.exports = function(grunt) {
     gitcommit: gitcommitConfig,
     compress: compressConfig,
     uglify: uglifyConfig,
-    shell: shellConfig,
     "saucelabs-mocha": saucelabsMochaConfig
   });
 
@@ -356,7 +329,6 @@ module.exports = function(grunt) {
     "concat:svgtypewriter",
     "concat:definitions",
     "sed:definitions",
-    "sed:privateDefinitions",
     "umd:all",
     "concat:header",
     "sed:versionNumber",
@@ -391,9 +363,6 @@ module.exports = function(grunt) {
     grunt.registerTask("test-travis", ["dev-compile", "test-local"]);
   }
 
-  // Tooling
-  grunt.registerTask("sublime", ["shell:sublime", "sed:sublime"]);
-
   grunt.registerTask("update-quicktests", function() {
     var qtJSON = [];
     var rawtests = grunt.file.expand("quicktests/overlaying/tests/**/*.js");

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "plottable",
   "description": "A modular charting library built on D3",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "main": ["plottable.js", "plottable.css"],
   "typescript": {
     "definition": "plottable.d.ts"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "plottable.js",
   "description": "A modular charting library built on D3",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "license": "MIT",
   "repository": {
     "type": "git",