bellingcat/ukraine-timemap
1
0
Fork 0
mirror of https://github.com/bellingcat/ukraine-timemap.git synced 2026-06-07 19:08:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: Switch tooling to vite (#67)

Browse Source 
closes https://github.com/bellingcat/ukraine-timemap/issues/66
This commit is contained in:
Felix Spöttel
2023-01-27 18:13:23 +01:00
committed by GitHub
parent 07dccef520
commit 1063178e8d
119 changed files with 3262 additions and 46567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.eslintrc.js Normal file
View File

@@ -0,0 +1,31 @@
module.exports = {
root: true,
plugins: [],
parserOptions: {
sourceType: "module",
ecmaFeatures: {
jsx: true,
},
},
settings: {
react: {
version: "detect",
},
},
extends: [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react/jsx-runtime",
"plugin:react-hooks/recommended",
"prettier",
],
env: {
browser: true,
es2022: true,
jest: true,
},
rules: {
"react/prop-types": 0,
}
};

4
.prettierignore
View File

@@ -1,4 +0,0 @@
# Ignore Create React App-related scaffolding
config/
scripts/
test/server_process.js

0
.prettierrc Normal file
View File

5
config.js
View File

@@ -1,5 +1,6 @@
const one_day = 1440; const one_day = 1440;
module.exports = {
const config = {
title: "ukraine", title: "ukraine",
display_title: "Civilian Harm\nin Ukraine", display_title: "Civilian Harm\nin Ukraine",
SERVER_ROOT: "https://ukraine.bellingcat.com/ukraine-server", SERVER_ROOT: "https://ukraine.bellingcat.com/ukraine-server",
@@ -166,3 +167,5 @@ module.exports = {
}, },
}, },
}; };
export default config;

125
config/env.js
View File

@@ -1,125 +0,0 @@
"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")];
// START - injecting env variables from config.js
// This section is responsible for require-ing the provided
// command-line argument configuration file and serializing it.
// It will later be available inside our app under process.env,
// through webpack.definePlugin
const CONFIG = process.env.CONFIG || "config.js";
const envConfig = require("../" + CONFIG);
const userConfig = {};
for (const k in envConfig) {
userConfig[k] = JSON.stringify(envConfig[k]);
}
// END - injecting env variables from config.js
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.
// react-refresh is not 100% stable at this time,
// which is why it's disabled by default.
// 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;
},
{
...userConfig,
}
),
};
return { raw, stringified };
}
module.exports = getClientEnvironment;

66
config/getHttpsConfig.js
View File

@@ -1,66 +0,0 @@
'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;

14
config/jest/cssTransform.js
View File

@@ -1,14 +0,0 @@
"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
config/jest/fileTransform.js
View File

@@ -1,40 +0,0 @@
"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};`;
},
};

2
config/jest/setEnvVars.js
View File

@@ -1,2 +0,0 @@
const envConfig = require("../../" + (process.env.CONFIG || 'config.js'));
process.env = { ...process.env, ...envConfig };

134
config/modules.js
View File

@@ -1,134 +0,0 @@
'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: additionalModulePaths,
webpackAliases: getWebpackAliases(options),
jestAliases: getJestAliases(options),
hasTsConfig,
};
}
module.exports = getModules();

73
config/paths.js
View File

@@ -1,73 +0,0 @@
'use strict';
const path = require('path');
const fs = require('fs');
const getPublicUrlOrPath = require('react-dev-utils/getPublicUrlOrPath');
// Make sure any symlinks in the project folder are resolved:
// https://github.com/facebook/create-react-app/issues/637
const appDirectory = fs.realpathSync(process.cwd());
const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
// We use `PUBLIC_URL` environment variable or "homepage" field to infer
// "public path" at which the app is served.
// webpack needs to know it to put the right <script> hrefs into HTML even in
// single-page apps that may serve index.html for nested URLs like /todos/42.
// We can't use a relative path in HTML because we don't want to load something
// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
const publicUrlOrPath = getPublicUrlOrPath(
process.env.NODE_ENV === 'development',
require(resolveApp('package.json')).homepage,
process.env.PUBLIC_URL
);
const moduleFileExtensions = [
'web.mjs',
'mjs',
'web.js',
'js',
'web.ts',
'ts',
'web.tsx',
'tsx',
'json',
'web.jsx',
'jsx',
];
// Resolve file paths in the same order as webpack
const resolveModule = (resolveFn, filePath) => {
const extension = moduleFileExtensions.find(extension =>
fs.existsSync(resolveFn(`${filePath}.${extension}`))
);
if (extension) {
return resolveFn(`${filePath}.${extension}`);
}
return resolveFn(`${filePath}.js`);
};
// config after eject: we're in ./config/
module.exports = {
dotenv: resolveApp('.env'),
appPath: resolveApp('.'),
appBuild: resolveApp('build'),
appPublic: resolveApp('public'),
appHtml: resolveApp('public/index.html'),
appIndexJs: resolveModule(resolveApp, 'src/index'),
appPackageJson: resolveApp('package.json'),
appSrc: resolveApp('src'),
appTsConfig: resolveApp('tsconfig.json'),
appJsConfig: resolveApp('jsconfig.json'),
yarnLockFile: resolveApp('yarn.lock'),
testsSetup: resolveModule(resolveApp, 'src/setupTests'),
proxySetup: resolveApp('src/setupProxy.js'),
appNodeModules: resolveApp('node_modules'),
swSrc: resolveModule(resolveApp, 'src/service-worker'),
publicUrlOrPath,
};
module.exports.moduleFileExtensions = moduleFileExtensions;

35
config/pnpTs.js
View File

@@ -1,35 +0,0 @@
'use strict';
const { resolveModuleName } = require('ts-pnp');
exports.resolveModuleName = (
typescript,
moduleName,
containingFile,
compilerOptions,
resolutionHost
) => {
return resolveModuleName(
moduleName,
containingFile,
compilerOptions,
resolutionHost,
typescript.resolveModuleName
);
};
exports.resolveTypeReferenceDirective = (
typescript,
moduleName,
containingFile,
compilerOptions,
resolutionHost
) => {
return resolveModuleName(
moduleName,
containingFile,
compilerOptions,
resolutionHost,
typescript.resolveTypeReferenceDirective
);
};

748
config/webpack.config.js
View File

