Skip to content

Commit cc781c4

Browse files
feat: upgrade cosmiconfig-typescript-loader (#1126)
* feat: upgrade cosmiconfig-typescript-loader * format stuff * chore(dependencies): updated changesets for modified dependencies Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 318c9fd commit cc781c4

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"graphql-config": patch
3+
---
4+
5+
dependencies updates:
6+
7+
- Updated dependency [`cosmiconfig-typescript-loader@^4.0.0` ↗︎](https://www.npmjs.com/package/cosmiconfig-typescript-loader/v/null) (from `^3.1.0`, in `dependencies`)

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@graphql-tools/utils": "^8.6.5",
5959
"cosmiconfig": "7.0.1",
6060
"cosmiconfig-toml-loader": "1.0.0",
61-
"cosmiconfig-typescript-loader": "^3.1.0",
61+
"cosmiconfig-typescript-loader": "^4.0.0",
6262
"minimatch": "4.2.1",
6363
"ts-node": "^10.8.1",
6464
"string-env-interpolation": "1.0.1",

src/helpers/cosmiconfig.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { cosmiconfig, cosmiconfigSync, Loader, defaultLoaders } from 'cosmiconfig';
2-
import unsecure_loadTs from 'cosmiconfig-typescript-loader';
2+
import { TypeScriptLoader } from 'cosmiconfig-typescript-loader';
33
import { loadToml } from 'cosmiconfig-toml-loader';
44
import { env } from 'string-env-interpolation';
55

6-
/** The underlying module gives us { default: } on ESM but no default on CJS :) */
7-
const loadTs: typeof unsecure_loadTs = (unsecure_loadTs as any)?.default ?? unsecure_loadTs;
86
export interface ConfigSearchResult {
97
config: any;
108
filepath: string;
@@ -83,7 +81,7 @@ function prepareCosmiconfig(moduleName: string, { legacy }: { legacy: boolean })
8381
return {
8482
searchPlaces: searchPlaces.map((place) => place.replace('#', moduleName)),
8583
loaders: {
86-
'.ts': loadTs(),
84+
'.ts': TypeScriptLoader(),
8785
'.js': defaultLoaders['.js'],
8886
'.json': loadJson,
8987
'.yaml': loadYaml,

src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ export { GraphQLExtensionDeclaration } from './extension.js';
44
export { Source, Loader } from '@graphql-tools/utils';
55
export * from './types.js';
66
export * from './errors.js';
7-
export { LoadersRegistry } from "./loaders.js"
7+
export { LoadersRegistry } from './loaders.js';

test/loaders.spec.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jest.mock('@graphql-tools/load', () => {
1818
}
1919
`);
2020

21-
schema.isTheOne = true
21+
schema.isTheOne = true;
2222

2323
return {
2424
loadTypedefs: jest.fn(() => {
@@ -36,9 +36,6 @@ jest.mock('@graphql-tools/load', () => {
3636
};
3737
});
3838

39-
40-
41-
4239
describe('middlewares', () => {
4340
test('loads Sources instead of GraphQLSchema when middlewares are defined', () => {
4441
const registry = new LoadersRegistry({ cwd: __dirname });
@@ -78,12 +75,9 @@ describe('middlewares', () => {
7875

7976
expect(received.isTheOne).toEqual(true);
8077
expect(receivedAsync.isTheOne).toEqual(true);
81-
8278
});
8379
});
8480

85-
86-
8781
class CustomLoader implements Loader {
8882
private schema: GraphQLSchema;
8983

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2790,10 +2790,10 @@ cosmiconfig-toml-loader@1.0.0:
27902790
dependencies:
27912791
"@iarna/toml" "^2.2.5"
27922792

2793-
cosmiconfig-typescript-loader@^3.1.0:
2794-
version "3.1.1"
2795-
resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.1.1.tgz#9cdc2ae1a219cf52b0bc0647596c6691b9ab56a3"
2796-
integrity sha512-SR5/NciF0vyYqcGsmB9WJ4QOKkcSSSzcBPLrnT6094BYahMy0eImWvlH3zoEOYqpF2zgiyAKHtWTXTo+fqgxPg==
2793+
cosmiconfig-typescript-loader@^4.0.0:
2794+
version "4.0.0"
2795+
resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.0.0.tgz#4a6d856c1281135197346a6f64dfa73a9cd9fefa"
2796+
integrity sha512-cVpucSc2Tf+VPwCCR7SZzmQTQkPbkk4O01yXsYqXBIbjE1bhwqSyAgYQkRK1un4i0OPziTleqFhdkmOc4RQ/9g==
27972797

27982798
cosmiconfig@7.0.1:
27992799
version "7.0.1"

0 commit comments

Comments
 (0)