From e3cca397e4e2686add39644b3ad1f533e6192777 Mon Sep 17 00:00:00 2001
From: djamaile <rdjamaile@gmail.com>
Date: Sat, 12 Mar 2022 19:25:49 +0100
Subject: [PATCH] fix: yarn.lock to keep tsc command from failing

Signed-off-by: djamaile <rdjamaile@gmail.com>
---
 packages/app/src/apis.ts                      |  4 +---
 .../.eslintrc.js                              |  4 +---
 .../package.json                              | 22 ++++++++-----------
 .../src/setupTests.ts                         |  3 +--
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts
index 7214a96688..7b3232f42d 100644
--- a/packages/app/src/apis.ts
+++ b/packages/app/src/apis.ts
@@ -65,8 +65,6 @@ export const apis: AnyApiFactory[] = [
         }),
       ]),
   }),
-
-  createApiFactory(costInsightsApiRef, new ExampleCostInsightsClient()),
   createApiFactory({
     api: cicdStatisticsApiRef,
     deps: { gitlabAuthApi: gitlabAuthApiRef },
@@ -74,5 +72,5 @@ export const apis: AnyApiFactory[] = [
       return new CicdStatisticsApiGitlab(gitlabAuthApi);
     },
   }),
-  //  createApiFactory(cicdStatisticsApiRef, new CicdStatisticsApiGitlab()),
+  createApiFactory(costInsightsApiRef, new ExampleCostInsightsClient()),
 ];
diff --git a/plugins/cicd-statistics-module-gitlab/.eslintrc.js b/plugins/cicd-statistics-module-gitlab/.eslintrc.js
index 13573efa9c..e2a53a6ad2 100644
--- a/plugins/cicd-statistics-module-gitlab/.eslintrc.js
+++ b/plugins/cicd-statistics-module-gitlab/.eslintrc.js
@@ -1,3 +1 @@
-module.exports = {
-  extends: [require.resolve('@backstage/cli/config/eslint')],
-};
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/cicd-statistics-module-gitlab/package.json b/plugins/cicd-statistics-module-gitlab/package.json
index df9ccef6b8..e41e634dc2 100644
--- a/plugins/cicd-statistics-module-gitlab/package.json
+++ b/plugins/cicd-statistics-module-gitlab/package.json
@@ -8,16 +8,12 @@
   "private": false,
   "publishConfig": {
     "access": "public",
-    "main": "dist/index.esm.js",
+    "main": "dist/index.cjs.js",
+    "module": "dist/index.esm.js",
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "frontend-plugin"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/backstage/backstage",
-    "directory": "plugins/cicd-statistics-module-gitlab"
+    "role": "common-library"
   },
   "keywords": [
     "backstage",
@@ -27,20 +23,20 @@
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
-    "test": "backstage-cli package test"
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.10",
-    "@backstage/core-plugin-api": "^0.8.0",
     "@backstage/plugin-cicd-statistics": "^0.1.0",
     "@gitbeaker/browser": "34.2.0",
     "@gitbeaker/core": "^35.4.0",
-    "lodash": "^4.17.21",
     "luxon": "^2.0.2",
     "p-limit": "^4.0.0"
   },
-  "peerDependencies": {
-    "react": "^16.13.1 || ^17.0.0"
+  "devDependencies": {
+    "@backstage/cli": "^0.15.2"
   },
   "files": [
     "dist"
diff --git a/plugins/cicd-statistics-module-gitlab/src/setupTests.ts b/plugins/cicd-statistics-module-gitlab/src/setupTests.ts
index 9bb3e72355..8b9b6bd586 100644
--- a/plugins/cicd-statistics-module-gitlab/src/setupTests.ts
+++ b/plugins/cicd-statistics-module-gitlab/src/setupTests.ts
@@ -13,5 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import '@testing-library/jest-dom';
-import 'cross-fetch/polyfill';
+export {};