Merge pull request #27767 from backstage/patch-release-pr-27751

Rugvip · web-flow · commit ffd04159e718 · 2024-11-21T22:00:08.000+01:00
Patch release of #27751
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "root",
-  "version": "1.33.3",
+  "version": "1.33.4",
   "private": true,
   "repository": {
     "type": "git",
diff --git a/packages/backend-legacy/CHANGELOG.md b/packages/backend-legacy/CHANGELOG.md
@@ -1,5 +1,12 @@
 # example-backend-legacy
 
+## 0.2.107
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-app-backend@0.4.2
+
 ## 0.2.106
 
 ### Patch Changes
diff --git a/packages/backend-legacy/package.json b/packages/backend-legacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend-legacy",
-  "version": "0.2.106",
+  "version": "0.2.107",
   "backstage": {
     "role": "backend"
   },
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -1,5 +1,12 @@
 # example-backend
 
+## 0.0.35
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-app-backend@0.4.2
+
 ## 0.0.34
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "backstage": {
     "role": "backend"
   },
diff --git a/plugins/app-backend/CHANGELOG.md b/plugins/app-backend/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/plugin-app-backend
 
+## 0.4.2
+
+### Patch Changes
+
+- 087c675: Fix root route handling when query parameters are present
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-backend",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "A Backstage backend plugin that serves the Backstage frontend app",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/app-backend/src/service/appPlugin.test.ts b/plugins/app-backend/src/service/appPlugin.test.ts
@@ -93,34 +93,37 @@ describe('appPlugin', () => {
       ],
     });
 
-    const rootContent = await fetch(`http://localhost:${server.port()}`).then(
-      res => res.text(),
-    );
-
-    expect(rootContent).toBe(`<html><head>
+    const baseUrl = `http://localhost:${server.port()}`;
+    const withInjectedConfig = `<html><head>
 <script type="backstage.io/config">
 []
 </script>
-</head></html>`);
+</head></html>`;
 
-    const indexContent = await fetch(
-      `http://localhost:${server.port()}/index.html`,
-    ).then(res => res.text());
+    await expect(fetch(`${baseUrl}`).then(res => res.text())).resolves.toBe(
+      withInjectedConfig,
+    );
 
-    expect(indexContent).toBe(`<html><head>
-<script type="backstage.io/config">
-[]
-</script>
-</head></html>`);
+    await expect(
+      fetch(`${baseUrl}?foo=bar`).then(res => res.text()),
+    ).resolves.toBe(withInjectedConfig);
 
-    const htmlContent = await fetch(
-      `http://localhost:${server.port()}/api/app/some/html5/route`,
-    ).then(res => res.text());
+    await expect(
+      fetch(`${baseUrl}/index.html`).then(res => res.text()),
+    ).resolves.toBe(withInjectedConfig);
 
-    expect(htmlContent).toBe(`<html><head>
-<script type="backstage.io/config">
-[]
-</script>
-</head></html>`);
+    await expect(
+      fetch(`${baseUrl}/index.html?foo=bar`).then(res => res.text()),
+    ).resolves.toBe(withInjectedConfig);
+
+    await expect(
+      fetch(`${baseUrl}/api/app/some/html5/route`).then(res => res.text()),
+    ).resolves.toBe(withInjectedConfig);
+
+    await expect(
+      fetch(`${baseUrl}/api/app/some/html5/route?foo=bar`).then(res =>
+        res.text(),
+      ),
+    ).resolves.toBe(withInjectedConfig);
   });
 });
diff --git a/plugins/app-backend/src/service/router.ts b/plugins/app-backend/src/service/router.ts
@@ -306,7 +306,7 @@ async function createEntryPointRouter({
   const rootRouter = Router();
   rootRouter.use((req, _res, next) => {
     // Make sure / and /index.html are handled by the HTML5 route below
-    if (req.url === '/' || req.url === '/index.html') {
+    if (req.path === '/' || req.path === '/index.html') {
       next('router');
     } else {
       next();

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "root",`
`3`		`- "version": "1.33.3",`
	`3`	`+ "version": "1.33.4",`
`4`	`4`	`"private": true,`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "example-backend-legacy",`
`3`		`- "version": "0.2.106",`
	`3`	`+ "version": "0.2.107",`
`4`	`4`	`"backstage": {`
`5`	`5`	`"role": "backend"`
`6`	`6`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "example-backend",`
`3`		`- "version": "0.0.34",`
	`3`	`+ "version": "0.0.35",`
`4`	`4`	`"backstage": {`
`5`	`5`	`"role": "backend"`
`6`	`6`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@backstage/plugin-app-backend",`
`3`		`- "version": "0.4.1",`
	`3`	`+ "version": "0.4.2",`
`4`	`4`	`"description": "A Backstage backend plugin that serves the Backstage frontend app",`
`5`	`5`	`"backstage": {`
`6`	`6`	`"role": "backend-plugin",`