Merge pull request #80 from topcoder-platform/TCA-43_replace-repplit

testflyjets · web-flow · commit cc24e4d85de3 · 2022-09-26T10:02:21.000-07:00
TCA-43 Fix the preprod issues
diff --git a/client/src/templates/Challenges/rechallenge/transformers.js b/client/src/templates/Challenges/rechallenge/transformers.js
@@ -211,16 +211,24 @@ export const embedFilesInHtml = async function (challengeFiles) {
       const style = contentDocument.createElement('style');
       style.classList.add('fcc-injected-styles');
       style.innerHTML = stylesCss?.contents;
-
-      link.parentNode.appendChild(style);
-
-      link.removeAttribute('href');
-      link.dataset.href = 'styles.css';
+      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) {
-      script.innerHTML = scriptJs?.contents;
-      script.removeAttribute('src');
-      script.setAttribute('data-src', 'script.js');
+      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
@@ -176,7 +176,7 @@ function* buildChallengeData(challengeData, options) {
   }
 }
 
-function* executeTests(testRunner, tests, testTimeout = 5000) {
+function* executeTests(testRunner, tests, testTimeout = 150000) {
   const testResults = [];
   for (let i = 0; i < tests.length; i++) {
     const { text, testString } = tests[i];
diff --git a/client/src/templates/Challenges/utils/worker-executor.js b/client/src/templates/Challenges/utils/worker-executor.js
@@ -57,7 +57,7 @@ class WorkerExecutor {
     }
   }
 
-  execute(data, timeout = 1000) {
+  execute(data, timeout = 150000) {
     const task = eventify({});
     task._execute = function (getWorker) {
       getWorker().then(
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

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ function* buildChallengeData(challengeData, options) {`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`179`		`-function* executeTests(testRunner, tests, testTimeout = 5000) {`
	`179`	`+function* executeTests(testRunner, tests, testTimeout = 150000) {`
`180`	`180`	`const testResults = [];`
`181`	`181`	`for (let i = 0; i < tests.length; i++) {`
`182`	`182`	`const { text, testString } = tests[i];`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class WorkerExecutor {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- execute(data, timeout = 1000) {`
	`60`	`+ execute(data, timeout = 150000) {`
`61`	`61`	`const task = eventify({});`
`62`	`62`	`task._execute = function (getWorker) {`
`63`	`63`	`getWorker().then(`