diff --git a/packages/cli/src/__tests__/plugin.test.js b/packages/cli/src/__tests__/plugin.test.js
index e1638acf6f7b..e0f730898395 100644
--- a/packages/cli/src/__tests__/plugin.test.js
+++ b/packages/cli/src/__tests__/plugin.test.js
@@ -14,8 +14,8 @@ import { hideBin } from 'yargs/helpers'
 
 import { getConfig, getPaths } from '@redwoodjs/project-config'
 
-import * as pluginLib from '../lib/plugin'
-import { loadPlugins } from '../plugin'
+import * as pluginLib from '../lib/plugin.js'
+import { loadPlugins } from '../plugin.js'
 
 vi.mock('fs-extra')
 vi.mock('@redwoodjs/project-config', async (importOriginal) => {
diff --git a/packages/cli/src/commands/__tests__/build.test.js b/packages/cli/src/commands/__tests__/build.test.js
index a7b140ac5a26..41c2131d860c 100644
--- a/packages/cli/src/commands/__tests__/build.test.js
+++ b/packages/cli/src/commands/__tests__/build.test.js
@@ -52,7 +52,7 @@ vi.mock('execa', () => ({
   })),
 }))
 
-import { handler } from '../build'
+import { handler } from '../build.js'
 
 afterEach(() => {
   vi.clearAllMocks()
diff --git a/packages/cli/src/commands/__tests__/dev.test.js b/packages/cli/src/commands/__tests__/dev.test.js
index ad5b0c3e571a..0e4679055854 100644
--- a/packages/cli/src/commands/__tests__/dev.test.js
+++ b/packages/cli/src/commands/__tests__/dev.test.js
@@ -74,8 +74,8 @@ import { vi, describe, afterEach, it, expect } from 'vitest'
 
 import { getConfig } from '@redwoodjs/project-config'
 
-import { generatePrismaClient } from '../../lib/generatePrismaClient'
-import { handler } from '../dev'
+import { generatePrismaClient } from '../../lib/generatePrismaClient.js'
+import { handler } from '../dev.js'
 
 describe('yarn rw dev', () => {
   afterEach(() => {
diff --git a/packages/cli/src/commands/__tests__/exec.test.ts b/packages/cli/src/commands/__tests__/exec.test.ts
index 37d68c79246a..d856d2cf5fb5 100644
--- a/packages/cli/src/commands/__tests__/exec.test.ts
+++ b/packages/cli/src/commands/__tests__/exec.test.ts
@@ -3,9 +3,9 @@ import path from 'node:path'
 import { fs as memfs, vol } from 'memfs'
 import { vi, afterEach, beforeEach, describe, it, expect } from 'vitest'
 
-import { runScriptFunction } from '../../lib/exec'
+import { runScriptFunction } from '../../lib/exec.js'
 import '../../lib/mockTelemetry'
-import { handler } from '../execHandler'
+import { handler } from '../execHandler.js'
 
 vi.mock('@redwoodjs/babel-config', () => ({
   getWebSideDefaultBabelConfig: () => ({
diff --git a/packages/cli/src/commands/__tests__/info.test.js b/packages/cli/src/commands/__tests__/info.test.js
index dc4d37042a8b..ecabbaf75e45 100644
--- a/packages/cli/src/commands/__tests__/info.test.js
+++ b/packages/cli/src/commands/__tests__/info.test.js
@@ -3,7 +3,7 @@ import '../../lib/mockTelemetry'
 
 import { vi, afterEach, beforeEach, describe, it, expect } from 'vitest'
 
-import { handler } from '../info'
+import { handler } from '../info.js'
 
 vi.mock('envinfo', () => ({ default: { run: () => '' } }))
 vi.mock('@redwoodjs/project-config', () => ({ getPaths: () => ({}) }))
diff --git a/packages/cli/src/commands/__tests__/prisma.test.js b/packages/cli/src/commands/__tests__/prisma.test.js
index 81800a6914d4..7790c2c7d2eb 100644
--- a/packages/cli/src/commands/__tests__/prisma.test.js
+++ b/packages/cli/src/commands/__tests__/prisma.test.js
@@ -39,7 +39,7 @@ vi.mock('fs-extra', async (importOriginal) => {
 import execa from 'execa'
 import { vi, beforeEach, afterEach, test, expect } from 'vitest'
 
-import { handler } from '../prisma'
+import { handler } from '../prisma.js'
 
 beforeEach(() => {
   vi.spyOn(console, 'info').mockImplementation(() => {})
diff --git a/packages/cli/src/commands/__tests__/serve.test.js b/packages/cli/src/commands/__tests__/serve.test.js
index 0c7f342c1994..d9db96869af7 100644
--- a/packages/cli/src/commands/__tests__/serve.test.js
+++ b/packages/cli/src/commands/__tests__/serve.test.js
@@ -4,7 +4,7 @@ import yargs from 'yargs/yargs'
 import * as apiServerCLIConfig from '@redwoodjs/api-server/dist/apiCLIConfig'
 import * as bothServerCLIConfig from '@redwoodjs/api-server/dist/bothCLIConfig'
 
-import { builder } from '../serve'
+import { builder } from '../serve.js'
 
 globalThis.__dirname = __dirname
 
diff --git a/packages/cli/src/commands/__tests__/studioHandler.test.js b/packages/cli/src/commands/__tests__/studioHandler.test.js
index 01b4f3a8dad1..efb127f0c619 100644
--- a/packages/cli/src/commands/__tests__/studioHandler.test.js
+++ b/packages/cli/src/commands/__tests__/studioHandler.test.js
@@ -22,7 +22,7 @@ vi.mock('fs-extra', () => ({
 
 import { vi, describe, it, afterEach, afterAll, expect } from 'vitest'
 
-import { assertRedwoodVersion } from '../studioHandler'
+import { assertRedwoodVersion } from '../studioHandler.js'
 
 describe('studioHandler', () => {
   describe('assertRedwoodVersion', () => {
diff --git a/packages/cli/src/commands/__tests__/test.test.js b/packages/cli/src/commands/__tests__/test.test.js
index e63ebb68cdf1..4fd6389d6316 100644
--- a/packages/cli/src/commands/__tests__/test.test.js
+++ b/packages/cli/src/commands/__tests__/test.test.js
@@ -11,7 +11,7 @@ vi.mock('execa', () => ({
 import execa from 'execa'
 import { vi, afterEach, test, expect } from 'vitest'
 
-import { handler } from '../test'
+import { handler } from '../test.js'
 
 vi.mock('@redwoodjs/structure', () => {
   return {
diff --git a/packages/cli/src/commands/__tests__/type-check.test.js b/packages/cli/src/commands/__tests__/type-check.test.js
index 6306a1d2bb7e..0eb99234636a 100644
--- a/packages/cli/src/commands/__tests__/type-check.test.js
+++ b/packages/cli/src/commands/__tests__/type-check.test.js
@@ -55,8 +55,8 @@ import concurrently from 'concurrently'
 import execa from 'execa'
 import { vi, beforeEach, afterEach, test, expect } from 'vitest'
 
-import { runCommandTask } from '../../lib'
-import { handler } from '../type-check'
+import { runCommandTask } from '../../lib/index.js'
+import { handler } from '../type-check.js'
 
 beforeEach(() => {
   vi.spyOn(console, 'info').mockImplementation(() => {})
diff --git a/packages/cli/src/commands/build.js b/packages/cli/src/commands/build.js
index c17005bd12cd..2ffc44ab9c95 100644
--- a/packages/cli/src/commands/build.js
+++ b/packages/cli/src/commands/build.js
@@ -1,9 +1,9 @@
 import terminalLink from 'terminal-link'
 
-import c from '../lib/colors'
-import { exitWithError } from '../lib/exit'
-import { sides } from '../lib/project'
-import { checkNodeVersion } from '../middleware/checkNodeVersion'
+import c from '../lib/colors.js'
+import { exitWithError } from '../lib/exit.js'
+import { sides } from '../lib/project.js'
+import { checkNodeVersion } from '../middleware/checkNodeVersion.js'
 
 export const command = 'build [side..]'
 export const description = 'Build for production'
diff --git a/packages/cli/src/commands/buildHandler.js b/packages/cli/src/commands/buildHandler.js
index 1ba64615cf1f..0ed3835ca5e4 100644
--- a/packages/cli/src/commands/buildHandler.js
+++ b/packages/cli/src/commands/buildHandler.js
@@ -12,8 +12,8 @@ import { loadAndValidateSdls } from '@redwoodjs/internal/dist/validateSchema'
 import { detectPrerenderRoutes } from '@redwoodjs/prerender/detection'
 import { timedTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, getConfig } from '../lib'
-import { generatePrismaCommand } from '../lib/generatePrismaClient'
+import { generatePrismaCommand } from '../lib/generatePrismaClient.js'
+import { getPaths, getConfig } from '../lib/index.js'
 
 export const handler = async ({
   side = ['api', 'web'],
diff --git a/packages/cli/src/commands/check.js b/packages/cli/src/commands/check.js
index f11abcbeec0e..ebc5359fe149 100644
--- a/packages/cli/src/commands/check.js
+++ b/packages/cli/src/commands/check.js
@@ -1,7 +1,7 @@
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getPaths } from '../lib'
-import c from '../lib/colors'
+import c from '../lib/colors.js'
+import { getPaths } from '../lib/index.js'
 
 export const command = 'check'
 export const aliases = ['diagnostics']
diff --git a/packages/cli/src/commands/consoleHandler.js b/packages/cli/src/commands/consoleHandler.js
index d6dd5abc17ee..93dc296de931 100644
--- a/packages/cli/src/commands/consoleHandler.js
+++ b/packages/cli/src/commands/consoleHandler.js
@@ -6,7 +6,7 @@ import fs from 'fs-extra'
 import { registerApiSideBabelHook } from '@redwoodjs/babel-config'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getPaths } from '../lib'
+import { getPaths } from '../lib/index.js'
 
 const paths = getPaths()
 
diff --git a/packages/cli/src/commands/deploy/__tests__/baremetal.test.js b/packages/cli/src/commands/deploy/__tests__/baremetal.test.js
index 5d6e3ba7ec05..eadedd66dd63 100644
--- a/packages/cli/src/commands/deploy/__tests__/baremetal.test.js
+++ b/packages/cli/src/commands/deploy/__tests__/baremetal.test.js
@@ -11,7 +11,7 @@ vi.mock('@redwoodjs/project-config', async (importOriginal) => {
   }
 })
 
-import * as baremetal from '../baremetal'
+import * as baremetal from '../baremetal.js'
 
 describe('verifyConfig', () => {
   it('throws an error if no environment specified', () => {
diff --git a/packages/cli/src/commands/deploy/__tests__/flightcontrol.test.ts b/packages/cli/src/commands/deploy/__tests__/flightcontrol.test.ts
index 8663d3888a84..cd466b2b8a84 100644
--- a/packages/cli/src/commands/deploy/__tests__/flightcontrol.test.ts
+++ b/packages/cli/src/commands/deploy/__tests__/flightcontrol.test.ts
@@ -1,7 +1,7 @@
 import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest'
 import yargs from 'yargs'
 
-import { handler, builder } from '../flightcontrol'
+import { handler, builder } from '../flightcontrol.js'
 
 vi.mock('path')
 vi.mock('execa')
diff --git a/packages/cli/src/commands/deploy/__tests__/nftPack.test.js b/packages/cli/src/commands/deploy/__tests__/nftPack.test.js
index aebd55e0bab0..d9704cb6233c 100644
--- a/packages/cli/src/commands/deploy/__tests__/nftPack.test.js
+++ b/packages/cli/src/commands/deploy/__tests__/nftPack.test.js
@@ -2,7 +2,7 @@ import { vi, test, expect } from 'vitest'
 
 import { findApiDistFunctions } from '@redwoodjs/internal/dist/files'
 
-import * as nftPacker from '../packing/nft'
+import * as nftPacker from '../packing/nft.js'
 
 vi.mock('@vercel/nft', () => {
   return {
diff --git a/packages/cli/src/commands/deploy/baremetal.js b/packages/cli/src/commands/deploy/baremetal.js
index a816a923e041..c62020146c79 100644
--- a/packages/cli/src/commands/deploy/baremetal.js
+++ b/packages/cli/src/commands/deploy/baremetal.js
@@ -10,10 +10,10 @@ import { titleCase } from 'title-case'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getPaths } from '../../lib'
-import c from '../../lib/colors'
+import c from '../../lib/colors.js'
+import { getPaths } from '../../lib/index.js'
 
-import { SshExecutor } from './baremetal/SshExecutor'
+import { SshExecutor } from './baremetal/SshExecutor.js'
 
 const CONFIG_FILENAME = 'deploy.toml'
 const SYMLINK_FLAGS = '-nsf'
diff --git a/packages/cli/src/commands/deploy/helpers/helpers.js b/packages/cli/src/commands/deploy/helpers/helpers.js
index 2c6ac51ec157..4ecb4e493802 100644
--- a/packages/cli/src/commands/deploy/helpers/helpers.js
+++ b/packages/cli/src/commands/deploy/helpers/helpers.js
@@ -3,7 +3,7 @@ import terminalLink from 'terminal-link'
 
 import { getPaths } from '@redwoodjs/project-config'
 
-import c from '../../../lib/colors'
+import c from '../../../lib/colors.js'
 
 export const deployBuilder = (yargs) => {
   yargs
diff --git a/packages/cli/src/commands/deploy/netlify.js b/packages/cli/src/commands/deploy/netlify.js
index 0f9309d892eb..ef2c7e276bb5 100644
--- a/packages/cli/src/commands/deploy/netlify.js
+++ b/packages/cli/src/commands/deploy/netlify.js
@@ -1,6 +1,6 @@
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { deployBuilder, deployHandler } from './helpers/helpers'
+import { deployBuilder, deployHandler } from './helpers/helpers.js'
 
 export const command = 'netlify [...commands]'
 export const description = 'Build command for Netlify deploy'
diff --git a/packages/cli/src/commands/deploy/packing/nft.js b/packages/cli/src/commands/deploy/packing/nft.js
index bd0ba6ccaba6..e90411f8402a 100644
--- a/packages/cli/src/commands/deploy/packing/nft.js
+++ b/packages/cli/src/commands/deploy/packing/nft.js
@@ -7,7 +7,7 @@ import fse from 'fs-extra'
 import { findApiDistFunctions } from '@redwoodjs/internal/dist/files'
 import { ensurePosixPath, getPaths } from '@redwoodjs/project-config'
 
-import * as nftPacker from '../packing/nft'
+import * as nftPacker from '../packing/nft.js'
 
 const ZIPBALL_DIR = './api/dist/zipball'
 
diff --git a/packages/cli/src/commands/deploy/serverless.js b/packages/cli/src/commands/deploy/serverless.js
index 68efb7811bd5..783437290fc6 100644
--- a/packages/cli/src/commands/deploy/serverless.js
+++ b/packages/cli/src/commands/deploy/serverless.js
@@ -11,8 +11,8 @@ import terminalLink from 'terminal-link'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getPaths } from '../../lib'
-import c from '../../lib/colors'
+import c from '../../lib/colors.js'
+import { getPaths } from '../../lib/index.js'
 
 export const command = 'serverless'
 export const aliases = ['aws serverless', 'sls']
diff --git a/packages/cli/src/commands/deploy/vercel.js b/packages/cli/src/commands/deploy/vercel.js
index 675d22a69950..183272cf4f02 100644
--- a/packages/cli/src/commands/deploy/vercel.js
+++ b/packages/cli/src/commands/deploy/vercel.js
@@ -1,6 +1,6 @@
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { deployBuilder, deployHandler } from './helpers/helpers'
+import { deployBuilder, deployHandler } from './helpers/helpers.js'
 
 export const command = 'vercel [...commands]'
 export const description = 'Build command for Vercel deploy'
diff --git a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
index ea98206054bd..9bf8a6d300eb 100644
--- a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
+++ b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
@@ -23,8 +23,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import { files } from '../../../generate/cell/cell'
-import { tasks } from '../cell'
+import { files } from '../../../generate/cell/cell.js'
+import { tasks } from '../cell.js'
 
 beforeEach(() => {
   vi.spyOn(console, 'info').mockImplementation(() => {})
diff --git a/packages/cli/src/commands/destroy/cell/cell.js b/packages/cli/src/commands/destroy/cell/cell.js
index 188f2507632b..8ca34865701b 100644
--- a/packages/cli/src/commands/destroy/cell/cell.js
+++ b/packages/cli/src/commands/destroy/cell/cell.js
@@ -1,5 +1,5 @@
-import { files as cellFiles } from '../../generate/cell/cell'
-import { createYargsForComponentDestroy } from '../helpers'
+import { files as cellFiles } from '../../generate/cell/cell.js'
+import { createYargsForComponentDestroy } from '../helpers.js'
 
 export const { command, description, builder, handler, tasks } =
   createYargsForComponentDestroy({
diff --git a/packages/cli/src/commands/destroy/component/__tests__/component.test.js b/packages/cli/src/commands/destroy/component/__tests__/component.test.js
index 4b84fdf3b72c..8a2d4456a330 100644
--- a/packages/cli/src/commands/destroy/component/__tests__/component.test.js
+++ b/packages/cli/src/commands/destroy/component/__tests__/component.test.js
@@ -14,8 +14,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import { files } from '../../../generate/component/component'
-import { tasks } from '../component'
+import { files } from '../../../generate/component/component.js'
+import { tasks } from '../component.js'
 
 beforeEach(async () => {
   vol.fromJSON(await files({ name: 'About' }))
diff --git a/packages/cli/src/commands/destroy/component/component.js b/packages/cli/src/commands/destroy/component/component.js
index 476e8f1fa079..71e294cc0361 100644
--- a/packages/cli/src/commands/destroy/component/component.js
+++ b/packages/cli/src/commands/destroy/component/component.js
@@ -1,5 +1,5 @@
-import { files as componentFiles } from '../../generate/component/component'
-import { createYargsForComponentDestroy } from '../helpers'
+import { files as componentFiles } from '../../generate/component/component.js'
+import { createYargsForComponentDestroy } from '../helpers.js'
 
 export const description = 'Destroy a component'
 
diff --git a/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js b/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js
index fc1d17dbe744..e48408ff6bde 100644
--- a/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js
+++ b/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js
@@ -15,8 +15,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import { files } from '../../../generate/directive/directive'
-import { tasks } from '../directive'
+import { files } from '../../../generate/directive/directive.js'
+import { tasks } from '../directive.js'
 
 beforeEach(() => {
   vol.fromJSON(files({ name: 'require-admin', type: 'validator', tests: true }))
diff --git a/packages/cli/src/commands/destroy/directive/directive.js b/packages/cli/src/commands/destroy/directive/directive.js
index b169b7ca2cd5..2bf1e00b51a9 100644
--- a/packages/cli/src/commands/destroy/directive/directive.js
+++ b/packages/cli/src/commands/destroy/directive/directive.js
@@ -1,5 +1,5 @@
-import { files as directiveFiles } from '../../generate/directive/directive'
-import { createYargsForComponentDestroy } from '../helpers'
+import { files as directiveFiles } from '../../generate/directive/directive.js'
+import { createYargsForComponentDestroy } from '../helpers.js'
 
 export const description = 'Destroy a directive'
 
diff --git a/packages/cli/src/commands/destroy/function/__tests__/function.test.js b/packages/cli/src/commands/destroy/function/__tests__/function.test.js
index bf13eb620247..d6fb75759838 100644
--- a/packages/cli/src/commands/destroy/function/__tests__/function.test.js
+++ b/packages/cli/src/commands/destroy/function/__tests__/function.test.js
@@ -14,8 +14,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import { files } from '../../../generate/function/function'
-import { tasks } from '../function'
+import { files } from '../../../generate/function/function.js'
+import { tasks } from '../function.js'
 
 beforeEach(async () => {
   vol.fromJSON(files({ name: 'sendMail' }))
diff --git a/packages/cli/src/commands/destroy/function/function.js b/packages/cli/src/commands/destroy/function/function.js
index 49fcc6d80042..9452f6852d0a 100644
--- a/packages/cli/src/commands/destroy/function/function.js
+++ b/packages/cli/src/commands/destroy/function/function.js
@@ -1,5 +1,5 @@
-import { files as functionFiles } from '../../generate/function/function'
-import { createYargsForComponentDestroy } from '../helpers'
+import { files as functionFiles } from '../../generate/function/function.js'
+import { createYargsForComponentDestroy } from '../helpers.js'
 
 export const description = 'Destroy a Function'
 
diff --git a/packages/cli/src/commands/destroy/helpers.js b/packages/cli/src/commands/destroy/helpers.js
index 5ffc4ed574a8..aea9b388c70e 100644
--- a/packages/cli/src/commands/destroy/helpers.js
+++ b/packages/cli/src/commands/destroy/helpers.js
@@ -2,7 +2,7 @@ import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { deleteFilesTask } from '../../lib'
+import { deleteFilesTask } from '../../lib/index.js'
 
 const tasks = ({ componentName, filesFn, name }) =>
   new Listr(
diff --git a/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js b/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js
index 59f25a85c2cf..59aad48aecee 100644
--- a/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js
+++ b/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js
@@ -14,8 +14,8 @@ import { vi, beforeEach, afterEach, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import { files } from '../../../generate/layout/layout'
-import { tasks } from '../layout'
+import { files } from '../../../generate/layout/layout.js'
+import { tasks } from '../layout.js'
 
 beforeEach(() => {
   vol.fromJSON(files({ name: 'Blog' }))
diff --git a/packages/cli/src/commands/destroy/layout/layout.js b/packages/cli/src/commands/destroy/layout/layout.js
index b09ecbb694d3..3f1fdde98686 100644
--- a/packages/cli/src/commands/destroy/layout/layout.js
+++ b/packages/cli/src/commands/destroy/layout/layout.js
@@ -1,5 +1,5 @@
-import { files as layoutFiles } from '../../generate/layout/layout'
-import { createYargsForComponentDestroy } from '../helpers'
+import { files as layoutFiles } from '../../generate/layout/layout.js'
+import { createYargsForComponentDestroy } from '../helpers.js'
 
 export const { command, description, builder, handler, tasks } =
   createYargsForComponentDestroy({
diff --git a/packages/cli/src/commands/destroy/page/__tests__/page.test.js b/packages/cli/src/commands/destroy/page/__tests__/page.test.js
index 97b3440cfba6..b883f60dfa26 100644
--- a/packages/cli/src/commands/destroy/page/__tests__/page.test.js
+++ b/packages/cli/src/commands/destroy/page/__tests__/page.test.js
@@ -54,9 +54,9 @@ vi.mock('@redwoodjs/internal/dist/generate/generate', () => {
   }
 })
 
-import { getPaths } from '../../../../lib'
-import { files } from '../../../generate/page/page'
-import { tasks } from '../page'
+import { getPaths } from '../../../../lib/index.js'
+import { files } from '../../../generate/page/page.js'
+import { tasks } from '../page.js'
 
 beforeEach(async () => {
   const f = await files({ name: 'About' })
diff --git a/packages/cli/src/commands/destroy/page/page.js b/packages/cli/src/commands/destroy/page/page.js
index ef2d8c891c9b..b37de054c827 100644
--- a/packages/cli/src/commands/destroy/page/page.js
+++ b/packages/cli/src/commands/destroy/page/page.js
@@ -3,13 +3,16 @@ import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { deleteFilesTask, removeRoutesFromRouterTask } from '../../../lib'
-import c from '../../../lib/colors'
-import { pathName } from '../../generate/helpers'
+import c from '../../../lib/colors.js'
+import {
+  deleteFilesTask,
+  removeRoutesFromRouterTask,
+} from '../../../lib/index.js'
+import { pathName } from '../../generate/helpers.js'
 import {
   files as pageFiles,
   paramVariants as templateVars,
-} from '../../generate/page/page'
+} from '../../generate/page/page.js'
 
 export const command = 'page <name> [path]'
 export const description = 'Destroy a page and route component'
diff --git a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
index 85a2cc1e9dd7..802f53142e85 100644
--- a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
+++ b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
@@ -8,13 +8,13 @@ import { vi, test, describe, beforeEach, afterEach, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import { getPaths, getDefaultArgs } from '../../../../lib'
+import { getPaths, getDefaultArgs } from '../../../../lib/index.js'
 import {
   yargsDefaults as defaults,
   customOrDefaultTemplatePath,
-} from '../../../generate/helpers'
-import { files } from '../../../generate/scaffold/scaffold'
-import { tasks } from '../scaffold'
+} from '../../../generate/helpers.js'
+import { files } from '../../../generate/scaffold/scaffold.js'
+import { tasks } from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('fs-extra')
diff --git a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js
index 95f6d6c4a928..6553e456a7ea 100644
--- a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js
+++ b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js
@@ -8,13 +8,13 @@ import { vi, test, describe, beforeEach, afterEach, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import { getPaths, getDefaultArgs } from '../../../../lib'
+import { getPaths, getDefaultArgs } from '../../../../lib/index.js'
 import {
   yargsDefaults as defaults,
   customOrDefaultTemplatePath,
-} from '../../../generate/helpers'
-import { files } from '../../../generate/scaffold/scaffold'
-import { tasks } from '../scaffold'
+} from '../../../generate/helpers.js'
+import { files } from '../../../generate/scaffold/scaffold.js'
+import { tasks } from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('fs-extra')
diff --git a/packages/cli/src/commands/destroy/scaffold/scaffold.js b/packages/cli/src/commands/destroy/scaffold/scaffold.js
index 62703aadf282..fc30d280848e 100644
--- a/packages/cli/src/commands/destroy/scaffold/scaffold.js
+++ b/packages/cli/src/commands/destroy/scaffold/scaffold.js
@@ -3,21 +3,21 @@ import pascalcase from 'pascalcase'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
+import c from '../../../lib/colors.js'
 import {
   deleteFilesTask,
   getPaths,
   readFile,
   removeRoutesFromRouterTask,
   writeFile,
-} from '../../../lib'
-import c from '../../../lib/colors'
-import { pluralize } from '../../../lib/rwPluralize'
-import { verifyModelName } from '../../../lib/schemaHelpers'
+} from '../../../lib/index.js'
+import { pluralize } from '../../../lib/rwPluralize.js'
+import { verifyModelName } from '../../../lib/schemaHelpers.js'
 import {
   files,
   routes as scaffoldRoutes,
   splitPathAndModel,
-} from '../../generate/scaffold/scaffold'
+} from '../../generate/scaffold/scaffold.js'
 
 export const command = 'scaffold <model>'
 export const description =
diff --git a/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js
index f15cfc463fdf..ee7f2912eaf5 100644
--- a/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js
+++ b/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js
@@ -6,9 +6,9 @@ import { vi, beforeEach, afterEach, test, expect, describe } from 'vitest'
 
 import '../../../../lib/test'
 
-import { getDefaultArgs } from '../../../../lib'
-import { builder, files } from '../../../generate/sdl/sdl'
-import { tasks } from '../sdl'
+import { getDefaultArgs } from '../../../../lib/index.js'
+import { builder, files } from '../../../generate/sdl/sdl.js'
+import { tasks } from '../sdl.js'
 
 vi.mock('fs-extra')
 
diff --git a/packages/cli/src/commands/destroy/sdl/sdl.js b/packages/cli/src/commands/destroy/sdl/sdl.js
index a4ac0810e36e..749356427674 100644
--- a/packages/cli/src/commands/destroy/sdl/sdl.js
+++ b/packages/cli/src/commands/destroy/sdl/sdl.js
@@ -2,10 +2,10 @@ import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { deleteFilesTask } from '../../../lib'
-import c from '../../../lib/colors'
-import { verifyModelName } from '../../../lib/schemaHelpers'
-import { files } from '../../generate/sdl/sdl'
+import c from '../../../lib/colors.js'
+import { deleteFilesTask } from '../../../lib/index.js'
+import { verifyModelName } from '../../../lib/schemaHelpers.js'
+import { files } from '../../generate/sdl/sdl.js'
 
 export const command = 'sdl <model>'
 export const description =
diff --git a/packages/cli/src/commands/destroy/service/__tests__/service.test.js b/packages/cli/src/commands/destroy/service/__tests__/service.test.js
index 65c088cb2f72..9f55402d76c6 100644
--- a/packages/cli/src/commands/destroy/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/destroy/service/__tests__/service.test.js
@@ -5,9 +5,9 @@ import { vi, describe, beforeEach, afterEach, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import { getDefaultArgs } from '../../../../lib'
-import { builder, files } from '../../../generate/service/service'
-import { tasks } from '../service'
+import { getDefaultArgs } from '../../../../lib/index.js'
+import { builder, files } from '../../../generate/service/service.js'
+import { tasks } from '../service.js'
 
 vi.mock('fs-extra')
 
diff --git a/packages/cli/src/commands/destroy/service/service.js b/packages/cli/src/commands/destroy/service/service.js
index 80f917acc3c7..30f05a88fcd7 100644
--- a/packages/cli/src/commands/destroy/service/service.js
+++ b/packages/cli/src/commands/destroy/service/service.js
@@ -1,7 +1,7 @@
-import { getDefaultArgs } from '../../../lib'
-import { verifyModelName } from '../../../lib/schemaHelpers'
-import { builder, files } from '../../generate/service/service'
-import { createYargsForComponentDestroy } from '../helpers'
+import { getDefaultArgs } from '../../../lib/index.js'
+import { verifyModelName } from '../../../lib/schemaHelpers.js'
+import { builder, files } from '../../generate/service/service.js'
+import { createYargsForComponentDestroy } from '../helpers.js'
 
 // This function wraps files(), so we can pass templateVars. templateVars
 // referenced in a file template must be defined, otherwise template rendering
diff --git a/packages/cli/src/commands/dev.js b/packages/cli/src/commands/dev.js
index 815bd90c1252..f7c1847033c4 100644
--- a/packages/cli/src/commands/dev.js
+++ b/packages/cli/src/commands/dev.js
@@ -1,7 +1,7 @@
 import terminalLink from 'terminal-link'
 
-import c from '../lib/colors'
-import { checkNodeVersion } from '../middleware/checkNodeVersion'
+import c from '../lib/colors.js'
+import { checkNodeVersion } from '../middleware/checkNodeVersion.js'
 
 export const command = 'dev [side..]'
 export const description = 'Start development servers for api, and web'
diff --git a/packages/cli/src/commands/devHandler.js b/packages/cli/src/commands/devHandler.js
index fe7982d18e41..c009148256d1 100644
--- a/packages/cli/src/commands/devHandler.js
+++ b/packages/cli/src/commands/devHandler.js
@@ -8,12 +8,12 @@ import { shutdownPort } from '@redwoodjs/internal/dist/dev'
 import { getConfig, getConfigPath } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths } from '../lib'
-import c from '../lib/colors'
-import { exitWithError } from '../lib/exit'
-import { generatePrismaClient } from '../lib/generatePrismaClient'
-import { getFreePort } from '../lib/ports'
-import { serverFileExists } from '../lib/project'
+import c from '../lib/colors.js'
+import { exitWithError } from '../lib/exit.js'
+import { generatePrismaClient } from '../lib/generatePrismaClient.js'
+import { getPaths } from '../lib/index.js'
+import { getFreePort } from '../lib/ports.js'
+import { serverFileExists } from '../lib/project.js'
 
 const defaultApiDebugPort = 18911
 
diff --git a/packages/cli/src/commands/execHandler.js b/packages/cli/src/commands/execHandler.js
index ab84b8dbb65c..2d6dcd8562d1 100644
--- a/packages/cli/src/commands/execHandler.js
+++ b/packages/cli/src/commands/execHandler.js
@@ -12,10 +12,10 @@ import {
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { findScripts } from '@redwoodjs/internal/dist/files'
 
-import { getPaths } from '../lib'
-import c from '../lib/colors'
-import { runScriptFunction } from '../lib/exec'
-import { generatePrismaClient } from '../lib/generatePrismaClient'
+import c from '../lib/colors.js'
+import { runScriptFunction } from '../lib/exec.js'
+import { generatePrismaClient } from '../lib/generatePrismaClient.js'
+import { getPaths } from '../lib/index.js'
 
 const printAvailableScriptsToConsole = () => {
   // Loop through all scripts and get their relative path
diff --git a/packages/cli/src/commands/experimental.js b/packages/cli/src/commands/experimental.js
index 0bcc75cddf9a..1b15278266f4 100644
--- a/packages/cli/src/commands/experimental.js
+++ b/packages/cli/src/commands/experimental.js
@@ -1,6 +1,6 @@
 import terminalLink from 'terminal-link'
 
-import detectRwVersion from '../middleware/detectProjectRwVersion'
+import detectRwVersion from '../middleware/detectProjectRwVersion.js'
 
 export const command = 'experimental <command>'
 export const aliases = ['exp']
diff --git a/packages/cli/src/commands/experimental/setupInngest.js b/packages/cli/src/commands/experimental/setupInngest.js
index 1c0f41199a6a..281ec02adf28 100644
--- a/packages/cli/src/commands/experimental/setupInngest.js
+++ b/packages/cli/src/commands/experimental/setupInngest.js
@@ -1,6 +1,6 @@
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getEpilogue } from './util'
+import { getEpilogue } from './util.js'
 
 export const command = 'setup-inngest'
 
diff --git a/packages/cli/src/commands/experimental/setupInngestHandler.js b/packages/cli/src/commands/experimental/setupInngestHandler.js
index f9f26fc02c61..248087570f0f 100644
--- a/packages/cli/src/commands/experimental/setupInngestHandler.js
+++ b/packages/cli/src/commands/experimental/setupInngestHandler.js
@@ -3,11 +3,11 @@ import { Listr } from 'listr2'
 
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths } from '../../lib'
-import c from '../../lib/colors'
+import c from '../../lib/colors.js'
+import { getPaths } from '../../lib/index.js'
 
-import { command, description, EXPERIMENTAL_TOPIC_ID } from './setupInngest'
-import { printTaskEpilogue } from './util'
+import { command, description, EXPERIMENTAL_TOPIC_ID } from './setupInngest.js'
+import { printTaskEpilogue } from './util.js'
 
 export const handler = async ({ force }) => {
   const tasks = new Listr([
diff --git a/packages/cli/src/commands/experimental/setupOpentelemetry.js b/packages/cli/src/commands/experimental/setupOpentelemetry.js
index 3c32e9457dfb..acce69bde888 100644
--- a/packages/cli/src/commands/experimental/setupOpentelemetry.js
+++ b/packages/cli/src/commands/experimental/setupOpentelemetry.js
@@ -1,6 +1,6 @@
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getEpilogue } from './util'
+import { getEpilogue } from './util.js'
 
 export const command = 'setup-opentelemetry'
 
diff --git a/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js b/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js
index bf95532bfdc0..439bb916c967 100644
--- a/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js
+++ b/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js
@@ -9,16 +9,16 @@ import { addApiPackages } from '@redwoodjs/cli-helpers'
 import { getConfigPath, resolveFile } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFile } from '../../lib'
-import c from '../../lib/colors'
-import { isTypeScriptProject } from '../../lib/project'
+import c from '../../lib/colors.js'
+import { getPaths, transformTSToJS, writeFile } from '../../lib/index.js'
+import { isTypeScriptProject } from '../../lib/project.js'
 
 import {
   command,
   description,
   EXPERIMENTAL_TOPIC_ID,
-} from './setupOpentelemetry'
-import { printTaskEpilogue } from './util'
+} from './setupOpentelemetry.js'
+import { printTaskEpilogue } from './util.js'
 
 export const handler = async ({ force, verbose }) => {
   const ts = isTypeScriptProject()
diff --git a/packages/cli/src/commands/experimental/setupReactCompiler.js b/packages/cli/src/commands/experimental/setupReactCompiler.js
index d7b53d1eb36a..7d942c016c04 100644
--- a/packages/cli/src/commands/experimental/setupReactCompiler.js
+++ b/packages/cli/src/commands/experimental/setupReactCompiler.js
@@ -1,6 +1,6 @@
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getEpilogue } from './util'
+import { getEpilogue } from './util.js'
 
 export const command = 'setup-react-compiler'
 
diff --git a/packages/cli/src/commands/experimental/setupReactCompilerHandler.js b/packages/cli/src/commands/experimental/setupReactCompilerHandler.js
index f117184cda7b..448486e413fe 100644
--- a/packages/cli/src/commands/experimental/setupReactCompilerHandler.js
+++ b/packages/cli/src/commands/experimental/setupReactCompilerHandler.js
@@ -8,15 +8,15 @@ import semver from 'semver'
 import { getConfigPath } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, writeFile } from '../../lib'
-import c from '../../lib/colors'
+import c from '../../lib/colors.js'
+import { getPaths, writeFile } from '../../lib/index.js'
 
 import {
   command,
   description,
   EXPERIMENTAL_TOPIC_ID,
-} from './setupReactCompiler'
-import { printTaskEpilogue } from './util'
+} from './setupReactCompiler.js'
+import { printTaskEpilogue } from './util.js'
 
 export const handler = async ({ force, verbose }) => {
   const rwPaths = getPaths()
diff --git a/packages/cli/src/commands/experimental/setupRsc.js b/packages/cli/src/commands/experimental/setupRsc.js
index 9ad8ca5aca6b..bf393b654f97 100644
--- a/packages/cli/src/commands/experimental/setupRsc.js
+++ b/packages/cli/src/commands/experimental/setupRsc.js
@@ -1,6 +1,6 @@
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getEpilogue } from './util'
+import { getEpilogue } from './util.js'
 
 export const command = 'setup-rsc'
 
diff --git a/packages/cli/src/commands/experimental/setupRscHandler.js b/packages/cli/src/commands/experimental/setupRscHandler.js
index c7d5e59eb479..9564ac86f589 100644
--- a/packages/cli/src/commands/experimental/setupRscHandler.js
+++ b/packages/cli/src/commands/experimental/setupRscHandler.js
@@ -8,12 +8,12 @@ import { prettify } from '@redwoodjs/cli-helpers'
 import { getConfig, getConfigPath } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFile } from '../../lib'
-import c from '../../lib/colors'
-import { isTypeScriptProject } from '../../lib/project'
+import c from '../../lib/colors.js'
+import { getPaths, transformTSToJS, writeFile } from '../../lib/index.js'
+import { isTypeScriptProject } from '../../lib/project.js'
 
-import { command, description, EXPERIMENTAL_TOPIC_ID } from './setupRsc'
-import { printTaskEpilogue } from './util'
+import { command, description, EXPERIMENTAL_TOPIC_ID } from './setupRsc.js'
+import { printTaskEpilogue } from './util.js'
 
 export const handler = async ({ force, verbose }) => {
   const rwPaths = getPaths()
diff --git a/packages/cli/src/commands/experimental/setupStreamingSsr.js b/packages/cli/src/commands/experimental/setupStreamingSsr.js
index 38b8ff203244..de5b85a60962 100644
--- a/packages/cli/src/commands/experimental/setupStreamingSsr.js
+++ b/packages/cli/src/commands/experimental/setupStreamingSsr.js
@@ -1,6 +1,6 @@
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getEpilogue } from './util'
+import { getEpilogue } from './util.js'
 
 export const command = 'setup-streaming-ssr'
 
diff --git a/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js b/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js
index c85bdd7401d2..0566d3cd954d 100644
--- a/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js
+++ b/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js
@@ -8,16 +8,16 @@ import { addWebPackages } from '@redwoodjs/cli-helpers'
 import { getConfigPath } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFile } from '../../lib'
-import c from '../../lib/colors'
-import { isTypeScriptProject } from '../../lib/project'
+import c from '../../lib/colors.js'
+import { getPaths, transformTSToJS, writeFile } from '../../lib/index.js'
+import { isTypeScriptProject } from '../../lib/project.js'
 
 import {
   command,
   description,
   EXPERIMENTAL_TOPIC_ID,
-} from './setupStreamingSsr'
-import { printTaskEpilogue } from './util'
+} from './setupStreamingSsr.js'
+import { printTaskEpilogue } from './util.js'
 
 export const handler = async ({ force, verbose }) => {
   const rwPaths = getPaths()
diff --git a/packages/cli/src/commands/experimental/util.js b/packages/cli/src/commands/experimental/util.js
index b52c72e68528..0f51ffa3907a 100644
--- a/packages/cli/src/commands/experimental/util.js
+++ b/packages/cli/src/commands/experimental/util.js
@@ -4,8 +4,8 @@ import chalk from 'chalk'
 import fs from 'fs-extra'
 import terminalLink from 'terminal-link'
 
-import { getPaths } from '../../lib'
-import { isTypeScriptProject, serverFileExists } from '../../lib/project'
+import { getPaths } from '../../lib/index.js'
+import { isTypeScriptProject, serverFileExists } from '../../lib/project.js'
 
 const link = (topicId, isTerminal = false) => {
   const communityLink = `https://community.redwoodjs.com/t/${topicId}`
diff --git a/packages/cli/src/commands/generate/__tests__/createYargsForComponentGeneration.test.js b/packages/cli/src/commands/generate/__tests__/createYargsForComponentGeneration.test.js
index bf5749ec7d47..d34226d5e408 100644
--- a/packages/cli/src/commands/generate/__tests__/createYargsForComponentGeneration.test.js
+++ b/packages/cli/src/commands/generate/__tests__/createYargsForComponentGeneration.test.js
@@ -6,7 +6,7 @@ vi.mock('listr2')
 import { Listr } from 'listr2'
 import { vi, test, expect } from 'vitest'
 
-import * as helpers from '../helpers'
+import * as helpers from '../helpers.js'
 
 test('createYargsForComponentGeneration generates a yargs handler as expected', async () => {
   const result = helpers.createYargsForComponentGeneration({
diff --git a/packages/cli/src/commands/generate/__tests__/helpers.test.js b/packages/cli/src/commands/generate/__tests__/helpers.test.js
index ef18763c8617..ad45127d724a 100644
--- a/packages/cli/src/commands/generate/__tests__/helpers.test.js
+++ b/packages/cli/src/commands/generate/__tests__/helpers.test.js
@@ -7,8 +7,8 @@ import { vi, test, expect, describe, it } from 'vitest'
 globalThis.__dirname = __dirname
 import '../../../lib/test'
 
-import * as helpers from '../helpers'
-import * as page from '../page/page'
+import * as helpers from '../helpers.js'
+import * as page from '../page/page.js'
 
 test('customOrDefaultTemplatePath returns the default path if no custom templates exist', () => {
   const output = helpers.customOrDefaultTemplatePath({
diff --git a/packages/cli/src/commands/generate/cell/__tests__/cell.test.js b/packages/cli/src/commands/generate/cell/__tests__/cell.test.js
index 0f940d3fd646..d29f71241873 100644
--- a/packages/cli/src/commands/generate/cell/__tests__/cell.test.js
+++ b/packages/cli/src/commands/generate/cell/__tests__/cell.test.js
@@ -5,7 +5,7 @@ import { vi, describe, it, expect, test, beforeAll } from 'vitest'
 
 // Load mocks
 import '../../../../lib/test'
-import * as cell from '../cell'
+import * as cell from '../cell.js'
 
 vi.mock('@redwoodjs/structure', () => {
   return {
diff --git a/packages/cli/src/commands/generate/cell/cell.js b/packages/cli/src/commands/generate/cell/cell.js
index b644fe7c9cc6..98378cd1e074 100644
--- a/packages/cli/src/commands/generate/cell/cell.js
+++ b/packages/cli/src/commands/generate/cell/cell.js
@@ -2,18 +2,18 @@ import pascalcase from 'pascalcase'
 
 import { generate as generateTypes } from '@redwoodjs/internal/dist/generate/generate'
 
-import { nameVariants, transformTSToJS } from '../../../lib'
-import { isWordPluralizable } from '../../../lib/pluralHelpers'
-import { addFunctionToRollback } from '../../../lib/rollback'
-import { isPlural, singularize } from '../../../lib/rwPluralize'
-import { getSchema } from '../../../lib/schemaHelpers'
-import { yargsDefaults } from '../helpers'
+import { nameVariants, transformTSToJS } from '../../../lib/index.js'
+import { isWordPluralizable } from '../../../lib/pluralHelpers.js'
+import { addFunctionToRollback } from '../../../lib/rollback.js'
+import { isPlural, singularize } from '../../../lib/rwPluralize.js'
+import { getSchema } from '../../../lib/schemaHelpers.js'
+import { yargsDefaults } from '../helpers.js'
 import {
   templateForComponentFile,
   createYargsForComponentGeneration,
   forcePluralizeWord,
   removeGeneratorName,
-} from '../helpers'
+} from '../helpers.js'
 
 import {
   checkProjectForQueryField,
@@ -21,7 +21,7 @@ import {
   getIdType,
   operationNameIsUnique,
   uniqueOperationName,
-} from './utils/utils'
+} from './utils/utils.js'
 
 const COMPONENT_SUFFIX = 'Cell'
 const REDWOOD_WEB_PATH_NAME = 'components'
diff --git a/packages/cli/src/commands/generate/component/__tests__/component.test.ts b/packages/cli/src/commands/generate/component/__tests__/component.test.ts
index bda71aca55be..a4a76cbbf87f 100644
--- a/packages/cli/src/commands/generate/component/__tests__/component.test.ts
+++ b/packages/cli/src/commands/generate/component/__tests__/component.test.ts
@@ -7,7 +7,7 @@ import yargs from 'yargs/yargs'
 // Shared mocks for paths, etc.
 import '../../../../lib/test'
 
-import * as component from '../component'
+import * as component from '../component.js'
 
 let singleWordDefaultFiles,
   multiWordDefaultFiles,
diff --git a/packages/cli/src/commands/generate/component/component.js b/packages/cli/src/commands/generate/component/component.js
index 0a62f8d23440..899826cfd4a6 100644
--- a/packages/cli/src/commands/generate/component/component.js
+++ b/packages/cli/src/commands/generate/component/component.js
@@ -1,8 +1,8 @@
-import { transformTSToJS } from '../../../lib'
+import { transformTSToJS } from '../../../lib/index.js'
 import {
   templateForComponentFile,
   createYargsForComponentGeneration,
-} from '../helpers'
+} from '../helpers.js'
 
 const REDWOOD_WEB_PATH_NAME = 'components'
 
diff --git a/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js b/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js
index f01f9fb08fb8..ef8c1498a410 100644
--- a/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js
+++ b/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js
@@ -4,7 +4,7 @@ import '../../../../lib/test'
 
 import { afterEach, test, expect } from 'vitest'
 
-import * as generator from '../dataMigration'
+import * as generator from '../dataMigration.js'
 
 const RealDate = Date
 
diff --git a/packages/cli/src/commands/generate/dataMigration/dataMigration.js b/packages/cli/src/commands/generate/dataMigration/dataMigration.js
index 23c9cd982553..665f5451c504 100644
--- a/packages/cli/src/commands/generate/dataMigration/dataMigration.js
+++ b/packages/cli/src/commands/generate/dataMigration/dataMigration.js
@@ -7,10 +7,10 @@ import terminalLink from 'terminal-link'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getPaths, writeFilesTask } from '../../../lib'
-import c from '../../../lib/colors'
-import { prepareForRollback } from '../../../lib/rollback'
-import { validateName, yargsDefaults } from '../helpers'
+import c from '../../../lib/colors.js'
+import { getPaths, writeFilesTask } from '../../../lib/index.js'
+import { prepareForRollback } from '../../../lib/rollback.js'
+import { validateName, yargsDefaults } from '../helpers.js'
 
 const POST_RUN_INSTRUCTIONS = `Next steps...\n\n   ${c.warning(
   'After writing your migration, you can run it with:',
diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js
index d322f76766bf..7c15d86a51da 100644
--- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js
+++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.mockListr.test.js
@@ -20,9 +20,9 @@ import {
   afterAll,
 } from 'vitest'
 
-import { Listr2Mock } from '../../../../__tests__/Listr2Mock'
-import { getPaths } from '../../../../lib'
-import * as dbAuth from '../dbAuth'
+import { Listr2Mock } from '../../../../__tests__/Listr2Mock.js'
+import { getPaths } from '../../../../lib/index.js'
+import * as dbAuth from '../dbAuth.js'
 
 vi.mock('listr2', () => ({
   Listr: Listr2Mock,
diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.postInstallMessage.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.postInstallMessage.test.js
index 3a4442bb4e48..c069f4f9bc82 100644
--- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.postInstallMessage.test.js
+++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.postInstallMessage.test.js
@@ -11,8 +11,8 @@ const actualFs = await vi.importActual('fs-extra')
 import { vol } from 'memfs'
 import { afterEach, beforeEach, vi, describe, it, expect } from 'vitest'
 
-import { getPaths } from '../../../../lib'
-import * as dbAuth from '../dbAuth'
+import { getPaths } from '../../../../lib/index.js'
+import * as dbAuth from '../dbAuth.js'
 
 vi.mock('listr2', async () => {
   return {
diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js
index 4aa4268c34ee..8e47b031e792 100644
--- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js
+++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js
@@ -22,8 +22,8 @@ import {
   beforeAll,
 } from 'vitest'
 
-import { getPaths } from '../../../../lib'
-import * as dbAuth from '../dbAuth'
+import { getPaths } from '../../../../lib/index.js'
+import * as dbAuth from '../dbAuth.js'
 
 // Mock files needed for each test
 const mockFiles = {}
diff --git a/packages/cli/src/commands/generate/dbAuth/dbAuth.js b/packages/cli/src/commands/generate/dbAuth/dbAuth.js
index 1057e458ec0f..489fb35a8e44 100644
--- a/packages/cli/src/commands/generate/dbAuth/dbAuth.js
+++ b/packages/cli/src/commands/generate/dbAuth/dbAuth.js
@@ -10,6 +10,7 @@ import { titleCase } from 'title-case'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
+import c from '../../../lib/colors.js'
 import {
   addRoutesToRouterTask,
   addScaffoldImport,
@@ -17,11 +18,10 @@ import {
   getPaths,
   transformTSToJS,
   writeFilesTask,
-} from '../../../lib'
-import c from '../../../lib/colors'
-import { prepareForRollback } from '../../../lib/rollback'
-import { yargsDefaults } from '../helpers'
-import { templateForComponentFile } from '../helpers'
+} from '../../../lib/index.js'
+import { prepareForRollback } from '../../../lib/rollback.js'
+import { yargsDefaults } from '../helpers.js'
+import { templateForComponentFile } from '../helpers.js'
 
 const ROUTES = [
   `<Route path="/login" page={LoginPage} name="login" />`,
diff --git a/packages/cli/src/commands/generate/directive/__tests__/directive.test.ts b/packages/cli/src/commands/generate/directive/__tests__/directive.test.ts
index df783a8ac747..063e1542256f 100644
--- a/packages/cli/src/commands/generate/directive/__tests__/directive.test.ts
+++ b/packages/cli/src/commands/generate/directive/__tests__/directive.test.ts
@@ -7,7 +7,7 @@ import path from 'path'
 import { test, expect } from 'vitest'
 import yargs from 'yargs/yargs'
 
-import * as directive from '../directive'
+import * as directive from '../directive.js'
 
 test('creates a JavaScript validator directive', async () => {
   const output = await directive.files({
diff --git a/packages/cli/src/commands/generate/directive/directive.js b/packages/cli/src/commands/generate/directive/directive.js
index e03e9281dc92..8231b054f9a0 100644
--- a/packages/cli/src/commands/generate/directive/directive.js
+++ b/packages/cli/src/commands/generate/directive/directive.js
@@ -8,18 +8,22 @@ import prompts from 'prompts'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { getConfig } from '@redwoodjs/project-config'
 
-import { getPaths, writeFilesTask, transformTSToJS } from '../../../lib'
-import c from '../../../lib/colors'
+import c from '../../../lib/colors.js'
+import {
+  getPaths,
+  writeFilesTask,
+  transformTSToJS,
+} from '../../../lib/index.js'
 import {
   prepareForRollback,
   addFunctionToRollback,
-} from '../../../lib/rollback'
-import { yargsDefaults } from '../helpers'
+} from '../../../lib/rollback.js'
+import { yargsDefaults } from '../helpers.js'
 import {
   createYargsForComponentGeneration,
   templateForComponentFile,
   validateName,
-} from '../helpers'
+} from '../helpers.js'
 
 export const files = async ({ name, typescript = false, type, tests }) => {
   if (tests === undefined) {
diff --git a/packages/cli/src/commands/generate/function/__tests__/function.test.ts b/packages/cli/src/commands/generate/function/__tests__/function.test.ts
index f46f130c6f56..9fcb89b286ea 100644
--- a/packages/cli/src/commands/generate/function/__tests__/function.test.ts
+++ b/packages/cli/src/commands/generate/function/__tests__/function.test.ts
@@ -7,7 +7,7 @@ import path from 'path'
 import { describe, it, expect, test } from 'vitest'
 import yargs from 'yargs/yargs'
 
-import * as functionGenerator from '../function'
+import * as functionGenerator from '../function.js'
 
 // Should be refactored as it's repeated
 type WordFilesType = { [key: string]: string }
diff --git a/packages/cli/src/commands/generate/function/function.js b/packages/cli/src/commands/generate/function/function.js
index 809fe3d4d0a4..450ba8adb21e 100644
--- a/packages/cli/src/commands/generate/function/function.js
+++ b/packages/cli/src/commands/generate/function/function.js
@@ -7,11 +7,15 @@ import terminalLink from 'terminal-link'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFilesTask } from '../../../lib'
-import c from '../../../lib/colors'
-import { prepareForRollback } from '../../../lib/rollback'
-import { yargsDefaults } from '../helpers'
-import { validateName, templateForComponentFile } from '../helpers'
+import c from '../../../lib/colors.js'
+import {
+  getPaths,
+  transformTSToJS,
+  writeFilesTask,
+} from '../../../lib/index.js'
+import { prepareForRollback } from '../../../lib/rollback.js'
+import { yargsDefaults } from '../helpers.js'
+import { validateName, templateForComponentFile } from '../helpers.js'
 
 export const files = async ({
   name,
diff --git a/packages/cli/src/commands/generate/helpers.js b/packages/cli/src/commands/generate/helpers.js
index 7f4a8fdbc572..7e8ce2799ebb 100644
--- a/packages/cli/src/commands/generate/helpers.js
+++ b/packages/cli/src/commands/generate/helpers.js
@@ -13,10 +13,10 @@ import {
 import { getConfig, ensurePosixPath } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { generateTemplate, getPaths, writeFilesTask } from '../../lib'
-import c from '../../lib/colors'
-import { prepareForRollback } from '../../lib/rollback'
-import { pluralize, isPlural, isSingular } from '../../lib/rwPluralize'
+import c from '../../lib/colors.js'
+import { generateTemplate, getPaths, writeFilesTask } from '../../lib/index.js'
+import { prepareForRollback } from '../../lib/rollback.js'
+import { pluralize, isPlural, isSingular } from '../../lib/rwPluralize.js'
 
 /**
  * Returns the full path to a custom generator template, if found in the app.
diff --git a/packages/cli/src/commands/generate/job/__tests__/job.test.ts b/packages/cli/src/commands/generate/job/__tests__/job.test.ts
index 2b618257153a..e75d1d7293c6 100644
--- a/packages/cli/src/commands/generate/job/__tests__/job.test.ts
+++ b/packages/cli/src/commands/generate/job/__tests__/job.test.ts
@@ -7,7 +7,7 @@ import path from 'path'
 import { describe, it, expect } from 'vitest'
 
 // @ts-expect-error - Jobs is a JavaScript file
-import * as jobGenerator from '../job'
+import * as jobGenerator from '../job.js'
 
 describe('Single word default files', async () => {
   const files = await jobGenerator.files({
diff --git a/packages/cli/src/commands/generate/job/job.js b/packages/cli/src/commands/generate/job/job.js
index c9aa50c9e8ac..319f7cc08ef8 100644
--- a/packages/cli/src/commands/generate/job/job.js
+++ b/packages/cli/src/commands/generate/job/job.js
@@ -9,12 +9,16 @@ import terminalLink from 'terminal-link'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFilesTask } from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject } from '../../../lib/project'
-import { prepareForRollback } from '../../../lib/rollback'
-import { yargsDefaults } from '../helpers'
-import { validateName, templateForComponentFile } from '../helpers'
+import c from '../../../lib/colors.js'
+import {
+  getPaths,
+  transformTSToJS,
+  writeFilesTask,
+} from '../../../lib/index.js'
+import { isTypeScriptProject } from '../../../lib/project.js'
+import { prepareForRollback } from '../../../lib/rollback.js'
+import { yargsDefaults } from '../helpers.js'
+import { validateName, templateForComponentFile } from '../helpers.js'
 
 // Try to make the name end up looking like: `WelcomeNotice` even if the user
 // called it `welcome-notice` or `welcomeNoticeJob` or something like that
diff --git a/packages/cli/src/commands/generate/layout/__tests__/layout.test.ts b/packages/cli/src/commands/generate/layout/__tests__/layout.test.ts
index 8e8436c75040..a0bd34db94fa 100644
--- a/packages/cli/src/commands/generate/layout/__tests__/layout.test.ts
+++ b/packages/cli/src/commands/generate/layout/__tests__/layout.test.ts
@@ -6,7 +6,7 @@ import { describe, test, it, expect } from 'vitest'
 // Load shared mocks
 import '../../../../lib/test'
 
-import * as layout from '../layout'
+import * as layout from '../layout.js'
 
 describe('Single Word default files', async () => {
   const singleWordDefaultFiles = await layout.files({
diff --git a/packages/cli/src/commands/generate/layout/layout.js b/packages/cli/src/commands/generate/layout/layout.js
index 8deb4096ac65..7d4135bd72dc 100644
--- a/packages/cli/src/commands/generate/layout/layout.js
+++ b/packages/cli/src/commands/generate/layout/layout.js
@@ -1,10 +1,10 @@
-import { transformTSToJS } from '../../../lib'
-import { yargsDefaults } from '../helpers'
+import { transformTSToJS } from '../../../lib/index.js'
+import { yargsDefaults } from '../helpers.js'
 import {
   templateForComponentFile,
   createYargsForComponentGeneration,
   removeGeneratorName,
-} from '../helpers'
+} from '../helpers.js'
 
 const COMPONENT_SUFFIX = 'Layout'
 const REDWOOD_WEB_PATH_NAME = 'layouts'
diff --git a/packages/cli/src/commands/generate/model/model.js b/packages/cli/src/commands/generate/model/model.js
index 1bde722dfd13..e815829a0070 100644
--- a/packages/cli/src/commands/generate/model/model.js
+++ b/packages/cli/src/commands/generate/model/model.js
@@ -5,11 +5,15 @@ import terminalLink from 'terminal-link'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getPaths, writeFilesTask, generateTemplate } from '../../../lib'
-import c from '../../../lib/colors'
-import { prepareForRollback } from '../../../lib/rollback'
-import { verifyModelName } from '../../../lib/schemaHelpers'
-import { validateName, yargsDefaults } from '../helpers'
+import c from '../../../lib/colors.js'
+import {
+  getPaths,
+  writeFilesTask,
+  generateTemplate,
+} from '../../../lib/index.js'
+import { prepareForRollback } from '../../../lib/rollback.js'
+import { verifyModelName } from '../../../lib/schemaHelpers.js'
+import { validateName, yargsDefaults } from '../helpers.js'
 const TEMPLATE_PATH = path.resolve(__dirname, 'templates', 'model.js.template')
 
 const files = async ({ name, typescript = false }) => {
diff --git a/packages/cli/src/commands/generate/ogImage/__tests__/ogImage.test.jsx b/packages/cli/src/commands/generate/ogImage/__tests__/ogImage.test.jsx
index 947ca37859f7..9675c2b492ba 100644
--- a/packages/cli/src/commands/generate/ogImage/__tests__/ogImage.test.jsx
+++ b/packages/cli/src/commands/generate/ogImage/__tests__/ogImage.test.jsx
@@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, test, expect, vi } from 'vitest'
 
 import { ensurePosixPath } from '@redwoodjs/project-config'
 
-import * as ogImage from '../ogImage'
+import * as ogImage from '../ogImage.js'
 
 vi.mock('fs', () => ({ ...memfs, default: { ...memfs } }))
 vi.mock('node:fs', () => ({ ...memfs, default: { ...memfs } }))
diff --git a/packages/cli/src/commands/generate/ogImage/ogImage.js b/packages/cli/src/commands/generate/ogImage/ogImage.js
index 42e7ea1071ed..b89fb0592597 100644
--- a/packages/cli/src/commands/generate/ogImage/ogImage.js
+++ b/packages/cli/src/commands/generate/ogImage/ogImage.js
@@ -9,12 +9,16 @@ import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { ensurePosixPath } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { transformTSToJS } from '../../../lib'
-import { generateTemplate, getPaths, writeFilesTask } from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject } from '../../../lib/project'
-import { prepareForRollback } from '../../../lib/rollback'
-import { customOrDefaultTemplatePath } from '../helpers'
+import c from '../../../lib/colors.js'
+import {
+  generateTemplate,
+  getPaths,
+  transformTSToJS,
+  writeFilesTask,
+} from '../../../lib/index.js'
+import { isTypeScriptProject } from '../../../lib/project.js'
+import { prepareForRollback } from '../../../lib/rollback.js'
+import { customOrDefaultTemplatePath } from '../helpers.js'
 
 export const files = async ({ pagePath, typescript = false }) => {
   const extension = typescript ? '.tsx' : '.jsx'
diff --git a/packages/cli/src/commands/generate/page/__tests__/page.test.js b/packages/cli/src/commands/generate/page/__tests__/page.test.js
index ed8717ad8cb7..e08702ea0476 100644
--- a/packages/cli/src/commands/generate/page/__tests__/page.test.js
+++ b/packages/cli/src/commands/generate/page/__tests__/page.test.js
@@ -110,9 +110,9 @@ vi.mock('@redwoodjs/internal/dist/generate/generate', () => {
 
 import { ensurePosixPath } from '@redwoodjs/project-config'
 
-import { getPaths } from '../../../../lib'
-import { pathName } from '../../helpers'
-import * as page from '../page'
+import { getPaths } from '../../../../lib/index.js'
+import { pathName } from '../../helpers.js'
+import * as page from '../page.js'
 
 describe('Single world files', async () => {
   const singleWordFiles = await page.files({
diff --git a/packages/cli/src/commands/generate/page/page.js b/packages/cli/src/commands/generate/page/page.js
index d2fb78bb6e76..42f9d0739a29 100644
--- a/packages/cli/src/commands/generate/page/page.js
+++ b/packages/cli/src/commands/generate/page/page.js
@@ -9,16 +9,16 @@ import { generate as generateTypes } from '@redwoodjs/internal/dist/generate/gen
 import { getConfig } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
+import c from '../../../lib/colors.js'
 import {
   addRoutesToRouterTask,
   transformTSToJS,
   writeFilesTask,
-} from '../../../lib'
-import c from '../../../lib/colors'
+} from '../../../lib/index.js'
 import {
   prepareForRollback,
   addFunctionToRollback,
-} from '../../../lib/rollback'
+} from '../../../lib/rollback.js'
 import {
   createYargsForComponentGeneration,
   pathName,
@@ -26,7 +26,7 @@ import {
   mapRouteParamTypeToTsType,
   removeGeneratorName,
   validateName,
-} from '../helpers'
+} from '../helpers.js'
 
 const COMPONENT_SUFFIX = 'Page'
 const REDWOOD_WEB_PATH_NAME = 'pages'
diff --git a/packages/cli/src/commands/generate/realtime/realtimeHandler.js b/packages/cli/src/commands/generate/realtime/realtimeHandler.js
index af01728c71bd..7225add0b42c 100644
--- a/packages/cli/src/commands/generate/realtime/realtimeHandler.js
+++ b/packages/cli/src/commands/generate/realtime/realtimeHandler.js
@@ -10,14 +10,14 @@ import { generate as generateTypes } from '@redwoodjs/internal/dist/generate/gen
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
 // Move this check out of experimental when server file is moved as well
+import c from '../../../lib/colors.js'
 import {
   generateTemplate,
   getPaths,
   transformTSToJS,
   writeFile,
-} from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject } from '../../../lib/project'
+} from '../../../lib/index.js'
+import { isTypeScriptProject } from '../../../lib/project.js'
 import { isRealtimeSetup, isServerFileSetup } from '../../experimental/util.js'
 
 const templateVariables = (name) => {
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/editableColumns.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/editableColumns.test.js
index 830bb42ee1e3..54fb07fcb9ff 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/editableColumns.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/editableColumns.test.js
@@ -7,9 +7,9 @@ import '../../../../lib/test'
 import { vol } from 'memfs'
 import { vi, describe, beforeAll, test, expect } from 'vitest'
 
-import { getDefaultArgs } from '../../../../lib'
-import { yargsDefaults as defaults } from '../../helpers'
-import * as scaffold from '../scaffold'
+import { getDefaultArgs } from '../../../../lib/index.js'
+import { yargsDefaults as defaults } from '../../helpers.js'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
index 29a6f85150c3..dd4a3e238834 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
@@ -8,9 +8,9 @@ import { vi, describe, test, expect, afterAll, beforeAll } from 'vitest'
 // Load mocks
 import '../../../../lib/test'
 
-import { getDefaultArgs } from '../../../../lib'
-import { yargsDefaults as defaults } from '../../helpers'
-import * as scaffold from '../scaffold'
+import { getDefaultArgs } from '../../../../lib/index.js'
+import { yargsDefaults as defaults } from '../../helpers.js'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs-extra', async (importOriginal) => {
   ufs.use(await importOriginal()).use(memfs)
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldCustomIdName.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldCustomIdName.test.js
index 419d722080eb..2ed9d72c99d3 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldCustomIdName.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldCustomIdName.test.js
@@ -7,9 +7,9 @@ import { vi, describe, beforeAll, test, expect } from 'vitest'
 // Load mocks
 import '../../../../lib/test'
 
-import { getDefaultArgs } from '../../../../lib'
-import { yargsDefaults as defaults } from '../../helpers'
-import * as scaffold from '../scaffold'
+import { getDefaultArgs } from '../../../../lib/index.js'
+import { yargsDefaults as defaults } from '../../helpers.js'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js
index abbfb05f6fba..f093ab68738c 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js
@@ -7,9 +7,9 @@ import { vi, describe, beforeAll, test, expect } from 'vitest'
 // Load mocks
 import '../../../../lib/test'
 
-import { getDefaultArgs } from '../../../../lib'
-import { yargsDefaults as defaults } from '../../helpers'
-import * as scaffold from '../scaffold'
+import { getDefaultArgs } from '../../../../lib/index.js'
+import { yargsDefaults as defaults } from '../../helpers.js'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js
index be52063bcaaf..1f417fc2dbe1 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js
@@ -6,7 +6,7 @@ import { vi, describe, beforeAll, test, it, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import * as scaffold from '../scaffold'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js
index 2f65d0a0a645..0bf7f7f1ef61 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js
@@ -6,7 +6,7 @@ import { vi, describe, beforeAll, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import * as scaffold from '../scaffold'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js
index 538995b4aaa2..50aa2690c5f7 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js
@@ -6,7 +6,7 @@ import { vi, describe, beforeAll, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import * as scaffold from '../scaffold'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js
index 0d79faa24e19..e128f7787219 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js
@@ -6,7 +6,7 @@ import { vi, describe, beforeAll, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import * as scaffold from '../scaffold'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js
index fe0d4c7b7c82..0e846309cef6 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js
@@ -6,7 +6,7 @@ import { vi, describe, beforeAll, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import * as scaffold from '../scaffold'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js
index c246c191b291..d69134a49360 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js
@@ -6,7 +6,7 @@ import { vi, describe, beforeAll, test, expect } from 'vitest'
 
 import '../../../../lib/test'
 
-import * as scaffold from '../scaffold'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseEmptyAsUndefined.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseEmptyAsUndefined.test.js
index 542b5971a0ed..71f5bf6c5bef 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseEmptyAsUndefined.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseEmptyAsUndefined.test.js
@@ -7,9 +7,9 @@ import { vi, describe, beforeAll, test, expect } from 'vitest'
 // Load mocks
 import '../../../../lib/test'
 
-import { getDefaultArgs } from '../../../../lib'
-import { yargsDefaults as defaults } from '../../helpers'
-import * as scaffold from '../scaffold'
+import { getDefaultArgs } from '../../../../lib/index.js'
+import { yargsDefaults as defaults } from '../../helpers.js'
+import * as scaffold from '../scaffold.js'
 
 vi.mock('fs', async () => ({ default: (await import('memfs')).fs }))
 vi.mock('execa')
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js
index 9b4dbbabf338..f2d5ec3c9180 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js
@@ -4,7 +4,7 @@ import fs from 'fs-extra'
 import { vi, describe, expect, test, afterEach } from 'vitest'
 
 import '../../../../lib/test'
-import { shouldUseTailwindCSS } from '../scaffold'
+import { shouldUseTailwindCSS } from '../scaffold.js'
 
 vi.mock('fs-extra')
 
diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js
index 11f3fe264d5d..0831dcc104c5 100644
--- a/packages/cli/src/commands/generate/scaffold/scaffold.js
+++ b/packages/cli/src/commands/generate/scaffold/scaffold.js
@@ -13,6 +13,7 @@ import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { generate as generateTypes } from '@redwoodjs/internal/dist/generate/generate'
 import { getConfig } from '@redwoodjs/project-config'
 
+import c from '../../../lib/colors.js'
 import {
   generateTemplate,
   readFile,
@@ -24,26 +25,25 @@ import {
   addScaffoldImport,
   transformTSToJS,
   nameVariants,
-} from '../../../lib'
-import c from '../../../lib/colors'
+} from '../../../lib/index.js'
 import {
   prepareForRollback,
   addFunctionToRollback,
-} from '../../../lib/rollback'
-import { pluralize, singularize } from '../../../lib/rwPluralize'
-import { getSchema, verifyModelName } from '../../../lib/schemaHelpers'
-import { yargsDefaults } from '../helpers'
+} from '../../../lib/rollback.js'
+import { pluralize, singularize } from '../../../lib/rwPluralize.js'
+import { getSchema, verifyModelName } from '../../../lib/schemaHelpers.js'
+import { yargsDefaults } from '../helpers.js'
 import {
   customOrDefaultTemplatePath,
   relationsForModel,
   intForeignKeysForModel,
   mapPrismaScalarToPagePropTsType,
-} from '../helpers'
-import { files as sdlFiles, builder as sdlBuilder } from '../sdl/sdl'
+} from '../helpers.js'
+import { files as sdlFiles, builder as sdlBuilder } from '../sdl/sdl.js'
 import {
   files as serviceFiles,
   builder as serviceBuilder,
-} from '../service/service'
+} from '../service/service.js'
 
 // Any assets that should not trigger an overwrite error and require a --force
 const SKIPPABLE_ASSETS = ['scaffold.css']
diff --git a/packages/cli/src/commands/generate/script/script.js b/packages/cli/src/commands/generate/script/script.js
index f69dc9a52060..e799421b4c47 100644
--- a/packages/cli/src/commands/generate/script/script.js
+++ b/packages/cli/src/commands/generate/script/script.js
@@ -7,10 +7,14 @@ import terminalLink from 'terminal-link'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, writeFilesTask, transformTSToJS } from '../../../lib'
-import c from '../../../lib/colors'
-import { prepareForRollback } from '../../../lib/rollback'
-import { validateName, yargsDefaults } from '../helpers'
+import c from '../../../lib/colors.js'
+import {
+  getPaths,
+  writeFilesTask,
+  transformTSToJS,
+} from '../../../lib/index.js'
+import { prepareForRollback } from '../../../lib/rollback.js'
+import { validateName, yargsDefaults } from '../helpers.js'
 
 const TEMPLATE_PATH = path.resolve(__dirname, 'templates', 'script.ts.template')
 const TSCONFIG_TEMPLATE = path.resolve(
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
index cb22722f7926..5dbe44565a34 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
@@ -52,8 +52,8 @@ import '../../../../lib/test'
 
 import { ensurePosixPath } from '@redwoodjs/project-config'
 
-import { getDefaultArgs } from '../../../../lib'
-import * as sdl from '../sdl'
+import { getDefaultArgs } from '../../../../lib/index.js'
+import * as sdl from '../sdl.js'
 
 afterEach(() => {
   vi.clearAllMocks()
diff --git a/packages/cli/src/commands/generate/sdl/sdl.js b/packages/cli/src/commands/generate/sdl/sdl.js
index 4d5ded2967d9..ae632b966b4b 100644
--- a/packages/cli/src/commands/generate/sdl/sdl.js
+++ b/packages/cli/src/commands/generate/sdl/sdl.js
@@ -11,22 +11,26 @@ import { generate as generateTypes } from '@redwoodjs/internal/dist/generate/gen
 import { getConfig } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
+import c from '../../../lib/colors.js'
 import {
   generateTemplate,
   transformTSToJS,
   getPaths,
   writeFilesTask,
-} from '../../../lib'
-import c from '../../../lib/colors'
+} from '../../../lib/index.js'
 import {
   prepareForRollback,
   addFunctionToRollback,
-} from '../../../lib/rollback'
-import { pluralize } from '../../../lib/rwPluralize'
-import { getSchema, getEnum, verifyModelName } from '../../../lib/schemaHelpers'
-import { yargsDefaults } from '../helpers'
-import { customOrDefaultTemplatePath, relationsForModel } from '../helpers'
-import { files as serviceFiles } from '../service/service'
+} from '../../../lib/rollback.js'
+import { pluralize } from '../../../lib/rwPluralize.js'
+import {
+  getSchema,
+  getEnum,
+  verifyModelName,
+} from '../../../lib/schemaHelpers.js'
+import { yargsDefaults } from '../helpers.js'
+import { customOrDefaultTemplatePath, relationsForModel } from '../helpers.js'
+import { files as serviceFiles } from '../service/service.js'
 
 const DEFAULT_IGNORE_FIELDS_FOR_INPUT = ['createdAt', 'updatedAt']
 
diff --git a/packages/cli/src/commands/generate/service/__tests__/scenario.test.js b/packages/cli/src/commands/generate/service/__tests__/scenario.test.js
index 1507a5057ebb..f688df8e5f4e 100644
--- a/packages/cli/src/commands/generate/service/__tests__/scenario.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/scenario.test.js
@@ -4,7 +4,7 @@ import '../../../../lib/test'
 
 import { describe, test, expect } from 'vitest'
 
-import * as service from '../service'
+import * as service from '../service.js'
 
 describe('the scenario generator', () => {
   test('parseSchema returns an object with required scalar fields', async () => {
diff --git a/packages/cli/src/commands/generate/service/__tests__/service.test.js b/packages/cli/src/commands/generate/service/__tests__/service.test.js
index 1ef03fe1e515..8c5c96c6e671 100644
--- a/packages/cli/src/commands/generate/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/service.test.js
@@ -7,8 +7,8 @@ import yargs from 'yargs/yargs'
 // Load mocks
 import '../../../../lib/test'
 
-import { getDefaultArgs } from '../../../../lib'
-import * as service from '../service'
+import { getDefaultArgs } from '../../../../lib/index.js'
+import * as service from '../service.js'
 
 beforeAll(() => {
   vi.useFakeTimers()
diff --git a/packages/cli/src/commands/generate/service/service.js b/packages/cli/src/commands/generate/service/service.js
index e98f849b9420..422fcd11c633 100644
--- a/packages/cli/src/commands/generate/service/service.js
+++ b/packages/cli/src/commands/generate/service/service.js
@@ -1,14 +1,14 @@
 import camelcase from 'camelcase'
 import terminalLink from 'terminal-link'
 
-import { transformTSToJS } from '../../../lib'
-import { pluralize, singularize } from '../../../lib/rwPluralize'
-import { getSchema, verifyModelName } from '../../../lib/schemaHelpers'
-import { yargsDefaults, relationsForModel } from '../helpers'
+import { transformTSToJS } from '../../../lib/index.js'
+import { pluralize, singularize } from '../../../lib/rwPluralize.js'
+import { getSchema, verifyModelName } from '../../../lib/schemaHelpers.js'
+import { yargsDefaults, relationsForModel } from '../helpers.js'
 import {
   createYargsForComponentGeneration,
   templateForComponentFile,
-} from '../helpers'
+} from '../helpers.js'
 
 const DEFAULT_SCENARIO_NAMES = ['one', 'two']
 
diff --git a/packages/cli/src/commands/jobsHandler.js b/packages/cli/src/commands/jobsHandler.js
index 1d92f6de1e7a..766d045044cf 100644
--- a/packages/cli/src/commands/jobsHandler.js
+++ b/packages/cli/src/commands/jobsHandler.js
@@ -1,6 +1,6 @@
 import execa from 'execa'
 
-import { getPaths } from '../lib/index'
+import { getPaths } from '../lib/index.js'
 
 export const handler = async ({
   _,
diff --git a/packages/cli/src/commands/lint.js b/packages/cli/src/commands/lint.js
index 5c605b3f4c71..eb21e942fe6b 100644
--- a/packages/cli/src/commands/lint.js
+++ b/packages/cli/src/commands/lint.js
@@ -4,7 +4,7 @@ import terminalLink from 'terminal-link'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getPaths } from '../lib'
+import { getPaths } from '../lib/index.js'
 
 export const command = 'lint [path..]'
 export const description = 'Lint your files'
diff --git a/packages/cli/src/commands/prerenderHandler.js b/packages/cli/src/commands/prerenderHandler.js
index bc83420c940c..6b6a832c9596 100644
--- a/packages/cli/src/commands/prerenderHandler.js
+++ b/packages/cli/src/commands/prerenderHandler.js
@@ -9,8 +9,8 @@ import { detectPrerenderRoutes } from '@redwoodjs/prerender/detection'
 import { getConfig, getPaths } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import c from '../lib/colors'
-import { configureBabel, runScriptFunction } from '../lib/exec'
+import c from '../lib/colors.js'
+import { configureBabel, runScriptFunction } from '../lib/exec.js'
 
 class PathParamError extends Error {}
 
diff --git a/packages/cli/src/commands/prismaHandler.js b/packages/cli/src/commands/prismaHandler.js
index 038749a43f90..c66b819a2f48 100644
--- a/packages/cli/src/commands/prismaHandler.js
+++ b/packages/cli/src/commands/prismaHandler.js
@@ -7,8 +7,8 @@ import fs from 'fs-extra'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import c from '../lib/colors'
-import { getPaths } from '../lib/index'
+import c from '../lib/colors.js'
+import { getPaths } from '../lib/index.js'
 
 // eslint-disable-next-line no-unused-vars
 export const handler = async ({ _, $0, commands = [], ...options }) => {
diff --git a/packages/cli/src/commands/serve.js b/packages/cli/src/commands/serve.js
index 629093ab5287..a50e7f2241b7 100644
--- a/packages/cli/src/commands/serve.js
+++ b/packages/cli/src/commands/serve.js
@@ -8,11 +8,11 @@ import * as bothServerCLIConfig from '@redwoodjs/api-server/dist/bothCLIConfig'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import * as webServerCLIConfig from '@redwoodjs/web-server'
 
-import { getPaths, getConfig } from '../lib'
-import c from '../lib/colors'
+import c from '../lib/colors.js'
+import { getPaths, getConfig } from '../lib/index.js'
 import { serverFileExists } from '../lib/project.js'
 
-import { webSsrServerHandler } from './serveWebHandler'
+import { webSsrServerHandler } from './serveWebHandler.js'
 
 export const command = 'serve [side]'
 export const description =
diff --git a/packages/cli/src/commands/serveBothHandler.js b/packages/cli/src/commands/serveBothHandler.js
index a0a2ec8acd49..2072a520b0d6 100644
--- a/packages/cli/src/commands/serveBothHandler.js
+++ b/packages/cli/src/commands/serveBothHandler.js
@@ -13,7 +13,7 @@ import {
 import { getConfig, getPaths } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { exitWithError } from '../lib/exit'
+import { exitWithError } from '../lib/exit.js'
 
 export const bothServerFileHandler = async (argv) => {
   if (
diff --git a/packages/cli/src/commands/setup.js b/packages/cli/src/commands/setup.js
index 22c1f16e0fca..6c3cdeeb3906 100644
--- a/packages/cli/src/commands/setup.js
+++ b/packages/cli/src/commands/setup.js
@@ -1,6 +1,6 @@
 import terminalLink from 'terminal-link'
 
-import detectRwVersion from '../middleware/detectProjectRwVersion'
+import detectRwVersion from '../middleware/detectProjectRwVersion.js'
 
 export const command = 'setup <command>'
 export const description = 'Initialize project config and install packages'
diff --git a/packages/cli/src/commands/setup/__tests__/jobsHandler.test.ts b/packages/cli/src/commands/setup/__tests__/jobsHandler.test.ts
index 8cc0f4bea84d..4bc3a9335fbc 100644
--- a/packages/cli/src/commands/setup/__tests__/jobsHandler.test.ts
+++ b/packages/cli/src/commands/setup/__tests__/jobsHandler.test.ts
@@ -15,7 +15,7 @@ import {
 
 import type * as ProjectConfig from '@redwoodjs/project-config'
 
-import { Listr2Mock } from '../../../__tests__/Listr2Mock'
+import { Listr2Mock } from '../../../__tests__/Listr2Mock.js'
 // @ts-expect-error - This is a JS file
 import * as jobsHandler from '../jobs/jobsHandler.js'
 
diff --git a/packages/cli/src/commands/setup/auth/auth.js b/packages/cli/src/commands/setup/auth/auth.js
index 78540ea45191..97d63e2926fb 100644
--- a/packages/cli/src/commands/setup/auth/auth.js
+++ b/packages/cli/src/commands/setup/auth/auth.js
@@ -9,7 +9,7 @@ import {
   standardAuthBuilder,
 } from '@redwoodjs/cli-helpers'
 
-import { getPaths } from '../../../lib/'
+import { getPaths } from '../../../lib/index.js'
 
 export const command = 'auth <provider>'
 
diff --git a/packages/cli/src/commands/setup/cache/cacheHandler.js b/packages/cli/src/commands/setup/cache/cacheHandler.js
index aa3d9c09ee61..6e8c683b2b4c 100644
--- a/packages/cli/src/commands/setup/cache/cacheHandler.js
+++ b/packages/cli/src/commands/setup/cache/cacheHandler.js
@@ -6,9 +6,9 @@ import { Listr } from 'listr2'
 import { addEnvVarTask } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { addPackagesTask, getPaths, writeFile } from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject } from '../../../lib/project'
+import c from '../../../lib/colors.js'
+import { addPackagesTask, getPaths, writeFile } from '../../../lib/index.js'
+import { isTypeScriptProject } from '../../../lib/project.js'
 
 const CLIENT_PACKAGE_MAP = {
   memcached: 'memjs',
diff --git a/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js b/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js
index 3627e19b5794..4eb2504ef3a2 100644
--- a/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js
+++ b/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js
@@ -7,8 +7,8 @@ import { vol } from 'memfs'
 import { vi, describe, it, expect, beforeEach } from 'vitest'
 
 import '../../../../lib/test'
-import { getPaths } from '../../../../lib'
-import { updateApiURLTask } from '../helpers'
+import { getPaths } from '../../../../lib/index.js'
+import { updateApiURLTask } from '../helpers.js'
 // Mock telemetry and other things
 
 vi.mock('../../../../lib', async (importOriginal) => {
diff --git a/packages/cli/src/commands/setup/deploy/helpers/index.js b/packages/cli/src/commands/setup/deploy/helpers/index.js
index e2268602f6d2..f62c9671f54b 100644
--- a/packages/cli/src/commands/setup/deploy/helpers/index.js
+++ b/packages/cli/src/commands/setup/deploy/helpers/index.js
@@ -4,7 +4,7 @@ import execa from 'execa'
 import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
-import { getPaths, writeFilesTask } from '../../../../lib'
+import { getPaths, writeFilesTask } from '../../../../lib/index.js'
 
 const REDWOOD_TOML_PATH = path.join(getPaths().base, 'redwood.toml')
 
diff --git a/packages/cli/src/commands/setup/deploy/providers/baremetal.js b/packages/cli/src/commands/setup/deploy/providers/baremetal.js
index 2ec5ab6b9034..d0fc2c22b8b8 100644
--- a/packages/cli/src/commands/setup/deploy/providers/baremetal.js
+++ b/packages/cli/src/commands/setup/deploy/providers/baremetal.js
@@ -6,10 +6,14 @@ import { Listr } from 'listr2'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { addPackagesTask, getPaths, printSetupNotes } from '../../../../lib'
-import c from '../../../../lib/colors'
-import { addFilesTask } from '../helpers'
-import { DEPLOY, ECOSYSTEM, MAINTENANCE } from '../templates/baremetal'
+import c from '../../../../lib/colors.js'
+import {
+  addPackagesTask,
+  getPaths,
+  printSetupNotes,
+} from '../../../../lib/index.js'
+import { addFilesTask } from '../helpers.js'
+import { DEPLOY, ECOSYSTEM, MAINTENANCE } from '../templates/baremetal.js'
 
 export const command = 'baremetal'
 export const description = 'Setup Baremetal deploy'
diff --git a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js
index cc2c6c7ec033..cfbff7ce56bf 100644
--- a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js
+++ b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js
@@ -12,9 +12,9 @@ import {
 } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { printSetupNotes } from '../../../../lib'
-import { serverFileExists } from '../../../../lib/project'
-import { addFilesTask } from '../helpers'
+import { printSetupNotes } from '../../../../lib/index.js'
+import { serverFileExists } from '../../../../lib/project.js'
+import { addFilesTask } from '../helpers.js'
 
 const redwoodProjectPaths = getPaths()
 
diff --git a/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js b/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js
index a8038725031a..9237e9afb33a 100644
--- a/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js
+++ b/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js
@@ -9,15 +9,19 @@ import { Listr } from 'listr2'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, writeFilesTask, printSetupNotes } from '../../../../lib'
-import c from '../../../../lib/colors'
-import { updateApiURLTask } from '../helpers'
+import c from '../../../../lib/colors.js'
+import {
+  getPaths,
+  writeFilesTask,
+  printSetupNotes,
+} from '../../../../lib/index.js'
+import { updateApiURLTask } from '../helpers.js'
 import {
   flightcontrolConfig,
   databaseEnvVariables,
   postgresDatabaseService,
   mysqlDatabaseService,
-} from '../templates/flightcontrol'
+} from '../templates/flightcontrol.js'
 
 export const command = 'flightcontrol'
 export const alias = 'fc'
diff --git a/packages/cli/src/commands/setup/deploy/providers/netlify.js b/packages/cli/src/commands/setup/deploy/providers/netlify.js
index bce82c1853c8..15d3ceb72452 100644
--- a/packages/cli/src/commands/setup/deploy/providers/netlify.js
+++ b/packages/cli/src/commands/setup/deploy/providers/netlify.js
@@ -6,10 +6,10 @@ import { Listr } from 'listr2'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, printSetupNotes } from '../../../../lib'
-import c from '../../../../lib/colors'
-import { addFilesTask, updateApiURLTask } from '../helpers'
-import { NETLIFY_TOML } from '../templates/netlify'
+import c from '../../../../lib/colors.js'
+import { getPaths, printSetupNotes } from '../../../../lib/index.js'
+import { addFilesTask, updateApiURLTask } from '../helpers.js'
+import { NETLIFY_TOML } from '../templates/netlify.js'
 
 export const command = 'netlify'
 export const description = 'Setup Netlify deploy'
diff --git a/packages/cli/src/commands/setup/deploy/providers/render.js b/packages/cli/src/commands/setup/deploy/providers/render.js
index 3b6dbccd3277..707096da7d1c 100644
--- a/packages/cli/src/commands/setup/deploy/providers/render.js
+++ b/packages/cli/src/commands/setup/deploy/providers/render.js
@@ -8,15 +8,19 @@ import { Listr } from 'listr2'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, writeFilesTask, printSetupNotes } from '../../../../lib'
-import c from '../../../../lib/colors'
-import { addFilesTask, updateApiURLTask } from '../helpers'
+import c from '../../../../lib/colors.js'
+import {
+  getPaths,
+  writeFilesTask,
+  printSetupNotes,
+} from '../../../../lib/index.js'
+import { addFilesTask, updateApiURLTask } from '../helpers.js'
 import {
   POSTGRES_YAML,
   RENDER_HEALTH_CHECK,
   RENDER_YAML,
   SQLITE_YAML,
-} from '../templates/render'
+} from '../templates/render.js'
 
 export const command = 'render'
 export const description = 'Setup Render deploy'
diff --git a/packages/cli/src/commands/setup/deploy/providers/serverless.js b/packages/cli/src/commands/setup/deploy/providers/serverless.js
index 351f0e1f0945..15c0e99358a2 100644
--- a/packages/cli/src/commands/setup/deploy/providers/serverless.js
+++ b/packages/cli/src/commands/setup/deploy/providers/serverless.js
@@ -7,11 +7,19 @@ import { Listr } from 'listr2'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { addPackagesTask, getPaths, printSetupNotes } from '../../../../lib'
-import c from '../../../../lib/colors'
-import { addToGitIgnoreTask, addToDotEnvTask, addFilesTask } from '../helpers'
-import { SERVERLESS_API_YML } from '../templates/serverless/api'
-import { SERVERLESS_WEB_YML } from '../templates/serverless/web'
+import c from '../../../../lib/colors.js'
+import {
+  addPackagesTask,
+  getPaths,
+  printSetupNotes,
+} from '../../../../lib/index.js'
+import {
+  addToGitIgnoreTask,
+  addToDotEnvTask,
+  addFilesTask,
+} from '../helpers.js'
+import { SERVERLESS_API_YML } from '../templates/serverless/api.js'
+import { SERVERLESS_WEB_YML } from '../templates/serverless/web.js'
 
 export const command = 'serverless'
 export const description =
diff --git a/packages/cli/src/commands/setup/deploy/providers/vercel.js b/packages/cli/src/commands/setup/deploy/providers/vercel.js
index 7bf92dc1c271..1f982c4dd2aa 100644
--- a/packages/cli/src/commands/setup/deploy/providers/vercel.js
+++ b/packages/cli/src/commands/setup/deploy/providers/vercel.js
@@ -5,9 +5,9 @@ import { Listr } from 'listr2'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, printSetupNotes, writeFile } from '../../../../lib'
-import c from '../../../../lib/colors'
-import { updateApiURLTask } from '../helpers'
+import c from '../../../../lib/colors.js'
+import { getPaths, printSetupNotes, writeFile } from '../../../../lib/index.js'
+import { updateApiURLTask } from '../helpers.js'
 
 export const command = 'vercel'
 export const description = 'Setup Vercel deploy'
diff --git a/packages/cli/src/commands/setup/deploy/templates/netlify.js b/packages/cli/src/commands/setup/deploy/templates/netlify.js
index 52f1f297fc2c..493ee73fea2a 100644
--- a/packages/cli/src/commands/setup/deploy/templates/netlify.js
+++ b/packages/cli/src/commands/setup/deploy/templates/netlify.js
@@ -1,4 +1,4 @@
-import { getConfig } from '../../../../lib'
+import { getConfig } from '../../../../lib/index.js'
 
 const config = getConfig()
 
diff --git a/packages/cli/src/commands/setup/deploy/templates/render.js b/packages/cli/src/commands/setup/deploy/templates/render.js
index cee0297ebc81..d0f123c274c6 100644
--- a/packages/cli/src/commands/setup/deploy/templates/render.js
+++ b/packages/cli/src/commands/setup/deploy/templates/render.js
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import { getPaths } from '../../../../lib'
+import { getPaths } from '../../../../lib/index.js'
 
 export const PROJECT_NAME = path.basename(getPaths().base)
 
diff --git a/packages/cli/src/commands/setup/deploy/templates/serverless/api.js b/packages/cli/src/commands/setup/deploy/templates/serverless/api.js
index 2772c29beee1..4cef3f1b50c3 100644
--- a/packages/cli/src/commands/setup/deploy/templates/serverless/api.js
+++ b/packages/cli/src/commands/setup/deploy/templates/serverless/api.js
@@ -2,7 +2,7 @@ import path from 'path'
 
 import fs from 'fs-extra'
 
-import { getPaths } from '../../../../../lib'
+import { getPaths } from '../../../../../lib/index.js'
 
 export const PROJECT_NAME = path.basename(getPaths().base)
 
diff --git a/packages/cli/src/commands/setup/deploy/templates/serverless/web.js b/packages/cli/src/commands/setup/deploy/templates/serverless/web.js
index 80972e08474a..3f031693f6e6 100644
--- a/packages/cli/src/commands/setup/deploy/templates/serverless/web.js
+++ b/packages/cli/src/commands/setup/deploy/templates/serverless/web.js
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import { getPaths } from '../../../../../lib'
+import { getPaths } from '../../../../../lib/index.js'
 
 export const PROJECT_NAME = path.basename(getPaths().base)
 
diff --git a/packages/cli/src/commands/setup/docker/__tests__/setupDocker.test.js b/packages/cli/src/commands/setup/docker/__tests__/setupDocker.test.js
index efd723756620..14104fe4a615 100644
--- a/packages/cli/src/commands/setup/docker/__tests__/setupDocker.test.js
+++ b/packages/cli/src/commands/setup/docker/__tests__/setupDocker.test.js
@@ -2,7 +2,7 @@ import { vi, test, describe, expect } from 'vitest'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { command, description, builder, handler } from '../docker'
+import { command, description, builder, handler } from '../docker.js'
 
 vi.mock('../dockerHandler.js')
 
diff --git a/packages/cli/src/commands/setup/docker/dockerHandler.js b/packages/cli/src/commands/setup/docker/dockerHandler.js
index 96bfedf2e0ff..9781f85564e4 100644
--- a/packages/cli/src/commands/setup/docker/dockerHandler.js
+++ b/packages/cli/src/commands/setup/docker/dockerHandler.js
@@ -8,7 +8,7 @@ import { writeFile } from '@redwoodjs/cli-helpers'
 import { getConfig, getConfigPath, getPaths } from '@redwoodjs/project-config'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import c from '../../../lib/colors'
+import c from '../../../lib/colors.js'
 
 export async function handler({ force }) {
   const TEMPLATE_DIR = path.join(__dirname, 'templates')
diff --git a/packages/cli/src/commands/setup/generator/generatorHandler.js b/packages/cli/src/commands/setup/generator/generatorHandler.js
index 2accad34b9da..17537694331c 100644
--- a/packages/cli/src/commands/setup/generator/generatorHandler.js
+++ b/packages/cli/src/commands/setup/generator/generatorHandler.js
@@ -3,8 +3,8 @@ import path from 'path'
 import fse from 'fs-extra'
 import { Listr } from 'listr2'
 
-import { getPaths } from '../../../lib'
-import c from '../../../lib/colors'
+import c from '../../../lib/colors.js'
+import { getPaths } from '../../../lib/index.js'
 
 const SIDE_MAP = {
   web: ['cell', 'component', 'layout', 'page', 'scaffold'],
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropInline/input/App.tsx b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropInline/input/App.tsx
index d8555cf11797..9873e7bc71f0 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropInline/input/App.tsx
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropInline/input/App.tsx
@@ -6,7 +6,7 @@ import possibleTypes from 'src/graphql/possibleTypes'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import Routes from 'src/Routes'
 
-import { AuthProvider, useAuth } from './auth'
+import { AuthProvider, useAuth } from './auth.js'
 
 import './scaffold.css'
 import './index.css'
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropInline/output/App.tsx b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropInline/output/App.tsx
index 7f4f8110a38b..5596169c3c81 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropInline/output/App.tsx
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropInline/output/App.tsx
@@ -6,7 +6,7 @@ import possibleTypes from 'src/graphql/possibleTypes'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import Routes from 'src/Routes'
 
-import { AuthProvider, useAuth } from './auth'
+import { AuthProvider, useAuth } from './auth.js'
 
 import './scaffold.css'
 import './index.css'
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariable/input/App.tsx b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariable/input/App.tsx
index 98a008ac1ee6..f7a74d7ae766 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariable/input/App.tsx
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariable/input/App.tsx
@@ -6,7 +6,7 @@ import possibleTypes from 'src/graphql/possibleTypes'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import Routes from 'src/Routes'
 
-import { AuthProvider, useAuth } from './auth'
+import { AuthProvider, useAuth } from './auth.js'
 
 import './scaffold.css'
 import './index.css'
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariable/output/App.tsx b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariable/output/App.tsx
index 7f4f8110a38b..5596169c3c81 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariable/output/App.tsx
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariable/output/App.tsx
@@ -6,7 +6,7 @@ import possibleTypes from 'src/graphql/possibleTypes'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import Routes from 'src/Routes'
 
-import { AuthProvider, useAuth } from './auth'
+import { AuthProvider, useAuth } from './auth.js'
 
 import './scaffold.css'
 import './index.css'
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableCustomName/input/App.tsx b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableCustomName/input/App.tsx
index 10f479bfe1d2..da80cebf300d 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableCustomName/input/App.tsx
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableCustomName/input/App.tsx
@@ -6,7 +6,7 @@ import possibleTypes from 'src/graphql/possibleTypes'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import Routes from 'src/Routes'
 
-import { AuthProvider, useAuth } from './auth'
+import { AuthProvider, useAuth } from './auth.js'
 
 import './scaffold.css'
 import './index.css'
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableCustomName/output/App.tsx b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableCustomName/output/App.tsx
index 7be341895a09..bb88c9b6a644 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableCustomName/output/App.tsx
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableCustomName/output/App.tsx
@@ -6,7 +6,7 @@ import possibleTypes from 'src/graphql/possibleTypes'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import Routes from 'src/Routes'
 
-import { AuthProvider, useAuth } from './auth'
+import { AuthProvider, useAuth } from './auth.js'
 
 import './scaffold.css'
 import './index.css'
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableNoCacheConfig/input/App.tsx b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableNoCacheConfig/input/App.tsx
index df01f546ba6d..1478ff3b6bee 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableNoCacheConfig/input/App.tsx
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableNoCacheConfig/input/App.tsx
@@ -6,7 +6,7 @@ import possibleTypes from 'src/graphql/possibleTypes'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import Routes from 'src/Routes'
 
-import { AuthProvider, useAuth } from './auth'
+import { AuthProvider, useAuth } from './auth.js'
 
 import './scaffold.css'
 import './index.css'
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableNoCacheConfig/output/App.tsx b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableNoCacheConfig/output/App.tsx
index e80646b99fea..8536a0683017 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableNoCacheConfig/output/App.tsx
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/__testfixtures__/existingPropVariableNoCacheConfig/output/App.tsx
@@ -6,7 +6,7 @@ import possibleTypes from 'src/graphql/possibleTypes'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import Routes from 'src/Routes'
 
-import { AuthProvider, useAuth } from './auth'
+import { AuthProvider, useAuth } from './auth.js'
 
 import './scaffold.css'
 import './index.css'
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/__tests__/fragmentsHandler.test.ts b/packages/cli/src/commands/setup/graphql/features/fragments/__tests__/fragmentsHandler.test.ts
index 081ab1c00312..617f509684ce 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/__tests__/fragmentsHandler.test.ts
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/__tests__/fragmentsHandler.test.ts
@@ -13,8 +13,8 @@ vi.mock('../../../../../../lib/runTransform', () => {
 import { vol, fs as memfsFs } from 'memfs'
 import { vi, beforeAll, afterAll, test, expect } from 'vitest'
 
-import { Listr2Mock } from '../../../../../../__tests__/Listr2Mock'
-import { handler } from '../fragmentsHandler'
+import { Listr2Mock } from '../../../../../../__tests__/Listr2Mock.js'
+import { handler } from '../fragmentsHandler.js'
 
 vi.mock('listr2', () => ({
   Listr: Listr2Mock,
diff --git a/packages/cli/src/commands/setup/graphql/features/fragments/fragmentsHandler.ts b/packages/cli/src/commands/setup/graphql/features/fragments/fragmentsHandler.ts
index 061f8b8b546e..59eff5063f30 100644
--- a/packages/cli/src/commands/setup/graphql/features/fragments/fragmentsHandler.ts
+++ b/packages/cli/src/commands/setup/graphql/features/fragments/fragmentsHandler.ts
@@ -12,9 +12,9 @@ import {
 } from '@redwoodjs/cli-helpers'
 import { getConfig, getPaths } from '@redwoodjs/project-config'
 
-import { runTransform } from '../../../../../lib/runTransform'
+import { runTransform } from '../../../../../lib/runTransform.js'
 
-import type { Args } from './fragments'
+import type { Args } from './fragments.js'
 
 export const command = 'fragments'
 export const description = 'Set up Fragments for GraphQL'
diff --git a/packages/cli/src/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.ts b/packages/cli/src/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.ts
index 8049052dfa64..04d0368ce9df 100644
--- a/packages/cli/src/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.ts
+++ b/packages/cli/src/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.ts
@@ -8,7 +8,7 @@ import { format } from 'prettier'
 import { getPrettierOptions, setTomlSetting } from '@redwoodjs/cli-helpers'
 import { getConfig, getPaths, resolveFile } from '@redwoodjs/project-config'
 
-import { runTransform } from '../../../../../lib/runTransform'
+import { runTransform } from '../../../../../lib/runTransform.js'
 
 export async function handler({ force }: { force: boolean }) {
   const tasks = new Listr(
diff --git a/packages/cli/src/commands/setup/graphql/graphql.ts b/packages/cli/src/commands/setup/graphql/graphql.ts
index ec17578b4d0e..710847aeada9 100644
--- a/packages/cli/src/commands/setup/graphql/graphql.ts
+++ b/packages/cli/src/commands/setup/graphql/graphql.ts
@@ -1,8 +1,8 @@
 import terminalLink from 'terminal-link'
 import type { Argv } from 'yargs'
 
-import * as fragmentsCommand from './features/fragments/fragments'
-import * as trustedDocumentsCommand from './features/trustedDocuments/trustedDocuments'
+import * as fragmentsCommand from './features/fragments/fragments.js'
+import * as trustedDocumentsCommand from './features/trustedDocuments/trustedDocuments.js'
 
 export const command = 'graphql <feature>'
 export const description = 'Set up GraphQL feature support'
diff --git a/packages/cli/src/commands/setup/i18n/i18nHandler.js b/packages/cli/src/commands/setup/i18n/i18nHandler.js
index 7b1214edf18c..a320ded5e6ba 100644
--- a/packages/cli/src/commands/setup/i18n/i18nHandler.js
+++ b/packages/cli/src/commands/setup/i18n/i18nHandler.js
@@ -6,10 +6,10 @@ import { Listr } from 'listr2'
 
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, writeFile } from '../../../lib'
-import c from '../../../lib/colors'
+import c from '../../../lib/colors.js'
 import extendStorybookConfiguration from '../../../lib/configureStorybook.js'
-import { fileIncludes } from '../../../lib/extendFile'
+import { fileIncludes } from '../../../lib/extendFile.js'
+import { getPaths, writeFile } from '../../../lib/index.js'
 
 const APP_JS_PATH = getPaths().web.app
 
diff --git a/packages/cli/src/commands/setup/jobs/jobsHandler.js b/packages/cli/src/commands/setup/jobs/jobsHandler.js
index d8acad3c899b..c90f4e630ea8 100644
--- a/packages/cli/src/commands/setup/jobs/jobsHandler.js
+++ b/packages/cli/src/commands/setup/jobs/jobsHandler.js
@@ -6,9 +6,9 @@ import { Listr } from 'listr2'
 
 import { addApiPackages } from '@redwoodjs/cli-helpers'
 
-import { getPaths, transformTSToJS, writeFile } from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject } from '../../../lib/project'
+import c from '../../../lib/colors.js'
+import { getPaths, transformTSToJS, writeFile } from '../../../lib/index.js'
+import { isTypeScriptProject } from '../../../lib/project.js'
 
 const MODEL_SCHEMA = `
 model BackgroundJob {
diff --git a/packages/cli/src/commands/setup/mailer/mailerHandler.js b/packages/cli/src/commands/setup/mailer/mailerHandler.js
index d2c3a360585b..47b9d03c2f63 100644
--- a/packages/cli/src/commands/setup/mailer/mailerHandler.js
+++ b/packages/cli/src/commands/setup/mailer/mailerHandler.js
@@ -6,9 +6,9 @@ import { Listr } from 'listr2'
 import { addApiPackages } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFile } from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject } from '../../../lib/project'
+import c from '../../../lib/colors.js'
+import { getPaths, transformTSToJS, writeFile } from '../../../lib/index.js'
+import { isTypeScriptProject } from '../../../lib/project.js'
 
 export const handler = async ({ force, skipExamples }) => {
   const projectIsTypescript = isTypeScriptProject()
diff --git a/packages/cli/src/commands/setup/middleware/middleware.ts b/packages/cli/src/commands/setup/middleware/middleware.ts
index 5fb7d4c180e4..927f58684f38 100644
--- a/packages/cli/src/commands/setup/middleware/middleware.ts
+++ b/packages/cli/src/commands/setup/middleware/middleware.ts
@@ -1,7 +1,7 @@
 import terminalLink from 'terminal-link'
 import type { Argv } from 'yargs'
 
-import * as ogImageCommand from './ogImage/ogImage'
+import * as ogImageCommand from './ogImage/ogImage.js'
 
 export const command = 'middleware <type>'
 export const description = 'Set up a middleware'
diff --git a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/alreadyContainsImport.input.tsx b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/alreadyContainsImport.input.tsx
index 8251f4a4c36b..31bea6ca8812 100644
--- a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/alreadyContainsImport.input.tsx
+++ b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/alreadyContainsImport.input.tsx
@@ -1,8 +1,8 @@
 import OgImageMiddleware from "@redwoodjs/ogimage-gen/middleware";
 import type { TagDescriptor } from '@redwoodjs/web'
 
-import App from './App'
-import { Document } from './Document'
+import App from './App.js'
+import { Document } from './Document.js'
 
 interface Props {
   css: string[]
diff --git a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/alreadyContainsImport.output.tsx b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/alreadyContainsImport.output.tsx
index 9fb7d82a95ca..c5442467d9e5 100644
--- a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/alreadyContainsImport.output.tsx
+++ b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/alreadyContainsImport.output.tsx
@@ -1,8 +1,8 @@
 import OgImageMiddleware from "@redwoodjs/ogimage-gen/middleware";
 import type { TagDescriptor } from '@redwoodjs/web'
 
-import App from './App'
-import { Document } from './Document'
+import App from './App.js'
+import { Document } from './Document.js'
 
 interface Props {
   css: string[]
diff --git a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/defaultTsx.input.tsx b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/defaultTsx.input.tsx
index 2ef279387fd2..e7a58b5e49d9 100644
--- a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/defaultTsx.input.tsx
+++ b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/defaultTsx.input.tsx
@@ -1,7 +1,7 @@
 import type { TagDescriptor } from '@redwoodjs/web'
 
-import App from './App'
-import { Document } from './Document'
+import App from './App.js'
+import { Document } from './Document.js'
 
 interface Props {
   css: string[]
diff --git a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/defaultTsx.output.tsx b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/defaultTsx.output.tsx
index 9fb7d82a95ca..c5442467d9e5 100644
--- a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/defaultTsx.output.tsx
+++ b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/defaultTsx.output.tsx
@@ -1,8 +1,8 @@
 import OgImageMiddleware from "@redwoodjs/ogimage-gen/middleware";
 import type { TagDescriptor } from '@redwoodjs/web'
 
-import App from './App'
-import { Document } from './Document'
+import App from './App.js'
+import { Document } from './Document.js'
 
 interface Props {
   css: string[]
diff --git a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/registerFunctionAlreadyDefined.input.tsx b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/registerFunctionAlreadyDefined.input.tsx
index d00756a888fb..626e40e437a1 100644
--- a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/registerFunctionAlreadyDefined.input.tsx
+++ b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/registerFunctionAlreadyDefined.input.tsx
@@ -1,7 +1,7 @@
 import type { TagDescriptor } from '@redwoodjs/web'
 
-import App from './App'
-import { Document } from './Document'
+import App from './App.js'
+import { Document } from './Document.js'
 
 interface Props {
   css: string[]
diff --git a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/registerFunctionAlreadyDefined.output.tsx b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/registerFunctionAlreadyDefined.output.tsx
index 040fd8c37374..9211f9b77644 100644
--- a/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/registerFunctionAlreadyDefined.output.tsx
+++ b/packages/cli/src/commands/setup/middleware/ogImage/__testfixtures__/registerFunctionAlreadyDefined.output.tsx
@@ -1,8 +1,8 @@
 import OgImageMiddleware from "@redwoodjs/ogimage-gen/middleware";
 import type { TagDescriptor } from '@redwoodjs/web'
 
-import App from './App'
-import { Document } from './Document'
+import App from './App.js'
+import { Document } from './Document.js'
 
 interface Props {
   css: string[]
diff --git a/packages/cli/src/commands/setup/middleware/ogImage/ogImageHandler.ts b/packages/cli/src/commands/setup/middleware/ogImage/ogImageHandler.ts
index 35b726929a20..c76949b6428c 100644
--- a/packages/cli/src/commands/setup/middleware/ogImage/ogImageHandler.ts
+++ b/packages/cli/src/commands/setup/middleware/ogImage/ogImageHandler.ts
@@ -7,7 +7,7 @@ import { format } from 'prettier'
 import { addWebPackages, getPrettierOptions } from '@redwoodjs/cli-helpers'
 import { getConfig, getPaths } from '@redwoodjs/project-config'
 
-import { runTransform } from '../../../../lib/runTransform'
+import { runTransform } from '../../../../lib/runTransform.js'
 
 export async function handler({ force }: { force: boolean }) {
   const rwPaths = getPaths()
diff --git a/packages/cli/src/commands/setup/monitoring/sentry/sentryHandler.ts b/packages/cli/src/commands/setup/monitoring/sentry/sentryHandler.ts
index 9646f757f2ef..db7571f4c6cb 100644
--- a/packages/cli/src/commands/setup/monitoring/sentry/sentryHandler.ts
+++ b/packages/cli/src/commands/setup/monitoring/sentry/sentryHandler.ts
@@ -15,7 +15,7 @@ import {
 } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import type { Args } from './sentry'
+import type { Args } from './sentry.js'
 
 const rwPaths = getPaths()
 
diff --git a/packages/cli/src/commands/setup/package/__tests__/packageHandler.test.js b/packages/cli/src/commands/setup/package/__tests__/packageHandler.test.js
index 4448536aa1e0..468a98af273d 100644
--- a/packages/cli/src/commands/setup/package/__tests__/packageHandler.test.js
+++ b/packages/cli/src/commands/setup/package/__tests__/packageHandler.test.js
@@ -46,7 +46,7 @@ import { vi, describe, beforeEach, afterEach, test, expect } from 'vitest'
 
 import { getCompatibilityData } from '@redwoodjs/cli-helpers'
 
-import { handler } from '../packageHandler'
+import { handler } from '../packageHandler.js'
 
 describe('packageHandler', () => {
   beforeEach(() => {
diff --git a/packages/cli/src/commands/setup/realtime/realtimeHandler.js b/packages/cli/src/commands/setup/realtime/realtimeHandler.js
index 302719747cbb..e1a09cc7a602 100644
--- a/packages/cli/src/commands/setup/realtime/realtimeHandler.js
+++ b/packages/cli/src/commands/setup/realtime/realtimeHandler.js
@@ -7,10 +7,10 @@ import { addApiPackages } from '@redwoodjs/cli-helpers'
 import { generate as generateTypes } from '@redwoodjs/internal/dist/generate/generate'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFile } from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject, serverFileExists } from '../../../lib/project'
-import { setupServerFileTasks } from '../server-file/serverFileHandler'
+import c from '../../../lib/colors.js'
+import { getPaths, transformTSToJS, writeFile } from '../../../lib/index.js'
+import { isTypeScriptProject, serverFileExists } from '../../../lib/project.js'
+import { setupServerFileTasks } from '../server-file/serverFileHandler.js'
 
 const { version } = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '../../../../package.json'), 'utf-8'),
diff --git a/packages/cli/src/commands/setup/server-file/serverFileHandler.js b/packages/cli/src/commands/setup/server-file/serverFileHandler.js
index c7ce8498c456..d7c706ac9193 100644
--- a/packages/cli/src/commands/setup/server-file/serverFileHandler.js
+++ b/packages/cli/src/commands/setup/server-file/serverFileHandler.js
@@ -6,9 +6,9 @@ import { Listr } from 'listr2'
 import { addApiPackages } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFile } from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject } from '../../../lib/project'
+import c from '../../../lib/colors.js'
+import { getPaths, transformTSToJS, writeFile } from '../../../lib/index.js'
+import { isTypeScriptProject } from '../../../lib/project.js'
 
 const { version } = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '../../../../package.json'), 'utf-8'),
diff --git a/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js b/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js
index 2ff12c3e745c..d7c8eb9bdf71 100644
--- a/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js
+++ b/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js
@@ -4,12 +4,12 @@ import { Listr } from 'listr2'
 
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
+import c from '../../../lib/colors.js'
 import {
   getInstalledRedwoodVersion,
   getPaths,
   saveRemoteFileToDisk,
-} from '../../../lib'
-import c from '../../../lib/colors'
+} from '../../../lib/index.js'
 
 export const handler = async ({ force }) => {
   const installedRwVersion = getInstalledRedwoodVersion()
diff --git a/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js b/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js
index fd9a511de985..8777d286bc2b 100644
--- a/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js
+++ b/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js
@@ -5,10 +5,10 @@ import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getPaths, writeFile } from '../../../../lib'
-import c from '../../../../lib/colors'
+import c from '../../../../lib/colors.js'
 import extendStorybookConfiguration from '../../../../lib/configureStorybook.js'
-import { extendJSXFile, fileIncludes } from '../../../../lib/extendFile'
+import { extendJSXFile, fileIncludes } from '../../../../lib/extendFile.js'
+import { getPaths, writeFile } from '../../../../lib/index.js'
 
 export const command = 'chakra-ui'
 export const description = 'Set up Chakra UI'
diff --git a/packages/cli/src/commands/setup/ui/libraries/mantine.js b/packages/cli/src/commands/setup/ui/libraries/mantine.js
index 74c3037e7690..b6f6561cc5ca 100644
--- a/packages/cli/src/commands/setup/ui/libraries/mantine.js
+++ b/packages/cli/src/commands/setup/ui/libraries/mantine.js
@@ -6,10 +6,10 @@ import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getPaths, writeFile } from '../../../../lib'
-import c from '../../../../lib/colors'
+import c from '../../../../lib/colors.js'
 import extendStorybookConfiguration from '../../../../lib/configureStorybook.js'
-import { extendJSXFile, fileIncludes } from '../../../../lib/extendFile'
+import { extendJSXFile, fileIncludes } from '../../../../lib/extendFile.js'
+import { getPaths, writeFile } from '../../../../lib/index.js'
 
 export const command = 'mantine'
 export const description = 'Set up Mantine UI'
diff --git a/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js b/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js
index 945670c8a347..5c36b6861ddd 100644
--- a/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js
+++ b/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js
@@ -10,8 +10,8 @@ import terminalLink from 'terminal-link'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, usingVSCode } from '../../../../lib'
-import c from '../../../../lib/colors'
+import c from '../../../../lib/colors.js'
+import { getPaths, usingVSCode } from '../../../../lib/index.js'
 
 export const command = 'tailwindcss'
 export const aliases = ['tailwind', 'tw']
diff --git a/packages/cli/src/commands/setup/uploads/__codemod_tests__/dbCodemod.test.ts b/packages/cli/src/commands/setup/uploads/__codemod_tests__/dbCodemod.test.ts
index 0475defece4a..2481a8c27ae3 100644
--- a/packages/cli/src/commands/setup/uploads/__codemod_tests__/dbCodemod.test.ts
+++ b/packages/cli/src/commands/setup/uploads/__codemod_tests__/dbCodemod.test.ts
@@ -2,7 +2,7 @@ import path from 'node:path'
 
 import { describe, it, expect } from 'vitest'
 
-import { runTransform } from '../../../../lib/runTransform'
+import { runTransform } from '../../../../lib/runTransform.js'
 
 describe('Db codemod', () => {
   it('Handles the default db case', async () => {
diff --git a/packages/cli/src/commands/setup/uploads/__testfixtures__/defaultDb.input.ts b/packages/cli/src/commands/setup/uploads/__testfixtures__/defaultDb.input.ts
index 006193cc6b72..6d4ae760037c 100644
--- a/packages/cli/src/commands/setup/uploads/__testfixtures__/defaultDb.input.ts
+++ b/packages/cli/src/commands/setup/uploads/__testfixtures__/defaultDb.input.ts
@@ -5,7 +5,7 @@ import { PrismaClient } from '@prisma/client'
 
 import { emitLogLevels, handlePrismaLogging } from '@redwoodjs/api/logger'
 
-import { logger } from './logger'
+import { logger } from './logger.js'
 
 const prismaClient = new PrismaClient({
   log: emitLogLevels(['info', 'warn', 'error']),
diff --git a/packages/cli/src/commands/setup/uploads/__testfixtures__/defaultDb.output.ts b/packages/cli/src/commands/setup/uploads/__testfixtures__/defaultDb.output.ts
index 5c60d4398da2..7e6905c0f48f 100644
--- a/packages/cli/src/commands/setup/uploads/__testfixtures__/defaultDb.output.ts
+++ b/packages/cli/src/commands/setup/uploads/__testfixtures__/defaultDb.output.ts
@@ -5,9 +5,9 @@ import { PrismaClient } from '@prisma/client'
 
 import { emitLogLevels, handlePrismaLogging } from '@redwoodjs/api/logger'
 
-import { logger } from './logger'
+import { logger } from './logger.js'
 
-import { storagePrismaExtension } from './uploads'
+import { storagePrismaExtension } from './uploads.js'
 
 const prismaClient = new PrismaClient({
   log: emitLogLevels(['info', 'warn', 'error']),
diff --git a/packages/cli/src/commands/setup/uploads/__testfixtures__/oldFormat.input.ts b/packages/cli/src/commands/setup/uploads/__testfixtures__/oldFormat.input.ts
index 3001ab2be9d7..7d0080f8b12d 100644
--- a/packages/cli/src/commands/setup/uploads/__testfixtures__/oldFormat.input.ts
+++ b/packages/cli/src/commands/setup/uploads/__testfixtures__/oldFormat.input.ts
@@ -5,7 +5,7 @@ import { PrismaClient } from '@prisma/client'
 
 import { emitLogLevels, handlePrismaLogging } from '@redwoodjs/api/logger'
 
-import { logger } from './logger'
+import { logger } from './logger.js'
 
 export const db = new PrismaClient({
   log: emitLogLevels(['info', 'warn', 'error']),
diff --git a/packages/cli/src/commands/setup/uploads/uploadsHandler.js b/packages/cli/src/commands/setup/uploads/uploadsHandler.js
index 8abcc6656406..c7c1cc47c396 100644
--- a/packages/cli/src/commands/setup/uploads/uploadsHandler.js
+++ b/packages/cli/src/commands/setup/uploads/uploadsHandler.js
@@ -7,10 +7,10 @@ import { format } from 'prettier'
 import { addApiPackages, getPrettierOptions } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFile } from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject } from '../../../lib/project'
-import { runTransform } from '../../../lib/runTransform'
+import c from '../../../lib/colors.js'
+import { getPaths, transformTSToJS, writeFile } from '../../../lib/index.js'
+import { isTypeScriptProject } from '../../../lib/project.js'
+import { runTransform } from '../../../lib/runTransform.js'
 
 export const handler = async ({ force }) => {
   const projectIsTypescript = isTypeScriptProject()
diff --git a/packages/cli/src/commands/setup/vite/viteHandler.js b/packages/cli/src/commands/setup/vite/viteHandler.js
index e740a14f3011..fe4c32b5381e 100644
--- a/packages/cli/src/commands/setup/vite/viteHandler.js
+++ b/packages/cli/src/commands/setup/vite/viteHandler.js
@@ -6,9 +6,9 @@ import { Listr } from 'listr2'
 import { addWebPackages } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths, transformTSToJS, writeFile } from '../../../lib'
-import c from '../../../lib/colors'
-import { isTypeScriptProject } from '../../../lib/project'
+import c from '../../../lib/colors.js'
+import { getPaths, transformTSToJS, writeFile } from '../../../lib/index.js'
+import { isTypeScriptProject } from '../../../lib/project.js'
 
 const { version } = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '../../../../package.json'), 'utf-8'),
diff --git a/packages/cli/src/commands/studioHandler.js b/packages/cli/src/commands/studioHandler.js
index 04685eba0fea..a346d78cc77e 100644
--- a/packages/cli/src/commands/studioHandler.js
+++ b/packages/cli/src/commands/studioHandler.js
@@ -5,7 +5,7 @@ import semver from 'semver'
 
 import { getPaths } from '@redwoodjs/project-config'
 
-import { isModuleInstalled, installModule } from '../lib/packages'
+import { isModuleInstalled, installModule } from '../lib/packages.js'
 
 export const handler = async (options) => {
   try {
diff --git a/packages/cli/src/commands/test.js b/packages/cli/src/commands/test.js
index 6c8bfc0fbba1..e2cf05ed8393 100644
--- a/packages/cli/src/commands/test.js
+++ b/packages/cli/src/commands/test.js
@@ -1,7 +1,7 @@
 import terminalLink from 'terminal-link'
 
-import c from '../lib/colors'
-import { sides } from '../lib/project'
+import c from '../lib/colors.js'
+import { sides } from '../lib/project.js'
 
 export const command = 'test [filter..]'
 export const description = 'Run Jest tests. Defaults to watch mode'
diff --git a/packages/cli/src/commands/testHandler.js b/packages/cli/src/commands/testHandler.js
index fa613b24098f..d7a5f1baf198 100644
--- a/packages/cli/src/commands/testHandler.js
+++ b/packages/cli/src/commands/testHandler.js
@@ -7,9 +7,9 @@ import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { ensurePosixPath } from '@redwoodjs/project-config'
 import { errorTelemetry, timedTelemetry } from '@redwoodjs/telemetry'
 
-import { getPaths } from '../lib'
-import c from '../lib/colors'
-import * as project from '../lib/project'
+import c from '../lib/colors.js'
+import { getPaths } from '../lib/index.js'
+import * as project from '../lib/project.js'
 
 // https://github.com/facebook/create-react-app/blob/cbad256a4aacfc3084be7ccf91aad87899c63564/packages/react-scripts/scripts/test.js#L39
 function isInGitRepository() {
diff --git a/packages/cli/src/commands/type-check.js b/packages/cli/src/commands/type-check.js
index dacd85efb054..b7a50781368d 100644
--- a/packages/cli/src/commands/type-check.js
+++ b/packages/cli/src/commands/type-check.js
@@ -1,6 +1,6 @@
 import terminalLink from 'terminal-link'
 
-import { sides } from '../lib/project'
+import { sides } from '../lib/project.js'
 
 export const command = 'type-check [sides..]'
 export const aliases = ['tsc', 'tc']
diff --git a/packages/cli/src/commands/type-checkHandler.js b/packages/cli/src/commands/type-checkHandler.js
index 27ba4b2b7593..8ca4f65b22da 100644
--- a/packages/cli/src/commands/type-checkHandler.js
+++ b/packages/cli/src/commands/type-checkHandler.js
@@ -6,9 +6,9 @@ import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
-import { getCmdMajorVersion } from '../commands/upgrade'
-import { getPaths } from '../lib'
-import { generatePrismaClient } from '../lib/generatePrismaClient'
+import { getCmdMajorVersion } from '../commands/upgrade.js'
+import { generatePrismaClient } from '../lib/generatePrismaClient.js'
+import { getPaths } from '../lib/index.js'
 
 export const handler = async ({ sides, verbose, prisma, generate }) => {
   recordTelemetryAttributes({
diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js
index 94853b79e36e..26bbb12cfb71 100644
--- a/packages/cli/src/commands/upgrade.js
+++ b/packages/cli/src/commands/upgrade.js
@@ -10,10 +10,10 @@ import terminalLink from 'terminal-link'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { getConfig } from '@redwoodjs/project-config'
 
-import { getPaths } from '../lib'
-import c from '../lib/colors'
-import { generatePrismaClient } from '../lib/generatePrismaClient'
-import { PLUGIN_CACHE_FILENAME } from '../lib/plugin'
+import c from '../lib/colors.js'
+import { generatePrismaClient } from '../lib/generatePrismaClient.js'
+import { getPaths } from '../lib/index.js'
+import { PLUGIN_CACHE_FILENAME } from '../lib/plugin.js'
 
 export const command = 'upgrade'
 export const description = 'Upgrade all @redwoodjs packages via interactive CLI'
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
index 74d6b74317a5..850986d0d726 100644
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
@@ -10,33 +10,33 @@ import yargs from 'yargs/yargs'
 import { loadEnvFiles, recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { telemetryMiddleware } from '@redwoodjs/telemetry'
 
-import * as buildCommand from './commands/build'
-import * as checkCommand from './commands/check'
-import * as consoleCommand from './commands/console'
-import * as deployCommand from './commands/deploy'
-import * as destroyCommand from './commands/destroy'
-import * as devCommand from './commands/dev'
-import * as execCommand from './commands/exec'
-import * as experimentalCommand from './commands/experimental'
-import * as generateCommand from './commands/generate'
-import * as infoCommand from './commands/info'
-import * as jobsCommand from './commands/jobs'
-import * as lintCommand from './commands/lint'
-import * as prerenderCommand from './commands/prerender'
-import * as prismaCommand from './commands/prisma'
-import * as recordCommand from './commands/record'
-import * as serveCommand from './commands/serve'
-import * as setupCommand from './commands/setup'
-import * as studioCommand from './commands/studio'
-import * as testCommand from './commands/test'
-import * as tstojsCommand from './commands/ts-to-js'
-import * as typeCheckCommand from './commands/type-check'
-import * as upgradeCommand from './commands/upgrade'
-import { findUp } from './lib'
-import { exitWithError } from './lib/exit'
-import * as updateCheck from './lib/updateCheck'
-import { loadPlugins } from './plugin'
-import { startTelemetry, shutdownTelemetry } from './telemetry/index'
+import * as buildCommand from './commands/build.js'
+import * as checkCommand from './commands/check.js'
+import * as consoleCommand from './commands/console.js'
+import * as deployCommand from './commands/deploy.js'
+import * as destroyCommand from './commands/destroy.js'
+import * as devCommand from './commands/dev.js'
+import * as execCommand from './commands/exec.js'
+import * as experimentalCommand from './commands/experimental.js'
+import * as generateCommand from './commands/generate.js'
+import * as infoCommand from './commands/info.js'
+import * as jobsCommand from './commands/jobs.js'
+import * as lintCommand from './commands/lint.js'
+import * as prerenderCommand from './commands/prerender.js'
+import * as prismaCommand from './commands/prisma.js'
+import * as recordCommand from './commands/record.js'
+import * as serveCommand from './commands/serve.js'
+import * as setupCommand from './commands/setup.js'
+import * as studioCommand from './commands/studio.js'
+import * as testCommand from './commands/test.js'
+import * as tstojsCommand from './commands/ts-to-js.js'
+import * as typeCheckCommand from './commands/type-check.js'
+import * as upgradeCommand from './commands/upgrade.js'
+import { exitWithError } from './lib/exit.js'
+import { findUp } from './lib/index.js'
+import * as updateCheck from './lib/updateCheck.js'
+import { loadPlugins } from './plugin.js'
+import { startTelemetry, shutdownTelemetry } from './telemetry/index.js'
 
 // # Setting the CWD
 //
diff --git a/packages/cli/src/lib/__tests__/getDevNodeOptions.test.js b/packages/cli/src/lib/__tests__/getDevNodeOptions.test.js
index 8f8a023c1854..e9985fe93d4f 100644
--- a/packages/cli/src/lib/__tests__/getDevNodeOptions.test.js
+++ b/packages/cli/src/lib/__tests__/getDevNodeOptions.test.js
@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach, afterEach } from 'vitest'
 
-import { getDevNodeOptions } from '../../commands/devHandler'
+import { getDevNodeOptions } from '../../commands/devHandler.js'
 
 describe('getNodeOptions', () => {
   const enableSourceMapsOption = '--enable-source-maps'
diff --git a/packages/cli/src/lib/__tests__/index.test.js b/packages/cli/src/lib/__tests__/index.test.js
index 4543783143a2..56f556e19b69 100644
--- a/packages/cli/src/lib/__tests__/index.test.js
+++ b/packages/cli/src/lib/__tests__/index.test.js
@@ -21,7 +21,7 @@ import path from 'path'
 import fs from 'fs-extra'
 import { vi, test, expect, describe } from 'vitest'
 
-import * as index from '../index'
+import * as index from '../index.js'
 
 test('nameVariants returns a single word cased variables', () => {
   const names = ['Home', 'home']
diff --git a/packages/cli/src/lib/__tests__/locking.test.js b/packages/cli/src/lib/__tests__/locking.test.js
index 911e88693665..16ee498cae21 100644
--- a/packages/cli/src/lib/__tests__/locking.test.js
+++ b/packages/cli/src/lib/__tests__/locking.test.js
@@ -20,7 +20,7 @@ import fs from 'fs-extra'
 import { vol } from 'memfs'
 import { vi, it, expect, beforeEach } from 'vitest'
 
-import { setLock, unsetLock, isLockSet, clearLocks } from '../locking'
+import { setLock, unsetLock, isLockSet, clearLocks } from '../locking.js'
 
 beforeEach(() => {
   // Start with no files
diff --git a/packages/cli/src/lib/__tests__/mergeBasics.test.js b/packages/cli/src/lib/__tests__/mergeBasics.test.js
index ad9f6db4dad6..cbf8a454fe30 100644
--- a/packages/cli/src/lib/__tests__/mergeBasics.test.js
+++ b/packages/cli/src/lib/__tests__/mergeBasics.test.js
@@ -1,9 +1,9 @@
 import { expect, it, describe } from 'vitest'
 
-import { merge } from '../merge'
-import { concatUnique } from '../merge/strategy'
+import { merge } from '../merge/index.js'
+import { concatUnique } from '../merge/strategy.js'
 
-import { unindented } from './fixtures/unindented'
+import { unindented } from './fixtures/unindented.js'
 
 const expectMerged = async (base, ext, merged, strategy = {}) => {
   expect(await merge(unindented(base), unindented(ext), strategy)).toBe(
diff --git a/packages/cli/src/lib/__tests__/mergeConfig.test.js b/packages/cli/src/lib/__tests__/mergeConfig.test.js
index 6e1edd708b33..a3ff30b00344 100644
--- a/packages/cli/src/lib/__tests__/mergeConfig.test.js
+++ b/packages/cli/src/lib/__tests__/mergeConfig.test.js
@@ -3,15 +3,15 @@ import path from 'path'
 import fs from 'fs-extra'
 import { expect, it, describe, test } from 'vitest'
 
-import { merge } from '../merge'
+import { merge } from '../merge/index.js'
 import {
   concatUnique,
   interleave,
   keepBoth,
   keepBothStatementParents,
-} from '../merge/strategy'
+} from '../merge/strategy.js'
 
-import { unindented } from './fixtures/unindented'
+import { unindented } from './fixtures/unindented.js'
 
 // A particular merge strategy for combining JS-config-style files.
 // This is the only strategy tested in this file.
diff --git a/packages/cli/src/lib/__tests__/mergeSemantics.test.js b/packages/cli/src/lib/__tests__/mergeSemantics.test.js
index 71576874560c..6c8f4027c633 100644
--- a/packages/cli/src/lib/__tests__/mergeSemantics.test.js
+++ b/packages/cli/src/lib/__tests__/mergeSemantics.test.js
@@ -1,7 +1,7 @@
 import { parse, traverse } from '@babel/core'
 import { describe, it, expect } from 'vitest'
 
-import { semanticIdentity } from '../merge/semanticIdentity'
+import { semanticIdentity } from '../merge/semanticIdentity.js'
 
 function expectSemanticId(rootPath, type, predicate, expectedIdentity) {
   const state = { result: undefined }
diff --git a/packages/cli/src/lib/__tests__/pluralHelpers.test.js b/packages/cli/src/lib/__tests__/pluralHelpers.test.js
index 8dc2aa159ca7..2cc52b7f24e0 100644
--- a/packages/cli/src/lib/__tests__/pluralHelpers.test.js
+++ b/packages/cli/src/lib/__tests__/pluralHelpers.test.js
@@ -1,8 +1,8 @@
 import prompts from 'prompts'
 import { test, expect } from 'vitest'
 
-import * as helpers from '../pluralHelpers'
-import { pluralize, singularize } from '../rwPluralize'
+import * as helpers from '../pluralHelpers.js'
+import { pluralize, singularize } from '../rwPluralize.js'
 
 test('validatePlural returns true if plural is single word and unique from singular', () => {
   const result = helpers.validatePlural('plural', 'singular')
diff --git a/packages/cli/src/lib/__tests__/rollback.test.js b/packages/cli/src/lib/__tests__/rollback.test.js
index 5e34cfdd0453..65965010cc5b 100644
--- a/packages/cli/src/lib/__tests__/rollback.test.js
+++ b/packages/cli/src/lib/__tests__/rollback.test.js
@@ -7,7 +7,7 @@ import { Listr } from 'listr2'
 import { vol } from 'memfs'
 import { vi, it, expect, beforeEach } from 'vitest'
 
-import * as rollback from '../rollback'
+import * as rollback from '../rollback.js'
 
 beforeEach(() => {
   vol.reset()
diff --git a/packages/cli/src/lib/__tests__/rwPluralize.test.js b/packages/cli/src/lib/__tests__/rwPluralize.test.js
index cd0deca77d42..dda77f32f4f5 100644
--- a/packages/cli/src/lib/__tests__/rwPluralize.test.js
+++ b/packages/cli/src/lib/__tests__/rwPluralize.test.js
@@ -6,7 +6,7 @@ import {
   isPlural,
   isSingular,
   addSingularPlural,
-} from '../rwPluralize'
+} from '../rwPluralize.js'
 
 test('pluralize', () => {
   expect(pluralize('books')).toEqual('books')
diff --git a/packages/cli/src/lib/__tests__/schemaHelpers.test.js b/packages/cli/src/lib/__tests__/schemaHelpers.test.js
index e1827ad4a3e3..577f27453ee0 100644
--- a/packages/cli/src/lib/__tests__/schemaHelpers.test.js
+++ b/packages/cli/src/lib/__tests__/schemaHelpers.test.js
@@ -20,7 +20,7 @@ vi.mock('@redwoodjs/project-config', async (importOriginal) => {
 import prompts from 'prompts'
 import { vi, test, expect, describe, it } from 'vitest'
 
-import { getSchema, verifyModelName } from '../schemaHelpers'
+import { getSchema, verifyModelName } from '../schemaHelpers.js'
 
 test('getSchema returns a parsed schema.prisma', async () => {
   let schema = await getSchema('Post')
diff --git a/packages/cli/src/lib/__tests__/updateCheck.test.js b/packages/cli/src/lib/__tests__/updateCheck.test.js
index 1871fba42be5..d720caa76332 100644
--- a/packages/cli/src/lib/__tests__/updateCheck.test.js
+++ b/packages/cli/src/lib/__tests__/updateCheck.test.js
@@ -35,8 +35,8 @@ import {
 
 import { getConfig } from '@redwoodjs/project-config'
 
-import { setLock } from '../locking'
-import * as updateCheck from '../updateCheck'
+import { setLock } from '../locking.js'
+import * as updateCheck from '../updateCheck.js'
 
 const TESTING_CURRENT_DATETIME = 1640995200000
 
diff --git a/packages/cli/src/lib/configureStorybook.js b/packages/cli/src/lib/configureStorybook.js
index d0f784f402b9..b89fcfc8ab60 100644
--- a/packages/cli/src/lib/configureStorybook.js
+++ b/packages/cli/src/lib/configureStorybook.js
@@ -3,16 +3,16 @@ import path from 'path'
 import fse from 'fs-extra'
 import prettier from 'prettier'
 
-import { merge } from './merge'
+import { merge } from './merge/index.js'
 import {
   interleave,
   concatUnique,
   keepBoth,
   keepBothStatementParents,
-} from './merge/strategy'
-import { isTypeScriptProject } from './project'
+} from './merge/strategy.js'
+import { isTypeScriptProject } from './project.js'
 
-import { getPaths, transformTSToJS, writeFile } from '.'
+import { getPaths, transformTSToJS, writeFile } from './index.js'
 
 /**
  * Extends the Storybook configuration file with the new configuration file
diff --git a/packages/cli/src/lib/generatePrismaClient.js b/packages/cli/src/lib/generatePrismaClient.js
index 03f5cb12a820..38dd52a83d8e 100644
--- a/packages/cli/src/lib/generatePrismaClient.js
+++ b/packages/cli/src/lib/generatePrismaClient.js
@@ -4,7 +4,7 @@ import path from 'path'
 
 import fs from 'fs-extra'
 
-import { runCommandTask, getPaths } from '../lib'
+import { runCommandTask, getPaths } from '../lib/index.js'
 
 const skipTask = (schema = getPaths().api.dbSchema) => {
   if (!fs.existsSync(schema)) {
diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js
index e3b64a0023d4..beb4a8f22ff8 100644
--- a/packages/cli/src/lib/index.js
+++ b/packages/cli/src/lib/index.js
@@ -21,9 +21,9 @@ import {
   findUp,
 } from '@redwoodjs/project-config'
 
-import c from './colors'
-import { addFileToRollback } from './rollback'
-import { pluralize, singularize } from './rwPluralize'
+import c from './colors.js'
+import { addFileToRollback } from './rollback.js'
+import { pluralize, singularize } from './rwPluralize.js'
 
 export { findUp }
 
diff --git a/packages/cli/src/lib/locking.js b/packages/cli/src/lib/locking.js
index 8066bb131751..611763e29409 100644
--- a/packages/cli/src/lib/locking.js
+++ b/packages/cli/src/lib/locking.js
@@ -2,7 +2,7 @@ import path from 'path'
 
 import fs from 'fs-extra'
 
-import { getPaths } from './index'
+import { getPaths } from './index.js'
 
 /**
  * Creates the ".redwood/locks" directory if it does not exist
diff --git a/packages/cli/src/lib/merge/index.js b/packages/cli/src/lib/merge/index.js
index f7d80e8d5da4..f296c7d20920 100644
--- a/packages/cli/src/lib/merge/index.js
+++ b/packages/cli/src/lib/merge/index.js
@@ -4,9 +4,9 @@ import { VISITOR_KEYS } from '@babel/types'
 import { partition, forEachRight } from 'lodash'
 import prettier from 'prettier'
 
-import { forEachFunctionOn, nodeIs } from './algorithms'
-import { semanticIdentity } from './semanticIdentity'
-import { isOpaque } from './strategy'
+import { forEachFunctionOn, nodeIs } from './algorithms.js'
+import { semanticIdentity } from './semanticIdentity.js'
+import { isOpaque } from './strategy.js'
 
 function extractProperty(property, fromObject) {
   if (property === undefined) {
diff --git a/packages/cli/src/lib/merge/strategy.js b/packages/cli/src/lib/merge/strategy.js
index b7f3ae2097e9..e3f37a325433 100644
--- a/packages/cli/src/lib/merge/strategy.js
+++ b/packages/cli/src/lib/merge/strategy.js
@@ -1,7 +1,7 @@
 import * as t from '@babel/types'
 import _ from 'lodash'
 
-import { nodeIs, sieve } from './algorithms'
+import { nodeIs, sieve } from './algorithms.js'
 
 const OPAQUE_UID_TAG =
   'RW_MERGE_OPAQUE_UID_Q2xldmVyIHlvdSEgSGF2ZSBhIGNvb2tpZS4='
diff --git a/packages/cli/src/lib/packages.js b/packages/cli/src/lib/packages.js
index 2fde6203f6bd..04c060fbf9ec 100644
--- a/packages/cli/src/lib/packages.js
+++ b/packages/cli/src/lib/packages.js
@@ -3,7 +3,7 @@ import path from 'path'
 import execa from 'execa'
 import fs from 'fs-extra'
 
-import { getPaths } from './index'
+import { getPaths } from './index.js'
 
 // Note: Have to add backslash (\) before @ below for intellisense to display
 // the doc comments properly
diff --git a/packages/cli/src/lib/plugin.js b/packages/cli/src/lib/plugin.js
index 334723d4ec74..94582bcdd69c 100644
--- a/packages/cli/src/lib/plugin.js
+++ b/packages/cli/src/lib/plugin.js
@@ -5,9 +5,9 @@ import fs from 'fs-extra'
 
 import { getCompatibilityData } from '@redwoodjs/cli-helpers'
 
-import { installModule, isModuleInstalled } from './packages'
+import { installModule, isModuleInstalled } from './packages.js'
 
-import { getPaths } from './index'
+import { getPaths } from './index.js'
 
 const { Select } = require('enquirer')
 
diff --git a/packages/cli/src/lib/pluralHelpers.js b/packages/cli/src/lib/pluralHelpers.js
index eb54ef9ff6cd..77f4a174608c 100644
--- a/packages/cli/src/lib/pluralHelpers.js
+++ b/packages/cli/src/lib/pluralHelpers.js
@@ -1,6 +1,6 @@
 import prompts from 'prompts'
 
-import { isSingular, isPlural, addSingularPlural } from './rwPluralize'
+import { isSingular, isPlural, addSingularPlural } from './rwPluralize.js'
 
 export const isWordPluralizable = (word) => {
   return isPlural(word) !== isSingular(word)
diff --git a/packages/cli/src/lib/project.js b/packages/cli/src/lib/project.js
index 70353270c625..b03d34c4af06 100644
--- a/packages/cli/src/lib/project.js
+++ b/packages/cli/src/lib/project.js
@@ -2,7 +2,7 @@ import path from 'path'
 
 import fs from 'fs-extra'
 
-import { getPaths } from '.'
+import { getPaths } from './index.js'
 
 export const isTypeScriptProject = () => {
   const paths = getPaths()
diff --git a/packages/cli/src/lib/schemaHelpers.js b/packages/cli/src/lib/schemaHelpers.js
index b21198abea3f..11a7ec1524ba 100644
--- a/packages/cli/src/lib/schemaHelpers.js
+++ b/packages/cli/src/lib/schemaHelpers.js
@@ -4,10 +4,10 @@ import {
   getSchema as getSchemaPrisma,
 } from '@prisma/internals'
 
-import { ensureUniquePlural } from './pluralHelpers'
-import { singularize, isPlural } from './rwPluralize'
+import { ensureUniquePlural } from './pluralHelpers.js'
+import { singularize, isPlural } from './rwPluralize.js'
 
-import { getPaths } from './'
+import { getPaths } from './index.js'
 
 /**
  * Used to memoize results from `getSchema()` so we don't have to go through
diff --git a/packages/cli/src/lib/updateCheck.js b/packages/cli/src/lib/updateCheck.js
index 3cae36aa093e..f06eb4ae1629 100644
--- a/packages/cli/src/lib/updateCheck.js
+++ b/packages/cli/src/lib/updateCheck.js
@@ -8,10 +8,10 @@ import semver from 'semver'
 
 import { getConfig } from '@redwoodjs/project-config'
 
-import { spawnBackgroundProcess } from './background'
-import { isLockSet, setLock, unsetLock } from './locking'
+import { spawnBackgroundProcess } from './background.js'
+import { isLockSet, setLock, unsetLock } from './locking.js'
 
-import { getPaths } from './index'
+import { getPaths } from './index.js'
 
 /**
  * @typedef {{
diff --git a/packages/cli/src/lib/updateCheckExecute.js b/packages/cli/src/lib/updateCheckExecute.js
index 01c285407bcf..bbf390052219 100644
--- a/packages/cli/src/lib/updateCheckExecute.js
+++ b/packages/cli/src/lib/updateCheckExecute.js
@@ -1,3 +1,3 @@
-import { check } from './updateCheck'
+import { check } from './updateCheck.js'
 
 check()
diff --git a/packages/cli/src/middleware/checkNodeVersion.js b/packages/cli/src/middleware/checkNodeVersion.js
index 42eca0cd4b17..05c1556119fb 100644
--- a/packages/cli/src/middleware/checkNodeVersion.js
+++ b/packages/cli/src/middleware/checkNodeVersion.js
@@ -1,6 +1,6 @@
 import semver from 'semver'
 
-import c from '../lib/colors'
+import c from '../lib/colors.js'
 
 export function checkNodeVersion() {
   const checks = { ok: true }
diff --git a/packages/cli/src/middleware/detectProjectRwVersion.js b/packages/cli/src/middleware/detectProjectRwVersion.js
index 535665358bdc..f2b4f9545f83 100644
--- a/packages/cli/src/middleware/detectProjectRwVersion.js
+++ b/packages/cli/src/middleware/detectProjectRwVersion.js
@@ -1,4 +1,4 @@
-import { getInstalledRedwoodVersion } from '../lib'
+import { getInstalledRedwoodVersion } from '../lib/index.js'
 
 const detectRwVersion = (argv) => {
   if (!argv.rwVersion) {
diff --git a/packages/cli/src/plugin.js b/packages/cli/src/plugin.js
index 7552d8db168e..f77f644128b7 100644
--- a/packages/cli/src/plugin.js
+++ b/packages/cli/src/plugin.js
@@ -1,10 +1,10 @@
-import { getConfig } from './lib'
+import { getConfig } from './lib/index.js'
 import {
   loadCommandCache,
   checkPluginListAndWarn,
   saveCommandCache,
   loadPluginPackage,
-} from './lib/plugin'
+} from './lib/plugin.js'
 
 /**
  * Attempts to load all CLI plugins as defined in the redwood.toml file
diff --git a/packages/cli/src/telemetry/index.js b/packages/cli/src/telemetry/index.js
index 4112deec144f..a5e298e13f5a 100644
--- a/packages/cli/src/telemetry/index.js
+++ b/packages/cli/src/telemetry/index.js
@@ -9,9 +9,9 @@ import {
 } from '@opentelemetry/sdk-trace-node'
 import { hideBin } from 'yargs/helpers'
 
-import { spawnBackgroundProcess } from '../lib/background'
+import { spawnBackgroundProcess } from '../lib/background.js'
 
-import { CustomFileExporter } from './exporter'
+import { CustomFileExporter } from './exporter.js'
 
 /**
  * @type NodeTracerProvider
diff --git a/packages/cli/src/telemetry/resource.js b/packages/cli/src/telemetry/resource.js
index 8fdc40b57630..21ab5771f178 100644
--- a/packages/cli/src/telemetry/resource.js
+++ b/packages/cli/src/telemetry/resource.js
@@ -11,7 +11,10 @@ import { getPaths, getRawConfig } from '@redwoodjs/project-config'
 import { DefaultHost } from '@redwoodjs/structure/dist/hosts'
 import { RWProject } from '@redwoodjs/structure/dist/model/RWProject'
 
-import { name as packageName, version as packageVersion } from '../../package'
+import {
+  name as packageName,
+  version as packageVersion,
+} from '../../package.js'
 
 export async function getResources() {
   // Read the UUID from the file within .redwood or generate a new one if it doesn't exist
diff --git a/packages/cli/src/telemetry/send.js b/packages/cli/src/telemetry/send.js
index f55a6f7e8027..0cea426b2b78 100644
--- a/packages/cli/src/telemetry/send.js
+++ b/packages/cli/src/telemetry/send.js
@@ -6,7 +6,7 @@ import fs from 'fs-extra'
 
 import { getPaths } from '@redwoodjs/project-config'
 
-import { getResources } from './resource'
+import { getResources } from './resource.js'
 
 async function main() {
   // Log out the telemetry notice
diff --git a/packages/cli/src/testLib/cells.ts b/packages/cli/src/testLib/cells.ts
index 39ecb963721b..ee541b0752ca 100644
--- a/packages/cli/src/testLib/cells.ts
+++ b/packages/cli/src/testLib/cells.ts
@@ -92,7 +92,7 @@ export const getNamedExports = (ast: types.Node): NamedExports[] => {
   traverse(ast, {
     ExportNamedDeclaration(path) {
       // Re-exports from other modules
-      // Eg: export { a, b } from './module'
+      // Eg: export { a, b } from './module.js'
       const specifiers = path.node?.specifiers
       if (specifiers.length) {
         for (const s of specifiers) {
diff --git a/packages/cli/src/testUtils/matchFolderTransform.ts b/packages/cli/src/testUtils/matchFolderTransform.ts
index 6bc42dffe33e..291fecfdec4f 100644
--- a/packages/cli/src/testUtils/matchFolderTransform.ts
+++ b/packages/cli/src/testUtils/matchFolderTransform.ts
@@ -5,9 +5,9 @@ import fg from 'fast-glob'
 import fse from 'fs-extra'
 import { expect } from 'vitest'
 
-import runTransform from '../testLib/runTransform'
+import runTransform from '../testLib/runTransform.js'
 
-import { createProjectMock } from './index'
+import { createProjectMock } from './index.js'
 
 type Options = {
   removeWhitespace?: boolean
diff --git a/packages/cli/src/testUtils/matchInlineTransformSnapshot.ts b/packages/cli/src/testUtils/matchInlineTransformSnapshot.ts
index d1ef031710ec..f68fc1708f83 100644
--- a/packages/cli/src/testUtils/matchInlineTransformSnapshot.ts
+++ b/packages/cli/src/testUtils/matchInlineTransformSnapshot.ts
@@ -5,9 +5,9 @@ import path from 'node:path'
 import tempy from 'tempy'
 import { expect } from 'vitest'
 
-import runTransform from '../testLib/runTransform'
+import runTransform from '../testLib/runTransform.js'
 
-import { formatCode } from './index'
+import { formatCode } from './index.js'
 
 const require = createRequire(import.meta.url)
 
diff --git a/packages/cli/src/testUtils/matchTransformSnapshot.ts b/packages/cli/src/testUtils/matchTransformSnapshot.ts
index 7ccab09440aa..d178b23a7cd8 100644
--- a/packages/cli/src/testUtils/matchTransformSnapshot.ts
+++ b/packages/cli/src/testUtils/matchTransformSnapshot.ts
@@ -5,9 +5,9 @@ import path from 'node:path'
 import tempy from 'tempy'
 import { expect } from 'vitest'
 
-import runTransform from '../testLib/runTransform'
+import runTransform from '../testLib/runTransform.js'
 
-import { formatCode } from './index'
+import { formatCode } from './index.js'
 
 const require = createRequire(import.meta.url)