fix(challenges): cherry pick pr 17664 & 17672 from main repo (#52)

gforce2k5 · raisedadead · commit 2375d0c98dbe · 2018-06-29T23:47:58.000+05:30
diff --git a/challenges/02-javascript-algorithms-and-data-structures/basic-javascript.json b/challenges/02-javascript-algorithms-and-data-structures/basic-javascript.json
@@ -30,7 +30,7 @@
           "text":
             "Create a <code>/* */</code> style comment that contains at least five letters.",
           "testString":
-            "assert(code.match(/(\\/\\*)([^\\*\\/]{5,})(?=\\*\\/)/gm), 'Create a <code>/* */</code> style comment that contains at least five letters.');"
+            "assert(code.match(/(\\/\\*)([^\\/]{5,})(?=\\*\\/)/gm), 'Create a <code>/* */</code> style comment that contains at least five letters.');"
         }
       ],
       "challengeType": 1,
diff --git a/challenges/03-front-end-libraries/react.json b/challenges/03-front-end-libraries/react.json
@@ -964,7 +964,7 @@
         "<blockquote>const Welcome = (props) => &lt;h1&gt;Hello, {props.user}!&lt;/h1&gt;</blockquote>",
         "It is standard to call this value <code>props</code> and when dealing with stateless functional components, you basically consider it as an argument to a function which returns JSX. You can access the value of the argument in the function body. With class components, you will see this is a little different.",
         "<hr>",
-        "There is a <code>Calendar</code> and <code>CurrentDate</code> component in the code editor. When rendering <code>CurrentDate</code> from the <code>Calendar</code> component, pass in a property of <code>date</code> assigned to the current date from JavaScript's <code>Date</code> object. Then access this <code>prop</code> in the <code>CurrentDate</code> component, showing its value within the <code>p</code> tags. Note that for <code>prop</code> values to be evaluated as JavaScript, they must be enclosed in curly brackets, for instance <code>date={Date()}</code>."
+        "There are <code>Calendar</code> and <code>CurrentDate</code> components in the code editor. When rendering <code>CurrentDate</code> from the <code>Calendar</code> component, pass in a property of <code>date</code> assigned to the current date from JavaScript's <code>Date</code> object. Then access this <code>prop</code> in the <code>CurrentDate</code> component, showing its value within the <code>p</code> tags. Note that for <code>prop</code> values to be evaluated as JavaScript, they must be enclosed in curly brackets, for instance <code>date={Date()}</code>."
       ],
       "files": {
         "indexjsx": {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`"text":`
`31`	`31`	`"Create a <code>/* */</code> style comment that contains at least five letters.",`
`32`	`32`	`"testString":`
`33`		`- "assert(code.match(/(\\/\\)([^\\\\/]{5,})(?=\\\\/)/gm), 'Create a <code>/ */</code> style comment that contains at least five letters.');"`
	`33`	`+ "assert(code.match(/(\\/\\)([^\\/]{5,})(?=\\\\/)/gm), 'Create a <code>/* */</code> style comment that contains at least five letters.');"`
`34`	`34`	`}`
`35`	`35`	`],`
`36`	`36`	`"challengeType": 1,`