@@ -1,748 +0,0 @@
'use strict';
const fs = require('fs');
const path = require('path');
const webpack = require('webpack');
const resolve = require('resolve');
const PnpWebpackPlugin = require('pnp-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin');
const TerserPlugin = require('terser-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const safePostCssParser = require('postcss-safe-parser');
const ManifestPlugin = require('webpack-manifest-plugin');
const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
const ESLintPlugin = require('eslint-webpack-plugin');
const paths = require('./paths');
const modules = require('./modules');
const getClientEnvironment = require('./env');
const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
const postcssNormalize = require('postcss-normalize');
const appPackageJson = require(paths.appPackageJson);
// Source maps are resource heavy and can cause out of memory issue for large source files.
const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
const webpackDevClientEntry = require.resolve(
'react-dev-utils/webpackHotDevClient'
);
const reactRefreshOverlayEntry = require.resolve(
'react-dev-utils/refreshOverlayInterop'
);
// Some apps do not need the benefits of saving a web request, so not inlining the chunk
// makes for a smoother build process.
const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
const imageInlineSizeLimit = parseInt(
process.env.IMAGE_INLINE_SIZE_LIMIT || '10000'
);
// Check if TypeScript is setup
const useTypeScript = fs.existsSync(paths.appTsConfig);
// Get the path to the uncompiled service worker (if it exists).
const swSrc = paths.swSrc;
// style files regexes
const cssRegex = /\.css$/;
const cssModuleRegex = /\.module\.css$/;
const sassRegex = /\.(scss|sass)$/;
const sassModuleRegex = /\.module\.(scss|sass)$/;
const hasJsxRuntime = (() => {
if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') {
return false;
}
try {
require.resolve('react/jsx-runtime');
return true;
} catch (e) {
return false;
}
})();
// This is the production and development configuration.
// It is focused on developer experience, fast rebuilds, and a minimal bundle.
module.exports = function (webpackEnv) {
const isEnvDevelopment = webpackEnv === 'development';
const isEnvProduction = webpackEnv === 'production';
// Variable used for enabling profiling in Production
// passed into alias object. Uses a flag if passed into the build command
const isEnvProductionProfile =
isEnvProduction && process.argv.includes('--profile');
// We will provide `paths.publicUrlOrPath` to our app
// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
// Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
// Get environment variables to inject into our app.
const env = getClientEnvironment(paths.publicUrlOrPath.slice(0, -1));
const shouldUseReactRefresh = env.raw.FAST_REFRESH;
// common function to get style loaders
const getStyleLoaders = (cssOptions, preProcessor) => {
const loaders = [
isEnvDevelopment && require.resolve('style-loader'),
isEnvProduction && {
loader: MiniCssExtractPlugin.loader,
// css is located in `static/css`, use '../../' to locate index.html folder
// in production `paths.publicUrlOrPath` can be a relative path
options: paths.publicUrlOrPath.startsWith('.')
? { publicPath: '../../' }
: {},
},
{
loader: require.resolve('css-loader'),
options: cssOptions,
},
{
// Options for PostCSS as we reference these options twice
// Adds vendor prefixing based on your specified browser support in
// package.json
loader: require.resolve('postcss-loader'),
options: {
// Necessary for external CSS imports to work
// https://github.com/facebook/create-react-app/issues/2677
ident: 'postcss',
plugins: () => [
require('postcss-flexbugs-fixes'),
require('postcss-preset-env')({
autoprefixer: {
flexbox: 'no-2009',
},
stage: 3,
}),
// Adds PostCSS Normalize as the reset css with default options,
// so that it honors browserslist config in package.json
// which in turn let's users customize the target behavior as per their needs.
postcssNormalize(),
],
sourceMap: isEnvProduction ? shouldUseSourceMap : isEnvDevelopment,
},
},
].filter(Boolean);
if (preProcessor) {
loaders.push(
{
loader: require.resolve('resolve-url-loader'),
options: {
sourceMap: isEnvProduction ? shouldUseSourceMap : isEnvDevelopment,
root: paths.appSrc,
},
},
{
loader: require.resolve(preProcessor),
options: {
sourceMap: true,
},
}
);
}
return loaders;
};
return {
mode: isEnvProduction ? 'production' : isEnvDevelopment && 'development',
// Stop compilation early in production
bail: isEnvProduction,
devtool: isEnvProduction
? shouldUseSourceMap
? 'source-map'
: false
: isEnvDevelopment && 'cheap-module-source-map',
// These are the "entry points" to our application.
// This means they will be the "root" imports that are included in JS bundle.
entry:
isEnvDevelopment && !shouldUseReactRefresh
? [
// Include an alternative client for WebpackDevServer. A client's job is to
// connect to WebpackDevServer by a socket and get notified about changes.
// When you save a file, the client will either apply hot updates (in case
// of CSS changes), or refresh the page (in case of JS changes). When you
// make a syntax error, this client will display a syntax error overlay.
// Note: instead of the default WebpackDevServer client, we use a custom one
// to bring better experience for Create React App users. You can replace
// the line below with these two lines if you prefer the stock client:
//
// require.resolve('webpack-dev-server/client') + '?/',
// require.resolve('webpack/hot/dev-server'),
//
// When using the experimental react-refresh integration,
// the webpack plugin takes care of injecting the dev client for us.
webpackDevClientEntry,
// Finally, this is your app's code:
paths.appIndexJs,
// We include the app code last so that if there is a runtime error during
// initialization, it doesn't blow up the WebpackDevServer client, and
// changing JS code would still trigger a refresh.
]
: paths.appIndexJs,
output: {
// The build folder.
path: isEnvProduction ? paths.appBuild : undefined,
// Add /* filename */ comments to generated require()s in the output.
pathinfo: isEnvDevelopment,
// There will be one main bundle, and one file per asynchronous chunk.
// In development, it does not produce real files.
filename: isEnvProduction
? 'static/js/[name].[contenthash:8].js'
: isEnvDevelopment && 'static/js/bundle.js',
// TODO: remove this when upgrading to webpack 5
futureEmitAssets: true,
// There are also additional JS chunk files if you use code splitting.
chunkFilename: isEnvProduction
? 'static/js/[name].[contenthash:8].chunk.js'
: isEnvDevelopment && 'static/js/[name].chunk.js',
// webpack uses `publicPath` to determine where the app is being served from.
// It requires a trailing slash, or the file assets will get an incorrect path.
// We inferred the "public path" (such as / or /my-project) from homepage.
publicPath: paths.publicUrlOrPath,
// Point sourcemap entries to original disk location (format as URL on Windows)
devtoolModuleFilenameTemplate: isEnvProduction
? info =>
path
.relative(paths.appSrc, info.absoluteResourcePath)
.replace(/\\/g, '/')
: isEnvDevelopment &&
(info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
// Prevents conflicts when multiple webpack runtimes (from different apps)
// are used on the same page.
jsonpFunction: `webpackJsonp${appPackageJson.name}`,
// this defaults to 'window', but by setting it to 'this' then
// module chunks which are built will work in web workers as well.
globalObject: 'this',
},
optimization: {
minimize: isEnvProduction,
minimizer: [
// This is only used in production mode
new TerserPlugin({
terserOptions: {
parse: {
// We want terser to parse ecma 8 code. However, we don't want it
// to apply any minification steps that turns valid ecma 5 code
// into invalid ecma 5 code. This is why the 'compress' and 'output'
// sections only apply transformations that are ecma 5 safe
// https://github.com/facebook/create-react-app/pull/4234
ecma: 8,
},
compress: {
ecma: 5,
warnings: false,
// Disabled because of an issue with Uglify breaking seemingly valid code:
// https://github.com/facebook/create-react-app/issues/2376
// Pending further investigation:
// https://github.com/mishoo/UglifyJS2/issues/2011
comparisons: false,
// Disabled because of an issue with Terser breaking valid code:
// https://github.com/facebook/create-react-app/issues/5250
// Pending further investigation:
// https://github.com/terser-js/terser/issues/120
inline: 2,
},
mangle: {
safari10: true,
},
// Added for profiling in devtools
keep_classnames: isEnvProductionProfile,
keep_fnames: isEnvProductionProfile,
output: {
ecma: 5,
comments: false,
// Turned on because emoji and regex is not minified properly using default
// https://github.com/facebook/create-react-app/issues/2488
ascii_only: true,
},
},
sourceMap: shouldUseSourceMap,
}),
// This is only used in production mode
new OptimizeCSSAssetsPlugin({
cssProcessorOptions: {
parser: safePostCssParser,
map: shouldUseSourceMap
? {
// `inline: false` forces the sourcemap to be output into a
// separate file
inline: false,
// `annotation: true` appends the sourceMappingURL to the end of
// the css file, helping the browser find the sourcemap
annotation: true,
}
: false,
},
cssProcessorPluginOptions: {
preset: ['default', { minifyFontValues: { removeQuotes: false } }],
},
}),
],
// Automatically split vendor and commons
// https://twitter.com/wSokra/status/969633336732905474
// https://medium.com/webpack/webpack-4-code-splitting-chunk-graph-and-the-splitchunks-optimization-be739a861366
splitChunks: {
chunks: 'all',
name: false,
},
// Keep the runtime chunk separated to enable long term caching
// https://twitter.com/wSokra/status/969679223278505985
// https://github.com/facebook/create-react-app/issues/5358
runtimeChunk: {
name: entrypoint => `runtime-${entrypoint.name}`,
},
},
resolve: {
// This allows you to set a fallback for where webpack should look for modules.
// We placed these paths second because we want `node_modules` to "win"
// if there are any conflicts. This matches Node resolution mechanism.
// https://github.com/facebook/create-react-app/issues/253
modules: ['node_modules', paths.appNodeModules].concat(
modules.additionalModulePaths || []
),
// These are the reasonable defaults supported by the Node ecosystem.
// We also include JSX as a common component filename extension to support
// some tools, although we do not recommend using it, see:
// https://github.com/facebook/create-react-app/issues/290
// `web` extension prefixes have been added for better support
// for React Native Web.
extensions: paths.moduleFileExtensions
.map(ext => `.${ext}`)
.filter(ext => useTypeScript || !ext.includes('ts')),
alias: {
// Support React Native Web
// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
'react-native': 'react-native-web',
// Allows for better profiling with ReactDevTools
...(isEnvProductionProfile && {
'react-dom$': 'react-dom/profiling',
'scheduler/tracing': 'scheduler/tracing-profiling',
}),
...(modules.webpackAliases || {}),
},
plugins: [
// Adds support for installing with Plug'n'Play, leading to faster installs and adding
// guards against forgotten dependencies and such.
PnpWebpackPlugin,
// Prevents users from importing files from outside of src/ (or node_modules/).
// This often causes confusion because we only process files within src/ with babel.
// To fix this, we prevent you from importing files out of src/ -- if you'd like to,
// please link the files into your node_modules/ and let module-resolution kick in.
// Make sure your source files are compiled, as they will not be processed in any way.
new ModuleScopePlugin(paths.appSrc, [
paths.appPackageJson,
reactRefreshOverlayEntry,
]),
],
},
resolveLoader: {
plugins: [
// Also related to Plug'n'Play, but this time it tells webpack to load its loaders
// from the current package.
PnpWebpackPlugin.moduleLoader(module),
],
},
module: {
strictExportPresence: true,
rules: [
// Disable require.ensure as it's not a standard language feature.
{ parser: { requireEnsure: false } },
{
// "oneOf" will traverse all following loaders until one will
// match the requirements. When no loader matches it will fall
// back to the "file" loader at the end of the loader list.
oneOf: [
// TODO: Merge this config once `image/avif` is in the mime-db
// https://github.com/jshttp/mime-db
{
test: [/\.avif$/],
loader: require.resolve('url-loader'),
options: {
limit: imageInlineSizeLimit,
mimetype: 'image/avif',
name: 'static/media/[name].[hash:8].[ext]',
},
},
// "url" loader works like "file" loader except that it embeds assets
// smaller than specified limit in bytes as data URLs to avoid requests.
// A missing `test` is equivalent to a match.
{
test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
loader: require.resolve('url-loader'),
options: {
limit: imageInlineSizeLimit,
name: 'static/media/[name].[hash:8].[ext]',
},
},
// Process application JS with Babel.
// The preset includes JSX, Flow, TypeScript, and some ESnext features.
{
test: /\.(js|mjs|jsx|ts|tsx)$/,
include: paths.appSrc,
loader: require.resolve('babel-loader'),
options: {
customize: require.resolve(
'babel-preset-react-app/webpack-overrides'
),
presets: [
[
require.resolve('babel-preset-react-app'),
{
runtime: hasJsxRuntime ? 'automatic' : 'classic',
},
],
],
plugins: [
[
require.resolve('babel-plugin-named-asset-import'),
{
loaderMap: {
svg: {
ReactComponent:
'@svgr/webpack?-svgo,+titleProp,+ref![path]',
},
},
},
],
isEnvDevelopment &&
shouldUseReactRefresh &&
require.resolve('react-refresh/babel'),
].filter(Boolean),
// This is a feature of `babel-loader` for webpack (not Babel itself).
// It enables caching results in ./node_modules/.cache/babel-loader/
// directory for faster rebuilds.
cacheDirectory: true,
// See #6846 for context on why cacheCompression is disabled
cacheCompression: false,
compact: isEnvProduction,
},
},
// Process any JS outside of the app with Babel.
// Unlike the application JS, we only compile the standard ES features.
{
test: /\.(js|mjs)$/,
exclude: /@babel(?:\/|\\{1,2})runtime/,
loader: require.resolve('babel-loader'),
options: {
babelrc: false,
configFile: false,
compact: false,
presets: [
[
require.resolve('babel-preset-react-app/dependencies'),
{ helpers: true },
],
],
cacheDirectory: true,
// See #6846 for context on why cacheCompression is disabled
cacheCompression: false,
// Babel sourcemaps are needed for debugging into node_modules
// code. Without the options below, debuggers like VSCode
// show incorrect code and set breakpoints on the wrong lines.
sourceMaps: shouldUseSourceMap,
inputSourceMap: shouldUseSourceMap,
},
},
// "postcss" loader applies autoprefixer to our CSS.
// "css" loader resolves paths in CSS and adds assets as dependencies.
// "style" loader turns CSS into JS modules that inject <style> tags.
// In production, we use MiniCSSExtractPlugin to extract that CSS
// to a file, but in development "style" loader enables hot editing
// of CSS.
// By default we support CSS Modules with the extension .module.css
{
test: cssRegex,
exclude: cssModuleRegex,
use: getStyleLoaders({
importLoaders: 1,
sourceMap: isEnvProduction
? shouldUseSourceMap
: isEnvDevelopment,
}),
// Don't consider CSS imports dead code even if the
// containing package claims to have no side effects.
// Remove this when webpack adds a warning or an error for this.
// See https://github.com/webpack/webpack/issues/6571
sideEffects: true,
},
// Adds support for CSS Modules (https://github.com/css-modules/css-modules)
// using the extension .module.css
{
test: cssModuleRegex,
use: getStyleLoaders({
importLoaders: 1,
sourceMap: isEnvProduction
? shouldUseSourceMap
: isEnvDevelopment,
modules: {
getLocalIdent: getCSSModuleLocalIdent,
},
}),
},
// Opt-in support for SASS (using .scss or .sass extensions).
// By default we support SASS Modules with the
// extensions .module.scss or .module.sass
{
test: sassRegex,
exclude: sassModuleRegex,
use: getStyleLoaders(
{
importLoaders: 3,
sourceMap: isEnvProduction
? shouldUseSourceMap
: isEnvDevelopment,
},
'sass-loader'
),
// Don't consider CSS imports dead code even if the
// containing package claims to have no side effects.
// Remove this when webpack adds a warning or an error for this.
// See https://github.com/webpack/webpack/issues/6571
sideEffects: true,
},
// Adds support for CSS Modules, but using SASS
// using the extension .module.scss or .module.sass
{
test: sassModuleRegex,
use: getStyleLoaders(
{
importLoaders: 3,
sourceMap: isEnvProduction
? shouldUseSourceMap
: isEnvDevelopment,
modules: {
getLocalIdent: getCSSModuleLocalIdent,
},
},
'sass-loader'
),
},
// "file" loader makes sure those assets get served by WebpackDevServer.
// When you `import` an asset, you get its (virtual) filename.
// In production, they would get copied to the `build` folder.
// This loader doesn't use a "test" so it will catch all modules
// that fall through the other loaders.
{
loader: require.resolve('file-loader'),
// Exclude `js` files to keep "css" loader working as it injects
// its runtime that would otherwise be processed through "file" loader.
// Also exclude `html` and `json` extensions so they get processed
// by webpacks internal loaders.
exclude: [/\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
options: {
name: 'static/media/[name].[hash:8].[ext]',
},
},
// ** STOP ** Are you adding a new loader?
// Make sure to add the new loader(s) before the "file" loader.
],
},
],
},
plugins: [
// Generates an `index.html` file with the <script> injected.
new HtmlWebpackPlugin(
Object.assign(
{},
{
inject: true,
template: paths.appHtml,
},
isEnvProduction
? {
minify: {
removeComments: true,
collapseWhitespace: true,
removeRedundantAttributes: true,
useShortDoctype: true,
removeEmptyAttributes: true,
removeStyleLinkTypeAttributes: true,
keepClosingSlash: true,
minifyJS: true,
minifyCSS: true,
minifyURLs: true,
},
}
: undefined
)
),
// Inlines the webpack runtime script. This script is too small to warrant
// a network request.
// https://github.com/facebook/create-react-app/issues/5358
isEnvProduction &&
shouldInlineRuntimeChunk &&
new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime-.+[.]js/]),
// Makes some environment variables available in index.html.
// The public URL is available as %PUBLIC_URL% in index.html, e.g.:
// <link rel="icon" href="%PUBLIC_URL%/favicon.ico">
// It will be an empty string unless you specify "homepage"
// in `package.json`, in which case it will be the pathname of that URL.
new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
// This gives some necessary context to module not found errors, such as
// the requesting resource.
new ModuleNotFoundPlugin(paths.appPath),
// Makes some environment variables available to the JS code, for example:
// if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
// It is absolutely essential that NODE_ENV is set to production
// during a production build.
// Otherwise React will be compiled in the very slow development mode.
new webpack.DefinePlugin(env.stringified),
// This is necessary to emit hot updates (CSS and Fast Refresh):
isEnvDevelopment && new webpack.HotModuleReplacementPlugin(),
// Experimental hot reloading for React .
// https://github.com/facebook/react/tree/master/packages/react-refresh
isEnvDevelopment &&
shouldUseReactRefresh &&
new ReactRefreshWebpackPlugin({
overlay: {
entry: webpackDevClientEntry,
// The expected exports are slightly different from what the overlay exports,
// so an interop is included here to enable feedback on module-level errors.
module: reactRefreshOverlayEntry,
// Since we ship a custom dev client and overlay integration,
// the bundled socket handling logic can be eliminated.
sockIntegration: false,
},
}),
// Watcher doesn't work well if you mistype casing in a path so we use
// a plugin that prints an error when you attempt to do this.
// See https://github.com/facebook/create-react-app/issues/240
isEnvDevelopment && new CaseSensitivePathsPlugin(),
// If you require a missing module and then `npm install` it, you still have
// to restart the development server for webpack to discover it. This plugin
// makes the discovery automatic so you don't have to restart.
// See https://github.com/facebook/create-react-app/issues/186
isEnvDevelopment &&
new WatchMissingNodeModulesPlugin(paths.appNodeModules),
isEnvProduction &&
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
// both options are optional
filename: 'static/css/[name].[contenthash:8].css',
chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
}),
// Generate an asset manifest file with the following content:
// - "files" key: Mapping of all asset filenames to their corresponding
// output file so that tools can pick it up without having to parse
// `index.html`
// - "entrypoints" key: Array of files which are included in `index.html`,
// can be used to reconstruct the HTML if necessary
new ManifestPlugin({
fileName: 'asset-manifest.json',
publicPath: paths.publicUrlOrPath,
generate: (seed, files, entrypoints) => {
const manifestFiles = files.reduce((manifest, file) => {
manifest[file.name] = file.path;
return manifest;
}, seed);
const entrypointFiles = entrypoints.main.filter(
fileName => !fileName.endsWith('.map')
);
return {
files: manifestFiles,
entrypoints: entrypointFiles,
};
},
}),
// Moment.js is an extremely popular library that bundles large locale files
// by default due to how webpack interprets its code. This is a practical
// solution that requires the user to opt into importing specific locales.
// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
// You can remove this if you don't use Moment.js:
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
// Generate a service worker script that will precache, and keep up to date,
// the HTML & assets that are part of the webpack build.
isEnvProduction &&
fs.existsSync(swSrc) &&
new WorkboxWebpackPlugin.InjectManifest({
swSrc,
dontCacheBustURLsMatching: /\.[0-9a-f]{8}\./,
exclude: [/\.map$/, /asset-manifest\.json$/, /LICENSE/],
// Bump up the default maximum size (2mb) that's precached,
// to make lazy-loading failure scenarios less likely.
// See https://github.com/cra-template/pwa/issues/13#issuecomment-722667270
maximumFileSizeToCacheInBytes: 5 * 1024 * 1024,
}),
// TypeScript type checking
useTypeScript &&
new ForkTsCheckerWebpackPlugin({
typescript: resolve.sync('typescript', {
basedir: paths.appNodeModules,
}),
async: isEnvDevelopment,
checkSyntacticErrors: true,
resolveModuleNameModule: process.versions.pnp
? `${__dirname}/pnpTs.js`
: undefined,
resolveTypeReferenceDirectiveModule: process.versions.pnp
? `${__dirname}/pnpTs.js`
: undefined,
tsconfig: paths.appTsConfig,
reportFiles: [
// This one is specifically to match during CI tests,
// as micromatch doesn't match
// '../cra-template-typescript/template/src/App.tsx'
// otherwise.
'../**/src/**/*.{ts,tsx}',
'**/src/**/*.{ts,tsx}',
'!**/src/**/__tests__/**',
'!**/src/**/?(*.)(spec|test).*',
'!**/src/setupProxy.*',
'!**/src/setupTests.*',
],
silent: true,
// The formatter is invoked directly in WebpackDevServerUtils during development
formatter: isEnvProduction ? typescriptFormatter : undefined,
}),
new ESLintPlugin({
// Plugin options
extensions: ['js', 'mjs', 'jsx', 'ts', 'tsx'],
formatter: require.resolve('react-dev-utils/eslintFormatter'),
eslintPath: require.resolve('eslint'),
context: paths.appSrc,
cache: true,
// ESLint class options
cwd: paths.appPath,
resolvePluginsRelativeTo: __dirname,
baseConfig: {
extends: [require.resolve('eslint-config-react-app/base')],
rules: {
...(!hasJsxRuntime && {
'react/react-in-jsx-scope': 'error',
}),
},
},
}),
].filter(Boolean),
// Some libraries import Node modules but don't use them in the browser.
// Tell webpack to provide empty mocks for them so importing them works.
node: {
module: 'empty',
dgram: 'empty',
dns: 'mock',
fs: 'empty',
http2: 'empty',
net: 'empty',
tls: 'empty',
child_process: 'empty',
},
// Turn off performance processing because we utilize
// our own hints via the FileSizeReporter
performance: false,
};
};

