From f234f17853b5421bfb77b7b11d3950d523fae8f0 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 31 Aug 2020 16:44:36 +0200
Subject: [PATCH] cli: fix version management in create-app

---
 packages/cli/src/commands/create-plugin/createPlugin.ts   | 7 ++++++-
 packages/cli/src/commands/plugin/diff.ts                  | 5 ++++-
 packages/cli/templates/default-plugin/package.json.hbs    | 8 ++++----
 .../templates/default-app/{lerna.json.hbs => lerna.json}  | 2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)
 rename packages/create-app/templates/default-app/{lerna.json.hbs => lerna.json} (77%)

diff --git a/packages/cli/src/commands/create-plugin/createPlugin.ts b/packages/cli/src/commands/create-plugin/createPlugin.ts
index 47b883882b..5e6882a4a0 100644
--- a/packages/cli/src/commands/create-plugin/createPlugin.ts
+++ b/packages/cli/src/commands/create-plugin/createPlugin.ts
@@ -28,6 +28,7 @@ import {
 } from '../../lib/codeowners';
 import { paths } from '../../lib/paths';
 import { Task, templatingTask } from '../../lib/tasks';
+import { version as backstageVersion } from '../../lib/version';
 
 const exec = promisify(execCb);
 
@@ -239,7 +240,11 @@ export default async () => {
     await createTemporaryPluginFolder(tempDir);
 
     Task.section('Preparing files');
-    await templatingTask(templateDir, tempDir, { ...answers, version });
+    await templatingTask(templateDir, tempDir, {
+      ...answers,
+      version,
+      backstageVersion,
+    });
 
     Task.section('Moving to final location');
     await movePlugin(tempDir, pluginDir, answers.id);
diff --git a/packages/cli/src/commands/plugin/diff.ts b/packages/cli/src/commands/plugin/diff.ts
index 66db692ab4..99af093f2c 100644
--- a/packages/cli/src/commands/plugin/diff.ts
+++ b/packages/cli/src/commands/plugin/diff.ts
@@ -25,7 +25,7 @@ import {
   yesPromptFunc,
 } from '../../lib/diff';
 import { paths } from '../../lib/paths';
-import { version } from '../../lib/version';
+import { version as backstageVersion } from '../../lib/version';
 
 export type PluginData = {
   id: string;
@@ -62,9 +62,12 @@ export default async (cmd: Command) => {
     promptFunc = yesPromptFunc;
   }
 
+  const { version } = await fs.readJson(paths.resolveTargetRoot('lerna.json'));
+
   const data = await readPluginData();
   const templateFiles = await diffTemplateFiles('default-plugin', {
     version,
+    backstageVersion,
     ...data,
   });
   await handleAllFiles(fileHandlers, templateFiles, promptFunc);
diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index 4e85bf39bd..38d4e41b5b 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -21,8 +21,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^{{version}}",
-    "@backstage/theme": "^{{version}}",
+    "@backstage/core": "^{{backstageVersion}}",
+    "@backstage/theme": "^{{backstageVersion}}",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -31,8 +31,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^{{version}}",
-    "@backstage/dev-utils": "^{{version}}",
+    "@backstage/cli": "^{{backstageVersion}}",
+    "@backstage/dev-utils": "^{{backstageVersion}}",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/packages/create-app/templates/default-app/lerna.json.hbs b/packages/create-app/templates/default-app/lerna.json
similarity index 77%
rename from packages/create-app/templates/default-app/lerna.json.hbs
rename to packages/create-app/templates/default-app/lerna.json
index ba627eaf80..322929db1d 100644
--- a/packages/create-app/templates/default-app/lerna.json.hbs
+++ b/packages/create-app/templates/default-app/lerna.json
@@ -2,5 +2,5 @@
   "packages": ["packages/*", "plugins/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "{{version}}"
+  "version": "0.1.0"
 }