Update to use aws/aws-sdk-js#1123 explicit webpack support.

- Update README.md to use new aws-sdk webpack support.

- Simplify NPM install by making the dependencies direct.

  This is apparently OK for aws-sdk to do, so we may as well make it nicer
  for the end-user.

- Remove old grunt build and deps.

Author: simonbuchan

Gruntfile.js

@@ -93,12 +93,12 @@ migration.
   }
   ```
 
-* Install the required tools and dependencies into your project with `npm` (Node Package Manager, which is installed
-  with Node.js): 
+* Install the Amazon Cognito Identity SDK for JavaScript and the Webpack tool into your project with `npm` (the Node
+  Package Manager, which is installed with Node.js):
 
   ```
-  > npm install --save-dev webpack exports-loader source-map-loader
-  > npm install --save amazon-cognito-identity-js aws-sdk jsbn sjcl
+  > npm install --save-dev webpack json-loader
+  > npm install --save amazon-cognito-identity-js
   ```
 
   These will add a `node_modules` directory containing these tools and dependencies into your
@@ -108,79 +108,27 @@ migration.
 
 * Create the configuration file for `webpack`, named `webpack.config.js`:
 
-  * Using the included Amazon Cognito AWS SDK for JavaScript:
-
-    ```js
-    // If you wish to use a custom build of the AWS SDK for JavaScript, put the relative path to it
-    // here, starting with `./`, eg `./vendor/my-aws-sdk-build.js`.
-    // This build must include the Cognito Identity Service Provider service.
-    var AWS_SDK_BUNDLE = 'amazon-cognito-identity-js/dist/aws-cognito-sdk.min.js';
-
-    module.exports = {
-      // Example setup for your project:
-      // The entry module that requires or imports the rest of your project.
-      // Must start with `./`!
-      entry: './src/entry',
-      // Place output files in `./dist/my-app.js`
-      output: {
-        path: 'dist',
-        filename: 'my-app.js'
-      },
-      // ... other configuration
-
-      // The current version of the AWS SDK for JavaScript does not work without extra configuration
-      // under webpack, see https://github.com/aws/aws-sdk-js/issues/603.
-      // This configuration uses the packaged output file as it is simple, see the issue for other
-      // options with different tradeoffs.
-      resolve: {
-        alias: {
-          'aws-sdk$': AWS_SDK_BUNDLE
+  ```js
+  module.exports = {
+    // Example setup for your project:
+    // The entry module that requires or imports the rest of your project.
+    // Must start with `./`!
+    entry: './src/entry',
+    // Place output files in `./dist/my-app.js`
+    output: {
+      path: 'dist',
+      filename: 'my-app.js'
+    },
+    module: {
+      loaders: [
+        {
+          test: /\.json$/,
+          loader: 'json'
         }
-      },
-      module: {
-        noParse: /aws-cognito-sdk/,
-        // Optional, but makes debugging library code much nicer:
-        preLoaders: [
-          {
-            test: /\.min\.js$/,
-            loader: 'source-map'
-          }
-        ],
-        loaders: [
-          {
-            test: require.resolve(AWS_SDK_BUNDLE),
-            loader: 'exports?AWSCognito'
-          }
-        ]
-      }
-    };
-    ```
-
-  * Or to use the full AWS SDK for JavaScript: 
-
-    ```js
-    var AWS_SDK_BUNDLE = 'aws-sdk/dist/aws-sdk.min.js';
-
-    module.exports = {
-      // ... as before.
-  
-      resolve: {
-        alias: {
-          'aws-sdk$': AWS_SDK_BUNDLE
-        }
-      },
-      module: {
-        noParse: /aws-sdk/,
-        // preLoaders: as before
-        loaders: [
-          {
-            test: require.resolve(AWS_SDK_BUNDLE),
-            loader: 'exports?AWS'
-          }
-        ]
-      }
-    };
-    ```
+      ]
+    }
+  };
+  ```
 
 * Add the following into your `package.json`
 

README.md

@@ -1,4 +1,4 @@
-import { CognitoIdentityServiceProvider } from 'aws-sdk';
+import CognitoIdentityServiceProvider from 'aws-sdk/clients/cognitoidentityserviceprovider';
 import * as enhancements from './src';
 
 export * from './src';

enhance.js

@@ -28,6 +28,17 @@
     "cognito",
     "identity"
   ],
+  "scripts": {
+    "build": "webpack -p",
+    "doc": "jsdoc src -d docs",
+    "lint": "eslint src"
+  },
+  "main": "dist/amazon-cognito-identity.min.js",
+  "dependencies": {
+    "aws-sdk": "^2.6.0",
+    "jsbn": "^0.1.0",
+    "sjcl": "^1.0.3"
+  },
   "devDependencies": {
     "babel-core": "^6.13.2",
     "babel-loader": "^6.2.4",
@@ -36,24 +47,7 @@
     "eslint-config-airbnb-base": "^5.0.2",
     "eslint-import-resolver-webpack": "^0.5.1",
     "eslint-plugin-import": "^1.13.0",
-    "grunt": "^0.4.5",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-qunit": "^0.5.2",
-    "grunt-contrib-uglify": "^0.6.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-jsdoc": "^0.5.7",
     "jsdoc": "^3.4.0",
-    "qunitjs": "^1.15.0",
     "webpack": "^1.13.1"
-  },
-  "scripts": {
-    "build": "webpack -p",
-    "doc": "jsdoc src -d docs",
-    "lint": "eslint src"
-  },
-  "main": "dist/amazon-cognito-identity.min.js",
-  "peerDependencies": {
-    "jsbn": "^0.1.0",
-    "sjcl": "^1.0.3"
   }
 }

package.json

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { CognitoIdentityServiceProvider } from 'aws-sdk';
+import CognitoIdentityServiceProvider from 'aws-sdk/clients/cognitoidentityserviceprovider';
 
 import CognitoUser from './CognitoUser';
 

src/CognitoUserPool.js

@@ -30,16 +30,16 @@ module.exports = {
   externals: {
     // This umd context config isn't in configuration documentation, but see example:
     // https://github.com/webpack/webpack/tree/master/examples/externals
-    'aws-sdk': {
-      root: 'AWSCognito',
-      commonjs2: 'aws-sdk',
-      commonjs: 'aws-sdk',
-      amd: 'aws-sdk'
+    'aws-sdk/clients/cognitoidentityserviceprovider': {
+      root: ['AWSCognito', 'CognitoIdentityServiceProvider'],
+      commonjs2: 'aws-sdk/clients/cognitoidentityserviceprovider',
+      commonjs: 'aws-sdk/clients/cognitoidentityserviceprovider',
+      amd: 'aws-sdk/clients/cognitoidentityserviceprovider'
     },
     // Exclude 3rd-party code from the bundle.
     sjcl: true,
     jsbn: {
-      root: 'window', // non-npm jsbn exports to global
+      root: [], // non-npm jsbn exports to global
       commonjs2: 'jsbn',
       commonjs: 'jsbn',
       amd: 'jsbn'