From 390edd9dd6ff33995477c7ed067e54bcf00e4bde Mon Sep 17 00:00:00 2001
From: Marco Wettstein <maw@panter.ch>
Date: Tue, 15 Mar 2022 10:03:51 +0100
Subject: [PATCH] fix(cli): migration does not work properly when component
name is not defined
---
cli/src/apps/cli/config/writeConfig.ts | 2 ++
cli/src/apps/cli/verify/migration/fromv2.ts | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cli/src/apps/cli/config/writeConfig.ts b/cli/src/apps/cli/config/writeConfig.ts
index c71799053..89845d128 100644
--- a/cli/src/apps/cli/config/writeConfig.ts
+++ b/cli/src/apps/cli/config/writeConfig.ts
@@ -4,6 +4,7 @@ import { writeFile } from "fs-extra";
import { dump } from "js-yaml";
import { format } from "prettier";
import { CommandInstance } from "vorpal";
+import { reloadConfig } from "../../../config/getProjectConfig";
import { getGitRoot } from "../../../utils/projects";
export const writeConfig = async (
@@ -66,6 +67,7 @@ export const writeConfig = async (
);
await exec("git add " + file);
}
+ await reloadConfig();
vorpal.log("done!");
vorpal.log("");
};
diff --git a/cli/src/apps/cli/verify/migration/fromv2.ts b/cli/src/apps/cli/verify/migration/fromv2.ts
index 787b9e9ca..21717190e 100644
--- a/cli/src/apps/cli/verify/migration/fromv2.ts
+++ b/cli/src/apps/cli/verify/migration/fromv2.ts
@@ -94,7 +94,7 @@ export const migrateV2 = async (vorpal: Vorpal) => {
const {
CUSTOMER_NAME,
APP_NAME,
- COMPONENT_NAME,
+ COMPONENT_NAME = "web",
APP_DIR = ".",
STAGING_ENABLED,
} = gitlabCi.variables;
@@ -147,7 +147,7 @@ export const migrateV2 = async (vorpal: Vorpal) => {
const startCommand = Array.isArray(baseValues?.application?.command)
? baseValues?.application?.command.join(" ")
- : baseValues?.application?.command
+ : baseValues?.application?.command;
return {
vars: env ? transformVars(env) : undefined,
dir: dir,
--
GitLab