chore(build): Move more repetitive code into framework-tools (#11320)

packages/auth-providers/dbAuth/middleware/build.mts

@@ -1,30 +1,14 @@
-import { build, defaultBuildOptions } from '@redwoodjs/framework-tools'
+import { buildExternalCjs, buildExternalEsm } from '@redwoodjs/framework-tools'
 import {
   generateTypesCjs,
   generateTypesEsm,
   insertCommonJsPackageJson,
 } from '@redwoodjs/framework-tools/generateTypes'
 
-// ESM build
-await build({
-  buildOptions: {
-    ...defaultBuildOptions,
-    format: 'esm',
-    packages: 'external',
-  },
-})
+await buildExternalEsm()
 await generateTypesEsm()
 
-// CJS build
-await build({
-  buildOptions: {
-    ...defaultBuildOptions,
-    outdir: 'dist/cjs',
-    packages: 'external',
-  },
-})
+await buildExternalCjs()
 await generateTypesCjs()
-await insertCommonJsPackageJson({
-  buildFileUrl: import.meta.url,
-  cjsDir: 'dist/cjs',
-})
+
+await insertCommonJsPackageJson({ buildFileUrl: import.meta.url })

packages/auth-providers/dbAuth/middleware/package.json

@@ -28,7 +28,7 @@
   "scripts": {
     "build": "tsx ./build.mts",
     "build:pack": "yarn pack -o redwoodjs-auth-dbauth-middleware.tgz",
-    "build:types": "tsc --build --verbose ./tsconfig.json",
+    "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:types-cjs": "tsc --build --verbose tsconfig.cjs.json",
     "check:attw": "yarn attw -P",
     "check:package": "concurrently npm:check:attw yarn:publint",

packages/auth-providers/dbAuth/middleware/src/__tests__/defaultGetRoles.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { defaultGetRoles } from '../defaultGetRoles'
+import { defaultGetRoles } from '../defaultGetRoles.js'
 
 describe('dbAuth: defaultGetRoles', () => {
   it('returns an empty array if no roles are present', () => {

packages/auth-providers/dbAuth/middleware/src/__tests__/initDbAuthMiddleware.test.ts

@@ -8,9 +8,10 @@ import {
   MiddlewareResponse,
 } from '@redwoodjs/web/middleware'
 
-import { middlewareDefaultAuthProviderState } from '../../../../../auth/dist/AuthProvider/AuthProviderState'
-import type { DbAuthMiddlewareOptions } from '../index'
-import { initDbAuthMiddleware } from '../index'
+import { middlewareDefaultAuthProviderState } from '../../../../../auth/dist/AuthProvider/AuthProviderState.js'
+import type { DbAuthMiddlewareOptions } from '../index.js'
+import { initDbAuthMiddleware } from '../index.js'
+
 const FIXTURE_PATH = path.resolve(
   __dirname,
   '../../../../../../__fixtures__/example-todo-main',
@@ -39,6 +40,8 @@ beforeAll(() => {
               mockedSession: 'this_is_the_only_correct_session',
             }
           }
+
+          return undefined
         }),
       },
     }

packages/auth-providers/dbAuth/middleware/src/defaultGetRoles.ts

@@ -1,4 +1,6 @@
-export const defaultGetRoles = (decoded: Record<string, any>): string[] => {
+export const defaultGetRoles = (
+  decoded: Record<string, any> | undefined | null,
+): string[] => {
   try {
     const roles = decoded?.currentUser?.roles
 

packages/auth-providers/dbAuth/middleware/tsconfig.build.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../../../tsconfig.compilerOption.json",
+  "compilerOptions": {
+    "strict": true,
+    "rootDir": "src",
+    "outDir": "dist",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "tsBuildInfoFile": "./tsconfig.build.tsbuildinfo"
+  },
+  "include": ["src/**/*"],
+  "references": [
+    { "path": "../../../auth/tsconfig.build.json" },
+    { "path": "../../../vite/tsconfig.build.json" }
+  ]
+}

packages/auth-providers/dbAuth/middleware/tsconfig.cjs.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.build.json",
   "compilerOptions": {
     "outDir": "dist/cjs",
     "tsBuildInfoFile": "./tsconfig.cjs.tsbuildinfo"

packages/auth-providers/dbAuth/middleware/tsconfig.json

@@ -2,13 +2,12 @@
   "extends": "../../../../tsconfig.compilerOption.json",
   "compilerOptions": {
     "strict": true,
-    "rootDir": "src",
     "outDir": "dist",
     "module": "Node16",
-    "moduleResolution": "Node16",
-    "tsBuildInfoFile": "./tsconfig.tsbuildinfo"
+    "moduleResolution": "Node16"
   },
-  "include": ["src/**/*"],
+  "include": ["."],
+  "exclude": ["dist", "node_modules", "**/__mocks__", "**/__fixtures__"],
   "references": [
     { "path": "../../../auth/tsconfig.build.json" },
     { "path": "../../../vite/tsconfig.build.json" }

packages/auth-providers/supabase/middleware/build.mts

@@ -1,30 +1,14 @@
-import { build, defaultBuildOptions } from '@redwoodjs/framework-tools'
+import { buildExternalCjs, buildExternalEsm } from '@redwoodjs/framework-tools'
 import {
   generateTypesCjs,
   generateTypesEsm,
   insertCommonJsPackageJson,
 } from '@redwoodjs/framework-tools/generateTypes'
 
-// ESM build
-await build({
-  buildOptions: {
-    ...defaultBuildOptions,
-    format: 'esm',
-    packages: 'external',
-  },
-})
+await buildExternalEsm()
 await generateTypesEsm()
 
-// CJS build
-await build({
-  buildOptions: {
-    ...defaultBuildOptions,
-    outdir: 'dist/cjs',
-    packages: 'external',
-  },
-})
+await buildExternalCjs()
 await generateTypesCjs()
-await insertCommonJsPackageJson({
-  buildFileUrl: import.meta.url,
-  cjsDir: 'dist/cjs',
-})
+
+await insertCommonJsPackageJson({ buildFileUrl: import.meta.url })

packages/auth-providers/supabase/middleware/package.json

@@ -29,7 +29,7 @@
   "scripts": {
     "build": "tsx ./build.mts",
     "build:pack": "yarn pack -o redwoodjs-auth-supabase-middleware.tgz",
-    "build:types": "tsc --build --verbose ./tsconfig.json",
+    "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:types-cjs": "tsc --build --verbose ./tsconfig.cjs.json",
     "check:attw": "yarn attw -P",
     "check:package": "concurrently npm:check:attw yarn:publint",

packages/auth-providers/supabase/middleware/src/__tests__/defaultGetRoles.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { defaultGetRoles } from '../defaultGetRoles'
+import { defaultGetRoles } from '../defaultGetRoles.js'
 
 describe('dbAuth: defaultGetRoles', () => {
   it('returns an empty array if no roles are present', () => {

packages/auth-providers/supabase/middleware/src/__tests__/initSupabaseAuthMiddleware.test.ts

@@ -10,8 +10,9 @@ import {
   MiddlewareResponse,
 } from '@redwoodjs/web/middleware'
 
-import initSupabaseAuthMiddleware from '../index'
-import type { SupabaseAuthMiddlewareOptions } from '../index'
+import initSupabaseAuthMiddleware from '../index.js'
+import type { SupabaseAuthMiddlewareOptions } from '../index.js'
+
 const FIXTURE_PATH = path.resolve(
   __dirname,
   '../../../../../../__fixtures__/example-todo-main',

packages/auth-providers/supabase/middleware/src/defaultGetRoles.ts

@@ -33,7 +33,8 @@
 
 interface PartialSupabaseDecoded {
   app_metadata: {
-    roles?: string
+    [key: string]: unknown
+    roles?: string | undefined
   }
 }
 

packages/auth-providers/supabase/middleware/tsconfig.build.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../../../tsconfig.compilerOption.json",
+  "compilerOptions": {
+    "strict": true,
+    "rootDir": "src",
+    "outDir": "dist",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "tsBuildInfoFile": "./tsconfig.build.tsbuildinfo"
+  },
+  "include": ["src/**/*"],
+  "references": [
+    { "path": "../../../auth/tsconfig.build.json" },
+    { "path": "../../../vite/tsconfig.build.json" }
+  ]
+}

packages/auth-providers/supabase/middleware/tsconfig.cjs.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.build.json",
   "compilerOptions": {
     "outDir": "dist/cjs",
     "tsBuildInfoFile": "./tsconfig.cjs.tsbuildinfo"

packages/auth-providers/supabase/middleware/tsconfig.json

@@ -2,13 +2,12 @@
   "extends": "../../../../tsconfig.compilerOption.json",
   "compilerOptions": {
     "strict": true,
-    "rootDir": "src",
     "outDir": "dist",
     "module": "Node16",
-    "moduleResolution": "Node16",
-    "tsBuildInfoFile": "./tsconfig.tsbuildinfo"
+    "moduleResolution": "Node16"
   },
-  "include": ["src/**/*"],
+  "include": ["."],
+  "exclude": ["dist", "node_modules", "**/__mocks__", "**/__fixtures__"],
   "references": [
     { "path": "../../../auth/tsconfig.build.json" },
     { "path": "../../../vite/tsconfig.build.json" }

packages/context/build.mts

@@ -1,28 +1,14 @@
-import { build, defaultBuildOptions } from '@redwoodjs/framework-tools'
+import { buildCjs, buildEsm } from '@redwoodjs/framework-tools'
 import {
   generateTypesCjs,
   generateTypesEsm,
   insertCommonJsPackageJson,
 } from '@redwoodjs/framework-tools/generateTypes'
 
-// ESM build and type generation
-await build({
-  buildOptions: {
-    ...defaultBuildOptions,
-    format: 'esm',
-  },
-})
+await buildEsm()
 await generateTypesEsm()
 
-// CJS build, type generation, and package.json insert
-await build({
-  buildOptions: {
-    ...defaultBuildOptions,
-    outdir: 'dist/cjs',
-  },
-})
+await buildCjs()
 await generateTypesCjs()
-await insertCommonJsPackageJson({
-  buildFileUrl: import.meta.url,
-  cjsDir: 'dist/cjs',
-})
+
+await insertCommonJsPackageJson({ buildFileUrl: import.meta.url })

packages/context/package.json

@@ -39,7 +39,7 @@
   "scripts": {
     "build": "tsx ./build.mts",
     "build:pack": "yarn pack -o redwoodjs-context.tgz",
-    "build:types": "tsc --build --verbose ./tsconfig.json",
+    "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:types-cjs": "tsc --build --verbose ./tsconfig.cjs.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx\" --ignore dist --exec \"yarn build\"",
     "check:attw": "yarn attw -P",

packages/context/tsconfig.build.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.compilerOption.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "tsBuildInfoFile": "./tsconfig.build.tsbuildinfo"
+  },
+  "include": ["src"]
+}

packages/context/tsconfig.cjs.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.build.json",
   "compilerOptions": {
     "outDir": "dist/cjs",
     "tsBuildInfoFile": "./tsconfig.cjs.tsbuildinfo"

packages/context/tsconfig.json

@@ -1,11 +1,11 @@
 {
   "extends": "../../tsconfig.compilerOption.json",
   "compilerOptions": {
-    "rootDir": "src",
     "outDir": "dist",
     "module": "Node16",
-    "moduleResolution": "Node16",
-    "tsBuildInfoFile": "./tsconfig.tsbuildinfo"
+    "moduleResolution": "Node16"
   },
-  "include": ["src"]
+  "include": ["."],
+  "exclude": ["dist", "node_modules", "**/__mocks__", "**/__fixtures__"],
+  "references": [{ "path": "../framework-tools" }]
 }

packages/framework-tools/src/buildDefaults.ts

@@ -85,6 +85,48 @@ export async function build({
   }
 }
 
+export function buildCjs() {
+  return build({
+    buildOptions: {
+      ...defaultBuildOptions,
+      tsconfig: 'tsconfig.cjs.json',
+      outdir: 'dist/cjs',
+    },
+  })
+}
+
+export function buildEsm() {
+  return build({
+    buildOptions: {
+      ...defaultBuildOptions,
+      tsconfig: 'tsconfig.build.json',
+      format: 'esm',
+    },
+  })
+}
+
+export function buildExternalCjs() {
+  return build({
+    buildOptions: {
+      ...defaultBuildOptions,
+      tsconfig: 'tsconfig.cjs.json',
+      outdir: 'dist/cjs',
+      packages: 'external',
+    },
+  })
+}
+
+export function buildExternalEsm() {
+  return build({
+    buildOptions: {
+      ...defaultBuildOptions,
+      tsconfig: 'tsconfig.build.json',
+      format: 'esm',
+      packages: 'external',
+    },
+  })
+}
+
 interface CopyAssetsOptions {
   buildFileUrl: string
   patterns: string[]