@backstage/create-app 0.4.4 → 0.4.5

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @backstage/create-app
 
+## 0.4.5
+
+### Patch Changes
+
+- dcaeaac174: Cleaned out the `peerDependencies` in the published version of the package, making it much quicker to run `npx @backstage/create-app` as it no longer needs to install a long list of unnecessary.
+- a5a5d7e1f1: DefaultTechDocsCollator is now included in the search backend, and the Search Page updated with the SearchType component that includes the techdocs type
+- bab752e2b3: Change default port of backend from 7000 to 7007.
+
+  This is due to the AirPlay Receiver process occupying port 7000 and preventing local Backstage instances on MacOS to start.
+
+  You can change the port back to 7000 or any other value by providing an `app-config.yaml` with the following values:
+
+  ```
+  backend:
+    listen: 0.0.0.0:7123
+    baseUrl: http://localhost:7123
+  ```
+
+  More information can be found here: https://backstage.io/docs/conf/writing
+
+- 42ebbc18c0: Bump gitbeaker to the latest version
+
 ## 0.4.4
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -55,45 +55,45 @@ ${chalk__default['default'].red(`${error}`)}
   }
 }
 
-var version$A = "0.4.4";
+var version$A = "0.4.5";
 
 var version$z = "0.1.1";
 
-var version$y = "0.9.10";
+var version$y = "0.9.11";
 
 var version$x = "0.5.2";
 
 var version$w = "0.9.7";
 
-var version$v = "0.9.0";
+var version$v = "0.9.1";
 
 var version$u = "0.1.11";
 
-var version$t = "0.1.21";
+var version$t = "0.1.23";
 
-var version$s = "0.7.4";
+var version$s = "0.7.5";
 
-var version$r = "0.2.0";
+var version$r = "0.2.1";
 
-var version$q = "0.1.4";
+var version$q = "0.1.5";
 
 var version$p = "0.1.14";
 
-var version$o = "0.1.22";
+var version$o = "0.1.23";
 
 var version$n = "0.2.13";
 
-var version$m = "0.6.14";
+var version$m = "0.6.15";
 
 var version$l = "0.3.19";
 
-var version$k = "0.4.8";
+var version$k = "0.4.9";
 
 var version$j = "0.7.3";
 
 var version$i = "0.6.4";
 
-var version$h = "0.17.4";
+var version$h = "0.18.0";
 
 var version$g = "0.7.4";
 
@@ -101,31 +101,31 @@ var version$f = "0.2.29";
 
 var version$e = "0.3.21";
 
-var version$d = "0.4.24";
+var version$d = "0.4.25";
 
 var version$c = "0.2.30";
 
-var version$b = "0.3.28";
+var version$b = "0.3.29";
 
-var version$a = "0.2.13";
+var version$a = "0.2.14";
 
-var version$9 = "0.1.15";
+var version$9 = "0.1.16";
 
-var version$8 = "0.11.11";
+var version$8 = "0.11.12";
 
-var version$7 = "0.15.13";
+var version$7 = "0.15.14";
 
 var version$6 = "0.4.18";
 
-var version$5 = "0.2.6";
+var version$5 = "0.2.7";
 
 var version$4 = "0.4.3";
 
 var version$3 = "0.4.12";
 
-var version$2 = "0.12.6";
+var version$2 = "0.12.7";
 
-var version$1 = "0.10.8";
+var version$1 = "0.10.9";
 
 var version = "0.3.11";
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "A CLI that helps you create your own Backstage app",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -25,6 +25,8 @@
     "lint": "backstage-cli lint",
     "test": "backstage-cli test",
     "clean": "backstage-cli clean",
+    "prepack": "node scripts/prepack.js",
+    "postpack": "node scripts/postpack.js",
     "start": "nodemon --"
   },
   "dependencies": {
@@ -44,40 +46,6 @@
     "mock-fs": "^5.1.1",
     "ts-node": "^10.0.0"
   },
-  "peerDependencies": {
-    "@backstage/backend-common": "*",
-    "@backstage/catalog-client": "*",
-    "@backstage/catalog-model": "*",
-    "@backstage/cli": "*",
-    "@backstage/config": "*",
-    "@backstage/core-app-api": "*",
-    "@backstage/core-components": "*",
-    "@backstage/core-plugin-api": "*",
-    "@backstage/errors": "*",
-    "@backstage/integration-react": "*",
-    "@backstage/plugin-api-docs": "*",
-    "@backstage/plugin-app-backend": "*",
-    "@backstage/plugin-auth-backend": "*",
-    "@backstage/plugin-catalog": "*",
-    "@backstage/plugin-catalog-backend": "*",
-    "@backstage/plugin-catalog-import": "*",
-    "@backstage/plugin-explore": "*",
-    "@backstage/plugin-github-actions": "*",
-    "@backstage/plugin-lighthouse": "*",
-    "@backstage/plugin-proxy-backend": "*",
-    "@backstage/plugin-rollbar-backend": "*",
-    "@backstage/plugin-scaffolder": "*",
-    "@backstage/plugin-scaffolder-backend": "*",
-    "@backstage/plugin-search": "*",
-    "@backstage/plugin-search-backend": "*",
-    "@backstage/plugin-search-backend-node": "*",
-    "@backstage/plugin-tech-radar": "*",
-    "@backstage/plugin-techdocs": "*",
-    "@backstage/plugin-techdocs-backend": "*",
-    "@backstage/plugin-user-settings": "*",
-    "@backstage/test-utils": "*",
-    "@backstage/theme": "*"
-  },
   "nodemonConfig": {
     "watch": "./src",
     "exec": "bin/backstage-create-app",
@@ -88,5 +56,5 @@
     "dist",
     "templates"
   ],
