Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create react scripts ejection; replace Chart.js for VQA feature #919

Merged
merged 39 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
93a7013
Open-ended data for QV chart
WrathfulSpatula May 1, 2024
63bdfd3
Remove console.log()
WrathfulSpatula May 1, 2024
db7914c
Restore default provider
WrathfulSpatula May 1, 2024
24542af
Fix log plot
WrathfulSpatula May 1, 2024
64b5cdb
Remove bar chart w/ error bars
WrathfulSpatula May 2, 2024
48c5211
2^n -> n for produuction environment
WrathfulSpatula May 3, 2024
2a672a5
No log 0/1
WrathfulSpatula May 3, 2024
b444306
onLoadData()
WrathfulSpatula May 3, 2024
f7d26aa
Fix Results table for QV task
WrathfulSpatula May 3, 2024
6643bb3
Update dependencies
WrathfulSpatula May 4, 2024
7030d62
Update away from deprecated json2csv
WrathfulSpatula May 4, 2024
70994a0
Update away from deprecated json2csv
WrathfulSpatula May 4, 2024
78e6c8c
Fix json2csv parsing
WrathfulSpatula May 4, 2024
2bc1e4c
npm run eject
WrathfulSpatula May 4, 2024
22b47e8
Get metric names
WrathfulSpatula May 7, 2024
387420b
Select for metric
WrathfulSpatula May 8, 2024
0de2bcb
Fix refresh loop
WrathfulSpatula May 9, 2024
f4ca487
Fix log scale on AQ
WrathfulSpatula May 9, 2024
a23ea8c
Default metric choice
WrathfulSpatula May 9, 2024
3185e25
Axis and data labels
WrathfulSpatula May 9, 2024
54c5eff
Generalize for all tasks
WrathfulSpatula May 9, 2024
3d2ba21
Table skeleton
WrathfulSpatula May 10, 2024
79c8221
progressTable.csv
WrathfulSpatula May 10, 2024
13283c3
useState()
WrathfulSpatula May 10, 2024
24f9fec
Fix metricNames UI
WrathfulSpatula May 10, 2024
d7f3bf8
Don't reset Voronoi grid on mouseout
WrathfulSpatula May 10, 2024
bda1ca4
Merge branch 'main' into create-react-scripts_ejection
WrathfulSpatula May 10, 2024
1b84d2c
Add names and links to Progress table
WrathfulSpatula May 10, 2024
34c34df
Partial barplot() work
WrathfulSpatula May 17, 2024
6afd20a
Fix ECDLP point on Progress chart
WrathfulSpatula May 20, 2024
f9d2523
Bar plot now displays
WrathfulSpatula May 30, 2024
d4c35ca
Fix bar plot colors
WrathfulSpatula May 30, 2024
5d2abc5
Debug
WrathfulSpatula May 30, 2024
d69d975
Fix Y-axis domain
WrathfulSpatula May 31, 2024
145df7b
Fix Y-axis domain
WrathfulSpatula May 31, 2024
56b033f
VQA chart
WrathfulSpatula Jun 3, 2024
689e279
Hide first 2 toggle buttons, for VQA
WrathfulSpatula Jun 3, 2024
1cce52b
Merge branch 'main' into create-react-scripts_ejection
WrathfulSpatula Jun 7, 2024
5dd7804
Update progress.csv (T-depth replaced with T-count)
WrathfulSpatula Jun 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions config/env.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
'use strict'

const fs = require('fs')
const path = require('path')
const paths = require('./paths')

// Make sure that including paths.js after env.js will read .env variables.
delete require.cache[require.resolve('./paths')]

const NODE_ENV = process.env.NODE_ENV
if (!NODE_ENV) {
throw new Error(
'The NODE_ENV environment variable is required but was not specified.'
)
}

// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
const dotenvFiles = [
`${paths.dotenv}.${NODE_ENV}.local`,
// Don't include `.env.local` for `test` environment
// since normally you expect tests to produce the same
// results for everyone
NODE_ENV !== 'test' && `${paths.dotenv}.local`,
`${paths.dotenv}.${NODE_ENV}`,
paths.dotenv
].filter(Boolean)

// Load environment variables from .env* files. Suppress warnings using silent
// if this file is missing. dotenv will never modify any environment variables
// that have already been set. Variable expansion is supported in .env files.
// https://github.com/motdotla/dotenv
// https://github.com/motdotla/dotenv-expand
dotenvFiles.forEach(dotenvFile => {
if (fs.existsSync(dotenvFile)) {
require('dotenv-expand')(
require('dotenv').config({
path: dotenvFile
})
)
}
})