130
config/webpackDevServer.config.js
View File

@@ -1,130 +0,0 @@
'use strict';
const fs = require('fs');
const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
const evalSourceMapMiddleware = require('react-dev-utils/evalSourceMapMiddleware');
const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
const ignoredFiles = require('react-dev-utils/ignoredFiles');
const redirectServedPath = require('react-dev-utils/redirectServedPathMiddleware');
const paths = require('./paths');
const getHttpsConfig = require('./getHttpsConfig');
const host = process.env.HOST || '0.0.0.0';
const sockHost = process.env.WDS_SOCKET_HOST;
const sockPath = process.env.WDS_SOCKET_PATH; // default: '/sockjs-node'
const sockPort = process.env.WDS_SOCKET_PORT;
module.exports = function (proxy, allowedHost) {
return {
// WebpackDevServer 2.4.3 introduced a security fix that prevents remote
// websites from potentially accessing local content through DNS rebinding:
// https://github.com/webpack/webpack-dev-server/issues/887
// https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a
// However, it made several existing use cases such as development in cloud
// environment or subdomains in development significantly more complicated:
// https://github.com/facebook/create-react-app/issues/2271
// https://github.com/facebook/create-react-app/issues/2233
// While we're investigating better solutions, for now we will take a
// compromise. Since our WDS configuration only serves files in the `public`
// folder we won't consider accessing them a vulnerability. However, if you
// use the `proxy` feature, it gets more dangerous because it can expose
// remote code execution vulnerabilities in backends like Django and Rails.
// So we will disable the host check normally, but enable it if you have
// specified the `proxy` setting. Finally, we let you override it if you
// really know what you're doing with a special environment variable.
disableHostCheck:
!proxy || process.env.DANGEROUSLY_DISABLE_HOST_CHECK === 'true',
// Enable gzip compression of generated files.
compress: true,
// Silence WebpackDevServer's own logs since they're generally not useful.
// It will still show compile warnings and errors with this setting.
clientLogLevel: 'none',
// By default WebpackDevServer serves physical files from current directory
// in addition to all the virtual build products that it serves from memory.
// This is confusing because those files won’t automatically be available in
// production build folder unless we copy them. However, copying the whole
// project directory is dangerous because we may expose sensitive files.
// Instead, we establish a convention that only files in `public` directory
// get served. Our build script will copy `public` into the `build` folder.
// In `index.html`, you can get URL of `public` folder with %PUBLIC_URL%:
// <link rel="icon" href="%PUBLIC_URL%/favicon.ico">
// In JavaScript code, you can access it with `process.env.PUBLIC_URL`.
// Note that we only recommend to use `public` folder as an escape hatch
// for files like `favicon.ico`, `manifest.json`, and libraries that are
// for some reason broken when imported through webpack. If you just want to
// use an image, put it in `src` and `import` it from JavaScript instead.
contentBase: paths.appPublic,
contentBasePublicPath: paths.publicUrlOrPath,
// By default files from `contentBase` will not trigger a page reload.
watchContentBase: true,
// Enable hot reloading server. It will provide WDS_SOCKET_PATH endpoint
// for the WebpackDevServer client so it can learn when the files were
// updated. The WebpackDevServer client is included as an entry point
// in the webpack development configuration. Note that only changes
// to CSS are currently hot reloaded. JS changes will refresh the browser.
hot: true,
// Use 'ws' instead of 'sockjs-node' on server since we're using native
// websockets in `webpackHotDevClient`.
transportMode: 'ws',
// Prevent a WS client from getting injected as we're already including
// `webpackHotDevClient`.
injectClient: false,
// Enable custom sockjs pathname for websocket connection to hot reloading server.
// Enable custom sockjs hostname, pathname and port for websocket connection
// to hot reloading server.
sockHost,
sockPath,
sockPort,
// It is important to tell WebpackDevServer to use the same "publicPath" path as
// we specified in the webpack config. When homepage is '.', default to serving
// from the root.
// remove last slash so user can land on `/test` instead of `/test/`
publicPath: paths.publicUrlOrPath.slice(0, -1),
// WebpackDevServer is noisy by default so we emit custom message instead
// by listening to the compiler events with `compiler.hooks[...].tap` calls above.
quiet: true,
// Reportedly, this avoids CPU overload on some systems.
// https://github.com/facebook/create-react-app/issues/293
// src/node_modules is not ignored to support absolute imports
// https://github.com/facebook/create-react-app/issues/1065
watchOptions: {
ignored: ignoredFiles(paths.appSrc),
},
https: getHttpsConfig(),
host,
overlay: false,
historyApiFallback: {
// Paths with dots should still use the history fallback.
// See https://github.com/facebook/create-react-app/issues/387.
disableDotRule: true,
index: paths.publicUrlOrPath,
},
public: allowedHost,
// `proxy` is run between `before` and `after` `webpack-dev-server` hooks
proxy,
before(app, server) {
// Keep `evalSourceMapMiddleware` and `errorOverlayMiddleware`
// middlewares before `redirectServedPath` otherwise will not have any effect
// This lets us fetch source contents from webpack for the error overlay
app.use(evalSourceMapMiddleware(server));
// This lets us open files from the runtime error overlay.
app.use(errorOverlayMiddleware());
if (fs.existsSync(paths.proxySetup)) {
// This registers user provided middleware for proxy reasons
require(paths.proxySetup)(app);
}
},
after(app) {
// Redirect to `PUBLIC_URL` or `homepage` from `package.json` if url not match
app.use(redirectServedPath(paths.publicUrlOrPath));
// This service worker file is effectively a 'no-op' that will reset any
// previous service worker registered for the same host:port combination.
// We do this in development to avoid hitting the production cache if
// it used the same host and port.
// https://github.com/facebook/create-react-app/issues/2272#issuecomment-302832432
app.use(noopServiceWorkerMiddleware(paths.publicUrlOrPath));
},
};
};

4
example.config.js
View File

@@ -1,4 +1,4 @@
module.exports = { const config = {
title: 'example', title: 'example',
display_title: 'example', display_title: 'example',
SERVER_ROOT: 'http://localhost:4040', SERVER_ROOT: 'http://localhost:4040',
@@ -25,3 +25,5 @@ module.exports = {
} }
} }
} }
export default config;

5
index.html
View File

@@ -35,13 +35,12 @@
<body> <body>
<div class="page"> <div class="page">
<div class="page"> <div id="explore-app"></div>
<div id="explore-app"></div>
</div>
<div id="nodisplay"> <div id="nodisplay">
This platform is unsuitable for mobile. Please revisit on a desktop. This platform is unsuitable for mobile. Please revisit on a desktop.
</div> </div>
</div> </div>
<script type="module" src="/src/index.jsx"></script>
</body> </body>
</html> </html>

47241
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

175
package.json
View File

