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

Merge branch 'backstage:master' into feat/scaffolder-add-edit-action

Browse Source
This commit is contained in:
John
2024-05-30 21:16:27 +10:00
committed by GitHub
parent 58c0342d90 ee9e1737b3
commit 1513766caf
14 changed files with 116 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/cuddly-eggs-sin.md
+6
View File
@@ -0,0 +1,6 @@
---
'@backstage/plugin-techdocs-backend': patch
'@backstage/plugin-techdocs-node': patch
---
Allow defining custom build log transport for techdocs builder
.changeset/real-ghosts-return.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/create-app': patch
---
Bumped TypeScript to version `5.4`.
.github/workflows/deploy_microsite.yml
+1 -1
View File
@@ -66,7 +66,7 @@ jobs:
run: ls microsite/build && ls microsite/build/storybook
- name: Deploy both microsite and storybook to gh-pages
uses: JamesIves/github-pages-deploy-action@ec9c88baef04b842ca6f0a132fd61c762aa6c1b0 # v4.6.0
uses: JamesIves/github-pages-deploy-action@5c6e9e9f3672ce8fd37b9856193d2a537941e66c # v4.6.1
with:
branch: gh-pages
folder: microsite/build
docs/features/software-templates/writing-custom-actions.md
+1 -1
View File
@@ -216,7 +216,7 @@ const scaffolderModuleCustomExtensions = createBackendModule({
async init({ scaffolder /* ..., other dependencies */ }) {
// Here you have the opportunity to interact with the extension
// point before the plugin itself gets instantiated
scaffolder.addActions(new createNewFileAction()); // just an example
scaffolder.addActions(createNewFileAction()); // just an example
},
});
},
microsite/package.json
+1 -1
View File
@@ -43,7 +43,7 @@
"@types/webpack-env": "^1.18.0",
"js-yaml": "^4.1.0",
"prettier": "^2.6.2",
"typescript": "~5.1.0",
"typescript": "~5.2.0",
"yaml-loader": "^0.8.0"
}
}
microsite/yarn.lock
+9 -9
View File
@@ -3865,7 +3865,7 @@ __metadata:
react-dom: ^18.0.0
sass: ^1.57.1
swc-loader: ^0.2.3
typescript: ~5.1.0
typescript: ~5.2.0
yaml-loader: ^0.8.0
languageName: unknown
linkType: soft
@@ -11266,23 +11266,23 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:~5.1.0":
version: 5.1.6
resolution: "typescript@npm:5.1.6"
"typescript@npm:~5.2.0":
version: 5.2.2
resolution: "typescript@npm:5.2.2"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: b2f2c35096035fe1f5facd1e38922ccb8558996331405eb00a5111cc948b2e733163cc22fab5db46992aba7dd520fff637f2c1df4996ff0e134e77d3249a7350
checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c
languageName: node
linkType: hard
"typescript@patch:typescript@~5.1.0#~builtin<compat/typescript>":
version: 5.1.6
resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin<compat/typescript>::version=5.1.6&hash=5da071"
"typescript@patch:typescript@~5.2.0#~builtin<compat/typescript>":
version: 5.2.2
resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=f3b441"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: f53bfe97f7c8b2b6d23cf572750d4e7d1e0c5fff1c36d859d0ec84556a827b8785077bc27676bf7e71fae538e517c3ecc0f37e7f593be913d884805d931bc8be
checksum: 0f4da2f15e6f1245e49db15801dbee52f2bbfb267e1c39225afdab5afee1a72839cd86000e65ee9d7e4dfaff12239d28beaf5ee431357fcced15fb08583d72ca
languageName: node
linkType: hard
package.json
+1 -1
View File
@@ -129,7 +129,7 @@
"shx": "^0.3.2",
"sloc": "^0.3.1",
"sort-package-json": "^2.8.0",
"typescript": "~5.1.0"
"typescript": "~5.2.0"
},
"packageManager": "yarn@3.8.1",
"engines": {
packages/core-components/.eslintrc.js
+4
View File
@@ -4,6 +4,10 @@ module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, {
'@backstage/no-top-level-material-ui-4-imports': 'error',
},
restrictedImports: [
{
name: '@backstage/core-components',
message: "To avoid circular dependencies, use relative paths to import '@backstage/core-components' from its subdirectories."
},
{
name: '@material-ui/core',
message: "Please import '@material-ui/core/...' instead.",
packages/create-app/seed-yarn.lock
+5
View File
@@ -16,3 +16,8 @@
// package: the name of the package, e.g. @testing-library/react
// query: the version query to pin the version for, e.g. ^14.0.0
// version: the version to pin to, must be in range of the query, e.g. 14.11.0
"@swc/core@^1.3.46":
version "1.5.7"
resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.5.7.tgz#e1db7b9887d5f34eb4a3256a738d0c5f1b018c33"
integrity sha512-U4qJRBefIJNJDRCCiVtkfa/hpiZ7w0R6kASea+/KLp+vkus3zcLSB8Ub8SvKgTIxjWpwsKcZlPf5nrv4ls46SQ==
packages/create-app/templates/default-app/package.json.hbs
+1 -1
View File
@@ -39,7 +39,7 @@
"lerna": "^7.3.0",
"node-gyp": "^9.0.0",
"prettier": "^2.3.2",
"typescript": "~5.3.0"
"typescript": "~5.4.0"
},
"resolutions": {
"@types/react": "^18",
plugins/techdocs-backend/src/plugin.ts
+9
View File
@@ -38,6 +38,7 @@ import {
} from '@backstage/plugin-techdocs-node';
import Docker from 'dockerode';
import { createRouter } from '@backstage/plugin-techdocs-backend';
import * as winston from 'winston';
/**
* The TechDocs plugin is responsible for serving and building documentation for any entity.
@@ -47,6 +48,7 @@ export const techdocsPlugin = createBackendPlugin({
pluginId: 'techdocs',
register(env) {
let docsBuildStrategy: DocsBuildStrategy | undefined;
let buildLogTransport: winston.transport | undefined;
env.registerExtensionPoint(techdocsBuildsExtensionPoint, {
setBuildStrategy(buildStrategy: DocsBuildStrategy) {
if (docsBuildStrategy) {
@@ -54,6 +56,12 @@ export const techdocsPlugin = createBackendPlugin({
}
docsBuildStrategy = buildStrategy;
},
setBuildLogTransport(transport: winston.transport) {
if (buildLogTransport) {
throw new Error('BuildLogTransport may only be set once');
}
buildLogTransport = transport;
},
});
let customTechdocsGenerator: TechdocsGenerator | undefined;
@@ -138,6 +146,7 @@ export const techdocsPlugin = createBackendPlugin({
logger: winstonLogger,
cache: cacheManager,
docsBuildStrategy,
buildLogTransport,
preparers,
generators,
publisher,
plugins/techdocs-node/api-report.md
+3
View File
@@ -16,6 +16,7 @@ import { Logger } from 'winston';
import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { ScmIntegrationRegistry } from '@backstage/integration';
import { UrlReader } from '@backstage/backend-common';
import * as winston from 'winston';
import { Writable } from 'stream';
// @public
@@ -240,6 +241,8 @@ export type SupportedGeneratorKey = 'techdocs' | string;
// @public
export interface TechdocsBuildsExtensionPoint {
// (undocumented)
setBuildLogTransport(transport: winston.transport): void;
// (undocumented)
setBuildStrategy(buildStrategy: DocsBuildStrategy): void;
}
plugins/techdocs-node/src/extensions.ts
+2
View File
@@ -16,6 +16,7 @@
import { createExtensionPoint } from '@backstage/backend-plugin-api';
import { DocsBuildStrategy } from './techdocsTypes';
import { PreparerBase, RemoteProtocol, TechdocsGenerator } from './stages';
import * as winston from 'winston';
/**
* Extension point type for configuring Techdocs builds.
@@ -24,6 +25,7 @@ import { PreparerBase, RemoteProtocol, TechdocsGenerator } from './stages';
*/
export interface TechdocsBuildsExtensionPoint {
setBuildStrategy(buildStrategy: DocsBuildStrategy): void;
setBuildLogTransport(transport: winston.transport): void;
}
/**
yarn.lock
+68 -48
View File
@@ -7835,14 +7835,15 @@ __metadata:
languageName: node
linkType: hard
"@changesets/apply-release-plan@npm:^7.0.1":
version: 7.0.1
resolution: "@changesets/apply-release-plan@npm:7.0.1"
"@changesets/apply-release-plan@npm:^7.0.3":
version: 7.0.3
resolution: "@changesets/apply-release-plan@npm:7.0.3"
dependencies:
"@babel/runtime": ^7.20.1
"@changesets/config": ^3.0.0
"@changesets/config": ^3.0.1
"@changesets/get-version-range-type": ^0.4.0
"@changesets/git": ^3.0.0
"@changesets/should-skip-package": ^0.1.0
"@changesets/types": ^6.0.0
"@manypkg/get-packages": ^1.1.3
detect-indent: ^6.0.0
@@ -7852,35 +7853,22 @@ __metadata:
prettier: ^2.7.1
resolve-from: ^5.0.0
semver: ^7.5.3
checksum: 44a2686d3dc3ee569f23862a6c3da5c247987b320ddaf64be6c2096bb486b3da620c9336164f73e30e6272149e435988b46776508b81f328e1d66e885a8264cc
checksum: 622b1ed7652b072b28bee431d5407ce686cff058caa3db9353848cd1177dc535d352711f6e5f9f819a7331235e72279f7e0f34955da67681c50d051ec30f476a
languageName: node
linkType: hard
"@changesets/assemble-release-plan@npm:6.0.0":
version: 6.0.0
resolution: "@changesets/assemble-release-plan@npm:6.0.0"
"@changesets/assemble-release-plan@npm:^6.0.2":
version: 6.0.2
resolution: "@changesets/assemble-release-plan@npm:6.0.2"
dependencies:
"@babel/runtime": ^7.20.1
"@changesets/errors": ^0.2.0
"@changesets/get-dependents-graph": ^2.0.0
"@changesets/get-dependents-graph": ^2.1.0
"@changesets/should-skip-package": ^0.1.0
"@changesets/types": ^6.0.0
"@manypkg/get-packages": ^1.1.3
semver: ^7.5.3
checksum: 0e6d25f25e0e3cc0e92aa8c43f5f496bae9464e2523be4ff81e31b6c9971b63bb1264821a2483c48d451d89d60af1acebe727e7f8c392ed48188a3ff26d0950e
languageName: node
linkType: hard
"@changesets/assemble-release-plan@patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch::locator=root%40workspace%3A.":
version: 6.0.0
resolution: "@changesets/assemble-release-plan@patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch::version=6.0.0&hash=43c5e4&locator=root%40workspace%3A."
dependencies:
"@babel/runtime": ^7.20.1
"@changesets/errors": ^0.2.0
"@changesets/get-dependents-graph": ^2.0.0
"@changesets/types": ^6.0.0
"@manypkg/get-packages": ^1.1.3
semver: ^7.5.3
checksum: b7a68e28d03379bdc2a1d7171963990e1b88d0e5efca5f5ed490c0f583d66d0ccbd4c04ebf4e5cd1c38e1346ff0e5c4c16e1b4973cdd97fabdbad0c6996fe016
checksum: 90019a9bd22ad1368f23f1335d1b7eea5a55b1ed8b9141c9cc2fdab99bda85f9cb3886062a33c078cfb6f08f1a6f165aedbb1d1ce2a63c15ce0bfa7a7c365854
languageName: node
linkType: hard
@@ -7894,21 +7882,22 @@ __metadata:
linkType: hard
"@changesets/cli@npm:^2.14.0":
version: 2.27.3
resolution: "@changesets/cli@npm:2.27.3"
version: 2.27.5
resolution: "@changesets/cli@npm:2.27.5"
dependencies:
"@babel/runtime": ^7.20.1
"@changesets/apply-release-plan": ^7.0.1
"@changesets/assemble-release-plan": ^6.0.0
"@changesets/apply-release-plan": ^7.0.3
"@changesets/assemble-release-plan": ^6.0.2
"@changesets/changelog-git": ^0.2.0
"@changesets/config": ^3.0.0
"@changesets/config": ^3.0.1
"@changesets/errors": ^0.2.0
"@changesets/get-dependents-graph": ^2.0.0
"@changesets/get-release-plan": ^4.0.0
"@changesets/get-dependents-graph": ^2.1.0
"@changesets/get-release-plan": ^4.0.2
"@changesets/git": ^3.0.0
"@changesets/logger": ^0.1.0
"@changesets/pre": ^2.0.0
"@changesets/read": ^0.6.0
"@changesets/should-skip-package": ^0.1.0
"@changesets/types": ^6.0.0
"@changesets/write": ^0.3.1
"@manypkg/get-packages": ^1.1.3
@@ -7931,22 +7920,22 @@ __metadata:
tty-table: ^4.1.5
bin:
changeset: bin.js
checksum: e3b0bb3a123f71701f3b76e80104968fdf99a7403b97860631ed6f98f7ba0df5d9fb56767191fa46148372a0b35d44f7883decb2b70f60d5fa2716692332c0fd
checksum: 7e0d0aadabcf3028abbb2e079b58135b8e39f78bc174f4fa669cf94482ca3a4ec873e4b4ff9a7e071d83aee592780f0c47bd36a3a12282ab5f13a493c796663f
languageName: node
linkType: hard
"@changesets/config@npm:^3.0.0":
version: 3.0.0
resolution: "@changesets/config@npm:3.0.0"
"@changesets/config@npm:^3.0.1":
version: 3.0.1
resolution: "@changesets/config@npm:3.0.1"
dependencies:
"@changesets/errors": ^0.2.0
"@changesets/get-dependents-graph": ^2.0.0
"@changesets/get-dependents-graph": ^2.1.0
"@changesets/logger": ^0.1.0
"@changesets/types": ^6.0.0
"@manypkg/get-packages": ^1.1.3
fs-extra: ^7.0.1
micromatch: ^4.0.2
checksum: 31a8c37e38768cf3676d24b7d371009dd1d691f221ecf086b79f0d96dc8e95aa408cda3659eb867a14615ea38a1c2be448bf0655c7570539af57c930ca784051
checksum: 588a8139f721e2917c9bad842e3a933a8a5216b6a73c6a203ddcb834c274f873eaa780b32b42f89a477159e898ad3c1c93ca0ac28a07401b7b3f56185672a6a8
languageName: node
linkType: hard
@@ -7959,31 +7948,31 @@ __metadata:
languageName: node
linkType: hard
"@changesets/get-dependents-graph@npm:^2.0.0":
version: 2.0.0
resolution: "@changesets/get-dependents-graph@npm:2.0.0"
"@changesets/get-dependents-graph@npm:^2.1.0":
version: 2.1.0
resolution: "@changesets/get-dependents-graph@npm:2.1.0"
dependencies:
"@changesets/types": ^6.0.0
"@manypkg/get-packages": ^1.1.3
chalk: ^2.1.0
fs-extra: ^7.0.1
semver: ^7.5.3
checksum: 6690d3ed36e8a636bc2a985d209bd72ee1100601ccf00850ca1fbe8500af839a3f4e5bd2167858cf11383aa76360f853e481533157060ad882fb56319db3090a
checksum: 1cd9c0f145a20d735ab9e1d615c5bdf52179cd2fc9b8555649d74979d8dbc915f9e85af4e20f7b71da76d3d860cd2090cee4c6ecccac4f5bf42ae11bb245471d
languageName: node
linkType: hard
"@changesets/get-release-plan@npm:^4.0.0":
version: 4.0.0
resolution: "@changesets/get-release-plan@npm:4.0.0"
"@changesets/get-release-plan@npm:^4.0.2":
version: 4.0.2
resolution: "@changesets/get-release-plan@npm:4.0.2"
dependencies:
"@babel/runtime": ^7.20.1
"@changesets/assemble-release-plan": ^6.0.0
"@changesets/config": ^3.0.0
"@changesets/assemble-release-plan": ^6.0.2
"@changesets/config": ^3.0.1
"@changesets/pre": ^2.0.0
"@changesets/read": ^0.6.0
"@changesets/types": ^6.0.0
"@manypkg/get-packages": ^1.1.3
checksum: 57672c1e94f95de8ac65aac969275e0cb225f02aa86b2cef69329fff6e36ba5fde04eadeb6af36f4d8ac41a8fd329028b4df4c23c15c10fd13e026c77463d576
checksum: 651814230890bf7605f4094332e4842505eb060092fbe65d9c8fa1a44f724ce0086890b8437f2fa96aedfa11c88e622e133d700847dea4c92141c2fbb486460f
languageName: node
linkType: hard
@@ -8057,6 +8046,17 @@ __metadata:
languageName: node
linkType: hard
"@changesets/should-skip-package@npm:^0.1.0":
version: 0.1.0
resolution: "@changesets/should-skip-package@npm:0.1.0"
dependencies:
"@babel/runtime": ^7.20.1
"@changesets/types": ^6.0.0
"@manypkg/get-packages": ^1.1.3
checksum: 3c966feae085a41d4ce10a46a1b525f980cec59951f7cf23ea805866b370de5c75fdd45af326e1a5ef502fa4846f821d9df15550c2b606b96e99ed4b967f01c0
languageName: node
linkType: hard
"@changesets/types@npm:^4.0.1":
version: 4.1.0
resolution: "@changesets/types@npm:4.1.0"
@@ -38986,7 +38986,7 @@ __metadata:
shx: ^0.3.2
sloc: ^0.3.1
sort-package-json: ^2.8.0
typescript: ~5.1.0
typescript: ~5.2.0
languageName: unknown
linkType: soft
@@ -42140,6 +42140,16 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:~5.2.0":
version: 5.2.2
resolution: "typescript@npm:5.2.2"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c
languageName: node
linkType: hard
"typescript@patch:typescript@~5.0.4#~builtin<compat/typescript>":
version: 5.0.4
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=b5f058"
@@ -42160,6 +42170,16 @@ __metadata:
languageName: node
linkType: hard
"typescript@patch:typescript@~5.2.0#~builtin<compat/typescript>":
version: 5.2.2
resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=f3b441"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 0f4da2f15e6f1245e49db15801dbee52f2bbfb267e1c39225afdab5afee1a72839cd86000e65ee9d7e4dfaff12239d28beaf5ee431357fcced15fb08583d72ca
languageName: node
linkType: hard
"ua-parser-js@npm:^0.7.30":
version: 0.7.33
resolution: "ua-parser-js@npm:0.7.33"