Skip to content

Commit

Permalink
Update workspaces to use backstage yarn plugin (#207)
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottGuymer authored Oct 30, 2024
1 parent 254d84d commit 5f1eb70
Show file tree
Hide file tree
Showing 39 changed files with 32,943 additions and 30,775 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release_workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,6 @@ jobs:
- name: publish
run: |
yarn config set -H 'npmAuthToken' "${{secrets.NPM_TOKEN}}"
yarn workspaces foreach -v --no-private npm publish --access public --tolerate-republish
yarn workspaces foreach --all -v --no-private npm publish --access public --tolerate-republish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
46 changes: 46 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-backstage.cjs

Large diffs are not rendered by default.

28 changes: 0 additions & 28 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

This file was deleted.

783 changes: 0 additions & 783 deletions .yarn/releases/yarn-3.2.3.cjs

This file was deleted.

934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.5.1.cjs

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
compressionLevel: mixed

enableGlobalCache: true

httpTimeout: 300000
Expand All @@ -7,7 +9,8 @@ nodeLinker: node-modules
npmRegistryServer: "https://registry.npmjs.org/"

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
- checksum: 8fa2e3a1cdf5076dde96b177618478419daea000b8038412817583e4d309fd39bf4813a337eb1fad3bfe9036d31732f7416383affbe3d420f48eacb60f6184d5
path: .yarn/plugins/@yarnpkg/plugin-backstage.cjs
spec: "https://versions.backstage.io/v1/tags/main/yarn-plugin"

yarnPath: .yarn/releases/yarn-3.2.3.cjs
yarnPath: .yarn/releases/yarn-4.5.1.cjs
3 changes: 3 additions & 0 deletions backstage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"version": "1.32.3"
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"create-workspace": "community-cli workspace create"
},
"type": "module",
"packageManager": "yarn@3.2.3",
"packageManager": "yarn@4.5.1",
"dependencies": {
"@backstage-community/cli": "portal:./workspaces/repo-tools/packages/cli",
"@backstage/cli-node": "^0.2.7",
"@backstage/cli-node": "backstage:^",
"@changesets/parse": "^0.4.0"
}
}
6 changes: 6 additions & 0 deletions workspaces/confluence/.changeset/gentle-badgers-destroy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@philips-software/backstage-plugin-search-confluence-frontend': minor
'@philips-software/backstage-plugin-search-confluence-backend': minor
---

Bump to backstage version 1.32.2
1 change: 0 additions & 1 deletion workspaces/confluence/.yarnrc.yaml

This file was deleted.

