Merge branch 'master' of github.com:spotify/backstage into shmidt-i/circle-ci-plugin-new-route-api

packages/create-app/templates/default-app/.gitignore

@@ -22,6 +22,7 @@ node_modules/
 
 # Build output
 dist
+dist-types
 
 # Temporary change files created by Vim
 *.swp

packages/create-app/templates/default-app/app-config.development.yaml

@@ -0,0 +1,11 @@
+app:
+  baseUrl: http://localhost:3000
+
+backend:
+  baseUrl: http://localhost:7000
+  listen:
+    port: 7000
+  cors:
+    origin: http://localhost:3000
+    methods: [GET, POST, PUT, DELETE]
+    credentials: true

packages/create-app/templates/default-app/app-config.yaml.hbs

@@ -1,6 +1,6 @@
 app:
   title: Scaffolded Backstage App
-  baseUrl: http://localhost:3000
+  baseUrl: http://localhost:7000
 
 organization:
   name: Acme Corporation
@@ -9,10 +9,6 @@ backend:
   baseUrl: http://localhost:7000
   listen:
     port: 7000
-  cors:
-    origin: http://localhost:3000
-    methods: [GET, POST, PUT, DELETE]
-    credentials: true
   {{#if dbTypeSqlite}}
   database:
     client: sqlite3

packages/create-app/templates/default-app/package.json.hbs

@@ -9,6 +9,7 @@
     "start": "yarn workspace app start",
     "build": "lerna run build",
     "tsc": "tsc",
+    "tsc:full": "tsc --skipLibCheck false --incremental false",
     "clean": "backstage-cli clean && lerna run clean",
     "diff": "lerna run diff --",
     "test": "lerna run test --since origin/master -- --coverage",

packages/create-app/templates/default-app/packages/app/package.json.hbs

@@ -8,6 +8,7 @@
     "@material-ui/icons": "^4.9.1",
     "@backstage/cli": "^{{version}}",
     "@backstage/core": "^{{version}}",
+    "@backstage/plugin-api-docs": "^{{version}}",
     "@backstage/plugin-catalog": "^{{version}}",
     "@backstage/plugin-register-component": "^{{version}}",
     "@backstage/plugin-scaffolder": "^{{version}}",

packages/create-app/templates/default-app/packages/app/src/App.tsx

@@ -10,6 +10,7 @@ import * as plugins from './plugins';
 import { AppSidebar } from './sidebar';
 import { Route, Routes, Navigate } from 'react-router';
 import { Router as CatalogRouter } from '@backstage/plugin-catalog';
+import { Router as DocsRouter } from '@backstage/plugin-techdocs';
 import { EntityPage } from './components/catalog/EntityPage';
 
 const app = createApp({
@@ -33,6 +34,7 @@ const App: FC<{}> = () => (
             path="/catalog/*"
             element={<CatalogRouter EntityPage={EntityPage} />}
           />
+          <Route path="/docs/*" element={<DocsRouter />} />
           <Navigate key="/" to="/catalog" />
           {deprecatedAppRoutes}
         </Routes>

packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx

@@ -21,6 +21,9 @@ import {
   Router as CircleCIRouter,
   isPluginApplicableToEntity as isCircleCIAvailable,
 } from '@backstage/plugin-circleci';
+import { Router as ApiDocsRouter } from '@backstage/plugin-api-docs';
+import { EmbeddedDocsRouter as DocsRouter } from '@backstage/plugin-techdocs';
+
 import React from 'react';
 import {
   EntityPageLayout,
@@ -69,6 +72,16 @@ const ServiceEntityPage = ({ entity }: { entity: Entity }) => (
       title="CI/CD"
       element={<CICDSwitcher entity={entity} />}
     />
+    <EntityPageLayout.Content
+      path="/api/*"
+      title="API"
+      element={<ApiDocsRouter entity={entity} />}
+    />
+     <EntityPageLayout.Content
+      path="/docs/*"
+      title="Docs"
+      element={<DocsRouter entity={entity} />}
+    />
   </EntityPageLayout>
 );
 
@@ -84,6 +97,11 @@ const WebsiteEntityPage = ({ entity }: { entity: Entity }) => (
       title="CI/CD"
       element={<CICDSwitcher entity={entity} />}
     />
+     <EntityPageLayout.Content
+      path="/docs/*"
+      title="Docs"
+      element={<DocsRouter entity={entity} />}
+    />
   </EntityPageLayout>
 );
 
@@ -94,6 +112,11 @@ const DefaultEntityPage = ({ entity }: { entity: Entity }) => (
       title="Overview"
       element={<OverviewContent entity={entity} />}
     />
+     <EntityPageLayout.Content
+      path="/docs/*"
+      title="Docs"
+      element={<DocsRouter entity={entity} />}
+    />
   </EntityPageLayout>
 );
 

packages/create-app/templates/default-app/packages/backend/package.json.hbs

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "build": "backstage-cli backend:build",
-    "build-image": "backstage-cli backend:build-image example-backend",
+    "build-image": "backstage-cli backend:build-image --build --tag example-backend",
     "start": "backstage-cli backend:dev",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test",

packages/create-app/templates/default-app/tsconfig.json

@@ -8,8 +8,7 @@
   ],
   "exclude": ["node_modules"],
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": ".",
-    "skipLibCheck": true
+    "outDir": "dist-types",
+    "rootDir": "."
   }
 }