refactor: move browser-script output into client (#51422)
parent
569ace00ae
commit
9885d1a779
|
@ -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
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
**/public
|
||||
client/static
|
||||
client/**/trending.json
|
||||
client/config/browser-scripts/*.json
|
||||
**/*fixtures*
|
||||
curriculum/challenges/_meta/*/*
|
||||
curriculum/challenges/**/*
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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');
|
||||
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Reference in New Issue