Merge pull request #147 from webrtc/revert-146-browserify

Revert "make adapter.js the result of browserification"

Author: KaptenJansson

Gruntfile.js

@@ -6,12 +6,6 @@
 module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
-    browserify: {
-      js: {
-        src: ['adapter-core.js'],
-        dest: 'adapter.js'
-      }
-    },
     githooks: {
       all: {
         'pre-commit': 'jshint jscs'
@@ -21,10 +15,10 @@ module.exports = function(grunt) {
       options: {
         jshintrc: '.jshintrc'
       },
-      files: ['adapter-core.js', 'test/*.js']
+      files: ['adapter.js', 'test/*.js']
     },
     jscs: {
-      src: ['adapter-core.js', 'test/*.js'],
+      src: ['adapter.js', 'test/*.js'],
       options: {
         config: '.jscsrc',
         'excludeFiles': [
@@ -39,9 +33,8 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-jscs');
   grunt.loadNpmTasks('grunt-githooks');
-  grunt.loadNpmTasks('grunt-browserify');;
   grunt.registerTask('verify-require', 'Verifies the script can be required in a node context', function () {
       require('./adapter');
   });
-  grunt.registerTask('default', ['jshint', 'jscs', 'browserify', 'verify-require']);
+  grunt.registerTask('default', ['jshint', 'jscs', 'verify-require']);
 };

adapter-core.js renamed to adapter.js

@@ -3,7 +3,7 @@
   "version": "0.2.4",
   "description": "Hide browser differences in WebRTC APIs (test package name)",
   "license": "BSD-3-Clause",
-  "main": "adapter-core.js",
+  "main": "adapter.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/webrtc/adapter.git"
@@ -15,8 +15,8 @@
     "files": "test/test.js"
   },
   "devDependencies": {
+    "browserify": "^10.2.1",
     "grunt": "^0.4.5",
-    "grunt-browserify": "^4.0.1",
     "grunt-cli": ">=0.1.9",
     "grunt-contrib-jshint": "^0.11.2",
     "grunt-contrib-nodeunit": "~0.4.1",

package.json

@@ -15,7 +15,7 @@ console.log = function() {
   saveConsole.apply(saveConsole, arguments);
 };
 
-var m = require('../adapter-core.js');
+var m = require('../adapter.js');
 console.log = saveConsole;
 
 test('log suppression', function(t) {
@@ -894,7 +894,6 @@ test('iceTransportPolicy relay functionality', function(t) {
   });
 });
 
-/*
 // This MUST to be the last test since it loads adapter
 // again which may result in unintended behaviour.
 test('Non-module logging to console still works', function(t) {
@@ -932,4 +931,3 @@ test('Non-module logging to console still works', function(t) {
     t.end();
   }, 500);
 });
-*/