Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support .cjs config files #129

Closed
wants to merge 3 commits into from
Closed

Support .cjs config files #129

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb72b51
Support .cjs config files
guillaumervls Jun 21, 2021
c87dea9
Update _common.ts
guillaumervls Jul 2, 2021
67b06b2
Update src/commands/_common.ts
guillaumervls Jul 2, 2021
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
7 changes: 5 additions & 2 deletions src/commands/_common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Settings } from "../settings";
export const DEFAULT_GMRC_PATH = `${process.cwd()}/.gmrc`;
export const DEFAULT_GMRCJS_PATH = `${DEFAULT_GMRC_PATH}.js`;
export const DEFAULT_GMRCCJS_PATH = `${DEFAULT_GMRC_PATH}.cjs`;
export const DEFAULT_GMRCMJS_PATH = `${DEFAULT_GMRC_PATH}.mjs`;

/**
* Represents the option flags that are valid for all commands (see
Expand Down Expand Up @@ -71,7 +72,7 @@ export async function getSettings(options: Options = {}): Promise<Settings> {
const relativePath = resolve(process.cwd(), path);

try {
return require(relativePath);
return relativePath.endsWith(".mjs") ? import(relativePath) : require(relativePath);
guillaumervls marked this conversation as resolved.
Show resolved Hide resolved
} catch (e) {
throw new Error(
`Failed to import '${relativePath}'; error:\n ${e.stack.replace(
Expand All @@ -87,7 +88,7 @@ export async function getSettings(options: Options = {}): Promise<Settings> {
throw new Error(`Failed to import '${configFile}': file not found`);
}

if (configFile.endsWith(".js") || configFile.endsWith(".cjs")) {
if (configFile.endsWith(".js") || configFile.endsWith(".cjs") || configFile.endsWith(".mjs")) {
return tryRequire(configFile);
} else {
return await getSettingsFromJSON(configFile);
Expand All @@ -98,6 +99,8 @@ export async function getSettings(options: Options = {}): Promise<Settings> {
return tryRequire(DEFAULT_GMRCJS_PATH);
} else if (await exists(DEFAULT_GMRCCJS_PATH)) {
return tryRequire(DEFAULT_GMRCCJS_PATH);
} else if (await exists(DEFAULT_GMRCMJS_PATH)) {
return tryRequire(DEFAULT_GMRCMJS_PATH);
} else {
throw new Error(
"No .gmrc file found; please run `graphile-migrate init` first.",
Expand Down