create-flow-os 0.0.47-dev.1772047467 → 0.0.47-dev.1772047685
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.
- package/package.json +1 -1
- package/src/init/merge.ts +1 -1
package/package.json
CHANGED
package/src/init/merge.ts
CHANGED
|
@@ -161,7 +161,7 @@ export function mergeCodeObject(userContent: string, templateContent: string, _p
|
|
|
161
161
|
const extToReplace = userExt ?? templateExt;
|
|
162
162
|
let merged = replaceObjectArg(base, extToReplace, mergedObj);
|
|
163
163
|
const templateExport = extractExportDefault(templateContent);
|
|
164
|
-
if (templateExport && !userHasExportDefault(userContent)) {
|
|
164
|
+
if (templateExport && !userHasExportDefault(userContent) && !userHasExportDefault(merged)) {
|
|
165
165
|
const userTrimmed = merged.trimEnd();
|
|
166
166
|
const sep = userTrimmed.endsWith("\n") || !userTrimmed ? "" : "\n\n";
|
|
167
167
|
merged = userTrimmed + sep + templateExport;
|