@@ -5,113 +5,59 @@
"homepage": ".", "homepage": ".",
"private": true, "private": true,
"engines": { "engines": {
"node": "16" "node": "18"
}, },
"scripts": { "scripts": {
"dev": "node scripts/start.js", "dev": "vite",
"build": "NODE_ENV=production node scripts/build.js", "build": "vite build",
"dev:wsl": "HOST=0.0.0.0 npm run dev", "dev:wsl": "vite --host",
"test": "node scripts/test.js --silent", "test": "vitest",
"test:ava": "NODE_ENV=production ava --verbose", "eslint": "eslint src --ext jsx",
"test-watch": "ava --watch",
"lint": "prettier --check \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"", "lint": "prettier --check \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
"lint:fix": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"" "lint:fix": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\""
}, },
"dependencies": { "dependencies": {
"@json2csv/plainjs": "^6.1.2",
"d3": "^7.4.2", "d3": "^7.4.2",
"dayjs": "^1.11.0", "dayjs": "^1.11.0",
"joi": "^14.0.1", "joi": "^17.1.1",
"json2csv": "^5.0.7",
"leaflet": "^1.0.3", "leaflet": "^1.0.3",
"marked": "^0.7.0", "marked": "^4.2.5",
"object-hash": "^1.3.0", "object-hash": "^3.0.0",
"ramda": "^0.26.1", "ramda": "^0.28.0",
"react-dev-utils": "^11.0.1", "react": "^18.0.0",
"react-device-detect": "^2.2.2", "react-device-detect": "^2.2.2",
"react-dom": "^18.0.0", "react-dom": "^18.0.0",
"react-image": "^4.0.3", "react-image": "^4.0.3",
"react-redux": "^8.0.5", "react-redux": "^8.0.5",
"react-refresh": "^0.8.3",
"react-tabs": "^6.0.0", "react-tabs": "^6.0.0",
"react-twitter-embed": "^4.0.4", "react-twitter-embed": "^4.0.4",
"react": "^18.0.0",
"redux-thunk": "^2.2.0",
"redux": "^4.0.0", "redux": "^4.0.0",
"reselect": "^3.0.1", "redux-thunk": "^2.2.0",
"screenfull": "^5.2.0", "reselect": "^4.1.7",
"screenfull": "^6.0.2",
"supercluster": "^7.1.5", "supercluster": "^7.1.5",
"video-react": "^0.16.0" "video-react": "^0.16.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.20.12",
"@babel/highlight": "^7.14.5",
"@pmmmwh/react-refresh-webpack-plugin": "0.4.2",
"@svgr/webpack": "5.4.0",
"@testing-library/jest-dom": "^5.11.6", "@testing-library/jest-dom": "^5.11.6",
"@testing-library/react": "^11.2.2", "@testing-library/react": "^13.4.0",
"ava": "1.0.0-beta.8", "@vitejs/plugin-react": "^3.0.1",
"babel-eslint": "^10.1.0", "eslint": "^8.31.0",
"babel-jest": "^26.6.0", "eslint-config-prettier": "^8.6.0",
"babel-loader": "^8.2.4", "eslint-plugin-react": "^7.32.0",
"babel-plugin-named-asset-import": "^0.3.7", "eslint-plugin-react-hooks": "^4.6.0",
"babel-preset-react-app": "^10.0.0", "husky": "^8.0.3",
"bfj": "^7.0.2",
"camelcase": "^6.1.0",
"case-sensitive-paths-webpack-plugin": "2.3.0",
"css-loader": "4.3.0",
"dotenv-expand": "5.1.0",
"dotenv": "8.2.0",
"eslint-config-react-app": "^6.0.0",
"eslint-plugin-flowtype": "^5.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.1.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-testing-library": "^3.9.2",
"eslint-webpack-plugin": "^2.1.0",
"eslint": "^7.11.0",
"file-loader": "6.1.1",
"fs-extra": "^9.0.1",
"html-webpack-plugin": "4.5.0",
"husky": "^4.3.5",
"identity-obj-proxy": "3.0.0",
"jest-circus": "26.6.0",
"jest-date-mock": "^1.0.8", "jest-date-mock": "^1.0.8",
"jest-resolve": "26.6.0", "lint-staged": "^13.1.0",
"jest-watch-typeahead": "0.6.1",
"jest": "26.6.0",
"lint-staged": "^10.5.3",
"mini-css-extract-plugin": "0.11.3",
"node-sass": "^8.0.0",
"optimize-css-assets-webpack-plugin": "5.0.4",
"pnp-webpack-plugin": "1.6.4",
"postcss-flexbugs-fixes": "4.2.1",
"postcss-loader": "3.0.0",
"postcss-normalize": "8.0.1",
"postcss-preset-env": "6.7.0",
"postcss-safe-parser": "5.0.2",
"prettier": "^2.2.1", "prettier": "^2.2.1",
"react-app-polyfill": "^2.0.0", "sass": "^1.57.1",
"resolve-url-loader": "^3.1.2", "vite": "^4.0.4",
"resolve": "1.18.1", "vitest": "^0.27.1"
"sass-loader": "^10.4.1",
"semver": "7.3.2",
"style-loader": "1.3.0",
"terser-webpack-plugin": "4.2.3",
"ts-pnp": "1.2.0",
"url-loader": "4.1.1",
"webpack-dev-server": "^3.11.3",
"webpack-manifest-plugin": "2.2.0",
"webpack": "^4.46.0",
"workbox-webpack-plugin": "5.1.4"
}, },
"lint-staged": { "lint-staged": {
"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [ "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
"prettier --write" "prettier --write"
],
"test/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
"prettier --write"
] ]
}, },
"husky": { "husky": {
@@ -119,11 +65,6 @@
"pre-commit": "lint-staged" "pre-commit": "lint-staged"
} }
}, },
"ava": {
"files": [
"test/**/*.js"
]
},
"browserslist": { "browserslist": {
"production": [ "production": [
">0.2%", ">0.2%",
@@ -135,67 +76,5 @@
"last 1 firefox version", "last 1 firefox version",
"last 1 safari version" "last 1 safari version"
] ]
}, }
"jest": {
"roots": [
"<rootDir>/src"
],
"collectCoverageFrom": [
"src/**/*.{js,jsx,ts,tsx}",
"!src/**/*.d.ts"
],
"setupFiles": [
"react-app-polyfill/jsdom"
],
"setupFilesAfterEnv": [
"<rootDir>/src/setupTests.js",
"<rootDir>/config/jest/setEnvVars.js"
],
"testMatch": [
"<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
"<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
],
"testEnvironment": "jsdom",
"testRunner": "<rootDir>/node_modules/jest-circus/runner.js",
"transform": {
"^.+\\.(js|jsx|mjs|cjs|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
"^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
},
"transformIgnorePatterns": [
"[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|cjs|ts|tsx)$",
"^.+\\.module\\.(css|sass|scss)$"
],
"modulePaths": [],
"moduleNameMapper": {
"^react-native$": "react-native-web",
"^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
},
"moduleFileExtensions": [
"web.js",
"js",
"web.ts",
"ts",
"web.tsx",
"tsx",
"json",
"web.jsx",
"jsx",
"node"
],
"watchPlugins": [
"jest-watch-typeahead/filename",
"jest-watch-typeahead/testname"
],
"resetMocks": true
},
"babel": {
"presets": [
"react-app"
]
},
"eslintConfig": {
"extends": "react-app"
},
"proxy": "https://ukraine.bellingcat.com/ukraine-server"
} }

212
scripts/build.js
View File

@@ -1,212 +0,0 @@
'use strict';
// Do this as the first thing so that any code reading it knows the right env.
process.env.BABEL_ENV = 'production';
process.env.NODE_ENV = 'production';
// Makes the script crash on unhandled rejections instead of silently
// ignoring them. In the future, promise rejections that are not handled will
// terminate the Node.js process with a non-zero exit code.
process.on('unhandledRejection', err => {
throw err;
});
// Ensure environment variables are read.
require('../config/env');
const path = require('path');
const chalk = require('react-dev-utils/chalk');
const fs = require('fs-extra');
const bfj = require('bfj');
const webpack = require('webpack');
const configFactory = require('../config/webpack.config');
const paths = require('../config/paths');
const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
const printBuildError = require('react-dev-utils/printBuildError');
const measureFileSizesBeforeBuild =
FileSizeReporter.measureFileSizesBeforeBuild;
const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
const useYarn = fs.existsSync(paths.yarnLockFile);
// These sizes are pretty large. We'll warn for bundles exceeding them.
const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
const isInteractive = process.stdout.isTTY;
// Warn and crash if required files are missing
if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
process.exit(1);
}
const argv = process.argv.slice(2);
const writeStatsJson = argv.indexOf('--stats') !== -1;
// Generate configuration
const config = configFactory('production');
// We require that you explicitly set browsers and do not fall back to
// browserslist defaults.
const { checkBrowsers } = require('react-dev-utils/browsersHelper');
checkBrowsers(paths.appPath, isInteractive)
.then(() => {
// First, read the current file sizes in build directory.
// This lets us display how much they changed later.
return measureFileSizesBeforeBuild(paths.appBuild);
})
.then(previousFileSizes => {
// Remove all content but keep the directory so that
// if you're in it, you don't end up in Trash
fs.emptyDirSync(paths.appBuild);
// Merge with the public folder
copyPublicFolder();
// Start the webpack build
return build(previousFileSizes);
})
.then(
({ stats, previousFileSizes, warnings }) => {
if (warnings.length) {
console.log(chalk.yellow('Compiled with warnings.\n'));
console.log(warnings.join('\n\n'));
console.log(
'\nSearch for the ' +
chalk.underline(chalk.yellow('keywords')) +
' to learn more about each warning.'
);
console.log(
'To ignore, add ' +
chalk.cyan('// eslint-disable-next-line') +
' to the line before.\n'
);
} else {
console.log(chalk.green('Compiled successfully.\n'));
}
console.log('File sizes after gzip:\n');
printFileSizesAfterBuild(
stats,
previousFileSizes,
paths.appBuild,
WARN_AFTER_BUNDLE_GZIP_SIZE,
WARN_AFTER_CHUNK_GZIP_SIZE
);
console.log();
const appPackage = require(paths.appPackageJson);
const publicUrl = paths.publicUrlOrPath;
const publicPath = config.output.publicPath;
const buildFolder = path.relative(process.cwd(), paths.appBuild);
printHostingInstructions(
appPackage,
publicUrl,
publicPath,
buildFolder,
useYarn
);
},
err => {
const tscCompileOnError = process.env.TSC_COMPILE_ON_ERROR === 'true';
if (tscCompileOnError) {
console.log(
chalk.yellow(
'Compiled with the following type errors (you may want to check these before deploying your app):\n'
)
);
printBuildError(err);
} else {
console.log(chalk.red('Failed to compile.\n'));
printBuildError(err);
process.exit(1);
}
}
)
.catch(err => {
if (err && err.message) {
console.log(err.message);
}
process.exit(1);
});
// Create the production build and print the deployment instructions.
function build(previousFileSizes) {
console.log('Creating an optimized production build...');
const compiler = webpack(config);
return new Promise((resolve, reject) => {
compiler.run((err, stats) => {
let messages;
if (err) {
if (!err.message) {
return reject(err);
}
let errMessage = err.message;
// Add additional information for postcss errors
if (Object.prototype.hasOwnProperty.call(err, 'postcssNode')) {
errMessage +=
'\nCompileError: Begins at CSS selector ' +
err['postcssNode'].selector;
}
messages = formatWebpackMessages({
errors: [errMessage],
warnings: [],
});
} else {
messages = formatWebpackMessages(
stats.toJson({ all: false, warnings: true, errors: true })
);
}
if (messages.errors.length) {
// Only keep the first error. Others are often indicative
// of the same problem, but confuse the reader with noise.
if (messages.errors.length > 1) {
messages.errors.length = 1;
}
return reject(new Error(messages.errors.join('\n\n')));
}
if (
process.env.CI &&
(typeof process.env.CI !== 'string' ||
process.env.CI.toLowerCase() !== 'false') &&
messages.warnings.length
) {
console.log(
chalk.yellow(
'\nTreating warnings as errors because process.env.CI = true.\n' +
'Most CI servers set it automatically.\n'
)
);
return reject(new Error(messages.warnings.join('\n\n')));
}
const resolveArgs = {
stats,
previousFileSizes,
warnings: messages.warnings,
};
if (writeStatsJson) {
return bfj
.write(paths.appBuild + '/bundle-stats.json', stats.toJson())
.then(() => resolve(resolveArgs))
.catch(error => reject(new Error(error)));
}
return resolve(resolveArgs);
});
});
}
function copyPublicFolder() {
fs.copySync(paths.appPublic, paths.appBuild, {
dereference: true,
filter: file => file !== paths.appHtml,
});
}

166
scripts/start.js
View File