// We support resolving modules according to `NODE_PATH`.
// This lets you use absolute paths in imports inside large monorepos:
// https://github.com/facebook/create-react-app/issues/253.
// It works similar to `NODE_PATH` in Node itself:
// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
// Otherwise, we risk importing Node.js core modules into an app instead of webpack shims.
// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
// We also resolve them to make sure all tools using them work consistently.
const appDirectory = fs.realpathSync(process.cwd())
process.env.NODE_PATH = (process.env.NODE_PATH || '')
.split(path.delimiter)
.filter(folder => folder && !path.isAbsolute(folder))
.map(folder => path.resolve(appDirectory, folder))
.join(path.delimiter)

// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
// injected into the application via DefinePlugin in webpack configuration.
const REACT_APP = /^REACT_APP_/i

function getClientEnvironment (publicUrl) {
const raw = Object.keys(process.env)
.filter(key => REACT_APP.test(key))
.reduce(
(env, key) => {
env[key] = process.env[key]
return env
},
{
// Useful for determining whether we’re running in production mode.
// Most importantly, it switches React into the correct mode.
NODE_ENV: process.env.NODE_ENV || 'development',
// Useful for resolving the correct path to static assets in `public`.
// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
// This should only be used as an escape hatch. Normally you would put
// images into the `src` and `import` them in code to get their paths.
PUBLIC_URL: publicUrl,
// We support configuring the sockjs pathname during development.
// These settings let a developer run multiple simultaneous projects.
// They are used as the connection `hostname`, `pathname` and `port`
// in webpackHotDevClient. They are used as the `sockHost`, `sockPath`
// and `sockPort` options in webpack-dev-server.
WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST,
WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH,
WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT,
// Whether or not react-refresh is enabled.
// It is defined here so it is available in the webpackHotDevClient.
FAST_REFRESH: process.env.FAST_REFRESH !== 'false'
}
)
// Stringify all values so we can feed into webpack DefinePlugin
const stringified = {
'process.env': Object.keys(raw).reduce((env, key) => {
env[key] = JSON.stringify(raw[key])
return env
}, {})
}

return { raw, stringified }
}

module.exports = getClientEnvironment
66 changes: 66 additions & 0 deletions config/getHttpsConfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
'use strict'

const fs = require('fs')
const path = require('path')
const crypto = require('crypto')
const chalk = require('react-dev-utils/chalk')
const paths = require('./paths')

// Ensure the certificate and key provided are valid and if not
// throw an easy to debug error
function validateKeyAndCerts ({ cert, key, keyFile, crtFile }) {
let encrypted
try {
// publicEncrypt will throw an error with an invalid cert
encrypted = crypto.publicEncrypt(cert, Buffer.from('test'))
} catch (err) {
throw new Error(
`The certificate "${chalk.yellow(crtFile)}" is invalid.\n${err.message}`
)
}

try {
// privateDecrypt will throw an error with an invalid key
crypto.privateDecrypt(key, encrypted)
} catch (err) {
throw new Error(
`The certificate key "${chalk.yellow(keyFile)}" is invalid.\n${
err.message
}`
)
}
}

// Read file and throw an error if it doesn't exist
function readEnvFile (file, type) {
if (!fs.existsSync(file)) {
throw new Error(
`You specified ${chalk.cyan(
type
)} in your env, but the file "${chalk.yellow(file)}" can't be found.`
)
}
return fs.readFileSync(file)
}

// Get the https config
// Return cert files if provided in env, otherwise just true or false
function getHttpsConfig () {
const { SSL_CRT_FILE, SSL_KEY_FILE, HTTPS } = process.env
const isHttps = HTTPS === 'true'

if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) {
const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE)
const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE)
const config = {
cert: readEnvFile(crtFile, 'SSL_CRT_FILE'),
key: readEnvFile(keyFile, 'SSL_KEY_FILE')
}

validateKeyAndCerts({ ...config, keyFile, crtFile })
return config
}
return isHttps
}

module.exports = getHttpsConfig
29 changes: 29 additions & 0 deletions config/jest/babelTransform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict'

const babelJest = require('babel-jest').default

const hasJsxRuntime = (() => {
if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') {
return false
}

try {
require.resolve('react/jsx-runtime')
return true
} catch (e) {
return false
}
})()

module.exports = babelJest.createTransformer({
presets: [
[
require.resolve('babel-preset-react-app'),
{
runtime: hasJsxRuntime ? 'automatic' : 'classic'
}
]
],
babelrc: false,
configFile: false
})
14 changes: 14 additions & 0 deletions config/jest/cssTransform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict'

// This is a custom Jest transformer turning style imports into empty objects.
// http://facebook.github.io/jest/docs/en/webpack.html

