From 2795bf050e7ae8e9a7621fc923c6626dff3ca20c Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Thu, 24 Mar 2022 21:27:33 +0100 Subject: [PATCH 1/6] Dejected project back to react-scripts, where posible --- .eslintrc | 2 +- babel.config.js | 4 - config/env.js | 101 - config/paths.js | 89 - config/webpack.config.js | 674 - config/webpackDevServer.config.js | 116 - package-lock.json | 25988 +++++++++--------------- package.json | 49 +- scripts/build.js | 182 - scripts/start.js | 125 - scripts/test.js | 4 - src/index.tsx | 4 +- src/servers/reducers/remoteServers.ts | 4 +- 13 files changed, 9864 insertions(+), 17478 deletions(-) delete mode 100644 config/env.js delete mode 100644 config/paths.js delete mode 100644 config/webpack.config.js delete mode 100644 config/webpackDevServer.config.js delete mode 100644 scripts/build.js delete mode 100644 scripts/start.js diff --git a/.eslintrc b/.eslintrc index 20632049..d3b1d6b0 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,6 +1,6 @@ { "extends": [ - "@shlinkio/js-coding-standard" + "react-app" ], "plugins": ["jest"], "env": { diff --git a/babel.config.js b/babel.config.js index f70a10e6..35f2625c 100644 --- a/babel.config.js +++ b/babel.config.js @@ -8,8 +8,4 @@ module.exports = { }, ], ], - plugins: [ - '@babel/plugin-proposal-optional-chaining', - '@babel/plugin-proposal-nullish-coalescing-operator', - ], }; diff --git a/config/env.js b/config/env.js deleted file mode 100644 index c4ca2b01..00000000 --- a/config/env.js +++ /dev/null @@ -1,101 +0,0 @@ -/* eslint-disable @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/promise-function-async, @typescript-eslint/prefer-optional-chain */ - -const fs = require('fs'); -const path = require('path'); -const paths = require('./paths'); - -// Make sure that including paths.js after env.js will read .env variables. -delete require.cache[require.resolve('./paths')]; - -const { NODE_ENV } = process.env; - -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`, - `${paths.dotenv}.${NODE_ENV}`, - - // 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, -].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, . - // 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, - }, - ); - - // Stringify all values so we can feed into Webpack DefinePlugin - const stringified = { - 'process.env': Object.keys(raw).reduce((env, key) => { - env[key] = JSON.stringify(raw[key]); - - return env; - }, {}), - }; - - return { raw, stringified }; -} - -module.exports = getClientEnvironment; diff --git a/config/paths.js b/config/paths.js deleted file mode 100644 index 3dca2282..00000000 --- a/config/paths.js +++ /dev/null @@ -1,89 +0,0 @@ -/* eslint-disable @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/promise-function-async, @typescript-eslint/prefer-optional-chain */ - -const path = require('path'); -const fs = require('fs'); -const url = require('url'); - -// 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); - -const envPublicUrl = process.env.PUBLIC_URL; - -function ensureSlash(inputPath, needsSlash) { - const hasSlash = inputPath.endsWith('/'); - - if (hasSlash && !needsSlash) { - return inputPath.substr(0, inputPath.length - 1); - } else if (!hasSlash && needsSlash) { - return `${inputPath}/`; - } - - return inputPath; -} - -const getPublicUrl = (appPackageJson) => - envPublicUrl || require(appPackageJson).homepage; - -// 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