-  "gitHead": "ddfdcd2b44dc9848cf550cea5346d5f9916a36d9"
+  "gitHead": "85c127e436a24140bb3606f17f034f82aa9c7c0d"
 }

package/templates/default-app/app-config.production.yaml

@@ -1,8 +1,8 @@
 app:
   # Should be the same as backend.baseUrl when using the `app-backend` plugin
-  baseUrl: http://localhost:7000
+  baseUrl: http://localhost:7007
 
 backend:
-  baseUrl: http://localhost:7000
+  baseUrl: http://localhost:7007
   listen:
-    port: 7000
+    port: 7007

package/templates/default-app/app-config.yaml.hbs

@@ -6,9 +6,9 @@ organization:
   name: My Company
 
 backend:
-  baseUrl: http://localhost:7000
+  baseUrl: http://localhost:7007
   listen:
-    port: 7000
+    port: 7007
   csp:
     connect-src: ["'self'", 'http:', 'https:']
     # Content-Security-Policy directives follow the Helmet format: https://helmetjs.github.io/#reference
@@ -32,7 +32,9 @@ backend:
       user: ${POSTGRES_USER}
       password: ${POSTGRES_PASSWORD}
       # https://node-postgres.com/features/ssl
-      # ssl: require # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require)
+      # you can set the sslmode configuration option via the `PGSSLMODE` environment variable
+      # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require)
+      # ssl:
       #   ca: # if you have a CA file and want to verify it you can uncomment this section
       #     $file: <file-path>/ca/server.crt
   {{/if}}

package/templates/default-app/packages/app/src/App.test.tsx

@@ -10,9 +10,9 @@ describe('App', () => {
         {
           data: {
             app: { title: 'Test' },
-            backend: { baseUrl: 'http://localhost:7000' },
+            backend: { baseUrl: 'http://localhost:7007' },
             techdocs: {
-              storageUrl: 'http://localhost:7000/api/techdocs/static/docs',
+              storageUrl: 'http://localhost:7007/api/techdocs/static/docs',
             },
           },
           context: 'test',

package/templates/default-app/packages/app/src/components/search/SearchPage.tsx

@@ -2,10 +2,13 @@ import React from 'react';
 import { makeStyles, Theme, Grid, List, Paper } from '@material-ui/core';
 
 import { CatalogResultListItem } from '@backstage/plugin-catalog';
+import { DocsResultListItem } from '@backstage/plugin-techdocs';
+
 import {
   SearchBar,
   SearchFilter,
   SearchResult,
+  SearchType,
   DefaultResultListItem,
 } from '@backstage/plugin-search';
 import { Content, Header, Page } from '@backstage/core-components';
@@ -39,6 +42,11 @@ const SearchPage = () => {
           </Grid>
           <Grid item xs={3}>
             <Paper className={classes.filters}>
+              <SearchType
+                values={['techdocs', 'software-catalog']}
+                name="type"
+                defaultValue="software-catalog"
+              />
               <SearchFilter.Select
                 className={classes.filter}
                 name="kind"
@@ -64,6 +72,13 @@ const SearchPage = () => {
                             result={document}
                           />
                         );
+                      case 'techdocs':
+                        return (
+                          <DocsResultListItem
+                            key={document.location}
+                            result={document}
+                          />
+                        );
                       default:
                         return (
                           <DefaultResultListItem

package/templates/default-app/packages/backend/README.md

@@ -36,7 +36,7 @@ yarn start
 Substitute `x` for actual values, or leave them as dummy values just to try out
 the backend without using the auth or sentry features.
 
-The backend starts up on port 7000 per default.
+The backend starts up on port 7007 per default.
 
 ## Populating The Catalog
 

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

@@ -27,7 +27,7 @@
     "@backstage/plugin-search-backend": "^{{version '@backstage/plugin-search-backend'}}",
     "@backstage/plugin-search-backend-node": "^{{version '@backstage/plugin-search-backend-node'}}",
     "@backstage/plugin-techdocs-backend": "^{{version '@backstage/plugin-techdocs-backend'}}",
-    "@gitbeaker/node": "^30.2.0",
+    "@gitbeaker/node": "^34.6.0",
     "@octokit/rest": "^18.5.3",
     "dockerode": "^3.3.1",
     "express": "^4.17.1",

package/templates/default-app/packages/backend/src/plugins/search.ts

@@ -6,6 +6,7 @@ import {
 } from '@backstage/plugin-search-backend-node';
 import { PluginEnvironment } from '../types';
 import { DefaultCatalogCollator } from '@backstage/plugin-catalog-backend';
+import { DefaultTechDocsCollator } from '@backstage/plugin-techdocs-backend';
 
 export default async function createPlugin({
   logger,
@@ -17,12 +18,18 @@ export default async function createPlugin({
   const indexBuilder = new IndexBuilder({ logger, searchEngine });
 
   // Collators are responsible for gathering documents known to plugins. This
-  // particular collator gathers entities from the software catalog.
+  // collator gathers entities from the software catalog.
   indexBuilder.addCollator({
     defaultRefreshIntervalSeconds: 600,
     collator: DefaultCatalogCollator.fromConfig(config, { discovery }),
   });
 
+  // collator gathers entities from techdocs.
+  indexBuilder.addCollator({
+    defaultRefreshIntervalSeconds: 600,
+    collator: DefaultTechDocsCollator.fromConfig(config, { discovery, logger }),
+  });
+
   // The scheduler controls when documents are gathered from collators and sent
   // to the search engine for indexing.
   const { scheduler } = await indexBuilder.build();