Skip to content

Commit

Permalink
Merge pull request #473 from auth0/v10-prepare-rc2
Browse files Browse the repository at this point in the history
Prepare for release 10.0.0-rc.2
  • Loading branch information
gnandretta authored Jul 5, 2016
2 parents 52610a1 + 653d4db commit 4185b05
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 6 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
## unreleased
## [10.0.0-rc.2] - 2016-07-05

### Fixed

- Fix issue with the blueimp library when bundling with webpack.
- Fixed issue with the blueimp library when bundling with webpack.
- Stopped fetching SSO data when SSO is disabled.
- The location hash is no longer cleared every time Lock is
initialized.

### Added

- The validator function for additional sign up fields now allows to
specify a hint that will be displayed when the field is invalid.

## [10.0.0-rc.1] - 2016-06-22

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "auth0-lock",
"version": "10.0.0-rc.1",
"version": "10.0.0-rc.2",
"main": "build/lock.js",
"ignore": [
"lib-cov",
Expand Down
4 changes: 4 additions & 0 deletions examples/bundling/browserify/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
This example shows how to bundle the `auth0-lock` npm package with [browserify](https://browserify.org). It uses [Babel](https://babeljs.io/) to support the new [ES2015 syntax](https://babeljs.io/docs/learn-es2015/), but it is not a requirement.

First, ensure you have [node](https://nodejs.org/) installed on your system. Then, run `npm install` to install the project's dependencies and `npm run build` to build the bundle. Finally, open `index.html` in your favorite browser.

## Warning

Having multiple copies of [React](https://facebook.github.io/react) in your bundle can cause problems. Lock was built using React, and if your project, or any other dependency, also depends on React, you might en up with two different versions in your bundle. In such scenarios, you should see a warning when doing `npm install`. Also, you can check with `npm ls react` at any time.
2 changes: 1 addition & 1 deletion examples/bundling/browserify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"dependencies": {
"auth0-lock": "10.0.0-rc.1"
"auth0-lock": "10.0.0-rc.2"
},
"devDependencies": {
"babel-preset-es2015": "^6.3.13",
Expand Down
4 changes: 4 additions & 0 deletions examples/bundling/webpack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
This example shows how to bundle the `auth0-lock` npm package with [webpack](https://webpack.github.io/). It uses [Babel](https://babeljs.io/) to support the new [ES2015 syntax](https://babeljs.io/docs/learn-es2015/), but it is not a requirement.

First, ensure you have [node](https://nodejs.org/) installed on your system. Then, run `npm install` to install the project's dependencies and `npm run build` to build the bundle. Finally, open `index.html` in your favorite browser.

## Warning

Having multiple copies of [React](https://facebook.github.io/react) in your bundle can cause problems. Lock was built using React, and if your project, or any other dependency, also depends on React, you might en up with two different versions in your bundle. In such scenarios, you should see a warning when doing `npm install`. Also, you can check with `npm ls react` at any time.
2 changes: 1 addition & 1 deletion examples/bundling/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"author": "",
"license": "MIT",
"dependencies": {
"auth0-lock": "10.0.0-rc.1"
"auth0-lock": "10.0.0-rc.2"
},
"devDependencies": {
"babel-core": "^6.4.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "auth0-lock",
"version": "10.0.0-rc.1",
"version": "10.0.0-rc.2",
"description": "Auth0 Lock",
"author": "Auth0 <[email protected]> (http://auth0.com)",
"license": "MIT",
Expand Down
1 change: 1 addition & 0 deletions src/field/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react';
import { Map } from 'immutable';
import trim from 'trim';
import OptionSelectionPane from './option_selection_pane';
Expand Down

0 comments on commit 4185b05

Please sign in to comment.