Skip to content

Commit 7351e32

Browse files
TobbeTobbe
committed
chore(cli): Add .js to relative imports (ESM prep)
1 parent 3d4a112 commit 7351e32

File tree

208 files changed

+542
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+542
-488
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import { hideBin } from 'yargs/helpers'
1414

1515
import { getConfig, getPaths } from '@redwoodjs/project-config'
1616

17-
import * as pluginLib from '../lib/plugin'
18-
import { loadPlugins } from '../plugin'
17+
import * as pluginLib from '../lib/plugin.js'
18+
import { loadPlugins } from '../plugin.js'
1919

2020
vi.mock('fs-extra')
2121
vi.mock('@redwoodjs/project-config', async (importOriginal) => {

‎packages/cli/src/commands/__tests__/build.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ vi.mock('execa', () => ({
5252
})),
5353
}))
5454

55-
import { handler } from '../build'
55+
import { handler } from '../build.js'
5656

5757
afterEach(() => {
5858
vi.clearAllMocks()

‎packages/cli/src/commands/__tests__/dev.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ import { vi, describe, afterEach, it, expect } from 'vitest'
7474

7575
import { getConfig } from '@redwoodjs/project-config'
7676

77-
import { generatePrismaClient } from '../../lib/generatePrismaClient'
78-
import { handler } from '../dev'
77+
import { generatePrismaClient } from '../../lib/generatePrismaClient.js'
78+
import { handler } from '../dev.js'
7979

8080
describe('yarn rw dev', () => {
8181
afterEach(() => {

‎packages/cli/src/commands/__tests__/exec.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import path from 'node:path'
33
import { fs as memfs, vol } from 'memfs'
44
import { vi, afterEach, beforeEach, describe, it, expect } from 'vitest'
55

6-
import { runScriptFunction } from '../../lib/exec'
6+
import { runScriptFunction } from '../../lib/exec.js'
77
import '../../lib/mockTelemetry'
8-
import { handler } from '../execHandler'
8+
import { handler } from '../execHandler.js'
99

1010
vi.mock('@redwoodjs/babel-config', () => ({
1111
getWebSideDefaultBabelConfig: () => ({

‎packages/cli/src/commands/__tests__/info.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import '../../lib/mockTelemetry'
33

44
import { vi, afterEach, beforeEach, describe, it, expect } from 'vitest'
55

6-
import { handler } from '../info'
6+
import { handler } from '../info.js'
77

88
vi.mock('envinfo', () => ({ default: { run: () => '' } }))
99
vi.mock('@redwoodjs/project-config', () => ({ getPaths: () => ({}) }))

‎packages/cli/src/commands/__tests__/prisma.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ vi.mock('fs-extra', async (importOriginal) => {
3939
import execa from 'execa'
4040
import { vi, beforeEach, afterEach, test, expect } from 'vitest'
4141

42-
import { handler } from '../prisma'
42+
import { handler } from '../prisma.js'
4343

4444
beforeEach(() => {
4545
vi.spyOn(console, 'info').mockImplementation(() => {})

‎packages/cli/src/commands/__tests__/serve.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import yargs from 'yargs/yargs'
44
import * as apiServerCLIConfig from '@redwoodjs/api-server/dist/apiCLIConfig'
55
import * as bothServerCLIConfig from '@redwoodjs/api-server/dist/bothCLIConfig'
66

7-
import { builder } from '../serve'
7+
import { builder } from '../serve.js'
88

99
globalThis.__dirname = __dirname
1010

‎packages/cli/src/commands/__tests__/studioHandler.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ vi.mock('fs-extra', () => ({
2222

2323
import { vi, describe, it, afterEach, afterAll, expect } from 'vitest'
2424

25-
import { assertRedwoodVersion } from '../studioHandler'
25+
import { assertRedwoodVersion } from '../studioHandler.js'
2626

2727
describe('studioHandler', () => {
2828
describe('assertRedwoodVersion', () => {

‎packages/cli/src/commands/__tests__/test.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ vi.mock('execa', () => ({
1111
import execa from 'execa'
1212
import { vi, afterEach, test, expect } from 'vitest'
1313

14-
import { handler } from '../test'
14+
import { handler } from '../test.js'
1515

1616
vi.mock('@redwoodjs/structure', () => {
1717
return {

‎packages/cli/src/commands/__tests__/type-check.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ import concurrently from 'concurrently'
5555
import execa from 'execa'
5656
import { vi, beforeEach, afterEach, test, expect } from 'vitest'
5757

58-
import { runCommandTask } from '../../lib'
59-
import { handler } from '../type-check'
58+
import { runCommandTask } from '../../lib/index.js'
59+
import { handler } from '../type-check.js'
6060

6161
beforeEach(() => {
6262
vi.spyOn(console, 'info').mockImplementation(() => {})

‎packages/cli/src/commands/build.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import terminalLink from 'terminal-link'
22

3-
import c from '../lib/colors'
4-
import { exitWithError } from '../lib/exit'
5-
import { sides } from '../lib/project'
6-
import { checkNodeVersion } from '../middleware/checkNodeVersion'
3+
import c from '../lib/colors.js'
4+
import { exitWithError } from '../lib/exit.js'
5+
import { sides } from '../lib/project.js'
6+
import { checkNodeVersion } from '../middleware/checkNodeVersion.js'
77

88
export const command = 'build [side..]'
99
export const description = 'Build for production'

‎packages/cli/src/commands/buildHandler.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import { loadAndValidateSdls } from '@redwoodjs/internal/dist/validateSchema'
1212
import { detectPrerenderRoutes } from '@redwoodjs/prerender/detection'
1313
import { timedTelemetry } from '@redwoodjs/telemetry'
1414

15-
import { getPaths, getConfig } from '../lib'
16-
import { generatePrismaCommand } from '../lib/generatePrismaClient'
15+
import { generatePrismaCommand } from '../lib/generatePrismaClient.js'
16+
import { getPaths, getConfig } from '../lib/index.js'
1717

1818
export const handler = async ({
1919
side = ['api', 'web'],

‎packages/cli/src/commands/check.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
22

3-
import { getPaths } from '../lib'
4-
import c from '../lib/colors'
3+
import c from '../lib/colors.js'
4+
import { getPaths } from '../lib/index.js'
55

66
export const command = 'check'
77
export const aliases = ['diagnostics']

‎packages/cli/src/commands/consoleHandler.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import fs from 'fs-extra'
66
import { registerApiSideBabelHook } from '@redwoodjs/babel-config'
77
import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
88

9-
import { getPaths } from '../lib'
9+
import { getPaths } from '../lib/index.js'
1010

1111
const paths = getPaths()
1212

‎packages/cli/src/commands/deploy/__tests__/baremetal.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ vi.mock('@redwoodjs/project-config', async (importOriginal) => {
1111
}
1212
})
1313

14-
import * as baremetal from '../baremetal'
14+
import * as baremetal from '../baremetal.js'
1515

1616
describe('verifyConfig', () => {
1717
it('throws an error if no environment specified', () => {

‎packages/cli/src/commands/deploy/__tests__/flightcontrol.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest'
22
import yargs from 'yargs'
33

4-
import { handler, builder } from '../flightcontrol'
4+
import { handler, builder } from '../flightcontrol.js'
55

66
vi.mock('path')
77
vi.mock('execa')

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { vi, test, expect } from 'vitest'
22

33
import { findApiDistFunctions } from '@redwoodjs/internal/dist/files'
44

5-
import * as nftPacker from '../packing/nft'
5+
import * as nftPacker from '../packing/nft.js'
66

77
vi.mock('@vercel/nft', () => {
88
return {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import { titleCase } from 'title-case'
1010

1111
import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
1212

13-
import { getPaths } from '../../lib'
14-
import c from '../../lib/colors'
13+
import c from '../../lib/colors.js'
14+
import { getPaths } from '../../lib/index.js'
1515

16-
import { SshExecutor } from './baremetal/SshExecutor'
16+
import { SshExecutor } from './baremetal/SshExecutor.js'
1717

1818
const CONFIG_FILENAME = 'deploy.toml'
1919
const SYMLINK_FLAGS = '-nsf'

‎packages/cli/src/commands/deploy/helpers/helpers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import terminalLink from 'terminal-link'
33

44
import { getPaths } from '@redwoodjs/project-config'
55

6-
import c from '../../../lib/colors'
6+
import c from '../../../lib/colors.js'
77

88
export const deployBuilder = (yargs) => {
99
yargs

‎packages/cli/src/commands/deploy/netlify.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
22

3-
import { deployBuilder, deployHandler } from './helpers/helpers'
3+
import { deployBuilder, deployHandler } from './helpers/helpers.js'
44

55
export const command = 'netlify [...commands]'
66
export const description = 'Build command for Netlify deploy'

‎packages/cli/src/commands/deploy/packing/nft.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import fse from 'fs-extra'
77
import { findApiDistFunctions } from '@redwoodjs/internal/dist/files'
88
import { ensurePosixPath, getPaths } from '@redwoodjs/project-config'
99

10-
import * as nftPacker from '../packing/nft'
10+
import * as nftPacker from '../packing/nft.js'
1111

1212
const ZIPBALL_DIR = './api/dist/zipball'
1313

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import terminalLink from 'terminal-link'
1111

1212
import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
1313

14-
import { getPaths } from '../../lib'
15-
import c from '../../lib/colors'
14+
import c from '../../lib/colors.js'
15+
import { getPaths } from '../../lib/index.js'
1616

1717
export const command = 'serverless'
1818
export const aliases = ['aws serverless', 'sls']

‎packages/cli/src/commands/deploy/vercel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
22

3-
import { deployBuilder, deployHandler } from './helpers/helpers'
3+
import { deployBuilder, deployHandler } from './helpers/helpers.js'
44

55
export const command = 'vercel [...commands]'
66
export const description = 'Build command for Vercel deploy'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
2323

2424
import '../../../../lib/test'
2525

26-
import { files } from '../../../generate/cell/cell'
27-
import { tasks } from '../cell'
26+
import { files } from '../../../generate/cell/cell.js'
27+
import { tasks } from '../cell.js'
2828

2929
beforeEach(() => {
3030
vi.spyOn(console, 'info').mockImplementation(() => {})

‎packages/cli/src/commands/destroy/cell/cell.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { files as cellFiles } from '../../generate/cell/cell'
2-
import { createYargsForComponentDestroy } from '../helpers'
1+
import { files as cellFiles } from '../../generate/cell/cell.js'
2+
import { createYargsForComponentDestroy } from '../helpers.js'
33

44
export const { command, description, builder, handler, tasks } =
55
createYargsForComponentDestroy({

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
1414

1515
import '../../../../lib/test'
1616

17-
import { files } from '../../../generate/component/component'
18-
import { tasks } from '../component'
17+
import { files } from '../../../generate/component/component.js'
18+
import { tasks } from '../component.js'
1919

2020
beforeEach(async () => {
2121
vol.fromJSON(await files({ name: 'About' }))

‎packages/cli/src/commands/destroy/component/component.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { files as componentFiles } from '../../generate/component/component'
2-
import { createYargsForComponentDestroy } from '../helpers'
1+
import { files as componentFiles } from '../../generate/component/component.js'
2+
import { createYargsForComponentDestroy } from '../helpers.js'
33

44
export const description = 'Destroy a component'
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
1515

1616
import '../../../../lib/test'
1717

18-
import { files } from '../../../generate/directive/directive'
19-
import { tasks } from '../directive'
18+
import { files } from '../../../generate/directive/directive.js'
19+
import { tasks } from '../directive.js'
2020

2121
beforeEach(() => {
2222
vol.fromJSON(files({ name: 'require-admin', type: 'validator', tests: true }))

‎packages/cli/src/commands/destroy/directive/directive.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { files as directiveFiles } from '../../generate/directive/directive'
2-
import { createYargsForComponentDestroy } from '../helpers'
1+
import { files as directiveFiles } from '../../generate/directive/directive.js'
2+
import { createYargsForComponentDestroy } from '../helpers.js'
33

44
export const description = 'Destroy a directive'
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
1414

1515
import '../../../../lib/test'
1616

17-
import { files } from '../../../generate/function/function'
18-
import { tasks } from '../function'
17+
import { files } from '../../../generate/function/function.js'
18+
import { tasks } from '../function.js'
1919

2020
beforeEach(async () => {
2121
vol.fromJSON(files({ name: 'sendMail' }))

‎packages/cli/src/commands/destroy/function/function.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { files as functionFiles } from '../../generate/function/function'
2-
import { createYargsForComponentDestroy } from '../helpers'
1+
import { files as functionFiles } from '../../generate/function/function.js'
2+
import { createYargsForComponentDestroy } from '../helpers.js'
33

44
export const description = 'Destroy a Function'
55

‎packages/cli/src/commands/destroy/helpers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Listr } from 'listr2'
22

33
import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
44

5-
import { deleteFilesTask } from '../../lib'
5+
import { deleteFilesTask } from '../../lib/index.js'
66

77
const tasks = ({ componentName, filesFn, name }) =>
88
new Listr(

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
1414

1515
import '../../../../lib/test'
1616

17-
import { files } from '../../../generate/layout/layout'
18-
import { tasks } from '../layout'
17+
import { files } from '../../../generate/layout/layout.js'
18+
import { tasks } from '../layout.js'
1919

2020
beforeEach(() => {
2121
vol.fromJSON(files({ name: 'Blog' }))

‎packages/cli/src/commands/destroy/layout/layout.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { files as layoutFiles } from '../../generate/layout/layout'
2-
import { createYargsForComponentDestroy } from '../helpers'
1+
import { files as layoutFiles } from '../../generate/layout/layout.js'
2+
import { createYargsForComponentDestroy } from '../helpers.js'
33

44
export const { command, description, builder, handler, tasks } =
55
createYargsForComponentDestroy({

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ vi.mock('@redwoodjs/internal/dist/generate/generate', () => {
5454
}
5555
})
5656

57-
import { getPaths } from '../../../../lib'
58-
import { files } from '../../../generate/page/page'
59-
import { tasks } from '../page'
57+
import { getPaths } from '../../../../lib/index.js'
58+
import { files } from '../../../generate/page/page.js'
59+
import { tasks } from '../page.js'
6060

6161
beforeEach(async () => {
6262
const f = await files({ name: 'About' })

‎packages/cli/src/commands/destroy/page/page.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ import { Listr } from 'listr2'
33

44
import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
55

6-
import { deleteFilesTask, removeRoutesFromRouterTask } from '../../../lib'
7-
import c from '../../../lib/colors'
8-
import { pathName } from '../../generate/helpers'
6+
import c from '../../../lib/colors.js'
7+
import {
8+
deleteFilesTask,
9+
removeRoutesFromRouterTask,
10+
} from '../../../lib/index.js'
11+
import { pathName } from '../../generate/helpers.js'
912
import {
1013
files as pageFiles,
1114
paramVariants as templateVars,
12-
} from '../../generate/page/page'
15+
} from '../../generate/page/page.js'
1316

1417
export const command = 'page <name> [path]'
1518
export const description = 'Destroy a page and route component'

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import { vi, test, describe, beforeEach, afterEach, expect } from 'vitest'
88

99
import '../../../../lib/test'
1010

11-
import { getPaths, getDefaultArgs } from '../../../../lib'
11+
import { getPaths, getDefaultArgs } from '../../../../lib/index.js'
1212
import {
1313
yargsDefaults as defaults,
1414
customOrDefaultTemplatePath,
15-
} from '../../../generate/helpers'
16-
import { files } from '../../../generate/scaffold/scaffold'
17-
import { tasks } from '../scaffold'
15+
} from '../../../generate/helpers.js'
16+
import { files } from '../../../generate/scaffold/scaffold.js'
17+
import { tasks } from '../scaffold.js'
1818

1919
vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
2020
vi.mock('fs-extra')

0 commit comments

Comments
 (0)