From 1c140dff784c837a3c595614812b62549b3c950f Mon Sep 17 00:00:00 2001
From: Owen Edwards <owen.r.edwards@gmail.com>
Date: Mon, 11 Jun 2018 21:24:25 -0700
Subject: [PATCH] Fix: clean up package.json and Gruntfile scripts which refer
 to old build process.

---
 Gruntfile.js | 52 +++++----------------------------------------
 package.json | 60 +++++++++++++++++++++++-----------------------------
 2 files changed, 31 insertions(+), 81 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 378bf5ea..d1dae852 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -29,53 +29,18 @@ module.exports = function( grunt ) {
       files: [ "lib/*", "tests/**/*.js" ]
     },
 
-    uglify: {
-      options: {
-        banner: banner
-      },
-      dist: {
-        files: {
-          "dist/vtt.min.js": "dist/vtt.js"
-        }
-      },
-      global: {
-        files: {
-          "dist/vtt.global.min.js": "dist/vtt.global.js"
-        }
-      },
-      dev: {
-        files: {
-          "dev_build/vtt.min.js": distFiles
-        }
-      }
-    },
-
-    concat: {
-      options: {
-        banner: banner + "\n"
-      },
-      dist: {
-        src: distFiles,
-        dest: "dist/vtt.js"
-      },
-      dev: {
-        src: distFiles,
-        dest: "dev_build/vtt.js"
-      }
-    },
-
     bump: {
       options: {
         files: [ "package.json", "bower.json" ],
         updateConfigs: [],
         commit: true,
         commitMessage: "Release v%VERSION%",
-        commitFiles: [ "package.json", "bower.json", "dist/*" ],
+        commitFiles: [ "package.json", "bower.json", distFiles ],
         createTag: true,
         tagName: "v%VERSION%",
         tagMessage: "Version %VERSION%",
         push: true,
-        pushTo: "git@github.com:mozilla/vtt.js.git",
+        pushTo: "git@github.com:videojs/vtt.js.git",
       }
     },
 
@@ -102,25 +67,18 @@ module.exports = function( grunt ) {
   }
 
   grunt.loadNpmTasks( "grunt-contrib-jshint" );
-  grunt.loadNpmTasks( "grunt-contrib-uglify" );
-  grunt.loadNpmTasks( "grunt-contrib-concat" );
   grunt.loadNpmTasks( "grunt-bump" );
   grunt.loadNpmTasks( "grunt-mocha-test" );
 
-  grunt.registerTask( "build", [ "uglify:dist", "concat:dist" ] );
-  grunt.registerTask( "dev-build", [ "uglify:dev", "concat:dev" ])
-  grunt.registerTask( "default", [ "jshint", "dev-build", "mochaTest" ]);
-
-  grunt.registerTask( "stage-dist", "Stage dist files.", function() {
-    execCmd( "git add dist/*", this.async() );
-  });
+  grunt.registerTask( "test", [ "mochaTest" ]);
+  grunt.registerTask( "default", [ "jshint", "mochaTest" ]);
 
   grunt.registerTask( "reload-pkg", "Reload the package.json config.", function() {
     grunt.config( "pkg", grunt.file.readJSON( "package.json" ) );
   });
 
   grunt.registerTask( "release", "Build the distributables and bump the version.", function(arg) {
-    grunt.task.run( "bump-only:" + arg, "reload-pkg", "build", "stage-dist", "bump-commit" );
+    grunt.task.run( "bump-only:" + arg, "reload-pkg", "bump-commit" );
   });
 
   grunt.registerTask( "cue2json", "Run cue2json.", function(path, opts) {
diff --git a/package.json b/package.json
index 462b84e8..5c1dc164 100644
--- a/package.json
+++ b/package.json
@@ -12,36 +12,11 @@
     "url": "https://github.com/videojs/vtt.js.git"
   },
   "homepage": "https://github.com/videojs/vtt.js",
-  "devDependencies": {
-    "async": "0.9.0",
-    "browserify": "^14.3.0",
-    "deumdify": "^1.2.4",
-    "difflet": "git://github.com/humphd/difflet.git#714b82706ad39d75275a886aeff637df5097626f",
-    "dive": "0.3.1",
-    "grunt": "0.4.1",
-    "grunt-bump": "0.0.14",
-    "grunt-cli": "0.1.9",
-    "grunt-contrib-concat": "0.4.0",
-    "grunt-contrib-jshint": "0.10.0",
-    "grunt-contrib-uglify": "0.5.0",
-    "grunt-mocha-test": "0.11.0",
-    "json-stable-stringify": "1.0.0",
-    "mocha": "1.20.1",
-    "node-vtt": "1.1.7",
-    "optimist": "0.6.1",
-    "text-encoding": "0.1.0",
-    "underscore": "1.6.0",
-    "watchify": "^3.9.0"
-  },
   "files": [
-    "dist/",
-    "lib/browser.js",
-    "lib/index.js",
+    "lib/browser-index.js",
     "lib/vtt.js",
     "lib/vttcue.js",
-    "lib/vttcue-extended.js",
-    "lib/vttregion.js",
-    "lib/vttregion-extended.js"
+    "lib/vttregion.js"
   ],
   "keywords": [
     "vtt",
@@ -52,15 +27,32 @@
     "text track"
   ],
   "scripts": {
-    "build": "npm run build-umd && npm run build-global",
-    "build-umd": "browserify -s vttjs . -o dist/vtt.js",
-    "build-global": "browserify -s vttjs -p deumdify  . -o dist/vtt.global.js",
-    "postbuild": "npm run minify",
-    "minify": "grunt uglify:dist uglify:global",
     "test": "grunt"
   },
-  "license": "Apache-2.0",
   "dependencies": {
     "global": "^4.3.1"
-  }
+  },
+  "devDependencies": {
+    "node-phantom": "^0.2.5",
+    "phantomjs": "^2.1.7",
+    "socket.io": "^2.1.1",
+    "async": "0.9.0",
+    "browserify": "^14.3.0",
+    "deumdify": "^1.2.4",
+    "difflet": "git://github.com/humphd/difflet.git#714b82706ad39d75275a886aeff637df5097626f",
+    "dive": "0.3.1",
+    "grunt": "0.4.1",
+    "grunt-bump": "0.0.14",
+    "grunt-cli": "0.1.9",
+    "grunt-contrib-jshint": "1.1.0",
+    "grunt-mocha-test": "0.13.3",
+    "json-stable-stringify": "1.0.0",
+    "mocha": "5.1.1",
+    "node-vtt": "1.1.7",
+    "optimist": "0.6.1",
+    "text-encoding": "0.1.0",
+    "underscore": "1.6.0",
+    "watchify": "^3.9.0"
+  },
+  "license": "Apache-2.0"
 }