Fix several pre-prod issues

billsedison · billsedison · commit f8bc9377f248 · 2022-09-26T22:06:42.000+08:00
diff --git a/client/src/templates/Challenges/rechallenge/transformers.js b/client/src/templates/Challenges/rechallenge/transformers.js
@@ -220,13 +220,24 @@ export const embedFilesInHtml = async function (challengeFiles) {
       const style = contentDocument.createElement('style');
       style.classList.add('fcc-injected-styles');
       style.innerHTML = stylesCss?.contents;
-
       link.parentNode.replaceChild(style, link);
+    } else if (stylesCss?.contents) {
+      // automatic linking of style contents to html
+      const style = contentDocument.createElement('style');
+      style.classList.add('fcc-injected-styles');
+      style.innerHTML = stylesCss?.contents;
+      contentDocument.head.appendChild(style);
     }
     if (script) {
-      const script = (contentDocument.createElement('script').innerHTML =
-        scriptJs?.contents);
-      link.parentNode.replaceChild(script, link);
+      const newScript = contentDocument.createElement('script');
+      newScript.innerHTML = scriptJs?.contents;
+      script.parentNode.replaceChild(newScript, script);
+    }
+    if (indexJsx?.contents) {
+      // automatic linking of jsx to html
+      const newScript = contentDocument.createElement('script');
+      newScript.innerHTML = indexJsx?.contents;
+      contentDocument.head.appendChild(newScript);
     }
     return {
       contents: documentElement.innerHTML
diff --git a/client/src/templates/Challenges/redux/execute-challenge-saga.js b/client/src/templates/Challenges/redux/execute-challenge-saga.js
@@ -175,7 +175,7 @@ function* buildChallengeData(challengeData, options) {
   }
 }
 
-function* executeTests(testRunner, tests, testTimeout = 5000) {
+function* executeTests(testRunner, tests, testTimeout = 70000) {
   const testResults = [];
   for (let i = 0; i < tests.length; i++) {
     const { text, testString } = tests[i];
diff --git a/curriculum/challenges/_meta/front-end-development-libraries-projects/meta.json b/curriculum/challenges/_meta/front-end-development-libraries-projects/meta.json
@@ -4,8 +4,27 @@
   "dashedName": "front-end-development-libraries-projects",
   "order": 6,
   "time": "150 hours",
-  "template": "",
-  "required": [],
+  "template": "<body><div id='root'></div>${ source || '' }</body>",
+  "required": [
+    {
+      "link": "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.css"
+    },
+    {
+      "src": "https://code.jquery.com/jquery-3.6.0.min.js"
+    },
+    {
+      "src": "https://unpkg.com/react@16.4.0/umd/react.production.min.js"
+    },
+    {
+      "src": "https://unpkg.com/react-dom@16.4.0/umd/react-dom.production.min.js"
+    },
+    {
+      "src": "https://cdnjs.cloudflare.com/ajax/libs/redux/3.7.2/redux.min.js"
+    },
+    {
+      "src": "https://cdnjs.cloudflare.com/ajax/libs/react-redux/5.0.7/react-redux.min.js"
+    }
+  ],
   "superBlock": "front-end-development-libraries",
   "challengeOrder": [
     [
diff --git a/curriculum/challenges/english/03-front-end-development-libraries/front-end-development-libraries-projects/build-a-25-5-clock.md b/curriculum/challenges/english/03-front-end-development-libraries/front-end-development-libraries-projects/build-a-25-5-clock.md
@@ -8,7 +8,7 @@ dashedName: build-a-25--5-clock
 
 # --description--
 
-**Objective:** Build a [CodePen.io](https://codepen.io) app that is functionally similar to this: <https://codepen.io/freeCodeCamp/full/XpKrrW>.
+**Objective:** Build an app that is functionally similar to this: <https://codepen.io/freeCodeCamp/full/XpKrrW>.
 
 Fulfill the below [user stories](https://en.wikipedia.org/wiki/User_story) and get all of the tests to pass. Give it your own personal style.
 
@@ -1210,18 +1210,65 @@ assert.strictEqual(
 
 # --seed--
 
+## --after-user-code--
+
+```jsx
+ReactDOM.render(<App />, document.getElementById('root'))
+```
+
 ## --seed-contents--
 
 ```html
-
+<!DOCTYPE html>
+<html>
+  <body>
+    <!--Change code below this line-->
+      <p>Hello from HTML!</p>
+    <!--Change code above this line-->
+  </body>
+</html>
 ```
 
 ```css
 
 ```
 
+```jsx
+class App extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+
+  render() {
+    return (
+        <div>
+            { /* Change code below this line */ }
+            <Timer />
+            { /* Change code above this line */ }
+        </div>
+    );
+  }
+};
+
+class Timer extends React.Component {
+  constructor(props) {
+    super(props);
+
+  }
+  render() {
+    return (
+        <div>
+          { /* Change code below this line */ }
+          <p>Hello from JSX !</p>
+          { /* Change code above this line */ }
+        </div>
+    );
+  }
+};
+```
+
 # --solutions--
 
-```js
+```jsx
 // solution required
 ```

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ function* buildChallengeData(challengeData, options) {`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
`178`		`-function* executeTests(testRunner, tests, testTimeout = 5000) {`
	`178`	`+function* executeTests(testRunner, tests, testTimeout = 70000) {`
`179`	`179`	`const testResults = [];`
`180`	`180`	`for (let i = 0; i < tests.length; i++) {`
`181`	`181`	`const { text, testString } = tests[i];`