Merge branch 'fs-promises/search-and-replace' into fs-promises/path-exists

This commit is contained in:
Markus Olsson 2022-03-04 15:43:11 +01:00
commit c4ea0405cd
3 changed files with 4 additions and 4 deletions

View file

@ -1,6 +1,5 @@
import * as Path from 'path'
import * as React from 'react'
import { readdir } from 'fs-extra'
import { Dispatcher } from '../dispatcher'
import { getDefaultDir, setDefaultDir } from '../lib/default-dir'
import { Account } from '../../models/account'
@ -24,6 +23,7 @@ import { ClickSource } from '../lib/list'
import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
import { enableSaveDialogOnCloneRepository } from '../../lib/feature-flag'
import { showOpenDialog, showSaveDialog } from '../main-process-proxy'
import { readdir } from 'fs/promises'
interface ICloneRepositoryProps {
readonly dispatcher: Dispatcher

View file

@ -1,7 +1,7 @@
import * as React from 'react'
import { Ref } from './ref'
import { LinkButton } from './link-button'
import { unlink } from 'fs-extra'
import { unlink } from 'fs/promises'
interface IConfigLockFileExistsProps {
/**

View file

@ -1,5 +1,4 @@
import * as React from 'react'
import * as FSE from 'fs-extra'
import * as Path from 'path'
import { marked } from 'marked'
import DOMPurify from 'dompurify'
@ -8,6 +7,7 @@ import {
buildCustomMarkDownNodeFilterPipe,
} from '../../lib/markdown-filters/node-filter'
import { GitHubRepository } from '../../models/github-repository'
import { readFile } from 'fs/promises'
interface ISandboxedMarkdownProps {
/** A string of unparsed markdown to display */
@ -80,7 +80,7 @@ export class SandboxedMarkdown extends React.PureComponent<
* document body and provide them aswell.
*/
private async getInlineStyleSheet(): Promise<string> {
const css = await FSE.readFile(
const css = await readFile(
Path.join(__dirname, 'static', 'markdown.css'),
'utf8'
)