Upgrade to latest backstage and switch to new react import. (#68)

Also use some more modern yarn.

Signed-off-by: Łukasz Jernaś <[email protected]>

Author: deejay1

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         cache: yarn
-    - run: yarn install --frozen-lockfile
+    - run: yarn install --immutable
     - run: yarn tsc
     - run: yarn build
     - run: yarn test

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
         node-version: 20
         cache: yarn
         registry-url: 'https://registry.npmjs.org'
-    - run: yarn install --frozen-lockfile
+    - run: yarn install --immutable
     - run: yarn tsc
     - run: yarn build
     - run: yarn publish

.gitignore

@@ -3,4 +3,5 @@ dist-types/
 node_modules
 .idea/
 app-config.yaml
-.npmrc
+.npmrc
+.yarn/install-state.gz

.yarn/releases/yarn-4.8.1.cjs

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.8.1.cjs

.yarnrc.yml

@@ -1,3 +1,3 @@
 {
-  "version": "1.38.0"
+  "version": "1.39.0"
 }

backstage.json

@@ -32,11 +32,11 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.17.1",
-    "@backstage/core-plugin-api": "^1.10.6",
-    "@backstage/frontend-plugin-api": "^0.10.1",
-    "@backstage/plugin-techdocs-react": "^1.2.16",
-    "@backstage/theme": "^0.6.5",
+    "@backstage/core-components": "^0.17.2",
+    "@backstage/core-plugin-api": "^1.10.7",
+    "@backstage/frontend-plugin-api": "^0.10.2",
+    "@backstage/plugin-techdocs-react": "^1.2.17",
+    "@backstage/theme": "^0.6.6",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "4.0.0-alpha.61",
@@ -47,21 +47,27 @@
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
-    "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0",
+    "@types/react": "^17.0.0 || ^18.0.0",
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0",
     "react-router-dom": "^6.3.0"
   },
+  "peerDependenciesMeta": {
+    "@types/react": {
+      "optional": true
+    }
+  },
   "devDependencies": {
-    "@backstage/cli": "^0.32.0",
-    "@backstage/core-app-api": "^1.16.1",
-    "@backstage/dev-utils": "^1.1.9",
-    "@backstage/plugin-techdocs-addons-test-utils": "^1.0.47",
-    "@backstage/test-utils": "^1.7.7",
+    "@backstage/cli": "^0.32.1",
+    "@backstage/core-app-api": "^1.17.0",
+    "@backstage/dev-utils": "^1.1.10",
+    "@backstage/plugin-techdocs-addons-test-utils": "^1.0.48",
+    "@backstage/test-utils": "^1.7.8",
     "@date-io/core": "^1.3.13",
     "@svgr/core": "^6.0.0",
-    "@testing-library/dom": "^9.0.0",
+    "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.0.0",
     "@types/d3": "^7.4.3",
     "@types/jest": "*",
@@ -72,7 +78,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.3.0",
-    "typescript": "~5.2.0"
+    "typescript": "~5.6.0"
   },
   "files": [
     "dist"
@@ -82,5 +88,5 @@
     "url": "https://github.com/johanneswuerbach/backstage-plugin-techdocs-addon-mermaid",
     "directory": "."
   },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  "packageManager": "yarn@4.8.1"
 }

package.json

@@ -16,8 +16,6 @@
 
 import { TechDocsAddonTester } from '@backstage/plugin-techdocs-addons-test-utils';
 
-import React from 'react';
-
 import { Mermaid } from '../plugin';
 import { selectConfig } from './Mermaid';
 import { MermaidProps } from './props';

src/Mermaid/Mermaid.test.tsx

@@ -7,6 +7,7 @@
   "compilerOptions": {
     "outDir": "dist-types",
     "rootDir": ".",
-    "useUnknownInCatchVariables": false
+    "useUnknownInCatchVariables": false,
+    "jsx": "react-jsx"
   }
 }