From c7466c4ce2cedd4df16faaf333a50f5ec450d477 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 31 Oct 2022 10:21:04 +0530 Subject: [PATCH 1/3] optimse only-db flag and add src directory to find resolvers in console --- packages/blitz/src/cli/utils/next-console.ts | 40 ++++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/packages/blitz/src/cli/utils/next-console.ts b/packages/blitz/src/cli/utils/next-console.ts index 5d6842e2c5..58b487cd6d 100644 --- a/packages/blitz/src/cli/utils/next-console.ts +++ b/packages/blitz/src/cli/utils/next-console.ts @@ -71,32 +71,30 @@ export const forceRequire = (modulePath: string) => { } } -export async function getBlitzModulePaths() { +export async function getBlitzModulePaths(onlyDb: boolean) { const projectRoot = getProjectRootSync() - const {globby} = await import("globby") - const paths = await globby( - [ - "app/**/{queries,mutations}/**/*.{js,ts,tsx}", - "utils/*.{js,ts,tsx}", - "jobs/**/*.{js,ts,tsx}", - "integrations/**/*.{js,ts,tsx}", - "!**/*.test.*", - "!**/*.spec.*", - ], - {cwd: projectRoot, gitignore: true}, - ) - paths.push(getDbFolder()) - debug("Paths", paths) - + const paths = [getDbFolder()] + if (!onlyDb) { + const {globby} = await import("globby") + paths.push( + ...(await globby( + [ + "{app,src}/**/{queries,mutations}/**/*.{js,ts,tsx}", + "utils/*.{js,ts,tsx}", + "jobs/**/*.{js,ts,tsx}", + "integrations/**/*.{js,ts,tsx}", + "!**/*.test.*", + "!**/*.spec.*", + ], + {cwd: projectRoot, gitignore: true}, + )), + ) + } return [...paths.map((p: string) => path.join(projectRoot, p))] } export const loadBlitz = async (onlyDb: boolean, module = "") => { - let paths = await getBlitzModulePaths() - - if (onlyDb) { - paths = paths.filter((p) => p.includes(getDbFolder())) - } + let paths = await getBlitzModulePaths(onlyDb) if (module) { paths = paths.filter((p) => module.includes(p) || p.includes(module)) From 217189dea5b5f3eef7fd939b371468d22963f251 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 31 Oct 2022 10:24:13 +0530 Subject: [PATCH 2/3] default parameter --- packages/blitz/src/cli/utils/next-console.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/blitz/src/cli/utils/next-console.ts b/packages/blitz/src/cli/utils/next-console.ts index 58b487cd6d..613ec8738f 100644 --- a/packages/blitz/src/cli/utils/next-console.ts +++ b/packages/blitz/src/cli/utils/next-console.ts @@ -71,7 +71,7 @@ export const forceRequire = (modulePath: string) => { } } -export async function getBlitzModulePaths(onlyDb: boolean) { +export async function getBlitzModulePaths(onlyDb = false) { const projectRoot = getProjectRootSync() const paths = [getDbFolder()] if (!onlyDb) { From a052a647b884803a5956552453d6207aed006f08 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 31 Oct 2022 10:32:01 +0530 Subject: [PATCH 3/3] Create stale-parents-yawn.md --- .changeset/stale-parents-yawn.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/stale-parents-yawn.md diff --git a/.changeset/stale-parents-yawn.md b/.changeset/stale-parents-yawn.md new file mode 100644 index 0000000000..ae92a8d334 --- /dev/null +++ b/.changeset/stale-parents-yawn.md @@ -0,0 +1,5 @@ +--- +"blitz": patch +--- + +Include resolvers in `src` directory in blitz console