@jungvonmatt/contentful-config 3.0.2 → 3.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/index.d.ts +2 -12
  2. package/dist/index.js +2 -2
  3. package/dist/index.js.map +1 -1
  4. package/package.json +3 -3
  5. package/src/index.ts +4 -4
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { LoadConfigOptions } from '@jungvonmatt/config-loader';
1
+ import type { LoadConfigOptions, ResolvedConfig } from '@jungvonmatt/config-loader';
2
2
  import { type ContentfulOptions } from './contentful.js';
3
3
  type EnquirerContext<T extends Record<string, any> = ContentfulOptions> = {
4
4
  enquirer: {
@@ -70,14 +70,4 @@ export declare const getPrompts: (data?: Partial<ContentfulOptions>) => ({
70
70
  format?: undefined;
71
71
  })[];
72
72
  type LoadContentfulConfigOptions<T extends Record<string, any> = ContentfulOptions> = Omit<LoadConfigOptions<T>, 'name'>;
73
- export declare const loadContentfulConfig: <T extends Record<string, any> = ContentfulOptions>(name: string, options?: LoadContentfulConfigOptions<T>) => Promise<{
74
- config: T;
75
- filepath: string | undefined;
76
- missing: string[];
77
- layers: {
78
- type: "module" | "file" | "env" | "overrides" | "default" | "prompt";
79
- filepath: string | undefined;
80
- config: Partial<{ [K in keyof T]: T[K]; } & { [K_1 in keyof T]: T[K_1]; } & { [K_2 in Exclude<keyof T, number | symbol>]?: any; } & T>;
81
- cwd: string | undefined;
82
- }[];
83
- }>;
73
+ export declare const loadContentfulConfig: <T extends Record<string, any> = ContentfulOptions>(name: string, options?: LoadContentfulConfigOptions<T>) => Promise<ResolvedConfig<T>>;
package/dist/index.js CHANGED
@@ -188,11 +188,11 @@ export const loadContentfulConfig = async (name, options = {}) => {
188
188
  required,
189
189
  cwd: options?.cwd || packageDir || process.cwd(),
190
190
  name,
191
- defaultConfig: {
191
+ defaults: {
192
192
  environmentId: 'master',
193
193
  host: 'api.contentful.com',
194
194
  ...contentfulCliOptions.config,
195
- ...options?.defaultConfig,
195
+ ...options?.defaults,
196
196
  },
197
197
  envMap: {
198
198
  CONTENTFUL_SPACE_ID: 'spaceId',
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jungvonmatt/contentful-config",
3
- "version": "3.0.2",
3
+ "version": "3.0.3",
4
4
  "main": "./dist/index.js",
5
5
  "type": "module",
6
6
  "exports": "./dist/index.js",
@@ -36,12 +36,12 @@
36
36
  },
37
37
  "homepage": "https://github.com/jungvonmatt/contentful-ssg#readme",
38
38
  "dependencies": {
39
- "@jungvonmatt/config-loader": "^0.4.1",
39
+ "@jungvonmatt/config-loader": "^0.5.1",
40
40
  "contentful-management": "^11.12.1",
41
41
  "node-homedir": "^2.0.0",
42
42
  "package-up": "^5.0.0",
43
43
  "pathe": "^2.0.3",
44
44
  "type-fest": "^4.41.0"
45
45
  },
46
- "gitHead": "c2031185cf0573c56ed3070105b12680819337e5"
46
+ "gitHead": "e8e767eec3591a998f26a85ea07cc86bbcb5c51d"
47
47
  }
package/src/index.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { homedir } from 'node-homedir';
2
2
  import { packageUp } from 'package-up';
3
3
  import { dirname } from 'pathe';
4
- import type { LoadConfigOptions } from '@jungvonmatt/config-loader';
4
+ import type { LoadConfigOptions, ResolvedConfig } from '@jungvonmatt/config-loader';
5
5
  import {
6
6
  type ContentfulOptions,
7
7
  getApiKey,
@@ -211,7 +211,7 @@ const mergePrompts = <T extends Record<string, any>>(options: LoadContentfulConf
211
211
  export const loadContentfulConfig = async <T extends Record<string, any> = ContentfulOptions>(
212
212
  name: string,
213
213
  options: LoadContentfulConfigOptions<T> = {},
214
- ) => {
214
+ ): Promise<ResolvedConfig<T>> => {
215
215
  const { loadConfig } = await import('@jungvonmatt/config-loader');
216
216
 
217
217
  // Load global contentful config stored in a .contentfulrc.json file in the home directory
@@ -248,11 +248,11 @@ export const loadContentfulConfig = async <T extends Record<string, any> = Conte
248
248
  required,
249
249
  cwd: options?.cwd || packageDir || process.cwd(),
250
250
  name,
251
- defaultConfig: {
251
+ defaults: {
252
252
  environmentId: 'master',
253
253
  host: 'api.contentful.com',
254
254
  ...contentfulCliOptions.config,
255
- ...options?.defaultConfig,
255
+ ...options?.defaults,
256
256
  },
257
257
  envMap: {
258
258
  CONTENTFUL_SPACE_ID: 'spaceId',