Merge pull request #6697 from backstage/mob/bump-prettier-in-create-app

2021-08-06 09:39:01 +02:00
parent 9e8507305c 56c773909c
commit 0f6c44d39e
41 changed files with 145 additions and 51 deletions
@@ -0,0 +1,4 @@
+dist
+dist-types
+coverage
+.vscode
@@ -7,4 +7,4 @@ To start the app, run:
 ```sh
 yarn install
 yarn dev
-```
+```
@@ -32,9 +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)
-        #ca: # if you have a CA file and want to verify it you can uncomment this section
-        #  $file: <file-path>/ca/server.crt
+      # ssl: require # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require)
+      #   ca: # if you have a CA file and want to verify it you can uncomment this section
+      #     $file: <file-path>/ca/server.crt
  {{/if}}
  cache:
    store: memory
@@ -5,8 +5,8 @@ metadata:
  description: An example of a Backstage application.
  # Example for optional annotations
  # annotations:
-    # github.com/project-slug: backstage/backstage
-    # backstage.io/techdocs-ref: dir:.
+  #   github.com/project-slug: backstage/backstage
+  #   backstage.io/techdocs-ref: dir:.
 spec:
  type: website
  owner: john@example.com
@@ -19,6 +19,7 @@
    "test:all": "lerna run test -- --coverage",
    "lint": "lerna run lint --since origin/master --",
    "lint:all": "lerna run lint --",
+    "prettier:check": "prettier --check .",
    "create-plugin": "backstage-cli create-plugin --scope internal --no-private",
    "remove-plugin": "backstage-cli remove-plugin"
  },
@@ -37,7 +38,7 @@
    "@spotify/prettier-config": "^7.0.0",
    "concurrently": "^6.0.0",
    "lerna": "^4.0.0",
-    "prettier": "^1.19.1"
+    "prettier": "^2.3.2"
  },
  "prettier": "@spotify/prettier-config",
  "lint-staged": {
@@ -38,7 +38,7 @@
    "@testing-library/user-event": "^12.0.7",
    "@types/jest": "^26.0.7",
    "@types/node": "^14.14.32",
-    "@types/react-dom": "^16.9.8",
+    "@types/react-dom": "*",
    "cross-env": "^7.0.0",
    "cypress": "^7.3.0",
    "eslint-plugin-cypress": "^2.10.3",
@@ -65,7 +65,7 @@
    </script>
    <% } %>
  </head>
-  <body style="margin: 0;">
+  <body style="margin: 0">
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <div id="root"></div>
    <!--
@@ -6,11 +6,11 @@ import {
  CatalogIndexPage,
  catalogPlugin,
 } from '@backstage/plugin-catalog';
-import {CatalogImportPage, catalogImportPlugin} from '@backstage/plugin-catalog-import';
-import { 
-  ScaffolderPage, 
-  scaffolderPlugin 
-} from '@backstage/plugin-scaffolder';
+import {
+  CatalogImportPage,
+  catalogImportPlugin,
+} from '@backstage/plugin-catalog-import';
+import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
 import { SearchPage } from '@backstage/plugin-search';
 import { TechRadarPage } from '@backstage/plugin-tech-radar';
 import { TechdocsPage } from '@backstage/plugin-techdocs';
@@ -1,7 +1,12 @@
 import {
-  ScmIntegrationsApi, scmIntegrationsApiRef
+  ScmIntegrationsApi,
+  scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import { AnyApiFactory, configApiRef, createApiFactory } from '@backstage/core-plugin-api';
+import {
+  AnyApiFactory,
+  configApiRef,
+  createApiFactory,
+} from '@backstage/core-plugin-api';

 export const apis: AnyApiFactory[] = [
  createApiFactory({
@@ -91,7 +91,7 @@ const overviewContent = (
        </Grid>
      </EntitySwitch.Case>
    </EntitySwitch>
-    
+
    <EntitySwitch>
      <EntitySwitch.Case if={hasCatalogProcessingErrors}>
        <Grid item xs={12}>
@@ -1,11 +1,13 @@
 import {
  CatalogBuilder,
-  createRouter
+  createRouter,
 } from '@backstage/plugin-catalog-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';

-export default async function createPlugin(env: PluginEnvironment): Promise<Router> {
+export default async function createPlugin(
+  env: PluginEnvironment,
+): Promise<Router> {
  const builder = await CatalogBuilder.create(env);
  const {
    entitiesCatalog,
@@ -3,9 +3,7 @@ import {
  SingleHostDiscovery,
 } from '@backstage/backend-common';
 import { CatalogClient } from '@backstage/catalog-client';
-import {
-  createRouter,
-} from '@backstage/plugin-scaffolder-backend';
+import { createRouter } from '@backstage/plugin-scaffolder-backend';
 import Docker from 'dockerode';
 import { Router } from 'express';
 import type { PluginEnvironment } from '../types';
@@ -12,6 +12,6 @@ export type PluginEnvironment = {
  database: PluginDatabaseManager;
  cache: PluginCacheManager;
  config: Config;
-  reader: UrlReader
+  reader: UrlReader;
  discovery: PluginEndpointDiscovery;
 };