js: Convert the webdriver.promise namespace to a Closure module.

Author: jleyba

Diff for: javascript/node/deploy.js

@@ -28,13 +28,15 @@ var optparse = require('./optparse');
 
 
 var CLOSURE_BASE_REGEX = /^var goog = goog \|\| \{\};/;
-var REQUIRE_REGEX = /^\s*(?:(?:var|let|const)\s+[a-zA-Z_$][a-zA-Z0-9$_]*\s*=\s*)?goog\.require\s*\(\s*[\'\"]([^\)]+)[\'\"]\s*\);?$/;
+var MODULE_REGEX = /^goog\.module\s*\(\s*[\'\"]([^\)]+)[\'\"]\s*\);?$/;
 var PROVIDE_REGEX = /^goog\.provide\s*\(\s*[\'\"]([^\)]+)[\'\"]\s*\);?$/;
+var REQUIRE_REGEX = /^\s*(?:(?:var|let|const)\s+[a-zA-Z_$][a-zA-Z0-9$_]*\s*=\s*)?goog\.require\s*\(\s*[\'\"]([^\)]+)[\'\"]\s*\);?$/;
 
 
 /**
  * Map of file paths to a hash of what symbols that file provides and requires.
- * @type {!Object.<{provides: !Array.<string>,
+ * @type {!Object.<{modules: boolean,
+ *                  provides: !Array.<string>,
  *                  requires: !Array.<string>}>}
  */
 var FILE_INFO = {};
@@ -104,14 +106,18 @@ function updateProviders(path, symbol) {
  */
 function parseFile(path) {
   var contents = fs.readFileSync(path, 'utf8');
-  var info = {provides: [], requires: []};
+  var info = {module: false, provides: [], requires: []};
   FILE_INFO[path] = info;
 
   contents.split(/\n/).forEach(function(line) {
     var match = line.match(REQUIRE_REGEX);
     if (match) {
       info.requires.push(match[1]);
       addRequiredEdge(path, match[1]);
+    } else if (match = line.match(MODULE_REGEX)) {
+      info.module = true;
+      info.provides.push(match[1]);
+      updateProviders(path, match[1]);
     } else if (match = line.match(PROVIDE_REGEX)) {
       info.provides.push(match[1]);
       updateProviders(path, match[1]);
@@ -244,7 +250,8 @@ function copyLibraries(outputDirPath, filePaths) {
       'goog.addDependency(',
       JSON.stringify(relativePath), ', ',
       JSON.stringify(FILE_INFO[file].provides), ', ',
-      JSON.stringify(FILE_INFO[file].requires),
+      JSON.stringify(FILE_INFO[file].requires), ', ',
+      !!FILE_INFO[file].module,
       ');'
     ].join(''));
 

Diff for: javascript/safari-driver/inject/util.js

@@ -21,7 +21,7 @@ goog.provide('safaridriver.inject.util');
 
 goog.require('bot.response');
 goog.require('safaridriver.message.LoadModule');
-goog.require('webdriver.promise.Promise');
+goog.require('webdriver.promise');
 
 
 /**

Diff for: javascript/webdriver/http/http.js

@@ -27,7 +27,7 @@ goog.require('goog.array');
 goog.require('goog.json');
 goog.require('webdriver.CommandExecutor');
 goog.require('webdriver.CommandName');
-goog.require('webdriver.promise.Deferred');
+goog.require('webdriver.promise');