Fix dbAuth setup and TW setup

Author: Tobbe

packages/auth-providers/dbAuth/setup/src/setupHandler.ts

@@ -185,6 +185,10 @@ export const createAuthDecoderFunction = {
 
     const content = fs.readFileSync(graphqlPath, 'utf-8')
 
+    if (!content) {
+      throw new Error('Could not read ' + graphqlPath)
+    }
+
     let newContent = content.replace(
       'import { getCurrentUser } from',
       'import { cookieName, getCurrentUser } from',
@@ -205,6 +209,8 @@ export const createAuthDecoderFunction = {
     }
 
     if (!newContent.includes('import { cookieName')) {
+      console.error('unexpected content\n')
+      console.error(newContent)
       throw new Error('Failed to import cookieName')
     }
 

packages/cli-helpers/src/auth/authTasks.ts

@@ -18,8 +18,8 @@ import {
 
 import { apiSideFiles, generateUniqueFileNames } from './authFiles.js'
 
-const AUTH_PROVIDER_HOOK_IMPORT = `import { AuthProvider, useAuth } from './auth'`
-const AUTH_HOOK_IMPORT = `import { useAuth } from './auth'`
+const AUTH_PROVIDER_HOOK_IMPORT = `import { AuthProvider, useAuth } from './auth.js'`
+const AUTH_HOOK_IMPORT = `import { useAuth } from './auth.js'`
 
 export const getWebAppPath = () => getPaths().web.app
 
@@ -110,15 +110,15 @@ export const addApiConfig = ({
   }
 
   const hasCurrentUserImport =
-    /(^import {.*?getCurrentUser(?!getCurrentUser).*?} from ['"]src\/lib\/auth['"])/s.test(
+    /(^import {.*?getCurrentUser(?!getCurrentUser).*?} from ['"]src\/lib\/auth(?:\.js)['"])/s.test(
       newContent,
     )
 
   if (!hasCurrentUserImport) {
     // add import statement
     newContent = newContent.replace(
-      /^(import { db } from ['"]src\/lib\/db['"])$/m,
-      `import { getCurrentUser } from 'src/lib/auth'\n$1`,
+      /^(import { db } from ['"]src\/lib\/db(?:\.js)['"])$/m,
+      `import { getCurrentUser } from 'src/lib/auth.js'\n$1`,
     )
 
     // add object to handler

packages/cli/src/commands/setup/ui/libraries/tailwindcssHandler.js

@@ -375,7 +375,7 @@ export const handler = async ({ force, install }) => {
         task: async (_ctx) => {
           const prettierConfigPath = path.join(
             rwPaths.base,
-            'prettier.config.js',
+            'prettier.config.cjs',
           )
           // Add tailwindcss ordering plugin to prettier
           const prettierConfig = fs.readFileSync(prettierConfigPath, 'utf-8')
@@ -413,7 +413,7 @@ export const handler = async ({ force, install }) => {
         task: async (_ctx, task) => {
           const prettierConfigPath = path.join(
             rwPaths.base,
-            'prettier.config.js',
+            'prettier.config.cjs',
           )
           // Add tailwindcss ordering plugin to prettier
           const prettierConfig = fs.readFileSync(prettierConfigPath, 'utf-8')

packages/create-cedar-app/templates/js/scripts/seed.js

@@ -1,4 +1,4 @@
-// import { db } from 'api/src/lib/db'
+// import { db } from 'api/src/lib/db.js'
 
 // Manually apply seeds via the `yarn rw prisma db seed` command.
 //

packages/create-cedar-app/templates/ts/scripts/seed.ts

@@ -1,4 +1,4 @@
-// import { db } from 'api/src/lib/db'
+// import { db } from 'api/src/lib/db.js'
 
 // Manually apply seeds via the `yarn rw prisma db seed` command.
 //

packages/project-config/src/paths.ts

@@ -156,7 +156,7 @@ export const getBaseDirFromFile = (file: string) => {
  */
 export const resolveFile = (
   filePath: string,
-  extensions: string[] = ['.js', '.tsx', '.ts', '.jsx', '.mjs', '.mts'],
+  extensions: string[] = ['.js', '.tsx', '.ts', '.jsx', '.mjs', '.mts', '.cjs'],
 ): string | null => {
   for (const extension of extensions) {
     const p = `${filePath}${extension}`

tasks/test-project/codemods/seed.js

@@ -69,8 +69,8 @@ export default (file, api) => {
 
   // Uncomment the db import line
   newSource = newSource.replace(
-    "// import { db } from 'api/src/lib/db'",
-    "import { db } from 'api/src/lib/db'",
+    "// import { db } from 'api/src/lib/db.js'",
+    "import { db } from 'api/src/lib/db.js'",
   )
 
   return newSource