@@ -1,166 +0,0 @@
'use strict';
// Do this as the first thing so that any code reading it knows the right env.
process.env.BABEL_ENV = 'development';
process.env.NODE_ENV = 'development';
// Makes the script crash on unhandled rejections instead of silently
// ignoring them. In the future, promise rejections that are not handled will
// terminate the Node.js process with a non-zero exit code.
process.on('unhandledRejection', err => {
throw err;
});
// Ensure environment variables are read.
require('../config/env');
const fs = require('fs');
const chalk = require('react-dev-utils/chalk');
const webpack = require('webpack');
const WebpackDevServer = require('webpack-dev-server');
const clearConsole = require('react-dev-utils/clearConsole');
const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
const {
choosePort,
createCompiler,
prepareProxy,
prepareUrls,
} = require('react-dev-utils/WebpackDevServerUtils');
const openBrowser = require('react-dev-utils/openBrowser');
const semver = require('semver');
const paths = require('../config/paths');
const configFactory = require('../config/webpack.config');
const createDevServerConfig = require('../config/webpackDevServer.config');
const getClientEnvironment = require('../config/env');
const react = require(require.resolve('react', { paths: [paths.appPath] }));
const env = getClientEnvironment(paths.publicUrlOrPath.slice(0, -1));
const useYarn = fs.existsSync(paths.yarnLockFile);
const isInteractive = process.stdout.isTTY;
// Warn and crash if required files are missing
if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
process.exit(1);
}
// Tools like Cloud9 rely on this.
const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 8080;
const HOST = process.env.HOST || '0.0.0.0';
if (process.env.HOST) {
console.log(
chalk.cyan(
`Attempting to bind to HOST environment variable: ${chalk.yellow(
chalk.bold(process.env.HOST)
)}`
)
);
console.log(
`If this was unintentional, check that you haven't mistakenly set it in your shell.`
);
console.log(
`Learn more here: ${chalk.yellow('https://cra.link/advanced-config')}`
);
console.log();
}
// We require that you explicitly set browsers and do not fall back to
// browserslist defaults.
const { checkBrowsers } = require('react-dev-utils/browsersHelper');
checkBrowsers(paths.appPath, isInteractive)
.then(() => {
// We attempt to use the default port but if it is busy, we offer the user to
// run on a different port. `choosePort()` Promise resolves to the next free port.
return choosePort(HOST, DEFAULT_PORT);
})
.then(port => {
if (port == null) {
// We have not found a port.
return;
}
const config = configFactory('development');
const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
const appName = require(paths.appPackageJson).name;
const useTypeScript = fs.existsSync(paths.appTsConfig);
const tscCompileOnError = process.env.TSC_COMPILE_ON_ERROR === 'true';
const urls = prepareUrls(
protocol,
HOST,
port,
paths.publicUrlOrPath.slice(0, -1)
);
const devSocket = {
warnings: warnings =>
devServer.sockWrite(devServer.sockets, 'warnings', warnings),
errors: errors =>
devServer.sockWrite(devServer.sockets, 'errors', errors),
};
// Create a webpack compiler that is configured with custom messages.
const compiler = createCompiler({
appName,
config,
devSocket,
urls,
useYarn,
useTypeScript,
tscCompileOnError,
webpack,
});
// Load proxy config
const proxySetting = require(paths.appPackageJson).proxy;
const proxyConfig = prepareProxy(
proxySetting,
paths.appPublic,
paths.publicUrlOrPath
);
// Serve webpack assets generated by the compiler over a web server.
const serverConfig = createDevServerConfig(
proxyConfig,
urls.lanUrlForConfig
);
const devServer = new WebpackDevServer(compiler, serverConfig);
// Launch WebpackDevServer.
devServer.listen(port, HOST, err => {
if (err) {
return console.log(err);
}
if (isInteractive) {
clearConsole();
}
if (env.raw.FAST_REFRESH && semver.lt(react.version, '16.10.0')) {
console.log(
chalk.yellow(
`Fast Refresh requires React 16.10 or higher. You are using React ${react.version}.`
)
);
}
console.log(chalk.cyan('Starting the development server...\n'));
openBrowser(urls.localUrlForBrowser);
});
['SIGINT', 'SIGTERM'].forEach(function (sig) {
process.on(sig, function () {
devServer.close();
process.exit();
});
});
if (process.env.CI !== 'true') {
// Gracefully exit when stdin ends
process.stdin.on('end', function () {
devServer.close();
process.exit();
});
}
})
.catch(err => {
if (err && err.message) {
console.log(err.message);
}
process.exit(1);
});

53
scripts/test.js
View File

@@ -1,53 +0,0 @@
'use strict';
// Do this as the first thing so that any code reading it knows the right env.
process.env.BABEL_ENV = 'test';
process.env.NODE_ENV = 'test';
process.env.PUBLIC_URL = '';
// Makes the script crash on unhandled rejections instead of silently
// ignoring them. In the future, promise rejections that are not handled will
// terminate the Node.js process with a non-zero exit code.
process.on('unhandledRejection', err => {
throw err;
});
// Ensure environment variables are read.
require('../config/env');
const jest = require('jest');
const execSync = require('child_process').execSync;
let argv = process.argv.slice(2);
function isInGitRepository() {
try {
execSync('git rev-parse --is-inside-work-tree', { stdio: 'ignore' });
return true;
} catch (e) {
return false;
}
}
function isInMercurialRepository() {
try {
execSync('hg --cwd . root', { stdio: 'ignore' });
return true;
} catch (e) {
return false;
}
}
// Watch unless on CI or explicitly running all tests
if (
!process.env.CI &&
argv.indexOf('--watchAll') === -1 &&
argv.indexOf('--watchAll=false') === -1
) {
// https://github.com/facebook/create-react-app/issues/5210
const hasSourceControl = isInGitRepository() || isInMercurialRepository();
argv.push(hasSourceControl ? '--watch' : '--watchAll');
}
jest.run(argv);

21
src/common/utilities.js
View File

