Merge pull request desktop#17496 from desktop/lower-dash

niik · web-flow · commit 89a832e9c6a4 · 2023-10-05T15:44:56.000+02:00
Avoid importing all of lodash
diff --git a/app/package.json b/app/package.json
@@ -38,6 +38,7 @@
     "fs-admin": "^0.19.0",
     "fuzzaldrin-plus": "^0.6.0",
     "keytar": "^7.8.0",
+    "lodash": "^4.17.21",
     "marked": "^4.0.10",
     "mem": "^4.3.0",
     "memoize-one": "^4.0.3",
diff --git a/app/src/lib/markdown-filters/commit-mention-link-filter.ts b/app/src/lib/markdown-filters/commit-mention-link-filter.ts
@@ -1,4 +1,4 @@
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 import { GitHubRepository } from '../../models/github-repository'
 import { getHTMLURL } from '../api'
 import { INodeFilter } from './node-filter'
diff --git a/app/src/lib/markdown-filters/emoji-filter.ts b/app/src/lib/markdown-filters/emoji-filter.ts
@@ -1,7 +1,7 @@
 import { INodeFilter } from './node-filter'
 import { fileURLToPath } from 'url'
 import { readFile } from 'fs/promises'
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 
 /**
  * The Emoji Markdown filter will take a text node and create multiple text and
diff --git a/app/src/lib/markdown-filters/issue-link-filter.ts b/app/src/lib/markdown-filters/issue-link-filter.ts
@@ -1,4 +1,4 @@
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 import { GitHubRepository } from '../../models/github-repository'
 import { getHTMLURL } from '../api'
 import { INodeFilter } from './node-filter'
diff --git a/app/src/lib/markdown-filters/video-url-regex.ts b/app/src/lib/markdown-filters/video-url-regex.ts
@@ -1,4 +1,4 @@
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 
 const user_images_cdn_url = 'https://user-images.githubusercontent.com'
 
diff --git a/app/src/lib/stores/commit-status-store.ts b/app/src/lib/stores/commit-status-store.ts
@@ -17,7 +17,7 @@ import {
   getCheckRunActionsWorkflowRuns,
   manuallySetChecksToPending,
 } from '../ci-checks/ci-checks'
-import _ from 'lodash'
+import xor from 'lodash/xor'
 import { offsetFromNow } from '../offset-from'
 
 interface ICommitStatusCacheEntry {
@@ -343,7 +343,7 @@ export class CommitStatusStore {
       existingChecks !== undefined &&
       existingChecks.check !== null &&
       existingChecks.check.checks.some(c => c.actionsWorkflow !== undefined) &&
-      _.xor(
+      xor(
         existingChecks.check.checks.map(cr => cr.id),
         checks.map(cr => cr.id)
       ).length === 0
diff --git a/app/src/lib/unique-coauthors-as-authors.ts b/app/src/lib/unique-coauthors-as-authors.ts
@@ -1,16 +1,13 @@
-import _ from 'lodash'
+import uniqWith from 'lodash/uniqWith'
 import { KnownAuthor } from '../models/author'
 import { Commit } from '../models/commit'
-import { GitAuthor } from '../models/git-author'
 
 export function getUniqueCoauthorsAsAuthors(
   commits: ReadonlyArray<Commit>
 ): ReadonlyArray<KnownAuthor> {
-  const allCommitsCoAuthors: GitAuthor[] = _.flatten(
-    commits.map(c => c.coAuthors)
-  )
+  const allCommitsCoAuthors = commits.flatMap(c => c.coAuthors)
 
-  const uniqueCoAuthors = _.uniqWith(
+  const uniqueCoAuthors = uniqWith(
     allCommitsCoAuthors,
     (a, b) => a.email === b.email && a.name === b.name
   )
diff --git a/app/src/main-process/desktop-file-transport.ts b/app/src/main-process/desktop-file-transport.ts
@@ -5,7 +5,7 @@ import TransportStream, { TransportStreamOptions } from 'winston-transport'
 import { EOL } from 'os'
 import { readdir, unlink } from 'fs/promises'
 import { promisify } from 'util'
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 
 type DesktopFileTransportOptions = TransportStreamOptions & {
   readonly logDirectory: string
diff --git a/app/src/main-process/log.ts b/app/src/main-process/log.ts
@@ -1,7 +1,7 @@
 import * as winston from 'winston'
 import { getLogDirectoryPath } from '../lib/logging/get-log-path'
 import { LogLevel } from '../lib/logging/log-level'
-import { noop } from 'lodash'
+import noop from 'lodash/noop'
 import { DesktopConsoleTransport } from './desktop-console-transport'
 import memoizeOne from 'memoize-one'
 import { mkdir } from 'fs/promises'
diff --git a/app/src/ui/accessibility/aria-live-container.tsx b/app/src/ui/accessibility/aria-live-container.tsx
@@ -1,4 +1,4 @@
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 import React, { Component } from 'react'
 
 interface IAriaLiveContainerProps {
diff --git a/app/src/ui/clone-repository/group-repositories.ts b/app/src/ui/clone-repository/group-repositories.ts
@@ -2,7 +2,8 @@ import { IAPIRepository } from '../../lib/api'
 import { IFilterListGroup, IFilterListItem } from '../lib/filter-list'
 import { OcticonSymbolType } from '../octicons'
 import * as OcticonSymbol from '../octicons/octicons.generated'
-import { entries, groupBy } from 'lodash'
+import entries from 'lodash/entries'
+import groupBy from 'lodash/groupBy'
 import { caseInsensitiveEquals, compare } from '../../lib/compare'
 
 /** The identifier for the "Your Repositories" grouping. */
