From 2c009db3b640deb31c1bd3dfcce72fba0d817792 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 2 Dec 2021 12:20:44 -0500 Subject: [PATCH 1/8] Bump Spotify's prettier Signed-off-by: Adam Harvey --- packages/create-app/templates/default-app/package.json.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs index bdae71d9e3..b0747c4454 100644 --- a/packages/create-app/templates/default-app/package.json.hbs +++ b/packages/create-app/templates/default-app/package.json.hbs @@ -31,7 +31,7 @@ }, "devDependencies": { "@backstage/cli": "^{{version '@backstage/cli'}}", - "@spotify/prettier-config": "^11.0.0", + "@spotify/prettier-config": "^12.0.0", "concurrently": "^6.0.0", "lerna": "^4.0.0", "prettier": "^2.3.2" From 2c503737550f0b14951f11e428160fbbdf2dd19d Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 2 Dec 2021 12:21:06 -0500 Subject: [PATCH 2/8] Move test-utils to devDeps Signed-off-by: Adam Harvey --- .../templates/default-app/packages/app/package.json.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs index 9e15608a01..fd4de85b60 100644 --- a/packages/create-app/templates/default-app/packages/app/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs @@ -22,7 +22,6 @@ "@backstage/plugin-tech-radar": "^{{version '@backstage/plugin-tech-radar'}}", "@backstage/plugin-techdocs": "^{{version '@backstage/plugin-techdocs'}}", "@backstage/plugin-user-settings": "^{{version '@backstage/plugin-user-settings'}}", - "@backstage/test-utils": "^{{version '@backstage/test-utils'}}", "@backstage/theme": "^{{version '@backstage/theme'}}", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -34,6 +33,7 @@ "react-use": "^15.3.3" }, "devDependencies": { + "@backstage/test-utils": "^{{version '@backstage/test-utils'}}", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^10.4.1", "@testing-library/user-event": "^12.0.7", From cfd019b72114da5a536bfc41e08806d5cff900f8 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 2 Dec 2021 12:29:16 -0500 Subject: [PATCH 3/8] Update Backstage docs link Signed-off-by: Adam Harvey --- packages/create-app/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/README.md b/packages/create-app/README.md index 9f86cdb448..8ed2fb93d5 100644 --- a/packages/create-app/README.md +++ b/packages/create-app/README.md @@ -22,4 +22,4 @@ yarn backstage-create-app ## Documentation - [Backstage Readme](https://github.com/backstage/backstage/blob/master/README.md) -- [Backstage Documentation](https://github.com/backstage/backstage/blob/master/docs/README.md) +- [Backstage Documentation](hhttps://backstage.io/docs/) From 2d3dd1e76fce11642314989f6e50bba758efa88e Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 2 Dec 2021 12:29:39 -0500 Subject: [PATCH 4/8] Fix doco typo Signed-off-by: Adam Harvey --- packages/create-app/src/createApp.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/src/createApp.ts b/packages/create-app/src/createApp.ts index d301792380..ac42ed0ff3 100644 --- a/packages/create-app/src/createApp.ts +++ b/packages/create-app/src/createApp.ts @@ -65,7 +65,7 @@ export default async (cmd: Command, version: string): Promise => { const templateDir = paths.resolveOwn('templates/default-app'); const tempDir = resolvePath(os.tmpdir(), answers.name); - // Use `--path` argument as applicaiton directory when specified, otherwise + // Use `--path` argument as application directory when specified, otherwise // create a directory using `answers.name` const appDir = cmd.path ? resolvePath(paths.targetDir, cmd.path) From bdf357956cd2dfd251f5c714ec93921bf2201462 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 2 Dec 2021 12:33:38 -0500 Subject: [PATCH 5/8] Align scripts order to monorepo Signed-off-by: Adam Harvey --- .../templates/default-app/packages/app/package.json.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs index fd4de85b60..68848d2de9 100644 --- a/packages/create-app/templates/default-app/packages/app/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs @@ -48,11 +48,11 @@ "scripts": { "start": "backstage-cli app:serve", "build": "backstage-cli app:build", - "test": "backstage-cli test", - "lint": "backstage-cli lint", "clean": "backstage-cli clean", + "test": "backstage-cli test", "test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev", "test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run", + "lint": "backstage-cli lint", "cy:dev": "cypress open", "cy:run": "cypress run" }, From 4862fbc64f5503a5f5944cb69a64d575c20339bc Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 2 Dec 2021 12:42:19 -0500 Subject: [PATCH 6/8] Add changeset Signed-off-by: Adam Harvey --- .changeset/thirty-readers-attack.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/thirty-readers-attack.md diff --git a/.changeset/thirty-readers-attack.md b/.changeset/thirty-readers-attack.md new file mode 100644 index 0000000000..bb05fd45f2 --- /dev/null +++ b/.changeset/thirty-readers-attack.md @@ -0,0 +1,5 @@ +--- +'@backstage/create-app': patch +--- + +Alignments of template with Backstage example app in monorepo From 7d24709264d4a673ea77730ad7519138cb139754 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 2 Dec 2021 14:30:44 -0500 Subject: [PATCH 7/8] Fix URL typo Signed-off-by: Adam Harvey --- packages/create-app/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/README.md b/packages/create-app/README.md index 8ed2fb93d5..d5b5039d4e 100644 --- a/packages/create-app/README.md +++ b/packages/create-app/README.md @@ -22,4 +22,4 @@ yarn backstage-create-app ## Documentation - [Backstage Readme](https://github.com/backstage/backstage/blob/master/README.md) -- [Backstage Documentation](hhttps://backstage.io/docs/) +- [Backstage Documentation](https://backstage.io/docs/) From c401170b360d58d9295d4d7d6b940c5db423455f Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 2 Dec 2021 14:47:36 -0500 Subject: [PATCH 8/8] Update changeset wording Signed-off-by: Adam Harvey --- .changeset/thirty-readers-attack.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/thirty-readers-attack.md b/.changeset/thirty-readers-attack.md index bb05fd45f2..cd05f4ebf4 100644 --- a/.changeset/thirty-readers-attack.md +++ b/.changeset/thirty-readers-attack.md @@ -2,4 +2,4 @@ '@backstage/create-app': patch --- -Alignments of template with Backstage example app in monorepo +Bump @spotify/prettier-config