@@ -1,17 +1,18 @@
import config from "../../config";
import customParseFormat from "dayjs/plugin/customParseFormat"; import customParseFormat from "dayjs/plugin/customParseFormat";
import dayjs from "dayjs"; import dayjs from "dayjs";
import hash from "object-hash"; import hash from "object-hash";
import { timeFormatDefaultLocale } from "d3"; import { timeFormatDefaultLocale } from "d3";
import esMxData from "./data/es-MX.json";
import { ASSOCIATION_MODES, POLYGON_CLIP_PATH } from "./constants"; import { ASSOCIATION_MODES, POLYGON_CLIP_PATH } from "./constants";
dayjs.extend(customParseFormat); dayjs.extend(customParseFormat);
let { DATE_FMT, TIME_FMT } = process.env; const DATE_FMT = config.DATE_FMT ?? "MM/DD/YYYY";
if (!DATE_FMT) DATE_FMT = "MM/DD/YYYY"; const TIME_FMT = config.TIME_FMT ?? "HH:mm";
if (!TIME_FMT) TIME_FMT = "HH:mm";
export const language = process.env.store.app.language || "en-US"; export const language = config.store.app.language || "en-US";
export function getPathLeaf(path) { export function getPathLeaf(path) {
const splitPath = path.split("/"); const splitPath = path.split("/");
@@ -250,14 +251,14 @@ export function injectSource(id) {
} }
const API_ROOT = const API_ROOT =
process.env.NODE_ENV === "development" ? "" : process.env.SERVER_ROOT; import.meta.env.MODE === "development" ? "" : config.SERVER_ROOT;
export function urlFromEnv(ext) { export function urlFromEnv(ext) {
if (process.env[ext]) { if (config[ext]) {
if (!Array.isArray(process.env[ext])) { if (!Array.isArray(config[ext])) {
return [`${API_ROOT}${process.env[ext]}`]; return [`${API_ROOT}${config[ext]}`];
} else { } else {
return process.env[ext].map((suffix) => `${API_ROOT}${suffix}`); return config[ext].map((suffix) => `${API_ROOT}${suffix}`);
} }
} else { } else {
return null; return null;
@@ -488,7 +489,7 @@ export function makeNiceDate(datetime) {
*/ */
export function setD3Locale() { export function setD3Locale() {
const languages = { const languages = {
"es-MX": require("./data/es-MX.json"), "es-MX": esMxData,
}; };
if (language !== "es-US" && languages[language]) { if (language !== "es-US" && languages[language]) {

4
src/components/App.js → src/components/App.jsx
View File

@@ -1,8 +1,8 @@
import "../scss/main.scss"; import "../scss/main.scss";
import React from "react"; import { Component } from "react";
import Layout from "./Layout"; import Layout from "./Layout";
class App extends React.Component { class App extends Component {
render() { render() {
return <Layout />; return <Layout />;
} }

1
src/components/InfoPopup.js → src/components/InfoPopup.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import Popup from "./atoms/Popup"; import Popup from "./atoms/Popup";
import copy from "../common/data/copy.json"; import copy from "../common/data/copy.json";

6
src/components/Layout.js → src/components/Layout.jsx
View File

@@ -1,4 +1,4 @@
import React from "react"; import { Component } from "react";
import { bindActionCreators } from "redux"; import { bindActionCreators } from "redux";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -19,12 +19,12 @@ import Timeline from "./time/Timeline";
import Space from "./space/Space"; import Space from "./space/Space";
import Search from "./controls/Search"; import Search from "./controls/Search";
import CardStack from "./controls/CardStack"; import CardStack from "./controls/CardStack";
import NarrativeControls from "./controls/NarrativeControls.js"; import NarrativeControls from "./controls/NarrativeControls";
import colors from "../common/global"; import colors from "../common/global";
import { binarySearch, insetSourceFrom } from "../common/utilities"; import { binarySearch, insetSourceFrom } from "../common/utilities";
class Dashboard extends React.Component { class Dashboard extends Component {
constructor(props) { constructor(props) {
super(props); super(props);

4
src/components/Notification.js → src/components/Notification.jsx
View File

@@ -1,6 +1,6 @@
import React from "react"; import { Component } from "react";
export default class Notification extends React.Component { export default class Notification extends Component {
constructor(props) { constructor(props) {
super(); super();
this.state = { this.state = {

4
src/components/Portal.js → src/components/Portal.jsx
View File

@@ -1,7 +1,7 @@
import React from "react"; import { Component } from "react";
import ReactDOM from "react-dom"; import ReactDOM from "react-dom";
class Portal extends React.Component { class Portal extends Component {
render() { render() {
const { children, node } = this.props; const { children, node } = this.props;
if (!node) return null; if (!node) return null;

6
src/components/TemplateCover.js → src/components/TemplateCover.jsx
View File

@@ -1,7 +1,7 @@
import React from "react"; import { Component } from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Player } from "video-react"; import { Player } from "video-react";
import marked from "marked"; import { marked } from "marked";
import MediaOverlay from "./atoms/Media"; import MediaOverlay from "./atoms/Media";
// import falogo from "../assets/fa-logo.png"; // import falogo from "../assets/fa-logo.png";
import bcatlogo from "../assets/bellingcat-logo.png"; import bcatlogo from "../assets/bellingcat-logo.png";
@@ -13,7 +13,7 @@ const MEDIA_HIDDEN = -2;
* The component is a bit of a mess, keeping a lot of internal state and using * The component is a bit of a mess, keeping a lot of internal state and using
* a couple of weird offset calculations... but it works for the time being. * a couple of weird offset calculations... but it works for the time being.
*/ */
class TemplateCover extends React.Component { class TemplateCover extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {

9
src/components/Toolbar.js → src/components/Toolbar.jsx
View File

@@ -1,8 +1,9 @@
import React from "react"; import { Component } from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { bindActionCreators } from "redux"; import { bindActionCreators } from "redux";
import * as actions from "../actions"; import * as actions from "../actions";
import * as selectors from "../selectors"; import * as selectors from "../selectors";
import config from "../../config";
import { Tabs, TabList, TabPanel } from "react-tabs"; import { Tabs, TabList, TabPanel } from "react-tabs";
import FilterListPanel from "./controls/FilterListPanel"; import FilterListPanel from "./controls/FilterListPanel";
@@ -20,12 +21,12 @@ import {
mapCategoriesToPaths, mapCategoriesToPaths,
getCategoryIdxs, getCategoryIdxs,
getFilterIdx, getFilterIdx,
} from "../common/utilities.js"; } from "../common/utilities";
import { ToolbarButton } from "./controls/atoms/ToolbarButton"; import { ToolbarButton } from "./controls/atoms/ToolbarButton";
import { FullscreenToggle } from "./controls/FullScreenToggle"; import { FullscreenToggle } from "./controls/FullScreenToggle";
import DownloadPanel from "./controls/DownloadPanel"; import DownloadPanel from "./controls/DownloadPanel";
class Toolbar extends React.Component { class Toolbar extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.onSelectFilter = this.onSelectFilter.bind(this); this.onSelectFilter = this.onSelectFilter.bind(this);
@@ -279,7 +280,7 @@ class Toolbar extends React.Component {
const { features, narratives, toolbarCopy } = this.props; const { features, narratives, toolbarCopy } = this.props;
const narrativesExist = narratives && narratives.length !== 0; const narrativesExist = narratives && narratives.length !== 0;
let title = copy[this.props.language].toolbar.title; let title = copy[this.props.language].toolbar.title;
if (process.env.display_title) title = process.env.display_title; if (config.display_title) title = config.display_title;
const { panels } = toolbarCopy; const { panels } = toolbarCopy;
const narrativesIdx = 0; const narrativesIdx = 0;

1
src/components/atoms/Checkbox.js → src/components/atoms/Checkbox.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import { DEFAULT_CHECKBOX_COLOR } from "../../common/constants"; import { DEFAULT_CHECKBOX_COLOR } from "../../common/constants";
const Checkbox = ({ label, isActive, onClickCheckbox, color, styleProps }) => { const Checkbox = ({ label, isActive, onClickCheckbox, color, styleProps }) => {

10
src/components/atoms/CoeventIcon.js → src/components/atoms/CoeventIcon.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const CoeventIcon = ({ isEnabled, toggleMapViews }) => { const CoeventIcon = ({ isEnabled, toggleMapViews }) => {
return ( return (
<button onClick={() => toggleMapViews("coevents")}> <button onClick={() => toggleMapViews("coevents")}>
@@ -13,8 +11,8 @@ const CoeventIcon = ({ isEnabled, toggleMapViews }) => {
enableBackground="new 0 0 30 20" enableBackground="new 0 0 30 20"
> >
<polygon <polygon
stroke-linejoin="round" strokeLinejoin="round"
stroke-miterlimit="10" strokeMiterlimit="10"
points="19.178,20 10.823,20 10.473,14.081 points="19.178,20 10.823,20 10.473,14.081
10,13.396 10,6.084 20,6.084 20,13.396 19.445,14.021 " 10,13.396 10,6.084 20,6.084 20,13.396 19.445,14.021 "
/> />
@@ -26,8 +24,8 @@ const CoeventIcon = ({ isEnabled, toggleMapViews }) => {
height="3.35" height="3.35"
/> />
<line <line
stroke-linejoin="round" strokeLinejoin="round"
stroke-miterlimit="10" strokeMiterlimit="10"
x1="12.125" x1="12.125"
y1="1" y1="1"
x2="12.125" x2="12.125"

1
src/components/atoms/ColoredMarkers.js → src/components/atoms/ColoredMarkers.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import { getCoordinatesForPercent } from "../../common/utilities"; import { getCoordinatesForPercent } from "../../common/utilities";
function ColoredMarkers({ radius, colorPercentMap, styles, className }) { function ColoredMarkers({ radius, colorPercentMap, styles, className }) {

1
src/components/atoms/Content.js → src/components/atoms/Content.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import { Player } from "video-react"; import { Player } from "video-react";
import { Img } from "react-image"; import { Img } from "react-image";
import Md from "./Md"; import Md from "./Md";

2
src/components/atoms/Controls.js → src/components/atoms/Controls.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const OverlayControls = ({ viewIdx, paths, onShiftHandler }) => { const OverlayControls = ({ viewIdx, paths, onShiftHandler }) => {
const backArrow = const backArrow =
viewIdx !== 0 ? ( viewIdx !== 0 ? (

2
src/components/atoms/CoverIcon.js → src/components/atoms/CoverIcon.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const CoverIcon = ({ isActive, isDisabled, onClickHandler }) => { const CoverIcon = ({ isActive, isDisabled, onClickHandler }) => {
let classes = isActive ? "action-button enabled" : "action-button"; let classes = isActive ? "action-button enabled" : "action-button";
if (isDisabled) { if (isDisabled) {

2
src/components/atoms/InfoIcon.js → src/components/atoms/InfoIcon.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const CoverIcon = ({ isActive, isDisabled, onClickHandler }) => { const CoverIcon = ({ isActive, isDisabled, onClickHandler }) => {
let classes = isActive ? "action-button enabled" : "action-button"; let classes = isActive ? "action-button enabled" : "action-button";
if (isDisabled) { if (isDisabled) {

1
src/components/atoms/Loading.js → src/components/atoms/Loading.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import copy from "../../common/data/copy.json"; import copy from "../../common/data/copy.json";
const LoadingOverlay = ({ isLoading, language }) => { const LoadingOverlay = ({ isLoading, language }) => {

6
src/components/atoms/Md.js → src/components/atoms/Md.jsx
View File

@@ -1,8 +1,8 @@
import React from "react"; import { Component } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import marked from "marked"; import { marked } from "marked";
class Md extends React.Component { class Md extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { md: null, error: null }; this.state = { md: null, error: null };

6
src/components/atoms/Media.js → src/components/atoms/Media.jsx
View File

@@ -1,5 +1,5 @@
import React from "react"; import { Component } from "react";
import marked from "marked"; import { marked } from "marked";
import Content from "./Content"; import Content from "./Content";
import Controls from "./Controls"; import Controls from "./Controls";
import { selectTypeFromPathWithPoster } from "../../common/utilities"; import { selectTypeFromPathWithPoster } from "../../common/utilities";
@@ -9,7 +9,7 @@ import { selectTypeFromPathWithPoster } from "../../common/utilities";
* can be changed by the user. These are both managed in this component's React * can be changed by the user. These are both managed in this component's React
* state. * state.
*/ */
class SourceOverlay extends React.Component { class SourceOverlay extends Component {
constructor() { constructor() {
super(); super();
this.state = { mediaIdx: 0, langIdx: 0 }; this.state = { mediaIdx: 0, langIdx: 0 };

2
src/components/atoms/NoSource.js → src/components/atoms/NoSource.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const NoSource = ({ failedUrls }) => { const NoSource = ({ failedUrls }) => {
return ( return (
<div className="no-source-container"> <div className="no-source-container">

3
src/components/atoms/Popup.js → src/components/atoms/Popup.jsx
View File

@@ -1,5 +1,4 @@
import React from "react"; import { marked } from "marked";
import marked from "marked";
const fontSize = window.innerWidth > 1000 ? 14 : 18; const fontSize = window.innerWidth > 1000 ? 14 : 18;

6
src/components/atoms/RefreshIcon.js → src/components/atoms/RefreshIcon.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
export default ({ isActive, isDisabled, onClickHandler }) => { export default ({ isActive, isDisabled, onClickHandler }) => {
return ( return (
<svg <svg
@@ -12,8 +10,8 @@ export default ({ isActive, isDisabled, onClickHandler }) => {
enableBackground="new 7.5 7.5 25 25" enableBackground="new 7.5 7.5 25 25"
> >
<path <path
stroke-width="2" strokeWidth="2"
stroke-miterlimit="10" strokeMiterlimit="10"
d="M28.822,16.386c1.354,3.219,0.898,7.064-1.5,9.924 d="M28.822,16.386c1.354,3.219,0.898,7.064-1.5,9.924
c-3.419,4.073-9.49,4.604-13.562,1.186c-4.073-3.417-4.604-9.49-1.187-13.562c1.987-2.368,4.874-3.54,7.74-3.433" c-3.419,4.073-9.49,4.604-13.562,1.186c-4.073-3.417-4.604-9.49-1.187-13.562c1.987-2.368,4.874-3.54,7.74-3.433"
/> />

2
src/components/atoms/RouteIcon.js → src/components/atoms/RouteIcon.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const RouteIcon = ({ isEnabled, toggleMapViews }) => { const RouteIcon = ({ isEnabled, toggleMapViews }) => {
return ( return (
<button onClick={() => toggleMapViews("routes")}> <button onClick={() => toggleMapViews("routes")}>

2
src/components/atoms/SitesIcon.js → src/components/atoms/SitesIcon.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const SitesIcon = ({ isActive, isDisabled, onClickHandler }) => { const SitesIcon = ({ isActive, isDisabled, onClickHandler }) => {
let classes = isActive ? "action-button enabled" : "action-button"; let classes = isActive ? "action-button enabled" : "action-button";
if (isDisabled) { if (isDisabled) {

2
src/components/atoms/Spinner.js → src/components/atoms/Spinner.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const Spinner = ({ small }) => { const Spinner = ({ small }) => {
return ( return (
<div className={`spinner ${small ? "small" : ""}`}> <div className={`spinner ${small ? "small" : ""}`}>

2
src/components/atoms/StaticPage.js → src/components/atoms/StaticPage.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const StaticPage = ({ showing, children }) => ( const StaticPage = ({ showing, children }) => (
<div className={`cover-container ${showing ? "showing" : ""}`}> <div className={`cover-container ${showing ? "showing" : ""}`}>
{children} {children}

2
src/components/controls/BottomActions.js → src/components/controls/BottomActions.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
import SitesIcon from "../atoms/SitesIcon"; import SitesIcon from "../atoms/SitesIcon";
import CoverIcon from "../atoms/CoverIcon"; import CoverIcon from "../atoms/CoverIcon";
// import InfoIcon from "../atoms/InfoIcon"; // import InfoIcon from "../atoms/InfoIcon";

2
src/components/controls/Card.js → src/components/controls/Card.jsx
View File

@@ -1,4 +1,4 @@
import React, { useState } from "react"; import { useState } from "react";
import CardText from "./atoms/Text"; import CardText from "./atoms/Text";
import CardTime from "./atoms/Time"; import CardTime from "./atoms/Time";
import CardButton from "./atoms/Button"; import CardButton from "./atoms/Button";

10
src/components/controls/CardStack.js → src/components/controls/CardStack.jsx
View File

@@ -1,4 +1,4 @@
import React from "react"; import { createRef, Component } from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { generateCardLayout, Card } from "./Card"; import { generateCardLayout, Card } from "./Card";
@@ -6,12 +6,12 @@ import * as selectors from "../../selectors";
import { getFilterIdxFromColorSet } from "../../common/utilities"; import { getFilterIdxFromColorSet } from "../../common/utilities";
import copy from "../../common/data/copy.json"; import copy from "../../common/data/copy.json";
class CardStack extends React.Component { class CardStack extends Component {
constructor() { constructor() {
super(); super();
this.refs = {}; this.refs = {};
this.refCardStack = React.createRef(); this.refCardStack = createRef();
this.refCardStackContent = React.createRef(); this.refCardStackContent = createRef();
} }
componentDidUpdate() { componentDidUpdate() {
@@ -64,7 +64,7 @@ class CardStack extends React.Component {
generateCardLayout[this.props.cardUI.layout.template]; generateCardLayout[this.props.cardUI.layout.template];
return events.map((event, idx) => { return events.map((event, idx) => {
const thisRef = React.createRef(); const thisRef = createRef();
this.refs[idx] = thisRef; this.refs[idx] = thisRef;
const content = generateTemplate({ const content = generateTemplate({

3
src/components/controls/CategoriesListPanel.js → src/components/controls/CategoriesListPanel.jsx
View File

@@ -1,5 +1,4 @@
import React from "react"; import { marked } from "marked";
import marked from "marked";
import PanelTree from "./atoms/PanelTree"; import PanelTree from "./atoms/PanelTree";
import { ASSOCIATION_MODES } from "../../common/constants"; import { ASSOCIATION_MODES } from "../../common/constants";

11
src/components/controls/DownloadButton.js → src/components/controls/DownloadButton.jsx
View File

@@ -1,10 +1,10 @@
import React from "react"; import { Component } from "react";
import copy from "../../common/data/copy.json";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { parse } from "json2csv"; import { Parser } from "@json2csv/plainjs";
import copy from "../../common/data/copy.json";
import { downloadAsFile } from "../../common/utilities"; import { downloadAsFile } from "../../common/utilities";
export class DownloadButton extends React.Component { export class DownloadButton extends Component {
onDownload(format, domain) { onDownload(format, domain) {
let filename = `ukr-civharm-${dayjs().format("YYYY-MM-DD")}`; let filename = `ukr-civharm-${dayjs().format("YYYY-MM-DD")}`;
if (format === "csv") { if (format === "csv") {
@@ -31,7 +31,8 @@ export class DownloadButton extends React.Component {
.join(","), .join(","),
}; };
}); });
return parse(exportEvents, { flatten: true }); const parser = new Parser();
return parser.parse(exportEvents, { flatten: true });
} }
getJsonData(domain) { getJsonData(domain) {
const { events, sources } = domain; const { events, sources } = domain;

1
src/components/controls/DownloadPanel.js → src/components/controls/DownloadPanel.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import { DownloadButton } from "./DownloadButton"; import { DownloadButton } from "./DownloadButton";
const DownloadPanel = ({ language, title, description, domain }) => { const DownloadPanel = ({ language, title, description, domain }) => {

5
src/components/controls/FilterListPanel.js → src/components/controls/FilterListPanel.jsx
View File

@@ -1,6 +1,5 @@
import React from "react";
import Checkbox from "../atoms/Checkbox"; import Checkbox from "../atoms/Checkbox";
import marked from "marked"; import { marked } from "marked";
import { import {
aggregateFilterPaths, aggregateFilterPaths,
getFilterIdxFromColorSet, getFilterIdxFromColorSet,
@@ -10,8 +9,6 @@ import {
/** recursively get an array of node keys to toggle */ /** recursively get an array of node keys to toggle */
function getFiltersToToggle(filter, activeFilters) { function getFiltersToToggle(filter, activeFilters) {
const [key, children] = filter; const [key, children] = filter;
// base case: no children to recurse through
if (children === {}) return [key];
const turningOff = activeFilters.includes(key); const turningOff = activeFilters.includes(key);
const childKeys = Object.entries(children) const childKeys = Object.entries(children)

4
src/components/controls/FullScreenToggle.js → src/components/controls/FullScreenToggle.jsx
View File

@@ -1,9 +1,9 @@
import React from "react"; import { Component } from "react";
import screenfull from "screenfull"; import screenfull from "screenfull";
import { ToolbarButton } from "./atoms/ToolbarButton"; import { ToolbarButton } from "./atoms/ToolbarButton";
import copy from "../../common/data/copy.json"; import copy from "../../common/data/copy.json";
export class FullscreenToggle extends React.Component { export class FullscreenToggle extends Component {
constructor(props) { constructor(props) {
super(props); super(props);

1
src/components/controls/NarrativeControls.js → src/components/controls/NarrativeControls.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import Card from "./atoms/NarrativeCard"; import Card from "./atoms/NarrativeCard";
import Adjust from "./atoms/NarrativeAdjust"; import Adjust from "./atoms/NarrativeAdjust";
import Close from "./atoms/NarrativeClose"; import Close from "./atoms/NarrativeClose";

4
src/components/controls/Search.js → src/components/controls/Search.jsx
View File

@@ -1,4 +1,4 @@
import React from "react"; import { Component } from "react";
import { bindActionCreators } from "redux"; import { bindActionCreators } from "redux";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -6,7 +6,7 @@ import * as actions from "../../actions";
import SearchRow from "./atoms/SearchRow.jsx"; import SearchRow from "./atoms/SearchRow.jsx";
class Search extends React.Component { class Search extends Component {
constructor(props) { constructor(props) {
super(props); super(props);

3
src/components/controls/ShapesListPanel.js → src/components/controls/ShapesListPanel.jsx
View File

@@ -1,5 +1,4 @@
import React from "react"; import { marked } from "marked";
import marked from "marked";
import PanelTree from "./atoms/PanelTree"; import PanelTree from "./atoms/PanelTree";
import { mapStyleByShape } from "../../common/utilities"; import { mapStyleByShape } from "../../common/utilities";
import { SHAPE } from "../../common/constants"; import { SHAPE } from "../../common/constants";

1
src/components/controls/atoms/Button.js → src/components/controls/atoms/Button.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
/** /**

2
src/components/controls/atoms/Caret.js → src/components/controls/atoms/Caret.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const CardCaret = ({ isOpen, toggle }) => { const CardCaret = ({ isOpen, toggle }) => {
let classes = isOpen ? "arrow-down" : "arrow-down folded"; let classes = isOpen ? "arrow-down" : "arrow-down folded";

3
src/components/controls/atoms/CustomField.js → src/components/controls/atoms/CustomField.jsx
View File

@@ -1,5 +1,4 @@
import React from "react"; import { marked } from "marked";
import marked from "marked";
// TODO could this be a security vulnerability? // TODO could this be a security vulnerability?
const CardCustomField = ({ title, value }) => ( const CardCustomField = ({ title, value }) => (

2
src/components/controls/atoms/Media.js → src/components/controls/atoms/Media.jsx
View File

@@ -1,4 +1,4 @@
import React, { useRef } from "react"; import { useRef } from "react";
import { useCallback } from "react"; import { useCallback } from "react";
import { typeForPath } from "../../../common/utilities"; import { typeForPath } from "../../../common/utilities";
import { TwitterTweetEmbed } from "react-twitter-embed"; import { TwitterTweetEmbed } from "react-twitter-embed";

2
src/components/controls/atoms/NarrativeAdjust.js → src/components/controls/atoms/NarrativeAdjust.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const Adjust = ({ isDisabled, direction, onClickHandler }) => { const Adjust = ({ isDisabled, direction, onClickHandler }) => {
return ( return (
<div <div

1
src/components/controls/atoms/NarrativeCard.js → src/components/controls/atoms/NarrativeCard.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { selectActiveNarrative } from "../../../selectors"; import { selectActiveNarrative } from "../../../selectors";

2
src/components/controls/atoms/NarrativeClose.js → src/components/controls/atoms/NarrativeClose.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const Close = ({ onClickHandler, closeMsg }) => { const Close = ({ onClickHandler, closeMsg }) => {
return ( return (
<div className="narrative-close" onClick={onClickHandler}> <div className="narrative-close" onClick={onClickHandler}>

1
src/components/controls/atoms/PanelTree.js → src/components/controls/atoms/PanelTree.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import Checkbox from "../../atoms/Checkbox"; import Checkbox from "../../atoms/Checkbox";
import { ASSOCIATION_MODES } from "../../../common/constants"; import { ASSOCIATION_MODES } from "../../../common/constants";

2
src/components/controls/atoms/SearchRow.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const SearchRow = ({ query, eventObj, onSearchRowClick }) => { const SearchRow = ({ query, eventObj, onSearchRowClick }) => {
const { description, location, date } = eventObj; const { description, location, date } = eventObj;
function getHighlightedText(text, highlight) { function getHighlightedText(text, highlight) {

2
src/components/controls/atoms/TelegramEmbed.js → src/components/controls/atoms/TelegramEmbed.jsx
View File

@@ -1,7 +1,7 @@
/* /*
* Adapted from https://github.com/cudr/react-telegram-embed * Adapted from https://github.com/cudr/react-telegram-embed
*/ */
import React, { Component } from "react"; import { Component } from "react";
const styles = { const styles = {
width: "100%", width: "100%",

2
src/components/controls/atoms/Text.js → src/components/controls/atoms/Text.jsx
View File

@@ -1,4 +1,4 @@
import React, { useState } from "react"; import { useState } from "react";
const CardText = ({ title, value, hoverValue = null }) => { const CardText = ({ title, value, hoverValue = null }) => {
const [showHover, setShowHover] = useState(false); const [showHover, setShowHover] = useState(false);

2
src/components/controls/atoms/Time.js → src/components/controls/atoms/Time.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
import copy from "../../../common/data/copy.json"; import copy from "../../../common/data/copy.json";
import { isNotNullNorUndefined } from "../../../common/utilities"; import { isNotNullNorUndefined } from "../../../common/utilities";

0
src/components/controls/atoms/ToolbarButton.js → src/components/controls/atoms/ToolbarButton.jsx
View File

1
src/components/space/Space.js → src/components/space/Space.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import MapCarto from "./carto/Map"; import MapCarto from "./carto/Map";
// import Map3d from "./3d/Map"; // import Map3d from "./3d/Map";

22
src/components/space/carto/Map.js → src/components/space/carto/Map.jsx
View File

@@ -1,12 +1,13 @@
/* global L */ /* global L */
import { bindActionCreators } from "redux"; import { bindActionCreators } from "redux";
import "leaflet"; import "leaflet";
import React from "react"; import { createRef, Component } from "react";
import { flushSync } from "react-dom"; import { flushSync } from "react-dom";
import Supercluster from "supercluster"; import Supercluster from "supercluster";
import { isMobileOnly } from "react-device-detect"; import { isMobileOnly } from "react-device-detect";
import { connect } from "react-redux"; import { connect } from "react-redux";
import config from "../../../../config";
import * as actions from "../../../actions"; import * as actions from "../../../actions";
import * as selectors from "../../../selectors"; import * as selectors from "../../../selectors";
@@ -35,14 +36,14 @@ import {
const supportedMapboxMap = ["streets", "satellite"]; const supportedMapboxMap = ["streets", "satellite"];
const defaultToken = "your_token"; const defaultToken = "your_token";
class Map extends React.Component { class Map extends Component {
constructor() { constructor() {
super(); super();
this.projectPoint = this.projectPoint.bind(this); this.projectPoint = this.projectPoint.bind(this);
this.onClusterSelect = this.onClusterSelect.bind(this); this.onClusterSelect = this.onClusterSelect.bind(this);
this.loadClusterData = this.loadClusterData.bind(this); this.loadClusterData = this.loadClusterData.bind(this);
this.getClusterChildren = this.getClusterChildren.bind(this); this.getClusterChildren = this.getClusterChildren.bind(this);
this.svgRef = React.createRef(); this.svgRef = createRef();
this.map = null; this.map = null;
this.superclusterIndex = null; this.superclusterIndex = null;
this.tileLayer = null; this.tileLayer = null;
@@ -108,16 +109,13 @@ class Map extends React.Component {
getTileUrl(tile) { getTileUrl(tile) {
if ( if (
supportedMapboxMap.indexOf(this.props.ui.tiles) !== -1 && supportedMapboxMap.indexOf(this.props.ui.tiles) !== -1 &&
process.env.MAPBOX_TOKEN && config.MAPBOX_TOKEN &&
process.env.MAPBOX_TOKEN !== defaultToken config.MAPBOX_TOKEN !== defaultToken
) { ) {
return `http://a.tiles.mapbox.com/v4/mapbox.${tile}/{z}/{x}/{y}@2x.png?access_token=${process.env.MAPBOX_TOKEN}`; return `http://a.tiles.mapbox.com/v4/mapbox.${tile}/{z}/{x}/{y}@2x.png?access_token=${config.MAPBOX_TOKEN}`;
} else if ( } else if (config.MAPBOX_TOKEN && config.MAPBOX_TOKEN !== defaultToken) {
process.env.MAPBOX_TOKEN && return `https://api.mapbox.com/styles/v1/${tile}/tiles/256/{z}/{x}/{y}@2x?access_token=${config.MAPBOX_TOKEN}`;
process.env.MAPBOX_TOKEN !== defaultToken // `http://a.tiles.mapbox.com/styles/v1/${this.props.ui.tiles}/tiles/{z}/{x}/{y}?access_token=${config.MAPBOX_TOKEN}`
) {
return `https://api.mapbox.com/styles/v1/${tile}/tiles/256/{z}/{x}/{y}@2x?access_token=${process.env.MAPBOX_TOKEN}`;
// `http://a.tiles.mapbox.com/styles/v1/${this.props.ui.tiles}/tiles/{z}/{x}/{y}?access_token=${process.env.MAPBOX_TOKEN}`
} else { } else {
return "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"; return "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
// "https://api.maptiler.com/maps/bright/256/{z}/{x}/{y}.png?key=" // "https://api.maptiler.com/maps/bright/256/{z}/{x}/{y}.png?key="

6
src/components/space/carto/atoms/Clusters.js → src/components/space/carto/atoms/Clusters.jsx
View File

@@ -1,4 +1,4 @@
import React, { useState } from "react"; import { useState } from "react";
import colors from "../../../../common/global"; import colors from "../../../../common/global";
import ColoredMarkers from "../../../atoms/ColoredMarkers"; import ColoredMarkers from "../../../atoms/ColoredMarkers";
import Portal from "../../../Portal"; import Portal from "../../../Portal";
@@ -15,8 +15,8 @@ import {
const DefsClusters = () => ( const DefsClusters = () => (
<defs> <defs>
<radialGradient id="clusterGradient"> <radialGradient id="clusterGradient">
<stop offset="10%" stop-color="red" /> <stop offset="10%" stopColor="red" />
<stop offset="90%" stop-color="transparent" /> <stop offset="90%" stopColor="transparent" />
</radialGradient> </radialGradient>
</defs> </defs>
); );

2
src/components/space/carto/atoms/DefsMarkers.js → src/components/space/carto/atoms/DefsMarkers.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const MapDefsMarkers = () => ( const MapDefsMarkers = () => (
<svg> <svg>
<defs> <defs>

1
src/components/space/carto/atoms/Events.js → src/components/space/carto/atoms/Events.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import colors from "../../../../common/global"; import colors from "../../../../common/global";
import ColoredMarkers from "../../../atoms/ColoredMarkers"; import ColoredMarkers from "../../../atoms/ColoredMarkers";
import Portal from "../../../Portal"; import Portal from "../../../Portal";

1
src/components/space/carto/atoms/Narratives.js → src/components/space/carto/atoms/Narratives.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import Portal from "../../../Portal"; import Portal from "../../../Portal";
// import { concatStatic } from 'rxjs/operator/concat' // import { concatStatic } from 'rxjs/operator/concat'
// import { single } from 'rxjs/operator/single' // import { single } from 'rxjs/operator/single'

1
src/components/space/carto/atoms/Regions.js → src/components/space/carto/atoms/Regions.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import Portal from "../../../Portal"; import Portal from "../../../Portal";
function MapRegions({ svg, regions, projectPoint, styles }) { function MapRegions({ svg, regions, projectPoint, styles }) {

2
src/components/space/carto/atoms/SatelliteOverlayToggle.js → src/components/space/carto/atoms/SatelliteOverlayToggle.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import copy from "../../../../common/data/copy.json"; import copy from "../../../../common/data/copy.json";
import { language } from "../../../../common/utilities"; import { language } from "../../../../common/utilities";
import mapImg from "../../../../assets/satelliteoverlaytoggle/map.png"; import mapImg from "../../../../assets/satelliteoverlaytoggle/map.png";
@@ -17,6 +16,7 @@ const SatelliteOverlayToggle = ({ isUsingSatellite, toggleSatellite }) => {
<button <button
className={`satellite-overlay-toggle-button ${toggleClass}`} className={`satellite-overlay-toggle-button ${toggleClass}`}
style={{ backgroundImage: `url(${toggleImg}` }} style={{ backgroundImage: `url(${toggleImg}` }}
name="satellite-toggle"
onClick={toggleSatellite} onClick={toggleSatellite}
> >
<div className="label">{toggleLabel}</div> <div className="label">{toggleLabel}</div>

4
src/components/space/carto/atoms/SelectedEvents.js → src/components/space/carto/atoms/SelectedEvents.jsx
View File

@@ -1,9 +1,9 @@
import React from "react"; import { Component } from "react";
import colors from "../../../../common/global"; import colors from "../../../../common/global";
import hash from "object-hash"; import hash from "object-hash";
import Portal from "../../../Portal"; import Portal from "../../../Portal";
class MapSelectedEvents extends React.Component { class MapSelectedEvents extends Component {
renderMarker(marker) { renderMarker(marker) {
const { x, y } = this.props.projectPoint([ const { x, y } = this.props.projectPoint([
marker.latitude, marker.latitude,

2
src/components/space/carto/atoms/Sites.js → src/components/space/carto/atoms/Sites.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
function MapSites({ sites, projectPoint }) { function MapSites({ sites, projectPoint }) {
function renderSite(site) { function renderSite(site) {
const { x, y } = projectPoint([site.latitude, site.longitude]); const { x, y } = projectPoint([site.latitude, site.longitude]);

28
src/components/space/carto/atoms/__tests__/SatelliteOverlayToggle.spec.js → src/components/space/carto/atoms/__tests__/SatelliteOverlayToggle.spec.jsx
View File

@@ -1,4 +1,4 @@
import React from "react"; import { vi } from "vitest";
import { fireEvent, render, screen } from "@testing-library/react"; import { fireEvent, render, screen } from "@testing-library/react";
import SatelliteOverlayToggle from "../SatelliteOverlayToggle"; import SatelliteOverlayToggle from "../SatelliteOverlayToggle";
import "@testing-library/jest-dom"; import "@testing-library/jest-dom";
@@ -6,7 +6,7 @@ import "@testing-library/jest-dom";
describe("<SatelliteOverlayToggle />", () => { describe("<SatelliteOverlayToggle />", () => {
it("shows the option to switch to satellite by default", () => { it("shows the option to switch to satellite by default", () => {
render( render(
<SatelliteOverlayToggle reset={jest.fn()} switchToSatellite={jest.fn()} /> <SatelliteOverlayToggle reset={vi.fn()} switchToSatellite={vi.fn()} />
); );
expect(screen.getByRole("button", { name: /sat/i })).toBeTruthy(); expect(screen.getByRole("button", { name: /sat/i })).toBeTruthy();
}); });
@@ -15,38 +15,28 @@ describe("<SatelliteOverlayToggle />", () => {
render( render(
<SatelliteOverlayToggle <SatelliteOverlayToggle
isUsingSatellite isUsingSatellite
reset={jest.fn()} reset={vi.fn()}
switchToSatellite={jest.fn()} switchToSatellite={vi.fn()}
/> />
); );
expect(screen.getByRole("button", { name: /map/i })).toBeTruthy(); expect(screen.getByRole("button", { name: /map/i })).toBeTruthy();
}); });
it("calls the reset function when switching to the default overlay", () => { it("calls the reset function when switching to the default overlay", () => {
const mockReset = jest.fn(); const mockSat = vi.fn();
const mockSat = jest.fn();
render( render(
<SatelliteOverlayToggle <SatelliteOverlayToggle isUsingSatellite toggleSatellite={mockSat} />
isUsingSatellite
reset={mockReset}
switchToSatellite={mockSat}
/>
); );
const btn = screen.getByRole("button", { name: /map/i }); const btn = screen.getByRole("button", { name: /map/i });
fireEvent.click(btn); fireEvent.click(btn);
expect(mockReset).toHaveBeenCalledTimes(1); expect(mockSat).toHaveBeenCalledTimes(1);
expect(mockSat).not.toHaveBeenCalled();
}); });
it("calls the switchToSatellite function when switching to the satellite overlay", () => { it("calls the switchToSatellite function when switching to the satellite overlay", () => {
const mockReset = jest.fn(); const mockSat = vi.fn();
const mockSat = jest.fn(); render(<SatelliteOverlayToggle toggleSatellite={mockSat} />);
render(
<SatelliteOverlayToggle reset={mockReset} switchToSatellite={mockSat} />
);
const btn = screen.getByRole("button", { name: /sat/i }); const btn = screen.getByRole("button", { name: /sat/i });
fireEvent.click(btn); fireEvent.click(btn);
expect(mockSat).toHaveBeenCalledTimes(1); expect(mockSat).toHaveBeenCalledTimes(1);
expect(mockReset).not.toHaveBeenCalled();
}); });
}); });

8
src/components/time/Axis.js → src/components/time/Axis.jsx
View File

@@ -1,14 +1,14 @@
import React from "react"; import { createRef, Component } from "react";
import { axisBottom, timeFormat, select } from "d3"; import { axisBottom, timeFormat, select } from "d3";
import { setD3Locale } from "../../common/utilities"; import { setD3Locale } from "../../common/utilities";
const TEXT_HEIGHT = 15; const TEXT_HEIGHT = 15;
setD3Locale(); setD3Locale();
class TimelineAxis extends React.Component { class TimelineAxis extends Component {
constructor() { constructor() {
super(); super();
this.xAxis0Ref = React.createRef(); this.xAxis0Ref = createRef();
this.xAxis1Ref = React.createRef(); this.xAxis1Ref = createRef();
this.state = { this.state = {
isInitialized: false, isInitialized: false,
}; };

6
src/components/time/Categories.js → src/components/time/Categories.jsx
View File

@@ -1,10 +1,10 @@
import React from "react"; import { createRef, Component } from "react";
import { drag as d3Drag, select } from "d3"; import { drag as d3Drag, select } from "d3";
class TimelineCategories extends React.Component { class TimelineCategories extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.grabRef = React.createRef(); this.grabRef = createRef();
this.state = { this.state = {
isInitialized: false, isInitialized: false,
}; };

14
src/components/time/Timeline.js → src/components/time/Timeline.jsx
View File

@@ -1,4 +1,4 @@
import React from "react"; import { createRef, Component } from "react";
import { bindActionCreators } from "redux"; import { bindActionCreators } from "redux";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { scaleTime, timeMinute, timeSecond } from "d3"; import { scaleTime, timeMinute, timeSecond } from "d3";
@@ -11,13 +11,13 @@ import copy from "../../common/data/copy.json";
import Header from "./atoms/Header"; import Header from "./atoms/Header";
import Axis from "./Axis"; import Axis from "./Axis";
import Clip from "./atoms/Clip"; import Clip from "./atoms/Clip";
import Handles from "./atoms/Handles.js"; import Handles from "./atoms/Handles";
import ZoomControls from "./atoms/ZoomControls.js"; import ZoomControls from "./atoms/ZoomControls";
import Markers from "./atoms/Markers.js"; import Markers from "./atoms/Markers";
import Events from "./atoms/Events.js"; import Events from "./atoms/Events";
import Categories from "./Categories"; import Categories from "./Categories";
class Timeline extends React.Component { class Timeline extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
let searchParams = new URLSearchParams(window.location.href.split("?")[1]); let searchParams = new URLSearchParams(window.location.href.split("?")[1]);
@@ -29,7 +29,7 @@ class Timeline extends React.Component {
this.onDragStart = this.onDragStart.bind(this); this.onDragStart = this.onDragStart.bind(this);
this.onDrag = this.onDrag.bind(this); this.onDrag = this.onDrag.bind(this);
this.onDragEnd = this.onDragEnd.bind(this); this.onDragEnd = this.onDragEnd.bind(this);
this.svgRef = React.createRef(); this.svgRef = createRef();
this.state = { this.state = {
isFolded: isFolded:
searchParams.has("timeline") && searchParams.has("timeline") &&

2
src/components/time/atoms/Clip.js → src/components/time/atoms/Clip.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const TimelineClip = ({ dims }) => ( const TimelineClip = ({ dims }) => (
<clipPath id="clip"> <clipPath id="clip">
<rect <rect

2
src/components/time/atoms/DatetimeBar.js → src/components/time/atoms/DatetimeBar.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const DatetimeBar = ({ const DatetimeBar = ({
highlights, highlights,
events, events,

2
src/components/time/atoms/DatetimeDot.js → src/components/time/atoms/DatetimeDot.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
export default ({ export default ({
category, category,
events, events,

2
src/components/time/atoms/DatetimePentagon.js → src/components/time/atoms/DatetimePentagon.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const DatetimePentagon = ({ x, y, r, transform, onSelect, styleProps }) => { const DatetimePentagon = ({ x, y, r, transform, onSelect, styleProps }) => {
const s = (r * 2) / 3; const s = (r * 2) / 3;
return ( return (

2
src/components/time/atoms/DatetimeSquare.js → src/components/time/atoms/DatetimeSquare.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const DatetimeSquare = ({ const DatetimeSquare = ({
x, x,
y, y,

2
src/components/time/atoms/DatetimeStar.js → src/components/time/atoms/DatetimeStar.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const DatetimeStar = ({ const DatetimeStar = ({
x, x,
y, y,

2
src/components/time/atoms/DatetimeTriangle.js → src/components/time/atoms/DatetimeTriangle.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const DatetimeTriangle = ({ x, y, r, transform, onSelect, styleProps }) => { const DatetimeTriangle = ({ x, y, r, transform, onSelect, styleProps }) => {
const s = (r * 2) / 3; const s = (r * 2) / 3;
return ( return (

1
src/components/time/atoms/Events.js → src/components/time/atoms/Events.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import DatetimeBar from "./DatetimeBar"; import DatetimeBar from "./DatetimeBar";
import DatetimeSquare from "./DatetimeSquare"; import DatetimeSquare from "./DatetimeSquare";
import DatetimeStar from "./DatetimeStar"; import DatetimeStar from "./DatetimeStar";

2
src/components/time/atoms/Handles.js → src/components/time/atoms/Handles.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const TimelineHandles = ({ dims, onMoveTime, backward }) => { const TimelineHandles = ({ dims, onMoveTime, backward }) => {
if (backward === true) { if (backward === true) {
return ( return (

1
src/components/time/atoms/Header.js → src/components/time/atoms/Header.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import { makeNiceDate } from "../../../common/utilities"; import { makeNiceDate } from "../../../common/utilities";
const TimelineHeader = ({ title, from, to, onClick, hideInfo }) => { const TimelineHeader = ({ title, from, to, onClick, hideInfo }) => {

2
src/components/time/atoms/Labels.js → src/components/time/atoms/Labels.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const TimelineLabels = ({ dims, timelabels }) => { const TimelineLabels = ({ dims, timelabels }) => {
return ( return (
<g> <g>

1
src/components/time/atoms/Markers.js → src/components/time/atoms/Markers.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import colors from "../../../common/global"; import colors from "../../../common/global";
import hash from "object-hash"; import hash from "object-hash";
import { import {

2
src/components/time/atoms/Project.js → src/components/time/atoms/Project.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const Project = ({ const Project = ({
offset, offset,
id, id,

2
src/components/time/atoms/ZoomControls.js → src/components/time/atoms/ZoomControls.jsx
View File

@@ -1,5 +1,3 @@
import React from "react";
const DEFAULT_ZOOM_LEVELS = [ const DEFAULT_ZOOM_LEVELS = [
{ label: "20 years", duration: 10512000 }, { label: "20 years", duration: 10512000 },
{ label: "2 years", duration: 1051200 }, { label: "2 years", duration: 1051200 },

1
src/index.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import ReactDOM from "react-dom/client"; import ReactDOM from "react-dom/client";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
import store from "./store"; import store from "./store";

2
src/reducers/__tests__/index.spec.js
View File

@@ -1,5 +1,5 @@
import { updateTimeRange } from "../../actions"; import { updateTimeRange } from "../../actions";
import initial from "../../store/initial.js"; import initial from "../../store/initial";
import reduce from "../app"; import reduce from "../app";
describe("app reducer", () => { describe("app reducer", () => {

Some files were not shown because too many files have changed in this diff Show More