refactor: code format

agalwood · agalwood · commit 1f033d1e4718 · 2023-05-06T18:16:05.000+08:00
diff --git a/.electron-vue/dev-runner.js b/.electron-vue/dev-runner.js
@@ -1,10 +1,10 @@
 'use strict'
 
-const chalk = require('chalk')
-const electron = require('electron')
-const path = require('path')
+const path = require('node:path')
+const { spawn } = require('node:child_process')
 const { say } = require('cfonts')
-const { spawn } = require('child_process')
+const electron = require('electron')
+const chalk = require('chalk')
 const Webpack = require('webpack')
 const WebpackDevServer = require('webpack-dev-server')
 
diff --git a/.electron-vue/webpack.main.config.js b/.electron-vue/webpack.main.config.js
@@ -2,13 +2,13 @@
 
 process.env.BABEL_ENV = 'main'
 
-const devMode = process.env.NODE_ENV !== 'production'
-const path = require('path')
+const path = require('node:path')
+const Webpack = require('webpack')
+const ESLintPlugin = require('eslint-webpack-plugin')
+const TerserPlugin = require('terser-webpack-plugin')
 const { dependencies } = require('../package.json')
 const { appId } = require('../electron-builder.json')
-const Webpack = require('webpack')
-const TerserPlugin = require('terser-webpack-plugin');
-const ESLintPlugin = require('eslint-webpack-plugin');
+const devMode = process.env.NODE_ENV !== 'production'
 
 let mainConfig = {
   entry: {
diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js
@@ -2,17 +2,17 @@
 
 process.env.BABEL_ENV = 'renderer'
 
-const devMode = process.env.NODE_ENV !== 'production'
-const path = require('path')
-const { dependencies } = require('../package.json')
+const path = require('node:path')
 const Webpack = require('webpack')
-const TerserPlugin = require('terser-webpack-plugin');
+const { VueLoaderPlugin } = require('vue-loader')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
-const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
+const ESLintPlugin = require('eslint-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
-const { VueLoaderPlugin } = require('vue-loader')
-const ESLintPlugin = require('eslint-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin')
+const TerserPlugin = require('terser-webpack-plugin')
+const { dependencies } = require('../package.json')
+const devMode = process.env.NODE_ENV !== 'production'
 
 /**
  * List of node_modules to include in webpack bundle
diff --git a/.electron-vue/webpack.web.config.js b/.electron-vue/webpack.web.config.js
@@ -2,17 +2,17 @@
 
 process.env.BABEL_ENV = 'web'
 
-const devMode = process.env.NODE_ENV !== 'production'
-const path = require('path')
+const path = require('node:path')
 const { dependencies } = require('../package.json')
 const Webpack = require('webpack')
-const TerserPlugin = require('terser-webpack-plugin');
+const { VueLoaderPlugin } = require('vue-loader')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
-const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
+const ESLintPlugin = require('eslint-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
-const { VueLoaderPlugin } = require('vue-loader')
-const ESLintPlugin = require('eslint-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin')
+const TerserPlugin = require('terser-webpack-plugin')
+const devMode = process.env.NODE_ENV !== 'production'
 
 /**
  * List of node_modules to include in webpack bundle
@@ -48,7 +48,7 @@ let webConfig = {
             loader: 'sass-loader',
             options: {
               implementation: require('sass'),
-              additionalData: '@import "@/components/Theme/Variables.scss";',
+              additionalData: '@import "@/components/Theme/Variables.scss"',
               sassOptions: {
                 includePaths:[__dirname, 'src']
               }
@@ -66,7 +66,7 @@ let webConfig = {
             options: {
               implementation: require('sass'),
               indentedSyntax: true,
-              additionalData: '@import "@/components/Theme/Variables.scss";',
+              additionalData: '@import "@/components/Theme/Variables.scss"',
               sassOptions: {
                 includePaths:[__dirname, 'src']
               }
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -18,17 +18,17 @@ module.exports = {
   rules: {
     'no-console': 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'indent': ['error', 2],
+    indent: ['error', 2],
     'vue/script-indent': ['error', 2, {
-      'baseIndent': 1
-    }],
+      baseIndent: 1
+    }]
   },
   overrides: [
     {
-      'files': ['*.vue'],
-      'rules': {
-        'indent': 'off'
+      files: ['*.vue'],
+      rules: {
+        indent: 'off'
       }
     }
   ]
-};
+}
diff --git a/build/afterPackHook.js b/build/afterPackHook.js
@@ -29,9 +29,9 @@
 // TODO: Remove script once https://github.com/electron/electron/issues/17972 is solved by
 // `electron-builder`
 
-const fs = require('fs')
-const { spawn } = require('child_process')
-const { chdir } = require('process')
+const fs = require('node:fs')
+const { spawn } = require('node:child_process')
+const { chdir } = require('node:process')
 
 const pkg = require('../package.json')
 const binName = `${pkg.name}`.toLowerCase()
diff --git a/build/afterSignHook.js b/build/afterSignHook.js
@@ -1,5 +1,5 @@
 require('dotenv').config()
-const { join } = require('path')
+const { join } = require('node:path')
 const { notarize } = require('@electron/notarize')
 const { appId } = require('../electron-builder.json')
 
diff --git a/src/main/Launcher.js b/src/main/Launcher.js
@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events'
+import { EventEmitter } from 'node:events'
 import { app } from 'electron'
 import is from 'electron-is'
 
diff --git a/src/main/core/Engine.js b/src/main/core/Engine.js
@@ -1,6 +1,6 @@
+import { spawn } from 'node:child_process'
+import { existsSync, writeFile, unlink } from 'node:fs'
 import is from 'electron-is'
-import { existsSync, writeFile, unlink } from 'fs'
-import { spawn } from 'child_process'
 
 import logger from './Logger'
 import { getI18n } from '../ui/Locale'
diff --git a/src/main/core/ProtocolManager.js b/src/main/core/ProtocolManager.js
@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events'
+import { EventEmitter } from 'node:events'
 import { app } from 'electron'
 import is from 'electron-is'
 import { parse } from 'querystring'
diff --git a/src/main/core/UpdateManager.js b/src/main/core/UpdateManager.js
@@ -1,5 +1,5 @@
-import { EventEmitter } from 'events'
-import { resolve } from 'path'
+import { EventEmitter } from 'node:events'
+import { resolve } from 'node:path'
 import { dialog } from 'electron'
 import is from 'electron-is'
 import { autoUpdater } from 'electron-updater'
diff --git a/src/main/ui/DockManager.js b/src/main/ui/DockManager.js
@@ -1,5 +1,5 @@
 import is from 'electron-is'
-import { EventEmitter } from 'events'
+import { EventEmitter } from 'node:events'
 import { app } from 'electron'
 
 import { bytesToSize } from '@shared/utils'
diff --git a/src/main/ui/MenuManager.js b/src/main/ui/MenuManager.js
@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events'
+import { EventEmitter } from 'node:events'
 import { Menu } from 'electron'
 
 import keymap from '@shared/keymap'
diff --git a/src/main/ui/ThemeManager.js b/src/main/ui/ThemeManager.js
@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events'
+import { EventEmitter } from 'node:events'
 import { nativeTheme } from 'electron'
 
 import { APP_THEME } from '@shared/constants'
diff --git a/src/main/ui/TouchBarManager.js b/src/main/ui/TouchBarManager.js
@@ -1,5 +1,5 @@
-import { EventEmitter } from 'events'
-import { join } from 'path'
+import { EventEmitter } from 'node:events'
+import { join } from 'node:path'
 import { TouchBar, nativeImage } from 'electron'
 
 import { handleCommand } from '../utils/menu'
diff --git a/src/main/ui/TrayManager.js b/src/main/ui/TrayManager.js
@@ -1,5 +1,5 @@
-import { EventEmitter } from 'events'
-import { join } from 'path'
+import { EventEmitter } from 'node:events'
+import { join } from 'node:path'
 import { Tray, Menu, nativeImage } from 'electron'
 import is from 'electron-is'
 
diff --git a/src/main/ui/WindowManager.js b/src/main/ui/WindowManager.js
@@ -1,5 +1,5 @@
-import { join } from 'path'
-import { EventEmitter } from 'events'
+import { join } from 'node:path'
+import { EventEmitter } from 'node:events'
 import { debounce } from 'lodash'
 import { app, shell, screen, BrowserWindow } from 'electron'
 import is from 'electron-is'
diff --git a/src/renderer/components/CommandManager/index.js b/src/renderer/components/CommandManager/index.js
@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events'
+import { EventEmitter } from 'node:events'
 
 export default class CommandManager extends EventEmitter {
   constructor () {
diff --git a/src/renderer/utils/native.js b/src/renderer/utils/native.js
@@ -1,6 +1,6 @@
 import { shell, nativeTheme } from '@electron/remote'
-import { access, constants } from 'fs'
-import { resolve } from 'path'
+import { access, constants } from 'node:fs'
+import { resolve } from 'node:path'
 import { Message } from 'element-ui'
 
 import {
@@ -16,7 +16,7 @@ export function showItemInFolder (fullPath, { errorMsg }) {
 
   access(fullPath, constants.F_OK, (err) => {
     console.log(`[Motrix] ${fullPath} ${err ? 'does not exist' : 'exists'}`)
-    if (err) {
+    if (err && errorMsg) {
       Message.error(errorMsg)
       return
     }
diff --git a/src/shared/aria2/lib/JSONRPCClient.js b/src/shared/aria2/lib/JSONRPCClient.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import { EventEmitter } from 'events'
+import { EventEmitter } from 'node:events'
 import _fetch from 'node-fetch'
 import _WebSocket from 'ws'
 import { JSONRPCError } from './JSONRPCError'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { EventEmitter } from 'events'`
	`1`	`+import { EventEmitter } from 'node:events'`
`2`	`2`	`import { app } from 'electron'`
`3`	`3`	`import is from 'electron-is'`
`4`	`4`