diff --git a/app/src/ui/commit-message/commit-message-dialog.tsx b/app/src/ui/commit-message/commit-message-dialog.tsx
@@ -11,7 +11,7 @@ import { ICommitMessage } from '../../models/commit-message'
 import { IAutocompletionProvider } from '../autocompletion'
 import { Author, UnknownAuthor } from '../../models/author'
 import { CommitMessage } from '../changes/commit-message'
-import { noop } from 'lodash'
+import noop from 'lodash/noop'
 import { Popup } from '../../models/popup'
 import { Foldout } from '../../lib/app-state'
 import { Account } from '../../models/account'
diff --git a/app/src/ui/diff/seamless-diff-switcher.tsx b/app/src/ui/diff/seamless-diff-switcher.tsx
@@ -20,6 +20,7 @@ import { Loading } from '../lib/loading'
 import { getFileContents, IFileContents } from './syntax-highlighting'
 import { getTextDiffWithBottomDummyHunk } from './text-diff-expansion'
 import { textDiffEquals } from './diff-helpers'
+import noop from 'lodash/noop'
 
 /**
  * The time (in milliseconds) we allow when loading a diff before
@@ -116,9 +117,6 @@ interface ISeamlessDiffSwitcherState {
   readonly fileContents: IFileContents | null
 }
 
-/** I'm super useful */
-function noop() {}
-
 function isSameFile(prevFile: ChangedFile, newFile: ChangedFile) {
   return prevFile === newFile || prevFile.id === newFile.id
 }
diff --git a/app/src/ui/diff/side-by-side-diff.tsx b/app/src/ui/diff/side-by-side-diff.tsx
@@ -62,7 +62,7 @@ import {
 } from './text-diff-expansion'
 import { IMenuItem } from '../../lib/menu-item'
 import { HiddenBidiCharsWarning } from './hidden-bidi-chars-warning'
-import { escapeRegExp } from 'lodash'
+import escapeRegExp from 'lodash/escapeRegExp'
 
 const DefaultRowHeight = 20
 
diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
@@ -15,7 +15,7 @@ import { DiffOptions } from '../diff/diff-options'
 import { IChangesetData } from '../../lib/git'
 import { TooltippedContent } from '../lib/tooltipped-content'
 import { AppFileStatusKind } from '../../models/status'
-import _ from 'lodash'
+import uniqWith from 'lodash/uniqWith'
 import { LinkButton } from '../lib/link-button'
 import { UnreachableCommitsTab } from './unreachable-commits-dialog'
 import { TooltippedCommitSHA } from '../lib/tooltipped-commit-sha'
@@ -128,7 +128,7 @@ function createState(
     getAvatarUsersForCommit(repository.gitHubRepository, c)
   )
 
-  const avatarUsers = _.uniqWith(
+  const avatarUsers = uniqWith(
     allAvatarUsers,
     (a, b) => a.email === b.email && a.name === b.name
   )
diff --git a/app/src/ui/lib/path-exists.ts b/app/src/ui/lib/path-exists.ts
@@ -1,5 +1,5 @@
 import { access } from 'fs/promises'
-import { constant } from 'lodash'
+import constant from 'lodash/constant'
 
 /**
  * Returns a value indicating whether or not the provided path exists (as in
diff --git a/app/src/ui/lib/sandboxed-markdown.tsx b/app/src/ui/lib/sandboxed-markdown.tsx
@@ -6,7 +6,7 @@ import { readFile } from 'fs/promises'
 import { Tooltip } from './tooltip'
 import { createObservableRef } from './observable-ref'
 import { getObjectId } from './object-id'
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 import {
   MarkdownEmitter,
   parseMarkdown,
diff --git a/app/yarn.lock b/app/yarn.lock
@@ -657,6 +657,11 @@ lie@~3.3.0:
   dependencies:
     immediate "~3.0.5"
 
+lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
 logform@^2.3.2, logform@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.0.tgz#131651715a17d50f09c2a2c1a524ff1a4164bcfe"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { escapeRegExp } from 'lodash'`
	`1`	`+import escapeRegExp from 'lodash/escapeRegExp'`
`2`	`2`	`import { GitHubRepository } from '../../models/github-repository'`
`3`	`3`	`import { getHTMLURL } from '../api'`
`4`	`4`	`import { INodeFilter } from './node-filter'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { debounce } from 'lodash'`
	`1`	`+import debounce from 'lodash/debounce'`
`2`	`2`	`import React, { Component } from 'react'`
`3`	`3`
`4`	`4`	`interface IAriaLiveContainerProps {`