openmrs 6.3.1-pre.3149 → 6.3.1-pre.3158
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.
|
@@ -210,9 +210,9 @@ async function runAssemble(args) {
|
|
|
210
210
|
await (0, promises_1.writeFile)((0, node_path_1.resolve)(args.target, `routes.registry${args.hashFiles ? '.' + (0, utils_1.contentHash)(routes) : ''}.json`), JSON.stringify(routes), 'utf-8');
|
|
211
211
|
}
|
|
212
212
|
if (args.configFiles && args.configFiles.length > 0) {
|
|
213
|
-
const assembledConfig = args.configFiles.reduce(
|
|
213
|
+
const assembledConfig = args.configFiles.reduce((merged, file) => {
|
|
214
214
|
try {
|
|
215
|
-
const config = JSON.parse(
|
|
215
|
+
const config = JSON.parse((0, node_fs_1.readFileSync)(file, 'utf8'));
|
|
216
216
|
return (0, merge_1.default)(merged, config);
|
|
217
217
|
}
|
|
218
218
|
catch (e) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "openmrs",
|
|
3
|
-
"version": "6.3.1-pre.
|
|
3
|
+
"version": "6.3.1-pre.3158",
|
|
4
4
|
"license": "MPL-2.0",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"bin": "./dist/cli.js",
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
],
|
|
30
30
|
"homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@openmrs/esm-app-shell": "6.3.1-pre.
|
|
33
|
-
"@openmrs/rspack-config": "6.3.1-pre.
|
|
34
|
-
"@openmrs/webpack-config": "6.3.1-pre.
|
|
32
|
+
"@openmrs/esm-app-shell": "6.3.1-pre.3158",
|
|
33
|
+
"@openmrs/rspack-config": "6.3.1-pre.3158",
|
|
34
|
+
"@openmrs/webpack-config": "6.3.1-pre.3158",
|
|
35
35
|
"@pnpm/npm-conf": "^2.1.0",
|
|
36
36
|
"@rspack/cli": "^1.3.11",
|
|
37
37
|
"@rspack/core": "^1.3.11",
|
package/src/commands/assemble.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { mkdir, readFile, writeFile } from 'node:fs/promises';
|
|
2
|
-
import { existsSync } from 'node:fs';
|
|
2
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
3
3
|
import { resolve, dirname, basename } from 'node:path';
|
|
4
4
|
import { Readable } from 'node:stream';
|
|
5
5
|
import { prompt, type Question } from 'inquirer';
|
|
@@ -305,9 +305,9 @@ export async function runAssemble(args: AssembleArgs) {
|
|
|
305
305
|
}
|
|
306
306
|
|
|
307
307
|
if (args.configFiles && args.configFiles.length > 0) {
|
|
308
|
-
const assembledConfig = args.configFiles.reduce(
|
|
308
|
+
const assembledConfig = args.configFiles.reduce((merged, file) => {
|
|
309
309
|
try {
|
|
310
|
-
const config = JSON.parse(
|
|
310
|
+
const config = JSON.parse(readFileSync(file, 'utf8'));
|
|
311
311
|
return merge(merged, config);
|
|
312
312
|
} catch (e) {
|
|
313
313
|
logWarn(`Error while processing config file ${file}: ${e}`);
|