Skip to content

Commit 0252c2d

Browse files
committed
Configuration style updated JSON to JS
1 parent 17f8385 commit 0252c2d

File tree

7 files changed

+304
-267
lines changed

7 files changed

+304
-267
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
node_modules
22
dist
3-
.vscode
4-
dummy

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dist

.prettierrc

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
{
2-
3-
"bracketSameLine": true,
4-
"semi": true,
5-
"proseWrap": "always",
6-
"printWidth": 75,
7-
"arrowParens": "always",
8-
"singleAttributePerLine": true,
9-
"trailingComma": "all",
10-
"embeddedLanguageFormatting": "auto",
11-
"experimentalTernaries": true,
12-
"parser": "typescript",
13-
"tabWidth": 2,
14-
"useTabs": true
15-
}
2+
"bracketSameLine": true,
3+
"semi": true,
4+
"proseWrap": "always",
5+
"printWidth": 75,
6+
"arrowParens": "always",
7+
"singleAttributePerLine": true,
8+
"trailingComma": "all",
9+
"embeddedLanguageFormatting": "auto",
10+
"experimentalTernaries": true,
11+
"parser": "typescript",
12+
"tabWidth": 2,
13+
"useTabs": true
14+
}

.richiejs

Lines changed: 0 additions & 219 deletions
This file was deleted.

configLoader.ts

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,33 @@
1-
import { existsSync, readFileSync } from "fs";
2-
import { join } from "path";
3-
import { configurationOptions } from "./lib/options";
1+
import { existsSync } from "node:fs";
2+
import { join } from "node:path";
3+
import { configurationOptions } from "./lib/types";
44

5-
const CONFIG_FILE_NAME = ".richiejs";
5+
export default function loadConfig(): configurationOptions {
6+
const CONFIG_FILE_NAME = "richie.config.js";
67

7-
const projectConfigFile = join(process.cwd(), CONFIG_FILE_NAME);
8-
const projectHasConfig = existsSync(projectConfigFile);
8+
const projectConfigFile = join(process.cwd(), CONFIG_FILE_NAME);
9+
const projectHasConfig = existsSync(projectConfigFile);
910

10-
let projectConfig: configurationOptions = {} as configurationOptions;
11-
let defaultConfig: configurationOptions = {} as configurationOptions;
11+
let projectConfig: configurationOptions = {} as configurationOptions;
12+
let defaultConfig: configurationOptions = {} as configurationOptions;
1213

13-
if (projectHasConfig) {
14-
//load project config
15-
try {
16-
projectConfig = JSON.parse(
17-
readFileSync(projectConfigFile, { encoding: "utf8" }),
18-
);
19-
} catch (err) {
20-
if (err instanceof SyntaxError) {
21-
console.log(
22-
"Error: Check configuration file if there any syntax mistake",
23-
);
24-
} else {
25-
console.log("Unexpected Error while loading settings");
14+
if (projectHasConfig) {
15+
//load project config
16+
try {
17+
projectConfig = require(projectConfigFile).default;
18+
} catch (err) {
19+
console.log("Error while loading settings\n", err);
20+
process.exit(1);
2621
}
27-
process.exit(1);
2822
}
29-
}
30-
//load default configuration
31-
defaultConfig = JSON.parse(
32-
readFileSync(join(__dirname, CONFIG_FILE_NAME), { encoding: "utf8" }),
33-
);
3423

35-
const configurations: configurationOptions = {
36-
...defaultConfig,
37-
...projectConfig,
38-
};
24+
//load default configuration
25+
defaultConfig = require(join(__dirname, CONFIG_FILE_NAME)).default;
26+
27+
const configurations: configurationOptions = {
28+
...defaultConfig,
29+
...projectConfig,
30+
};
3931

40-
export default configurations;
32+
return configurations;
33+
}

0 commit comments

Comments
 (0)