paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 37 Packages Projects Releases Wiki Activity

Merge branch 'backstage:master' into feature/entity-dependencies-card-enhancements

Browse Source
This commit is contained in:
Abhay Soni
2023-07-07 11:47:25 +05:30
committed by GitHub
parent 540b1c5ed2 26125da35e
commit 3d4ba71a52
314 changed files with 4596 additions and 1234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/beige-actors-melt.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-kubernetes-backend': patch
---
Replace reference to deprecated import
.changeset/cold-hounds-cheat.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/create-app': patch
---
Post-create message - added instruction to run `yarn install` when app was created with `--skip-install`
.changeset/cool-beans-tap.md
+76
View File
@@ -0,0 +1,76 @@
---
'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': minor
---
**BREAKING**
This change updates the configuration of the confluence-to-markdown action so that it does not conflict with other confluence plguins. Currently many plugins make use of the `confluence.auth` configuration. However, only the confluence-to-markdown action uses the `confluence.auth` as a string. This change updates it so that `confluence.auth` is an object.
## Required Changes
Below are examples for updating `bearer`, `basic`, and `userpass` implementations.
For `bearer`:
Before:
```yaml
confluence:
baseUrl: 'https://confluence.example.com'
auth: 'bearer'
token: '${CONFLUENCE_TOKEN}'
```
After:
```yaml
confluence:
baseUrl: 'https://confluence.example.com'
auth:
type: 'bearer'
token: '${CONFLUENCE_TOKEN}'
```
For `basic`:
Before:
```yaml
confluence:
baseUrl: 'https://confluence.example.com'
auth: 'basic'
token: '${CONFLUENCE_TOKEN}'
email: 'example@company.org'
```
After:
```yaml
confluence:
baseUrl: 'https://confluence.example.com'
auth:
type: 'basic'
token: '${CONFLUENCE_TOKEN}'
email: 'example@company.org'
```
For `userpass`
Before:
```yaml
confluence:
baseUrl: 'https://confluence.example.com'
auth: 'userpass'
username: 'your-username'
password: 'your-password'
```
After:
```yaml
confluence:
baseUrl: 'https://confluence.example.com'
auth:
type: 'userpass'
username: 'your-username'
password: 'your-password'
```
.changeset/cool-starfishes-love.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/theme': patch
---
Overwrite `PaletteOptions` & `ThemeOptions` type to allow use of `createTheme` from `@backstage/theme` as well as `@material-ui/core/styles` with the same type. Also replaced the default `CSSBaseline` with v4 instead of v5 for better backwards compatibility for now.
.changeset/cuddly-guests-hide.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/create-app': patch
---
add cy.\*\*.should to cypress eslintrc
.changeset/lemon-cycles-enjoy.md
+7
View File
@@ -0,0 +1,7 @@
---
'@backstage/plugin-lighthouse': patch
---
Added more verbose components (used to render `null`) when no audits for a website corresponding to the provided url were found.
Added `Create New Audit` button for the `AuditListForEntity` component used by `EntityLighthouseContent` and `EmbeddedRouter`.
Removed error alert from `errorApi` if error was due to no audits being found for a website (empty database query result).
.changeset/mean-bobcats-taste.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-catalog-import': patch
---
Add a "View Component" button as the primary CTA after registering a new component using a link to catalog-info.yaml
.changeset/polite-shrimps-confess.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-kubernetes-backend': patch
---
Proxy endpoint supports cluster URLs with subpath
.changeset/pre.json
+24 -1
View File
@@ -232,21 +232,44 @@
},
"changesets": [
"angry-phones-wash",
"beige-actors-melt",
"chatty-buttons-deny",
"cli-always-yarn-pack-freal",
"cold-hounds-cheat",
"cool-starfishes-love",
"create-app-1687867724",
"cuddly-guests-hide",
"cyan-shirts-deny",
"dirty-wasps-draw",
"dull-onions-remember",
"fluffy-frogs-change",
"fresh-bears-yawn",
"green-otters-wait",
"khaki-rocks-do",
"lazy-frogs-destroy",
"lemon-cycles-enjoy",
"many-ants-poke",
"mean-bobcats-taste",
"mighty-pandas-deny",
"mighty-shoes-refuse",
"old-rules-give",
"popular-crabs-deny",
"popular-kangaroos-accept",
"purple-feet-approve",
"purple-starfishes-design",
"red-cherries-draw",
"renovate-f316d5e",
"seven-pillows-hear",
"short-rabbits-roll",
"silver-balloons-sniff",
"sixty-humans-rescue",
"sour-humans-begin",
"strange-baboons-look",
"tender-clouds-promise",
"thin-countries-battle",
"tough-flowers-suffer",
"twenty-seas-float"
"twenty-seas-float",
"yellow-schools-relax",
"young-frogs-burn"
]
}
.changeset/pretty-apes-know.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
---
Update readme and instructions
.changeset/purple-feet-approve.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/core-components': patch
---
The `Skip to content` button on click focuses on the main article tag and skips the `h1` tag. Users are not able to identify which page they are on currently. Now it's changed the behaviour of the button and focuses on the `h1` tag on the page.
.changeset/red-cherries-draw.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-kubernetes': patch
---
Make pod drawer headings consistent
.changeset/renovate-46eac46.md
+6
View File
@@ -0,0 +1,6 @@
---
'@backstage/cli': patch
'@backstage/plugin-scaffolder-backend': patch
---
Updated dependency `esbuild` to `^0.18.0`.
.changeset/renovate-739552f.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/codemods': patch
---
Updated dependency `jscodeshift` to `^0.15.0`.
.changeset/renovate-f316d5e.md
+7
View File
@@ -0,0 +1,7 @@
---
'@backstage/core-components': patch
'@backstage/plugin-codescene': patch
'@backstage/plugin-sonarqube': patch
---
Updated dependency `rc-progress` to `3.4.2`.
.changeset/shiny-meals-chew.md
+6
View File
@@ -0,0 +1,6 @@
---
'@backstage/plugin-kubernetes-backend': patch
---
Fixed a bug where the proxy endpoint would error when used in combination with
a local kubectl proxy process and a token-based auth strategy on-cluster.
.changeset/silver-balloons-sniff.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-catalog-unprocessed-entities': patch
---
Fixed spacing for success message
.changeset/sixty-humans-rescue.md
+6
View File
@@ -0,0 +1,6 @@
---
'@backstage/create-app': patch
'@backstage/plugin-catalog': patch
---
Display a warning alert if relations are defined, which don't exist in the catalog.
.changeset/tender-clouds-promise.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-auth-backend': patch
---
Support for Token Endpoint Auth Method for OIDC Provider
.changeset/wicked-ears-scream.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-scaffolder-backend-module-gitlab': patch
---
Fixed a bug in `gitlab:group:ensureExists` where `repos` was always set as the root group.
.changeset/yellow-schools-relax.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/theme': patch
---
Override the spacing to a v5 compliant method
.github/vale/Vocab/Backstage/accept.txt
+1
View File
@@ -409,6 +409,7 @@ unregistration
untracked
upsert
upvote
url
URIs
URLs
utils
app-config.yaml
+1
View File
@@ -354,6 +354,7 @@ auth:
clientSecret: ${AUTH_OIDC_CLIENT_SECRET}
authorizationUrl: ${AUTH_OIDC_AUTH_URL}
tokenUrl: ${AUTH_OIDC_TOKEN_URL}
tokenEndpointAuthMethod: ${AUTH_OIDC_TOKEN_ENDPOINT_AUTH_METHOD} # default='client_secret_basic'
tokenSignedResponseAlg: ${AUTH_OIDC_TOKEN_SIGNED_RESPONSE_ALG} # default='RS256'
scope: ${AUTH_OIDC_SCOPE} # default='openid profile email'
prompt: ${AUTH_OIDC_PROMPT} # default=none (allowed values: auto, none, consent, login)
docs/auth/oidc.md
+1
View File
@@ -237,6 +237,7 @@ check the App Registration you created:
- `metadataUrl`: In Overview > Endpoints tab, grab OpenID Connect metadata document URL.
- `authorizationUrl` and `tokenUrl`: Open the `metadataUrl` in a browser, that json will
hold these 2 urls somewhere in there.
- `tokenEndpointAuthMethod`: Don't define it, use the default unless you know what it does.
- `tokenSignedResponseAlg`: Don't define it, use the default unless you know what it does.
- `scope`: Only used if we didn't specify `defaultScopes` in the provider's factory,
basically the same thing.
docs/getting-started/configuration.md
+12 -5
View File
@@ -71,7 +71,7 @@ yarn add --cwd packages/backend pg
```
Use your favorite editor to open `app-config.yaml` and add your PostgreSQL
configuration. in the root directory of your Backstage app using the credentials
configuration in the root directory of your Backstage app using the credentials
from the previous steps.
```yaml title="app-config.yaml"
@@ -90,10 +90,17 @@ 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
# highlight-add-end
# ssl:
# host is only needed if the connection name differs from the certificate name.
# This is for example the case with CloudSQL.
# host: servername in the certificate
# ca:
# $file: <file-path>/server.pem
# key:
# $file: <file-path>/client.key
# cert:
# $file: <file-path>/client-cert.pem
# highlight-add-end
```
You'll use the connection details from the previous step. You can either set the
docs/plugins/analytics.md
+5 -3
View File
@@ -34,15 +34,17 @@ is a concrete implementation of [AnalyticsApi][analytics-api-type], common
integrations are packaged and provided as plugins. Find your analytics tool of
choice below.
| Analytics Tool | Support Status |
| ---------------------- | -------------- |
| [Google Analytics][ga] | Yes ✅ |
| Analytics Tool | Support Status |
| ------------------------- | -------------- |
| [Google Analytics][ga] | Yes ✅ |
| [Google Analytics 4][ga4] | Yes ✅ |
To suggest an integration, please [open an issue][add-tool] for the analytics
tool your organization uses. Or jump to [Writing Integrations][int-howto] to
learn how to contribute the integration yourself!
[ga]: https://github.com/backstage/backstage/blob/master/plugins/analytics-module-ga/README.md
[ga4]: https://github.com/backstage/backstage/blob/master/plugins/analytics-module-ga4/README.md
[add-tool]: https://github.com/backstage/backstage/issues/new?assignees=&labels=plugin&template=plugin_template.md&title=%5BAnalytics+Module%5D+THE+ANALYTICS+TOOL+TO+INTEGRATE
[int-howto]: #writing-integrations
[analytics-api-type]: https://backstage.io/docs/reference/core-plugin-api.analyticsapi
docs/releases/v1.16.0-next.1-changelog.md
+1201
View File
File diff suppressed because it is too large Load Diff
microsite/data/plugins/k8sgpt.yaml
+1 -1
View File
@@ -2,7 +2,7 @@
title: k8sgpt
author: suxess-it
authorUrl: github.com/suxess-it
category: monitoring
category: Monitoring
description: show all k8sgpt results of the k8sgpt operator related to your entity
documentation: https://github.com/suxess-it/backstage-plugin-k8sgpt/blob/main/README.md
iconUrl: https://raw.githubusercontent.com/k8sgpt-ai/k8sgpt/1a81227d6148be59b7b9ae4e9ae5e2d9a5b7a9ae/images/banner-white.png
microsite/data/plugins/kubecost.yaml
+10
View File
@@ -0,0 +1,10 @@
---
title: Kubecost
author: suxess-it
authorUrl: https://github.com/suxess-it
category: Discovery
description: Get cost insights from Kubecost Installation for your k8s deployments
documentation: https://github.com/suxess-it/backstage-plugin-kubecost/blob/main/README.md
iconUrl: https://avatars.githubusercontent.com/u/45108136?s=200&v=4
npmPackageName: '@suxess-it/backstage-plugin-kubecost'
addedDate: '2023-06-29'
microsite/yarn.lock
+46 -46
View File
@@ -2604,90 +2604,90 @@ __metadata:
languageName: node
linkType: hard
"@swc/core-darwin-arm64@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-darwin-arm64@npm:1.3.66"
"@swc/core-darwin-arm64@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-darwin-arm64@npm:1.3.68"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
"@swc/core-darwin-x64@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-darwin-x64@npm:1.3.66"
"@swc/core-darwin-x64@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-darwin-x64@npm:1.3.68"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
"@swc/core-linux-arm-gnueabihf@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.66"
"@swc/core-linux-arm-gnueabihf@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.68"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard
"@swc/core-linux-arm64-gnu@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-linux-arm64-gnu@npm:1.3.66"
"@swc/core-linux-arm64-gnu@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-linux-arm64-gnu@npm:1.3.68"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard
"@swc/core-linux-arm64-musl@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-linux-arm64-musl@npm:1.3.66"
"@swc/core-linux-arm64-musl@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-linux-arm64-musl@npm:1.3.68"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
"@swc/core-linux-x64-gnu@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-linux-x64-gnu@npm:1.3.66"
"@swc/core-linux-x64-gnu@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-linux-x64-gnu@npm:1.3.68"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
"@swc/core-linux-x64-musl@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-linux-x64-musl@npm:1.3.66"
"@swc/core-linux-x64-musl@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-linux-x64-musl@npm:1.3.68"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
"@swc/core-win32-arm64-msvc@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-win32-arm64-msvc@npm:1.3.66"
"@swc/core-win32-arm64-msvc@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-win32-arm64-msvc@npm:1.3.68"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard
"@swc/core-win32-ia32-msvc@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-win32-ia32-msvc@npm:1.3.66"
"@swc/core-win32-ia32-msvc@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-win32-ia32-msvc@npm:1.3.68"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard
"@swc/core-win32-x64-msvc@npm:1.3.66":
version: 1.3.66
resolution: "@swc/core-win32-x64-msvc@npm:1.3.66"
"@swc/core-win32-x64-msvc@npm:1.3.68":
version: 1.3.68
resolution: "@swc/core-win32-x64-msvc@npm:1.3.68"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
"@swc/core@npm:^1.3.46":
version: 1.3.66
resolution: "@swc/core@npm:1.3.66"
version: 1.3.68
resolution: "@swc/core@npm:1.3.68"
dependencies:
"@swc/core-darwin-arm64": 1.3.66
"@swc/core-darwin-x64": 1.3.66
"@swc/core-linux-arm-gnueabihf": 1.3.66
"@swc/core-linux-arm64-gnu": 1.3.66
"@swc/core-linux-arm64-musl": 1.3.66
"@swc/core-linux-x64-gnu": 1.3.66
"@swc/core-linux-x64-musl": 1.3.66
"@swc/core-win32-arm64-msvc": 1.3.66
"@swc/core-win32-ia32-msvc": 1.3.66
"@swc/core-win32-x64-msvc": 1.3.66
"@swc/core-darwin-arm64": 1.3.68
"@swc/core-darwin-x64": 1.3.68
"@swc/core-linux-arm-gnueabihf": 1.3.68
"@swc/core-linux-arm64-gnu": 1.3.68
"@swc/core-linux-arm64-musl": 1.3.68
"@swc/core-linux-x64-gnu": 1.3.68
"@swc/core-linux-x64-musl": 1.3.68
"@swc/core-win32-arm64-msvc": 1.3.68
"@swc/core-win32-ia32-msvc": 1.3.68
"@swc/core-win32-x64-msvc": 1.3.68
peerDependencies:
"@swc/helpers": ^0.5.0
dependenciesMeta:
@@ -2714,7 +2714,7 @@ __metadata:
peerDependenciesMeta:
"@swc/helpers":
optional: true
checksum: e6029c648ba47c522bed51a9f2fee606f82de1f9233e2e89197e43b0a4867054174ca05e825e688cdc4de332221c0da2e12ba7ba875549e8b5432aa70fe19263
checksum: f56ad1d4cb91f7cc1cb5d4b9894bbb528da0b2eabc98984581f5b3f3187cf2c0d512003880f6ff7a3f6d215b7a3dcbf5a9c45e8a428ac2d711941027c0151d89
languageName: node
linkType: hard
@@ -5028,14 +5028,14 @@ __metadata:
linkType: hard
"docusaurus-plugin-sass@npm:^0.2.3":
version: 0.2.3
resolution: "docusaurus-plugin-sass@npm:0.2.3"
version: 0.2.4
resolution: "docusaurus-plugin-sass@npm:0.2.4"
dependencies:
sass-loader: ^10.1.1
peerDependencies:
"@docusaurus/core": ^2.0.0-beta
sass: ^1.30.0
checksum: 928b02fd7c63835d54cdcce2eeda01cb6124707c6d43ef8e77db06474d3e3b4b7282cc0d88fed378cf1f3db2fc93ba8c11366965bb9b668eae19ca805e578acb
checksum: 10e0c9f519dd7ef4666b1fb82d120738feab03ea451c18bab7f785627887f65b8cb72457065a9b2a2664af1490c20b38df9adf525c1b58ce3e324d2b50412734
languageName: node
linkType: hard
package.json
+1 -1
View File
@@ -47,7 +47,7 @@
"@types/react": "^17",
"@types/react-dom": "^17"
},
"version": "1.16.0-next.0",
"version": "1.16.0-next.1",
"dependencies": {
"@backstage/errors": "workspace:^",
"@manypkg/get-packages": "^1.1.3"
packages/app-defaults/CHANGELOG.md
+11
View File
@@ -1,5 +1,16 @@
# @backstage/app-defaults
## 1.4.1-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/core-app-api@1.8.2-next.0
- @backstage/plugin-permission-react@0.4.14-next.1
## 1.4.1-next.0
### Patch Changes
packages/app-defaults/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/app-defaults",
"description": "Provides the default wiring of a Backstage App",
"version": "1.4.1-next.0",
"version": "1.4.1-next.1",
"publishConfig": {
"access": "public",
"main": "dist/index.esm.js",
packages/app/CHANGELOG.md
+71
View File
@@ -1,5 +1,76 @@
# example-app
## 0.2.85-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/plugin-scaffolder-react@1.5.1-next.1
- @backstage/plugin-lighthouse@0.4.5-next.1
- @backstage/plugin-catalog-import@0.9.10-next.1
- @backstage/core-components@0.13.3-next.1
- @backstage/plugin-kubernetes@0.9.3-next.1
- @backstage/plugin-catalog-unprocessed-entities@0.1.1-next.1
- @backstage/plugin-home@0.5.4-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/app-defaults@1.4.1-next.1
- @backstage/cli@0.22.9-next.0
- @backstage/integration-react@1.1.15-next.1
- @backstage/plugin-adr@0.6.3-next.1
- @backstage/plugin-airbrake@0.3.20-next.1
- @backstage/plugin-api-docs@0.9.6-next.1
- @backstage/plugin-azure-devops@0.3.2-next.1
- @backstage/plugin-azure-sites@0.1.9-next.1
- @backstage/plugin-badges@0.2.44-next.1
- @backstage/plugin-catalog-graph@0.2.32-next.1
- @backstage/plugin-catalog-react@1.7.1-next.1
- @backstage/plugin-circleci@0.3.20-next.1
- @backstage/plugin-cloudbuild@0.3.20-next.1
- @backstage/plugin-code-coverage@0.2.13-next.1
- @backstage/plugin-cost-insights@0.12.9-next.1
- @backstage/plugin-devtools@0.1.2-next.1
- @backstage/plugin-dynatrace@6.0.1-next.1
- @backstage/plugin-entity-feedback@0.2.3-next.1
- @backstage/plugin-explore@0.4.6-next.1
- @backstage/plugin-gcalendar@0.3.16-next.1
- @backstage/plugin-gcp-projects@0.3.39-next.1
- @backstage/plugin-github-actions@0.6.1-next.1
- @backstage/plugin-gocd@0.1.26-next.1
- @backstage/plugin-graphiql@0.2.52-next.1
- @backstage/plugin-jenkins@0.8.2-next.1
- @backstage/plugin-kafka@0.3.20-next.1
- @backstage/plugin-linguist@0.1.5-next.1
- @backstage/plugin-microsoft-calendar@0.1.5-next.1
- @backstage/plugin-newrelic@0.3.38-next.1
- @backstage/plugin-nomad@0.1.1-next.1
- @backstage/plugin-octopus-deploy@0.2.2-next.1
- @backstage/plugin-org@0.6.10-next.1
- @backstage/plugin-pagerduty@0.6.1-next.1
- @backstage/plugin-playlist@0.1.12-next.1
- @backstage/plugin-puppetdb@0.1.3-next.1
- @backstage/plugin-rollbar@0.4.20-next.1
- @backstage/plugin-scaffolder@1.14.1-next.1
- @backstage/plugin-search@1.3.3-next.1
- @backstage/plugin-search-react@1.6.3-next.1
- @backstage/plugin-sentry@0.5.5-next.1
- @backstage/plugin-shortcuts@0.3.12-next.1
- @backstage/plugin-stack-overflow@0.1.18-next.1
- @backstage/plugin-stackstorm@0.1.4-next.1
- @backstage/plugin-tech-insights@0.3.12-next.1
- @backstage/plugin-tech-radar@0.6.6-next.1
- @backstage/plugin-techdocs@1.6.5-next.1
- @backstage/plugin-techdocs-module-addons-contrib@1.0.15-next.1
- @backstage/plugin-techdocs-react@1.1.8-next.1
- @backstage/plugin-todo@0.2.22-next.1
- @backstage/plugin-user-settings@0.7.5-next.1
- @backstage/plugin-apache-airflow@0.2.13-next.1
- @backstage/plugin-newrelic-dashboard@0.2.13-next.1
- @internal/plugin-catalog-customized@0.0.12-next.1
- @backstage/core-app-api@1.8.2-next.0
- @backstage/plugin-permission-react@0.4.14-next.1
- @backstage/config@1.0.8
## 0.2.85-next.0
### Patch Changes
packages/app/cypress/.eslintrc.json
+1 -1
View File
@@ -5,7 +5,7 @@
"jest/expect-expect": [
"error",
{
"assertFunctionNames": ["expect", "cy.contains"]
"assertFunctionNames": ["expect", "cy.contains", "cy.**.should"]
}
]
}
packages/app/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "example-app",
"version": "0.2.85-next.0",
"version": "0.2.85-next.1",
"private": true,
"backstage": {
"role": "frontend"
packages/app/src/components/catalog/EntityPage.tsx
+10
View File
@@ -66,6 +66,8 @@ import {
isKind,
isOrphan,
hasLabels,
hasRelationWarnings,
EntityRelationWarning,
} from '@internal/plugin-catalog-customized';
import {
Direction,
@@ -328,6 +330,14 @@ const entityWarningContent = (
</EntitySwitch.Case>
</EntitySwitch>
<EntitySwitch>
<EntitySwitch.Case if={hasRelationWarnings}>
<Grid item xs={12}>
<EntityRelationWarning />
</Grid>
</EntitySwitch.Case>
</EntitySwitch>
<EntitySwitch>
<EntitySwitch.Case if={hasCatalogProcessingErrors}>
<Grid item xs={12}>
packages/backend-next/CHANGELOG.md
+11
View File
@@ -1,5 +1,16 @@
# example-backend-next
## 0.0.13-next.1
### Patch Changes
- Updated dependencies
- @backstage/plugin-kubernetes-backend@0.11.2-next.1
- @backstage/plugin-badges-backend@0.2.2-next.1
- @backstage/plugin-azure-devops-backend@0.3.26-next.1
- @backstage/plugin-devtools-backend@0.1.2-next.1
- @backstage/plugin-linguist-backend@0.3.1-next.1
## 0.0.13-next.0
### Patch Changes
packages/backend-next/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "example-backend-next",
"version": "0.0.13-next.0",
"version": "0.0.13-next.1",
"main": "dist/index.cjs.js",
"types": "src/index.ts",
"license": "Apache-2.0",
packages/backend/CHANGELOG.md
+14
View File
@@ -1,5 +1,19 @@
# example-backend
## 0.2.85-next.1
### Patch Changes
- Updated dependencies
- @backstage/plugin-kubernetes-backend@0.11.2-next.1
- @backstage/plugin-badges-backend@0.2.2-next.1
- @backstage/plugin-azure-devops-backend@0.3.26-next.1
- @backstage/plugin-devtools-backend@0.1.2-next.1
- @backstage/plugin-linguist-backend@0.3.1-next.1
- @backstage/plugin-auth-backend@0.18.5-next.1
- example-app@0.2.85-next.1
- @backstage/config@1.0.8
## 0.2.85-next.0
### Patch Changes
packages/backend/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "example-backend",
"version": "0.2.85-next.0",
"version": "0.2.85-next.1",
"main": "dist/index.cjs.js",
"types": "src/index.ts",
"license": "Apache-2.0",
packages/cli/package.json
+1 -1
View File
@@ -78,7 +78,7 @@
"cross-spawn": "^7.0.3",
"css-loader": "^6.5.1",
"diff": "^5.0.0",
"esbuild": "^0.17.0",
"esbuild": "^0.18.0",
"esbuild-loader": "^2.18.0",
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
packages/codemods/package.json
+1 -1
View File
@@ -36,7 +36,7 @@
"@backstage/cli-common": "workspace:^",
"chalk": "^4.0.0",
"commander": "^9.1.0",
"jscodeshift": "^0.14.0",
"jscodeshift": "^0.15.0",
"jscodeshift-add-imports": "^1.0.10"
},
"devDependencies": {
packages/core-app-api/CHANGELOG.md
+8
View File
@@ -1,5 +1,13 @@
# @backstage/core-app-api
## 1.8.2-next.0
### Patch Changes
- Updated dependencies
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/config@1.0.8
## 1.8.1
### Patch Changes
packages/core-app-api/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/core-app-api",
"description": "Core app API used by Backstage apps",
"version": "1.8.1",
"version": "1.8.2-next.0",
"publishConfig": {
"access": "public",
"main": "dist/index.esm.js",
packages/core-components/CHANGELOG.md
+11
View File
@@ -1,5 +1,16 @@
# @backstage/core-components
## 0.13.3-next.1
### Patch Changes
- 7e0f558fbc37: The `Skip to content` button on click focuses on the main article tag and skips the `h1` tag. Users are not able to identify which page they are on currently. Now it's changed the behaviour of the button and focuses on the `h1` tag on the page.
- 015439b5b6ca: Updated dependency `rc-progress` to `3.4.2`.
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/config@1.0.8
## 0.13.3-next.0
### Patch Changes
packages/core-components/package.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/core-components",
"description": "Core components used by Backstage plugins and apps",
"version": "0.13.3-next.0",
"version": "0.13.3-next.1",
"publishConfig": {
"access": "public",
"main": "dist/index.esm.js",
@@ -60,7 +60,7 @@
"pluralize": "^8.0.0",
"prop-types": "^15.7.2",
"qs": "^6.9.4",
"rc-progress": "3.4.1",
"rc-progress": "3.4.2",
"react-helmet": "6.1.0",
"react-hook-form": "^7.12.2",
"react-markdown": "^8.0.0",
packages/core-components/src/layout/Content/Content.tsx
-5
View File
@@ -17,7 +17,6 @@
import { makeStyles, Theme } from '@material-ui/core/styles';
import classNames from 'classnames';
import React, { PropsWithChildren } from 'react';
import { useContent } from '../Sidebar';
/** @public */
export type BackstageContentClassKey = 'root' | 'stretch' | 'noPadding';
@@ -64,13 +63,9 @@ type Props = {
export function Content(props: PropsWithChildren<Props>) {
const { className, stretch, noPadding, children, ...restProps } = props;
const { contentRef } = useContent();
const classes = useStyles();
return (
<article
ref={contentRef}
tabIndex={-1}
{...restProps}
className={classNames(classes.root, className, {
[classes.stretch]: stretch,
packages/core-components/src/layout/Header/Header.tsx
+9 -1
View File
@@ -25,6 +25,7 @@ import React, { CSSProperties, PropsWithChildren, ReactNode } from 'react';
import { Helmet } from 'react-helmet';
import { Link } from '../../components/Link';
import { Breadcrumbs } from '../Breadcrumbs';
import { useContent } from '../Sidebar';
/** @public */
export type HeaderClassKey =
@@ -157,8 +158,15 @@ const TypeFragment = ({
};
const TitleFragment = ({ pageTitle, classes, tooltip }: TitleFragmentProps) => {
const { contentRef } = useContent();
const FinalTitle = (
<Typography className={classes.title} variant="h1">
<Typography
ref={contentRef}
tabIndex={-1}
className={classes.title}
variant="h1"
>
{pageTitle}
</Typography>
);
packages/core-plugin-api/CHANGELOG.md
+8
View File
@@ -1,5 +1,13 @@
# @backstage/core-plugin-api
## 1.5.3-next.0
### Patch Changes
- 13426ebd1235: Change `IconComponent` type to be compatible with Material UI v5 icons.
- Updated dependencies
- @backstage/config@1.0.8
## 1.5.2
### Patch Changes
packages/core-plugin-api/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/core-plugin-api",
"description": "Core API used by Backstage plugins",
"version": "1.5.2",
"version": "1.5.3-next.0",
"publishConfig": {
"access": "public"
},
packages/create-app/CHANGELOG.md
+8
View File
@@ -1,5 +1,13 @@
# @backstage/create-app
## 0.5.3-next.1
### Patch Changes
- 76b83a4422bb: Post-create message - added instruction to run `yarn install` when app was created with `--skip-install`
- e3ce5dd3f89a: add cy.\*\*.should to cypress eslintrc
- 294b1629de28: Display a warning alert if relations are defined, which don't exist in the catalog.
## 0.5.3-next.0
### Patch Changes
packages/create-app/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/create-app",
"description": "A CLI that helps you create your own Backstage app",
"version": "0.5.3-next.0",
"version": "0.5.3-next.1",
"publishConfig": {
"access": "public"
},
packages/create-app/src/createApp.ts
+7
View File
@@ -129,6 +129,13 @@ export default async (opts: OptionValues): Promise<void> => {
);
Task.log();
Task.section('All set! Now you might want to');
if (!opts.skipInstall) {
Task.log(
` Install the dependencies: ${chalk.cyan(
`cd ${answers.name} && yarn install`,
)}`,
);
}
Task.log(` Run the app: ${chalk.cyan(`cd ${answers.name} && yarn dev`)}`);
Task.log(
' Set up the software catalog: https://backstage.io/docs/features/software-catalog/configuration',
packages/create-app/templates/default-app/packages/app/cypress/.eslintrc.json
+1 -1
View File
@@ -5,7 +5,7 @@
"jest/expect-expect": [
"error",
{
"assertFunctionNames": ["expect", "cy.contains"]
"assertFunctionNames": ["expect", "cy.contains", "cy.**.should"]
}
]
}
packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
+10
View File
@@ -25,6 +25,8 @@ import {
isKind,
hasCatalogProcessingErrors,
isOrphan,
hasRelationWarnings,
EntityRelationWarning,
} from '@backstage/plugin-catalog';
import {
isGithubActionsAvailable,
@@ -101,6 +103,14 @@ const entityWarningContent = (
</EntitySwitch.Case>
</EntitySwitch>
<EntitySwitch>
<EntitySwitch.Case if={hasRelationWarnings}>
<Grid item xs={12}>
<EntityRelationWarning />
</Grid>
</EntitySwitch.Case>
</EntitySwitch>
<EntitySwitch>
<EntitySwitch.Case if={hasCatalogProcessingErrors}>
<Grid item xs={12}>
packages/dev-utils/CHANGELOG.md
+14
View File
@@ -1,5 +1,19 @@
# @backstage/dev-utils
## 1.0.17-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/app-defaults@1.4.1-next.1
- @backstage/integration-react@1.1.15-next.1
- @backstage/test-utils@1.4.1-next.1
- @backstage/plugin-catalog-react@1.7.1-next.1
- @backstage/core-app-api@1.8.2-next.0
## 1.0.17-next.0
### Patch Changes
packages/dev-utils/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/dev-utils",
"description": "Utilities for developing Backstage plugins.",
"version": "1.0.17-next.0",
"version": "1.0.17-next.1",
"publishConfig": {
"access": "public",
"main": "dist/index.esm.js",
packages/e2e-test/CHANGELOG.md
+7
View File
@@ -1,5 +1,12 @@
# e2e-test
## 0.2.5-next.1
### Patch Changes
- Updated dependencies
- @backstage/create-app@0.5.3-next.1
## 0.2.5-next.0
### Patch Changes
packages/e2e-test/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "e2e-test",
"description": "E2E test for verifying Backstage packages",
"version": "0.2.5-next.0",
"version": "0.2.5-next.1",
"private": true,
"backstage": {
"role": "cli"
packages/integration-react/CHANGELOG.md
+10
View File
@@ -1,5 +1,15 @@
# @backstage/integration-react
## 1.1.15-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/config@1.0.8
## 1.1.15-next.0
### Patch Changes
packages/integration-react/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/integration-react",
"description": "Frontend package for managing integrations towards external systems",
"version": "1.1.15-next.0",
"version": "1.1.15-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
packages/techdocs-cli-embedded-app/CHANGELOG.md
+18
View File
@@ -1,5 +1,23 @@
# techdocs-cli-embedded-app
## 0.2.84-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/plugin-catalog@1.11.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/app-defaults@1.4.1-next.1
- @backstage/cli@0.22.9-next.0
- @backstage/integration-react@1.1.15-next.1
- @backstage/test-utils@1.4.1-next.1
- @backstage/plugin-techdocs@1.6.5-next.1
- @backstage/plugin-techdocs-react@1.1.8-next.1
- @backstage/core-app-api@1.8.2-next.0
- @backstage/config@1.0.8
## 0.2.84-next.0
### Patch Changes
packages/techdocs-cli-embedded-app/cypress/.eslintrc.json
+1 -1
View File
@@ -5,7 +5,7 @@
"jest/expect-expect": [
"error",
{
"assertFunctionNames": ["expect", "cy.contains"]
"assertFunctionNames": ["expect", "cy.contains", "cy.**.should"]
}
]
}
packages/techdocs-cli-embedded-app/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "techdocs-cli-embedded-app",
"version": "0.2.84-next.0",
"version": "0.2.84-next.1",
"private": true,
"backstage": {
"role": "frontend"
packages/test-utils/CHANGELOG.md
+11
View File
@@ -1,5 +1,16 @@
# @backstage/test-utils
## 1.4.1-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/core-app-api@1.8.2-next.0
- @backstage/plugin-permission-react@0.4.14-next.1
- @backstage/config@1.0.8
## 1.4.1-next.0
### Patch Changes
packages/test-utils/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/test-utils",
"description": "Utilities to test Backstage plugins and apps.",
"version": "1.4.1-next.0",
"version": "1.4.1-next.1",
"publishConfig": {
"access": "public"
},
packages/theme/CHANGELOG.md
+7
View File
@@ -1,5 +1,12 @@
# @backstage/theme
## 0.4.1-next.0
### Patch Changes
- 4f28914d9f0e: Overwrite `PaletteOptions` & `ThemeOptions` type to allow use of `createTheme` from `@backstage/theme` as well as `@material-ui/core/styles` with the same type. Also replaced the default `CSSBaseline` with v4 instead of v5 for better backwards compatibility for now.
- 874c3e8bf909: Override the spacing to a v5 compliant method
## 0.4.0
### Minor Changes
packages/theme/api-report.md
+14 -7
View File
@@ -10,7 +10,8 @@ import type { PaletteOptions } from '@material-ui/core/styles/createPalette';
import { PaletteOptions as PaletteOptions_2 } from '@mui/material/styles';
import { ReactNode } from 'react';
import { Theme } from '@mui/material/styles';
import { Theme as Theme_2 } from '@material-ui/core';
import { Theme as Theme_2 } from '@material-ui/core/styles';
import { Theme as Theme_3 } from '@material-ui/core';
import { ThemeOptions } from '@mui/material/styles';
import { ThemeOptions as ThemeOptions_2 } from '@material-ui/core/styles';
import type { ThemeOptions as ThemeOptions_3 } from '@material-ui/core';
@@ -86,7 +87,7 @@ export type BackstagePaletteOptions = PaletteOptions &
BackstagePaletteAdditions;
// @public @deprecated
export interface BackstageTheme extends Theme_2 {
export interface BackstageTheme extends Theme_3 {
// (undocumented)
getPageTheme: (selector: PageThemeSelector) => PageTheme;
// (undocumented)
@@ -172,13 +173,13 @@ export function createBaseThemeOptions<PaletteOptions>(
};
// @public @deprecated
export function createTheme(options: SimpleThemeOptions): Theme_2;
export function createTheme(options: SimpleThemeOptions): Theme_3;
// @public @deprecated
export function createThemeOptions(options: SimpleThemeOptions): ThemeOptions_3;
// @public @deprecated
export function createThemeOverrides(theme: Theme_2): Overrides;
export function createThemeOverrides(theme: Theme_3): Overrides;
// @public
export function createUnifiedTheme(options: UnifiedThemeOptions): UnifiedTheme;
@@ -187,7 +188,7 @@ export function createUnifiedTheme(options: UnifiedThemeOptions): UnifiedTheme;
export function createUnifiedThemeFromV4(options: ThemeOptions_2): UnifiedTheme;
// @public @deprecated
export const darkTheme: Theme_2;
export const darkTheme: Theme_3;
// @public
export const defaultComponentThemes: ThemeOptions['components'];
@@ -202,7 +203,7 @@ export function genPageTheme(props: {
}): PageTheme;
// @public @deprecated
export const lightTheme: Theme_2;
export const lightTheme: Theme_3;
// @public
export type PageTheme = {
@@ -380,6 +381,12 @@ export type SimpleThemeOptions = {
htmlFontSize?: number;
};
// @public
export type SupportedThemes = Theme_2 | Theme;
// @public
export type SupportedVersions = 'v4' | 'v5';
// @public
export const themes: {
light: UnifiedTheme;
@@ -398,7 +405,7 @@ export function transformV5ComponentThemesToV4(
// @public
export interface UnifiedTheme {
// (undocumented)
getTheme(version: string): unknown | undefined;
getTheme(version: SupportedVersions): SupportedThemes | undefined;
}
// @public
packages/theme/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/theme",
"description": "material-ui theme for use with Backstage.",
"version": "0.4.0",
"version": "0.4.1-next.0",
"publishConfig": {
"access": "public",
"main": "dist/index.esm.js",
packages/theme/src/unified/UnifiedTheme.tsx
+10 -15
View File
@@ -20,21 +20,22 @@ import {
createTheme,
} from '@material-ui/core/styles';
import type { PaletteOptions as PaletteOptionsV4 } from '@material-ui/core/styles/createPalette';
import { PaletteOptions as PaletteOptionsV5 } from '@mui/material/styles';
import {
adaptV4Theme,
DeprecatedThemeOptions,
Theme as Mui5Theme,
createTheme as createV5Theme,
PaletteOptions as PaletteOptionsV5,
ThemeOptions as ThemeOptionsV5,
adaptV4Theme,
createTheme as createV5Theme,
} from '@mui/material/styles';
import { transformV5ComponentThemesToV4 } from './overrides';
import { createBaseThemeOptions } from '../base/createBaseThemeOptions';
import { PageTheme } from '../base/types';
import { defaultComponentThemes } from '../v5';
import { createBaseThemeOptions } from '../base/createBaseThemeOptions';
import { UnifiedTheme } from './types';
import { transformV5ComponentThemesToV4 } from './overrides';
import { SupportedThemes, SupportedVersions, UnifiedTheme } from './types';
export class UnifiedThemeHolder implements UnifiedTheme {
#themes = new Map<string, unknown>();
#themes = new Map<SupportedVersions, SupportedThemes>();
constructor(v4?: Mui4Theme, v5?: Mui5Theme) {
this.#themes = new Map();
@@ -46,7 +47,7 @@ export class UnifiedThemeHolder implements UnifiedTheme {
}
}
getTheme(version: string): unknown | undefined {
getTheme(version: SupportedVersions): SupportedThemes | undefined {
return this.#themes.get(version);
}
}
@@ -75,12 +76,6 @@ export function createUnifiedTheme(options: UnifiedThemeOptions): UnifiedTheme {
const components = { ...defaultComponentThemes, ...options.components };
const v5Theme = createV5Theme({ ...themeOptions, components });
// TODO: Not super relevant in the beginning
/* const mui4Styles = maybeLoadMui4Styles();
if (!mui4Styles) {
return new UnifiedThemeHolder(undefined, v5Theme);
} */
const v4Overrides = transformV5ComponentThemesToV4(v5Theme, components);
const v4Theme = { ...createTheme(themeOptions), ...v4Overrides };
return new UnifiedThemeHolder(v4Theme, v5Theme);
@@ -95,7 +90,7 @@ export function createUnifiedTheme(options: UnifiedThemeOptions): UnifiedTheme {
export function createUnifiedThemeFromV4(
options: ThemeOptionsV4,
): UnifiedTheme {
const v5Theme = adaptV4Theme(options as any);
const v5Theme = adaptV4Theme(options as DeprecatedThemeOptions);
const v4Theme = createTheme(options);
return new UnifiedThemeHolder(v4Theme, v5Theme);
}
packages/theme/src/unified/UnifiedThemeProvider.tsx
+6 -4
View File
@@ -16,16 +16,18 @@
import React, { ReactNode } from 'react';
import './MuiClassNameSetup';
import { CssBaseline } from '@material-ui/core';
import {
ThemeProvider,
StylesProvider,
createGenerateClassName,
Theme as Mui4Theme,
} from '@material-ui/core/styles';
import {
StyledEngineProvider,
ThemeProvider as Mui5Provider,
Theme as Mui5Theme,
} from '@mui/material/styles';
import CSSBaseline from '@mui/material/CssBaseline';
import { UnifiedTheme } from './types';
/**
@@ -57,12 +59,12 @@ export function UnifiedThemeProvider(
): JSX.Element {
const { children, theme, noCssBaseline = false } = props;
const v4Theme = theme.getTheme('v4');
const v5Theme = theme.getTheme('v5');
const v4Theme = theme.getTheme('v4') as Mui4Theme;
const v5Theme = theme.getTheme('v5') as Mui5Theme;
let cssBaseline: JSX.Element | undefined = undefined;
if (!noCssBaseline) {
cssBaseline = <CSSBaseline />;
cssBaseline = <CssBaseline />;
}
let result = (
packages/theme/src/unified/index.ts
+1 -1
View File
@@ -20,4 +20,4 @@ export type { UnifiedThemeOptions } from './UnifiedTheme';
export { themes } from './themes';
export { UnifiedThemeProvider } from './UnifiedThemeProvider';
export type { UnifiedThemeProviderProps } from './UnifiedThemeProvider';
export type { UnifiedTheme } from './types';
export type { UnifiedTheme, SupportedThemes, SupportedVersions } from './types';
packages/theme/src/unified/overrides.test.ts
+2
View File
@@ -18,12 +18,14 @@ import { Theme } from '@mui/material/styles';
import { transformV5ComponentThemesToV4 } from './overrides';
describe('transformV5ComponentThemesToV4', () => {
// TODO: Create actual v5 Theme to avoid missing properties in test
const mockTheme = {
palette: {
primary: {
main: 'red',
},
},
spacing: (n: number) => `${n * 8}px`,
} as unknown as Theme;
it('transforms empty component themes', () => {
expect(transformV5ComponentThemesToV4(mockTheme)).toEqual({
packages/theme/src/unified/overrides.ts
+26
View File
@@ -29,6 +29,26 @@ type StaticStyleRules = Record<
CSSProperties | Record<string, CSSProperties>
>;
// Utility function based on v5 `createSpacing`: https://github.com/mui/material-ui/blob/master/packages/mui-system/src/createTheme/createSpacing.ts#L42C3-L59C5
const __v5Spacing =
(defaultSpacing: number) =>
(...argsInput: ReadonlyArray<number | string>) => {
const args = argsInput.length === 0 ? [1] : argsInput;
const transform = (argument: string | number, themeSpacing: number) => {
if (typeof argument === 'string') {
return argument;
}
return themeSpacing * argument;
};
return args
.map(argument => {
const output = transform(argument, defaultSpacing);
return typeof output === 'number' ? `${output}px` : output;
})
.join(' ');
};
// Converts callback-based overrides to static styles, e.g.
// { root: theme => ({ color: theme.color }) } -> { root: { color: 'red' } }
function adaptV5CssBaselineOverride(
@@ -60,6 +80,12 @@ function adaptV5Override(
return Object.fromEntries(
Object.entries(overrides).map(([className, style]) => {
if (typeof style === 'function') {
const defaultSpacing = theme.spacing(1);
if (typeof defaultSpacing === 'number') {
// Override potential v4 spacing method: https://mui.com/material-ui/migration/v5-style-changes/#%E2%9C%85-remove-px-suffix
// `adaptV4Theme as reference: https://github.com/mui/material-ui/blob/v5.x/packages/mui-material/src/styles/adaptV4Theme.js#L54C41-L54C41
theme.spacing = __v5Spacing(defaultSpacing);
}
return [className, style({ theme })];
}
return [className, style];
packages/theme/src/unified/types.ts
+20 -1
View File
@@ -14,6 +14,25 @@
* limitations under the License.
*/
import { Theme as Mui4Theme } from '@material-ui/core/styles';
import { Theme as Mui5Theme } from '@mui/material/styles';
/**
* Supported Material UI Versions
*
* Currently: 'v4' and 'v5'.
*
* @public
*/
export type SupportedVersions = 'v4' | 'v5';
/**
* Supported Material UI Theme Types for `SupportedVersions`
*
* @public
*/
export type SupportedThemes = Mui4Theme | Mui5Theme;
/**
* A container of one theme for multiple different MUI versions.
*
@@ -22,5 +41,5 @@
* @public
*/
export interface UnifiedTheme {
getTheme(version: string): unknown | undefined;
getTheme(version: SupportedVersions): SupportedThemes | undefined;
}
packages/theme/src/v4/types.ts
+4
View File
@@ -93,8 +93,12 @@ export type SimpleThemeOptions = {
declare module '@material-ui/core/styles/createPalette' {
interface Palette extends BackstagePaletteAdditions {}
interface PaletteOptions extends Partial<BackstagePaletteAdditions> {}
}
declare module '@material-ui/core/styles/createTheme' {
interface Theme extends BackstageThemeAdditions {}
interface ThemeOptions extends Partial<BackstageThemeAdditions> {}
}
packages/theme/src/v5/defaultComponentThemes.ts
+5
View File
@@ -240,4 +240,9 @@ export const defaultComponentThemes: ThemeOptions['components'] = {
},
},
},
MuiLink: {
defaultProps: {
underline: 'hover',
},
},
};
packages/theme/src/v5/types.ts
+4
View File
@@ -22,10 +22,14 @@ import {
declare module '@mui/material/styles' {
interface Palette extends BackstagePaletteAdditions {}
interface PaletteOptions extends Partial<BackstagePaletteAdditions> {}
}
declare module '@mui/material/styles' {
interface Theme extends BackstageThemeAdditions {}
interface ThemeOptions extends Partial<BackstageThemeAdditions> {}
}
declare module '@mui/private-theming/defaultTheme' {
plugins/adr/CHANGELOG.md
+12
View File
@@ -1,5 +1,17 @@
# @backstage/plugin-adr
## 0.6.3-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/integration-react@1.1.15-next.1
- @backstage/plugin-catalog-react@1.7.1-next.1
- @backstage/plugin-search-react@1.6.3-next.1
## 0.6.3-next.0
### Patch Changes
plugins/adr/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-adr",
"version": "0.6.3-next.0",
"version": "0.6.3-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
plugins/airbrake/CHANGELOG.md
+12
View File
@@ -1,5 +1,17 @@
# @backstage/plugin-airbrake
## 0.3.20-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/dev-utils@1.0.17-next.1
- @backstage/test-utils@1.4.1-next.1
- @backstage/plugin-catalog-react@1.7.1-next.1
## 0.3.20-next.0
### Patch Changes
plugins/airbrake/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-airbrake",
"version": "0.3.20-next.0",
"version": "0.3.20-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
plugins/allure/CHANGELOG.md
+10
View File
@@ -1,5 +1,15 @@
# @backstage/plugin-allure
## 0.1.36-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/plugin-catalog-react@1.7.1-next.1
## 0.1.36-next.0
### Patch Changes
plugins/allure/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-allure",
"description": "A Backstage plugin that integrates with Allure",
"version": "0.1.36-next.0",
"version": "0.1.36-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
plugins/analytics-module-ga/CHANGELOG.md
+10
View File
@@ -1,5 +1,15 @@
# @backstage/plugin-analytics-module-ga
## 0.1.31-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/config@1.0.8
## 0.1.31-next.0
### Patch Changes
plugins/analytics-module-ga/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-analytics-module-ga",
"version": "0.1.31-next.0",
"version": "0.1.31-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
plugins/analytics-module-ga4/CHANGELOG.md
+10
View File
@@ -1,5 +1,15 @@
# @backstage/plugin-analytics-module-ga4
## 0.1.2-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/config@1.0.8
## 0.1.2-next.0
### Patch Changes
plugins/analytics-module-ga4/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-analytics-module-ga4",
"version": "0.1.2-next.0",
"version": "0.1.2-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
plugins/apache-airflow/CHANGELOG.md
+8
View File
@@ -1,5 +1,13 @@
# @backstage/plugin-apache-airflow
## 0.2.13-next.1
### Patch Changes
- Updated dependencies
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
## 0.2.13-next.0
### Patch Changes
plugins/apache-airflow/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-apache-airflow",
"version": "0.2.13-next.0",
"version": "0.2.13-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
plugins/api-docs/CHANGELOG.md
+11
View File
@@ -1,5 +1,16 @@
# @backstage/plugin-api-docs
## 0.9.6-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/plugin-catalog@1.11.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
- @backstage/plugin-catalog-react@1.7.1-next.1
## 0.9.6-next.0
### Patch Changes
plugins/api-docs/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-api-docs",
"description": "A Backstage plugin that helps represent API entities in the frontend",
"version": "0.9.6-next.0",
"version": "0.9.6-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
plugins/apollo-explorer/CHANGELOG.md
+9
View File
@@ -1,5 +1,14 @@
# @backstage/plugin-apollo-explorer
## 0.1.13-next.1
### Patch Changes
- Updated dependencies
- @backstage/theme@0.4.1-next.0
- @backstage/core-components@0.13.3-next.1
- @backstage/core-plugin-api@1.5.3-next.0
## 0.1.13-next.0
### Patch Changes
plugins/apollo-explorer/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-apollo-explorer",
"version": "0.1.13-next.0",
"version": "0.1.13-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
plugins/auth-backend/CHANGELOG.md
+8
View File
@@ -1,5 +1,13 @@
# @backstage/plugin-auth-backend
## 0.18.5-next.1
### Patch Changes
- c27ae5004fc2: Support for Token Endpoint Auth Method for OIDC Provider
- Updated dependencies
- @backstage/config@1.0.8
## 0.18.5-next.0
### Patch Changes
plugins/auth-backend/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-auth-backend",
"description": "A Backstage backend plugin that handles authentication",
"version": "0.18.5-next.0",
"version": "0.18.5-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
plugins/auth-backend/src/providers/oidc/provider.test.ts
+1
View File
@@ -53,6 +53,7 @@ const clientMetadata: Options = {
clientId: 'testclientid',
clientSecret: 'testclientsecret',
metadataUrl: 'https://oidc.test/.well-known/openid-configuration',
tokenEndpointAuthMethod: 'none',
tokenSignedResponseAlg: 'none',
};
plugins/auth-backend/src/providers/oidc/provider.ts
+8
View File
@@ -17,6 +17,7 @@
import express from 'express';
import {
Client,
ClientAuthMethod,
Issuer,
Strategy as OidcStrategy,
TokenSet,
@@ -72,6 +73,7 @@ export type Options = OAuthProviderOptions & {
metadataUrl: string;
scope?: string;
prompt?: string;
tokenEndpointAuthMethod?: ClientAuthMethod;
tokenSignedResponseAlg?: string;
signInResolver?: SignInResolver<OidcAuthResult>;
authHandler: AuthHandler<OidcAuthResult>;
@@ -144,6 +146,8 @@ export class OidcAuthProvider implements OAuthHandlers {
client_secret: options.clientSecret,
redirect_uris: [options.callbackUrl],
response_types: ['code'],
token_endpoint_auth_method:
options.tokenEndpointAuthMethod || 'client_secret_basic',
id_token_signed_response_alg: options.tokenSignedResponseAlg || 'RS256',
scope: options.scope || '',
});
@@ -232,6 +236,9 @@ export const oidc = createAuthProviderIntegration({
customCallbackUrl ||
`${globalConfig.baseUrl}/${providerId}/handler/frame`;
const metadataUrl = envConfig.getString('metadataUrl');
const tokenEndpointAuthMethod = envConfig.getOptionalString(
'tokenEndpointAuthMethod',
) as ClientAuthMethod;
const tokenSignedResponseAlg = envConfig.getOptionalString(
'tokenSignedResponseAlg',
);
@@ -252,6 +259,7 @@ export const oidc = createAuthProviderIntegration({
clientId,
clientSecret,
callbackUrl,
tokenEndpointAuthMethod,
tokenSignedResponseAlg,
metadataUrl,
scope,
plugins/azure-devops-backend/CHANGELOG.md
+8
View File
@@ -1,5 +1,13 @@
# @backstage/plugin-azure-devops-backend
## 0.3.26-next.1
### Patch Changes
- ae261e79d256: Added alpha support for the [new backend system](https://backstage.io/docs/backend-system/)
- Updated dependencies
- @backstage/config@1.0.8
## 0.3.26-next.0
### Patch Changes

Some files were not shown because too many files have changed in this diff Show More