Merge branch 'v2-dev' into fix/clippy-warnings

farm-fe · Feb 13, 2025 · c02f99f · c02f99f
2 parents dfd13bc + c18d0e5
commit c02f99f
Show file tree

Hide file tree

Showing 50 changed files with 0 additions and 144 deletions.
diff --git a/crates/compiler/tests/fixtures/tree_shake/self-executed/decl/var_side_effect/a.js b/crates/compiler/tests/fixtures/tree_shake/self-executed/decl/var_side_effect/a.js
@@ -1,4 +1,3 @@
-/* eslint-disable import/prefer-default-export */
 function invariant(condition, message) {
   if (condition) return;
   var error = new Error('loadable: ' + message);
@@ -7,7 +6,6 @@ function invariant(condition, message) {
   throw error;
 }
 function warn(message) {
-  // eslint-disable-next-line no-console
   console.warn('loadable: ' + message);
 }
 
@@ -461,14 +459,11 @@ function createLoadable(_ref) {
 }
 
 function defaultResolveComponent(loadedModule) {
-  // eslint-disable-next-line no-underscore-dangle
   return loadedModule.__esModule
     ? loadedModule['default']
     : loadedModule['default'] || loadedModule;
 }
 
-/* eslint-disable no-use-before-define, react/no-multi-comp */
-
 var _createLoadable =
     /*#__PURE__*/
     createLoadable({
@@ -482,8 +477,6 @@ var _createLoadable =
   loadable = _createLoadable.loadable,
   lazy = _createLoadable.lazy;
 
-/* eslint-disable no-use-before-define, react/no-multi-comp */
-
 var _createLoadable$1 =
     /*#__PURE__*/
     createLoadable({
@@ -510,7 +503,6 @@ var _createLoadable$1 =
   loadable$1 = _createLoadable$1.loadable,
   lazy$1 = _createLoadable$1.lazy;
 
-/* eslint-disable no-underscore-dangle, camelcase */
 var BROWSER = typeof window !== 'undefined';
 function loadableReady(done, _temp) {
   if (done === void 0) {
@@ -597,7 +589,6 @@ function loadableReady(done, _temp) {
   }).then(done);
 }
 
-/* eslint-disable no-underscore-dangle */
 var loadable$2 = loadable;
 loadable$2.lib = loadable$1;
 var lazy$2 = lazy;

diff --git a/crates/plugin_script/tests/fixtures/module_system/hybrid-no-import.ts b/crates/plugin_script/tests/fixtures/module_system/hybrid-no-import.ts
@@ -1,7 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 // const figlet = require('figlet')
 // import figlet from 'figlet'
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 export const PKG = require('../../../package.json')
 export const VITE_CLI_VERSION = PKG.version
 export const JZZX_NAME = PKG.name

diff --git a/crates/plugin_tree_shake/tests/fixtures/remove_useless_stmts/loadable.esm.js b/crates/plugin_tree_shake/tests/fixtures/remove_useless_stmts/loadable.esm.js
@@ -6,7 +6,6 @@ import _inheritsLoose from '@babel/runtime/helpers/esm/inheritsLoose';
 import { isValidElementType } from 'react-is';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 
-/* eslint-disable import/prefer-default-export */
 function invariant(condition, message) {
   if (condition) return;
   var error = new Error("loadable: " + message);
@@ -15,7 +14,6 @@ function invariant(condition, message) {
   throw error;
 }
 function warn(message) {
-  // eslint-disable-next-line no-console
   console.warn("loadable: " + message);
 }
 
@@ -428,12 +426,9 @@ function createLoadable(_ref) {
 }
 
 function defaultResolveComponent(loadedModule) {
-  // eslint-disable-next-line no-underscore-dangle
   return loadedModule.__esModule ? loadedModule["default"] : loadedModule["default"] || loadedModule;
 }
 
-/* eslint-disable no-use-before-define, react/no-multi-comp */
-
 var _createLoadable =
 /*#__PURE__*/
 createLoadable({
@@ -447,7 +442,6 @@ createLoadable({
     loadable = _createLoadable.loadable,
     lazy = _createLoadable.lazy;
 
-/* eslint-disable no-use-before-define, react/no-multi-comp */
 
 var _createLoadable$1 =
 /*#__PURE__*/
@@ -475,7 +469,6 @@ createLoadable({
     loadable$1 = _createLoadable$1.loadable,
     lazy$1 = _createLoadable$1.lazy;
 
-/* eslint-disable no-underscore-dangle, camelcase */
 var BROWSER = typeof window !== 'undefined';
 function loadableReady(done, _temp) {
   if (done === void 0) {
@@ -553,7 +546,6 @@ function loadableReady(done, _temp) {
   }).then(done);
 }
 
-/* eslint-disable no-underscore-dangle */
 var loadable$2 = loadable;
 loadable$2.lib = loadable$1;
 var lazy$2 = lazy;

diff --git a/docs/src/theme/ManagerTabs/index.tsx b/docs/src/theme/ManagerTabs/index.tsx
@@ -161,7 +161,6 @@ export const Tabs: ForwardRefExoticComponent<TabsProps> = forwardRef(
               {tabValues.map((item, index) => {
                 return (
                   <div
-                    // eslint-disable-next-line react/no-array-index-key
                     key={index}
                     className={`${styles['tab']} ${currentIndex === index
                       ? styles['selected']

diff --git a/docs/src/theme/logic/TabDataContext.ts b/docs/src/theme/logic/TabDataContext.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import React, { createContext } from 'react';
 
 export interface TabData {

diff --git a/e2e/utils.ts b/e2e/utils.ts
@@ -57,7 +57,6 @@ export const concurrentify = <F extends (...args: any) => Promise<any>>(maxConcu
     if (queue.length > 0) {
       const { ctx, deferred, args } = queue.shift()!;
       try {
-        // eslint-disable-next-line no-use-before-define
         newFn.apply(ctx, args).then(deferred.resolve, deferred.reject);
       } catch (e) {
         deferred.reject(e);
@@ -66,7 +65,6 @@ export const concurrentify = <F extends (...args: any) => Promise<any>>(maxConcu
   }
 
   function newFn(this: any) {
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
     const ctx = this;
     const args = arguments as any;
 

diff --git a/e2e/vitestGlobalSetup.ts b/e2e/vitestGlobalSetup.ts
@@ -24,7 +24,6 @@ export async function setup({ provide }: GlobalSetupContext): Promise<void> {
 
   client.listen(12306);
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   provide('wsEndpoint', browserServer.wsEndpoint());
 }

diff --git a/e2e/vitestSetup.ts b/e2e/vitestSetup.ts
@@ -20,7 +20,6 @@ const visitPage = async (
   command: string
 ) => {
   if (!path) return;
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   const wsEndpoint = inject('wsEndpoint');
   if (!wsEndpoint) {

diff --git a/js-plugins/electron/.eslintrc.json b/js-plugins/electron/.eslintrc.json
diff --git a/js-plugins/less/.eslintrc.json b/js-plugins/less/.eslintrc.json
diff --git a/js-plugins/less/src/index.ts b/js-plugins/less/src/index.ts
@@ -35,7 +35,6 @@ export default function farmLessPlugin(
     options?.implementation
   );
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore TODO fix it
   const cwd = () => farmConfig.root ?? process.cwd();
 
@@ -63,7 +62,6 @@ export default function farmLessPlugin(
         ...preprocessorOptions
       };
     },
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore it will be removed in the future
     configureServer() {
       console.warn(

diff --git a/js-plugins/postcss/.eslintrc.json b/js-plugins/postcss/.eslintrc.json
diff --git a/js-plugins/sass/.eslintrc.json b/js-plugins/sass/.eslintrc.json
diff --git a/js-plugins/sass/src/index.ts b/js-plugins/sass/src/index.ts
@@ -48,7 +48,6 @@ export default function farmSassPlugin(
   let farmConfig!: UserConfig['compilation'];
   const implementation = getSassImplementation(options.implementation);
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore TODO fix it
   const cwd = () => farmConfig.root ?? process.cwd();
 

diff --git a/js-plugins/sass/src/utils.ts b/js-plugins/sass/src/utils.ts
@@ -26,7 +26,6 @@ async function getDefaultSassImplementation() {
  * @param implementation
  * @returns
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getSassImplementation(implementation?: string | any) {
   let resolvedImplementation = implementation;
   // if empty

diff --git a/js-plugins/solid/.eslintrc.json b/js-plugins/solid/.eslintrc.json
diff --git a/js-plugins/svgr/.eslintrc.json b/js-plugins/svgr/.eslintrc.json
diff --git a/js-plugins/visualizer/.eslintrc.json b/js-plugins/visualizer/.eslintrc.json
diff --git a/js-plugins/visualizer/.gitignore b/js-plugins/visualizer/.gitignore
@@ -54,9 +54,6 @@ typings/
 # Optional npm cache directory
 .npm
 
-# Optional eslint cache
-.eslintcache
-
 # Microbundle cache
 .rpt2_cache/
 .rts2_cache_cjs/

diff --git a/js-plugins/vue/.eslintrc.json b/js-plugins/vue/.eslintrc.json
diff --git a/js-plugins/vue/src/farm-vue-plugin.ts b/js-plugins/vue/src/farm-vue-plugin.ts
@@ -239,7 +239,6 @@ async function preProcession(
       case 'scss':
         processor = await loadPreProcessor(PreProcessorsType.sass);
         return await compilePreProcessorCodeToCss(styleCode, processor, {
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
           indentedSyntax: moduleType === 'sass',
           includePaths: options.paths ?? []

diff --git a/packages/core/.gitignore b/packages/core/.gitignore
@@ -54,9 +54,6 @@ typings/
 # Optional npm cache directory
 .npm
 
-# Optional eslint cache
-.eslintcache
-
 # Microbundle cache
 .rpt2_cache/
 .rts2_cache_cjs/

diff --git a/packages/core/.npmignore b/packages/core/.npmignore
@@ -3,7 +3,6 @@ Cargo.lock
 .cargo
 .github
 npm
-.eslintrc
 .prettierignore
 rustfmt.toml
 yarn.lock

diff --git a/packages/core/binding/binding.cjs b/packages/core/binding/binding.cjs
@@ -1,5 +1,4 @@
 /* tslint:disable */
-/* eslint-disable */
 /* prettier-ignore */
 
 /* auto-generated by NAPI-RS */

diff --git a/packages/core/binding/binding.d.ts b/packages/core/binding/binding.d.ts
@@ -1,5 +1,4 @@
 /* tslint:disable */
-/* eslint-disable */
 
 /* auto-generated by NAPI-RS */
 

diff --git a/packages/core/client.d.ts b/packages/core/client.d.ts
@@ -5,7 +5,6 @@
  * Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
  */
 
-/* eslint-disable @typescript-eslint/triple-slash-reference */
 /// <reference path="./types/import-meta.d.ts" />
 
 // CSS modules

diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
@@ -310,7 +310,6 @@ export async function normalizeUserCompilationConfig(
   normalizeOutput(resolvedCompilation, isProduction, resolvedUserConfig.logger);
   normalizeExternal(resolvedUserConfig, resolvedCompilation);
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore do not check type for this internal option
   if (!resolvedCompilation.assets?.publicDir) {
     resolvedCompilation.assets ??= {};
@@ -320,11 +319,9 @@ export async function normalizeUserCompilationConfig(
       : path.join(resolvedCompilation.root, 'public');
 
     if (path.isAbsolute(userPublicDir)) {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore do not check type for this internal option
       resolvedCompilation.assets.publicDir = userPublicDir;
     } else {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore do not check type for this internal option
       resolvedCompilation.assets.publicDir = path.join(
         resolvedCompilation.root,

diff --git a/packages/core/src/config/types.ts b/packages/core/src/config/types.ts
@@ -303,7 +303,6 @@ interface ResolvedCss extends CssConfig {
   };
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ResolvedCompilation
   extends Exclude<Config['config'], undefined> {
   external?: string[];

diff --git a/packages/core/src/plugin/js/farm-to-vite-config.ts b/packages/core/src/plugin/js/farm-to-vite-config.ts
@@ -41,7 +41,6 @@ export function farmUserConfigToViteConfig(config: UserConfig): ViteUserConfig {
     },
     plugins: vitePlugins,
     server: {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore ignore error
       hmr: config.server?.hmr,
       port: config.server?.port,
@@ -53,7 +52,6 @@ export function farmUserConfigToViteConfig(config: UserConfig): ViteUserConfig {
       watch: typeof config.watch === 'object' ? config.watch : {}
       // other options are not supported in farm
     },
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore ignore this error
     isProduction: config.compilation?.mode === 'production',
     css: config.compilation?.css?._viteCssOptions ?? {},
@@ -434,7 +432,6 @@ export function viteConfigToFarmConfig(
         const keys = ['assetFileNames', 'entryFilename', 'filename'];
 
         for (const k of keys) {
-          /* eslint-disable @typescript-eslint/ban-ts-comment */
           // @ts-ignore type is correct
           farmConfig.compilation.output[k] =
             // @ts-ignore type is correct

diff --git a/packages/core/src/plugin/js/farm-to-vite-context.ts b/packages/core/src/plugin/js/farm-to-vite-context.ts
@@ -188,7 +188,6 @@ export function farmContextToViteContext(
       has: cacheError
     },
     moduleIds: new Set<string>()[Symbol.iterator](),
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore Vite specific property
     getCombinedSourcemap() {
       logger.warn(

diff --git a/packages/core/src/plugin/js/utils.ts b/packages/core/src/plugin/js/utils.ts
@@ -335,13 +335,11 @@ export function transformRollupResource2FarmResource(
   }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const notSupport: (method: string) => (...args: any[]) => any =
   (method) => () => {
     console.warn(`${method} not support`);
   };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const noop: (...args: any) => any = () => void 0;
 
 function transformFarmFormatToRollupFormat(

diff --git a/packages/core/src/plugin/js/vite-plugin-adapter.ts b/packages/core/src/plugin/js/vite-plugin-adapter.ts
@@ -826,7 +826,6 @@ export class VitePluginAdapter implements JsPlugin {
           const { htmlResource } = params;
           const hook = this.wrapRawPluginHook(
             'transformIndexHtml',
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore ignore type error
             this._rawPlugin.transformIndexHtml,
             context