From 30151498bb8e4f7fa84f0c8e0b92648a4fb12103 Mon Sep 17 00:00:00 2001 From: Alec Aivazis Date: Fri, 7 Oct 2022 23:39:29 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20v0.16.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/brown-onions-smile.md | 5 ----- .changeset/quiet-buses-film.md | 5 ----- CHANGELOG.md | 8 ++++++++ package.json | 2 +- src/cmd/generate.ts | 13 ++++++++++++- 5 files changed, 21 insertions(+), 12 deletions(-) delete mode 100644 .changeset/brown-onions-smile.md delete mode 100644 .changeset/quiet-buses-film.md diff --git a/.changeset/brown-onions-smile.md b/.changeset/brown-onions-smile.md deleted file mode 100644 index 42ee19da55..0000000000 --- a/.changeset/brown-onions-smile.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'houdini': patch ---- - -Don't consider the schema path as an source for generation diff --git a/.changeset/quiet-buses-film.md b/.changeset/quiet-buses-film.md deleted file mode 100644 index 6480846fbc..0000000000 --- a/.changeset/quiet-buses-film.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'houdini': patch ---- - -fix bug prevent documents from being discovered on windows diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eb9615782..a8fc2f3715 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # houdini +## 0.16.8 + +### 🐛 Fixes + +- [#595](https://github.com/HoudiniGraphql/houdini/pull/595) [`3421404`](https://github.com/HoudiniGraphql/houdini/commit/3421404e58697bc8e066d3f0b2d9c74c77c0318a) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - Don't consider the schema path as an source for generation + +- [#594](https://github.com/HoudiniGraphql/houdini/pull/594) [`4ee9db3`](https://github.com/HoudiniGraphql/houdini/commit/4ee9db312c8ef9db3244bcd2f10f877d596e6f8d) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - Fixed bug preventing documents from being discovered on windows + ## 0.16.7 ### 🐛 Fixes diff --git a/package.json b/package.json index 856eebafd1..2e0ae40fcd 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "houdini", - "version": "0.16.7", + "version": "0.16.8", "description": "The disappearing graphql client for SvelteKit", "type": "module", "bin": "./build/cmd.js", diff --git a/src/cmd/generate.ts b/src/cmd/generate.ts index e03179ee61..cd94bb2dee 100755 --- a/src/cmd/generate.ts +++ b/src/cmd/generate.ts @@ -212,7 +212,18 @@ async function collectDocuments(config: Config): Promise config.includeFile(filepath)) // don't include the schema path as a source file - .filter((filepath) => !config.schemaPath || !minimatch(filepath, config.schemaPath)) + .filter((filepath) => { + const prefix = config.schemaPath?.startsWith('./') ? './' : '' + + return ( + !config.schemaPath || + !minimatch( + prefix + + path.relative(config.projectRoot, filepath).replaceAll('\\', '/'), + config.schemaPath + ) + ) + }) ), ]