Merge remote-tracking branch 'upstream/master'

packages/amplify-ui/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.0.20-unstable.0"></a>
+## [1.0.20-unstable.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2019-05-24)
+
+
+
+
+**Note:** Version bump only for package @aws-amplify/ui
+
 <a name="1.0.19"></a>
 ## [1.0.19](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2019-05-06)
 

packages/amplify-ui/package.json

@@ -1,37 +1,29 @@
 {
   "name": "@aws-amplify/ui",
-  "version": "1.0.19",
+  "version": "1.0.20-unstable.0",
   "main": "dist/aws-amplify-ui.js",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
     "test": "webpack",
     "start": "webpack-dev-server",
-    "clean": "rimraf dist",
-    "build": "npm run clean && webpack"
+    "clean": "rimraf dist lib",
+    "build": "npm run clean && webpack && copyfiles -u 1 ./src/*.css.d.ts ./lib"
   },
   "license": "MIT",
   "devDependencies": {
-    "autoprefixer-core": "^5.1.11",
-    "babel-core": "^5.2.17",
-    "babel-loader": "^5.0.0",
-    "css-loader": "^0.15.1",
-    "ejs": "^2.3.1",
-    "extract-text-webpack-plugin": "^0.8.1",
-    "file-loader": "^0.8.4",
-    "gh-pages": "git://github.com/markdalgleish/gh-pages#cli-message",
-    "node-libs-browser": "^0.5.0",
-    "postcss-color-rebeccapurple": "^1.1.0",
-    "postcss-loader": "^0.4.3",
-    "raw-loader": "^0.5.1",
-    "react": "^0.13.3",
-    "react-to-html-webpack-plugin": "^2.2.0",
-    "rimraf": "^2.5.4",
-    "style-loader": "^0.12.3",
-    "url-loader": "^0.5.6",
-    "webpack": "^1.9.10",
-    "webpack-dev-server": "^1.9.0"
+    "autoprefixer": "^9.5.1",
+    "copyfiles": "^2.1.0",
+    "css-loader": "^2.1.1",
+    "dts-css-modules-loader": "^1.0.1",
+    "mini-css-extract-plugin": "^0.6.0",
+    "postcss-loader": "^3.0.0",
+    "rimraf": "^2.6.3",
+    "style-loader": "^0.23.1",
+    "ts-loader": "^5.4.4",
+    "webpack": "^4.30.0",
+    "webpack-cli": "^3.3.1"
   },
   "postcss": {
     "plugins": {

packages/amplify-ui/postcss.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: [
+    require('autoprefixer')
+  ]
+}

packages/amplify-ui/src/Anchor.css.d.ts

@@ -0,0 +1,2 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const a: string;

packages/amplify-ui/src/Button.css.d.ts

@@ -0,0 +1,10 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const button: string;
+export const signInButton: string;
+export const googleSignInButton: string;
+export const signInButtonIcon: string;
+export const auth0SignInButton: string;
+export const facebookSignInButton: string;
+export const amazonSignInButton: string;
+export const oAuthSignInButton: string;
+export const signInButtonContent: string;

packages/amplify-ui/src/Form.css.d.ts

@@ -0,0 +1,5 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const formContainer: string;
+export const formSection: string;
+export const formField: string;
+export const formRow: string;

packages/amplify-ui/src/Hint.css.d.ts

@@ -0,0 +1,2 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const hint: string;

packages/amplify-ui/src/Input.css.d.ts

@@ -0,0 +1,5 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const input: string;
+export const inputLabel: string;
+export const label: string;
+export const radio: string;

packages/amplify-ui/src/Nav.css.d.ts

@@ -0,0 +1,5 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const navBar: string;
+export const navRight: string;
+export const nav: string;
+export const navItem: string;

packages/amplify-ui/src/PhotoPicker.css.d.ts

@@ -0,0 +1,4 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const photoPickerButton: string;
+export const photoPlaceholder: string;
+export const photoPlaceholderIcon: string;

packages/amplify-ui/src/Section.css.d.ts

@@ -0,0 +1,9 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const container: string;
+export const actionRow: string;
+export const sectionHeader: string;
+export const sectionHeaderHint: string;
+export const sectionBody: string;
+export const sectionFooter: string;
+export const sectionFooterPrimaryContent: string;
+export const sectionFooterSecondaryContent: string;

packages/amplify-ui/src/SelectInput.css.d.ts

@@ -0,0 +1,2 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const selectInput: string;

packages/amplify-ui/src/Strike.css.d.ts

@@ -0,0 +1,3 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const strike: string;
+export const strikeContent: string;

packages/amplify-ui/src/Toast.css.d.ts

@@ -0,0 +1,3 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const toast: string;
+export const toastClose: string;

packages/amplify-ui/src/Totp.css.d.ts

@@ -0,0 +1,2 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const totpQrcode: string;

packages/amplify-ui/src/XR.css.d.ts

@@ -0,0 +1,17 @@
+// AUTOMATICALLY GENERATED - DO NOT EDIT
+export const sumerianSceneContainer: string;
+export const sumerianScene: string;
+export const loadingOverlay: string;
+export const loadingContainer: string;
+export const loadingLogo: string;
+export const loadingSceneName: string;
+export const loadingBar: string;
+export const loadingBarFill: string;
+export const sceneErrorText: string;
+export const sceneBar: string;
+export const sceneName: string;
+export const sceneActions: string;
+export const actionButton: string;
+export const tooltip: string;
+export const actionIcon: string;
+export const autoShowTooltip: string;

packages/amplify-ui/tsconfig.json

@@ -0,0 +1,29 @@
+//WARNING: If you are manually specifying files to compile then the tsconfig.json is completely ignored, you must use command line flags
+{
+    "compilerOptions": {
+        "outDir": "./lib/",
+        "target": "es5",
+        "noImplicitAny": false,
+        "lib": [
+            "es5",
+            "es2015",
+            "dom",
+            "esnext.asynciterable",
+            "es2017.object"
+        ],
+        "sourceMap": true,
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "allowJs": false,
+        "declaration": true,
+        "typeRoots": [
+            "./node_modules/@types",
+            "../../node_modules/@types"
+        ],
+        // temporary fix
+        "types": ["node", "lodash"]
+    },
+    "include": [
+        "src/**/*"
+    ]
+}

packages/amplify-ui/webpack.config.js

@@ -1,42 +1,55 @@
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
 module.exports = {
   entry: {
-    'aws-amplify-ui': './src/index.js',
-    'aws-amplify-ui.min': './src/index.js'
+    "aws-amplify-ui": "./src/index.ts",
+    "aws-amplify-ui.min": "./src/index.ts"
   },
   output: {
-      filename: '[name].js',
-      path: __dirname + '/dist',
-      library: 'aws_amplify_ui',
-      libraryTarget: 'umd',
-      umdNamedDefine: true,
-      devtoolModuleFilenameTemplate: require('../aws-amplify/webpack-utils').devtoolModuleFilenameTemplate
+    filename: "[name].js",
+    path: __dirname + "/dist",
+    library: "aws_amplify_ui",
+    libraryTarget: "umd",
+    umdNamedDefine: true,
+    devtoolModuleFilenameTemplate: require("../aws-amplify/webpack-utils")
+      .devtoolModuleFilenameTemplate
   },
   // Enable sourcemaps for debugging webpack's output.
-  devtool: 'source-map',
+  devtool: "source-map",
   resolve: {
-      extensions: ['.js', '.css']
+    extensions: [".tsx", ".ts", ".js", ".css"]
   },
 
+  mode: process.env.NODE_ENV || "production",
+
   module: {
-    loaders: [
-      { test: /\.js$/, loader: 'babel-loader', exclude: /node_modules/ },
-      { test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss-loader') },
-      { test: /\.svg$/, loader: "url-loader?limit=10000&mimetype=image/svg+xml" }
+    rules: [
+      { test: /\.jsx?$/, use: "ts-loader", exclude: /node_modules/ },
+      { test: /\.tsx?$/, use: "ts-loader", exclude: /node_modules/ },
+      {
+        test: /\.css$/,
+        use: [
+          "style-loader",
+          {
+            loader: MiniCssExtractPlugin.loader,
+            options: {
+              hmr: process.env.NODE_ENV === "development"
+            }
+          },
+          { loader: "dts-css-modules-loader", options: { banner: "// AUTOMATICALLY GENERATED - DO NOT EDIT", namedExport: true } },
+          {
+            loader: "css-loader",
+            options: {
+              modules: true,
+              importLoaders: 1,
+              localIdentName: "[name]__[local]___[hash:base64:5]"
+            }
+          },
+          "postcss-loader"
+        ]
+      }
     ]
   },
 
-  postcss: [
-    require('autoprefixer-core'),
-    require('postcss-color-rebeccapurple')
-  ],
-
-  resolve: {
-    modulesDirectories: ['node_modules', 'components']
-  },
-
-  plugins: [
-    new ExtractTextPlugin('style.css', { allChunks: true }),
-  ]
-};
+  plugins: [new MiniCssExtractPlugin({ filename: "style.css", allChunks: true })]
+};

packages/analytics/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.2.17-unstable.1"></a>
+## [1.2.17-unstable.1](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2019-05-24)
+
+
+### Bug Fixes
+
+* **@aws-amplify/analytics:** manual version bump ([b347e0d](https://github.com/aws/aws-amplify/commit/b347e0d))
+
+
+
+
 <a name="1.2.16"></a>
 ## [1.2.16](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2019-05-14)
 

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/analytics",
-  "version": "1.2.16",
+  "version": "1.2.17-unstable.1",
   "description": "Analytics category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib/index.js",

packages/api/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.0.36-unstable.1"></a>
+## [1.0.36-unstable.1](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2019-05-24)
+
+
+### Bug Fixes
+
+* **aws-amplify:** manual version bumps for lerna issue ([9ce5a72](https://github.com/aws/aws-amplify/commit/9ce5a72))
+
+
+
+
 <a name="1.0.35"></a>
 ## [1.0.35](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2019-05-14)
 

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/api",
-  "version": "1.0.35",
+  "version": "1.0.36-unstable.1",
   "description": "Api category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib/index.js",

packages/auth/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="1.2.25-unstable.1"></a>
+## [1.2.25-unstable.1](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2019-05-24)
+
+
+### Bug Fixes
+
+* **@aws-amplify/auth:** check if storage object is valid or not ([d93d36d](https://github.com/aws/aws-amplify/commit/d93d36d))
+* **aws-amplify:** manual version bumps for lerna issue ([9ce5a72](https://github.com/aws/aws-amplify/commit/9ce5a72))
+
+
+
+
 <a name="1.2.24"></a>
 ## [1.2.24](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2019-05-14)
 

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/auth",
-  "version": "1.2.24",
+  "version": "1.2.25-unstable.1",
   "description": "Auth category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib/index.js",

packages/auth/src/Auth.ts

@@ -152,8 +152,8 @@ export default class AuthClass {
                 this._storage = new StorageHelper().getStorage();
             }
         } else {
-            if (JS.isEmpty(this._config.storage)) {
-                logger.error('The storage in the Auth config can not be empty!');
+            if (!this._isValidAuthStorage(this._config.storage)) {
+                logger.error('The storage in the Auth config is not valid!');
                 throw new Error('Empty storage object');
             }
             this._storage = this._config.storage;
@@ -1645,4 +1645,13 @@ export default class AuthClass {
         }
         return user;
     }
+
+    private _isValidAuthStorage(obj) {
+        // We need to check if the obj has the functions of Storage
+        return !!obj &&
+            typeof obj.getItem === 'function' &&
+            typeof obj.setItem === 'function' &&
+            typeof obj.removeItem === 'function' &&
+            typeof obj.clear === 'function';
+    }
 }

packages/aws-amplify-angular/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<a name="3.0.4-unstable.1"></a>
+## [3.0.4-unstable.1](https://github.com/aws-amplify/amplify-js/compare/[email protected]@3.0.4-unstable.1) (2019-05-24)
+
+
+### Bug Fixes
+
+* **aws-amplify:** manual version bumps for lerna issue ([9ce5a72](https://github.com/aws-amplify/amplify-js/commit/9ce5a72))
+
+
+
+
 <a name="3.0.3"></a>
 ## [3.0.3](https://github.com/aws-amplify/amplify-js/compare/[email protected]@3.0.3) (2019-05-14)