Merge branch 'master' into codescene-plugin

microsite/data/plugins/adr.yaml

@@ -0,0 +1,9 @@
+---
+title: Architecture Decision Records
+author: Phil Kuang
+authorUrl: https://github.com/kuangp
+category: Discovery
+description: Browse your project's ADRs.
+documentation: https://github.com/backstage/backstage/tree/master/plugins/adr
+iconUrl: img/adr-logo.png
+npmPackageName: '@backstage/plugin-adr'

microsite/data/plugins/cloud-carbon-footprint.yaml

@@ -0,0 +1,15 @@
+---
+title: Cloud Carbon Footprint
+author: Thoughtworks
+authorUrl: https://github.com/cloud-carbon-footprint
+category: Metrics
+description: View your cloud carbon footprint by estimating energy use (kilowatt-hours) and carbon emissions (metric tons CO2e) from public cloud usage.
+documentation: https://github.com/cloud-carbon-footprint/ccf-backstage-plugin/blob/trunk/README.md
+iconUrl: https://www.cloudcarbonfootprint.org/img/logo.png
+npmPackageName: '@cloud-carbon-footprint/backstage-plugin-frontend'
+tags:
+  - sustainability
+  - cloud
+  - climate
+  - carbon-emissions
+  - carbon-footprint

microsite/package.json

@@ -16,7 +16,7 @@
     "lock:check": "yarn-lock-check"
   },
   "devDependencies": {
-    "@spotify/prettier-config": "^13.0.0",
+    "@spotify/prettier-config": "^13.0.1",
     "docusaurus": "^2.0.0-alpha.70",
     "js-yaml": "^4.1.0",
     "prettier": "^2.6.2",

microsite/sidebars.json

@@ -1,6 +1,6 @@
 {
   "releases": {
-    "Release Notes": ["releases/v1.0.0"]
+    "Release Notes": ["releases/v1.1.0", "releases/v1.0.0"]
   },
   "docs": {
     "Overview": [
@@ -109,6 +109,7 @@
           "features/techdocs/techdocs-overview",
           "features/techdocs/getting-started",
           "features/techdocs/concepts",
+          "features/techdocs/addons",
           "features/techdocs/architecture",
           "features/techdocs/creating-and-publishing",
           "features/techdocs/configuration",
@@ -156,7 +157,10 @@
       {
         "type": "subcategory",
         "label": "Gerrit",
-        "ids": ["integrations/gerrit/locations"]
+        "ids": [
+          "integrations/gerrit/locations",
+          "integrations/gerrit/discovery"
+        ]
       },
       {
         "type": "subcategory",
@@ -164,7 +168,8 @@
         "ids": [
           "integrations/github/locations",
           "integrations/github/discovery",
-          "integrations/github/org"
+          "integrations/github/org",
+          "integrations/github/github-apps"
         ]
       },
       {
@@ -202,7 +207,6 @@
           "plugins/proxying",
           "plugins/backend-plugin",
           "plugins/call-existing-api",
-          "plugins/github-apps",
           "plugins/url-reader"
         ]
       },
@@ -246,7 +250,6 @@
         ]
       },
       "auth/add-auth-provider",
-      "auth/using-auth",
       "auth/identity-resolver",
       "auth/auth-backend",
       "auth/oauth",

microsite/yarn.lock

@@ -909,10 +909,10 @@
   resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@spotify/prettier-config@^13.0.0":
-  version "13.0.0"
-  resolved "https://registry.npmjs.org/@spotify/prettier-config/-/prettier-config-13.0.0.tgz#ff6372cedf7e97e2e8a2d96c5ec12aa32cca3dbf"
-  integrity sha512-Hl3zgj67zaYejjLQLq0h0DlDMaI62EppO30AcStpLZNihjfwnFeS2+/gamiRHAnLki3P8bXaZVYwOV5NYNGQfw==
+"@spotify/prettier-config@^13.0.1":
+  version "13.0.1"
+  resolved "https://registry.npmjs.org/@spotify/prettier-config/-/prettier-config-13.0.1.tgz#0fdceb3d4ab543259ce6adc0ec1d10e34898b812"
+  integrity sha512-oVd4hjx2+y0MeUdk1l+ItwVLwlrDlvTlGwXBWMMzPYc7DLyxuxFvDfoHGkAQkrikfAgtdnzxrW6u9a8ywUqdfw==
 
 "@types/cheerio@^0.22.8":
   version "0.22.23"
@@ -1117,9 +1117,9 @@ async-each@^1.0.1:
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.npmjs.org/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  version "2.6.4"
+  resolved "https://registry.npmjs.org/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"