Updates node and browser loaders

Author: chrisradek

Diff for: browser.js

@@ -0,0 +1,6 @@
+require('./lib/browser_loader');
+
+var AWS = require('./lib/core');
+if (typeof window !== 'undefined') window.AWS = AWS;
+if (typeof module !== 'undefined') module.exports = AWS;
+if (typeof self !== 'undefined') self.AWS = AWS;

Diff for: global.js

@@ -0,0 +1,2 @@
+require('./lib/node_loader');
+module.exports = require('./lib/core');

Diff for: lib/aws.js

@@ -1,72 +1,7 @@
-var util = require('./util');
-
-// node.js specific modules
-util.crypto.lib = require('crypto');
-util.Buffer = require('buffer').Buffer;
-
-// node.js stubs
-util.nodeRequire = function nodeRequire(mod) {
-  if (util.isNode()) return require(mod);
-};
+require('./node_loader');
 
 var AWS = require('./core');
 module.exports = AWS;
 
-// Use default API loader function
-AWS.apiLoader = require('./api_loader').load;
-
-// Load the xml2js XML parser
-AWS.XML.Parser = require('./xml/node_parser');
-
-// Load Node HTTP client
-require('./http/node');
-
 // Load all service classes
-require('./services');
-
-// Load custom credential providers
-require('./credentials/ec2_metadata_credentials');
-require('./credentials/ecs_credentials');
-require('./credentials/environment_credentials');
-require('./credentials/file_system_credentials');
-require('./credentials/shared_ini_file_credentials');
-
-// Setup default chain providers
-// If this changes, please update documentation for
-// AWS.CredentialProviderChain.defaultProviders in
-// credentials/credential_provider_chain.js
-AWS.CredentialProviderChain.defaultProviders = [
-  function () { return new AWS.EnvironmentCredentials('AWS'); },
-  function () { return new AWS.EnvironmentCredentials('AMAZON'); },
-  function () { return new AWS.SharedIniFileCredentials(); },
-  function () {
-    if (AWS.ECSCredentials.prototype.getECSRelativeUri() !== undefined) {
-      return new AWS.ECSCredentials();
-    }
-    return new AWS.EC2MetadataCredentials();
-  }
-];
-
-// Update configuration keys
-AWS.util.update(AWS.Config.prototype.keys, {
-  credentials: function () {
-    var credentials = null;
-    new AWS.CredentialProviderChain([
-      function () { return new AWS.EnvironmentCredentials('AWS'); },
-      function () { return new AWS.EnvironmentCredentials('AMAZON'); },
-      function () { return new AWS.SharedIniFileCredentials({ disableAssumeRole: true }); }
-    ]).resolve(function(err, creds) {
-      if (!err) credentials = creds;
-    });
-    return credentials;
-  },
-  credentialProvider: function() {
-    return new AWS.CredentialProviderChain();
-  },
-  region: function() {
-    return process.env.AWS_REGION || process.env.AMAZON_REGION;
-  }
-});
-
-// Reset configuration
-AWS.config = new AWS.Config();
+require('../clients/all');

Diff for: lib/browser.js

@@ -11,4 +11,4 @@ if (typeof self !== 'undefined') self.AWS = AWS;
  * DO NOT REMOVE
  * browser builder will strip out this line if services are supplied on the command line.
  */
-require('../browser/browser_default');
+require('../clients/browser_default');

Diff for: lib/browser_loader.js

@@ -4,20 +4,10 @@ var util = require('./util');
 util.crypto.lib = require('crypto-browserify');
 util.Buffer = require('buffer/').Buffer;
 
-// browser stubs
-util.nodeRequire = function nodeRequire(mod) {};
-
 var AWS = require('./core');
 
-// Load browser API loader
-AWS.apiLoader = function(svc, version) {
-  return AWS.apiLoader.services[svc][version];
-};
-
-/**
- * @api private
- */
-AWS.apiLoader.services = {};
+// Use default API loader function
+require('./api_loader');
 
 // Load the DOMParser XML parser
 AWS.XML.Parser = require('./xml/browser_parser');

Diff for: lib/node_loader.js

@@ -0,0 +1,65 @@
+var util = require('./util');
+
+// node.js specific modules
+util.crypto.lib = require('crypto');
+util.Buffer = require('buffer').Buffer;
+util.domain = require('domain');
+util.stream = require('stream');
+
+var AWS = require('./core');
+
+// Use default API loader function
+require('./api_loader');
+
+// Load the xml2js XML parser
+AWS.XML.Parser = require('./xml/node_parser');
+
+// Load Node HTTP client
+require('./http/node');
+
+// Load custom credential providers
+require('./credentials/ec2_metadata_credentials');
+require('./credentials/ecs_credentials');
+require('./credentials/environment_credentials');
+require('./credentials/file_system_credentials');
+require('./credentials/shared_ini_file_credentials');
+
+// Setup default chain providers
+// If this changes, please update documentation for
+// AWS.CredentialProviderChain.defaultProviders in
+// credentials/credential_provider_chain.js
+AWS.CredentialProviderChain.defaultProviders = [
+  function () { return new AWS.EnvironmentCredentials('AWS'); },
+  function () { return new AWS.EnvironmentCredentials('AMAZON'); },
+  function () { return new AWS.SharedIniFileCredentials(); },
+  function () {
+    if (AWS.ECSCredentials.prototype.getECSRelativeUri() !== undefined) {
+      return new AWS.ECSCredentials();
+    }
+    return new AWS.EC2MetadataCredentials();
+  }
+];
+
+// Update configuration keys
+AWS.util.update(AWS.Config.prototype.keys, {
+  credentials: function () {
+    var credentials = null;
+    new AWS.CredentialProviderChain([
+      function () { return new AWS.EnvironmentCredentials('AWS'); },
+      function () { return new AWS.EnvironmentCredentials('AMAZON'); },
+      function () { return new AWS.SharedIniFileCredentials({ disableAssumeRole: true }); }
+    ]).resolve(function(err, creds) {
+      if (!err) credentials = creds;
+    });
+    return credentials;
+  },
+  credentialProvider: function() {
+    return new AWS.CredentialProviderChain();
+  },
+  region: function() {
+    return process.env.AWS_REGION || process.env.AMAZON_REGION;
+  }
+});
+
+// Reset configuration
+AWS.config = new AWS.Config();