From 9885d1a77978fd6025ad2c9ff79531700b119b79 Mon Sep 17 00:00:00 2001
From: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Date: Wed, 6 Sep 2023 14:52:20 +0200
Subject: [PATCH] refactor: move browser-script output into client (#51422)

---
 .gitignore                                            | 11 -----------
 .prettierignore                                       |  1 +
 client/.gitignore                                     |  9 +++++++++
 .../client => client/config/browser-scripts}/.gitkeep |  0
 .../templates/Challenges/rechallenge/transformers.js  |  2 +-
 client/src/templates/Challenges/utils/build.ts        |  6 +++---
 curriculum/test/test-challenges.js                    |  2 +-
 .../client-plugins/browser-scripts/webpack.config.js  |  5 ++++-
 8 files changed, 19 insertions(+), 17 deletions(-)
 rename {config/client => client/config/browser-scripts}/.gitkeep (100%)

diff --git a/.gitignore b/.gitignore
index fe39f29358e..8b80a1bf68f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,10 +158,6 @@ jspm_packages/
 
 ### Generated config files ###
 config/env.json
-config/client/sass-compile.json
-config/client/frame-runner.json
-config/client/test-evaluator.json
-config/client/python-runner.json
 config/curriculum.json
 config/i18n.js
 config/misc.js
@@ -216,18 +212,11 @@ tags
 *.out
 *.gz
 curriculum/curricula.json
-client/static/js/frame-runner.js
-client/static/js/frame-runner.js.map
 
 ### Additional Folders ###
 api-server/lib/*
 curriculum/dist
 curriculum/build
-client/static/_redirects
-client/static/mobile
-client/static/curriculum-data
-client/i18n/locales/**/trending.json
-client/src/components/Donation/types.js
 
 ### UI Components ###
 tools/ui-components/dist
diff --git a/.prettierignore b/.prettierignore
index d4364b4ada7..408119a2648 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,6 +2,7 @@
 **/public
 client/static
 client/**/trending.json
+client/config/browser-scripts/*.json
 **/*fixtures*
 curriculum/challenges/_meta/*/*
 curriculum/challenges/**/*
diff --git a/client/.gitignore b/client/.gitignore
index e55e63a5f30..5c557d03425 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -9,3 +9,12 @@ yarn-error.log
 
 /static/js
 ./static/_redirects
+static/curriculum-data
+
+# Generated config
+config/browser-scripts/*.json
+i18n/locales/**/trending.json
+
+# TODO: Remove once you've figured out why it's generated.
+# JS that probably should not be generated
+src/components/Donation/types.js
diff --git a/config/client/.gitkeep b/client/config/browser-scripts/.gitkeep
similarity index 100%
rename from config/client/.gitkeep
rename to client/config/browser-scripts/.gitkeep
diff --git a/client/src/templates/Challenges/rechallenge/transformers.js b/client/src/templates/Challenges/rechallenge/transformers.js
index 8ad9597a9c7..f8861221805 100644
--- a/client/src/templates/Challenges/rechallenge/transformers.js
+++ b/client/src/templates/Challenges/rechallenge/transformers.js
@@ -11,7 +11,7 @@ import {
   stubTrue
 } from 'lodash-es';
 
-import sassData from '../../../../../config/client/sass-compile.json';
+import sassData from '../../../../../client/config/browser-scripts/sass-compile.json';
 import {
   transformContents,
   transformHeadTailAndContents,
diff --git a/client/src/templates/Challenges/utils/build.ts b/client/src/templates/Challenges/utils/build.ts
index 4d1dc8f8166..25ec63c5d07 100644
--- a/client/src/templates/Challenges/utils/build.ts
+++ b/client/src/templates/Challenges/utils/build.ts
@@ -1,7 +1,7 @@
 import { challengeTypes } from '../../../../../config/challenge-types';
-import frameRunnerData from '../../../../../config/client/frame-runner.json';
-import testEvaluatorData from '../../../../../config/client/test-evaluator.json';
-import pythonRunnerData from '../../../../../config/client/python-runner.json';
+import frameRunnerData from '../../../../../client/config/browser-scripts/frame-runner.json';
+import testEvaluatorData from '../../../../../client/config/browser-scripts/test-evaluator.json';
+import pythonRunnerData from '../../../../../client/config/browser-scripts/python-runner.json';
 
 import {
   ChallengeFile as PropTypesChallengeFile,
diff --git a/curriculum/test/test-challenges.js b/curriculum/test/test-challenges.js
index 26129f79dff..e649e183d99 100644
--- a/curriculum/test/test-challenges.js
+++ b/curriculum/test/test-challenges.js
@@ -34,7 +34,7 @@ const {
 const { challengeTypes } = require('../../config/challenge-types');
 // the config files are created during the build, but not before linting
 const testEvaluator =
-  require('../../config/client/test-evaluator.json').filename;
+  require('../../client/config/browser-scripts/test-evaluator.json').filename;
 
 const { getLines } = require('../../utils/get-lines');
 
diff --git a/tools/client-plugins/browser-scripts/webpack.config.js b/tools/client-plugins/browser-scripts/webpack.config.js
index 18c52315892..bd509976c09 100644
--- a/tools/client-plugins/browser-scripts/webpack.config.js
+++ b/tools/client-plugins/browser-scripts/webpack.config.js
@@ -6,7 +6,10 @@ const webpack = require('webpack');
 module.exports = (env = {}) => {
   const __DEV__ = env.production !== true;
   const staticPath = path.join(__dirname, '../../../client/static/js');
-  const configPath = path.join(__dirname, '../../../config/client');
+  const configPath = path.join(
+    __dirname,
+    '../../../client/config/browser-scripts/'
+  );
   return {
     cache: __DEV__ ? { type: 'filesystem' } : false,
     mode: __DEV__ ? 'development' : 'production',