diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 0f41517..0000000
--- a/.babelrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "presets": [
- "react-app"
- ]
-}
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
index db7c402..74266ff 100644
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@@ -9,20 +9,24 @@ jobs:
- name: Checkout Dashboard code
uses: actions/checkout@v2
- name: Setup Nodejs
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v2
with:
node-version: '15.x'
+ - name: Get yarn cache directory path
+ id: yarn-cache-dir-path
+ run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Reuse Cache
uses: actions/cache@v2
+ id: yarn-cache
with:
- path: ~/.npm
- key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+ path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+ key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
- ${{ runner.os }}-node-
+ ${{ runner.os }}-yarn-
- name: Install package
run: |
- npm ci
- npm run build
+ yarn
+ yarn build
- name: Deploy
uses: crazy-max/ghaction-github-pages@v2
with:
diff --git a/README.md b/README.md
index b82705e..1368f18 100644
--- a/README.md
+++ b/README.md
@@ -42,13 +42,13 @@ defaults delete com.west2online.ClashX webviewUrl
This command will start Clash Dashboard at `http://localhost:8080/`
```bash
-npm start
+yarn start
```
### Build for production
```bash
-npm run build
+yarn build
```
## Contributors
diff --git a/config/env.js b/config/env.js
deleted file mode 100644
index baffec8..0000000
--- a/config/env.js
+++ /dev/null
@@ -1,104 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const paths = require('./paths');
-
-// Make sure that including paths.js after env.js will read .env variables.
-delete require.cache[require.resolve('./paths')];
-
-const NODE_ENV = process.env.NODE_ENV;
-if (!NODE_ENV) {
- throw new Error(
- 'The NODE_ENV environment variable is required but was not specified.'
- );
-}
-
-// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
-const dotenvFiles = [
- `${paths.dotenv}.${NODE_ENV}.local`,
- // Don't include `.env.local` for `test` environment
- // since normally you expect tests to produce the same
- // results for everyone
- NODE_ENV !== 'test' && `${paths.dotenv}.local`,
- `${paths.dotenv}.${NODE_ENV}`,
- paths.dotenv,
-].filter(Boolean);
-
-// Load environment variables from .env* files. Suppress warnings using silent
-// if this file is missing. dotenv will never modify any environment variables
-// that have already been set. Variable expansion is supported in .env files.
-// https://github.com/motdotla/dotenv
-// https://github.com/motdotla/dotenv-expand
-dotenvFiles.forEach(dotenvFile => {
- if (fs.existsSync(dotenvFile)) {
- require('dotenv-expand')(
- require('dotenv').config({
- path: dotenvFile,
- })
- );
- }
-});
-
-// We support resolving modules according to `NODE_PATH`.
-// This lets you use absolute paths in imports inside large monorepos:
-// https://github.com/facebook/create-react-app/issues/253.
-// It works similar to `NODE_PATH` in Node itself:
-// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
-// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
-// Otherwise, we risk importing Node.js core modules into an app instead of webpack shims.
-// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
-// We also resolve them to make sure all tools using them work consistently.
-const appDirectory = fs.realpathSync(process.cwd());
-process.env.NODE_PATH = (process.env.NODE_PATH || '')
- .split(path.delimiter)
- .filter(folder => folder && !path.isAbsolute(folder))
- .map(folder => path.resolve(appDirectory, folder))
- .join(path.delimiter);
-
-// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
-// injected into the application via DefinePlugin in webpack configuration.
-const REACT_APP = /^REACT_APP_/i;
-
-function getClientEnvironment(publicUrl) {
- const raw = Object.keys(process.env)
- .filter(key => REACT_APP.test(key))
- .reduce(
- (env, key) => {
- env[key] = process.env[key];
- return env;
- },
- {
- // Useful for determining whether we’re running in production mode.
- // Most importantly, it switches React into the correct mode.
- NODE_ENV: process.env.NODE_ENV || 'development',
- // Useful for resolving the correct path to static assets in `public`.
- // For example, 
.
- // 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;
- }, {}),
- };
-
- return { raw, stringified };
-}
-
-module.exports = getClientEnvironment;
diff --git a/config/getHttpsConfig.js b/config/getHttpsConfig.js
deleted file mode 100644
index d035cfe..0000000
--- a/config/getHttpsConfig.js
+++ /dev/null
@@ -1,64 +0,0 @@
-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;
diff --git a/config/modules.js b/config/modules.js
deleted file mode 100644
index ddbcc89..0000000
--- a/config/modules.js
+++ /dev/null
@@ -1,132 +0,0 @@
-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/(.*)$': '/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();
diff --git a/config/paths.js b/config/paths.js
deleted file mode 100644
index 8b30656..0000000
--- a/config/paths.js
+++ /dev/null
@@ -1,71 +0,0 @@
-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