Skip to content

Commit

Permalink
chore: move plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
johanneswuerbach committed May 3, 2024
1 parent 8cb7fb3 commit 632a3ac
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 38 deletions.
7 changes: 7 additions & 0 deletions .changeset/blue-moons-occur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@humanitec/backstage-plugin-backend': minor
'@humanitec/backstage-plugin-common': minor
'@humanitec/backstage-plugin': minor
---

moved plugin into humanitec organization
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@backstage/plugin-techdocs-react": "^1.2.3",
"@backstage/plugin-user-settings": "^0.8.5",
"@backstage/theme": "^0.5.3",
"@frontside/backstage-plugin-humanitec": "^0.3.15",
"@humanitec/backstage-plugin": "^0.3.15",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"history": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@backstage/plugin-search-backend-module-techdocs": "^0.1.22",
"@backstage/plugin-search-backend-node": "^1.2.21",
"@backstage/plugin-techdocs-backend": "^1.10.4",
"@frontside/backstage-plugin-humanitec-backend": "^0.3.17",
"@humanitec/backstage-plugin-backend": "^0.3.17",
"app": "link:../app",
"better-sqlite3": "^9.0.0",
"dockerode": "^3.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/plugins/humanitec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createRouter } from '@frontside/backstage-plugin-humanitec-backend';
import { createRouter } from '@humanitec/backstage-plugin-backend';
import { Router } from 'express';
import { PluginEnvironment } from '../types';

Expand Down
4 changes: 2 additions & 2 deletions plugins/humanitec-backend/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@frontside/backstage-plugin-humanitec-backend",
"name": "@humanitec/backstage-plugin-backend",
"version": "0.3.17",
"main": "src/index.ts",
"types": "src/index.ts",
Expand All @@ -25,7 +25,7 @@
"@backstage/backend-common": "^0.21.3",
"@backstage/config": "^1.1.1",
"@backstage/plugin-scaffolder-backend": "^1.19.1",
"@frontside/backstage-plugin-humanitec-common": "^0.3.13",
"@humanitec/backstage-plugin-common": "^0.3.13",
"@types/express": "*",
"cross-fetch": "3.1.5",
"express": "^4.17.1",
Expand Down
4 changes: 2 additions & 2 deletions plugins/humanitec-backend/src/actions/create-app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createTemplateAction } from '@backstage/plugin-scaffolder-backend';
import { stat, readFile } from 'fs/promises';
import { join, resolve } from 'path';
import { loadAll } from 'js-yaml';
import { SetupFileSchema, createHumanitecClient } from '@frontside/backstage-plugin-humanitec-common';
import { SetupFileSchema, createHumanitecClient } from '@humanitec/backstage-plugin-common';

interface HumanitecCreateApp {
orgId: string;
Expand Down Expand Up @@ -130,4 +130,4 @@ async function loadSetupFile(filePath: string) {
}
}
return null;
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { setTimeout } from 'node:timers/promises';
import * as common from '@frontside/backstage-plugin-humanitec-common';
import * as common from '@humanitec/backstage-plugin-common';

import { AppInfoService } from './app-info-service';

Expand All @@ -11,7 +11,7 @@ let slowFetch = false
const fakeAppInfo = { fake: 'res' }
const fakeError = new Error('fake error');

