Merge pull request dozoisch#143 from dozoisch/2_0

2.0

Author: dozoisch

.travis.yml

@@ -1,8 +1,9 @@
 sudo: false
 language: node_js
 node_js:
-  - "10.0"
-  - "8.0"
+  - "12"
+  - "10"
+  - "8"
 
 branches:
   only:

CHANGELOG.md

@@ -1,4 +1,12 @@
-v1.1.0 - Mon 12 Nov 2018 9:25 PST
+v2.0.0-rc.1 - Sat 3 Aug 2019 8:00 PST
+---------------------------------------
+
+- Remove lang and removeOnUnmount global options [(#143)](https://github.com/dozoisch/react-google-recaptcha/issues/143)
+- Upgrade to node 8, 10, 12 [(#143)](https://github.com/dozoisch/react-google-recaptcha/issues/143)
+- Update to react-async-script 1.1 [(#143)](https://github.com/dozoisch/react-google-recaptcha/issues/143)
+
+
+v1.1.0 - Sun 14 Jul 2019 10:56 PST
 ---------------------------------------
 
 - Add HL prop [(#141)](https://github.com/dozoisch/react-google-recaptcha/issues/141)

README.md

@@ -114,18 +114,13 @@ ReactDOM.render(
 
 #### Global properties used by reCaptcha
 
-__lang__: By default google reCaptcha infers the user's interface language. In order to overwrite the language and update the translation for the reCaptcha widget, you can create a global variable configuring the desired language via `lang`.
-
 __useRecaptchaNet__: If google.com is blocked, you can set `useRecaptchaNet` to `true` so that the component uses recaptcha.net instead.
 
-__removeOnUnmount__: If you plan to change the lang dynamically, `removeOnUnmount` should probably be `true`. This unloads the google recaptcha script on `componetWillUnmount` to allow for a new google recaptcha script to load next time the reCAPTCHA component is used to facilitate a new language if needed.
 
 Example global properties:
 ```js
 window.recaptchaOptions = {
-  lang: 'fr',
   useRecaptchaNet: true,
-  removeOnUnmount: false,
 };
 ```
 
@@ -148,6 +143,12 @@ render(
 );
 ```
 
+## Migrate to 2.0
+
+- __options.removeOnUnmount__: *REMOVED* This was only useful for the lang changes. Lang is now changed through the `hl` prop.
+- __options.lang__: *REMOVED* Instead pass it as the `hl` prop on the component.
+
+
 ## Notes on Requirements
 At least `[email protected]` is required due to `forwardRef` usage in the dependency [react-async-script](https://github.com/dozoisch/react-async-script).
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-google-recaptcha",
-  "version": "1.1.0",
+  "version": "2.0.0-rc.1",
   "description": "React Component Wrapper for Google reCAPTCHA",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -53,6 +53,6 @@
   },
   "dependencies": {
     "prop-types": "^15.5.0",
-    "react-async-script": "^1.0.0"
+    "react-async-script": "^1.1.1"
   }
 }

package.json

@@ -1,22 +1,20 @@
 import ReCAPTCHA from "./recaptcha";
 import makeAsyncScriptLoader from "react-async-script";
 
+const callbackName = "onloadcallback";
+const globalName = "grecaptcha";
+
 function getOptions() {
   return (typeof window !== "undefined" && window.recaptchaOptions) || {};
 }
+
 function getURL() {
   const dynamicOptions = getOptions();
-  const lang = dynamicOptions.lang ? `&hl=${dynamicOptions.lang}` : "";
   const hostname = dynamicOptions.useRecaptchaNet ? "recaptcha.net" : "www.google.com";
-  return `https://${hostname}/recaptcha/api.js?onload=${callbackName}&render=explicit${lang}`;
+  return `https://${hostname}/recaptcha/api.js?onload=${callbackName}&render=explicit`;
 }
 
-const callbackName = "onloadcallback";
-const globalName = "grecaptcha";
-const initialOptions = getOptions();
-
 export default makeAsyncScriptLoader(getURL, {
   callbackName,
   globalName,
-  removeOnUnmount: initialOptions.removeOnUnmount || false,
 })(ReCAPTCHA);