Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"tstyche": "3.0.0",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9",
"vitest": "3.2.4",
"yargs": "17.7.2",
"zx": "8.1.9"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/fastify/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"fastify": "5.3.3",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/api-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"pino-abstract-transport": "1.2.0",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"@cedarjs/graphql-server": "workspace:*"
Expand Down
24 changes: 22 additions & 2 deletions packages/api-server/src/__tests__/fastify.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import path from 'node:path'

import fastify from 'fastify'
import { vol } from 'memfs'
import {
Expand Down Expand Up @@ -26,7 +28,7 @@ vi.mock('fastify', () => {
})

// Suppress terminal logging.
console.log = vi.fn()
// console.log = vi.fn()

// Set up RWJS_CWD.
let original_RWJS_CWD: string | undefined
Expand All @@ -52,14 +54,32 @@ const userConfig = {
requestTimeout: 25_000,
}

console.log('dirname', __dirname)
const fileOSRoot = path.parse(__dirname).root
console.log('fileOSRoot', fileOSRoot)

vi.mock('/graphql/cedar-app/api/server.config.js', () => {
return {
default: {
config: userConfig,
},
}
})
vi.mock('\\redwood-app\\api\\server.config.js', () => {
vi.mock('/D:/graphql/cedar-app/api/server.config.js', () => {
return {
default: {
config: userConfig,
},
}
})
vi.mock('D:/graphql/cedar-app/api/server.config.js', () => {
return {
default: {
config: userConfig,
},
}
})
vi.mock('\\graphql\\cedar-app\\api\\server.config.js', () => {
return {
default: {
config: userConfig,
Expand Down
7 changes: 6 additions & 1 deletion packages/api-server/src/fastify.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import fs from 'fs'
import path from 'path'
import { pathToFileURL } from 'url'

import type { FastifyInstance, FastifyServerOptions } from 'fastify'
import Fastify from 'fastify'
Expand Down Expand Up @@ -48,7 +49,11 @@ export async function loadFastifyConfig() {

if (!isServerConfigLoaded) {
console.log(`Loading server config from ${serverConfigPath}`)
const config = await import(`file://${serverConfigPath}`)
console.log(`Loading server config from URL file://${serverConfigPath}`)
console.log(
`Loading server config from URL ${pathToFileURL(serverConfigPath).href}`,
)
const config = await import(pathToFileURL(serverConfigPath).href)
serverConfigFile = { ...config.default }
isServerConfigLoaded = true
}
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"ts-toolbelt": "9.6.0",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"memjs": "1.3.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/auth0/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/auth0/setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/auth0/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"react": "19.0.0-rc-f2df5694-20240916",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"@auth0/auth0-spa-js": "2.1.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"react": "19.0.0-rc-f2df5694-20240916",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"@azure/msal-browser": "2.39.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/clerk/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/clerk/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"react": "19.0.0-rc-f2df5694-20240916",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"@clerk/clerk-react": "5.12.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/custom/setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/dbAuth/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/dbAuth/middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"ts-toolbelt": "9.6.0",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/dbAuth/setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@simplewebauthn/types": "9.0.1",
"@types/yargs": "17.0.33",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/dbAuth/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@types/react": "^18.2.55",
"react": "19.0.0-rc-f2df5694-20240916",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/firebase/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/firebase/setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/firebase/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"react": "19.0.0-rc-f2df5694-20240916",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"firebase": "10.14.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/netlify/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/netlify/setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/netlify/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"react": "19.0.0-rc-f2df5694-20240916",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"netlify-identity-widget": "1.9.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/supabase/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/supabase/middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"ts-toolbelt": "9.6.0",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/supabase/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"react": "19.0.0-rc-f2df5694-20240916",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"@supabase/supabase-js": "2.45.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/supertokens/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"supertokens-node": "15.2.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-providers/supertokens/setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"publint": "0.3.12",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/auth-providers/supertokens/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"supertokens-auth-react": "0.39.1",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"peerDependencies": {
"supertokens-auth-react": "0.39.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"tsx": "4.19.4",
"type-fest": "4.26.1",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/babel-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@types/node": "20.17.10",
"babel-plugin-tester": "11.0.4",
"tsx": "4.19.4",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/cli-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@types/yargs-parser": "21.0.3",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/cli-packages/storybook-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"storybook": "7.6.20",
"storybook-framework-cedarjs": "workspace:*",
"termi-link": "1.1.0",
"vitest": "2.1.9",
"vitest": "3.2.4",
"yargs": "17.7.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"node-ssh": "13.2.1",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/codemods/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"publint": "0.3.12",
"tempy": "1.0.1",
"tsx": "4.19.4",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
2 changes: 1 addition & 1 deletion packages/cookie-jar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@types/fs-extra": "11.0.4",
"tsx": "4.19.4",
"typescript": "5.6.2",
"vitest": "2.1.9"
"vitest": "3.2.4"
},
"gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
}
Loading
Loading