reciple 7.2.2 → 7.2.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.
|
@@ -11,16 +11,16 @@ const yaml_1 = __importDefault(require("yaml"));
|
|
|
11
11
|
function getConfigExtensions(config, configPath) {
|
|
12
12
|
if (!config.extends || Array.isArray(config.extends) && !config.extends.length)
|
|
13
13
|
return config;
|
|
14
|
-
|
|
14
|
+
let extensions = typeof config.extends === 'string' ? [config.extends] : config.extends;
|
|
15
|
+
extensions = extensions.map(e => configPath
|
|
16
|
+
? path_1.default.isAbsolute(e)
|
|
17
|
+
? e
|
|
18
|
+
: path_1.default.join(path_1.default.dirname(configPath), e)
|
|
19
|
+
: e);
|
|
15
20
|
for (const extension of extensions) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
: path_1.default.join(path_1.default.dirname(configPath), extension)
|
|
20
|
-
: extension;
|
|
21
|
-
if (!(0, fs_1.existsSync)(configExtensionPath))
|
|
22
|
-
throw new Error(`Config extension file doesn't exists: ${configExtensionPath}`);
|
|
23
|
-
const configExtension = getConfigExtensions(yaml_1.default.parse((0, fs_1.readFileSync)(configExtensionPath, 'utf-8')), configExtensionPath);
|
|
21
|
+
if (!(0, fs_1.existsSync)(extension))
|
|
22
|
+
throw new Error(`Config extension file doesn't exists: ${extension}`);
|
|
23
|
+
const configExtension = getConfigExtensions(yaml_1.default.parse((0, fs_1.readFileSync)(extension, 'utf-8')), extension);
|
|
24
24
|
config = (0, lodash_merge_1.default)(configExtension, config);
|
|
25
25
|
}
|
|
26
26
|
config.extends = extensions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConfigExtensions.js","sourceRoot":"","sources":["../../src/utils/getConfigExtensions.ts"],"names":[],"mappings":";;;;;;AAAA,2BAA8C;AAC9C,gEAAiC;AACjC,gDAAwB;AACxB,gDAAuB;AAEvB,SAAgB,mBAAmB,CAA2C,MAAS,EAAE,UAAmB;IACxG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAE9F,
|
|
1
|
+
{"version":3,"file":"getConfigExtensions.js","sourceRoot":"","sources":["../../src/utils/getConfigExtensions.ts"],"names":[],"mappings":";;;;;;AAAA,2BAA8C;AAC9C,gEAAiC;AACjC,gDAAwB;AACxB,gDAAuB;AAEvB,SAAgB,mBAAmB,CAA2C,MAAS,EAAE,UAAmB;IACxG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAE9F,IAAI,UAAU,GAAG,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;IACpF,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU;QACvC,CAAC,CAAC,cAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC,CAAC,CAAC;IAEb,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAChC,IAAI,CAAC,IAAA,eAAU,EAAC,SAAS,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,SAAS,EAAE,CAAC,CAAC;QAElG,MAAM,eAAe,GAAG,mBAAmB,CAAC,cAAG,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAEpG,MAAM,GAAG,IAAA,sBAAK,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;KAC3C;IAED,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC;IAE5B,OAAO,MAAM,CAAC;AAClB,CAAC;AArBD,kDAqBC"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"description": "Reciple is a Discord.js bot framework",
|
|
4
4
|
"homepage": "https://reciple.js.org/docs/reciple",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
|
-
"version": "7.2.
|
|
6
|
+
"version": "7.2.3",
|
|
7
7
|
"main": "./bin/index.js",
|
|
8
8
|
"module": "./bin/esm.mjs",
|
|
9
9
|
"types": "./bin/index.d.ts",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"README.md"
|
|
38
38
|
],
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@reciple/client": "^7.2.
|
|
40
|
+
"@reciple/client": "^7.2.3",
|
|
41
41
|
"commander": "^10.0.0",
|
|
42
42
|
"dotenv": "^16.0.3",
|
|
43
43
|
"fallout-utility": "^2.3.0",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"peerDependencies": {
|
|
60
60
|
"discord.js": "^14.7.1"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "13edae224e3777a0ae61e0abe32e3181ce60ba16"
|
|
63
63
|
}
|