jest.mock('@frontside/backstage-plugin-humanitec-common', () => ({
jest.mock('@humanitec/backstage-plugin-common', () => ({
createHumanitecClient: jest.fn(),
fetchAppInfo: jest.fn(async () => {
if (returnError) {
Expand Down
2 changes: 1 addition & 1 deletion plugins/humanitec-backend/src/service/app-info-service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EventEmitter } from 'events';

import { createHumanitecClient, fetchAppInfo } from '@frontside/backstage-plugin-humanitec-common';
import { createHumanitecClient, fetchAppInfo } from '@humanitec/backstage-plugin-common';

const defaultFetchInterval = 10000;

Expand Down
2 changes: 1 addition & 1 deletion plugins/humanitec-common/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@frontside/backstage-plugin-humanitec-common",
"name": "@humanitec/backstage-plugin-common",
"description": "Humanitec API Client",
"version": "0.3.13",
"main": "src/index.ts",
Expand Down
4 changes: 2 additions & 2 deletions plugins/humanitec/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@frontside/backstage-plugin-humanitec",
"name": "@humanitec/backstage-plugin",
"version": "0.3.15",
"main": "src/index.ts",
"types": "src/index.ts",
Expand Down Expand Up @@ -43,7 +43,7 @@
"@backstage/core-app-api": "^1.11.1",
"@backstage/dev-utils": "^1.0.27",
"@backstage/test-utils": "^1.5.0",
"@frontside/backstage-plugin-humanitec-common": "^0.3.13",
"@humanitec/backstage-plugin-common": "^0.3.13",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^14.5.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/humanitec/src/hooks/useAppInfo.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EventSourcePolyfill } from "event-source-polyfill";
import { configApiRef, discoveryApiRef, useApi, identityApiRef } from '@backstage/core-plugin-api';
import type { FetchAppInfoResponse } from '@frontside/backstage-plugin-humanitec-common';
import type { FetchAppInfoResponse } from '@humanitec/backstage-plugin-common';
import { useEffect, useState } from 'react';
import { HUMANITEC_MISSING_ANNOTATION_ERROR } from '../annotations';

Expand Down
27 changes: 3 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9502,20 +9502,13 @@
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==

"@types/react-dom@*", "@types/react-dom@^18.0.0":
"@types/react-dom@*", "@types/react-dom@<18.0.0", "@types/react-dom@^18", "@types/react-dom@^18.0.0":
version "18.3.0"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0"
integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==
dependencies:
"@types/react" "*"

"@types/react-dom@<18.0.0":
version "17.0.25"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5"
integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==
dependencies:
"@types/react" "^17"

"@types/react-redux@^7.1.20":
version "7.1.33"
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15"
Expand Down Expand Up @@ -9547,23 +9540,14 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@^16.13.1 || ^17.0.0 || ^18.0.0":
"@types/react@*", "@types/react@^16.13.1 || ^17.0.0", "@types/react@^16.13.1 || ^17.0.0 || ^18.0.0", "@types/react@^18":
version "18.3.1"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.1.tgz#fed43985caa834a2084d002e4771e15dfcbdbe8e"
integrity sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==
dependencies:
"@types/prop-types" "*"
csstype "^3.0.2"

"@types/react@^16.13.1 || ^17.0.0", "@types/react@^17":
version "17.0.80"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.80.tgz#a5dfc351d6a41257eb592d73d3a85d3b7dbcbb41"
integrity sha512-LrgHIu2lEtIo8M7d1FcI3BdwXWoRQwMoXOZ7+dPTW0lYREjmlHl3P0U1VD0i/9tppOuv8/sam7sOjx34TxSFbA==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "^0.16"
csstype "^3.0.2"

"@types/request@^2.47.1", "@types/request@^2.48.8":
version "2.48.12"
resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.12.tgz#0f590f615a10f87da18e9790ac94c29ec4c5ef30"
Expand Down Expand Up @@ -9601,11 +9585,6 @@
resolved "https://registry.yarnpkg.com/@types/sarif/-/sarif-2.1.7.tgz#dab4d16ba7568e9846c454a8764f33c5d98e5524"
integrity sha512-kRz0VEkJqWLf1LLVN4pT1cg1Z9wAuvI6L97V3m2f5B76Tg8d413ddvLBPTEHAZJlnn4XSvu0FkZtViCQGVyrXQ==

"@types/scheduler@^0.16":
version "0.16.8"
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==

"@types/semver@^7.3.12", "@types/semver@^7.5.0":
version "7.5.8"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
Expand Down Expand Up @@ -10419,7 +10398,7 @@ anymatch@^3.0.3, anymatch@~3.1.2:
"@backstage/plugin-techdocs-react" "^1.2.3"
"@backstage/plugin-user-settings" "^0.8.5"
"@backstage/theme" "^0.5.3"
"@frontside/backstage-plugin-humanitec" "^0.3.15"
"@humanitec/backstage-plugin" "^0.3.15"
"@material-ui/core" "^4.12.2"
"@material-ui/icons" "^4.9.1"
history "^5.0.0"
Expand Down

0 comments on commit 632a3ac

Please sign in to comment.