Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

compact multiline imports #251

Open
GlebDolzhikov opened this issue Sep 1, 2022 · 8 comments
Open

compact multiline imports #251

GlebDolzhikov opened this issue Sep 1, 2022 · 8 comments

Comments

@GlebDolzhikov
Copy link

No description provided.

@GlebDolzhikov
Copy link
Author

Run #13353

@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2022 •
edited

prettier/prettier#13353 VS prettier/prettier@main :: babel/babel@4e0e5f9

Diff (193 lines) 
diff --git ORI/babel/packages/babel-core/test/async.js ALT/babel/packages/babel-core/test/async.js
index a7cb2856..1cd55774 100644
--- ORI/babel/packages/babel-core/test/async.js
+++ ALT/babel/packages/babel-core/test/async.js
@@ -2,11 +2,8 @@ import path from "path";
 import { fileURLToPath } from "url";
 import * as babel from "../lib/index.js";
 
-import {
-  spawnTransformAsync,
-  spawnTransformSync,
-  supportsESM,
-} from "./helpers/esm.js";
+import { spawnTransformAsync, spawnTransformSync, supportsESM }
+  from "./helpers/esm.js";
 
 const nodeGte8 = (...args) => {
   // "minNodeVersion": "8.0.0" <-- For Ctrl+F when dropping node 6
diff --git ORI/babel/packages/babel-core/test/config-loading.js ALT/babel/packages/babel-core/test/config-loading.js
index 46e1758b..1b9e0a21 100644
--- ORI/babel/packages/babel-core/test/config-loading.js
+++ ALT/babel/packages/babel-core/test/config-loading.js
@@ -1,7 +1,5 @@
-import _loadConfigRunner, {
-  loadPartialConfig,
-  createConfigItem,
-} from "../lib/config/index.js";
+import _loadConfigRunner, { loadPartialConfig, createConfigItem }
+  from "../lib/config/index.js";
 import path from "path";
 import { fileURLToPath } from "url";
 import { createRequire } from "module";
diff --git ORI/babel/packages/babel-parser/src/parser/expression.js ALT/babel/packages/babel-parser/src/parser/expression.js
index bb37f6a8..ef3aae29 100644
--- ORI/babel/packages/babel-parser/src/parser/expression.js
+++ ALT/babel/packages/babel-parser/src/parser/expression.js
@@ -56,17 +56,10 @@ import {
   SCOPE_SUPER,
 } from "../util/scopeflags";
 import { ExpressionErrors } from "./util";
-import {
-  PARAM_AWAIT,
-  PARAM_IN,
-  PARAM_RETURN,
-  functionFlags,
-} from "../util/production-parameter";
-import {
-  newArrowHeadScope,
-  newAsyncArrowScope,
-  newExpressionScope,
-} from "../util/expression-scope";
+import { PARAM_AWAIT, PARAM_IN, PARAM_RETURN, functionFlags }
+  from "../util/production-parameter";
+import { newArrowHeadScope, newAsyncArrowScope, newExpressionScope }
+  from "../util/expression-scope";
 import { Errors, SourceTypeModuleErrors } from "./error";
 import type { ParsingError } from "./error";
 import { setInnerComments } from "./comments";
diff --git ORI/babel/packages/babel-parser/src/parser/lval.js ALT/babel/packages/babel-parser/src/parser/lval.js
index cc867177..4124126b 100644
--- ORI/babel/packages/babel-parser/src/parser/lval.js
+++ ALT/babel/packages/babel-parser/src/parser/lval.js
@@ -21,10 +21,8 @@ import type {
   /*:: ObjectPattern, */
 } from "../types";
 import type { Pos, Position } from "../util/location";
-import {
-  isStrictBindOnlyReservedWord,
-  isStrictBindReservedWord,
-} from "../util/identifier";
+import { isStrictBindOnlyReservedWord, isStrictBindReservedWord }
+  from "../util/identifier";
 import { NodeUtils } from "./node";
 import { type BindingTypes, BIND_NONE } from "../util/scopeflags";
 import { ExpressionErrors } from "./util";
diff --git ORI/babel/packages/babel-parser/src/parser/statement.js ALT/babel/packages/babel-parser/src/parser/statement.js
index 0f7cbec4..1c05945d 100644
--- ORI/babel/packages/babel-parser/src/parser/statement.js
+++ ALT/babel/packages/babel-parser/src/parser/statement.js
@@ -34,10 +34,8 @@ import {
 } from "../util/scopeflags";
 import { ExpressionErrors } from "./util";
 import { PARAM, functionFlags } from "../util/production-parameter";
-import {
-  newExpressionScope,
-  newParameterDeclarationScope,
-} from "../util/expression-scope";
+import { newExpressionScope, newParameterDeclarationScope }
+  from "../util/expression-scope";
 import type { SourceType } from "../options";
 import { Token } from "../tokenizer";
 import { Position, createPositionWithColumnOffset } from "../util/location";
diff --git ORI/babel/packages/babel-parser/src/parser/util.js ALT/babel/packages/babel-parser/src/parser/util.js
index f9bad51b..8687f848 100644
--- ORI/babel/packages/babel-parser/src/parser/util.js
+++ ALT/babel/packages/babel-parser/src/parser/util.js
@@ -1,12 +1,8 @@
 // @flow
 
 import { type Position } from "../util/location";
-import {
-  tokenIsLiteralPropertyName,
-  tokenLabelName,
-  tt,
-  type TokenType,
-} from "../tokenizer/types";
+import { tokenIsLiteralPropertyName, tokenLabelName, tt, type TokenType }
+  from "../tokenizer/types";
 import Tokenizer from "../tokenizer";
 import State from "../tokenizer/state";
 import type { Node } from "../types";
@@ -15,10 +11,8 @@ import { isIdentifierChar } from "../util/identifier";
 import ClassScopeHandler from "../util/class-scope";
 import ExpressionScopeHandler from "../util/expression-scope";
 import { SCOPE_PROGRAM } from "../util/scopeflags";
-import ProductionParameterHandler, {
-  PARAM_AWAIT,
-  PARAM,
-} from "../util/production-parameter";
+import ProductionParameterHandler, { PARAM_AWAIT, PARAM }
+  from "../util/production-parameter";
 import { Errors, type ErrorTemplate, ErrorCodes } from "./error";
 import type { ParsingError } from "./error";
 import type { PluginConfig } from "./base";
diff --git ORI/babel/packages/babel-parser/src/plugins/flow/scope.js ALT/babel/packages/babel-parser/src/plugins/flow/scope.js
index 418276b5..0825205e 100644
--- ORI/babel/packages/babel-parser/src/plugins/flow/scope.js
+++ ALT/babel/packages/babel-parser/src/plugins/flow/scope.js
@@ -2,11 +2,8 @@
 
 import { Position } from "../../util/location";
 import ScopeHandler, { Scope } from "../../util/scope";
-import {
-  BIND_FLAGS_FLOW_DECLARE_FN,
-  type ScopeFlags,
-  type BindingTypes,
-} from "../../util/scopeflags";
+import { BIND_FLAGS_FLOW_DECLARE_FN, type ScopeFlags, type BindingTypes }
+  from "../../util/scopeflags";
 import * as N from "../../types";
 
 // Reference implementation: https://github.com/facebook/flow/blob/23aeb2a2ef6eb4241ce178fde5d8f17c5f747fb5/src/typing/env.ml#L536-L584
diff --git ORI/babel/packages/babel-parser/src/plugins/typescript/index.js ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
index fae6d2fb..b748b694 100644
--- ORI/babel/packages/babel-parser/src/plugins/typescript/index.js
+++ ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
@@ -37,12 +37,8 @@ import TypeScriptScopeHandler from "./scope";
 import * as charCodes from "charcodes";
 import type { ExpressionErrors } from "../../parser/util";
 import { PARAM } from "../../util/production-parameter";
-import {
-  Errors,
-  makeErrorTemplates,
-  type ErrorTemplate,
-  ErrorCodes,
-} from "../../parser/error";
+import { Errors, makeErrorTemplates, type ErrorTemplate, ErrorCodes }
+  from "../../parser/error";
 import { cloneIdentifier } from "../../parser/node";
 
 type TsModifier =
diff --git ORI/babel/packages/babel-parser/src/tokenizer/index.js ALT/babel/packages/babel-parser/src/tokenizer/index.js
index 075ccb96..e0ee62d2 100644
--- ORI/babel/packages/babel-parser/src/tokenizer/index.js
+++ ALT/babel/packages/babel-parser/src/tokenizer/index.js
@@ -17,12 +17,8 @@ import {
 import { type TokContext } from "./context";
 import ParserErrors, { Errors, type ErrorTemplate } from "../parser/error";
 import { SourceLocation } from "../util/location";
-import {
-  lineBreakG,
-  isNewLine,
-  isWhitespace,
-  skipWhiteSpace,
-} from "../util/whitespace";
+import { lineBreakG, isNewLine, isWhitespace, skipWhiteSpace }
+  from "../util/whitespace";
 import State from "./state";
 import type { LookaheadState } from "./state";
 
diff --git ORI/babel/packages/babel-parser/test/unit/util/identifier.skip-bundled.js ALT/babel/packages/babel-parser/test/unit/util/identifier.skip-bundled.js
index 6a9b3f7b..c752b992 100644
--- ORI/babel/packages/babel-parser/test/unit/util/identifier.skip-bundled.js
+++ ALT/babel/packages/babel-parser/test/unit/util/identifier.skip-bundled.js
@@ -1,7 +1,5 @@
-import {
-  isKeyword,
-  keywordRelationalOperator,
-} from "../../../lib/util/identifier.js";
+import { isKeyword, keywordRelationalOperator }
+  from "../../../lib/util/identifier.js";
 
 describe("identifier", () => {
   describe("isKeyword", () => {

@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2022

prettier/prettier#13353 VS prettier/prettier@main :: vuejs/eslint-plugin-vue@508ea0e

The diff is empty.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2022

prettier/prettier#13353 VS prettier/prettier@main :: excalidraw/excalidraw@49172ac

Diff (1069 lines) 
diff --git ORI/excalidraw/src/actions/actionDistribute.tsx ALT/excalidraw/src/actions/actionDistribute.tsx
index 578a4a5..a78aef1 100644
--- ORI/excalidraw/src/actions/actionDistribute.tsx
+++ ALT/excalidraw/src/actions/actionDistribute.tsx
@@ -1,7 +1,5 @@
-import {
-  DistributeHorizontallyIcon,
-  DistributeVerticallyIcon,
-} from "../components/icons";
+import { DistributeHorizontallyIcon, DistributeVerticallyIcon }
+  from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 import { distributeElements, Distribution } from "../disitrubte";
 import { getNonDeletedElements } from "../element";
diff --git ORI/excalidraw/src/actions/actionFinalize.tsx ALT/excalidraw/src/actions/actionFinalize.tsx
index e89112a..aefc8a4 100644
--- ORI/excalidraw/src/actions/actionFinalize.tsx
+++ ALT/excalidraw/src/actions/actionFinalize.tsx
@@ -9,10 +9,8 @@ import { mutateElement } from "../element/mutateElement";
 import { isPathALoop } from "../math";
 import { LinearElementEditor } from "../element/linearElementEditor";
 import Scene from "../scene/Scene";
-import {
-  maybeBindLinearElement,
-  bindOrUnbindLinearElement,
-} from "../element/binding";
+import { maybeBindLinearElement, bindOrUnbindLinearElement }
+  from "../element/binding";
 import { isBindingElement } from "../element/typeChecks";
 
 export const actionFinalize = register({
diff --git ORI/excalidraw/src/actions/actionProperties.tsx ALT/excalidraw/src/actions/actionProperties.tsx
index 203c625..ffa2efe 100644
--- ORI/excalidraw/src/actions/actionProperties.tsx
+++ ALT/excalidraw/src/actions/actionProperties.tsx
@@ -31,26 +31,15 @@ import {
   TextAlignLeftIcon,
   TextAlignRightIcon,
 } from "../components/icons";
-import {
-  DEFAULT_FONT_FAMILY,
-  DEFAULT_FONT_SIZE,
-  FONT_FAMILY,
-} from "../constants";
-import {
-  getNonDeletedElements,
-  isTextElement,
-  redrawTextBoundingBox,
-} from "../element";
+import { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, FONT_FAMILY }
+  from "../constants";
+import { getNonDeletedElements, isTextElement, redrawTextBoundingBox }
+  from "../element";
 import { mutateElement, newElementWith } from "../element/mutateElement";
-import {
-  getBoundTextElement,
-  getContainerElement,
-} from "../element/textElement";
-import {
-  isBoundToContainer,
-  isLinearElement,
-  isLinearElementType,
-} from "../element/typeChecks";
+import { getBoundTextElement, getContainerElement }
+  from "../element/textElement";
+import { isBoundToContainer, isLinearElement, isLinearElementType }
+  from "../element/typeChecks";
 import {
   Arrowhead,
   ExcalidrawElement,
diff --git ORI/excalidraw/src/actions/actionStyles.ts ALT/excalidraw/src/actions/actionStyles.ts
index 3244321..7bbe6f6 100644
--- ORI/excalidraw/src/actions/actionStyles.ts
+++ ALT/excalidraw/src/actions/actionStyles.ts
@@ -1,17 +1,11 @@
-import {
-  isTextElement,
-  isExcalidrawElement,
-  redrawTextBoundingBox,
-} from "../element";
+import { isTextElement, isExcalidrawElement, redrawTextBoundingBox }
+  from "../element";
 import { CODES, KEYS } from "../keys";
 import { t } from "../i18n";
 import { register } from "./register";
 import { mutateElement, newElementWith } from "../element/mutateElement";
-import {
-  DEFAULT_FONT_SIZE,
-  DEFAULT_FONT_FAMILY,
-  DEFAULT_TEXT_ALIGN,
-} from "../constants";
+import { DEFAULT_FONT_SIZE, DEFAULT_FONT_FAMILY, DEFAULT_TEXT_ALIGN }
+  from "../constants";
 import { getContainerElement } from "../element/textElement";
 
 // `copiedStyles` is exported only for tests.
diff --git ORI/excalidraw/src/actions/actionZindex.tsx ALT/excalidraw/src/actions/actionZindex.tsx
index f1cdcfe..2eeffb3 100644
--- ORI/excalidraw/src/actions/actionZindex.tsx
+++ ALT/excalidraw/src/actions/actionZindex.tsx
@@ -1,20 +1,12 @@
 import React from "react";
-import {
-  moveOneLeft,
-  moveOneRight,
-  moveAllLeft,
-  moveAllRight,
-} from "../zindex";
+import { moveOneLeft, moveOneRight, moveAllLeft, moveAllRight }
+  from "../zindex";
 import { KEYS, isDarwin, CODES } from "../keys";
 import { t } from "../i18n";
 import { getShortcutKey } from "../utils";
 import { register } from "./register";
-import {
-  SendBackwardIcon,
-  BringToFrontIcon,
-  SendToBackIcon,
-  BringForwardIcon,
-} from "../components/icons";
+import { SendBackwardIcon, BringToFrontIcon, SendToBackIcon, BringForwardIcon }
+  from "../components/icons";
 
 export const actionSendBackward = register({
   name: "sendBackward",
diff --git ORI/excalidraw/src/actions/types.ts ALT/excalidraw/src/actions/types.ts
index b7bb560..01f4d86 100644
--- ORI/excalidraw/src/actions/types.ts
+++ ALT/excalidraw/src/actions/types.ts
@@ -1,11 +1,7 @@
 import React from "react";
 import { ExcalidrawElement } from "../element/types";
-import {
-  AppClassProperties,
-  AppState,
-  ExcalidrawProps,
-  BinaryFiles,
-} from "../types";
+import { AppClassProperties, AppState, ExcalidrawProps, BinaryFiles }
+  from "../types";
 import { ToolButtonSize } from "../components/ToolButton";
 
 /** if false, the action should be prevented */
diff --git ORI/excalidraw/src/clipboard.ts ALT/excalidraw/src/clipboard.ts
index a0d737e..7cccef9 100644
--- ORI/excalidraw/src/clipboard.ts
+++ ALT/excalidraw/src/clipboard.ts
@@ -1,7 +1,5 @@
-import {
-  ExcalidrawElement,
-  NonDeletedExcalidrawElement,
-} from "./element/types";
+import { ExcalidrawElement, NonDeletedExcalidrawElement }
+  from "./element/types";
 import { getSelectedElements } from "./scene";
 import { AppState, BinaryFiles } from "./types";
 import { SVG_EXPORT_TAG } from "./scene/export";
diff --git ORI/excalidraw/src/components/ContextMenu.tsx ALT/excalidraw/src/components/ContextMenu.tsx
index c10e135..602ea4b 100644
--- ORI/excalidraw/src/components/ContextMenu.tsx
+++ ALT/excalidraw/src/components/ContextMenu.tsx
@@ -4,10 +4,8 @@ import { Popover } from "./Popover";
 import { t } from "../i18n";
 
 import "./ContextMenu.scss";
-import {
-  getShortcutFromShortcutName,
-  ShortcutName,
-} from "../actions/shortcuts";
+import { getShortcutFromShortcutName, ShortcutName }
+  from "../actions/shortcuts";
 import { Action } from "../actions/types";
 import { ActionManager } from "../actions/manager";
 import { AppState } from "../types";
diff --git ORI/excalidraw/src/components/LibraryMenu.tsx ALT/excalidraw/src/components/LibraryMenu.tsx
index 763dfb8..ee9d5bc 100644
--- ORI/excalidraw/src/components/LibraryMenu.tsx
+++ ALT/excalidraw/src/components/LibraryMenu.tsx
@@ -2,13 +2,8 @@ import { useRef, useState, useEffect, useCallback, RefObject } from "react";
 import Library from "../data/library";
 import { t } from "../i18n";
 import { randomId } from "../random";
-import {
-  LibraryItems,
-  LibraryItem,
-  AppState,
-  BinaryFiles,
-  ExcalidrawProps,
-} from "../types";
+import { LibraryItems, LibraryItem, AppState, BinaryFiles, ExcalidrawProps }
+  from "../types";
 import { Dialog } from "./Dialog";
 import { Island } from "./Island";
 import PublishLibrary from "./PublishLibrary";
diff --git ORI/excalidraw/src/components/LibraryMenuItems.tsx ALT/excalidraw/src/components/LibraryMenuItems.tsx
index b2dd630..49798f6 100644
--- ORI/excalidraw/src/components/LibraryMenuItems.tsx
+++ ALT/excalidraw/src/components/LibraryMenuItems.tsx
@@ -4,13 +4,8 @@ import { importLibraryFromJSON, saveLibraryAsJSON } from "../data/json";
 import Library from "../data/library";
 import { ExcalidrawElement, NonDeleted } from "../element/types";
 import { t } from "../i18n";
-import {
-  AppState,
-  BinaryFiles,
-  ExcalidrawProps,
-  LibraryItem,
-  LibraryItems,
-} from "../types";
+import { AppState, BinaryFiles, ExcalidrawProps, LibraryItem, LibraryItems }
+  from "../types";
 import { muteFSAbortError } from "../utils";
 import { useIsMobile } from "./App";
 import ConfirmDialog from "./ConfirmDialog";
diff --git ORI/excalidraw/src/components/PublishLibrary.tsx ALT/excalidraw/src/components/PublishLibrary.tsx
index adcc90a..a93bc25 100644
--- ORI/excalidraw/src/components/PublishLibrary.tsx
+++ ALT/excalidraw/src/components/PublishLibrary.tsx
@@ -8,12 +8,8 @@ import { ToolButton } from "./ToolButton";
 
 import { AppState, LibraryItems, LibraryItem } from "../types";
 import { exportToCanvas } from "../packages/utils";
-import {
-  EXPORT_DATA_TYPES,
-  EXPORT_SOURCE,
-  MIME_TYPES,
-  VERSIONS,
-} from "../constants";
+import { EXPORT_DATA_TYPES, EXPORT_SOURCE, MIME_TYPES, VERSIONS }
+  from "../constants";
 import { ExportedLibraryData } from "../data/types";
 
 import "./PublishLibrary.scss";
diff --git ORI/excalidraw/src/data/blob.ts ALT/excalidraw/src/data/blob.ts
index 2418f5a..be7a40a 100644
--- ORI/excalidraw/src/data/blob.ts
+++ ALT/excalidraw/src/data/blob.ts
@@ -1,10 +1,7 @@
 import { nanoid } from "nanoid";
 import { cleanAppStateForExport } from "../appState";
-import {
-  ALLOWED_IMAGE_MIME_TYPES,
-  EXPORT_DATA_TYPES,
-  MIME_TYPES,
-} from "../constants";
+import { ALLOWED_IMAGE_MIME_TYPES, EXPORT_DATA_TYPES, MIME_TYPES }
+  from "../constants";
 import { clearElementsForExport } from "../element";
 import { ExcalidrawElement, FileId } from "../element/types";
 import { CanvasError } from "../errors";
diff --git ORI/excalidraw/src/data/index.ts ALT/excalidraw/src/data/index.ts
index 8896646..92acdf7 100644
--- ORI/excalidraw/src/data/index.ts
+++ ALT/excalidraw/src/data/index.ts
@@ -1,7 +1,5 @@
-import {
-  copyBlobToClipboardAsPng,
-  copyTextToSystemClipboard,
-} from "../clipboard";
+import { copyBlobToClipboardAsPng, copyTextToSystemClipboard }
+  from "../clipboard";
 import { DEFAULT_EXPORT_PADDING, MIME_TYPES } from "../constants";
 import { NonDeletedExcalidrawElement } from "../element/types";
 import { t } from "../i18n";
diff --git ORI/excalidraw/src/data/json.ts ALT/excalidraw/src/data/json.ts
index e7ce527..c3e5f17 100644
--- ORI/excalidraw/src/data/json.ts
+++ ALT/excalidraw/src/data/json.ts
@@ -1,21 +1,14 @@
 import { fileOpen, fileSave } from "./filesystem";
 import { cleanAppStateForExport, clearAppStateForDatabase } from "../appState";
-import {
-  EXPORT_DATA_TYPES,
-  EXPORT_SOURCE,
-  MIME_TYPES,
-  VERSIONS,
-} from "../constants";
+import { EXPORT_DATA_TYPES, EXPORT_SOURCE, MIME_TYPES, VERSIONS }
+  from "../constants";
 import { clearElementsForDatabase, clearElementsForExport } from "../element";
 import { ExcalidrawElement } from "../element/types";
 import { AppState, BinaryFiles, LibraryItems } from "../types";
 import { isImageFileHandle, loadFromBlob } from "./blob";
 
-import {
-  ExportedDataState,
-  ImportedDataState,
-  ExportedLibraryData,
-} from "./types";
+import { ExportedDataState, ImportedDataState, ExportedLibraryData }
+  from "./types";
 import Library from "./library";
 
 /**
diff --git ORI/excalidraw/src/data/restore.ts ALT/excalidraw/src/data/restore.ts
index b55bd95..49298d1 100644
--- ORI/excalidraw/src/data/restore.ts
+++ ALT/excalidraw/src/data/restore.ts
@@ -1,14 +1,7 @@
-import {
-  ExcalidrawElement,
-  ExcalidrawSelectionElement,
-  FontFamilyValues,
-} from "../element/types";
-import {
-  AppState,
-  BinaryFiles,
-  LibraryItem,
-  NormalizedZoomValue,
-} from "../types";
+import { ExcalidrawElement, ExcalidrawSelectionElement, FontFamilyValues }
+  from "../element/types";
+import { AppState, BinaryFiles, LibraryItem, NormalizedZoomValue }
+  from "../types";
 import { ImportedDataState } from "./types";
 import { getNormalizedDimensions, isInvisiblySmallElement } from "../element";
 import { isLinearElementType } from "../element/typeChecks";
diff --git ORI/excalidraw/src/element/Hyperlink.tsx ALT/excalidraw/src/element/Hyperlink.tsx
index 7c2d5fb..d87c377 100644
--- ORI/excalidraw/src/element/Hyperlink.tsx
+++ ALT/excalidraw/src/element/Hyperlink.tsx
@@ -12,13 +12,8 @@ import { register } from "../actions/register";
 import { ToolButton } from "../components/ToolButton";
 import { editIcon, link, trash } from "../components/icons";
 import { t } from "../i18n";
-import {
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useRef,
-  useState,
-} from "react";
+import { useCallback, useEffect, useLayoutEffect, useRef, useState }
+  from "react";
 import clsx from "clsx";
 import { KEYS } from "../keys";
 import { DEFAULT_LINK_SIZE } from "../renderer/renderElement";
diff --git ORI/excalidraw/src/element/binding.ts ALT/excalidraw/src/element/binding.ts
index d60640e..a627cfd 100644
--- ORI/excalidraw/src/element/binding.ts
+++ ALT/excalidraw/src/element/binding.ts
@@ -8,11 +8,8 @@ import {
 } from "./types";
 import { getElementAtPosition } from "../scene";
 import { AppState } from "../types";
-import {
-  isBindableElement,
-  isBindingElement,
-  isLinearElement,
-} from "./typeChecks";
+import { isBindableElement, isBindingElement, isLinearElement }
+  from "./typeChecks";
 import {
   bindingBorderTest,
   distanceToBindableElement,
diff --git ORI/excalidraw/src/element/bounds.ts ALT/excalidraw/src/element/bounds.ts
index 8290b1c..ce74dcb 100644
--- ORI/excalidraw/src/element/bounds.ts
+++ ALT/excalidraw/src/element/bounds.ts
@@ -9,10 +9,8 @@ import { distance2d, rotate } from "../math";
 import rough from "roughjs/bin/rough";
 import { Drawable, Op } from "roughjs/bin/core";
 import { Point } from "../types";
-import {
-  getShapeForElement,
-  generateRoughOptions,
-} from "../renderer/renderElement";
+import { getShapeForElement, generateRoughOptions }
+  from "../renderer/renderElement";
 import { isFreeDrawElement, isLinearElement } from "./typeChecks";
 import { rescalePoints } from "../points";
 
diff --git ORI/excalidraw/src/element/collision.ts ALT/excalidraw/src/element/collision.ts
index c00953a..eb9f92a 100644
--- ORI/excalidraw/src/element/collision.ts
+++ ALT/excalidraw/src/element/collision.ts
@@ -4,13 +4,8 @@ import * as GADirection from "../gadirections";
 import * as GALine from "../galines";
 import * as GATransform from "../gatransforms";
 
-import {
-  distance2d,
-  rotatePoint,
-  isPathALoop,
-  isPointInPolygon,
-  rotate,
-} from "../math";
+import { distance2d, rotatePoint, isPathALoop, isPointInPolygon, rotate }
+  from "../math";
 import { pointsOnBezierCurves } from "points-on-curve";
 
 import {
diff --git ORI/excalidraw/src/element/image.ts ALT/excalidraw/src/element/image.ts
index 17ba245..c6c1323 100644
--- ORI/excalidraw/src/element/image.ts
+++ ALT/excalidraw/src/element/image.ts
@@ -6,11 +6,8 @@ import { MIME_TYPES, SVG_NS } from "../constants";
 import { t } from "../i18n";
 import { AppClassProperties, DataURL, BinaryFiles } from "../types";
 import { isInitializedImageElement } from "./typeChecks";
-import {
-  ExcalidrawElement,
-  FileId,
-  InitializedExcalidrawImageElement,
-} from "./types";
+import { ExcalidrawElement, FileId, InitializedExcalidrawImageElement }
+  from "./types";
 
 export const loadHTMLImageElement = (dataURL: DataURL) => {
   return new Promise<HTMLImageElement>((resolve, reject) => {
diff --git ORI/excalidraw/src/element/index.ts ALT/excalidraw/src/element/index.ts
index ef4059c..580be29 100644
--- ORI/excalidraw/src/element/index.ts
+++ ALT/excalidraw/src/element/index.ts
@@ -1,8 +1,5 @@
-import {
-  ExcalidrawElement,
-  NonDeletedExcalidrawElement,
-  NonDeleted,
-} from "./types";
+import { ExcalidrawElement, NonDeletedExcalidrawElement, NonDeleted }
+  from "./types";
 import { isInvisiblySmallElement } from "./sizeHelpers";
 import { isLinearElementType } from "./typeChecks";
 
diff --git ORI/excalidraw/src/element/resizeElements.ts ALT/excalidraw/src/element/resizeElements.ts
index 634e9dd..ccbca80 100644
--- ORI/excalidraw/src/element/resizeElements.ts
+++ ALT/excalidraw/src/element/resizeElements.ts
@@ -1,12 +1,8 @@
 import { BOUND_TEXT_PADDING, SHIFT_LOCKING_ANGLE } from "../constants";
 import { rescalePoints } from "../points";
 
-import {
-  rotate,
-  adjustXYWithRotation,
-  centerPoint,
-  rotatePoint,
-} from "../math";
+import { rotate, adjustXYWithRotation, centerPoint, rotatePoint }
+  from "../math";
 import {
   ExcalidrawLinearElement,
   ExcalidrawTextElement,
@@ -18,11 +14,8 @@ import {
   getCommonBounds,
   getResizedElementAbsoluteCoords,
 } from "./bounds";
-import {
-  isFreeDrawElement,
-  isLinearElement,
-  isTextElement,
-} from "./typeChecks";
+import { isFreeDrawElement, isLinearElement, isTextElement }
+  from "./typeChecks";
 import { mutateElement } from "./mutateElement";
 import { getPerfectElementSize } from "./sizeHelpers";
 import { getFontString } from "../utils";
diff --git ORI/excalidraw/src/element/resizeTest.ts ALT/excalidraw/src/element/resizeTest.ts
index dbdab5a..f3ed024 100644
--- ORI/excalidraw/src/element/resizeTest.ts
+++ ALT/excalidraw/src/element/resizeTest.ts
@@ -1,8 +1,5 @@
-import {
-  ExcalidrawElement,
-  PointerType,
-  NonDeletedExcalidrawElement,
-} from "./types";
+import { ExcalidrawElement, PointerType, NonDeletedExcalidrawElement }
+  from "./types";
 
 import {
   OMIT_SIDES_FOR_MULTIPLE_ELEMENTS,
diff --git ORI/excalidraw/src/element/textWysiwyg.test.tsx ALT/excalidraw/src/element/textWysiwyg.test.tsx
index 0fe105b..eeac07e 100644
--- ORI/excalidraw/src/element/textWysiwyg.test.tsx
+++ ALT/excalidraw/src/element/textWysiwyg.test.tsx
@@ -7,10 +7,8 @@ import { fireEvent } from "../tests/test-utils";
 import { queryByText } from "@testing-library/react";
 
 import { BOUND_TEXT_PADDING, FONT_FAMILY } from "../constants";
-import {
-  ExcalidrawTextElement,
-  ExcalidrawTextElementWithContainer,
-} from "./types";
+import { ExcalidrawTextElement, ExcalidrawTextElementWithContainer }
+  from "./types";
 import * as textElementUtils from "./textElement";
 // Unmount ReactDOM from root
 ReactDOM.unmountComponentAtNode(document.getElementById("root")!);
diff --git ORI/excalidraw/src/element/textWysiwyg.tsx ALT/excalidraw/src/element/textWysiwyg.tsx
index a62efb4..c383f24 100644
--- ORI/excalidraw/src/element/textWysiwyg.tsx
+++ ALT/excalidraw/src/element/textWysiwyg.tsx
@@ -1,18 +1,11 @@
 import { CODES, KEYS } from "../keys";
-import {
-  isWritableElement,
-  getFontString,
-  getFontFamilyString,
-  isTestEnv,
-} from "../utils";
+import { isWritableElement, getFontString, getFontFamilyString, isTestEnv }
+  from "../utils";
 import Scene from "../scene/Scene";
 import { isBoundToContainer, isTextElement } from "./typeChecks";
 import { CLASSES, BOUND_TEXT_PADDING } from "../constants";
-import {
-  ExcalidrawElement,
-  ExcalidrawTextElement,
-  ExcalidrawLinearElement,
-} from "./types";
+import { ExcalidrawElement, ExcalidrawTextElement, ExcalidrawLinearElement }
+  from "./types";
 import { AppState } from "../types";
 import { mutateElement } from "./mutateElement";
 import {
@@ -21,10 +14,8 @@ import {
   getContainerElement,
   wrapText,
 } from "./textElement";
-import {
-  actionDecreaseFontSize,
-  actionIncreaseFontSize,
-} from "../actions/actionProperties";
+import { actionDecreaseFontSize, actionIncreaseFontSize }
+  from "../actions/actionProperties";
 import { actionZoomIn, actionZoomOut } from "../actions/actionCanvas";
 import App from "../components/App";
 
diff --git ORI/excalidraw/src/excalidraw-app/CustomStats.tsx ALT/excalidraw/src/excalidraw-app/CustomStats.tsx
index 3a65e3c..ff22055 100644
--- ORI/excalidraw/src/excalidraw-app/CustomStats.tsx
+++ ALT/excalidraw/src/excalidraw-app/CustomStats.tsx
@@ -1,9 +1,7 @@
 import { useEffect, useState } from "react";
 import { debounce, getVersion, nFormatter } from "../utils";
-import {
-  getElementsStorageSize,
-  getTotalStorageSize,
-} from "./data/localStorage";
+import { getElementsStorageSize, getTotalStorageSize }
+  from "./data/localStorage";
 import { DEFAULT_VERSION } from "../constants";
 import { t } from "../i18n";
 import { copyTextToSystemClipboard } from "../clipboard";
diff --git ORI/excalidraw/src/excalidraw-app/collab/CollabWrapper.tsx ALT/excalidraw/src/excalidraw-app/collab/CollabWrapper.tsx
index 23454bc..f1f9816 100644
--- ORI/excalidraw/src/excalidraw-app/collab/CollabWrapper.tsx
+++ ALT/excalidraw/src/excalidraw-app/collab/CollabWrapper.tsx
@@ -4,17 +4,12 @@ import { ExcalidrawImperativeAPI } from "../../types";
 import { ErrorDialog } from "../../components/ErrorDialog";
 import { APP_NAME, ENV, EVENT } from "../../constants";
 import { ImportedDataState } from "../../data/types";
-import {
-  ExcalidrawElement,
-  InitializedExcalidrawImageElement,
-} from "../../element/types";
+import { ExcalidrawElement, InitializedExcalidrawImageElement }
+  from "../../element/types";
 import { getSceneVersion } from "../../packages/excalidraw/index";
 import { Collaborator, Gesture } from "../../types";
-import {
-  preventUnload,
-  resolvablePromise,
-  withBatchedUpdates,
-} from "../../utils";
+import { preventUnload, resolvablePromise, withBatchedUpdates }
+  from "../../utils";
 import {
   FILE_UPLOAD_MAX_BYTES,
   FIREBASE_STORAGE_PREFIXES,
@@ -37,10 +32,8 @@ import {
   saveFilesToFirebase,
   saveToFirebase,
 } from "../data/firebase";
-import {
-  importUsernameFromLocalStorage,
-  saveUsernameToLocalStorage,
-} from "../data/localStorage";
+import { importUsernameFromLocalStorage, saveUsernameToLocalStorage }
+  from "../data/localStorage";
 import Portal from "./Portal";
 import RoomDialog from "./RoomDialog";
 import { createInverseContext } from "../../createInverseContext";
@@ -49,21 +42,14 @@ import { UserIdleState } from "../../types";
 import { IDLE_THRESHOLD, ACTIVE_THRESHOLD } from "../../constants";
 import { trackEvent } from "../../analytics";
 import { isInvisiblySmallElement } from "../../element";
-import {
-  encodeFilesForUpload,
-  FileManager,
-  updateStaleImageStatuses,
-} from "../data/FileManager";
+import { encodeFilesForUpload, FileManager, updateStaleImageStatuses }
+  from "../data/FileManager";
 import { AbortError } from "../../errors";
-import {
-  isImageElement,
-  isInitializedImageElement,
-} from "../../element/typeChecks";
+import { isImageElement, isInitializedImageElement }
+  from "../../element/typeChecks";
 import { newElementWith } from "../../element/mutateElement";
-import {
-  ReconciledElements,
-  reconcileElements as _reconcileElements,
-} from "./reconciliation";
+import { ReconciledElements, reconcileElements as _reconcileElements }
+  from "./reconciliation";
 import { decryptData } from "../../data/encryption";
 import { resetBrowserStateVersions } from "../data/tabSync";
 
diff --git ORI/excalidraw/src/excalidraw-app/collab/RoomDialog.tsx ALT/excalidraw/src/excalidraw-app/collab/RoomDialog.tsx
index ac3fc27..b5db8af 100644
--- ORI/excalidraw/src/excalidraw-app/collab/RoomDialog.tsx
+++ ALT/excalidraw/src/excalidraw-app/collab/RoomDialog.tsx
@@ -1,14 +1,8 @@
 import React, { useRef } from "react";
 import { copyTextToSystemClipboard } from "../../clipboard";
 import { Dialog } from "../../components/Dialog";
-import {
-  clipboard,
-  start,
-  stop,
-  share,
-  shareIOS,
-  shareWindows,
-} from "../../components/icons";
+import { clipboard, start, stop, share, shareIOS, shareWindows }
+  from "../../components/icons";
 import { ToolButton } from "../../components/ToolButton";
 import { t } from "../../i18n";
 import "./RoomDialog.scss";
diff --git ORI/excalidraw/src/excalidraw-app/data/index.ts ALT/excalidraw/src/excalidraw-app/data/index.ts
index 11b59b8..10cd991 100644
--- ORI/excalidraw/src/excalidraw-app/data/index.ts
+++ ALT/excalidraw/src/excalidraw-app/data/index.ts
@@ -1,21 +1,14 @@
 import { compressData, decompressData } from "../../data/encode";
-import {
-  decryptData,
-  generateEncryptionKey,
-  IV_LENGTH_BYTES,
-} from "../../data/encryption";
+import { decryptData, generateEncryptionKey, IV_LENGTH_BYTES }
+  from "../../data/encryption";
 import { serializeAsJSON } from "../../data/json";
 import { restore } from "../../data/restore";
 import { ImportedDataState } from "../../data/types";
 import { isInitializedImageElement } from "../../element/typeChecks";
 import { ExcalidrawElement, FileId } from "../../element/types";
 import { t } from "../../i18n";
-import {
-  AppState,
-  BinaryFileData,
-  BinaryFiles,
-  UserIdleState,
-} from "../../types";
+import { AppState, BinaryFileData, BinaryFiles, UserIdleState }
+  from "../../types";
 import { bytesToHexString } from "../../utils";
 import { FILE_UPLOAD_MAX_BYTES, ROOM_ID_BYTES } from "../app_constants";
 import { encodeFilesForUpload } from "./FileManager";
diff --git ORI/excalidraw/src/excalidraw-app/data/localStorage.ts ALT/excalidraw/src/excalidraw-app/data/localStorage.ts
index 3d54808..4750783 100644
--- ORI/excalidraw/src/excalidraw-app/data/localStorage.ts
+++ ALT/excalidraw/src/excalidraw-app/data/localStorage.ts
@@ -1,9 +1,7 @@
 import { ExcalidrawElement } from "../../element/types";
 import { AppState } from "../../types";
-import {
-  clearAppStateForLocalStorage,
-  getDefaultAppState,
-} from "../../appState";
+import { clearAppStateForLocalStorage, getDefaultAppState }
+  from "../../appState";
 import { clearElementsForLocalStorage } from "../../element";
 import { updateBrowserStateVersion } from "./tabSync";
 import { STORAGE_KEYS } from "../app_constants";
diff --git ORI/excalidraw/src/excalidraw-app/index.tsx ALT/excalidraw/src/excalidraw-app/index.tsx
index b0601c6..75a4579 100644
--- ORI/excalidraw/src/excalidraw-app/index.tsx
+++ ALT/excalidraw/src/excalidraw-app/index.tsx
@@ -4,26 +4,16 @@ import { trackEvent } from "../analytics";
 import { getDefaultAppState } from "../appState";
 import { ErrorDialog } from "../components/ErrorDialog";
 import { TopErrorBoundary } from "../components/TopErrorBoundary";
-import {
-  APP_NAME,
-  EVENT,
-  TITLE_TIMEOUT,
-  URL_HASH_KEYS,
-  VERSION_TIMEOUT,
-} from "../constants";
+import { APP_NAME, EVENT, TITLE_TIMEOUT, URL_HASH_KEYS, VERSION_TIMEOUT }
+  from "../constants";
 import { loadFromBlob } from "../data/blob";
 import { ImportedDataState } from "../data/types";
-import {
-  ExcalidrawElement,
-  FileId,
-  NonDeletedExcalidrawElement,
-} from "../element/types";
+import { ExcalidrawElement, FileId, NonDeletedExcalidrawElement }
+  from "../element/types";
 import { useCallbackRefState } from "../hooks/useCallbackRefState";
 import { Language, t } from "../i18n";
-import Excalidraw, {
-  defaultLang,
-  languages,
-} from "../packages/excalidraw/index";
+import Excalidraw, { defaultLang, languages }
+  from "../packages/excalidraw/index";
 import {
   AppState,
   LibraryItems,
@@ -45,11 +35,8 @@ import {
   STORAGE_KEYS,
   SYNC_BROWSER_TABS_TIMEOUT,
 } from "./app_constants";
-import CollabWrapper, {
-  CollabAPI,
-  CollabContext,
-  CollabContextConsumer,
-} from "./collab/CollabWrapper";
+import CollabWrapper, { CollabAPI, CollabContext, CollabContextConsumer }
+  from "./collab/CollabWrapper";
 import { LanguageList } from "./components/LanguageList";
 import { exportToBackend, getCollaborationLinkData, loadScene } from "./data";
 import {
@@ -71,10 +58,8 @@ import { FileManager, updateStaleImageStatuses } from "./data/FileManager";
 import { newElementWith } from "../element/mutateElement";
 import { isInitializedImageElement } from "../element/typeChecks";
 import { loadFilesFromFirebase } from "./data/firebase";
-import {
-  isBrowserStorageStateNewer,
-  updateBrowserStateVersion,
-} from "./data/tabSync";
+import { isBrowserStorageStateNewer, updateBrowserStateVersion }
+  from "./data/tabSync";
 
 const filesStore = createStore("files-db", "files-store");
 
diff --git ORI/excalidraw/src/packages/utils.ts ALT/excalidraw/src/packages/utils.ts
index c09d101..adf48e0 100644
--- ORI/excalidraw/src/packages/utils.ts
+++ ALT/excalidraw/src/packages/utils.ts
@@ -1,7 +1,5 @@
-import {
-  exportToCanvas as _exportToCanvas,
-  exportToSvg as _exportToSvg,
-} from "../scene/export";
+import { exportToCanvas as _exportToCanvas, exportToSvg as _exportToSvg }
+  from "../scene/export";
 import { getDefaultAppState } from "../appState";
 import { AppState, BinaryFiles } from "../types";
 import { ExcalidrawElement, NonDeleted } from "../element/types";
diff --git ORI/excalidraw/src/renderer/renderElement.ts ALT/excalidraw/src/renderer/renderElement.ts
index 6db858d..0d6dbc9 100644
--- ORI/excalidraw/src/renderer/renderElement.ts
+++ ALT/excalidraw/src/renderer/renderElement.ts
@@ -13,11 +13,8 @@ import {
   isFreeDrawElement,
   isInitializedImageElement,
 } from "../element/typeChecks";
-import {
-  getDiamondPoints,
-  getElementAbsoluteCoords,
-  getArrowheadPoints,
-} from "../element/bounds";
+import { getDiamondPoints, getElementAbsoluteCoords, getArrowheadPoints }
+  from "../element/bounds";
 import { RoughCanvas } from "roughjs/bin/canvas";
 import { Drawable, Options } from "roughjs/bin/core";
 import { RoughSVG } from "roughjs/bin/svg";
diff --git ORI/excalidraw/src/renderer/renderScene.ts ALT/excalidraw/src/renderer/renderScene.ts
index 00557ae..969d97b 100644
--- ORI/excalidraw/src/renderer/renderScene.ts
+++ ALT/excalidraw/src/renderer/renderScene.ts
@@ -22,38 +22,25 @@ import {
 
 import { roundRect } from "./roundRect";
 import { RenderConfig } from "../scene/types";
-import {
-  getScrollBars,
-  SCROLLBAR_COLOR,
-  SCROLLBAR_WIDTH,
-} from "../scene/scrollbars";
+import { getScrollBars, SCROLLBAR_COLOR, SCROLLBAR_WIDTH }
+  from "../scene/scrollbars";
 import { getSelectedElements } from "../scene/selection";
 
 import { renderElement, renderElementToSvg } from "./renderElement";
 import { getClientColors } from "../clients";
 import { LinearElementEditor } from "../element/linearElementEditor";
-import {
-  isSelectedViaGroup,
-  getSelectedGroupIds,
-  getElementsInGroup,
-} from "../groups";
+import { isSelectedViaGroup, getSelectedGroupIds, getElementsInGroup }
+  from "../groups";
 import { maxBindingGap } from "../element/collision";
-import {
-  SuggestedBinding,
-  SuggestedPointBinding,
-  isBindingEnabled,
-} from "../element/binding";
-import {
-  TransformHandles,
-  TransformHandleType,
-} from "../element/transformHandles";
+import { SuggestedBinding, SuggestedPointBinding, isBindingEnabled }
+  from "../element/binding";
+import { TransformHandles, TransformHandleType }
+  from "../element/transformHandles";
 import { viewportCoordsToSceneCoords, supportsEmoji } from "../utils";
 import { UserIdleState } from "../types";
 import { THEME_FILTER } from "../constants";
-import {
-  EXTERNAL_LINK_IMG,
-  getLinkHandleFromCoords,
-} from "../element/Hyperlink";
+import { EXTERNAL_LINK_IMG, getLinkHandleFromCoords }
+  from "../element/Hyperlink";
 
 const hasEmojiSupport = supportsEmoji();
 
diff --git ORI/excalidraw/src/scene/Scene.ts ALT/excalidraw/src/scene/Scene.ts
index 5d981c3..20b0555 100644
--- ORI/excalidraw/src/scene/Scene.ts
+++ ALT/excalidraw/src/scene/Scene.ts
@@ -1,8 +1,5 @@
-import {
-  ExcalidrawElement,
-  NonDeletedExcalidrawElement,
-  NonDeleted,
-} from "../element/types";
+import { ExcalidrawElement, NonDeletedExcalidrawElement, NonDeleted }
+  from "../element/types";
 import { getNonDeletedElements, isNonDeletedElement } from "../element";
 import { LinearElementEditor } from "../element/linearElementEditor";
 
diff --git ORI/excalidraw/src/scene/comparisons.ts ALT/excalidraw/src/scene/comparisons.ts
index 24b98d4..9289d1c 100644
--- ORI/excalidraw/src/scene/comparisons.ts
+++ ALT/excalidraw/src/scene/comparisons.ts
@@ -1,7 +1,5 @@
-import {
-  ExcalidrawElement,
-  NonDeletedExcalidrawElement,
-} from "../element/types";
+import { ExcalidrawElement, NonDeletedExcalidrawElement }
+  from "../element/types";
 
 import { getElementAbsoluteCoords } from "../element";
 
diff --git ORI/excalidraw/src/scene/export.ts ALT/excalidraw/src/scene/export.ts
index 1f46bd9..e2a12da 100644
--- ORI/excalidraw/src/scene/export.ts
+++ ALT/excalidraw/src/scene/export.ts
@@ -7,10 +7,8 @@ import { AppState, BinaryFiles } from "../types";
 import { DEFAULT_EXPORT_PADDING, SVG_NS, THEME_FILTER } from "../constants";
 import { getDefaultAppState } from "../appState";
 import { serializeAsJSON } from "../data/json";
-import {
-  getInitializedImageElements,
-  updateImageCache,
-} from "../element/image";
+import { getInitializedImageElements, updateImageCache }
+  from "../element/image";
 
 export const SVG_EXPORT_TAG = `<!-- svg-source:excalidraw -->`;
 
diff --git ORI/excalidraw/src/scene/scroll.ts ALT/excalidraw/src/scene/scroll.ts
index 4fce5e6..b39e335 100644
--- ORI/excalidraw/src/scene/scroll.ts
+++ ALT/excalidraw/src/scene/scroll.ts
@@ -1,15 +1,10 @@
 import { AppState, PointerCoords, Zoom } from "../types";
 import { ExcalidrawElement } from "../element/types";
-import {
-  getCommonBounds,
-  getClosestElementBounds,
-  getVisibleElements,
-} from "../element";
+import { getCommonBounds, getClosestElementBounds, getVisibleElements }
+  from "../element";
 
-import {
-  sceneCoordsToViewportCoords,
-  viewportCoordsToSceneCoords,
-} from "../utils";
+import { sceneCoordsToViewportCoords, viewportCoordsToSceneCoords }
+  from "../utils";
 
 const isOutsideViewPort = (
   appState: AppState,
diff --git ORI/excalidraw/src/scene/selection.ts ALT/excalidraw/src/scene/selection.ts
index a5abf7e..8ac2f8a 100644
--- ORI/excalidraw/src/scene/selection.ts
+++ ALT/excalidraw/src/scene/selection.ts
@@ -1,7 +1,5 @@
-import {
-  ExcalidrawElement,
-  NonDeletedExcalidrawElement,
-} from "../element/types";
+import { ExcalidrawElement, NonDeletedExcalidrawElement }
+  from "../element/types";
 import { getElementAbsoluteCoords, getElementBounds } from "../element";
 import { AppState } from "../types";
 import { isBoundToContainer } from "../element/typeChecks";
diff --git ORI/excalidraw/src/tests/export.test.tsx ALT/excalidraw/src/tests/export.test.tsx
index e6bd218..859a607 100644
--- ORI/excalidraw/src/tests/export.test.tsx
+++ ALT/excalidraw/src/tests/export.test.tsx
@@ -1,11 +1,8 @@
 import { render, waitFor } from "./test-utils";
 import ExcalidrawApp from "../excalidraw-app";
 import { API } from "./helpers/api";
-import {
-  encodePngMetadata,
-  encodeSvgMetadata,
-  decodeSvgMetadata,
-} from "../data/image";
+import { encodePngMetadata, encodeSvgMetadata, decodeSvgMetadata }
+  from "../data/image";
 import { serializeAsJSON } from "../data/json";
 
 const { h } = window;
diff --git ORI/excalidraw/src/tests/fixtures/diagramFixture.ts ALT/excalidraw/src/tests/fixtures/diagramFixture.ts
index 192442e..d66c641 100644
--- ORI/excalidraw/src/tests/fixtures/diagramFixture.ts
+++ ALT/excalidraw/src/tests/fixtures/diagramFixture.ts
@@ -1,9 +1,6 @@
 import { VERSIONS } from "../../constants";
-import {
-  diamondFixture,
-  ellipseFixture,
-  rectangleFixture,
-} from "./elementFixture";
+import { diamondFixture, ellipseFixture, rectangleFixture }
+  from "./elementFixture";
 
 export const diagramFixture = {
   type: "excalidraw",
diff --git ORI/excalidraw/src/tests/helpers/ui.ts ALT/excalidraw/src/tests/helpers/ui.ts
index b951710..883ccf0 100644
--- ORI/excalidraw/src/tests/helpers/ui.ts
+++ ALT/excalidraw/src/tests/helpers/ui.ts
@@ -1,8 +1,5 @@
-import {
-  ExcalidrawElement,
-  ExcalidrawLinearElement,
-  ExcalidrawTextElement,
-} from "../../element/types";
+import { ExcalidrawElement, ExcalidrawLinearElement, ExcalidrawTextElement }
+  from "../../element/types";
 import { CODES } from "../../keys";
 import { ToolName } from "../queries/toolQueries";
 import { fireEvent, GlobalTestState } from "../test-utils";
diff --git ORI/excalidraw/src/tests/move.test.tsx ALT/excalidraw/src/tests/move.test.tsx
index 312b3ee..4067a61 100644
--- ORI/excalidraw/src/tests/move.test.tsx
+++ ALT/excalidraw/src/tests/move.test.tsx
@@ -5,11 +5,8 @@ import ExcalidrawApp from "../excalidraw-app";
 import * as Renderer from "../renderer/renderScene";
 import { reseed } from "../random";
 import { bindOrUnbindLinearElement } from "../element/binding";
-import {
-  ExcalidrawLinearElement,
-  NonDeleted,
-  ExcalidrawRectangleElement,
-} from "../element/types";
+import { ExcalidrawLinearElement, NonDeleted, ExcalidrawRectangleElement }
+  from "../element/types";
 import { UI, Pointer, Keyboard } from "./helpers/ui";
 import { KEYS } from "../keys";
 
diff --git ORI/excalidraw/src/tests/reconciliation.test.ts ALT/excalidraw/src/tests/reconciliation.test.ts
index 7631729..946483c 100644
--- ORI/excalidraw/src/tests/reconciliation.test.ts
+++ ALT/excalidraw/src/tests/reconciliation.test.ts
@@ -1,10 +1,7 @@
 import { expect } from "chai";
 import { ExcalidrawElement } from "../element/types";
-import {
-  BroadcastedExcalidrawElement,
-  ReconciledElements,
-  reconcileElements,
-} from "../excalidraw-app/collab/reconciliation";
+import { BroadcastedExcalidrawElement, ReconciledElements, reconcileElements }
+  from "../excalidraw-app/collab/reconciliation";
 import { randomInteger } from "../random";
 import { AppState } from "../types";
 
diff --git ORI/excalidraw/src/tests/regressionTests.test.tsx ALT/excalidraw/src/tests/regressionTests.test.tsx
index 7b950e3..57e6abf 100644
--- ORI/excalidraw/src/tests/regressionTests.test.tsx
+++ ALT/excalidraw/src/tests/regressionTests.test.tsx
@@ -7,13 +7,8 @@ import * as Renderer from "../renderer/renderScene";
 import { setDateTimeForTests } from "../utils";
 import { API } from "./helpers/api";
 import { Keyboard, Pointer, UI } from "./helpers/ui";
-import {
-  assertSelectedElements,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-} from "./test-utils";
+import { assertSelectedElements, fireEvent, render, screen, waitFor }
+  from "./test-utils";
 import { defaultLang } from "../i18n";
 import { FONT_FAMILY } from "../constants";
 import { t } from "../i18n";
diff --git ORI/excalidraw/src/tests/resize.test.tsx ALT/excalidraw/src/tests/resize.test.tsx
index 4e55382..5f5a947 100644
--- ORI/excalidraw/src/tests/resize.test.tsx
+++ ALT/excalidraw/src/tests/resize.test.tsx
@@ -4,10 +4,8 @@ import App from "../components/App";
 import * as Renderer from "../renderer/renderScene";
 import { reseed } from "../random";
 import { UI, Pointer, Keyboard, KeyboardModifiers } from "./helpers/ui";
-import {
-  getTransformHandles,
-  TransformHandleDirection,
-} from "../element/transformHandles";
+import { getTransformHandles, TransformHandleDirection }
+  from "../element/transformHandles";
 import { ExcalidrawElement, ExcalidrawTextElement } from "../element/types";
 import ExcalidrawApp from "../excalidraw-app";
 import { API } from "./helpers/api";
diff --git ORI/excalidraw/src/tests/scene/export.test.ts ALT/excalidraw/src/tests/scene/export.test.ts
index 1b6f721..386770a 100644
--- ORI/excalidraw/src/tests/scene/export.test.ts
+++ ALT/excalidraw/src/tests/scene/export.test.ts
@@ -1,10 +1,7 @@
 import { NonDeletedExcalidrawElement } from "../../element/types";
 import * as exportUtils from "../../scene/export";
-import {
-  diamondFixture,
-  ellipseFixture,
-  rectangleWithLinkFixture,
-} from "../fixtures/elementFixture";
+import { diamondFixture, ellipseFixture, rectangleWithLinkFixture }
+  from "../fixtures/elementFixture";
 
 describe("exportToSvg", () => {
   const ELEMENT_HEIGHT = 100;
diff --git ORI/excalidraw/src/tests/test-utils.ts ALT/excalidraw/src/tests/test-utils.ts
index be9871c..a30512b 100644
--- ORI/excalidraw/src/tests/test-utils.ts
+++ ALT/excalidraw/src/tests/test-utils.ts
@@ -1,12 +1,7 @@
 import "pepjs";
 
-import {
-  render,
-  queries,
-  RenderResult,
-  RenderOptions,
-  waitFor,
-} from "@testing-library/react";
+import { render, queries, RenderResult, RenderOptions, waitFor }
+  from "@testing-library/react";
 
 import * as toolQueries from "./queries/toolQueries";
 import { ImportedDataState } from "../data/types";

@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2022

prettier/prettier#13353 VS prettier/prettier@main :: prettier/prettier@e949a54

Diff (110 lines) 
diff --git ORI/prettier/docs/rationale.md ALT/prettier/docs/rationale.md
index 4df64fa..241b97c 100644
--- ORI/prettier/docs/rationale.md
+++ ALT/prettier/docs/rationale.md
@@ -202,10 +202,8 @@ Apart from that, there are a few cases where Prettier intentionally exceeds the
 Prettier can break long `import` statements across several lines:
 
 ```js
-import {
-  CollectionDashboard,
-  DashboardPlaceholder,
-} from "../components/collections/collection-dashboard/main";
+import { CollectionDashboard, DashboardPlaceholder }
+  from "../components/collections/collection-dashboard/main";
 ```
 
 The following example doesn’t fit within the print width, but Prettier prints it in a single line anyway:
diff --git ORI/prettier/scripts/build-website.mjs ALT/prettier/scripts/build-website.mjs
index 6b2d363..bbc1220 100644
--- ORI/prettier/scripts/build-website.mjs
+++ ALT/prettier/scripts/build-website.mjs
@@ -6,14 +6,8 @@ import fastGlob from "fast-glob";
 import prettier from "prettier";
 import createEsmUtils from "esm-utils";
 import { execa } from "execa";
-import {
-  PROJECT_ROOT,
-  DIST_DIR,
-  WEBSITE_DIR,
-  writeJson,
-  copyFile,
-  writeFile,
-} from "./utils/index.mjs";
+import { PROJECT_ROOT, DIST_DIR, WEBSITE_DIR, writeJson, copyFile, writeFile }
+  from "./utils/index.mjs";
 
 const { require } = createEsmUtils(import.meta);
 const runYarn = (command, args, options) =>
diff --git ORI/prettier/scripts/build/build.mjs ALT/prettier/scripts/build/build.mjs
index ee35261..c9fe99b 100644
--- ORI/prettier/scripts/build/build.mjs
+++ ALT/prettier/scripts/build/build.mjs
@@ -7,13 +7,8 @@ import chalk from "chalk";
 import minimist from "minimist";
 import prettyBytes from "pretty-bytes";
 import createEsmUtils from "esm-utils";
-import {
-  PROJECT_ROOT,
-  DIST_DIR,
-  readJson,
-  writeJson,
-  copyFile,
-} from "../utils/index.mjs";
+import { PROJECT_ROOT, DIST_DIR, readJson, writeJson, copyFile }
+  from "../utils/index.mjs";
 import bundler from "./bundler.mjs";
 import bundleConfigs from "./config.mjs";
 import saveLicenses from "./save-licenses.mjs";
diff --git ORI/prettier/scripts/release/steps/publish-to-npm.js ALT/prettier/scripts/release/steps/publish-to-npm.js
index 805fde6..085f2dd 100644
--- ORI/prettier/scripts/release/steps/publish-to-npm.js
+++ ALT/prettier/scripts/release/steps/publish-to-npm.js
@@ -2,12 +2,8 @@ import chalk from "chalk";
 import outdent from "outdent";
 import { execa } from "execa";
 import semver from "semver";
-import {
-  getBlogPostInfo,
-  getChangelogContent,
-  logPromise,
-  waitForEnter,
-} from "../utils.js";
+import { getBlogPostInfo, getChangelogContent, logPromise, waitForEnter }
+  from "../utils.js";
 
 const outdentString = outdent.string;
 
diff --git ORI/prettier/scripts/release/steps/update-version.js ALT/prettier/scripts/release/steps/update-version.js
index b97cbe7..f7ef015 100644
--- ORI/prettier/scripts/release/steps/update-version.js
+++ ALT/prettier/scripts/release/steps/update-version.js
@@ -1,10 +1,5 @@
-import {
-  runYarn,
-  logPromise,
-  readJson,
-  writeJson,
-  processFile,
-} from "../utils.js";
+import { runYarn, logPromise, readJson, writeJson, processFile }
+  from "../utils.js";
 
 async function bump({ version }) {
   const pkg = await readJson("package.json");
diff --git ORI/prettier/website/versioned_docs/version-stable/rationale.md ALT/prettier/website/versioned_docs/version-stable/rationale.md
index d5c2726..e09365a 100644
--- ORI/prettier/website/versioned_docs/version-stable/rationale.md
+++ ALT/prettier/website/versioned_docs/version-stable/rationale.md
@@ -203,10 +203,8 @@ Apart from that, there are a few cases where Prettier intentionally exceeds the
 Prettier can break long `import` statements across several lines:
 
 ```js
-import {
-  CollectionDashboard,
-  DashboardPlaceholder,
-} from "../components/collections/collection-dashboard/main";
+import { CollectionDashboard, DashboardPlaceholder }
+  from "../components/collections/collection-dashboard/main";
 ```
 
 The following example doesn’t fit within the print width, but Prettier prints it in a single line anyway:

@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2022

prettier/prettier#13353 VS prettier/prettier@main :: marmelab/react-admin@5ae855a

Diff (3073 lines) 
diff --git ORI/react-admin/examples/crm/src/App.tsx ALT/react-admin/examples/crm/src/App.tsx
index 8f58b4c..de3cf94 100644
--- ORI/react-admin/examples/crm/src/App.tsx
+++ ALT/react-admin/examples/crm/src/App.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import { Admin, Resource, ListGuesser, defaultTheme } from 'react-admin';
-import {
-    unstable_createMuiStrictModeTheme,
-    createTheme,
-} from '@material-ui/core/styles';
+import { unstable_createMuiStrictModeTheme, createTheme }
+    from '@material-ui/core/styles';
 
 import { dataProvider } from './dataProvider';
 import { authProvider } from './authProvider';
diff --git ORI/react-admin/examples/crm/src/companies/CompanyListFilter.tsx ALT/react-admin/examples/crm/src/companies/CompanyListFilter.tsx
index 4bafeb8..2303c44 100644
--- ORI/react-admin/examples/crm/src/companies/CompanyListFilter.tsx
+++ ALT/react-admin/examples/crm/src/companies/CompanyListFilter.tsx
@@ -1,11 +1,7 @@
 /* eslint-disable import/no-anonymous-default-export */
 import * as React from 'react';
-import {
-    FilterList,
-    FilterLiveSearch,
-    FilterListItem,
-    useGetIdentity,
-} from 'react-admin';
+import { FilterList, FilterLiveSearch, FilterListItem, useGetIdentity }
+    from 'react-admin';
 import { Box } from '@material-ui/core';
 import BusinessIcon from '@material-ui/icons/Business';
 import LocalShippingIcon from '@material-ui/icons/LocalShipping';
diff --git ORI/react-admin/examples/crm/src/contacts/TagsListEdit.tsx ALT/react-admin/examples/crm/src/contacts/TagsListEdit.tsx
index ef84941..b0faab7 100644
--- ORI/react-admin/examples/crm/src/contacts/TagsListEdit.tsx
+++ ALT/react-admin/examples/crm/src/contacts/TagsListEdit.tsx
@@ -1,12 +1,7 @@
 import * as React from 'react';
 import { useState, FormEvent } from 'react';
-import {
-    useGetMany,
-    useCreate,
-    useUpdate,
-    useGetList,
-    Identifier,
-} from 'react-admin';
+import { useGetMany, useCreate, useUpdate, useGetList, Identifier }
+    from 'react-admin';
 import {
     Chip,
     Box,
diff --git ORI/react-admin/examples/crm/src/dashboard/DealsPipeline.tsx ALT/react-admin/examples/crm/src/dashboard/DealsPipeline.tsx
index 4013a6e..3fff248 100644
--- ORI/react-admin/examples/crm/src/dashboard/DealsPipeline.tsx
+++ ALT/react-admin/examples/crm/src/dashboard/DealsPipeline.tsx
@@ -3,13 +3,8 @@ import { useEffect, useState } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 import { Card, Link, Box } from '@material-ui/core';
 import MonetizationOnIcon from '@material-ui/icons/MonetizationOn';
-import {
-    useGetList,
-    SimpleList,
-    useGetIdentity,
-    ReferenceField,
-    Identifier,
-} from 'react-admin';
+import { useGetList, SimpleList, useGetIdentity, ReferenceField, Identifier }
+    from 'react-admin';
 
 import { CompanyAvatar } from '../companies/CompanyAvatar';
 import { stages, stageNames } from '../deals/stages';
diff --git ORI/react-admin/examples/crm/src/dashboard/LatestNotes.tsx ALT/react-admin/examples/crm/src/dashboard/LatestNotes.tsx
index 0d42dab..6143ec1 100644
--- ORI/react-admin/examples/crm/src/dashboard/LatestNotes.tsx
+++ ALT/react-admin/examples/crm/src/dashboard/LatestNotes.tsx
@@ -2,13 +2,8 @@ import * as React from 'react';
 import { Card, CardContent, Typography, Box } from '@material-ui/core';
 import NoteIcon from '@material-ui/icons/Note';
 import { makeStyles } from '@material-ui/core/styles';
-import {
-    useGetList,
-    useGetIdentity,
-    ReferenceField,
-    TextField,
-    FunctionField,
-} from 'react-admin';
+import { useGetList, useGetIdentity, ReferenceField, TextField, FunctionField }
+    from 'react-admin';
 import { formatDistance } from 'date-fns';
 
 import { Contact as ContactType } from '../types';
diff --git ORI/react-admin/examples/crm/src/dashboard/Welcome.tsx ALT/react-admin/examples/crm/src/dashboard/Welcome.tsx
index 9fb61a7..92a0de4 100644
--- ORI/react-admin/examples/crm/src/dashboard/Welcome.tsx
+++ ALT/react-admin/examples/crm/src/dashboard/Welcome.tsx
@@ -1,11 +1,6 @@
 import * as React from 'react';
-import {
-    Typography,
-    Card,
-    CardContent,
-    CardActions,
-    Button,
-} from '@material-ui/core';
+import { Typography, Card, CardContent, CardActions, Button }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import HomeIcon from '@material-ui/icons/Home';
 import CodeIcon from '@material-ui/icons/Code';
diff --git ORI/react-admin/examples/crm/src/dataGenerator/contacts.ts ALT/react-admin/examples/crm/src/dataGenerator/contacts.ts
index 0586c04..5b52048 100644
--- ORI/react-admin/examples/crm/src/dataGenerator/contacts.ts
+++ ALT/react-admin/examples/crm/src/dataGenerator/contacts.ts
@@ -1,11 +1,5 @@
-import {
-    name,
-    internet,
-    random,
-    company as fakerCompany,
-    phone,
-    lorem,
-} from 'faker/locale/en_US';
+import { name, internet, random, company as fakerCompany, phone, lorem }
+    from 'faker/locale/en_US';
 
 import { randomDate, weightedBoolean } from './utils';
 import { Db } from './types';
diff --git ORI/react-admin/examples/crm/src/deals/DealShow.tsx ALT/react-admin/examples/crm/src/deals/DealShow.tsx
index 0d24801..62ef686 100644
--- ORI/react-admin/examples/crm/src/deals/DealShow.tsx
+++ ALT/react-admin/examples/crm/src/deals/DealShow.tsx
@@ -9,13 +9,8 @@ import {
     useRedirect,
     Identifier,
 } from 'react-admin';
-import {
-    Box,
-    Dialog,
-    DialogContent,
-    Typography,
-    Divider,
-} from '@material-ui/core';
+import { Box, Dialog, DialogContent, Typography, Divider }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import { format } from 'date-fns';
 
diff --git ORI/react-admin/examples/crm/src/notes/Note.tsx ALT/react-admin/examples/crm/src/notes/Note.tsx
index cc5f438..411804c 100644
--- ORI/react-admin/examples/crm/src/notes/Note.tsx
+++ ALT/react-admin/examples/crm/src/notes/Note.tsx
@@ -10,13 +10,8 @@ import {
     useNotify,
     useRecordContext,
 } from 'react-admin';
-import {
-    Typography,
-    Tooltip,
-    IconButton,
-    FilledInput,
-    Button,
-} from '@material-ui/core';
+import { Typography, Tooltip, IconButton, FilledInput, Button }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import EditIcon from '@material-ui/icons/Edit';
 import TrashIcon from '@material-ui/icons/Delete';
diff --git ORI/react-admin/examples/data-generator/src/commands.ts ALT/react-admin/examples/data-generator/src/commands.ts
index b6c150b..2686eb7 100644
--- ORI/react-admin/examples/data-generator/src/commands.ts
+++ ALT/react-admin/examples/data-generator/src/commands.ts
@@ -2,12 +2,8 @@ import { random } from 'faker/locale/en';
 import isAfter from 'date-fns/is_after';
 import subDays from 'date-fns/sub_days';
 
-import {
-    randomDate,
-    randomFloat,
-    weightedArrayElement,
-    weightedBoolean,
-} from './utils';
+import { randomDate, randomFloat, weightedArrayElement, weightedBoolean }
+    from './utils';
 
 export default (db, { serializeDate }) => {
     const today = new Date();
diff --git ORI/react-admin/examples/demo/src/categories/CategoryList.tsx ALT/react-admin/examples/demo/src/categories/CategoryList.tsx
index d6467dc..4fa759a 100644
--- ORI/react-admin/examples/demo/src/categories/CategoryList.tsx
+++ ALT/react-admin/examples/demo/src/categories/CategoryList.tsx
@@ -1,14 +1,8 @@
 import * as React from 'react';
 import { EditButton, List, ListProps, useListContext } from 'react-admin';
 import inflection from 'inflection';
-import {
-    Grid,
-    Card,
-    CardMedia,
-    CardContent,
-    CardActions,
-    Typography,
-} from '@material-ui/core';
+import { Grid, Card, CardMedia, CardContent, CardActions, Typography }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 
 import LinkToRelatedProducts from './LinkToRelatedProducts';
diff --git ORI/react-admin/examples/demo/src/dashboard/NewCustomers.tsx ALT/react-admin/examples/demo/src/dashboard/NewCustomers.tsx
index 0952555..071a532 100644
--- ORI/react-admin/examples/demo/src/dashboard/NewCustomers.tsx
+++ ALT/react-admin/examples/demo/src/dashboard/NewCustomers.tsx
@@ -1,13 +1,6 @@
 import * as React from 'react';
-import {
-    Avatar,
-    Box,
-    Button,
-    List,
-    ListItem,
-    ListItemAvatar,
-    ListItemText,
-} from '@material-ui/core';
+import { Avatar, Box, Button, List, ListItem, ListItemAvatar, ListItemText }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import CustomerIcon from '@material-ui/icons/PersonAdd';
 import { Link } from 'react-router-dom';
diff --git ORI/react-admin/examples/demo/src/dashboard/PendingReviews.tsx ALT/react-admin/examples/demo/src/dashboard/PendingReviews.tsx
index 8d5ae2a..53ef285 100644
--- ORI/react-admin/examples/demo/src/dashboard/PendingReviews.tsx
+++ ALT/react-admin/examples/demo/src/dashboard/PendingReviews.tsx
@@ -1,13 +1,6 @@
 import * as React from 'react';
-import {
-    Avatar,
-    Box,
-    Button,
-    List,
-    ListItem,
-    ListItemAvatar,
-    ListItemText,
-} from '@material-ui/core';
+import { Avatar, Box, Button, List, ListItem, ListItemAvatar, ListItemText }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import CommentIcon from '@material-ui/icons/Comment';
 import { Link } from 'react-router-dom';
diff --git ORI/react-admin/examples/demo/src/dataProvider/graphql.ts ALT/react-admin/examples/demo/src/dataProvider/graphql.ts
index f274089..b9bcb5b 100644
--- ORI/react-admin/examples/demo/src/dataProvider/graphql.ts
+++ ALT/react-admin/examples/demo/src/dataProvider/graphql.ts
@@ -1,7 +1,6 @@
 import { ApolloQueryResult } from '@apollo/client';
-import buildApolloClient, {
-    buildQuery as buildQueryFactory,
-} from 'ra-data-graphql-simple';
+import buildApolloClient, { buildQuery as buildQueryFactory }
+    from 'ra-data-graphql-simple';
 import { BuildQueryFactory } from 'ra-data-graphql';
 import { CREATE, DataProvider, DELETE } from 'react-admin';
 import gql from 'graphql-tag';
diff --git ORI/react-admin/examples/demo/src/invoices/InvoiceShow.tsx ALT/react-admin/examples/demo/src/invoices/InvoiceShow.tsx
index 5f2149c..f3f69a0 100644
--- ORI/react-admin/examples/demo/src/invoices/InvoiceShow.tsx
+++ ALT/react-admin/examples/demo/src/invoices/InvoiceShow.tsx
@@ -4,12 +4,8 @@ import CardContent from '@material-ui/core/CardContent';
 import Grid from '@material-ui/core/Grid';
 import Typography from '@material-ui/core/Typography';
 import { makeStyles } from '@material-ui/core/styles';
-import {
-    useShowController,
-    ReferenceField,
-    TextField,
-    FieldProps,
-} from 'react-admin';
+import { useShowController, ReferenceField, TextField, FieldProps }
+    from 'react-admin';
 
 import Basket from '../orders/Basket';
 import { Customer, Invoice } from '../types';
diff --git ORI/react-admin/examples/demo/src/layout/Login.tsx ALT/react-admin/examples/demo/src/layout/Login.tsx
index 20c4100..ff16f36 100644
--- ORI/react-admin/examples/demo/src/layout/Login.tsx
+++ ALT/react-admin/examples/demo/src/layout/Login.tsx
@@ -4,14 +4,8 @@ import PropTypes from 'prop-types';
 import { Field, withTypes } from 'react-final-form';
 import { useLocation } from 'react-router-dom';
 
-import {
-    Avatar,
-    Button,
-    Card,
-    CardActions,
-    CircularProgress,
-    TextField,
-} from '@material-ui/core';
+import { Avatar, Button, Card, CardActions, CircularProgress, TextField }
+    from '@material-ui/core';
 import { createTheme, makeStyles } from '@material-ui/core/styles';
 import { ThemeProvider } from '@material-ui/styles';
 import LockIcon from '@material-ui/icons/Lock';
diff --git ORI/react-admin/examples/demo/src/layout/Menu.tsx ALT/react-admin/examples/demo/src/layout/Menu.tsx
index 8edf0e0..703a8ee 100644
--- ORI/react-admin/examples/demo/src/layout/Menu.tsx
+++ ALT/react-admin/examples/demo/src/layout/Menu.tsx
@@ -4,13 +4,8 @@ import { useSelector } from 'react-redux';
 import LabelIcon from '@material-ui/icons/Label';
 import { makeStyles } from '@material-ui/core/styles';
 import classnames from 'classnames';
-import {
-    useTranslate,
-    DashboardMenuItem,
-    MenuItemLink,
-    MenuProps,
-    ReduxState,
-} from 'react-admin';
+import { useTranslate, DashboardMenuItem, MenuItemLink, MenuProps, ReduxState }
+    from 'react-admin';
 
 import visitors from '../visitors';
 import orders from '../orders';
diff --git ORI/react-admin/examples/demo/src/layout/SubMenu.tsx ALT/react-admin/examples/demo/src/layout/SubMenu.tsx
index 9d7f695..c7c4a91 100644
--- ORI/react-admin/examples/demo/src/layout/SubMenu.tsx
+++ ALT/react-admin/examples/demo/src/layout/SubMenu.tsx
@@ -1,14 +1,8 @@
 import * as React from 'react';
 import { Fragment, ReactElement, ReactNode } from 'react';
 import { useSelector } from 'react-redux';
-import {
-    List,
-    MenuItem,
-    ListItemIcon,
-    Typography,
-    Collapse,
-    Tooltip,
-} from '@material-ui/core';
+import { List, MenuItem, ListItemIcon, Typography, Collapse, Tooltip }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import ExpandMore from '@material-ui/icons/ExpandMore';
 import { useTranslate, ReduxState } from 'react-admin';
diff --git ORI/react-admin/examples/demo/src/orders/Basket.tsx ALT/react-admin/examples/demo/src/orders/Basket.tsx
index 370a686..bb12f98 100644
--- ORI/react-admin/examples/demo/src/orders/Basket.tsx
+++ ALT/react-admin/examples/demo/src/orders/Basket.tsx
@@ -1,11 +1,6 @@
 import * as React from 'react';
-import {
-    Table,
-    TableBody,
-    TableCell,
-    TableHead,
-    TableRow,
-} from '@material-ui/core';
+import { Table, TableBody, TableCell, TableHead, TableRow }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import { Link, FieldProps, useTranslate, useQueryWithStore } from 'react-admin';
 
diff --git ORI/react-admin/examples/demo/src/orders/OrderEdit.tsx ALT/react-admin/examples/demo/src/orders/OrderEdit.tsx
index baa6019..d4d3ffc 100644
--- ORI/react-admin/examples/demo/src/orders/OrderEdit.tsx
+++ ALT/react-admin/examples/demo/src/orders/OrderEdit.tsx
@@ -13,14 +13,8 @@ import {
     useTranslate,
 } from 'react-admin';
 import { Link as RouterLink } from 'react-router-dom';
-import {
-    Card,
-    CardContent,
-    Box,
-    Grid,
-    Typography,
-    Link,
-} from '@material-ui/core';
+import { Card, CardContent, Box, Grid, Typography, Link }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 
 import { Order, Customer } from '../types';
diff --git ORI/react-admin/examples/demo/src/products/Aside.tsx ALT/react-admin/examples/demo/src/products/Aside.tsx
index ce0502c..c0f3926 100644
--- ORI/react-admin/examples/demo/src/products/Aside.tsx
+++ ALT/react-admin/examples/demo/src/products/Aside.tsx
@@ -5,12 +5,8 @@ import { makeStyles } from '@material-ui/core/styles';
 import LocalOfferIcon from '@material-ui/icons/LocalOfferOutlined';
 import BarChartIcon from '@material-ui/icons/BarChart';
 import AttachMoneyIcon from '@material-ui/icons/AttachMoney';
-import {
-    FilterList,
-    FilterListItem,
-    FilterLiveSearch,
-    useGetList,
-} from 'react-admin';
+import { FilterList, FilterListItem, FilterLiveSearch, useGetList }
+    from 'react-admin';
 
 import { Category } from '../types';
 
diff --git ORI/react-admin/examples/demo/src/products/GridList.tsx ALT/react-admin/examples/demo/src/products/GridList.tsx
index 9f210b0..fd58a5a 100644
--- ORI/react-admin/examples/demo/src/products/GridList.tsx
+++ ALT/react-admin/examples/demo/src/products/GridList.tsx
@@ -4,13 +4,8 @@ import GridListTile from '@material-ui/core/GridListTile';
 import GridListTileBar from '@material-ui/core/GridListTileBar';
 import { makeStyles } from '@material-ui/core/styles';
 import withWidth, { WithWidth } from '@material-ui/core/withWidth';
-import {
-    linkToRecord,
-    NumberField,
-    useListContext,
-    DatagridProps,
-    Identifier,
-} from 'react-admin';
+import { linkToRecord, NumberField, useListContext, DatagridProps, Identifier }
+    from 'react-admin';
 import { Link } from 'react-router-dom';
 import { Breakpoint } from '@material-ui/core/styles/createBreakpoints';
 
diff --git ORI/react-admin/examples/demo/src/reviews/ReviewList.tsx ALT/react-admin/examples/demo/src/reviews/ReviewList.tsx
index a7db917..20369e5 100644
--- ORI/react-admin/examples/demo/src/reviews/ReviewList.tsx
+++ ALT/react-admin/examples/demo/src/reviews/ReviewList.tsx
@@ -1,12 +1,8 @@
 import * as React from 'react';
 import { Fragment, useCallback } from 'react';
 import classnames from 'classnames';
-import {
-    BulkDeleteButton,
-    List,
-    ListProps,
-    BulkActionProps,
-} from 'react-admin';
+import { BulkDeleteButton, List, ListProps, BulkActionProps }
+    from 'react-admin';
 import { Route, RouteChildrenProps, useHistory } from 'react-router-dom';
 import { Drawer, useMediaQuery, Theme } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
diff --git ORI/react-admin/examples/demo/src/reviews/ReviewListDesktop.tsx ALT/react-admin/examples/demo/src/reviews/ReviewListDesktop.tsx
index 51194f3..8e17446 100644
--- ORI/react-admin/examples/demo/src/reviews/ReviewListDesktop.tsx
+++ ALT/react-admin/examples/demo/src/reviews/ReviewListDesktop.tsx
@@ -1,11 +1,6 @@
 import * as React from 'react';
-import {
-    Identifier,
-    Datagrid,
-    DateField,
-    TextField,
-    DatagridProps,
-} from 'react-admin';
+import { Identifier, Datagrid, DateField, TextField, DatagridProps }
+    from 'react-admin';
 import { makeStyles } from '@material-ui/core/styles';
 
 import ProductReferenceField from '../products/ProductReferenceField';
diff --git ORI/react-admin/examples/demo/src/visitors/MobileGrid.tsx ALT/react-admin/examples/demo/src/visitors/MobileGrid.tsx
index e3159be..814721b 100644
--- ORI/react-admin/examples/demo/src/visitors/MobileGrid.tsx
+++ ALT/react-admin/examples/demo/src/visitors/MobileGrid.tsx
@@ -4,13 +4,8 @@ import Card from '@material-ui/core/Card';
 import CardContent from '@material-ui/core/CardContent';
 import CardHeader from '@material-ui/core/CardHeader';
 import { makeStyles } from '@material-ui/core/styles';
-import {
-    DateField,
-    EditButton,
-    useTranslate,
-    NumberField,
-    Identifier,
-} from 'react-admin';
+import { DateField, EditButton, useTranslate, NumberField, Identifier }
+    from 'react-admin';
 
 import AvatarField from './AvatarField';
 import ColoredNumberField from './ColoredNumberField';
diff --git ORI/react-admin/examples/demo/src/visitors/VisitorListAside.tsx ALT/react-admin/examples/demo/src/visitors/VisitorListAside.tsx
index 11132ee..49083ce 100644
--- ORI/react-admin/examples/demo/src/visitors/VisitorListAside.tsx
+++ ALT/react-admin/examples/demo/src/visitors/VisitorListAside.tsx
@@ -6,13 +6,8 @@ import MonetizationOnIcon from '@material-ui/icons/MonetizationOnOutlined';
 import MailIcon from '@material-ui/icons/MailOutline';
 import LocalOfferIcon from '@material-ui/icons/LocalOfferOutlined';
 import { FilterList, FilterListItem, FilterLiveSearch } from 'react-admin';
-import {
-    endOfYesterday,
-    startOfWeek,
-    subWeeks,
-    startOfMonth,
-    subMonths,
-} from 'date-fns';
+import { endOfYesterday, startOfWeek, subWeeks, startOfMonth, subMonths }
+    from 'date-fns';
 
 import segments from '../segments/data';
 
diff --git ORI/react-admin/examples/no-code/src/main.tsx ALT/react-admin/examples/no-code/src/main.tsx
index 984421f..affdd84 100644
--- ORI/react-admin/examples/no-code/src/main.tsx
+++ ALT/react-admin/examples/no-code/src/main.tsx
@@ -2,10 +2,8 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Root } from 'ra-no-code';
 import { defaultTheme } from 'react-admin';
-import {
-    unstable_createMuiStrictModeTheme,
-    createTheme,
-} from '@material-ui/core/styles';
+import { unstable_createMuiStrictModeTheme, createTheme }
+    from '@material-ui/core/styles';
 
 // FIXME MUI bug https://github.com/mui-org/material-ui/issues/13394
 const theme =
diff --git ORI/react-admin/examples/simple/src/comments/CommentCreate.tsx ALT/react-admin/examples/simple/src/comments/CommentCreate.tsx
index 18ee4d4..641548a 100644
--- ORI/react-admin/examples/simple/src/comments/CommentCreate.tsx
+++ ALT/react-admin/examples/simple/src/comments/CommentCreate.tsx
@@ -1,13 +1,7 @@
 import * as React from 'react';
 
-import {
-    Create,
-    DateInput,
-    TextInput,
-    SimpleForm,
-    required,
-    minLength,
-} from 'react-admin'; // eslint-disable-line import/no-unresolved
+import { Create, DateInput, TextInput, SimpleForm, required, minLength }
+    from 'react-admin'; // eslint-disable-line import/no-unresolved
 import PostReferenceInput from './PostReferenceInput';
 
 const now = new Date();
diff --git ORI/react-admin/examples/simple/src/comments/CommentShow.tsx ALT/react-admin/examples/simple/src/comments/CommentShow.tsx
index 4012292..e81d978 100644
--- ORI/react-admin/examples/simple/src/comments/CommentShow.tsx
+++ ALT/react-admin/examples/simple/src/comments/CommentShow.tsx
@@ -1,11 +1,6 @@
 import * as React from 'react';
-import {
-    DateField,
-    ReferenceField,
-    Show,
-    SimpleShowLayout,
-    TextField,
-} from 'react-admin'; // eslint-disable-line import/no-unresolved
+import { DateField, ReferenceField, Show, SimpleShowLayout, TextField }
+    from 'react-admin'; // eslint-disable-line import/no-unresolved
 
 const CommentShow = props => (
     <Show {...props}>
diff --git ORI/react-admin/examples/simple/src/comments/PostPreview.tsx ALT/react-admin/examples/simple/src/comments/PostPreview.tsx
index 67a2621..cbeac28 100644
--- ORI/react-admin/examples/simple/src/comments/PostPreview.tsx
+++ ALT/react-admin/examples/simple/src/comments/PostPreview.tsx
@@ -1,12 +1,7 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
-import {
-    SimpleShowLayout,
-    TextField,
-    ReduxState,
-    Identifier,
-    Record,
-} from 'react-admin';
+import { SimpleShowLayout, TextField, ReduxState, Identifier, Record }
+    from 'react-admin';
 
 const PostPreview = ({
     id,
diff --git ORI/react-admin/examples/simple/src/comments/PostReferenceInput.tsx ALT/react-admin/examples/simple/src/comments/PostReferenceInput.tsx
index 1bc95fd..188a3c7 100644
--- ORI/react-admin/examples/simple/src/comments/PostReferenceInput.tsx
+++ ALT/react-admin/examples/simple/src/comments/PostReferenceInput.tsx
@@ -3,13 +3,8 @@ import { Fragment, useState, useCallback } from 'react';
 import { FormSpy, useForm } from 'react-final-form';
 
 import { makeStyles } from '@material-ui/core/styles';
-import {
-    Button,
-    Dialog,
-    DialogTitle,
-    DialogContent,
-    DialogActions,
-} from '@material-ui/core';
+import { Button, Dialog, DialogTitle, DialogContent, DialogActions }
+    from '@material-ui/core';
 
 import { ReferenceInput, SelectInput, useTranslate } from 'react-admin'; // eslint-disable-line import/no-unresolved
 
diff --git ORI/react-admin/examples/simple/src/customRouteLayout.tsx ALT/react-admin/examples/simple/src/customRouteLayout.tsx
index 761eaee..4bd14b0 100644
--- ORI/react-admin/examples/simple/src/customRouteLayout.tsx
+++ ALT/react-admin/examples/simple/src/customRouteLayout.tsx
@@ -1,11 +1,6 @@
 import * as React from 'react';
-import {
-    useGetList,
-    useAuthenticated,
-    Datagrid,
-    TextField,
-    Title,
-} from 'react-admin';
+import { useGetList, useAuthenticated, Datagrid, TextField, Title }
+    from 'react-admin';
 
 const currentSort = { field: 'published_at', order: 'DESC' };
 
diff --git ORI/react-admin/examples/simple/src/posts/ResetViewsButton.tsx ALT/react-admin/examples/simple/src/posts/ResetViewsButton.tsx
index da23506..4ee38e9 100644
--- ORI/react-admin/examples/simple/src/posts/ResetViewsButton.tsx
+++ ALT/react-admin/examples/simple/src/posts/ResetViewsButton.tsx
@@ -1,13 +1,8 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import VisibilityOff from '@material-ui/icons/VisibilityOff';
-import {
-    useUpdateMany,
-    useNotify,
-    useUnselectAll,
-    Button,
-    CRUD_UPDATE_MANY,
-} from 'react-admin';
+import { useUpdateMany, useNotify, useUnselectAll, Button, CRUD_UPDATE_MANY }
+    from 'react-admin';
 
 const ResetViewsButton = ({ resource, selectedIds }) => {
     const notify = useNotify();
diff --git ORI/react-admin/examples/simple/src/tags/TagList.tsx ALT/react-admin/examples/simple/src/tags/TagList.tsx
index c10d9ad..709404d 100644
--- ORI/react-admin/examples/simple/src/tags/TagList.tsx
+++ ALT/react-admin/examples/simple/src/tags/TagList.tsx
@@ -1,12 +1,7 @@
 import * as React from 'react';
 import { Fragment, useState } from 'react';
-import {
-    ListBase,
-    ListActions,
-    useListContext,
-    EditButton,
-    Title,
-} from 'react-admin';
+import { ListBase, ListActions, useListContext, EditButton, Title }
+    from 'react-admin';
 import {
     Box,
     List,
diff --git ORI/react-admin/examples/simple/src/tags/TagShow.tsx ALT/react-admin/examples/simple/src/tags/TagShow.tsx
index ae66fc6..c949bf9 100644
--- ORI/react-admin/examples/simple/src/tags/TagShow.tsx
+++ ALT/react-admin/examples/simple/src/tags/TagShow.tsx
@@ -1,11 +1,6 @@
 import * as React from 'react';
-import {
-    Show,
-    SimpleShowLayout,
-    TextField,
-    TranslatableFields,
-    BooleanField,
-} from 'react-admin'; // eslint-disable-line import/no-unresolved
+import { Show, SimpleShowLayout, TextField, TranslatableFields, BooleanField }
+    from 'react-admin'; // eslint-disable-line import/no-unresolved
 
 const TagShow = props => (
     <Show {...props}>
diff --git ORI/react-admin/examples/simple/src/validators.tsx ALT/react-admin/examples/simple/src/validators.tsx
index 1dd70eb..64bba5d 100644
--- ORI/react-admin/examples/simple/src/validators.tsx
+++ ALT/react-admin/examples/simple/src/validators.tsx
@@ -1,7 +1,5 @@
-import {
-    required as createRequiredValidator,
-    number as createNumberValidator,
-} from 'react-admin';
+import { required as createRequiredValidator, number as createNumberValidator }
+    from 'react-admin';
 
 export const required = createRequiredValidator();
 export const number = createNumberValidator();
diff --git ORI/react-admin/packages/ra-core/src/actions/dataActions/crudCreate.ts ALT/react-admin/packages/ra-core/src/actions/dataActions/crudCreate.ts
index 5b85753..aaf3900 100644
--- ORI/react-admin/packages/ra-core/src/actions/dataActions/crudCreate.ts
+++ ALT/react-admin/packages/ra-core/src/actions/dataActions/crudCreate.ts
@@ -1,10 +1,8 @@
 import { Record } from '../../types';
 import { CREATE } from '../../core';
 import { FETCH_END, FETCH_ERROR } from '../fetchActions';
-import {
-    NotificationSideEffect,
-    RedirectionSideEffect,
-} from '../../sideEffect';
+import { NotificationSideEffect, RedirectionSideEffect }
+    from '../../sideEffect';
 
 export const crudCreate = (
     resource: string,
diff --git ORI/react-admin/packages/ra-core/src/actions/dataActions/crudDelete.ts ALT/react-admin/packages/ra-core/src/actions/dataActions/crudDelete.ts
index cd807a6..0dbbb49 100644
--- ORI/react-admin/packages/ra-core/src/actions/dataActions/crudDelete.ts
+++ ALT/react-admin/packages/ra-core/src/actions/dataActions/crudDelete.ts
@@ -1,11 +1,8 @@
 import { Identifier, Record } from '../../types';
 import { DELETE } from '../../core';
 import { FETCH_END, FETCH_ERROR } from '../fetchActions';
-import {
-    NotificationSideEffect,
-    RedirectionSideEffect,
-    RefreshSideEffect,
-} from '../../sideEffect';
+import { NotificationSideEffect, RedirectionSideEffect, RefreshSideEffect }
+    from '../../sideEffect';
 
 export const crudDelete = (
     resource: string,
diff --git ORI/react-admin/packages/ra-core/src/actions/dataActions/crudGetManyReference.ts ALT/react-admin/packages/ra-core/src/actions/dataActions/crudGetManyReference.ts
index 2520ab5..4a670c1 100644
--- ORI/react-admin/packages/ra-core/src/actions/dataActions/crudGetManyReference.ts
+++ ALT/react-admin/packages/ra-core/src/actions/dataActions/crudGetManyReference.ts
@@ -1,9 +1,5 @@
-import {
-    Identifier,
-    Record,
-    PaginationPayload,
-    SortPayload,
-} from '../../types';
+import { Identifier, Record, PaginationPayload, SortPayload }
+    from '../../types';
 import { GET_MANY_REFERENCE } from '../../core';
 import { FETCH_END, FETCH_ERROR } from '../fetchActions';
 import { NotificationSideEffect } from '../../sideEffect';
diff --git ORI/react-admin/packages/ra-core/src/actions/dataActions/crudGetOne.ts ALT/react-admin/packages/ra-core/src/actions/dataActions/crudGetOne.ts
index 69f8230..805ea46 100644
--- ORI/react-admin/packages/ra-core/src/actions/dataActions/crudGetOne.ts
+++ ALT/react-admin/packages/ra-core/src/actions/dataActions/crudGetOne.ts
@@ -1,11 +1,8 @@
 import { Identifier, Record } from '../../types';
 import { GET_ONE } from '../../core';
 import { FETCH_END, FETCH_ERROR } from '../fetchActions';
-import {
-    NotificationSideEffect,
-    RedirectionSideEffect,
-    RefreshSideEffect,
-} from '../../sideEffect';
+import { NotificationSideEffect, RedirectionSideEffect, RefreshSideEffect }
+    from '../../sideEffect';
 
 export const crudGetOne = (
     resource: string,
diff --git ORI/react-admin/packages/ra-core/src/actions/dataActions/crudUpdate.ts ALT/react-admin/packages/ra-core/src/actions/dataActions/crudUpdate.ts
index 33f8096..ce62b15 100644
--- ORI/react-admin/packages/ra-core/src/actions/dataActions/crudUpdate.ts
+++ ALT/react-admin/packages/ra-core/src/actions/dataActions/crudUpdate.ts
@@ -1,11 +1,8 @@
 import { Identifier, Record } from '../../types';
 import { UPDATE } from '../../core';
 import { FETCH_END, FETCH_ERROR } from '../fetchActions';
-import {
-    NotificationSideEffect,
-    RedirectionSideEffect,
-    RefreshSideEffect,
-} from '../../sideEffect';
+import { NotificationSideEffect, RedirectionSideEffect, RefreshSideEffect }
+    from '../../sideEffect';
 
 export const crudUpdate = (
     resource: string,
diff --git ORI/react-admin/packages/ra-core/src/controller/ListContextProvider.tsx ALT/react-admin/packages/ra-core/src/controller/ListContextProvider.tsx
index a1839b3..956fbcf 100644
--- ORI/react-admin/packages/ra-core/src/controller/ListContextProvider.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/ListContextProvider.tsx
@@ -2,9 +2,8 @@ import * as React from 'react';
 import ListContext from './ListContext';
 import ListFilterContext, { usePickFilterContext } from './ListFilterContext';
 import ListSortContext, { usePickSortContext } from './ListSortContext';
-import ListPaginationContext, {
-    usePickPaginationContext,
-} from './ListPaginationContext';
+import ListPaginationContext, { usePickPaginationContext }
+    from './ListPaginationContext';
 
 /**
  * Create a List Context and several thematic List subcontext.
diff --git ORI/react-admin/packages/ra-core/src/controller/ListController.tsx ALT/react-admin/packages/ra-core/src/controller/ListController.tsx
index d271ba1..9ce7c91 100644
--- ORI/react-admin/packages/ra-core/src/controller/ListController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/ListController.tsx
@@ -1,7 +1,5 @@
-import useListController, {
-    ListProps,
-    ListControllerProps,
-} from './useListController';
+import useListController, { ListProps, ListControllerProps }
+    from './useListController';
 import { useTranslate } from '../i18n';
 import { Translate } from '../types';
 
diff --git ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
index 576132e..750e8ce 100644
--- ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
@@ -1,17 +1,9 @@
-import {
-    useState,
-    useCallback,
-    ReactEventHandler,
-    SyntheticEvent,
-} from 'react';
+import { useState, useCallback, ReactEventHandler, SyntheticEvent }
+    from 'react';
 import { useDelete } from '../../dataProvider';
 import { CRUD_DELETE } from '../../actions';
-import {
-    useRefresh,
-    useNotify,
-    useRedirect,
-    RedirectionSideEffect,
-} from '../../sideEffect';
+import { useRefresh, useNotify, useRedirect, RedirectionSideEffect }
+    from '../../sideEffect';
 import { Record, MutationMode, OnFailure, OnSuccess } from '../../types';
 import { useResourceContext } from '../../core';
 
diff --git ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
index a354d05..2980fa5 100644
--- ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
@@ -1,12 +1,8 @@
 import { useCallback, ReactEventHandler } from 'react';
 import { useDelete } from '../../dataProvider';
 import { CRUD_DELETE } from '../../actions';
-import {
-    useRefresh,
-    useNotify,
-    useRedirect,
-    RedirectionSideEffect,
-} from '../../sideEffect';
+import { useRefresh, useNotify, useRedirect, RedirectionSideEffect }
+    from '../../sideEffect';
 import { Record, OnFailure, OnSuccess } from '../../types';
 import { useResourceContext } from '../../core';
 
diff --git ORI/react-admin/packages/ra-core/src/controller/details/CreateController.tsx ALT/react-admin/packages/ra-core/src/controller/details/CreateController.tsx
index 150a8d6..0863e0a 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/CreateController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/details/CreateController.tsx
@@ -1,10 +1,7 @@
 import { Translate } from '../../types';
 import { useTranslate } from '../../i18n';
-import {
-    useCreateController,
-    CreateProps,
-    CreateControllerProps,
-} from './useCreateController';
+import { useCreateController, CreateProps, CreateControllerProps }
+    from './useCreateController';
 
 interface CreateControllerComponentProps extends CreateControllerProps {
     translate: Translate;
diff --git ORI/react-admin/packages/ra-core/src/controller/details/EditController.tsx ALT/react-admin/packages/ra-core/src/controller/details/EditController.tsx
index afa6ac2..37c564d 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/EditController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/details/EditController.tsx
@@ -1,10 +1,7 @@
 import { Translate } from '../../types';
 import { useTranslate } from '../../i18n';
-import {
-    useEditController,
-    EditProps,
-    EditControllerProps,
-} from './useEditController';
+import { useEditController, EditProps, EditControllerProps }
+    from './useEditController';
 
 interface EditControllerComponentProps extends EditControllerProps {
     translate: Translate;
diff --git ORI/react-admin/packages/ra-core/src/controller/details/ShowController.tsx ALT/react-admin/packages/ra-core/src/controller/details/ShowController.tsx
index 83d3fd3..d7e22ea 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/ShowController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/details/ShowController.tsx
@@ -1,8 +1,5 @@
-import {
-    useShowController,
-    ShowProps,
-    ShowControllerProps,
-} from './useShowController';
+import { useShowController, ShowProps, ShowControllerProps }
+    from './useShowController';
 import { Translate } from '../../types';
 import { useTranslate } from '../../i18n';
 
diff --git ORI/react-admin/packages/ra-core/src/controller/details/index.ts ALT/react-admin/packages/ra-core/src/controller/details/index.ts
index 1d3703f..83b6504 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/index.ts
+++ ALT/react-admin/packages/ra-core/src/controller/details/index.ts
@@ -1,7 +1,5 @@
-import {
-    CreateControllerProps,
-    useCreateController,
-} from './useCreateController';
+import { CreateControllerProps, useCreateController }
+    from './useCreateController';
 import { EditControllerProps, useEditController } from './useEditController';
 import { ShowControllerProps, useShowController } from './useShowController';
 
diff --git ORI/react-admin/packages/ra-core/src/controller/details/useCreateController.ts ALT/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
index 5b0738e..227e550 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
@@ -6,11 +6,8 @@ import { match as Match, useLocation } from 'react-router-dom';
 
 import { useCheckMinimumRequiredProps } from '../checkMinimumRequiredProps';
 import { useCreate } from '../../dataProvider';
-import {
-    useNotify,
-    useRedirect,
-    RedirectionSideEffect,
-} from '../../sideEffect';
+import { useNotify, useRedirect, RedirectionSideEffect }
+    from '../../sideEffect';
 import {
     SetOnSuccess,
     SetOnFailure,
diff --git ORI/react-admin/packages/ra-core/src/controller/details/useEditController.ts ALT/react-admin/packages/ra-core/src/controller/details/useEditController.ts
index 6c68afa..d8b8ee6 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/useEditController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/details/useEditController.ts
@@ -2,19 +2,10 @@ import { useCallback, MutableRefObject } from 'react';
 
 import useVersion from '../useVersion';
 import { useCheckMinimumRequiredProps } from '../checkMinimumRequiredProps';
-import {
-    Record,
-    Identifier,
-    MutationMode,
-    OnSuccess,
-    OnFailure,
-} from '../../types';
-import {
-    useNotify,
-    useRedirect,
-    useRefresh,
-    RedirectionSideEffect,
-} from '../../sideEffect';
+import { Record, Identifier, MutationMode, OnSuccess, OnFailure }
+    from '../../types';
+import { useNotify, useRedirect, useRefresh, RedirectionSideEffect }
+    from '../../sideEffect';
 import { useGetOne, useUpdate, Refetch } from '../../dataProvider';
 import { useTranslate } from '../../i18n';
 import { CRUD_GET_ONE, CRUD_UPDATE } from '../../actions';
diff --git ORI/react-admin/packages/ra-core/src/controller/field/index.ts ALT/react-admin/packages/ra-core/src/controller/field/index.ts
index 58ba6cb..a454707 100644
--- ORI/react-admin/packages/ra-core/src/controller/field/index.ts
+++ ALT/react-admin/packages/ra-core/src/controller/field/index.ts
@@ -1,12 +1,9 @@
-import ReferenceArrayFieldController, {
-    ReferenceArrayFieldControllerProps,
-} from './ReferenceArrayFieldController';
-import ReferenceFieldController, {
-    ReferenceFieldControllerProps,
-} from './ReferenceFieldController';
-import ReferenceManyFieldController, {
-    ReferenceManyFieldControllerProps,
-} from './ReferenceManyFieldController';
+import ReferenceArrayFieldController, { ReferenceArrayFieldControllerProps }
+    from './ReferenceArrayFieldController';
+import ReferenceFieldController, { ReferenceFieldControllerProps }
+    from './ReferenceFieldController';
+import ReferenceManyFieldController, { ReferenceManyFieldControllerProps }
+    from './ReferenceManyFieldController';
 import getResourceLinkPath, { LinkToType } from './getResourceLinkPath';
 import useReferenceArrayFieldController from './useReferenceArrayFieldController';
 import useReferenceManyFieldController from './useReferenceManyFieldController';
diff --git ORI/react-admin/packages/ra-core/src/controller/input/ReferenceArrayInputContextProvider.tsx ALT/react-admin/packages/ra-core/src/controller/input/ReferenceArrayInputContextProvider.tsx
index d3229d6..6cf83d2 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/ReferenceArrayInputContextProvider.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/input/ReferenceArrayInputContextProvider.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import { ReactNode } from 'react';
-import {
-    ReferenceArrayInputContext,
-    ReferenceArrayInputContextValue,
-} from './ReferenceArrayInputContext';
+import { ReferenceArrayInputContext, ReferenceArrayInputContextValue }
+    from './ReferenceArrayInputContext';
 
 /**
  * Provider for the context which provides access to the useReferenceArrayInput features.
diff --git ORI/react-admin/packages/ra-core/src/controller/input/ReferenceInputController.tsx ALT/react-admin/packages/ra-core/src/controller/input/ReferenceInputController.tsx
index 995ed7f..3754e19 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/ReferenceInputController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/input/ReferenceInputController.tsx
@@ -1,10 +1,8 @@
 import { ReactNode, ComponentType, ReactElement } from 'react';
 
 import { SortPayload, Record } from '../../types';
-import {
-    useReferenceInputController,
-    ReferenceInputValue,
-} from './useReferenceInputController';
+import { useReferenceInputController, ReferenceInputValue }
+    from './useReferenceInputController';
 
 export interface ReferenceInputControllerProps {
     allowEmpty?: boolean;
diff --git ORI/react-admin/packages/ra-core/src/controller/input/index.ts ALT/react-admin/packages/ra-core/src/controller/input/index.ts
index 8da8a84..bc2c442 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/index.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/index.ts
@@ -1,7 +1,6 @@
 import ReferenceArrayInputController from './ReferenceArrayInputController';
-import ReferenceInputController, {
-    ReferenceInputControllerProps,
-} from './ReferenceInputController';
+import ReferenceInputController, { ReferenceInputControllerProps }
+    from './ReferenceInputController';
 import {
     getStatusForInput,
     getSelectedReferencesStatus,
diff --git ORI/react-admin/packages/ra-core/src/controller/input/useGetMatchingReferences.ts ALT/react-admin/packages/ra-core/src/controller/input/useGetMatchingReferences.ts
index b367ad9..3e6a31d 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/useGetMatchingReferences.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/useGetMatchingReferences.ts
@@ -8,12 +8,8 @@ import {
     getPossibleReferenceValues,
     getReferenceResource,
 } from '../../reducer';
-import {
-    PaginationPayload,
-    SortPayload,
-    Record,
-    FilterPayload,
-} from '../../types';
+import { PaginationPayload, SortPayload, Record, FilterPayload }
+    from '../../types';
 import { useDeepCompareEffect } from '../../util/hooks';
 
 interface UseMatchingReferencesOption {
diff --git ORI/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputContext.ts ALT/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputContext.ts
index 4cffb49..0163437 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputContext.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputContext.ts
@@ -1,9 +1,7 @@
 import { useContext, useMemo } from 'react';
 import defaults from 'lodash/defaults';
-import {
-    ReferenceArrayInputContext,
-    ReferenceArrayInputContextValue,
-} from './ReferenceArrayInputContext';
+import { ReferenceArrayInputContext, ReferenceArrayInputContextValue }
+    from './ReferenceArrayInputContext';
 
 /**
  * Hook to get the ReferenceArrayInputContext.
diff --git ORI/react-admin/packages/ra-core/src/controller/input/useReferenceInputController.ts ALT/react-admin/packages/ra-core/src/controller/input/useReferenceInputController.ts
index 00a7e98..21f5198 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/useReferenceInputController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/useReferenceInputController.ts
@@ -3,13 +3,8 @@ import { useCallback } from 'react';
 import useGetList from '../../dataProvider/useGetList';
 import { getStatusForInput as getDataStatus } from './referenceDataStatus';
 import useTranslate from '../../i18n/useTranslate';
-import {
-    PaginationPayload,
-    Record,
-    RecordMap,
-    Identifier,
-    SortPayload,
-} from '../../types';
+import { PaginationPayload, Record, RecordMap, Identifier, SortPayload }
+    from '../../types';
 import { ListControllerProps } from '../useListController';
 import useReference from '../useReference';
 import usePaginationState from '../usePaginationState';
diff --git ORI/react-admin/packages/ra-core/src/controller/useList.ts ALT/react-admin/packages/ra-core/src/controller/useList.ts
index 5b9591e..cc2eb30 100644
--- ORI/react-admin/packages/ra-core/src/controller/useList.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useList.ts
@@ -2,13 +2,8 @@ import { useCallback, useEffect, useRef } from 'react';
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 import { indexById, removeEmpty, useSafeSetState } from '../util';
-import {
-    FilterPayload,
-    Identifier,
-    Record,
-    RecordMap,
-    SortPayload,
-} from '../types';
+import { FilterPayload, Identifier, Record, RecordMap, SortPayload }
+    from '../types';
 import usePaginationState from './usePaginationState';
 import useSortState from './useSortState';
 import useSelectionState from './useSelectionState';
diff --git ORI/react-admin/packages/ra-core/src/controller/useListController.spec.tsx ALT/react-admin/packages/ra-core/src/controller/useListController.spec.tsx
index 2a462f0..7b2e01b 100644
--- ORI/react-admin/packages/ra-core/src/controller/useListController.spec.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/useListController.spec.tsx
@@ -6,10 +6,8 @@ import TextField from '@material-ui/core/TextField/TextField';
 
 import { DataProviderContext } from '../dataProvider';
 import ListController from './ListController';
-import {
-    getListControllerProps,
-    sanitizeListRestProps,
-} from './useListController';
+import { getListControllerProps, sanitizeListRestProps }
+    from './useListController';
 
 import { renderWithRedux } from 'ra-test';
 import { CRUD_CHANGE_LIST_PARAMS } from '../actions';
diff --git ORI/react-admin/packages/ra-core/src/controller/useListController.ts ALT/react-admin/packages/ra-core/src/controller/useListController.ts
index 1961864..beb8fc1 100644
--- ORI/react-admin/packages/ra-core/src/controller/useListController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useListController.ts
@@ -11,14 +11,8 @@ import { Refetch } from '../dataProvider/useQueryWithStore';
 import { SORT_ASC } from '../reducer/admin/resource/list/queryReducer';
 import { CRUD_GET_LIST } from '../actions';
 import defaultExporter from '../export/defaultExporter';
-import {
-    FilterPayload,
-    SortPayload,
-    RecordMap,
-    Identifier,
-    Record,
-    Exporter,
-} from '../types';
+import { FilterPayload, SortPayload, RecordMap, Identifier, Record, Exporter }
+    from '../types';
 import { useResourceContext, useGetResourceLabel } from '../core';
 
 export interface ListProps {
diff --git ORI/react-admin/packages/ra-core/src/controller/useListPaginationContext.ts ALT/react-admin/packages/ra-core/src/controller/useListPaginationContext.ts
index 94afa30..b93b880 100644
--- ORI/react-admin/packages/ra-core/src/controller/useListPaginationContext.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useListPaginationContext.ts
@@ -1,8 +1,7 @@
 import { useContext } from 'react';
 
-import ListPaginationContext, {
-    ListPaginationContextValue,
-} from './ListPaginationContext';
+import ListPaginationContext, { ListPaginationContextValue }
+    from './ListPaginationContext';
 
 /**
  * Hook to read the list controller props from the ListContext.
diff --git ORI/react-admin/packages/ra-core/src/controller/useListParams.spec.tsx ALT/react-admin/packages/ra-core/src/controller/useListParams.spec.tsx
index cb0511e..487aa33 100644
--- ORI/react-admin/packages/ra-core/src/controller/useListParams.spec.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/useListParams.spec.tsx
@@ -8,10 +8,8 @@ import { fireEvent, waitFor } from '@testing-library/react';
 import { renderWithRedux, TestContext } from 'ra-test';
 
 import useListParams, { getQuery, getNumberOrDefault } from './useListParams';
-import {
-    SORT_DESC,
-    SORT_ASC,
-} from '../reducer/admin/resource/list/queryReducer';
+import { SORT_DESC, SORT_ASC }
+    from '../reducer/admin/resource/list/queryReducer';
 
 describe('useListParams', () => {
     describe('getQuery', () => {
diff --git ORI/react-admin/packages/ra-core/src/controller/useSortState.ts ALT/react-admin/packages/ra-core/src/controller/useSortState.ts
index b6d5940..40ba676 100644
--- ORI/react-admin/packages/ra-core/src/controller/useSortState.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useSortState.ts
@@ -1,9 +1,7 @@
 import { useReducer, useEffect, useRef, useCallback } from 'react';
 
-import {
-    SORT_ASC,
-    SORT_DESC,
-} from '../reducer/admin/resource/list/queryReducer';
+import { SORT_ASC, SORT_DESC }
+    from '../reducer/admin/resource/list/queryReducer';
 import { SortPayload } from '../types';
 
 export interface SortProps {
diff --git ORI/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx ALT/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx
index 089b013..9563703 100644
--- ORI/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx
+++ ALT/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx
@@ -6,10 +6,8 @@ import { createHashHistory } from 'history';
 import { ConnectedRouter } from 'connected-react-router';
 
 import { AuthContext, convertLegacyAuthProvider } from '../auth';
-import {
-    DataProviderContext,
-    convertLegacyDataProvider,
-} from '../dataProvider';
+import { DataProviderContext, convertLegacyDataProvider }
+    from '../dataProvider';
 import createAdminStore from './createAdminStore';
 import TranslationProvider from '../i18n/TranslationProvider';
 import {
diff --git ORI/react-admin/packages/ra-core/src/core/createAdminStore.ts ALT/react-admin/packages/ra-core/src/core/createAdminStore.ts
index 43692d7..cf61123 100644
--- ORI/react-admin/packages/ra-core/src/core/createAdminStore.ts
+++ ALT/react-admin/packages/ra-core/src/core/createAdminStore.ts
@@ -4,12 +4,8 @@ import createSagaMiddleware from 'redux-saga';
 import { all, fork } from 'redux-saga/effects';
 import { History } from 'history';
 
-import {
-    AuthProvider,
-    DataProvider,
-    I18nProvider,
-    InitialState,
-} from '../types';
+import { AuthProvider, DataProvider, I18nProvider, InitialState }
+    from '../types';
 import createAppReducer from '../reducer';
 import { adminSaga } from '../sideEffect';
 import { CLEAR_STATE } from '../actions/clearActions';
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/fetch.spec.ts ALT/react-admin/packages/ra-core/src/dataProvider/fetch.spec.ts
index aac5f37..04ab67c 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/fetch.spec.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/fetch.spec.ts
@@ -1,9 +1,6 @@
 import expect from 'expect';
-import {
-    createHeadersFromOptions,
-    queryParameters,
-    flattenObject,
-} from './fetch';
+import { createHeadersFromOptions, queryParameters, flattenObject }
+    from './fetch';
 
 describe('queryParameters', () => {
     it('should generate a query parameter', () => {
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/performQuery/index.ts ALT/react-admin/packages/ra-core/src/dataProvider/performQuery/index.ts
index 9e31831..2946de5 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/performQuery/index.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/performQuery/index.ts
@@ -1,8 +1,5 @@
 import { doQuery } from './doQuery';
-import {
-    stackCall,
-    stackOptimisticCall,
-    getRemainingStackedCalls,
-} from './stackedCalls';
+import { stackCall, stackOptimisticCall, getRemainingStackedCalls }
+    from './stackedCalls';
 
 export { doQuery, stackCall, stackOptimisticCall, getRemainingStackedCalls };
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/performQuery/performOptimisticQuery.ts ALT/react-admin/packages/ra-core/src/dataProvider/performQuery/performOptimisticQuery.ts
index c462c3b..e684b70 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/performQuery/performOptimisticQuery.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/performQuery/performOptimisticQuery.ts
@@ -1,14 +1,9 @@
 import validateResponseFormat from '../validateResponseFormat';
 import getFetchType from '../getFetchType';
-import {
-    startOptimisticMode,
-    stopOptimisticMode,
-} from '../../actions/undoActions';
-import {
-    FETCH_END,
-    FETCH_ERROR,
-    FETCH_START,
-} from '../../actions/fetchActions';
+import { startOptimisticMode, stopOptimisticMode }
+    from '../../actions/undoActions';
+import { FETCH_END, FETCH_ERROR, FETCH_START }
+    from '../../actions/fetchActions';
 import { replayStackedCalls } from './stackedCalls';
 import { QueryFunctionParams } from './QueryFunctionParams';
 
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/performQuery/performPessimisticQuery.ts ALT/react-admin/packages/ra-core/src/dataProvider/performQuery/performPessimisticQuery.ts
index 214c4e3..b777673 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/performQuery/performPessimisticQuery.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/performQuery/performPessimisticQuery.ts
@@ -1,10 +1,7 @@
 import validateResponseFormat from '../validateResponseFormat';
 import getFetchType from '../getFetchType';
-import {
-    FETCH_END,
-    FETCH_ERROR,
-    FETCH_START,
-} from '../../actions/fetchActions';
+import { FETCH_END, FETCH_ERROR, FETCH_START }
+    from '../../actions/fetchActions';
 import { QueryFunctionParams } from './QueryFunctionParams';
 
 /**
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/performQuery/performUndoableQuery.ts ALT/react-admin/packages/ra-core/src/dataProvider/performQuery/performUndoableQuery.ts
index fae1f64..c729304 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/performQuery/performUndoableQuery.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/performQuery/performUndoableQuery.ts
@@ -1,17 +1,12 @@
 import validateResponseFormat from '../validateResponseFormat';
 import getFetchType from '../getFetchType';
 import undoableEventEmitter from '../undoableEventEmitter';
-import {
-    startOptimisticMode,
-    stopOptimisticMode,
-} from '../../actions/undoActions';
+import { startOptimisticMode, stopOptimisticMode }
+    from '../../actions/undoActions';
 import { showNotification } from '../../actions/notificationActions';
 import { refreshView } from '../../actions/uiActions';
-import {
-    FETCH_END,
-    FETCH_ERROR,
-    FETCH_START,
-} from '../../actions/fetchActions';
+import { FETCH_END, FETCH_ERROR, FETCH_START }
+    from '../../actions/fetchActions';
 import { replayStackedCalls } from './stackedCalls';
 import { QueryFunctionParams } from './QueryFunctionParams';
 
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/useDataProvider.ts ALT/react-admin/packages/ra-core/src/dataProvider/useDataProvider.ts
index 80ba4c9..20d46a9 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/useDataProvider.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/useDataProvider.ts
@@ -7,12 +7,8 @@ import defaultDataProvider from './defaultDataProvider';
 import { ReduxState, DataProvider, DataProviderProxy } from '../types';
 import useLogoutIfAccessDenied from '../auth/useLogoutIfAccessDenied';
 import { getDataProviderCallArguments } from './getDataProviderCallArguments';
-import {
-    doQuery,
-    stackCall,
-    stackOptimisticCall,
-    getRemainingStackedCalls,
-} from './performQuery';
+import { doQuery, stackCall, stackOptimisticCall, getRemainingStackedCalls }
+    from './performQuery';
 
 /**
  * Hook for getting a dataProvider
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/useGetManyReference.ts ALT/react-admin/packages/ra-core/src/dataProvider/useGetManyReference.ts
index be3230e..fdeabb5 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/useGetManyReference.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/useGetManyReference.ts
@@ -11,11 +11,8 @@ import {
     RecordMap,
 } from '../types';
 import { useQueryWithStore } from './useQueryWithStore';
-import {
-    getIds,
-    getTotal,
-    nameRelatedTo,
-} from '../reducer/admin/references/oneToMany';
+import { getIds, getTotal, nameRelatedTo }
+    from '../reducer/admin/references/oneToMany';
 
 const defaultIds = [];
 const defaultData = {};
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/useGetMatching.ts ALT/react-admin/packages/ra-core/src/dataProvider/useGetMatching.ts
index 9150dab..c3eca49 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/useGetMatching.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/useGetMatching.ts
@@ -2,13 +2,8 @@ import { useSelector } from 'react-redux';
 import get from 'lodash/get';
 
 import { CRUD_GET_MATCHING } from '../actions/dataActions/crudGetMatching';
-import {
-    Identifier,
-    PaginationPayload,
-    SortPayload,
-    Record,
-    ReduxState,
-} from '../types';
+import { Identifier, PaginationPayload, SortPayload, Record, ReduxState }
+    from '../types';
 import { useQueryWithStore, Refetch } from './useQueryWithStore';
 import {
     getReferenceResource,
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/useGetOne.ts ALT/react-admin/packages/ra-core/src/dataProvider/useGetOne.ts
index ffe9e94..76b9d8d 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/useGetOne.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/useGetOne.ts
@@ -1,11 +1,7 @@
 import get from 'lodash/get';
 
-import {
-    Identifier,
-    Record,
-    ReduxState,
-    UseDataProviderOptions,
-} from '../types';
+import { Identifier, Record, ReduxState, UseDataProviderOptions }
+    from '../types';
 import { useQueryWithStore, Refetch } from './useQueryWithStore';
 
 /**
diff --git ORI/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx ALT/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx
index d0ab045..d439cf0 100644
--- ORI/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx
+++ ALT/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx
@@ -7,12 +7,8 @@ import { useDispatch } from 'react-redux';
 import useResetSubmitErrors from './useResetSubmitErrors';
 import sanitizeEmptyValues from './sanitizeEmptyValues';
 import getFormInitialValues from './getFormInitialValues';
-import {
-    FormContextValue,
-    Record as RaRecord,
-    OnSuccess,
-    OnFailure,
-} from '../types';
+import { FormContextValue, Record as RaRecord, OnSuccess, OnFailure }
+    from '../types';
 import { RedirectionSideEffect } from '../sideEffect';
 import { setAutomaticRefresh } from '../actions';
 import { RecordContextProvider, useRecordContext } from '../controller';
diff --git ORI/react-admin/packages/ra-core/src/form/ValidationError.tsx ALT/react-admin/packages/ra-core/src/form/ValidationError.tsx
index e4a7e63..edafcfb 100644
--- ORI/react-admin/packages/ra-core/src/form/ValidationError.tsx
+++ ALT/react-admin/packages/ra-core/src/form/ValidationError.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
-import {
-    ValidationErrorMessage,
-    ValidationErrorMessageWithArgs,
-} from './validate';
+import { ValidationErrorMessage, ValidationErrorMessageWithArgs }
+    from './validate';
 import { useTranslate } from '../i18n';
 
 export interface ValidationErrorProps {
diff --git ORI/react-admin/packages/ra-core/src/i18n/TranslatableContextProvider.tsx ALT/react-admin/packages/ra-core/src/i18n/TranslatableContextProvider.tsx
index c564655..48e267b 100644
--- ORI/react-admin/packages/ra-core/src/i18n/TranslatableContextProvider.tsx
+++ ALT/react-admin/packages/ra-core/src/i18n/TranslatableContextProvider.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import { ReactElement, ReactNode } from 'react';
-import {
-    TranslatableContext,
-    TranslatableContextValue,
-} from './TranslatableContext';
+import { TranslatableContext, TranslatableContextValue }
+    from './TranslatableContext';
 
 export const TranslatableContextProvider = ({
     children,
diff --git ORI/react-admin/packages/ra-core/src/i18n/TranslationUtils.spec.ts ALT/react-admin/packages/ra-core/src/i18n/TranslationUtils.spec.ts
index 25dfe35..55f5cad 100644
--- ORI/react-admin/packages/ra-core/src/i18n/TranslationUtils.spec.ts
+++ ALT/react-admin/packages/ra-core/src/i18n/TranslationUtils.spec.ts
@@ -1,9 +1,6 @@
 import expect from 'expect';
-import {
-    resolveBrowserLocale,
-    mergeTranslations,
-    DEFAULT_LOCALE,
-} from './index';
+import { resolveBrowserLocale, mergeTranslations, DEFAULT_LOCALE }
+    from './index';
 
 describe('TranslationUtils', () => {
     describe('resolveBrowserLocale', () => {
diff --git ORI/react-admin/packages/ra-core/src/i18n/index.ts ALT/react-admin/packages/ra-core/src/i18n/index.ts
index 29bf286..e92dd84 100644
--- ORI/react-admin/packages/ra-core/src/i18n/index.ts
+++ ALT/react-admin/packages/ra-core/src/i18n/index.ts
@@ -1,8 +1,7 @@
 import translate from './translate';
 import { TranslationContext } from './TranslationContext';
-import TranslationProvider, {
-    TranslationProviderProps,
-} from './TranslationProvider';
+import TranslationProvider, { TranslationProviderProps }
+    from './TranslationProvider';
 import TestTranslationProvider from './TestTranslationProvider';
 import useLocale from './useLocale';
 import useSetLocale from './useSetLocale';
diff --git ORI/react-admin/packages/ra-core/src/i18n/useTranslatableContext.ts ALT/react-admin/packages/ra-core/src/i18n/useTranslatableContext.ts
index 952f573..ead5aea 100644
--- ORI/react-admin/packages/ra-core/src/i18n/useTranslatableContext.ts
+++ ALT/react-admin/packages/ra-core/src/i18n/useTranslatableContext.ts
@@ -1,8 +1,6 @@
 import { useContext } from 'react';
-import {
-    TranslatableContext,
-    TranslatableContextValue,
-} from './TranslatableContext';
+import { TranslatableContext, TranslatableContextValue }
+    from './TranslatableContext';
 
 /**
  * Gives access to the current TranslatableContext.
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/loading.spec.ts ALT/react-admin/packages/ra-core/src/reducer/admin/loading.spec.ts
index 6b59a8f..7697af1 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/loading.spec.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/loading.spec.ts
@@ -1,10 +1,6 @@
 import expect from 'expect';
-import {
-    FETCH_START,
-    FETCH_END,
-    FETCH_ERROR,
-    FETCH_CANCEL,
-} from '../../actions/fetchActions';
+import { FETCH_START, FETCH_END, FETCH_ERROR, FETCH_CANCEL }
+    from '../../actions/fetchActions';
 
 import reducer from './loading';
 
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/loading.ts ALT/react-admin/packages/ra-core/src/reducer/admin/loading.ts
index 7a8032b..156d369 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/loading.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/loading.ts
@@ -1,10 +1,6 @@
 import { Reducer } from 'redux';
-import {
-    FETCH_START,
-    FETCH_END,
-    FETCH_ERROR,
-    FETCH_CANCEL,
-} from '../../actions/fetchActions';
+import { FETCH_START, FETCH_END, FETCH_ERROR, FETCH_CANCEL }
+    from '../../actions/fetchActions';
 
 type State = number;
 
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/notifications.spec.ts ALT/react-admin/packages/ra-core/src/reducer/admin/notifications.spec.ts
index 7d38d7a..081b6e2 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/notifications.spec.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/notifications.spec.ts
@@ -1,9 +1,6 @@
 import expect from 'expect';
-import {
-    HIDE_NOTIFICATION,
-    SHOW_NOTIFICATION,
-    NotificationType,
-} from '../../actions/notificationActions';
+import { HIDE_NOTIFICATION, SHOW_NOTIFICATION, NotificationType }
+    from '../../actions/notificationActions';
 import reducer from './notifications';
 
 describe('notifications reducer', () => {
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/references/possibleValues.spec.ts ALT/react-admin/packages/ra-core/src/reducer/admin/references/possibleValues.spec.ts
index 502be7b..4f3655c 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/references/possibleValues.spec.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/references/possibleValues.spec.ts
@@ -1,7 +1,5 @@
-import {
-    getPossibleReferenceValues,
-    getPossibleReferences,
-} from './possibleValues';
+import { getPossibleReferenceValues, getPossibleReferences }
+    from './possibleValues';
 
 describe('possibleValues reducer', () => {
     describe('getPossibleReferenceValues selector', () => {
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests.ts
index 151d64b..4f2bf0b 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests.ts
@@ -2,14 +2,8 @@ import { Reducer } from 'redux';
 
 import { Identifier } from '../../../../types';
 import { FETCH_END, REFRESH_VIEW } from '../../../../actions';
-import {
-    GET_LIST,
-    CREATE,
-    DELETE,
-    DELETE_MANY,
-    UPDATE,
-    UPDATE_MANY,
-} from '../../../../core';
+import { GET_LIST, CREATE, DELETE, DELETE_MANY, UPDATE, UPDATE_MANY }
+    from '../../../../core';
 import ids from './cachedRequests/ids';
 import total from './cachedRequests/total';
 import validity from './cachedRequests/validity';
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests/ids.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests/ids.ts
index e5be1a7..e693e37 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests/ids.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests/ids.ts
@@ -1,8 +1,6 @@
 import { Reducer } from 'redux';
-import {
-    CrudGetListSuccessAction,
-    CrudGetMatchingSuccessAction,
-} from '../../../../../actions';
+import { CrudGetListSuccessAction, CrudGetMatchingSuccessAction }
+    from '../../../../../actions';
 import { GET_LIST } from '../../../../../core';
 import { Identifier } from '../../../../../types';
 
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests/total.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests/total.ts
index cfa1edb..21403a1 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests/total.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/cachedRequests/total.ts
@@ -1,10 +1,8 @@
 import { Reducer } from 'redux';
 
 import { GET_LIST } from '../../../../../core';
-import {
-    CrudGetListSuccessAction,
-    CrudGetMatchingSuccessAction,
-} from '../../../../../actions/dataActions';
+import { CrudGetListSuccessAction, CrudGetMatchingSuccessAction }
+    from '../../../../../actions/dataActions';
 
 type ActionTypes =
     | CrudGetListSuccessAction
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/expanded.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/expanded.ts
index 3000184..41d8516 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/expanded.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/expanded.ts
@@ -1,8 +1,6 @@
 import { Reducer } from 'redux';
-import {
-    ToggleListItemExpandAction,
-    TOGGLE_LIST_ITEM_EXPAND,
-} from '../../../../actions/listActions';
+import { ToggleListItemExpandAction, TOGGLE_LIST_ITEM_EXPAND }
+    from '../../../../actions/listActions';
 import { Identifier } from '../../../../types';
 
 type IdentifierArray = Identifier[];
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/ids.spec.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/ids.spec.ts
index cda2146..2a9da46 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/ids.spec.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/ids.spec.ts
@@ -1,8 +1,6 @@
 import idsReducer from './ids';
-import {
-    CRUD_GET_LIST_SUCCESS,
-    CRUD_CREATE_SUCCESS,
-} from '../../../../actions';
+import { CRUD_GET_LIST_SUCCESS, CRUD_CREATE_SUCCESS }
+    from '../../../../actions';
 import { DELETE, DELETE_MANY } from '../../../../core';
 
 describe('ids reducer', () => {
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/params.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/params.ts
index 8f2e6e9..c477e75 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/params.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/params.ts
@@ -1,8 +1,6 @@
 import { Reducer } from 'redux';
-import {
-    CRUD_CHANGE_LIST_PARAMS,
-    ChangeListParamsAction,
-} from '../../../../actions/listActions';
+import { CRUD_CHANGE_LIST_PARAMS, ChangeListParamsAction }
+    from '../../../../actions/listActions';
 
 const defaultState = {
     sort: null,
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/total.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/total.ts
index 1d43900..c7361bd 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/total.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/total.ts
@@ -1,8 +1,6 @@
 import { Reducer } from 'redux';
-import {
-    CRUD_GET_LIST_SUCCESS,
-    CrudGetListSuccessAction,
-} from '../../../../actions/dataActions';
+import { CRUD_GET_LIST_SUCCESS, CrudGetListSuccessAction }
+    from '../../../../actions/dataActions';
 import { DELETE, DELETE_MANY } from '../../../../core';
 
 type ActionTypes =
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/ui.ts ALT/react-admin/packages/ra-core/src/reducer/admin/ui.ts
index 2dd8c04..31a4322 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/ui.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/ui.ts
@@ -11,10 +11,8 @@ import {
     STOP_OPTIMISTIC_MODE,
     StopOptimisticModeAction,
 } from '../../actions';
-import {
-    SET_AUTOMATIC_REFRESH,
-    SetAutomaticRefreshAction,
-} from '../../actions/uiActions';
+import { SET_AUTOMATIC_REFRESH, SetAutomaticRefreshAction }
+    from '../../actions/uiActions';
 
 type ActionTypes =
     | ToggleSidebarAction
diff --git ORI/react-admin/packages/ra-core/src/sideEffect/auth.spec.ts ALT/react-admin/packages/ra-core/src/sideEffect/auth.spec.ts
index 9b8502a..8b5d984 100644
--- ORI/react-admin/packages/ra-core/src/sideEffect/auth.spec.ts
+++ ALT/react-admin/packages/ra-core/src/sideEffect/auth.spec.ts
@@ -1,21 +1,12 @@
 import expect from 'expect';
 import { runSaga } from 'redux-saga';
-import {
-    handleLogin,
-    handleCheck,
-    handleLogout,
-    handleFetchError,
-} from './auth';
-import {
-    USER_LOGIN_LOADING,
-    USER_LOGIN_SUCCESS,
-    USER_LOGIN_FAILURE,
-} from '../actions/authActions';
+import { handleLogin, handleCheck, handleLogout, handleFetchError }
+    from './auth';
+import { USER_LOGIN_LOADING, USER_LOGIN_SUCCESS, USER_LOGIN_FAILURE }
+    from '../actions/authActions';
 import { push, replace } from 'connected-react-router';
-import {
-    showNotification,
-    hideNotification,
-} from '../actions/notificationActions';
+import { showNotification, hideNotification }
+    from '../actions/notificationActions';
 import { clearState } from '../actions/clearActions';
 import { waitFor } from '@testing-library/react';
 
diff --git ORI/react-admin/packages/ra-core/src/sideEffect/auth.ts ALT/react-admin/packages/ra-core/src/sideEffect/auth.ts
index 2100ef7..efba0e2 100644
--- ORI/react-admin/packages/ra-core/src/sideEffect/auth.ts
+++ ALT/react-admin/packages/ra-core/src/sideEffect/auth.ts
@@ -1,18 +1,10 @@
-import {
-    all,
-    put,
-    call,
-    select,
-    takeLatest,
-    takeEvery,
-} from 'redux-saga/effects';
+import { all, put, call, select, takeLatest, takeEvery }
+    from 'redux-saga/effects';
 import { push, replace } from 'connected-react-router';
 
 import { AuthProvider } from '../types';
-import {
-    showNotification,
-    hideNotification,
-} from '../actions/notificationActions';
+import { showNotification, hideNotification }
+    from '../actions/notificationActions';
 import {
     USER_LOGIN,
     USER_LOGIN_LOADING,
diff --git ORI/react-admin/packages/ra-core/src/sideEffect/fetch.ts ALT/react-admin/packages/ra-core/src/sideEffect/fetch.ts
index 5dd1735..2abbd02 100644
--- ORI/react-admin/packages/ra-core/src/sideEffect/fetch.ts
+++ ALT/react-admin/packages/ra-core/src/sideEffect/fetch.ts
@@ -1,11 +1,5 @@
-import {
-    all,
-    call,
-    cancelled,
-    put,
-    select,
-    takeEvery,
-} from 'redux-saga/effects';
+import { all, call, cancelled, put, select, takeEvery }
+    from 'redux-saga/effects';
 import { DataProvider, ReduxState } from '../types';
 import { FETCH_CANCEL, FETCH_END, FETCH_ERROR, FETCH_START } from '../actions';
 import {
diff --git ORI/react-admin/packages/ra-core/src/sideEffect/notification.ts ALT/react-admin/packages/ra-core/src/sideEffect/notification.ts
index ae8c2e6..a8248f1 100644
--- ORI/react-admin/packages/ra-core/src/sideEffect/notification.ts
+++ ALT/react-admin/packages/ra-core/src/sideEffect/notification.ts
@@ -1,8 +1,6 @@
 import { put, takeEvery } from 'redux-saga/effects';
-import {
-    showNotification,
-    NotificationType,
-} from '../actions/notificationActions';
+import { showNotification, NotificationType }
+    from '../actions/notificationActions';
 
 export interface NotificationSideEffect {
     body: string;
diff --git ORI/react-admin/packages/ra-core/src/sideEffect/undo.spec.ts ALT/react-admin/packages/ra-core/src/sideEffect/undo.spec.ts
index 8cb90b8..5c5e27b 100644
--- ORI/react-admin/packages/ra-core/src/sideEffect/undo.spec.ts
+++ ALT/react-admin/packages/ra-core/src/sideEffect/undo.spec.ts
@@ -2,12 +2,8 @@ import expect from 'expect';
 import { put, race, take } from 'redux-saga/effects';
 
 import { showNotification } from '../actions/notificationActions';
-import {
-    UNDO,
-    COMPLETE,
-    startOptimisticMode,
-    stopOptimisticMode,
-} from '../actions/undoActions';
+import { UNDO, COMPLETE, startOptimisticMode, stopOptimisticMode }
+    from '../actions/undoActions';
 import { refreshView } from '../actions/uiActions';
 
 import { handleUndoRace } from './undo';
diff --git ORI/react-admin/packages/ra-core/src/sideEffect/undo.ts ALT/react-admin/packages/ra-core/src/sideEffect/undo.ts
index c3be6f4..6d703e1 100644
--- ORI/react-admin/packages/ra-core/src/sideEffect/undo.ts
+++ ALT/react-admin/packages/ra-core/src/sideEffect/undo.ts
@@ -1,13 +1,8 @@
 import { take, takeEvery, put, race } from 'redux-saga/effects';
 
 import { showNotification } from '../actions/notificationActions';
-import {
-    UNDOABLE,
-    UNDO,
-    COMPLETE,
-    startOptimisticMode,
-    stopOptimisticMode,
-} from '../actions/undoActions';
+import { UNDOABLE, UNDO, COMPLETE, startOptimisticMode, stopOptimisticMode }
+    from '../actions/undoActions';
 import { refreshView } from '../actions/uiActions';
 
 export function* handleUndoRace(undoableAction: { payload: { action: any } }) {
diff --git ORI/react-admin/packages/ra-core/src/sideEffect/useNotify.ts ALT/react-admin/packages/ra-core/src/sideEffect/useNotify.ts
index ec0f018..e9a60a4 100644
--- ORI/react-admin/packages/ra-core/src/sideEffect/useNotify.ts
+++ ALT/react-admin/packages/ra-core/src/sideEffect/useNotify.ts
@@ -1,10 +1,7 @@
 import { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
-import {
-    showNotification,
-    NotificationType,
-    NotificationOptions,
-} from '../actions/notificationActions';
+import { showNotification, NotificationType, NotificationOptions }
+    from '../actions/notificationActions';
 import warning from '../util/warning';
 
 /**
diff --git ORI/react-admin/packages/ra-core/src/types.ts ALT/react-admin/packages/ra-core/src/types.ts
index eb316a1..1dbf7ad 100644
--- ORI/react-admin/packages/ra-core/src/types.ts
+++ ALT/react-admin/packages/ra-core/src/types.ts
@@ -1,9 +1,6 @@
 import { ReactNode, ReactElement, ComponentType } from 'react';
-import {
-    RouteProps,
-    RouteComponentProps,
-    match as Match,
-} from 'react-router-dom';
+import { RouteProps, RouteComponentProps, match as Match }
+    from 'react-router-dom';
 import { ThemeOptions } from '@material-ui/core';
 import { StaticContext } from 'react-router';
 import { Location, History, LocationState } from 'history';
diff --git ORI/react-admin/packages/ra-data-graphql-simple/src/buildGqlQuery.test.ts ALT/react-admin/packages/ra-data-graphql-simple/src/buildGqlQuery.test.ts
index d37fdff..93aa1af 100644
--- ORI/react-admin/packages/ra-data-graphql-simple/src/buildGqlQuery.test.ts
+++ ALT/react-admin/packages/ra-data-graphql-simple/src/buildGqlQuery.test.ts
@@ -8,12 +8,8 @@ import {
     CREATE,
     DELETE,
 } from 'ra-core';
-import buildGqlQuery, {
-    buildApolloArgs,
-    buildArgs,
-    buildFields,
-    getArgType,
-} from './buildGqlQuery';
+import buildGqlQuery, { buildApolloArgs, buildArgs, buildFields, getArgType }
+    from './buildGqlQuery';
 
 describe('getArgType', () => {
     it('returns the arg type', () => {
diff --git ORI/react-admin/packages/ra-data-graphql-simple/src/buildGqlQuery.ts ALT/react-admin/packages/ra-data-graphql-simple/src/buildGqlQuery.ts
index 8bc0762..0f296cf 100644
--- ORI/react-admin/packages/ra-data-graphql-simple/src/buildGqlQuery.ts
+++ ALT/react-admin/packages/ra-data-graphql-simple/src/buildGqlQuery.ts
@@ -1,9 +1,6 @@
 import { GET_LIST, GET_MANY, GET_MANY_REFERENCE, DELETE } from 'ra-core';
-import {
-    QUERY_TYPES,
-    IntrospectionResult,
-    IntrospectedResource,
-} from 'ra-data-graphql';
+import { QUERY_TYPES, IntrospectionResult, IntrospectedResource }
+    from 'ra-data-graphql';
 import {
     ArgumentNode,
     IntrospectionField,
diff --git ORI/react-admin/packages/ra-data-graphql-simple/src/buildVariables.test.ts ALT/react-admin/packages/ra-data-graphql-simple/src/buildVariables.test.ts
index 57b9ce3..77d6409 100644
--- ORI/react-admin/packages/ra-data-graphql-simple/src/buildVariables.test.ts
+++ ALT/react-admin/packages/ra-data-graphql-simple/src/buildVariables.test.ts
@@ -1,11 +1,5 @@
-import {
-    GET_LIST,
-    GET_MANY,
-    GET_MANY_REFERENCE,
-    CREATE,
-    UPDATE,
-    DELETE,
-} from 'ra-core';
+import { GET_LIST, GET_MANY, GET_MANY_REFERENCE, CREATE, UPDATE, DELETE }
+    from 'ra-core';
 import buildVariables from './buildVariables';
 
 describe('buildVariables', () => {
diff --git ORI/react-admin/packages/ra-data-graphql-simple/src/getResponseParser.test.ts ALT/react-admin/packages/ra-data-graphql-simple/src/getResponseParser.test.ts
index 52772e1..52a706f 100644
--- ORI/react-admin/packages/ra-data-graphql-simple/src/getResponseParser.test.ts
+++ ALT/react-admin/packages/ra-data-graphql-simple/src/getResponseParser.test.ts
@@ -1,12 +1,6 @@
 import { TypeKind } from 'graphql';
-import {
-    GET_LIST,
-    GET_MANY,
-    GET_MANY_REFERENCE,
-    CREATE,
-    UPDATE,
-    DELETE,
-} from 'ra-core';
+import { GET_LIST, GET_MANY, GET_MANY_REFERENCE, CREATE, UPDATE, DELETE }
+    from 'ra-core';
 import getResponseParser from './getResponseParser';
 
 describe('getResponseParser', () => {
diff --git ORI/react-admin/packages/ra-data-graphql/src/buildApolloClient.ts ALT/react-admin/packages/ra-data-graphql/src/buildApolloClient.ts
index d501eeb..1fb6228 100644
--- ORI/react-admin/packages/ra-data-graphql/src/buildApolloClient.ts
+++ ALT/react-admin/packages/ra-data-graphql/src/buildApolloClient.ts
@@ -1,9 +1,5 @@
-import {
-    ApolloClient,
-    ApolloClientOptions,
-    HttpLink,
-    InMemoryCache,
-} from '@apollo/client';
+import { ApolloClient, ApolloClientOptions, HttpLink, InMemoryCache }
+    from '@apollo/client';
 
 export default (options: Partial<ApolloClientOptions<unknown>>) => {
     if (!options) {
diff --git ORI/react-admin/packages/ra-data-graphql/src/index.ts ALT/react-admin/packages/ra-data-graphql/src/index.ts
index 8438c76..24d1fbf 100644
--- ORI/react-admin/packages/ra-data-graphql/src/index.ts
+++ ALT/react-admin/packages/ra-data-graphql/src/index.ts
@@ -32,11 +32,8 @@ import {
     MUTATION_TYPES as INNER_MUTATION_TYPES,
     ALL_TYPES as INNER_ALL_TYPES,
 } from './constants';
-import {
-    introspectSchema,
-    IntrospectionOptions,
-    IntrospectionResult,
-} from './introspection';
+import { introspectSchema, IntrospectionOptions, IntrospectionResult }
+    from './introspection';
 
 export * from './introspection';
 export const QUERY_TYPES = INNER_QUERY_TYPES;
diff --git ORI/react-admin/packages/ra-data-graphql/src/introspection.test.ts ALT/react-admin/packages/ra-data-graphql/src/introspection.test.ts
index f148ee8..a06ca0f 100644
--- ORI/react-admin/packages/ra-data-graphql/src/introspection.test.ts
+++ ALT/react-admin/packages/ra-data-graphql/src/introspection.test.ts
@@ -1,8 +1,5 @@
-import {
-    introspectSchema,
-    isResourceExcluded,
-    isResourceIncluded,
-} from './introspection';
+import { introspectSchema, isResourceExcluded, isResourceIncluded }
+    from './introspection';
 import {
     GET_LIST,
     GET_ONE,
diff --git ORI/react-admin/packages/ra-input-rich-text/src/index.tsx ALT/react-admin/packages/ra-input-rich-text/src/index.tsx
index 43526c8..dcc3d59 100644
--- ORI/react-admin/packages/ra-input-rich-text/src/index.tsx
+++ ALT/react-admin/packages/ra-input-rich-text/src/index.tsx
@@ -3,12 +3,8 @@ import React, { useRef, useEffect, useCallback, ComponentProps } from 'react';
 import Quill, { QuillOptionsStatic } from 'quill';
 import { useInput, FieldTitle } from 'ra-core';
 import { InputHelperText } from 'ra-ui-materialui';
-import {
-    FormHelperText,
-    FormControl,
-    InputLabel,
-    PropTypes as MuiPropTypes,
-} from '@material-ui/core';
+import { FormHelperText, FormControl, InputLabel, PropTypes as MuiPropTypes }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import PropTypes from 'prop-types';
 
diff --git ORI/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx ALT/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx
index 0422b62..3f35655 100644
--- ORI/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx
+++ ALT/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx
@@ -16,17 +16,13 @@ import {
     ThemeProvider,
     unstable_createMuiStrictModeTheme,
 } from '@material-ui/core/styles';
-import {
-    defaultTheme as RaDefaultTheme,
-    RaThemeOptions,
-} from 'ra-ui-materialui';
+import { defaultTheme as RaDefaultTheme, RaThemeOptions }
+    from 'ra-ui-materialui';
 import FolderIcon from '@material-ui/icons/Folder';
 import { Application } from './types';
 import { NewApplicationForm } from './NewApplicationForm';
-import {
-    loadApplicationsFromStorage,
-    storeApplicationsInStorage,
-} from './applicationStorage';
+import { loadApplicationsFromStorage, storeApplicationsInStorage }
+    from './applicationStorage';
 
 const defaultTheme =
     process.env.NODE_ENV !== 'production'
diff --git ORI/react-admin/packages/ra-no-code/src/ResourceConfiguration/ResourceConfiguration.tsx ALT/react-admin/packages/ra-no-code/src/ResourceConfiguration/ResourceConfiguration.tsx
index 9a18d23..9024038 100644
--- ORI/react-admin/packages/ra-no-code/src/ResourceConfiguration/ResourceConfiguration.tsx
+++ ALT/react-admin/packages/ra-no-code/src/ResourceConfiguration/ResourceConfiguration.tsx
@@ -12,16 +12,11 @@ import {
 } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import MoreVertIcon from '@material-ui/icons/MoreVert';
-import {
-    FormWithRedirect,
-    RecordContextProvider,
-    SaveContextProvider,
-} from 'ra-core';
+import { FormWithRedirect, RecordContextProvider, SaveContextProvider }
+    from 'ra-core';
 import { SaveButton, TextInput } from 'ra-ui-materialui';
-import {
-    ResourceConfiguration,
-    FieldConfiguration,
-} from './ResourceConfigurationContext';
+import { ResourceConfiguration, FieldConfiguration }
+    from './ResourceConfigurationContext';
 import { useResourceConfiguration } from './useResourceConfiguration';
 import { FieldConfigurationFormSection } from './FieldConfigurationFormSection';
 import { FieldConfigurationTab } from './FieldConfigurationTab';
diff --git ORI/react-admin/packages/ra-no-code/src/builders/Create.tsx ALT/react-admin/packages/ra-no-code/src/builders/Create.tsx
index ebbd0fc..f77e0ff 100644
--- ORI/react-admin/packages/ra-no-code/src/builders/Create.tsx
+++ ALT/react-admin/packages/ra-no-code/src/builders/Create.tsx
@@ -1,16 +1,10 @@
 import React from 'react';
 import { useResourceContext } from 'ra-core';
-import {
-    Create as RaCreate,
-    CreateProps,
-    SimpleForm,
-    SimpleFormProps,
-} from 'ra-ui-materialui';
+import { Create as RaCreate, CreateProps, SimpleForm, SimpleFormProps }
+    from 'ra-ui-materialui';
 import { getInputFromFieldDefinition } from './getInputFromFieldDefinition';
-import {
-    useResourceConfiguration,
-    useResourcesConfiguration,
-} from '../ResourceConfiguration';
+import { useResourceConfiguration, useResourcesConfiguration }
+    from '../ResourceConfiguration';
 
 export const Create = (props: CreateProps) => (
     <RaCreate {...props}>
diff --git ORI/react-admin/packages/ra-no-code/src/builders/Edit.tsx ALT/react-admin/packages/ra-no-code/src/builders/Edit.tsx
index 5dbae39..093ce57 100644
--- ORI/react-admin/packages/ra-no-code/src/builders/Edit.tsx
+++ ALT/react-admin/packages/ra-no-code/src/builders/Edit.tsx
@@ -1,15 +1,9 @@
 import React from 'react';
 import { useResourceContext } from 'ra-core';
-import {
-    Edit as RaEdit,
-    EditProps,
-    SimpleForm,
-    SimpleFormProps,
-} from 'ra-ui-materialui';
-import {
-    useResourceConfiguration,
-    useResourcesConfiguration,
-} from '../ResourceConfiguration';
+import { Edit as RaEdit, EditProps, SimpleForm, SimpleFormProps }
+    from 'ra-ui-materialui';
+import { useResourceConfiguration, useResourcesConfiguration }
+    from '../ResourceConfiguration';
 import { getInputFromFieldDefinition } from './getInputFromFieldDefinition';
 
 export const Edit = (props: EditProps) => (
diff --git ORI/react-admin/packages/ra-no-code/src/builders/List.tsx ALT/react-admin/packages/ra-no-code/src/builders/List.tsx
index 2356c07..d3d4a7b 100644
--- ORI/react-admin/packages/ra-no-code/src/builders/List.tsx
+++ ALT/react-admin/packages/ra-no-code/src/builders/List.tsx
@@ -1,16 +1,10 @@
 import React from 'react';
 import { useResourceContext } from 'ra-core';
-import {
-    Datagrid as RaDatagrid,
-    DatagridProps,
-    List as RaList,
-    ListProps,
-} from 'ra-ui-materialui';
+import { Datagrid as RaDatagrid, DatagridProps, List as RaList, ListProps }
+    from 'ra-ui-materialui';
 
-import {
-    useResourceConfiguration,
-    useResourcesConfiguration,
-} from '../ResourceConfiguration';
+import { useResourceConfiguration, useResourcesConfiguration }
+    from '../ResourceConfiguration';
 import { getFieldFromFieldDefinition } from './getFieldFromFieldDefinition';
 
 export const List = (props: ListProps) => (
diff --git ORI/react-admin/packages/ra-no-code/src/builders/ReferenceInputChildFromDefinition.tsx ALT/react-admin/packages/ra-no-code/src/builders/ReferenceInputChildFromDefinition.tsx
index 9b743ec..2483e2d 100644
--- ORI/react-admin/packages/ra-no-code/src/builders/ReferenceInputChildFromDefinition.tsx
+++ ALT/react-admin/packages/ra-no-code/src/builders/ReferenceInputChildFromDefinition.tsx
@@ -1,9 +1,6 @@
 import * as React from 'react';
-import {
-    AutocompleteInput,
-    RadioButtonGroupInput,
-    SelectInput,
-} from 'ra-ui-materialui';
+import { AutocompleteInput, RadioButtonGroupInput, SelectInput }
+    from 'ra-ui-materialui';
 import { ReferenceFieldConfiguration } from '../ResourceConfiguration';
 
 export const ReferenceInputChildFromDefinition = ({
diff --git ORI/react-admin/packages/ra-no-code/src/builders/Show.tsx ALT/react-admin/packages/ra-no-code/src/builders/Show.tsx
index 217805e..e8ff924 100644
--- ORI/react-admin/packages/ra-no-code/src/builders/Show.tsx
+++ ALT/react-admin/packages/ra-no-code/src/builders/Show.tsx
@@ -1,15 +1,9 @@
 import React from 'react';
 import { useResourceContext } from 'ra-core';
-import {
-    Show as RaShow,
-    ShowProps,
-    SimpleShowLayout,
-    SimpleShowLayoutProps,
-} from 'ra-ui-materialui';
-import {
-    useResourceConfiguration,
-    useResourcesConfiguration,
-} from '../ResourceConfiguration';
+import { Show as RaShow, ShowProps, SimpleShowLayout, SimpleShowLayoutProps }
+    from 'ra-ui-materialui';
+import { useResourceConfiguration, useResourcesConfiguration }
+    from '../ResourceConfiguration';
 import { getFieldFromFieldDefinition } from './getFieldFromFieldDefinition';
 
 export const Show = (props: ShowProps) => (
diff --git ORI/react-admin/packages/ra-no-code/src/builders/getFieldFromFieldDefinition.tsx ALT/react-admin/packages/ra-no-code/src/builders/getFieldFromFieldDefinition.tsx
index 9c6193b..2afaac9 100644
--- ORI/react-admin/packages/ra-no-code/src/builders/getFieldFromFieldDefinition.tsx
+++ ALT/react-admin/packages/ra-no-code/src/builders/getFieldFromFieldDefinition.tsx
@@ -9,10 +9,8 @@ import {
     TextField,
     UrlField,
 } from 'ra-ui-materialui';
-import {
-    FieldConfiguration,
-    ResourceConfigurationMap,
-} from '../ResourceConfiguration';
+import { FieldConfiguration, ResourceConfigurationMap }
+    from '../ResourceConfiguration';
 
 export const getFieldFromFieldDefinition = (
     definition: FieldConfiguration,
diff --git ORI/react-admin/packages/ra-no-code/src/ui/NewResourceMenuItem.tsx ALT/react-admin/packages/ra-no-code/src/ui/NewResourceMenuItem.tsx
index 8c885e5..b4129b5 100644
--- ORI/react-admin/packages/ra-no-code/src/ui/NewResourceMenuItem.tsx
+++ ALT/react-admin/packages/ra-no-code/src/ui/NewResourceMenuItem.tsx
@@ -3,12 +3,8 @@ import { MouseEvent, ReactElement, useState } from 'react';
 import AddIcon from '@material-ui/icons/Add';
 import { ImportResourceDialog } from './ImportResourceDialog';
 import { makeStyles } from '@material-ui/core/styles';
-import {
-    ListItemIcon,
-    MenuItem,
-    MenuItemProps,
-    Tooltip,
-} from '@material-ui/core';
+import { ListItemIcon, MenuItem, MenuItemProps, Tooltip }
+    from '@material-ui/core';
 
 export const NewResourceMenuItem = (
     props: MenuItemProps<'li', { button?: true } & { sidebarIsOpen: boolean }>
diff --git ORI/react-admin/packages/ra-no-code/src/ui/useImportResourceFromCsv.tsx ALT/react-admin/packages/ra-no-code/src/ui/useImportResourceFromCsv.tsx
index ae35450..fe75a73 100644
--- ORI/react-admin/packages/ra-no-code/src/ui/useImportResourceFromCsv.tsx
+++ ALT/react-admin/packages/ra-no-code/src/ui/useImportResourceFromCsv.tsx
@@ -3,10 +3,8 @@ import { parse } from 'papaparse';
 import { getValuesFromRecords, Record, useDataProvider } from 'ra-core';
 import set from 'lodash/set';
 
-import {
-    useResourcesConfiguration,
-    getFieldDefinitionsFromRecords,
-} from '../ResourceConfiguration';
+import { useResourcesConfiguration, getFieldDefinitionsFromRecords }
+    from '../ResourceConfiguration';
 
 /**
  * This hooks returns a tuple with its first element being a boolean indicating whether an import is ongoing, and the second element a function to call with a resource name and a file to import.
diff --git ORI/react-admin/packages/ra-test/src/TestContext.tsx ALT/react-admin/packages/ra-test/src/TestContext.tsx
index 6c0755c..717392a 100644
--- ORI/react-admin/packages/ra-test/src/TestContext.tsx
+++ ALT/react-admin/packages/ra-test/src/TestContext.tsx
@@ -6,11 +6,8 @@ import merge from 'lodash/merge';
 import { createMemoryHistory, History } from 'history';
 import { Router } from 'react-router-dom';
 
-import {
-    convertLegacyDataProvider,
-    createAdminStore,
-    ReduxState,
-} from 'ra-core';
+import { convertLegacyDataProvider, createAdminStore, ReduxState }
+    from 'ra-core';
 
 export const defaultStore = {
     admin: {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx ALT/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx
index 13d8bc3..c0837c4 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx
@@ -1,12 +1,8 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { Field, Form } from 'react-final-form';
-import {
-    Button,
-    CardActions,
-    CircularProgress,
-    TextField,
-} from '@material-ui/core';
+import { Button, CardActions, CircularProgress, TextField }
+    from '@material-ui/core';
 import { makeStyles, Theme } from '@material-ui/core/styles';
 import { useTranslate, useLogin, useNotify, useSafeSetState } from 'ra-core';
 
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteButton.tsx
index 121d6f1..97e7993 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteButton.tsx
@@ -1,11 +1,9 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import BulkDeleteWithConfirmButton, {
-    BulkDeleteWithConfirmButtonProps,
-} from './BulkDeleteWithConfirmButton';
-import BulkDeleteWithUndoButton, {
-    BulkDeleteWithUndoButtonProps,
-} from './BulkDeleteWithUndoButton';
+import BulkDeleteWithConfirmButton, { BulkDeleteWithConfirmButtonProps }
+    from './BulkDeleteWithConfirmButton';
+import BulkDeleteWithUndoButton, { BulkDeleteWithUndoButtonProps }
+    from './BulkDeleteWithUndoButton';
 
 /**
  * Deletes the selected rows.
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateButton.tsx
index d15ab42..7254a99 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateButton.tsx
@@ -1,11 +1,9 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import BulkUpdateWithConfirmButton, {
-    BulkUpdateWithConfirmButtonProps,
-} from './BulkUpdateWithConfirmButton';
-import BulkUpdateWithUndoButton, {
-    BulkUpdateWithUndoButtonProps,
-} from './BulkUpdateWithUndoButton';
+import BulkUpdateWithConfirmButton, { BulkUpdateWithConfirmButtonProps }
+    from './BulkUpdateWithConfirmButton';
+import BulkUpdateWithUndoButton, { BulkUpdateWithUndoButtonProps }
+    from './BulkUpdateWithUndoButton';
 import { MutationMode } from 'ra-core';
 
 /**
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx
index d318246..7c26666 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx
@@ -1,9 +1,5 @@
-import React, {
-    Fragment,
-    ReactEventHandler,
-    ReactElement,
-    SyntheticEvent,
-} from 'react';
+import React, { Fragment, ReactEventHandler, ReactElement, SyntheticEvent }
+    from 'react';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@material-ui/core/styles';
 import { alpha } from '@material-ui/core/styles/colorManipulator';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/SortButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/SortButton.tsx
index fbc4801..acb3b71 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/SortButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/SortButton.tsx
@@ -1,22 +1,12 @@
 import * as React from 'react';
 import { ReactElement, memo } from 'react';
-import {
-    Button,
-    Menu,
-    MenuItem,
-    Tooltip,
-    IconButton,
-    useMediaQuery,
-    Theme,
-} from '@material-ui/core';
+import { Button, Menu, MenuItem, Tooltip, IconButton, useMediaQuery, Theme }
+    from '@material-ui/core';
 import SortIcon from '@material-ui/icons/Sort';
 import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
 import { shallowEqual } from 'react-redux';
-import {
-    useListSortContext,
-    useTranslate,
-    getFieldLabelTranslationArgs,
-} from 'ra-core';
+import { useListSortContext, useTranslate, getFieldLabelTranslationArgs }
+    from 'ra-core';
 
 /**
  * A button allowing to change the sort field and order.
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/index.ts ALT/react-admin/packages/ra-ui-materialui/src/button/index.ts
index 1489acf..ebfa9fc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/index.ts
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/index.ts
@@ -1,10 +1,8 @@
 import BulkDeleteButton, { BulkDeleteButtonProps } from './BulkDeleteButton';
-import BulkDeleteWithConfirmButton, {
-    BulkDeleteWithConfirmButtonProps,
-} from './BulkDeleteWithConfirmButton';
-import BulkDeleteWithUndoButton, {
-    BulkDeleteWithUndoButtonProps,
-} from './BulkDeleteWithUndoButton';
+import BulkDeleteWithConfirmButton, { BulkDeleteWithConfirmButtonProps }
+    from './BulkDeleteWithConfirmButton';
+import BulkDeleteWithUndoButton, { BulkDeleteWithUndoButtonProps }
+    from './BulkDeleteWithUndoButton';
 import BulkUpdateButton, { BulkUpdateButtonProps } from './BulkUpdateButton';
 import BulkUpdateWithConfirmButton from './BulkUpdateWithConfirmButton';
 import BulkUpdateWithUndoButton from './BulkUpdateWithUndoButton';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx ALT/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx
index 1e3c632..7c76c12 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx
@@ -5,11 +5,8 @@ import Card from '@material-ui/core/Card';
 import CardContent from '@material-ui/core/CardContent';
 import { makeStyles } from '@material-ui/core/styles';
 import classnames from 'classnames';
-import {
-    EditControllerProps,
-    ComponentPropType,
-    useEditContext,
-} from 'ra-core';
+import { EditControllerProps, ComponentPropType, useEditContext }
+    from 'ra-core';
 
 import { EditActions as DefaultActions } from './EditActions';
 import TitleForRecord from '../layout/TitleForRecord';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx ALT/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx
index f5ad3c3..3c0b49c 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx
@@ -4,11 +4,8 @@ import PropTypes from 'prop-types';
 import Card from '@material-ui/core/Card';
 import { makeStyles } from '@material-ui/core/styles';
 import classnames from 'classnames';
-import {
-    ShowControllerProps,
-    useResourceDefinition,
-    useShowContext,
-} from 'ra-core';
+import { ShowControllerProps, useResourceDefinition, useShowContext }
+    from 'ra-core';
 
 import { ShowActions as DefaultActions } from './ShowActions';
 import TitleForRecord from '../layout/TitleForRecord';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/ArrayField.tsx ALT/react-admin/packages/ra-ui-materialui/src/field/ArrayField.tsx
index bf44224..ff9579a 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/ArrayField.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/ArrayField.tsx
@@ -1,13 +1,6 @@
 import * as React from 'react';
-import {
-    cloneElement,
-    Children,
-    useEffect,
-    useState,
-    memo,
-    FC,
-    ReactElement,
-} from 'react';
+import { cloneElement, Children, useEffect, useState, memo, FC, ReactElement }
+    from 'react';
 import get from 'lodash/get';
 import { Identifier, ListContextProvider, useRecordContext } from 'ra-core';
 
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/ReferenceArrayField.spec.tsx ALT/react-admin/packages/ra-ui-materialui/src/field/ReferenceArrayField.spec.tsx
index 2344034..f7cfb8f 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/ReferenceArrayField.spec.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/ReferenceArrayField.spec.tsx
@@ -5,9 +5,8 @@ import { renderWithRedux } from 'ra-test';
 import { MemoryRouter } from 'react-router-dom';
 import { ListContextProvider, DataProviderContext } from 'ra-core';
 
-import ReferenceArrayField, {
-    ReferenceArrayFieldView,
-} from './ReferenceArrayField';
+import ReferenceArrayField, { ReferenceArrayFieldView }
+    from './ReferenceArrayField';
 import TextField from './TextField';
 import SingleFieldList from '../list/SingleFieldList';
 
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/ReferenceManyField.spec.tsx ALT/react-admin/packages/ra-ui-materialui/src/field/ReferenceManyField.spec.tsx
index cbf3181..0669625 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/ReferenceManyField.spec.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/ReferenceManyField.spec.tsx
@@ -5,9 +5,8 @@ import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
 import { renderWithRedux } from 'ra-test';
 
-import ReferenceManyField, {
-    ReferenceManyFieldView,
-} from './ReferenceManyField';
+import ReferenceManyField, { ReferenceManyFieldView }
+    from './ReferenceManyField';
 import TextField from './TextField';
 import SingleFieldList from '../list/SingleFieldList';
 
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/SelectField.spec.tsx ALT/react-admin/packages/ra-ui-materialui/src/field/SelectField.spec.tsx
index 08980d9..e353738 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/SelectField.spec.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/SelectField.spec.tsx
@@ -2,11 +2,8 @@ import * as React from 'react';
 import { FC } from 'react';
 import expect from 'expect';
 import { render } from '@testing-library/react';
-import {
-    Record,
-    TestTranslationProvider,
-    RecordContextProvider,
-} from 'ra-core';
+import { Record, TestTranslationProvider, RecordContextProvider }
+    from 'ra-core';
 import { renderWithRedux } from 'ra-test';
 
 import SelectField from './SelectField';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/TranslatableFieldsTabContent.tsx ALT/react-admin/packages/ra-ui-materialui/src/field/TranslatableFieldsTabContent.tsx
index 087e3de..58dc5d9 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/TranslatableFieldsTabContent.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/TranslatableFieldsTabContent.tsx
@@ -1,11 +1,6 @@
 import * as React from 'react';
-import {
-    Children,
-    cloneElement,
-    isValidElement,
-    ReactElement,
-    ReactNode,
-} from 'react';
+import { Children, cloneElement, isValidElement, ReactElement, ReactNode }
+    from 'react';
 import { useTranslatableContext, Record } from 'ra-core';
 import { makeStyles } from '@material-ui/core/styles';
 import { ClassesOverride } from '../types';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/index.ts ALT/react-admin/packages/ra-ui-materialui/src/field/index.ts
index c3b102f..3deeee2 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/index.ts
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/index.ts
@@ -8,12 +8,10 @@ import ImageField, { ImageFieldProps } from './ImageField';
 import FunctionField, { FunctionFieldProps } from './FunctionField';
 import NumberField, { NumberFieldProps } from './NumberField';
 import ReferenceField, { ReferenceFieldProps } from './ReferenceField';
-import ReferenceArrayField, {
-    ReferenceArrayFieldProps,
-} from './ReferenceArrayField';
-import ReferenceManyField, {
-    ReferenceManyFieldProps,
-} from './ReferenceManyField';
+import ReferenceArrayField, { ReferenceArrayFieldProps }
+    from './ReferenceArrayField';
+import ReferenceManyField, { ReferenceManyFieldProps }
+    from './ReferenceManyField';
 import RichTextField, { RichTextFieldProps } from './RichTextField';
 import SelectField, { SelectFieldProps } from './SelectField';
 import TextField, { TextFieldProps } from './TextField';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/form/TabbedForm.spec.tsx ALT/react-admin/packages/ra-ui-materialui/src/form/TabbedForm.spec.tsx
index eab87e9..1b897dc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/form/TabbedForm.spec.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/form/TabbedForm.spec.tsx
@@ -1,12 +1,8 @@
 import * as React from 'react';
 import { MemoryRouter, Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
-import {
-    minLength,
-    required,
-    SaveContextProvider,
-    SideEffectContextProvider,
-} from 'ra-core';
+import { minLength, required, SaveContextProvider, SideEffectContextProvider }
+    from 'ra-core';
 import { renderWithRedux } from 'ra-test';
 
 import { TabbedForm } from './TabbedForm';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/form/TabbedFormView.tsx ALT/react-admin/packages/ra-ui-materialui/src/form/TabbedFormView.tsx
index 560d58d..879147c 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/form/TabbedFormView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/form/TabbedFormView.tsx
@@ -13,12 +13,8 @@ import classnames from 'classnames';
 import { Route, useRouteMatch, useLocation } from 'react-router-dom';
 import { Divider } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
-import {
-    escapePath,
-    FormWithRedirectRenderProps,
-    MutationMode,
-    Record,
-} from 'ra-core';
+import { escapePath, FormWithRedirectRenderProps, MutationMode, Record }
+    from 'ra-core';
 import Toolbar from './Toolbar';
 import TabbedFormTabs, { getTabFullPath } from './TabbedFormTabs';
 import { ClassesOverride } from '../types';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx ALT/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
index 1cf8310..6ba4209 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
@@ -1,16 +1,9 @@
 import * as React from 'react';
-import {
-    Children,
-    Fragment,
-    isValidElement,
-    ReactElement,
-    FC,
-    ReactNode,
-} from 'react';
+import { Children, Fragment, isValidElement, ReactElement, FC, ReactNode }
+    from 'react';
 import PropTypes from 'prop-types';
-import MuiToolbar, {
-    ToolbarProps as MuiToolbarProps,
-} from '@material-ui/core/Toolbar';
+import MuiToolbar, { ToolbarProps as MuiToolbarProps }
+    from '@material-ui/core/Toolbar';
 import withWidth from '@material-ui/core/withWidth';
 import { makeStyles } from '@material-ui/core/styles';
 import classnames from 'classnames';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/ArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/ArrayInput.tsx
index d54ad86..090ca47 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/ArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/ArrayInput.tsx
@@ -2,12 +2,8 @@ import * as React from 'react';
 import { cloneElement, Children, ReactElement } from 'react';
 import PropTypes from 'prop-types';
 import isEqual from 'lodash/isEqual';
-import {
-    isRequired,
-    FieldTitle,
-    composeSyncValidators,
-    InputProps,
-} from 'ra-core';
+import { isRequired, FieldTitle, composeSyncValidators, InputProps }
+    from 'ra-core';
 import { useFieldArray } from 'react-final-form-arrays';
 import { InputLabel, FormControl, FormHelperText } from '@material-ui/core';
 
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.tsx
index 1a4536d..1d56ac9 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.tsx
@@ -22,10 +22,8 @@ import { ClassesOverride } from '../../types';
 import { useArrayInput } from './useArrayInput';
 import { useSimpleFormIteratorStyles } from './useSimpleFormIteratorStyles';
 import { SimpleFormIteratorContext } from './SimpleFormIteratorContext';
-import {
-    DisableRemoveFunction,
-    SimpleFormIteratorItem,
-} from './SimpleFormIteratorItem';
+import { DisableRemoveFunction, SimpleFormIteratorItem }
+    from './SimpleFormIteratorItem';
 import { AddItemButton as DefaultAddItemButton } from './AddItemButton';
 import { RemoveItemButton as DefaultRemoveItemButton } from './RemoveItemButton';
 import { ReOrderButtons as DefaultReOrderButtons } from './ReOrderButtons';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx
index bc041a4..11f807d 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx
@@ -18,10 +18,8 @@ import FormInput from '../../form/FormInput';
 import { useSimpleFormIteratorStyles } from './useSimpleFormIteratorStyles';
 import { useSimpleFormIterator } from './useSimpleFormIterator';
 import { ArrayInputContextValue } from './ArrayInputContext';
-import {
-    SimpleFormIteratorItemContext,
-    SimpleFormIteratorItemContextValue,
-} from './SimpleFormIteratorItemContext';
+import { SimpleFormIteratorItemContext, SimpleFormIteratorItemContextValue }
+    from './SimpleFormIteratorItemContext';
 
 export const SimpleFormIteratorItem = React.forwardRef(
     (props: SimpleFormIteratorItemProps, ref: any) => {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
index b6ba266..a2cc7b3 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
@@ -1,10 +1,5 @@
-import React, {
-    useCallback,
-    useEffect,
-    useRef,
-    useMemo,
-    isValidElement,
-} from 'react';
+import React, { useCallback, useEffect, useRef, useMemo, isValidElement }
+    from 'react';
 import Downshift, { DownshiftProps } from 'downshift';
 import classNames from 'classnames';
 import get from 'lodash/get';
@@ -25,10 +20,8 @@ import InputHelperText from './InputHelperText';
 import AutocompleteSuggestionList from './AutocompleteSuggestionList';
 import AutocompleteSuggestionItem from './AutocompleteSuggestionItem';
 import { AutocompleteInputLoader } from './AutocompleteInputLoader';
-import {
-    SupportCreateSuggestionOptions,
-    useSupportCreateSuggestion,
-} from './useSupportCreateSuggestion';
+import { SupportCreateSuggestionOptions, useSupportCreateSuggestion }
+    from './useSupportCreateSuggestion';
 
 /**
  * An Input component for an autocomplete field, using an array of objects for the options
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
index a69991e..d32d6ba 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
@@ -9,12 +9,8 @@ import React, {
 import Downshift, { DownshiftProps } from 'downshift';
 import get from 'lodash/get';
 import classNames from 'classnames';
-import {
-    TextField,
-    InputAdornment,
-    IconButton,
-    InputProps,
-} from '@material-ui/core';
+import { TextField, InputAdornment, IconButton, InputProps }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import ClearIcon from '@material-ui/icons/Clear';
 import { TextFieldProps } from '@material-ui/core/TextField';
@@ -33,10 +29,8 @@ import InputHelperText from './InputHelperText';
 import AutocompleteSuggestionList from './AutocompleteSuggestionList';
 import AutocompleteSuggestionItem from './AutocompleteSuggestionItem';
 import { AutocompleteInputLoader } from './AutocompleteInputLoader';
-import {
-    SupportCreateSuggestionOptions,
-    useSupportCreateSuggestion,
-} from './useSupportCreateSuggestion';
+import { SupportCreateSuggestionOptions, useSupportCreateSuggestion }
+    from './useSupportCreateSuggestion';
 
 /**
  * An Input component for an autocomplete field, using an array of objects for the options
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx
index 2e39f9c..7eaac9b 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx
@@ -1,11 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import {
-    FormControl,
-    FormHelperText,
-    FormLabel,
-    RadioGroup,
-} from '@material-ui/core';
+import { FormControl, FormHelperText, FormLabel, RadioGroup }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import { RadioGroupProps } from '@material-ui/core/RadioGroup';
 import { FormControlProps } from '@material-ui/core/FormControl';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ReferenceArrayInput.spec.js ALT/react-admin/packages/ra-ui-materialui/src/input/ReferenceArrayInput.spec.js
index 0f11eca..5c9fc04 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ReferenceArrayInput.spec.js
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ReferenceArrayInput.spec.js
@@ -6,9 +6,8 @@ import { renderWithRedux } from 'ra-test';
 import addDays from 'date-fns/add_days';
 import { Datagrid } from '../list';
 import { TextField } from '../field';
-import ReferenceArrayInput, {
-    ReferenceArrayInputView,
-} from './ReferenceArrayInput';
+import ReferenceArrayInput, { ReferenceArrayInputView }
+    from './ReferenceArrayInput';
 
 describe('<ReferenceArrayInput />', () => {
     const defaultProps = {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
index abed0d0..8d32033 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
@@ -1,32 +1,19 @@
 import * as React from 'react';
 import { useCallback, useRef, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import {
-    Select,
-    MenuItem,
-    InputLabel,
-    FormHelperText,
-    FormControl,
-    Chip,
-} from '@material-ui/core';
+import { Select, MenuItem, InputLabel, FormHelperText, FormControl, Chip }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import classnames from 'classnames';
-import {
-    FieldTitle,
-    useInput,
-    InputProps,
-    ChoicesProps,
-    useChoices,
-} from 'ra-core';
+import { FieldTitle, useInput, InputProps, ChoicesProps, useChoices }
+    from 'ra-core';
 import InputHelperText from './InputHelperText';
 import { SelectProps } from '@material-ui/core/Select';
 import { FormControlProps } from '@material-ui/core/FormControl';
 import Labeled from './Labeled';
 import { LinearProgress } from '../layout';
-import {
-    SupportCreateSuggestionOptions,
-    useSupportCreateSuggestion,
-} from './useSupportCreateSuggestion';
+import { SupportCreateSuggestionOptions, useSupportCreateSuggestion }
+    from './useSupportCreateSuggestion';
 
 /**
  * An Input component for a select box allowing multiple selections, using an array of objects for the options
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/SelectInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/SelectInput.tsx
index 125b8d8..a3b72a1 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/SelectInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/SelectInput.tsx
@@ -18,10 +18,8 @@ import InputHelperText from './InputHelperText';
 import sanitizeInputRestProps from './sanitizeInputRestProps';
 import Labeled from './Labeled';
 import { LinearProgress } from '../layout';
-import {
-    useSupportCreateSuggestion,
-    SupportCreateSuggestionOptions,
-} from './useSupportCreateSuggestion';
+import { useSupportCreateSuggestion, SupportCreateSuggestionOptions }
+    from './useSupportCreateSuggestion';
 import { ClassesOverride } from '../types';
 
 /**
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/TranslatableInputs.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/TranslatableInputs.tsx
index 16cde03..c0939a8 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/TranslatableInputs.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/TranslatableInputs.tsx
@@ -1,10 +1,7 @@
 import * as React from 'react';
 import { ReactElement, ReactNode } from 'react';
-import {
-    TranslatableContextProvider,
-    useTranslatable,
-    UseTranslatableOptions,
-} from 'ra-core';
+import { TranslatableContextProvider, useTranslatable, UseTranslatableOptions }
+    from 'ra-core';
 import { TranslatableInputsTabs } from './TranslatableInputsTabs';
 import { TranslatableInputsTabContent } from './TranslatableInputsTabContent';
 import { makeStyles } from '@material-ui/core/styles';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/TranslatableInputsTabContent.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/TranslatableInputsTabContent.tsx
index d5ca649..87460a1 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/TranslatableInputsTabContent.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/TranslatableInputsTabContent.tsx
@@ -1,11 +1,6 @@
 import * as React from 'react';
-import {
-    Children,
-    cloneElement,
-    isValidElement,
-    ReactElement,
-    ReactNode,
-} from 'react';
+import { Children, cloneElement, isValidElement, ReactElement, ReactNode }
+    from 'react';
 import {
     FormGroupContextProvider,
     Record,
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/index.ts ALT/react-admin/packages/ra-ui-materialui/src/input/index.ts
index a859052..cf41c13 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/index.ts
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/index.ts
@@ -1,10 +1,8 @@
-import AutocompleteArrayInput, {
-    AutocompleteArrayInputProps,
-} from './AutocompleteArrayInput';
+import AutocompleteArrayInput, { AutocompleteArrayInputProps }
+    from './AutocompleteArrayInput';
 import BooleanInput, { BooleanInputProps } from './BooleanInput';
-import CheckboxGroupInput, {
-    CheckboxGroupInputProps,
-} from './CheckboxGroupInput';
+import CheckboxGroupInput, { CheckboxGroupInputProps }
+    from './CheckboxGroupInput';
 import DateInput, { DateInputProps } from './DateInput';
 import DateTimeInput, { DateTimeInputProps } from './DateTimeInput';
 import FileInput, { FileInputProps } from './FileInput';
@@ -12,21 +10,17 @@ import ImageInput, { ImageInputProps } from './ImageInput';
 import InputHelperText, { InputHelperTextProps } from './InputHelperText';
 import InputPropTypes from './InputPropTypes';
 import Labeled, { LabeledProps } from './Labeled';
-import NullableBooleanInput, {
-    NullableBooleanInputProps,
-} from './NullableBooleanInput';
+import NullableBooleanInput, { NullableBooleanInputProps }
+    from './NullableBooleanInput';
 import NumberInput, { NumberInputProps } from './NumberInput';
 import PasswordInput, { PasswordInputProps } from './PasswordInput';
-import RadioButtonGroupInput, {
-    RadioButtonGroupInputProps,
-} from './RadioButtonGroupInput';
-import ReferenceArrayInput, {
-    ReferenceArrayInputProps,
-} from './ReferenceArrayInput';
+import RadioButtonGroupInput, { RadioButtonGroupInputProps }
+    from './RadioButtonGroupInput';
+import ReferenceArrayInput, { ReferenceArrayInputProps }
+    from './ReferenceArrayInput';
 import ReferenceInput, { ReferenceInputProps } from './ReferenceInput';
-import ResettableTextField, {
-    ResettableTextFieldProps,
-} from './ResettableTextField';
+import ResettableTextField, { ResettableTextFieldProps }
+    from './ResettableTextField';
 import SearchInput, { SearchInputProps } from './SearchInput';
 import SelectArrayInput, { SelectArrayInputProps } from './SelectArrayInput';
 import TextInput, { TextInputProps } from './TextInput';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/Error.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/Error.tsx
index 310ce52..47d3fcf 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/Error.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/Error.tsx
@@ -2,13 +2,8 @@ import * as React from 'react';
 import { Fragment, HtmlHTMLAttributes, ErrorInfo } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import {
-    Button,
-    Accordion,
-    AccordionDetails,
-    AccordionSummary,
-    Typography,
-} from '@material-ui/core';
+import { Button, Accordion, AccordionDetails, AccordionSummary, Typography }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import ErrorIcon from '@material-ui/icons/Report';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/LinearProgress.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/LinearProgress.tsx
index d80570e..de8bbd9 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/LinearProgress.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/LinearProgress.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
-import Progress, {
-    LinearProgressProps as ProgressProps,
-} from '@material-ui/core/LinearProgress';
+import Progress, { LinearProgressProps as ProgressProps }
+    from '@material-ui/core/LinearProgress';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@material-ui/core/styles';
 import classnames from 'classnames';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/UserMenu.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/UserMenu.tsx
index 6e839f3..19b92d5 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/UserMenu.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/UserMenu.tsx
@@ -2,14 +2,8 @@ import * as React from 'react';
 import { Children, cloneElement, isValidElement, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslate, useGetIdentity } from 'ra-core';
-import {
-    Tooltip,
-    IconButton,
-    Menu,
-    Button,
-    Avatar,
-    PopoverOrigin,
-} from '@material-ui/core';
+import { Tooltip, IconButton, Menu, Button, Avatar, PopoverOrigin }
+    from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import AccountCircle from '@material-ui/icons/AccountCircle';
 
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/List.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/List.tsx
index 537b7b3..16708ac 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/List.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/List.tsx
@@ -1,11 +1,8 @@
 import * as React from 'react';
 import { ReactElement } from 'react';
 import PropTypes from 'prop-types';
-import {
-    useCheckMinimumRequiredProps,
-    useListController,
-    ListContextProvider,
-} from 'ra-core';
+import { useCheckMinimumRequiredProps, useListController, ListContextProvider }
+    from 'ra-core';
 
 import { TitlePropType } from '../layout/Title';
 
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx
index 3727fa4..2d15d37 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx
@@ -1,10 +1,6 @@
 import * as React from 'react';
-import {
-    cloneElement,
-    Children,
-    HtmlHTMLAttributes,
-    ComponentType,
-} from 'react';
+import { cloneElement, Children, HtmlHTMLAttributes, ComponentType }
+    from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import LinearProgress from '@material-ui/core/LinearProgress';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeaderCell.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeaderCell.tsx
index 1465e56..e496e7e 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeaderCell.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeaderCell.tsx
@@ -5,12 +5,8 @@ import classnames from 'classnames';
 import { TableCell, TableSortLabel, Tooltip } from '@material-ui/core';
 import { TableCellProps } from '@material-ui/core/TableCell';
 import { makeStyles } from '@material-ui/core/styles';
-import {
-    FieldTitle,
-    useTranslate,
-    SortPayload,
-    useResourceContext,
-} from 'ra-core';
+import { FieldTitle, useTranslate, SortPayload, useResourceContext }
+    from 'ra-core';
 
 import { ClassesOverride } from '../../types';
 
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx
index b91e267..91c0419 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx
@@ -11,12 +11,8 @@ import React, {
 } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import {
-    TableCell,
-    TableRow,
-    TableRowProps,
-    Checkbox,
-} from '@material-ui/core';
+import { TableCell, TableRow, TableRowProps, Checkbox }
+    from '@material-ui/core';
 import {
     Identifier,
     linkToRecord,
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/index.ts ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/index.ts
index 7eb6e18..67ecd5a 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/index.ts
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/index.ts
@@ -1,18 +1,12 @@
 import Datagrid, { DatagridProps } from './Datagrid';
-import DatagridBody, {
-    DatagridBodyProps,
-    PureDatagridBody,
-} from './DatagridBody';
+import DatagridBody, { DatagridBodyProps, PureDatagridBody }
+    from './DatagridBody';
 import DatagridCell, { DatagridCellProps } from './DatagridCell';
-import DatagridHeaderCell, {
-    DatagridHeaderCellProps,
-} from './DatagridHeaderCell';
+import DatagridHeaderCell, { DatagridHeaderCellProps }
+    from './DatagridHeaderCell';
 import DatagridLoading, { DatagridLoadingProps } from './DatagridLoading';
-import DatagridRow, {
-    DatagridRowProps,
-    PureDatagridRow,
-    RowClickFunction,
-} from './DatagridRow';
+import DatagridRow, { DatagridRowProps, PureDatagridRow, RowClickFunction }
+    from './DatagridRow';
 import ExpandRowButton, { ExpandRowButtonProps } from './ExpandRowButton';
 import useDatagridStyles from './useDatagridStyles';
 
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/filter/FilterForm.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/filter/FilterForm.tsx
index 8992f29..8126ac8 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/filter/FilterForm.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/filter/FilterForm.tsx
@@ -1,11 +1,6 @@
 import * as React from 'react';
-import {
-    useEffect,
-    useCallback,
-    useContext,
-    HtmlHTMLAttributes,
-    ReactNode,
-} from 'react';
+import { useEffect, useCallback, useContext, HtmlHTMLAttributes, ReactNode }
+    from 'react';
 import PropTypes from 'prop-types';
 import { useListContext, useResourceContext } from 'ra-core';
 import { Form, FormRenderProps, FormSpy } from 'react-final-form';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/filter/FilterListItem.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/filter/FilterListItem.tsx
index 134517a..9165bdc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/filter/FilterListItem.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/filter/FilterListItem.tsx
@@ -1,11 +1,7 @@
 import * as React from 'react';
 import { memo, isValidElement, ReactElement } from 'react';
-import {
-    IconButton,
-    ListItem,
-    ListItemText,
-    ListItemSecondaryAction,
-} from '@material-ui/core';
+import { IconButton, ListItem, ListItemText, ListItemSecondaryAction }
+    from '@material-ui/core';
 import { makeStyles, Theme } from '@material-ui/core/styles';
 import CancelIcon from '@material-ui/icons/CancelOutlined';
 import { useTranslate, useListFilterContext } from 'ra-core';
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/index.ts ALT/react-admin/packages/ra-ui-materialui/src/list/index.ts
index 6f98654..3edb4b0 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/index.ts
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/index.ts
@@ -1,6 +1,5 @@
-import BulkActionsToolbar, {
-    BulkActionsToolbarProps,
-} from './BulkActionsToolbar';
+import BulkActionsToolbar, { BulkActionsToolbarProps }
+    from './BulkActionsToolbar';
 import BulkDeleteAction from './BulkDeleteAction';
 import List from './List';
 import ListActions, { ListActionsProps } from './ListActions';
diff --git ORI/react-admin/packages/react-admin/src/AdminUI.tsx ALT/react-admin/packages/react-admin/src/AdminUI.tsx
index 9acda62..506071e 100644
--- ORI/react-admin/packages/react-admin/src/AdminUI.tsx
+++ ALT/react-admin/packages/react-admin/src/AdminUI.tsx
@@ -1,13 +1,8 @@
 import * as React from 'react';
 import { FC } from 'react';
 import { CoreAdminUI, AdminUIProps } from 'ra-core';
-import {
-    Layout as DefaultLayout,
-    LoadingPage,
-    Login,
-    Logout,
-    NotFound,
-} from 'ra-ui-materialui';
+import { Layout as DefaultLayout, LoadingPage, Login, Logout, NotFound }
+    from 'ra-ui-materialui';
 
 const AdminUI: FC<AdminUIProps> = props => <CoreAdminUI {...props} />;

@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2022

prettier/prettier#13353 VS prettier/prettier@main :: typescript-eslint/typescript-eslint@9d47a8b

Diff (1255 lines) 
diff --git ORI/typescript-eslint/packages/ast-spec/src/element/Property/spec.ts ALT/typescript-eslint/packages/ast-spec/src/element/Property/spec.ts
index c96a7a2..c100632 100644
--- ORI/typescript-eslint/packages/ast-spec/src/element/Property/spec.ts
+++ ALT/typescript-eslint/packages/ast-spec/src/element/Property/spec.ts
@@ -4,11 +4,8 @@ import type { TSEmptyBodyFunctionExpression } from '../../expression/TSEmptyBody
 import type { AssignmentPattern } from '../../parameter/AssignmentPattern/spec';
 import type { BindingName } from '../../unions/BindingName';
 import type { Expression } from '../../unions/Expression';
-import type {
-  PropertyName,
-  PropertyNameComputed,
-  PropertyNameNonComputed,
-} from '../../unions/PropertyName';
+import type { PropertyName, PropertyNameComputed, PropertyNameNonComputed }
+  from '../../unions/PropertyName';
 
 interface PropertyBase extends BaseNode {
   type: AST_NODE_TYPES.Property;
diff --git ORI/typescript-eslint/packages/ast-spec/src/element/TSEnumMember/spec.ts ALT/typescript-eslint/packages/ast-spec/src/element/TSEnumMember/spec.ts
index 97d8e49..060d583 100644
--- ORI/typescript-eslint/packages/ast-spec/src/element/TSEnumMember/spec.ts
+++ ALT/typescript-eslint/packages/ast-spec/src/element/TSEnumMember/spec.ts
@@ -1,10 +1,8 @@
 import type { AST_NODE_TYPES } from '../../ast-node-types';
 import type { BaseNode } from '../../base/BaseNode';
 import type { Expression } from '../../unions/Expression';
-import type {
-  PropertyNameComputed,
-  PropertyNameNonComputed,
-} from '../../unions/PropertyName';
+import type { PropertyNameComputed, PropertyNameNonComputed }
+  from '../../unions/PropertyName';
 
 interface TSEnumMemberBase extends BaseNode {
   type: AST_NODE_TYPES.TSEnumMember;
diff --git ORI/typescript-eslint/packages/ast-spec/src/element/TSMethodSignature/spec.ts ALT/typescript-eslint/packages/ast-spec/src/element/TSMethodSignature/spec.ts
index 5ca7cbe..2b379ee 100644
--- ORI/typescript-eslint/packages/ast-spec/src/element/TSMethodSignature/spec.ts
+++ ALT/typescript-eslint/packages/ast-spec/src/element/TSMethodSignature/spec.ts
@@ -4,11 +4,8 @@ import type { BaseNode } from '../../base/BaseNode';
 import type { TSTypeAnnotation } from '../../special/TSTypeAnnotation/spec';
 import type { TSTypeParameterDeclaration } from '../../special/TSTypeParameterDeclaration/spec';
 import type { Parameter } from '../../unions/Parameter';
-import type {
-  PropertyName,
-  PropertyNameComputed,
-  PropertyNameNonComputed,
-} from '../../unions/PropertyName';
+import type { PropertyName, PropertyNameComputed, PropertyNameNonComputed }
+  from '../../unions/PropertyName';
 
 interface TSMethodSignatureBase extends BaseNode {
   type: AST_NODE_TYPES.TSMethodSignature;
diff --git ORI/typescript-eslint/packages/ast-spec/src/element/TSPropertySignature/spec.ts ALT/typescript-eslint/packages/ast-spec/src/element/TSPropertySignature/spec.ts
index a3f91ac..711b420 100644
--- ORI/typescript-eslint/packages/ast-spec/src/element/TSPropertySignature/spec.ts
+++ ALT/typescript-eslint/packages/ast-spec/src/element/TSPropertySignature/spec.ts
@@ -3,11 +3,8 @@ import type { Accessibility } from '../../base/Accessibility';
 import type { BaseNode } from '../../base/BaseNode';
 import type { TSTypeAnnotation } from '../../special/TSTypeAnnotation/spec';
 import type { Expression } from '../../unions/Expression';
-import type {
-  PropertyName,
-  PropertyNameComputed,
-  PropertyNameNonComputed,
-} from '../../unions/PropertyName';
+import type { PropertyName, PropertyNameComputed, PropertyNameNonComputed }
+  from '../../unions/PropertyName';
 
 interface TSPropertySignatureBase extends BaseNode {
   type: AST_NODE_TYPES.TSPropertySignature;
diff --git ORI/typescript-eslint/packages/eslint-plugin-internal/src/rules/prefer-ast-types-enum.ts ALT/typescript-eslint/packages/eslint-plugin-internal/src/rules/prefer-ast-types-enum.ts
index d74104e..ad079e0 100755
--- ORI/typescript-eslint/packages/eslint-plugin-internal/src/rules/prefer-ast-types-enum.ts
+++ ALT/typescript-eslint/packages/eslint-plugin-internal/src/rules/prefer-ast-types-enum.ts
@@ -1,8 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESTree }
+  from '@typescript-eslint/utils';
 import { DefinitionType } from '@typescript-eslint/scope-manager';
 import { createRule } from '../util';
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/comma-spacing.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/comma-spacing.ts
index 2774324..22aef34 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/comma-spacing.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/comma-spacing.ts
@@ -1,10 +1,6 @@
 import { TSESTree, AST_TOKEN_TYPES } from '@typescript-eslint/utils';
-import {
-  isClosingParenToken,
-  isCommaToken,
-  isTokenOnSameLine,
-  createRule,
-} from '../util';
+import { isClosingParenToken, isCommaToken, isTokenOnSameLine, createRule }
+  from '../util';
 
 type Options = [
   {
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-definitions.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-definitions.ts
index 56581ef..58e4b18 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-definitions.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-definitions.ts
@@ -1,9 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESLint, TSESTree }
+  from '@typescript-eslint/utils';
 import * as util from '../util';
 
 export default util.createRule({
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-exports.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-exports.ts
index 36fa561..436a036 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-exports.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-exports.ts
@@ -1,9 +1,5 @@
-import {
-  TSESTree,
-  ParserServices,
-  AST_NODE_TYPES,
-  TSESLint,
-} from '@typescript-eslint/utils';
+import { TSESTree, ParserServices, AST_NODE_TYPES, TSESLint }
+  from '@typescript-eslint/utils';
 import { SymbolFlags } from 'typescript';
 import * as util from '../util';
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
index 6badf04..99f9640 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
@@ -1,9 +1,5 @@
-import {
-  TSESLint,
-  TSESTree,
-  AST_TOKEN_TYPES,
-  AST_NODE_TYPES,
-} from '@typescript-eslint/utils';
+import { TSESLint, TSESTree, AST_TOKEN_TYPES, AST_NODE_TYPES }
+  from '@typescript-eslint/utils';
 import * as util from '../util';
 
 type Prefer = 'type-imports' | 'no-type-imports';
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
index b67221a..2e03986 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
@@ -1,9 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESLint, TSESTree }
+  from '@typescript-eslint/utils';
 import * as util from '../util';
 
 type AccessibilityLevel =
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
index fa7013b..f2b092e 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
@@ -2,12 +2,8 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESLint, TSESTree }
+  from '@typescript-eslint/utils';
 
 import { OffsetStorage } from './OffsetStorage';
 import { TokenInfo } from './TokenInfo';
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/init-declarations.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/init-declarations.ts
index a10035c..6f173f3 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/init-declarations.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/init-declarations.ts
@@ -1,10 +1,7 @@
 import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils';
 import { getESLintCoreRule } from '../util/getESLintCoreRule';
-import {
-  createRule,
-  InferMessageIdsTypeFromRule,
-  InferOptionsTypeFromRule,
-} from '../util';
+import { createRule, InferMessageIdsTypeFromRule, InferOptionsTypeFromRule }
+  from '../util';
 
 const baseRule = getESLintCoreRule('init-declarations');
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts
index 92c794c..bdf6b82 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts
@@ -1,9 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  TSESLint,
-  TSESTree,
-  JSONSchema,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, TSESLint, TSESTree, JSONSchema }
+  from '@typescript-eslint/utils';
 import * as util from '../util';
 
 export type MessageIds = 'incorrectGroupOrder' | 'incorrectOrder';
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts
index c4e6e36..9192e83 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts
@@ -8,12 +8,8 @@ import {
   UnderscoreOptions,
 } from './enums';
 import { isMetaSelector } from './shared';
-import type {
-  Context,
-  NormalizedSelector,
-  ParsedOptions,
-  Selector,
-} from './types';
+import type { Context, NormalizedSelector, ParsedOptions, Selector }
+  from './types';
 import { createValidator } from './validator';
 
 function normalizeOption(option: Selector): NormalizedSelector[] {
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts
index 5538781..2b9c506 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts
@@ -1,9 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESLint, TSESTree }
+  from '@typescript-eslint/utils';
 import * as util from '../util';
 
 export default util.createRule({
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-this.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-this.ts
index 0ea8692..3df0fb2 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-this.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-this.ts
@@ -1,10 +1,7 @@
 import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/utils';
 import { getESLintCoreRule } from '../util/getESLintCoreRule';
-import {
-  InferOptionsTypeFromRule,
-  createRule,
-  InferMessageIdsTypeFromRule,
-} from '../util';
+import { InferOptionsTypeFromRule, createRule, InferMessageIdsTypeFromRule }
+  from '../util';
 
 const baseRule = getESLintCoreRule('no-invalid-this');
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-restricted-imports.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-restricted-imports.ts
index fd724c5..e7805cd 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-restricted-imports.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-restricted-imports.ts
@@ -1,8 +1,6 @@
 import { TSESTree } from '@typescript-eslint/utils';
-import type {
-  ArrayOfStringOrObject,
-  ArrayOfStringOrObjectPatterns,
-} from 'eslint/lib/rules/no-restricted-imports';
+import type { ArrayOfStringOrObject, ArrayOfStringOrObjectPatterns }
+  from 'eslint/lib/rules/no-restricted-imports';
 import ignore, { Ignore } from 'ignore';
 import {
   createRule,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
index 3f13f58..297ee7f 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
@@ -1,15 +1,7 @@
-import {
-  ASTUtils,
-  AST_NODE_TYPES,
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
-import {
-  Definition,
-  DefinitionType,
-  ImportBindingDefinition,
-  ScopeType,
-} from '@typescript-eslint/scope-manager';
+import { ASTUtils, AST_NODE_TYPES, TSESLint, TSESTree }
+  from '@typescript-eslint/utils';
+import { Definition, DefinitionType, ImportBindingDefinition, ScopeType }
+  from '@typescript-eslint/scope-manager';
 import * as util from '../util';
 
 type MessageIds = 'noShadow';
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts
index 2d9847e..da84bbe 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts
@@ -1,8 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESTree }
+  from '@typescript-eslint/utils';
 import * as util from '../util';
 
 type Values =
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
index 4e18a9f..1ef8691 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
@@ -1,8 +1,5 @@
-import {
-  TSESTree,
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-} from '@typescript-eslint/utils';
+import { TSESTree, AST_NODE_TYPES, AST_TOKEN_TYPES }
+  from '@typescript-eslint/utils';
 import * as ts from 'typescript';
 import {
   unionTypeParts,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/object-curly-spacing.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/object-curly-spacing.ts
index c64ca54..b14a786 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/object-curly-spacing.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/object-curly-spacing.ts
@@ -1,8 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESTree }
+  from '@typescript-eslint/utils';
 import { getESLintCoreRule } from '../util/getESLintCoreRule';
 import {
   createRule,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
index d13d187..3e25095 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
@@ -1,9 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESLint, TSESTree }
+  from '@typescript-eslint/utils';
 import * as util from '../util';
 
 export const phrases = {
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-nullish-coalescing.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-nullish-coalescing.ts
index b492287..a391d82 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-nullish-coalescing.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-nullish-coalescing.ts
@@ -1,9 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESLint, TSESTree }
+  from '@typescript-eslint/utils';
 import * as util from '../util';
 
 export type Options = [
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts
index bf49764..42bd221 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts
@@ -1,8 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESTree }
+  from '@typescript-eslint/utils';
 import * as ts from 'typescript';
 import * as util from '../util';
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/strict-boolean-expressions.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/strict-boolean-expressions.ts
index 0a91b2f..6ef3c69 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/strict-boolean-expressions.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/strict-boolean-expressions.ts
@@ -1,8 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  ParserServices,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, ParserServices, TSESTree }
+  from '@typescript-eslint/utils';
 import * as tsutils from 'tsutils';
 import * as ts from 'typescript';
 import * as util from '../util';
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/triple-slash-reference.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/triple-slash-reference.ts
index cf76923..4bf146b 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/triple-slash-reference.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/triple-slash-reference.ts
@@ -1,8 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESTree }
+  from '@typescript-eslint/utils';
 import * as util from '../util';
 
 type Options = [
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/util/collectUnusedVariables.ts ALT/typescript-eslint/packages/eslint-plugin/src/util/collectUnusedVariables.ts
index 6fe14b0..51535fc 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/util/collectUnusedVariables.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/util/collectUnusedVariables.ts
@@ -1,10 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  TSESLint,
-  ASTUtils,
-  TSESTree,
-  ESLintUtils,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, TSESLint, ASTUtils, TSESTree, ESLintUtils }
+  from '@typescript-eslint/utils';
 import { ImplicitLibVariable } from '@typescript-eslint/scope-manager';
 import { Visitor } from '@typescript-eslint/scope-manager/dist/referencer/Visitor';
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/util/explicitReturnTypeUtils.ts ALT/typescript-eslint/packages/eslint-plugin/src/util/explicitReturnTypeUtils.ts
index 4d4ec60..3f2c1a6 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/util/explicitReturnTypeUtils.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/util/explicitReturnTypeUtils.ts
@@ -1,9 +1,5 @@
-import {
-  TSESTree,
-  AST_NODE_TYPES,
-  ESLintUtils,
-  TSESLint,
-} from '@typescript-eslint/utils';
+import { TSESTree, AST_NODE_TYPES, ESLintUtils, TSESLint }
+  from '@typescript-eslint/utils';
 import { isTypeAssertion, isConstructor, isSetter } from './astUtils';
 import { getFunctionHeadLoc } from './getFunctionHeadLoc';
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/util/getFunctionHeadLoc.ts ALT/typescript-eslint/packages/eslint-plugin/src/util/getFunctionHeadLoc.ts
index a9d3083..64bc0e1 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/util/getFunctionHeadLoc.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/util/getFunctionHeadLoc.ts
@@ -1,9 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESLint, TSESTree }
+  from '@typescript-eslint/utils';
 
 type FunctionNode =
   | TSESTree.ArrowFunctionExpression
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/util/getWrappingFixer.ts ALT/typescript-eslint/packages/eslint-plugin/src/util/getWrappingFixer.ts
index af7885e..d791f17 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/util/getWrappingFixer.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/util/getWrappingFixer.ts
@@ -1,9 +1,5 @@
-import {
-  AST_NODE_TYPES,
-  TSESLint,
-  ASTUtils,
-  TSESTree,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, TSESLint, ASTUtils, TSESTree }
+  from '@typescript-eslint/utils';
 
 interface WrappingFixerParams {
   /** Source code. */
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/ban-types.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/ban-types.test.ts
index a200336..0b270f8 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/ban-types.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/ban-types.test.ts
@@ -1,10 +1,7 @@
 /* eslint-disable @typescript-eslint/internal/prefer-ast-types-enum */
 import { TSESLint } from '@typescript-eslint/utils';
-import rule, {
-  MessageIds,
-  Options,
-  TYPE_KEYWORDS,
-} from '../../src/rules/ban-types';
+import rule, { MessageIds, Options, TYPE_KEYWORDS }
+  from '../../src/rules/ban-types';
 import { objectReduceKey } from '../../src/util';
 import { noFormat, RuleTester } from '../RuleTester';
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
index 32b1f91..3de6bd9 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
@@ -6,10 +6,8 @@
 import { AST_NODE_TYPES, TSESLint } from '@typescript-eslint/utils';
 import { RuleTester } from '../../RuleTester';
 import rule from '../../../src/rules/indent';
-import {
-  InferMessageIdsTypeFromRule,
-  InferOptionsTypeFromRule,
-} from '../../../src/util';
+import { InferMessageIdsTypeFromRule, InferOptionsTypeFromRule }
+  from '../../../src/util';
 
 type MessageIds = InferMessageIdsTypeFromRule<typeof rule>;
 type Options = InferOptionsTypeFromRule<typeof rule>;
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
index 628389a..db3e795 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
@@ -1,11 +1,8 @@
 // The following code is adapted from the the code in eslint.
 // License: https://github.com/eslint/eslint/blob/48700fc8408f394887cdedd071b22b757700fdcb/LICENSE
 
-import {
-  AST_NODE_TYPES,
-  AST_TOKEN_TYPES,
-  TSESLint,
-} from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, AST_TOKEN_TYPES, TSESLint }
+  from '@typescript-eslint/utils';
 import rule from '../../../src/rules/indent';
 import { InferMessageIdsTypeFromRule } from '../../../src/util';
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/member-ordering-alphabetically-case-insensitive-order.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/member-ordering-alphabetically-case-insensitive-order.test.ts
index 24907a8..af08d4a 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/member-ordering-alphabetically-case-insensitive-order.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/member-ordering-alphabetically-case-insensitive-order.test.ts
@@ -1,8 +1,5 @@
-import rule, {
-  defaultOrder,
-  MessageIds,
-  Options,
-} from '../../src/rules/member-ordering';
+import rule, { defaultOrder, MessageIds, Options }
+  from '../../src/rules/member-ordering';
 import { RuleTester } from '../RuleTester';
 import { TSESLint } from '@typescript-eslint/utils';
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/member-ordering-alphabetically-order.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/member-ordering-alphabetically-order.test.ts
index dfd5f0d..df95205 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/member-ordering-alphabetically-order.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/member-ordering-alphabetically-order.test.ts
@@ -1,8 +1,5 @@
-import rule, {
-  defaultOrder,
-  MessageIds,
-  Options,
-} from '../../src/rules/member-ordering';
+import rule, { defaultOrder, MessageIds, Options }
+  from '../../src/rules/member-ordering';
 import { RuleTester } from '../RuleTester';
 import { TSESLint } from '@typescript-eslint/utils';
 
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/naming-convention.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/naming-convention.test.ts
index ef12350..0293a7d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/naming-convention.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/naming-convention.test.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/internal/prefer-ast-types-enum */
 import { TSESLint } from '@typescript-eslint/utils';
 import rule, { MessageIds, Options } from '../../src/rules/naming-convention';
-import {
-  PredefinedFormatsString,
-  Selector,
-  selectorTypeToMessageString,
-} from '../../src/rules/naming-convention-utils';
+import { PredefinedFormatsString, Selector, selectorTypeToMessageString }
+  from '../../src/rules/naming-convention-utils';
 import { getFixturesRootDir, RuleTester } from '../RuleTester';
 
 const ruleTester = new RuleTester({
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-confusing-void-expression.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-confusing-void-expression.test.ts
index e0bdd18..fbdc66f 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-confusing-void-expression.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-confusing-void-expression.test.ts
@@ -1,13 +1,7 @@
-import rule, {
-  MessageId,
-  Options,
-} from '../../src/rules/no-confusing-void-expression';
-import {
-  batchedSingleLineTests,
-  getFixturesRootDir,
-  noFormat,
-  RuleTester,
-} from '../RuleTester';
+import rule, { MessageId, Options }
+  from '../../src/rules/no-confusing-void-expression';
+import { batchedSingleLineTests, getFixturesRootDir, noFormat, RuleTester }
+  from '../RuleTester';
 
 const rootPath = getFixturesRootDir();
 const ruleTester = new RuleTester({
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-inferrable-types.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-inferrable-types.test.ts
index d85806b..7938667 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-inferrable-types.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-inferrable-types.test.ts
@@ -1,10 +1,8 @@
 import { TSESLint } from '@typescript-eslint/utils';
 import rule from '../../src/rules/no-inferrable-types';
 import { RuleTester } from '../RuleTester';
-import {
-  InferMessageIdsTypeFromRule,
-  InferOptionsTypeFromRule,
-} from '../../src/util';
+import { InferMessageIdsTypeFromRule, InferOptionsTypeFromRule }
+  from '../../src/util';
 
 type MessageIds = InferMessageIdsTypeFromRule<typeof rule>;
 type Options = InferOptionsTypeFromRule<typeof rule>;
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts
index 3e86749..d853d49 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts
@@ -1,12 +1,8 @@
-import {
-  TestCaseError,
-  InvalidTestCase,
-} from '@typescript-eslint/utils/dist/ts-eslint';
+import { TestCaseError, InvalidTestCase }
+  from '@typescript-eslint/utils/dist/ts-eslint';
 import * as path from 'path';
-import rule, {
-  Options,
-  MessageId,
-} from '../../src/rules/no-unnecessary-condition';
+import rule, { Options, MessageId }
+  from '../../src/rules/no-unnecessary-condition';
 import { RuleTester, getFixturesRootDir, noFormat } from '../RuleTester';
 
 const rootPath = getFixturesRootDir();
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-assignment.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-assignment.test.ts
index 78ef7e7..a6b77cf 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-assignment.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-assignment.test.ts
@@ -1,15 +1,9 @@
 import { TSESLint } from '@typescript-eslint/utils';
 import rule from '../../src/rules/no-unsafe-assignment';
-import {
-  RuleTester,
-  batchedSingleLineTests,
-  getFixturesRootDir,
-  noFormat,
-} from '../RuleTester';
-import {
-  InferMessageIdsTypeFromRule,
-  InferOptionsTypeFromRule,
-} from '../../src/util';
+import { RuleTester, batchedSingleLineTests, getFixturesRootDir, noFormat }
+  from '../RuleTester';
+import { InferMessageIdsTypeFromRule, InferOptionsTypeFromRule }
+  from '../../src/util';
 
 type Options = InferOptionsTypeFromRule<typeof rule>;
 type MessageIds = InferMessageIdsTypeFromRule<typeof rule>;
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-call.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-call.test.ts
index 1f70c30..7e7c35f 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-call.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-call.test.ts
@@ -1,10 +1,6 @@
 import rule from '../../src/rules/no-unsafe-call';
-import {
-  RuleTester,
-  batchedSingleLineTests,
-  getFixturesRootDir,
-  noFormat,
-} from '../RuleTester';
+import { RuleTester, batchedSingleLineTests, getFixturesRootDir, noFormat }
+  from '../RuleTester';
 
 const ruleTester = new RuleTester({
   parser: '@typescript-eslint/parser',
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-member-access.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-member-access.test.ts
index 491d5e9..48b590c 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-member-access.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-member-access.test.ts
@@ -1,10 +1,6 @@
 import rule from '../../src/rules/no-unsafe-member-access';
-import {
-  RuleTester,
-  batchedSingleLineTests,
-  getFixturesRootDir,
-  noFormat,
-} from '../RuleTester';
+import { RuleTester, batchedSingleLineTests, getFixturesRootDir, noFormat }
+  from '../RuleTester';
 
 const ruleTester = new RuleTester({
   parser: '@typescript-eslint/parser',
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-return.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-return.test.ts
index 2bbdfdd..2929b68 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-return.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-unsafe-return.test.ts
@@ -1,10 +1,6 @@
 import rule from '../../src/rules/no-unsafe-return';
-import {
-  RuleTester,
-  batchedSingleLineTests,
-  getFixturesRootDir,
-  noFormat,
-} from '../RuleTester';
+import { RuleTester, batchedSingleLineTests, getFixturesRootDir, noFormat }
+  from '../RuleTester';
 
 const ruleTester = new RuleTester({
   parser: '@typescript-eslint/parser',
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-nullish-coalescing.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-nullish-coalescing.test.ts
index 8096df9..63e6e33 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-nullish-coalescing.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-nullish-coalescing.test.ts
@@ -1,8 +1,6 @@
 import { TSESLint } from '@typescript-eslint/utils';
-import rule, {
-  MessageIds,
-  Options,
-} from '../../src/rules/prefer-nullish-coalescing';
+import rule, { MessageIds, Options }
+  from '../../src/rules/prefer-nullish-coalescing';
 import { RuleTester, getFixturesRootDir } from '../RuleTester';
 
 const rootPath = getFixturesRootDir();
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-optional-chain.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-optional-chain.test.ts
index d6ac19a..f0cae52 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-optional-chain.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-optional-chain.test.ts
@@ -1,10 +1,8 @@
 import rule from '../../src/rules/prefer-optional-chain';
 import { RuleTester, noFormat } from '../RuleTester';
 import { TSESLint } from '@typescript-eslint/utils';
-import {
-  InferMessageIdsTypeFromRule,
-  InferOptionsTypeFromRule,
-} from '../../src/util';
+import { InferMessageIdsTypeFromRule, InferOptionsTypeFromRule }
+  from '../../src/util';
 
 const ruleTester = new RuleTester({
   parser: '@typescript-eslint/parser',
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts
index f17a19f..41280d0 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts
@@ -1,10 +1,8 @@
 import { TSESLint } from '@typescript-eslint/utils';
 import { RuleTester, getFixturesRootDir } from '../RuleTester';
 import rule from '../../src/rules/prefer-readonly-parameter-types';
-import {
-  InferMessageIdsTypeFromRule,
-  InferOptionsTypeFromRule,
-} from '../../src/util';
+import { InferMessageIdsTypeFromRule, InferOptionsTypeFromRule }
+  from '../../src/util';
 
 type MessageIds = InferMessageIdsTypeFromRule<typeof rule>;
 type Options = InferOptionsTypeFromRule<typeof rule>;
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/sort-type-union-intersection-members.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/sort-type-union-intersection-members.test.ts
index 1d29a45..d110637 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/sort-type-union-intersection-members.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/sort-type-union-intersection-members.test.ts
@@ -1,8 +1,6 @@
 import { TSESLint } from '@typescript-eslint/utils';
-import rule, {
-  MessageIds,
-  Options,
-} from '../../src/rules/sort-type-union-intersection-members';
+import rule, { MessageIds, Options }
+  from '../../src/rules/sort-type-union-intersection-members';
 import { noFormat, RuleTester } from '../RuleTester';
 
 const ruleTester = new RuleTester({
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/strict-boolean-expressions.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/strict-boolean-expressions.test.ts
index 335c2c7..8395064 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/strict-boolean-expressions.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/strict-boolean-expressions.test.ts
@@ -1,14 +1,8 @@
 import * as path from 'path';
-import rule, {
-  MessageId,
-  Options,
-} from '../../src/rules/strict-boolean-expressions';
-import {
-  batchedSingleLineTests,
-  getFixturesRootDir,
-  noFormat,
-  RuleTester,
-} from '../RuleTester';
+import rule, { MessageId, Options }
+  from '../../src/rules/strict-boolean-expressions';
+import { batchedSingleLineTests, getFixturesRootDir, noFormat, RuleTester }
+  from '../RuleTester';
 
 const rootPath = getFixturesRootDir();
 const ruleTester = new RuleTester({
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/type-annotation-spacing.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/type-annotation-spacing.test.ts
index 17ae884..dbe570e 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/type-annotation-spacing.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/type-annotation-spacing.test.ts
@@ -6,10 +6,8 @@
 import { TSESLint } from '@typescript-eslint/utils';
 import { RuleTester } from '../RuleTester';
 import rule from '../../src/rules/type-annotation-spacing';
-import {
-  InferMessageIdsTypeFromRule,
-  InferOptionsTypeFromRule,
-} from '../../src/util';
+import { InferMessageIdsTypeFromRule, InferOptionsTypeFromRule }
+  from '../../src/util';
 
 type MessageIds = InferMessageIdsTypeFromRule<typeof rule>;
 type Options = InferOptionsTypeFromRule<typeof rule>;
diff --git ORI/typescript-eslint/packages/parser/src/parser.ts ALT/typescript-eslint/packages/parser/src/parser.ts
index bbb0e3a..0022259 100644
--- ORI/typescript-eslint/packages/parser/src/parser.ts
+++ ALT/typescript-eslint/packages/parser/src/parser.ts
@@ -5,11 +5,8 @@ import {
   TSESTreeOptions,
   visitorKeys,
 } from '@typescript-eslint/typescript-estree';
-import {
-  analyze,
-  AnalyzeOptions,
-  ScopeManager,
-} from '@typescript-eslint/scope-manager';
+import { analyze, AnalyzeOptions, ScopeManager }
+  from '@typescript-eslint/scope-manager';
 import debug from 'debug';
 import { CompilerOptions, ScriptTarget } from 'typescript';
 
diff --git ORI/typescript-eslint/packages/parser/tests/lib/services.ts ALT/typescript-eslint/packages/parser/tests/lib/services.ts
index 4567f5f..538dd7a 100644
--- ORI/typescript-eslint/packages/parser/tests/lib/services.ts
+++ ALT/typescript-eslint/packages/parser/tests/lib/services.ts
@@ -2,11 +2,8 @@ import path from 'path';
 import fs from 'fs';
 import glob from 'glob';
 import { ParserOptions } from '../../src/parser';
-import {
-  createSnapshotTestBlock,
-  formatSnapshotName,
-  testServices,
-} from '../tools/test-utils';
+import { createSnapshotTestBlock, formatSnapshotName, testServices }
+  from '../tools/test-utils';
 import { createProgram } from '@typescript-eslint/typescript-estree';
 
 //------------------------------------------------------------------------------
diff --git ORI/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts ALT/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts
index a3e1e98..1690035 100644
--- ORI/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts
@@ -1,10 +1,7 @@
 import { TSESTree } from '@typescript-eslint/types';
 import { VisitorBase, VisitorOptions } from './VisitorBase';
-import {
-  PatternVisitor,
-  PatternVisitorCallback,
-  PatternVisitorOptions,
-} from './PatternVisitor';
+import { PatternVisitor, PatternVisitorCallback, PatternVisitorOptions }
+  from './PatternVisitor';
 
 interface VisitPatternOptions extends PatternVisitorOptions {
   processRightHandNodes?: boolean;
diff --git ORI/typescript-eslint/packages/scope-manager/src/scope/GlobalScope.ts ALT/typescript-eslint/packages/scope-manager/src/scope/GlobalScope.ts
index 9dfb1e3..253b70c 100644
--- ORI/typescript-eslint/packages/scope-manager/src/scope/GlobalScope.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/scope/GlobalScope.ts
@@ -6,11 +6,8 @@ import { assert } from '../assert';
 import { ImplicitGlobalVariableDefinition } from '../definition/ImplicitGlobalVariableDefinition';
 import { Reference } from '../referencer/Reference';
 import { ScopeManager } from '../ScopeManager';
-import {
-  Variable,
-  ImplicitLibVariable,
-  ImplicitLibVariableOptions,
-} from '../variable';
+import { Variable, ImplicitLibVariable, ImplicitLibVariableOptions }
+  from '../variable';
 
 class GlobalScope extends ScopeBase<
   ScopeType.global,
diff --git ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
index 18196d9..06b54de 100644
--- ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
@@ -8,12 +8,8 @@ import { ModuleScope } from './ModuleScope';
 import { assert } from '../assert';
 import { Definition, DefinitionType } from '../definition';
 import { createIdGenerator } from '../ID';
-import {
-  Reference,
-  ReferenceFlag,
-  ReferenceImplicitGlobal,
-  ReferenceTypeFlag,
-} from '../referencer/Reference';
+import { Reference, ReferenceFlag, ReferenceImplicitGlobal, ReferenceTypeFlag }
+  from '../referencer/Reference';
 import { Variable } from '../variable';
 import { TSModuleScope } from './TSModuleScope';
 
diff --git ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/class-fields.test.ts ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/class-fields.test.ts
index 541b46a..71b77fe 100644
--- ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/class-fields.test.ts
+++ ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/class-fields.test.ts
@@ -1,12 +1,7 @@
-import {
-  expectToBeClassFieldInitializerScope,
-  expectToBeIdentifier,
-} from '../util';
-import {
-  expectToBeClassScope,
-  expectToBeGlobalScope,
-  parseAndAnalyze,
-} from '../util';
+import { expectToBeClassFieldInitializerScope, expectToBeIdentifier }
+  from '../util';
+import { expectToBeClassScope, expectToBeGlobalScope, parseAndAnalyze }
+  from '../util';
 
 describe('Class fields', () => {
   it('class C { f = g }', () => {
diff --git ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts
index 442f17a..0fcdbe6 100644
--- ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts
+++ ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts
@@ -1,9 +1,6 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
-import {
-  expectToBeFunctionScope,
-  getRealVariables,
-  parseAndAnalyze,
-} from '../util';
+import { expectToBeFunctionScope, getRealVariables, parseAndAnalyze }
+  from '../util';
 
 describe('ES6 new.target', () => {
   it('should not make references of new.target', () => {
diff --git ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/global-increment.test.ts ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/global-increment.test.ts
index 7cf8650..a900e35 100644
--- ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/global-increment.test.ts
+++ ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/global-increment.test.ts
@@ -1,8 +1,5 @@
-import {
-  expectToBeGlobalScope,
-  getRealVariables,
-  parseAndAnalyze,
-} from '../util';
+import { expectToBeGlobalScope, getRealVariables, parseAndAnalyze }
+  from '../util';
 
 describe('global increment', () => {
   it('becomes read/write', () => {
diff --git ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
index bc2d589..546095c 100644
--- ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
+++ ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
@@ -1,8 +1,5 @@
-import {
-  expectToBeGlobalScope,
-  getRealVariables,
-  parseAndAnalyze,
-} from '../util';
+import { expectToBeGlobalScope, getRealVariables, parseAndAnalyze }
+  from '../util';
 import { DefinitionType } from '../../src/definition';
 
 describe('implicit global reference', () => {
diff --git ORI/typescript-eslint/packages/type-utils/tests/isTypeReadonly.test.ts ALT/typescript-eslint/packages/type-utils/tests/isTypeReadonly.test.ts
index f6f2ceb..9a5272e 100644
--- ORI/typescript-eslint/packages/type-utils/tests/isTypeReadonly.test.ts
+++ ALT/typescript-eslint/packages/type-utils/tests/isTypeReadonly.test.ts
@@ -1,10 +1,8 @@
 import * as ts from 'typescript';
 import { TSESTree } from '@typescript-eslint/utils';
 import { parseForESLint } from '@typescript-eslint/parser';
-import {
-  isTypeReadonly,
-  type ReadonlynessOptions,
-} from '../src/isTypeReadonly';
+import { isTypeReadonly, type ReadonlynessOptions }
+  from '../src/isTypeReadonly';
 import path from 'path';
 
 describe('isTypeReadonly', () => {
diff --git ORI/typescript-eslint/packages/typescript-estree/src/convert.ts ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
index f0fb7d3..b03084f 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/convert.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
@@ -23,17 +23,11 @@ import {
   TSError,
   unescapeStringLiteralText,
 } from './node-utils';
-import type {
-  ParserWeakMap,
-  ParserWeakMapESTreeToTSNode,
-} from './parser-options';
+import type { ParserWeakMap, ParserWeakMapESTreeToTSNode }
+  from './parser-options';
 import type { SemanticOrSyntacticError } from './semantic-or-syntactic-errors';
-import {
-  AST_NODE_TYPES,
-  TSESTree,
-  TSESTreeToTSNode,
-  TSNode,
-} from './ts-estree';
+import { AST_NODE_TYPES, TSESTree, TSESTreeToTSNode, TSNode }
+  from './ts-estree';
 import { typescriptVersionIsAtLeast } from './version-check';
 import { Expression } from '@typescript-eslint/types/src/ast-spec';
 
diff --git ORI/typescript-eslint/packages/typescript-estree/src/create-program/createIsolatedProgram.ts ALT/typescript-eslint/packages/typescript-estree/src/create-program/createIsolatedProgram.ts
index 70169c6..5f6e2ba 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/createIsolatedProgram.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/createIsolatedProgram.ts
@@ -1,11 +1,8 @@
 import debug from 'debug';
 import * as ts from 'typescript';
 import { Extra } from '../parser-options';
-import {
-  ASTAndProgram,
-  createDefaultCompilerOptionsFromExtra,
-  getScriptKind,
-} from './shared';
+import { ASTAndProgram, createDefaultCompilerOptionsFromExtra, getScriptKind }
+  from './shared';
 
 const log = debug('typescript-eslint:typescript-estree:createIsolatedProgram');
 
diff --git ORI/typescript-eslint/packages/typescript-estree/src/create-program/useProvidedPrograms.ts ALT/typescript-eslint/packages/typescript-estree/src/create-program/useProvidedPrograms.ts
index 23b5649..b876472 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/useProvidedPrograms.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/useProvidedPrograms.ts
@@ -3,11 +3,8 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
 import { Extra } from '../parser-options';
-import {
-  ASTAndProgram,
-  CORE_COMPILER_OPTIONS,
-  getAstFromProgram,
-} from './shared';
+import { ASTAndProgram, CORE_COMPILER_OPTIONS, getAstFromProgram }
+  from './shared';
 
 const log = debug('typescript-eslint:typescript-estree:useProvidedProgram');
 
diff --git ORI/typescript-eslint/packages/typescript-estree/src/parser.ts ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
index 8867e8a..af5acb7 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/parser.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
@@ -19,10 +19,8 @@ import {
   ensureAbsolutePath,
   getCanonicalFileName,
 } from './create-program/shared';
-import {
-  createProgramFromConfigFile,
-  useProvidedPrograms,
-} from './create-program/useProvidedPrograms';
+import { createProgramFromConfigFile, useProvidedPrograms }
+  from './create-program/useProvidedPrograms';
 
 const log = debug('typescript-eslint:typescript-estree:parser');
 
diff --git ORI/typescript-eslint/packages/typescript-estree/src/semantic-or-syntactic-errors.ts ALT/typescript-eslint/packages/typescript-estree/src/semantic-or-syntactic-errors.ts
index af6f339..fdbf373 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/semantic-or-syntactic-errors.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/semantic-or-syntactic-errors.ts
@@ -1,9 +1,5 @@
-import type {
-  Diagnostic,
-  DiagnosticWithLocation,
-  Program,
-  SourceFile,
-} from 'typescript';
+import type { Diagnostic, DiagnosticWithLocation, Program, SourceFile }
+  from 'typescript';
 import { flattenDiagnosticMessageText, sys } from 'typescript';
 
 export interface SemanticOrSyntacticError extends Diagnostic {
diff --git ORI/typescript-eslint/packages/typescript-estree/tests/lib/semanticInfo.test.ts ALT/typescript-eslint/packages/typescript-estree/tests/lib/semanticInfo.test.ts
index c003d8d..41ee8d0 100644
--- ORI/typescript-eslint/packages/typescript-estree/tests/lib/semanticInfo.test.ts
+++ ALT/typescript-eslint/packages/typescript-estree/tests/lib/semanticInfo.test.ts
@@ -4,10 +4,8 @@ import * as path from 'path';
 import * as ts from 'typescript';
 import { clearWatchCaches } from '../../src/create-program/createWatchProgram';
 import { createProgramFromConfigFile as createProgram } from '../../src/create-program/useProvidedPrograms';
-import {
-  parseAndGenerateServices,
-  ParseAndGenerateServicesResult,
-} from '../../src/parser';
+import { parseAndGenerateServices, ParseAndGenerateServicesResult }
+  from '../../src/parser';
 import { TSESTreeOptions } from '../../src/parser-options';
 import { TSESTree } from '../../src/ts-estree';
 import {
diff --git ORI/typescript-eslint/packages/typescript-estree/tools/test-utils.ts ALT/typescript-eslint/packages/typescript-estree/tools/test-utils.ts
index 65e1cb1..54c4899 100644
--- ORI/typescript-eslint/packages/typescript-estree/tools/test-utils.ts
+++ ALT/typescript-eslint/packages/typescript-estree/tools/test-utils.ts
@@ -1,8 +1,5 @@
-import type {
-  TSESTree,
-  TSESTreeOptions,
-  ParseAndGenerateServicesResult,
-} from '../src';
+import type { TSESTree, TSESTreeOptions, ParseAndGenerateServicesResult }
+  from '../src';
 import { parse as parserParse, parseAndGenerateServices } from '../src';
 
 export function parseCodeAndGenerateServices(
diff --git ORI/typescript-eslint/packages/utils/src/ts-eslint-scope/PatternVisitor.ts ALT/typescript-eslint/packages/utils/src/ts-eslint-scope/PatternVisitor.ts
index 8563f6d..543ba6b 100644
--- ORI/typescript-eslint/packages/utils/src/ts-eslint-scope/PatternVisitor.ts
+++ ALT/typescript-eslint/packages/utils/src/ts-eslint-scope/PatternVisitor.ts
@@ -1,11 +1,8 @@
 import ESLintPatternVisitor from 'eslint-scope/lib/pattern-visitor';
 import { TSESTree } from '../ts-estree';
 import { ScopeManager } from './ScopeManager';
-import {
-  PatternVisitorCallback,
-  PatternVisitorOptions,
-  Visitor,
-} from './Options';
+import { PatternVisitorCallback, PatternVisitorOptions, Visitor }
+  from './Options';
 
 interface PatternVisitor extends Visitor {
   options: PatternVisitorOptions;
diff --git ORI/typescript-eslint/packages/utils/src/ts-eslint-scope/Referencer.ts ALT/typescript-eslint/packages/utils/src/ts-eslint-scope/Referencer.ts
index 1d1180f..5c90b69 100644
--- ORI/typescript-eslint/packages/utils/src/ts-eslint-scope/Referencer.ts
+++ ALT/typescript-eslint/packages/utils/src/ts-eslint-scope/Referencer.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import ESLintReferencer from 'eslint-scope/lib/referencer';
 import { TSESTree } from '../ts-estree';
-import {
-  PatternVisitorCallback,
-  PatternVisitorOptions,
-  Visitor,
-} from './Options';
+import { PatternVisitorCallback, PatternVisitorOptions, Visitor }
+  from './Options';
 import { Scope } from './Scope';
 import { ScopeManager } from './ScopeManager';
 
diff --git ORI/typescript-eslint/packages/utils/src/ts-eslint/Linter.ts ALT/typescript-eslint/packages/utils/src/ts-eslint/Linter.ts
index 77c338f..46082c8 100644
--- ORI/typescript-eslint/packages/utils/src/ts-eslint/Linter.ts
+++ ALT/typescript-eslint/packages/utils/src/ts-eslint/Linter.ts
@@ -3,12 +3,8 @@
 import { Linter as ESLintLinter } from 'eslint';
 import { TSESTree, ParserServices } from '../ts-estree';
 import { ParserOptions as TSParserOptions } from './ParserOptions';
-import {
-  RuleCreateFunction,
-  RuleFix,
-  RuleModule,
-  SharedConfigurationSettings,
-} from './Rule';
+import { RuleCreateFunction, RuleFix, RuleModule, SharedConfigurationSettings }
+  from './Rule';
 import { Scope } from './Scope';
 import { SourceCode } from './SourceCode';
 
diff --git ORI/typescript-eslint/packages/utils/src/ts-eslint/RuleTester.ts ALT/typescript-eslint/packages/utils/src/ts-eslint/RuleTester.ts
index 5b748ed..3b50205 100644
--- ORI/typescript-eslint/packages/utils/src/ts-eslint/RuleTester.ts
+++ ALT/typescript-eslint/packages/utils/src/ts-eslint/RuleTester.ts
@@ -2,11 +2,8 @@ import { RuleTester as ESLintRuleTester } from 'eslint';
 import { AST_NODE_TYPES, AST_TOKEN_TYPES } from '../ts-estree';
 import { Linter } from './Linter';
 import { ParserOptions } from './ParserOptions';
-import {
-  RuleCreateFunction,
-  RuleModule,
-  SharedConfigurationSettings,
-} from './Rule';
+import { RuleCreateFunction, RuleModule, SharedConfigurationSettings }
+  from './Rule';
 
 interface ValidTestCase<TOptions extends Readonly<unknown[]>> {
   /**
diff --git ORI/typescript-eslint/packages/website/src/components/ast/serializer/serializer.ts ALT/typescript-eslint/packages/website/src/components/ast/serializer/serializer.ts
index 697dba6..730f00d 100644
--- ORI/typescript-eslint/packages/website/src/components/ast/serializer/serializer.ts
+++ ALT/typescript-eslint/packages/website/src/components/ast/serializer/serializer.ts
@@ -1,8 +1,5 @@
-import type {
-  ASTViewerModelSimple,
-  ASTViewerModelMap,
-  Serializer,
-} from '../types';
+import type { ASTViewerModelSimple, ASTViewerModelMap, Serializer }
+  from '../types';
 import { isRecord, objType } from '../utils';
 
 function getSimpleModel(data: unknown): ASTViewerModelSimple {
diff --git ORI/typescript-eslint/packages/website/src/components/editor/useSandboxServices.ts ALT/typescript-eslint/packages/website/src/components/editor/useSandboxServices.ts
index ffd6aa6..5a0e940 100644
--- ORI/typescript-eslint/packages/website/src/components/editor/useSandboxServices.ts
+++ ALT/typescript-eslint/packages/website/src/components/editor/useSandboxServices.ts
@@ -3,10 +3,8 @@ import { useEffect, useState } from 'react';
 import type Monaco from 'monaco-editor';
 import type { LintMessage, WebLinter } from '@typescript-eslint/website-eslint';
 import type { RuleDetails } from '../types';
-import type {
-  createTypeScriptSandbox,
-  SandboxConfig,
-} from '../../vendor/sandbox';
+import type { createTypeScriptSandbox, SandboxConfig }
+  from '../../vendor/sandbox';
 
 import { sandboxSingleton } from './loadSandbox';
 import { editorEmbedId } from './EditorEmbed';
diff --git ORI/typescript-eslint/packages/website/src/components/types.ts ALT/typescript-eslint/packages/website/src/components/types.ts
index 5e1e3a7..a74143b 100644
--- ORI/typescript-eslint/packages/website/src/components/types.ts
+++ ALT/typescript-eslint/packages/website/src/components/types.ts
@@ -1,7 +1,5 @@
-import type {
-  ParserOptions,
-  RulesRecord,
-} from '@typescript-eslint/website-eslint';
+import type { ParserOptions, RulesRecord }
+  from '@typescript-eslint/website-eslint';
 
 export interface CompilerFlags extends Record<string, unknown> {
   isolatedModules?: boolean;

@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2022

prettier/prettier#13353 VS prettier/prettier@main :: vega/vega-lite@16bc913

Diff (657 lines) 
diff --git ORI/vega-lite/src/channeldef.ts ALT/vega-lite/src/channeldef.ts
index a0268e3..9a36021 100644
--- ORI/vega-lite/src/channeldef.ts
+++ ALT/vega-lite/src/channeldef.ts
@@ -67,14 +67,8 @@ import {hasDiscreteDomain, isContinuousToDiscrete, Scale, SCALE_CATEGORY_INDEX}
 import {isSortByChannel, Sort, SortOrder} from './sort';
 import {isFacetFieldDef} from './spec/facet';
 import {StackOffset} from './stack';
-import {
-  getTimeUnitParts,
-  isLocalSingleTimeUnit,
-  normalizeTimeUnit,
-  TimeUnit,
-  TimeUnitParams,
-  timeUnitToString
-} from './timeunit';
+import {getTimeUnitParts, isLocalSingleTimeUnit, normalizeTimeUnit, TimeUnit, TimeUnitParams, timeUnitToString}
+  from './timeunit';
 import {AggregatedFieldDef, WindowFieldDef} from './transform';
 import {getFullName, QUANTITATIVE, StandardType, Type} from './type';
 import {
diff --git ORI/vega-lite/src/compile/axis/component.ts ALT/vega-lite/src/compile/axis/component.ts
index 9031088..4a36164 100644
--- ORI/vega-lite/src/compile/axis/component.ts
+++ ALT/vega-lite/src/compile/axis/component.ts
@@ -1,11 +1,6 @@
 import {Axis as VgAxis, SignalRef, Text} from 'vega';
-import {
-  AxisInternal,
-  AxisPart,
-  AxisPropsWithCondition,
-  COMMON_AXIS_PROPERTIES_INDEX,
-  ConditionalAxisProp
-} from '../../axis';
+import {AxisInternal, AxisPart, AxisPropsWithCondition, COMMON_AXIS_PROPERTIES_INDEX, ConditionalAxisProp}
+  from '../../axis';
 import {FieldDefBase} from '../../channeldef';
 import {duplicate, Flag, keys} from '../../util';
 import {isSignalRef} from '../../vega.schema';
diff --git ORI/vega-lite/src/compile/compile.ts ALT/vega-lite/src/compile/compile.ts
index 13e76dc..5bde59b 100644
--- ORI/vega-lite/src/compile/compile.ts
+++ ALT/vega-lite/src/compile/compile.ts
@@ -7,14 +7,8 @@ import * as log from '../log';
 import {normalize} from '../normalize';
 import {assembleParameterSignals} from '../parameter';
 import {LayoutSizeMixins, TopLevel, TopLevelSpec} from '../spec';
-import {
-  AutoSizeParams,
-  Datasets,
-  extractTopLevelProperties,
-  getFitType,
-  isFitType,
-  TopLevelProperties
-} from '../spec/toplevel';
+import {AutoSizeParams, Datasets, extractTopLevelProperties, getFitType, isFitType, TopLevelProperties}
+  from '../spec/toplevel';
 import {Dict, keys} from '../util';
 import {buildModel} from './buildmodel';
 import {assembleRootData} from './data/assemble';
diff --git ORI/vega-lite/src/compile/data/aggregate.ts ALT/vega-lite/src/compile/data/aggregate.ts
index a952e22..bc0c705 100644
--- ORI/vega-lite/src/compile/data/aggregate.ts
+++ ALT/vega-lite/src/compile/data/aggregate.ts
@@ -1,12 +1,7 @@
 import {AggregateOp, AggregateTransform as VgAggregateTransform} from 'vega';
 import {isArgmaxDef, isArgminDef} from '../../aggregate';
-import {
-  Channel,
-  getPositionChannelFromLatLong,
-  getSecondaryRangeChannel,
-  isGeoPositionChannel,
-  isScaleChannel
-} from '../../channel';
+import {Channel, getPositionChannelFromLatLong, getSecondaryRangeChannel, isGeoPositionChannel, isScaleChannel}
+  from '../../channel';
 import {binRequiresRange, FieldDef, hasBandEnd, isScaleFieldDef, isTypedFieldDef, vgField} from '../../channeldef';
 import * as log from '../../log';
 import {isFieldRange} from '../../scale';
diff --git ORI/vega-lite/src/compile/data/formatparse.ts ALT/vega-lite/src/compile/data/formatparse.ts
index 33982c8..4f36819 100644
--- ORI/vega-lite/src/compile/data/formatparse.ts
+++ ALT/vega-lite/src/compile/data/formatparse.ts
@@ -3,13 +3,8 @@ import {isNumber, isString} from 'vega-util';
 import {AncestorParse} from '.';
 import {isMinMaxOp} from '../../aggregate';
 import {getMainRangeChannel, SingleDefChannel} from '../../channel';
-import {
-  isFieldDef,
-  isFieldOrDatumDefForTimeFormat,
-  isScaleFieldDef,
-  isTypedFieldDef,
-  TypedFieldDef
-} from '../../channeldef';
+import {isFieldDef, isFieldOrDatumDefForTimeFormat, isScaleFieldDef, isTypedFieldDef, TypedFieldDef}
+  from '../../channeldef';
 import {isGenerator, Parse} from '../../data';
 import {DateTime, isDateTime} from '../../datetime';
 import * as log from '../../log';
diff --git ORI/vega-lite/src/compile/data/parse.ts ALT/vega-lite/src/compile/data/parse.ts
index cf35136..e1767f4 100644
--- ORI/vega-lite/src/compile/data/parse.ts
+++ ALT/vega-lite/src/compile/data/parse.ts
@@ -45,12 +45,8 @@ import {FilterNode} from './filter';
 import {FilterInvalidNode} from './filterinvalid';
 import {FlattenTransformNode} from './flatten';
 import {FoldTransformNode} from './fold';
-import {
-  getImplicitFromEncoding,
-  getImplicitFromFilterTransform,
-  getImplicitFromSelection,
-  ParseNode
-} from './formatparse';
+import {getImplicitFromEncoding, getImplicitFromFilterTransform, getImplicitFromSelection, ParseNode}
+  from './formatparse';
 import {GeoJSONNode} from './geojson';
 import {GeoPointNode} from './geopoint';
 import {GraticuleNode} from './graticule';
diff --git ORI/vega-lite/src/compile/data/source.ts ALT/vega-lite/src/compile/data/source.ts
index 3d4c9c6..3d28c59 100644
--- ORI/vega-lite/src/compile/data/source.ts
+++ ALT/vega-lite/src/compile/data/source.ts
@@ -1,13 +1,5 @@
-import {
-  Data,
-  DataFormat,
-  DataFormatType,
-  isGenerator,
-  isInlineData,
-  isNamedData,
-  isSphereGenerator,
-  isUrlData
-} from '../../data';
+import {Data, DataFormat, DataFormatType, isGenerator, isInlineData, isNamedData, isSphereGenerator, isUrlData}
+  from '../../data';
 import {contains, isEmpty, omit} from '../../util';
 import {VgData} from '../../vega.schema';
 import {DataFlowNode} from './dataflow';
diff --git ORI/vega-lite/src/compile/format.ts ALT/vega-lite/src/compile/format.ts
index bbc645a..64b476f 100644
--- ORI/vega-lite/src/compile/format.ts
+++ ALT/vega-lite/src/compile/format.ts
@@ -1,15 +1,8 @@
 import {SignalRef} from 'vega';
 import {isString} from 'vega-util';
 import {isBinning} from '../bin';
-import {
-  channelDefType,
-  DatumDef,
-  FieldDef,
-  isFieldDef,
-  isFieldOrDatumDefForTimeFormat,
-  isScaleFieldDef,
-  vgField
-} from '../channeldef';
+import {channelDefType, DatumDef, FieldDef, isFieldDef, isFieldOrDatumDefForTimeFormat, isScaleFieldDef, vgField}
+  from '../channeldef';
 import {Config} from '../config';
 import {fieldValidPredicate} from '../predicate';
 import {ScaleType} from '../scale';
diff --git ORI/vega-lite/src/compile/header/assemble.ts ALT/vega-lite/src/compile/header/assemble.ts
index 1bc2959..c90e9d8 100644
--- ORI/vega-lite/src/compile/header/assemble.ts
+++ ALT/vega-lite/src/compile/header/assemble.ts
@@ -23,14 +23,8 @@ import {sortArrayIndexField} from '../data/calculate';
 import {formatSignalRef} from '../format';
 import {isFacetModel, Model} from '../model';
 import {getHeaderChannel, getHeaderProperties, getHeaderProperty} from './common';
-import {
-  HeaderChannel,
-  HeaderComponent,
-  HeaderType,
-  HEADER_TYPES,
-  LayoutHeaderComponent,
-  LayoutHeaderComponentIndex
-} from './component';
+import {HeaderChannel, HeaderComponent, HeaderType, HEADER_TYPES, LayoutHeaderComponent, LayoutHeaderComponentIndex}
+  from './component';
 
 // TODO: rename to assembleHeaderTitleGroup
 export function assembleTitleGroup(model: Model, channel: FacetChannel) {
diff --git ORI/vega-lite/src/compile/legend/encode.ts ALT/vega-lite/src/compile/legend/encode.ts
index 180d875..38602ef 100644
--- ORI/vega-lite/src/compile/legend/encode.ts
+++ ALT/vega-lite/src/compile/legend/encode.ts
@@ -1,16 +1,8 @@
 import {ColorValueRef, EncodeEntry, Gradient, LegendEncode, LegendType, SignalRef, SymbolEncodeEntry} from 'vega';
 import {array, isArray, stringValue} from 'vega-util';
 import {COLOR, NonPositionScaleChannel, OPACITY} from '../../channel';
-import {
-  Conditional,
-  DatumDef,
-  hasConditionalValueDef,
-  isFieldDef,
-  isValueDef,
-  TypedFieldDef,
-  Value,
-  ValueDef
-} from '../../channeldef';
+import {Conditional, DatumDef, hasConditionalValueDef, isFieldDef, isValueDef, TypedFieldDef, Value, ValueDef}
+  from '../../channeldef';
 import {Encoding} from '../../encoding';
 import {FILL_STROKE_CONFIG} from '../../mark';
 import {getFirstDefined, isEmpty, varName} from '../../util';
diff --git ORI/vega-lite/src/compile/model.ts ALT/vega-lite/src/compile/model.ts
index cb27b9f..35dc145 100644
--- ORI/vega-lite/src/compile/model.ts
+++ ALT/vega-lite/src/compile/model.ts
@@ -27,13 +27,8 @@ import * as log from '../log';
 import {Resolve} from '../resolve';
 import {hasDiscreteDomain} from '../scale';
 import {isFacetSpec} from '../spec';
-import {
-  extractCompositionLayout,
-  GenericCompositionLayoutWithColumns,
-  LayoutSizeMixins,
-  SpecType,
-  ViewBackground
-} from '../spec/base';
+import {extractCompositionLayout, GenericCompositionLayoutWithColumns, LayoutSizeMixins, SpecType, ViewBackground}
+  from '../spec/base';
 import {NormalizedSpec} from '../spec/index';
 import {extractTitleConfig, isText, TitleParams} from '../title';
 import {normalizeTransform, Transform} from '../transform';
@@ -49,12 +44,8 @@ import {assembleHeaderGroups, assembleLayoutTitleBand, assembleTitleGroup} from
 import {HEADER_CHANNELS, LayoutHeaderComponent} from './header/component';
 import {LayerModel} from './layer';
 import {sizeExpr} from './layoutsize/assemble';
-import {
-  getSizeTypeFromLayoutSizeType,
-  LayoutSizeComponent,
-  LayoutSizeIndex,
-  LayoutSizeType
-} from './layoutsize/component';
+import {getSizeTypeFromLayoutSizeType, LayoutSizeComponent, LayoutSizeIndex, LayoutSizeType}
+  from './layoutsize/component';
 import {assembleLegends} from './legend/assemble';
 import {LegendComponentIndex} from './legend/component';
 import {parseLegend} from './legend/parse';
diff --git ORI/vega-lite/src/compile/scale/parse.ts ALT/vega-lite/src/compile/scale/parse.ts
index a2334bc..5418ec0 100644
--- ORI/vega-lite/src/compile/scale/parse.ts
+++ ALT/vega-lite/src/compile/scale/parse.ts
@@ -3,12 +3,8 @@ import {getFieldOrDatumDef, ScaleDatumDef, TypedFieldDef} from '../../channeldef
 import {channelHasNestedOffsetScale} from '../../encoding';
 import * as log from '../../log';
 import {GEOSHAPE} from '../../mark';
-import {
-  NON_TYPE_DOMAIN_RANGE_VEGA_SCALE_PROPERTIES,
-  scaleCompatible,
-  ScaleType,
-  scaleTypePrecedence
-} from '../../scale';
+import {NON_TYPE_DOMAIN_RANGE_VEGA_SCALE_PROPERTIES, scaleCompatible, ScaleType, scaleTypePrecedence}
+  from '../../scale';
 import {GEOJSON} from '../../type';
 import {keys} from '../../util';
 import {VgScale} from '../../vega.schema';
diff --git ORI/vega-lite/src/compile/scale/properties.ts ALT/vega-lite/src/compile/scale/properties.ts
index 501e9df..942291d 100644
--- ORI/vega-lite/src/compile/scale/properties.ts
+++ ALT/vega-lite/src/compile/scale/properties.ts
@@ -11,15 +11,8 @@ import {
   ScaleChannel,
   STROKE
 } from '../../channel';
-import {
-  getFieldDef,
-  getFieldOrDatumDef,
-  isFieldDef,
-  ScaleDatumDef,
-  ScaleFieldDef,
-  TypedFieldDef,
-  valueExpr
-} from '../../channeldef';
+import {getFieldDef, getFieldOrDatumDef, isFieldDef, ScaleDatumDef, ScaleFieldDef, TypedFieldDef, valueExpr}
+  from '../../channeldef';
 import {Config} from '../../config';
 import {isDateTime} from '../../datetime';
 import {channelHasNestedOffsetScale} from '../../encoding';
diff --git ORI/vega-lite/src/compile/scale/type.ts ALT/vega-lite/src/compile/scale/type.ts
index 6476559..7b5ca43 100644
--- ORI/vega-lite/src/compile/scale/type.ts
+++ ALT/vega-lite/src/compile/scale/type.ts
@@ -1,13 +1,6 @@
 import {isBinning} from '../../bin';
-import {
-  getSizeChannel,
-  isColorChannel,
-  isScaleChannel,
-  isXorY,
-  isXorYOffset,
-  rangeType,
-  ScaleChannel
-} from '../../channel';
+import {getSizeChannel, isColorChannel, isScaleChannel, isXorY, isXorYOffset, rangeType, ScaleChannel}
+  from '../../channel';
 import {DatumDef, isFieldDef, isPositionFieldOrDatumDef, ScaleDatumDef, TypedFieldDef} from '../../channeldef';
 import * as log from '../../log';
 import {isRelativeBandSize, MarkDef} from '../../mark';
diff --git ORI/vega-lite/src/compile/unit.ts ALT/vega-lite/src/compile/unit.ts
index 6ccf138..08ce9d2 100644
--- ORI/vega-lite/src/compile/unit.ts
+++ ALT/vega-lite/src/compile/unit.ts
@@ -15,14 +15,8 @@ import {
   X,
   Y
 } from '../channel';
-import {
-  getFieldDef,
-  getFieldOrDatumDef,
-  isFieldOrDatumDef,
-  isTypedFieldDef,
-  MarkPropFieldOrDatumDef,
-  PositionFieldDef
-} from '../channeldef';
+import {getFieldDef, getFieldOrDatumDef, isFieldOrDatumDef, isTypedFieldDef, MarkPropFieldOrDatumDef, PositionFieldDef}
+  from '../channeldef';
 import {Config} from '../config';
 import {isGraticuleGenerator} from '../data';
 import * as vlEncoding from '../encoding';
@@ -51,12 +45,8 @@ import {defaultFilled, initMarkdef} from './mark/init';
 import {parseMarkGroups} from './mark/mark';
 import {isLayerModel, Model, ModelWithField} from './model';
 import {ScaleIndex} from './scale/component';
-import {
-  assembleTopLevelSignals,
-  assembleUnitSelectionData,
-  assembleUnitSelectionMarks,
-  assembleUnitSelectionSignals
-} from './selection/assemble';
+import {assembleTopLevelSignals, assembleUnitSelectionData, assembleUnitSelectionMarks, assembleUnitSelectionSignals}
+  from './selection/assemble';
 import {parseUnitSelection} from './selection/parse';
 
 /**
diff --git ORI/vega-lite/src/compositemark/errorbar.ts ALT/vega-lite/src/compositemark/errorbar.ts
index 52d41fe..0cbd3a2 100644
--- ORI/vega-lite/src/compositemark/errorbar.ts
+++ ALT/vega-lite/src/compositemark/errorbar.ts
@@ -1,14 +1,7 @@
 import {AggregateOp, Orientation, SignalRef, Text} from 'vega';
 import {PositionChannel} from '../channel';
-import {
-  Field,
-  isContinuousFieldOrDatumDef,
-  isFieldOrDatumDef,
-  PositionFieldDef,
-  SecondaryFieldDef,
-  title,
-  ValueDef
-} from '../channeldef';
+import {Field, isContinuousFieldOrDatumDef, isFieldOrDatumDef, PositionFieldDef, SecondaryFieldDef, title, ValueDef}
+  from '../channeldef';
 import {Config} from '../config';
 import {Data} from '../data';
 import {Encoding, extractTransformsFromEncoding, normalizeEncoding} from '../encoding';
diff --git ORI/vega-lite/src/compositemark/index.ts ALT/vega-lite/src/compositemark/index.ts
index d2c320d..8c47785 100644
--- ORI/vega-lite/src/compositemark/index.ts
+++ ALT/vega-lite/src/compositemark/index.ts
@@ -7,23 +7,10 @@ import {NormalizedUnitSpec} from '../spec/unit';
 import {keys} from '../util';
 import {CompositeMarkNormalizer} from './base';
 import {BOXPLOT, BoxPlot, BoxPlotConfigMixins, BoxPlotDef, BOXPLOT_PARTS, normalizeBoxPlot} from './boxplot';
-import {
-  ERRORBAND,
-  ErrorBand,
-  ErrorBandConfigMixins,
-  ErrorBandDef,
-  ERRORBAND_PARTS,
-  normalizeErrorBand
-} from './errorband';
-import {
-  ERRORBAR,
-  ErrorBar,
-  ErrorBarConfigMixins,
-  ErrorBarDef,
-  ERRORBAR_PARTS,
-  ErrorExtraEncoding,
-  normalizeErrorBar
-} from './errorbar';
+import {ERRORBAND, ErrorBand, ErrorBandConfigMixins, ErrorBandDef, ERRORBAND_PARTS, normalizeErrorBand}
+  from './errorband';
+import {ERRORBAR, ErrorBar, ErrorBarConfigMixins, ErrorBarDef, ERRORBAR_PARTS, ErrorExtraEncoding, normalizeErrorBar}
+  from './errorbar';
 
 export type {BoxPlotConfig} from './boxplot';
 export type {ErrorBandConfigMixins} from './errorband';
diff --git ORI/vega-lite/src/log/message.ts ALT/vega-lite/src/log/message.ts
index c64a20c..038c466 100644
--- ORI/vega-lite/src/log/message.ts
+++ ALT/vega-lite/src/log/message.ts
@@ -3,15 +3,8 @@
  */
 import {AggregateOp, SignalRef} from 'vega';
 import {Aggregate} from '../aggregate';
-import {
-  Channel,
-  ExtendedChannel,
-  FacetChannel,
-  getSizeChannel,
-  OffsetScaleChannel,
-  PositionScaleChannel,
-  ScaleChannel
-} from '../channel';
+import {Channel, ExtendedChannel, FacetChannel, getSizeChannel, OffsetScaleChannel, PositionScaleChannel, ScaleChannel}
+  from '../channel';
 import {HiddenCompositeAggregate, TypedFieldDef, Value} from '../channeldef';
 import {SplitParentProperty} from '../compile/split';
 import {CompositeMark} from '../compositemark';
diff --git ORI/vega-lite/src/normalize/core.ts ALT/vega-lite/src/normalize/core.ts
index f9de0a8..a9c2fb7 100644
--- ORI/vega-lite/src/normalize/core.ts
+++ ALT/vega-lite/src/normalize/core.ts
@@ -13,14 +13,8 @@ import {Projection} from '../projection';
 import {FacetedUnitSpec, GenericSpec, LayerSpec, UnitSpec} from '../spec';
 import {GenericCompositionLayoutWithColumns} from '../spec/base';
 import {GenericConcatSpec} from '../spec/concat';
-import {
-  FacetEncodingFieldDef,
-  FacetFieldDef,
-  FacetMapping,
-  GenericFacetSpec,
-  isFacetMapping,
-  NormalizedFacetSpec
-} from '../spec/facet';
+import {FacetEncodingFieldDef, FacetFieldDef, FacetMapping, GenericFacetSpec, isFacetMapping, NormalizedFacetSpec}
+  from '../spec/facet';
 import {NormalizedSpec} from '../spec/index';
 import {NormalizedLayerSpec} from '../spec/layer';
 import {SpecMapper} from '../spec/map';
diff --git ORI/vega-lite/src/normalize/toplevelselection.ts ALT/vega-lite/src/normalize/toplevelselection.ts
index 599e301..c55f860 100644
--- ORI/vega-lite/src/normalize/toplevelselection.ts
+++ ALT/vega-lite/src/normalize/toplevelselection.ts
@@ -2,15 +2,8 @@ import {isArray, isString} from 'vega';
 import {Field} from '../channeldef';
 import {VariableParameter} from '../parameter';
 import {isSelectionParameter, SelectionParameter} from '../selection';
-import {
-  BaseSpec,
-  isUnitSpec,
-  NormalizedLayerSpec,
-  NormalizedSpec,
-  NormalizedUnitSpec,
-  TopLevel,
-  UnitSpec
-} from '../spec';
+import {BaseSpec, isUnitSpec, NormalizedLayerSpec, NormalizedSpec, NormalizedUnitSpec, TopLevel, UnitSpec}
+  from '../spec';
 import {SpecMapper} from '../spec/map';
 import {NormalizerParams} from './base';
 
diff --git ORI/vega-lite/src/spec/map.ts ALT/vega-lite/src/spec/map.ts
index a1098bb..bea12fa 100644
--- ORI/vega-lite/src/spec/map.ts
+++ ALT/vega-lite/src/spec/map.ts
@@ -1,14 +1,8 @@
 import {GenericSpec} from '.';
 import * as log from '../log';
 import {Field, FieldName} from '../channeldef';
-import {
-  GenericConcatSpec,
-  GenericHConcatSpec,
-  GenericVConcatSpec,
-  isConcatSpec,
-  isHConcatSpec,
-  isVConcatSpec
-} from './concat';
+import {GenericConcatSpec, GenericHConcatSpec, GenericVConcatSpec, isConcatSpec, isHConcatSpec, isVConcatSpec}
+  from './concat';
 import {GenericFacetSpec, isFacetSpec} from './facet';
 import {GenericLayerSpec, isLayerSpec} from './layer';
 import {isRepeatSpec, RepeatSpec} from './repeat';
diff --git ORI/vega-lite/src/stack.ts ALT/vega-lite/src/stack.ts
index 8903598..cda56c2 100644
--- ORI/vega-lite/src/stack.ts
+++ ALT/vega-lite/src/stack.ts
@@ -16,22 +16,8 @@ import {
 import {CompositeAggregate} from './compositemark';
 import {channelHasField, Encoding, isAggregate} from './encoding';
 import * as log from './log';
-import {
-  ARC,
-  AREA,
-  BAR,
-  CIRCLE,
-  isMarkDef,
-  isPathMark,
-  LINE,
-  Mark,
-  MarkDef,
-  POINT,
-  RULE,
-  SQUARE,
-  TEXT,
-  TICK
-} from './mark';
+import {ARC, AREA, BAR, CIRCLE, isMarkDef, isPathMark, LINE, Mark, MarkDef, POINT, RULE, SQUARE, TEXT, TICK}
+  from './mark';
 import {ScaleType} from './scale';
 
 const STACK_OFFSET_INDEX = {
diff --git ORI/vega-lite/test-runtime/translate.test.ts ALT/vega-lite/test-runtime/translate.test.ts
index 2f944c8..5c4df95 100644
--- ORI/vega-lite/test-runtime/translate.test.ts
+++ ALT/vega-lite/test-runtime/translate.test.ts
@@ -1,18 +1,8 @@
 /* eslint-disable jest/expect-expect */
 
 import {assert} from 'chai';
-import {
-  bound,
-  brush,
-  compositeTypes,
-  embedFn,
-  hits as hitsMaster,
-  parentSelector,
-  spec,
-  testRenderFn,
-  tuples,
-  unbound
-} from './util';
+import {bound, brush, compositeTypes, embedFn, hits as hitsMaster, parentSelector, spec, testRenderFn, tuples, unbound}
+  from './util';
 import {Page} from 'puppeteer/lib/cjs/puppeteer/common/Page';
 import {TopLevelSpec} from '../src';
 
diff --git ORI/vega-lite/test/bin.test.ts ALT/vega-lite/test/bin.test.ts
index 08cb5d5..806017d 100644
--- ORI/vega-lite/test/bin.test.ts
+++ ALT/vega-lite/test/bin.test.ts
@@ -1,17 +1,6 @@
 import {autoMaxBins, binToString, isBinParams} from '../src/bin';
-import {
-  COLOR,
-  COLUMN,
-  FILL,
-  FILLOPACITY,
-  OPACITY,
-  ROW,
-  SHAPE,
-  SIZE,
-  STROKE,
-  STROKEOPACITY,
-  STROKEWIDTH
-} from '../src/channel';
+import {COLOR, COLUMN, FILL, FILLOPACITY, OPACITY, ROW, SHAPE, SIZE, STROKE, STROKEOPACITY, STROKEWIDTH}
+  from '../src/channel';
 
 describe('autoMaxBins', () => {
   it('should assign generate correct defaults for different channels', () => {
diff --git ORI/vega-lite/test/compile/header/assemble.test.ts ALT/vega-lite/test/compile/header/assemble.test.ts
index 25fc131..afd8b07 100644
--- ORI/vega-lite/test/compile/header/assemble.test.ts
+++ ALT/vega-lite/test/compile/header/assemble.test.ts
@@ -8,12 +8,8 @@ import {
   getLayoutTitleBand
 } from '../../../src/compile/header/assemble';
 import {HEADER_CHANNELS} from '../../../src/compile/header/component';
-import {
-  HEADER_LABEL_PROPERTIES,
-  HEADER_LABEL_PROPERTIES_MAP,
-  HEADER_TITLE_PROPERTIES,
-  HEADER_TITLE_PROPERTIES_MAP
-} from '../../../src/header';
+import {HEADER_LABEL_PROPERTIES, HEADER_LABEL_PROPERTIES_MAP, HEADER_TITLE_PROPERTIES, HEADER_TITLE_PROPERTIES_MAP}
+  from '../../../src/header';
 import {parseFacetModel} from '../../util';
 
 describe('compile/header/index', () => {
diff --git ORI/vega-lite/test/compile/scale/range.test.ts ALT/vega-lite/test/compile/scale/range.test.ts
index 30a6d1e..bb25ceb 100644
--- ORI/vega-lite/test/compile/scale/range.test.ts
+++ ALT/vega-lite/test/compile/scale/range.test.ts
@@ -1,9 +1,5 @@
-import {
-  defaultContinuousToDiscreteCount,
-  interpolateRange,
-  MAX_SIZE_RANGE_STEP_RATIO,
-  parseRangeForChannel
-} from '../../../src/compile/scale/range';
+import {defaultContinuousToDiscreteCount, interpolateRange, MAX_SIZE_RANGE_STEP_RATIO, parseRangeForChannel}
+  from '../../../src/compile/scale/range';
 import {makeExplicit, makeImplicit} from '../../../src/compile/split';
 import {Config, defaultConfig, DEFAULT_STEP} from '../../../src/config';
 import * as log from '../../../src/log';
diff --git ORI/vega-lite/test/compile/selection/point.test.ts ALT/vega-lite/test/compile/selection/point.test.ts
index 90ee24a..deeccbe 100644
--- ORI/vega-lite/test/compile/selection/point.test.ts
+++ ALT/vega-lite/test/compile/selection/point.test.ts
@@ -1,9 +1,5 @@
-import {
-  assembleUnitSelectionData,
-  assembleUnitSelectionMarks,
-  assembleUnitSelectionSignals,
-  assembleTopLevelSignals
-} from '../../../src/compile/selection/assemble';
+import {assembleUnitSelectionData, assembleUnitSelectionMarks, assembleUnitSelectionSignals, assembleTopLevelSignals}
+  from '../../../src/compile/selection/assemble';
 import point from '../../../src/compile/selection/point';
 import {parseUnitSelection} from '../../../src/compile/selection/parse';
 import {parseUnitModelWithScale} from '../../util';
diff --git ORI/vega-lite/test/config.test.ts ALT/vega-lite/test/config.test.ts
index 1c74338..d0aa937 100644
--- ORI/vega-lite/test/config.test.ts
+++ ALT/vega-lite/test/config.test.ts
@@ -1,13 +1,6 @@
 import {SignalRef} from 'vega';
-import {
-  Config,
-  defaultConfig,
-  DEFAULT_COLOR,
-  DEFAULT_FONT_SIZE,
-  initConfig,
-  isVgScheme,
-  stripAndRedirectConfig
-} from '../src/config';
+import {Config, defaultConfig, DEFAULT_COLOR, DEFAULT_FONT_SIZE, initConfig, isVgScheme, stripAndRedirectConfig}
+  from '../src/config';
 import {PRIMITIVE_MARKS} from '../src/mark';
 import {duplicate} from '../src/util';
 
diff --git ORI/vega-lite/test/encoding.test.ts ALT/vega-lite/test/encoding.test.ts
index da7db3a..5f8f2ea 100644
--- ORI/vega-lite/test/encoding.test.ts
+++ ALT/vega-lite/test/encoding.test.ts
@@ -1,25 +1,9 @@
-import {
-  COLOR,
-  DETAIL,
-  FILLOPACITY,
-  OPACITY,
-  SIZE,
-  STROKEOPACITY,
-  STROKEWIDTH,
-  UNIT_CHANNELS,
-  X2,
-  Y2
-} from '../src/channel';
+import {COLOR, DETAIL, FILLOPACITY, OPACITY, SIZE, STROKEOPACITY, STROKEWIDTH, UNIT_CHANNELS, X2, Y2}
+  from '../src/channel';
 import {isPositionFieldOrDatumDef} from '../src/channeldef';
 import {defaultConfig} from '../src/config';
-import {
-  Encoding,
-  extractTransformsFromEncoding,
-  fieldDefs,
-  initEncoding,
-  markChannelCompatible,
-  pathGroupingFields
-} from '../src/encoding';
+import {Encoding, extractTransformsFromEncoding, fieldDefs, initEncoding, markChannelCompatible, pathGroupingFields}
+  from '../src/encoding';
 import * as log from '../src/log';
 import {CIRCLE, POINT, SQUARE, TICK} from '../src/mark';
 import {internalField} from '../src/util';

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@GlebDolzhikov