chore(cli): make fs modules used in the CLI consistent

packages/cli/src/__tests__/fs.test.js

@@ -1,8 +1,9 @@
 jest.mock('fs')
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 const INITIAL_FS = {
   file_a: 'content_a',
   [path.join('fake_dir', 'mock_dir', 'made_up_file')]: 'made_up_content',

packages/cli/src/__tests__/plugin.test.js

@@ -1,5 +1,4 @@
-import fs from 'fs'
-
+import fs from 'fs-extra'
 import yargs from 'yargs'
 import { hideBin } from 'yargs/helpers'
 

packages/cli/src/commands/buildHandler.js

@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import { rimraf } from 'rimraf'
 import terminalLink from 'terminal-link'

packages/cli/src/commands/consoleHandler.js

@@ -1,7 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 import repl from 'repl'
 
+import fs from 'fs-extra'
+
 import { registerApiSideBabelHook } from '@redwoodjs/babel-config'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 

packages/cli/src/commands/deploy/__tests__/nftPack.test.js

@@ -1,6 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import { buildApi } from '@redwoodjs/internal/dist/build/api'
 import { findApiDistFunctions } from '@redwoodjs/internal/dist/files'
 

packages/cli/src/commands/deploy/baremetal.js

@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import toml from '@iarna/toml'
 import boxen from 'boxen'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import { env as envInterpolation } from 'string-env-interpolation'
 import terminalLink from 'terminal-link'

packages/cli/src/commands/deploy/serverless.js

@@ -1,10 +1,10 @@
-import fs from 'fs'
 import path from 'path'
 
 import boxen from 'boxen'
 import chalk from 'chalk'
 import { config } from 'dotenv-defaults'
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import prompts from 'prompts'
 import terminalLink from 'terminal-link'

packages/cli/src/commands/destroy/cell/__tests__/cell.test.js

@@ -16,7 +16,7 @@ jest.mock('@redwoodjs/structure', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 

packages/cli/src/commands/destroy/component/__tests__/component.test.js

@@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 

packages/cli/src/commands/destroy/directive/__tests__/directive.test.js

@@ -8,7 +8,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 

packages/cli/src/commands/destroy/function/__tests__/function.test.js

@@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 

packages/cli/src/commands/destroy/layout/__tests__/layout.test.js

@@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 

packages/cli/src/commands/destroy/page/__tests__/page.test.js

@@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 

packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js

@@ -1,8 +1,9 @@
 globalThis.__dirname = __dirname
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import '../../../../lib/test'
 
 import { getPaths, getDefaultArgs } from '../../../../lib'

packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js

@@ -1,8 +1,9 @@
 globalThis.__dirname = __dirname
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import '../../../../lib/test'
 
 import { getPaths, getDefaultArgs } from '../../../../lib'

packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js

@@ -1,6 +1,6 @@
 globalThis.__dirname = __dirname
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 

packages/cli/src/commands/destroy/service/__tests__/service.test.js

@@ -1,5 +1,5 @@
 globalThis.__dirname = __dirname
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 

packages/cli/src/commands/devHandler.js

@@ -1,7 +1,7 @@
-import fs from 'fs'
 import { argv } from 'process'
 
 import concurrently from 'concurrently'
+import fs from 'fs-extra'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { shutdownPort } from '@redwoodjs/internal/dist/dev'

packages/cli/src/commands/experimental/setupOpentelemetryHandler.js

@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addApiPackages } from '@redwoodjs/cli-helpers'

packages/cli/src/commands/experimental/setupRscHandler.js

@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { prettify } from '@redwoodjs/cli-helpers'

packages/cli/src/commands/experimental/setupSentryHandler.js

@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import {

packages/cli/src/commands/experimental/setupServerFileHandler.js

@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addApiPackages } from '@redwoodjs/cli-helpers'

packages/cli/src/commands/experimental/setupStreamingSsrHandler.js

@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addWebPackages } from '@redwoodjs/cli-helpers'

packages/cli/src/commands/experimental/studioHandler.js

@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import { getConfigPath } from '@redwoodjs/project-config'
 

packages/cli/src/commands/experimental/util.js

@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import terminalLink from 'terminal-link'
 
 import { getPaths } from '../../lib'

packages/cli/src/commands/generate/__tests__/helpers.test.js

@@ -1,6 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 // Setup test mocks
 globalThis.__dirname = __dirname
 import '../../../lib/test'

packages/cli/src/commands/generate/dataMigration/dataMigration.js

@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import { paramCase } from 'param-case'
 import terminalLink from 'terminal-link'

packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js

@@ -2,14 +2,14 @@ global.__dirname = __dirname
 
 jest.mock('fs')
 
-import fs from 'fs'
 import path from 'path'
 
 // Load mocks
 import '../../../../lib/test'
 
 const realfs = jest.requireActual('fs')
 import Enquirer from 'enquirer'
+import fs from 'fs-extra'
 
 import { getPaths } from '../../../../lib'
 import * as dbAuth from '../dbAuth'

packages/cli/src/commands/generate/dbAuth/dbAuth.js

@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import { camelCase } from 'camel-case'
 import Enquirer from 'enquirer'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import terminalLink from 'terminal-link'
 import { titleCase } from 'title-case'

packages/cli/src/commands/generate/helpers.js

@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import { paramCase } from 'param-case'
 import pascalcase from 'pascalcase'

packages/cli/src/commands/generate/page/__tests__/page.test.js

@@ -36,9 +36,10 @@ jest.mock('fs', () => {
   }
 })
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 // Load mocks
 import '../../../../lib/test'
 

packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js

@@ -1,6 +1,6 @@
 globalThis.__dirname = __dirname
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 import { shouldUseTailwindCSS } from '../scaffold'

packages/cli/src/commands/generate/scaffold/scaffold.js

@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import camelcase from 'camelcase'
 import execa from 'execa'
+import fs from 'fs-extra'
 import humanize from 'humanize-string'
 import { Listr } from 'listr2'
 import { paramCase } from 'param-case'

packages/cli/src/commands/generate/script/script.js

@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import terminalLink from 'terminal-link'
 

packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js

@@ -24,9 +24,9 @@ jest.mock('fs', () => {
   }
 })
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import prompts from 'prompts'
 
 // Load mocks

packages/cli/src/commands/lint.js

@@ -1,6 +1,5 @@
-import fs from 'fs'
-
 import execa from 'execa'
+import fs from 'fs-extra'
 import terminalLink from 'terminal-link'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'

packages/cli/src/commands/prerenderHandler.js

@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'

packages/cli/src/commands/prismaHandler.js

@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import boxen from 'boxen'
 import execa from 'execa'
+import fs from 'fs-extra'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'

packages/cli/src/commands/serve.js

@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import terminalLink from 'terminal-link'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'

packages/cli/src/commands/setup/cache/cacheHandler.js

@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addEnvVarTask } from '@redwoodjs/cli-helpers'

packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js

@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { errorTelemetry } from '@redwoodjs/telemetry'

packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js

@@ -1,9 +1,10 @@
 // Automock fs using ../..../__mocks__/fs
 jest.mock('fs')
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import { getPaths } from '../../../../lib'
 import { updateApiURLTask } from '../helpers'
 // Mock telemetry and other things

packages/cli/src/commands/setup/deploy/helpers/index.js

@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { getPaths, writeFilesTask } from '../../../../lib'