Empty file.
2 changes: 1 addition & 1 deletion workspaces/confluence/backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.27.4"
"version": "1.32.3"
}
10 changes: 5 additions & 5 deletions workspaces/confluence/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
"directory": "workspaces/confluence"
},
"devDependencies": {
"@backstage/cli": "^0.26.6",
"@backstage/e2e-test-utils": "^0.1.1",
"@backstage/plugin-auth-backend": "^0.22.5",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.1.4",
"@backstage/repo-tools": "^0.9.0",
"@backstage/cli": "backstage:^",
"@backstage/e2e-test-utils": "backstage:^",
"@backstage/plugin-auth-backend": "backstage:^",
"@backstage/plugin-auth-backend-module-guest-provider": "backstage:^",
"@backstage/repo-tools": "backstage:^",
"@changesets/cli": "^2.27.1",
"@spotify/prettier-config": "^12.0.0",
"node-gyp": "^9.0.0",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/backend-common": "^0.22.0",
"@backstage/backend-defaults": "^0.2.18",
"@backstage/backend-plugin-api": "^0.6.18",
"@backstage/backend-tasks": "^0.5.23",
"@backstage/config": "^1.2.0",
"@backstage/plugin-search-backend-node": "^1.2.23",
"@backstage/plugin-search-common": "^1.2.11",
"@backstage/backend-common": "^0.25.0",
"@backstage/backend-defaults": "backstage:^",
"@backstage/backend-plugin-api": "backstage:^",
"@backstage/backend-tasks": "^0.6.1",
"@backstage/config": "backstage:^",
"@backstage/plugin-search-backend-node": "backstage:^",
"@backstage/plugin-search-common": "backstage:^",
"p-limit": "^3.1.0",
"uuid": "^9.0.1",
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.26.6",
"@backstage/plugin-auth-backend": "^0.22.5",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.1.4",
"@backstage/types": "^1.1.1",
"@backstage/cli": "backstage:^",
"@backstage/plugin-auth-backend": "backstage:^",
"@backstage/plugin-auth-backend-module-guest-provider": "backstage:^",
"@backstage/types": "backstage:^",
"@types/supertest": "^6.0.2",
"@types/uuid": "^9.0.8",
"jest-fetch-mock": "^3.0.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { BackendFeature } from '@backstage/backend-plugin-api';

// @public
const confluencePlugin: () => BackendFeature;
const confluencePlugin: BackendFeature;
export default confluencePlugin;

// (No @packageDocumentation comment for this package)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/core-components": "^0.14.7",
"@backstage/core-plugin-api": "^1.9.2",
"@backstage/plugin-search-common": "^1.2.11",
"@backstage/plugin-search-react": "^1.7.11",
"@backstage/theme": "^0.5.5",
"@backstage/core-components": "backstage:^",
"@backstage/core-plugin-api": "backstage:^",
"@backstage/plugin-search-common": "backstage:^",
"@backstage/plugin-search-react": "backstage:^",
"@backstage/theme": "backstage:^",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@material-ui/lab": "^4.0.0-alpha.61",
Expand All @@ -44,10 +44,10 @@
"react-router-dom": "^6.14.1"
},
"devDependencies": {
"@backstage/cli": "^0.26.5",
"@backstage/core-app-api": "^1.12.5",
"@backstage/dev-utils": "^1.0.32",
"@backstage/test-utils": "^1.5.5",
"@backstage/cli": "backstage:^",
"@backstage/core-app-api": "backstage:^",
"@backstage/dev-utils": "backstage:^",
"@backstage/test-utils": "backstage:^",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^15.0.2",
"@types/react": "^18",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
## API Report File for "@philips-software/backstage-plugin-search-confluence-frontend"

> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
```ts
import { BackstagePlugin } from '@backstage/core-plugin-api';
import { IndexableDocument } from '@backstage/plugin-search-common';
import { default as React_2 } from 'react';
import { ResultHighlight } from '@backstage/plugin-search-common';

// @public
export interface ConfluenceResultItemProps {
highlight?: ResultHighlight;
result?: IndexableDocument;
}

// @public
export const ConfluenceResultListItem: ({
result,
highlight,
}: ConfluenceResultItemProps) => React_2.JSX.Element | null;

// @public
export const ConfluenceSearchIcon: () => React_2.JSX.Element;

// @public
export const searchConfluenceFrontendPlugin: BackstagePlugin<{}, {}, {}>;
```
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,27 @@ export type IndexableConfluenceDocument = IndexableDocument & {
}[];
};

/**
* Props for the Confluence search result item.
*
* @public
*/
export interface ConfluenceResultItemProps {
/**
* The search result item.
*/
result?: IndexableDocument;
/**
* The highlight information for the search result item.
*/
highlight?: ResultHighlight;
}

/**
* A single search result item for Confluence documents.
*
* @public
*/
export const ConfluenceResultListItem = ({
result,
highlight,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/**
* Confluence search frontend plugin.
*
* @packageDocumentation
*/

export { searchConfluenceFrontendPlugin } from './plugin';
export { ConfluenceSearchIcon } from './icons';
export { ConfluenceResultListItem } from './components/ConfluenceResultListItem';
export {
ConfluenceResultListItem,
type ConfluenceResultItemProps,
} from './components/ConfluenceResultListItem';
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { createPlugin } from '@backstage/core-plugin-api';

/**
* A plugin to display search results from Confluence.
*
* @public
*/
export const searchConfluenceFrontendPlugin = createPlugin({
id: 'search-confluence-frontend',
});
Loading

0 comments on commit 5f1eb70

Please sign in to comment.