Skip to content

Commit 62bcbf9

Browse files
committed
manual changes for release
Signed-off-by: Andre Wanlin <[email protected]>
1 parent 312c998 commit 62bcbf9

File tree

13 files changed

+170
-954
lines changed

13 files changed

+170
-954
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
playwright.config.ts

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,7 @@ site
4545
!.yarn/plugins
4646
!.yarn/releases
4747
!.yarn/sdks
48-
!.yarn/versions
48+
!.yarn/versions
49+
50+
# E2E test reports
51+
e2e-test-report/

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1 - Create yarn install skeleton layer
2-
FROM node:18-bullseye-slim AS packages
2+
FROM node:18-bookworm-slim AS packages
33

44
WORKDIR /app
55
COPY package.json yarn.lock ./
@@ -12,7 +12,7 @@ COPY packages packages
1212
RUN find packages \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf
1313

1414
# Stage 2 - Install dependencies and build packages
15-
FROM node:18-bullseye-slim AS build
15+
FROM node:18-bookworm-slim AS build
1616

1717
# Set Python interpreter for `node-gyp` to use
1818
ENV PYTHON /usr/bin/python3
@@ -46,7 +46,7 @@ RUN mkdir packages/backend/dist/skeleton packages/backend/dist/bundle \
4646
&& tar xzf packages/backend/dist/bundle.tar.gz -C packages/backend/dist/bundle
4747

4848
# Stage 3 - Build the actual backend image and install production dependencies
49-
FROM node:18-bullseye-slim
49+
FROM node:18-bookworm-slim
5050

5151
# Set Python interpreter for `node-gyp` to use
5252
ENV PYTHON /usr/bin/python3

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"private": true,
55
"engines": {
6-
"node": "16 || 18"
6+
"node": "18 || 20"
77
},
88
"scripts": {
99
"dev": "concurrently \"yarn start\" \"yarn start-backend\"",
@@ -15,6 +15,7 @@
1515
"clean": "backstage-cli repo clean",
1616
"test": "backstage-cli repo test",
1717
"test:all": "backstage-cli repo test --coverage",
18+
"test:e2e": "playwright test",
1819
"lint": "backstage-cli repo lint --since origin/master",
1920
"lint:all": "backstage-cli repo lint",
2021
"create-plugin": "backstage-cli create-plugin --scope internal --no-private",
@@ -35,6 +36,8 @@
3536
},
3637
"devDependencies": {
3738
"@backstage/cli": "^0.23.0-next.1",
39+
"@backstage/e2e-test-utils": "^0.1.0-next.0",
40+
"@playwright/test": "^1.32.3",
3841
"@spotify/prettier-config": "^7.0.0",
3942
"concurrently": "^6.0.0",
4043
"eslint-plugin-jest": "*",

packages/app/cypress.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

packages/app/cypress/.eslintrc.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

packages/app/cypress/integration/app.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/app/e2e-tests/app.test.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright 2023 The Backstage Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
import { test, expect } from '@playwright/test';
18+
19+
test('App should render the welcome page', async ({ page }) => {
20+
await page.goto('/');
21+
await expect(page.getByText('My Company Catalog')).toBeVisible();
22+
});

packages/app/package.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,19 @@
4343
"react-use": "^15.3.3"
4444
},
4545
"devDependencies": {
46+
"@playwright/test": "^1.32.3",
4647
"@testing-library/jest-dom": "^5.16.5",
4748
"@testing-library/react": "^14.0.0",
4849
"@types/jest": "^26.0.7",
4950
"@types/node": "^12.0.0",
5051
"@types/react-dom": "*",
51-
"cross-env": "^7.0.0",
52-
"cypress": "^4.2.0",
53-
"eslint-plugin-cypress": "^2.10.3",
54-
"start-server-and-test": "^1.10.11"
52+
"cross-env": "^7.0.0"
5553
},
5654
"scripts": {
5755
"start": "backstage-cli package start",
5856
"build": "backstage-cli package build",
5957
"test": "backstage-cli package test",
6058
"lint": "backstage-cli package lint",
61-
"test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev",
62-
"test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run",
63-
"cy:dev": "cypress open",
64-
"cy:run": "cypress run",
6559
"clean": "backstage-cli package clean"
6660
},
6761
"browserslist": {

packages/app/public/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
name="description"
99
content="Backstage is an open platform for building developer portals"
1010
/>
11-
<link rel="apple-touch-icon" href="<%= publicPath %>/logo192.png" />
1211
<!--
1312
manifest.json provides metadata used when your web app is installed on a
1413
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

0 commit comments

Comments
 (0)