module.exports = {
process () {
return 'module.exports = {};'
},
getCacheKey () {
// The output is always the same.
return 'cssTransform'
}
}
40 changes: 40 additions & 0 deletions config/jest/fileTransform.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
'use strict'

const path = require('path')
const camelcase = require('camelcase')

// This is a custom Jest transformer turning file imports into filenames.
// http://facebook.github.io/jest/docs/en/webpack.html

module.exports = {
process (src, filename) {
const assetFilename = JSON.stringify(path.basename(filename))

if (filename.match(/\.svg$/)) {
// Based on how SVGR generates a component name:
// https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
const pascalCaseFilename = camelcase(path.parse(filename).name, {
pascalCase: true
})
const componentName = `Svg${pascalCaseFilename}`
return `const React = require('react');
module.exports = {
__esModule: true,
default: ${assetFilename},
ReactComponent: React.forwardRef(function ${componentName}(props, ref) {
return {
$$typeof: Symbol.for('react.element'),
type: 'svg',
ref: ref,
key: null,
props: Object.assign({}, props, {
children: ${assetFilename}
})
};
}),
};`
}

return `module.exports = ${assetFilename};`
}
}
134 changes: 134 additions & 0 deletions config/modules.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
'use strict'

const fs = require('fs')
const path = require('path')
const paths = require('./paths')
const chalk = require('react-dev-utils/chalk')
const resolve = require('resolve')

/**
* Get additional module paths based on the baseUrl of a compilerOptions object.
*
* @param {Object} options
*/
function getAdditionalModulePaths (options = {}) {
const baseUrl = options.baseUrl

if (!baseUrl) {
return ''
}

const baseUrlResolved = path.resolve(paths.appPath, baseUrl)

// We don't need to do anything if `baseUrl` is set to `node_modules`. This is
// the default behavior.
if (path.relative(paths.appNodeModules, baseUrlResolved) === '') {
return null
}

// Allow the user set the `baseUrl` to `appSrc`.
if (path.relative(paths.appSrc, baseUrlResolved) === '') {
return [paths.appSrc]
}

// If the path is equal to the root directory we ignore it here.
// We don't want to allow importing from the root directly as source files are
// not transpiled outside of `src`. We do allow importing them with the
// absolute path (e.g. `src/Components/Button.js`) but we set that up with
// an alias.
if (path.relative(paths.appPath, baseUrlResolved) === '') {
return null
}

// Otherwise, throw an error.
throw new Error(
chalk.red.bold(
"Your project's `baseUrl` can only be set to `src` or `node_modules`." +
' Create React App does not support other values at this time.'
)
)
}

/**
* Get webpack aliases based on the baseUrl of a compilerOptions object.
*
* @param {*} options
*/
function getWebpackAliases (options = {}) {
const baseUrl = options.baseUrl

if (!baseUrl) {
return {}
}

const baseUrlResolved = path.resolve(paths.appPath, baseUrl)

if (path.relative(paths.appPath, baseUrlResolved) === '') {
return {
src: paths.appSrc
}
}
}

/**
* Get jest aliases based on the baseUrl of a compilerOptions object.
*
* @param {*} options
*/
function getJestAliases (options = {}) {
const baseUrl = options.baseUrl

if (!baseUrl) {
return {}
}

const baseUrlResolved = path.resolve(paths.appPath, baseUrl)

if (path.relative(paths.appPath, baseUrlResolved) === '') {
return {
'^src/(.*)$': '<rootDir>/src/$1'
}
}
}

function getModules () {
// Check if TypeScript is setup
const hasTsConfig = fs.existsSync(paths.appTsConfig)
const hasJsConfig = fs.existsSync(paths.appJsConfig)

if (hasTsConfig && hasJsConfig) {
throw new Error(
'You have both a tsconfig.json and a jsconfig.json. If you are using TypeScript please remove your jsconfig.json file.'
)
}

let config

// If there's a tsconfig.json we assume it's a
// TypeScript project and set up the config
// based on tsconfig.json
if (hasTsConfig) {
const ts = require(resolve.sync('typescript', {
basedir: paths.appNodeModules
}))
config = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile).config
// Otherwise we'll check if there is jsconfig.json
// for non TS projects.
} else if (hasJsConfig) {
config = require(paths.appJsConfig)
}

config = config || {}
const options = config.compilerOptions || {}

const additionalModulePaths = getAdditionalModulePaths(options)

return {
additionalModulePaths,
webpackAliases: getWebpackAliases(options),
jestAliases: getJestAliases(options),
hasTsConfig
}
}

module.exports = getModules()
Loading
Loading