Skip to content

Commit

Permalink
Add release 0.5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@github-actions
github-actions[bot] committed Oct 19, 2023
1 parent d2612dd commit 2872690
Show file tree
Hide file tree
Showing 3 changed files with 666 additions and 0 deletions.
324 changes: 324 additions & 0 deletions diffs/0.5.6-next.2..0.5.5.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,324 @@
diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e5b1994..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-playwright.config.ts
diff --git a/.gitignore b/.gitignore
index fbf8139..d452ac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,4 +51 @@ site
*.session.sql
-
-# E2E test reports
-e2e-test-report/
diff --git a/backstage.json b/backstage.json
index 58a3a2b..bdfd297 100644
--- a/backstage.json
+++ b/backstage.json
@@ -1,3 +1,3 @@
{
- "version": "1.19.0-next.2"
+ "version": "1.18.0"
}
diff --git a/package.json b/package.json
index c66be6b..99520c1 100644
--- a/package.json
+++ b/package.json
@@ -5,3 +5,3 @@
"engines": {
- "node": "18 || 20"
+ "node": "16 || 18"
},
@@ -19,3 +19,2 @@
"test:all": "backstage-cli repo test --coverage",
- "test:e2e": "playwright test",
"fix": "backstage-cli repo fix",
@@ -33,5 +32,3 @@
"devDependencies": {
- "@backstage/cli": "^0.23.0-next.2",
- "@backstage/e2e-test-utils": "^0.1.0-next.0",
- "@playwright/test": "^1.32.3",
+ "@backstage/cli": "^0.22.13",
"@spotify/prettier-config": "^12.0.0",
diff --git a/packages/app/cypress.json b/packages/app/cypress.json
new file mode 100644
index 0000000..0cb845a
--- /dev/null
+++ b/packages/app/cypress.json
@@ -0,0 +1,6 @@
+{
+ "baseUrl": "http://localhost:3001",
+ "fixturesFolder": false,
+ "pluginsFile": false,
+ "retries": 3
+}
diff --git a/packages/app/cypress/.eslintrc.json b/packages/app/cypress/.eslintrc.json
new file mode 100644
index 0000000..b903ff2
--- /dev/null
+++ b/packages/app/cypress/.eslintrc.json
@@ -0,0 +1,12 @@
+{
+ "plugins": ["cypress"],
+ "extends": ["plugin:cypress/recommended"],
+ "rules": {
+ "jest/expect-expect": [
+ "error",
+ {
+ "assertFunctionNames": ["expect", "cy.contains", "cy.**.should"]
+ }
+ ]
+ }
+}
diff --git a/packages/app/cypress/integration/app.js b/packages/app/cypress/integration/app.js
new file mode 100644
index 0000000..43fb2e3
--- /dev/null
+++ b/packages/app/cypress/integration/app.js
@@ -0,0 +1,6 @@
+describe('App', () => {
+ it('should render the catalog', () => {
+ cy.visit('/');
+ cy.contains('My Company Catalog');
+ });
+});
diff --git a/packages/app/e2e-tests/app.test.ts b/packages/app/e2e-tests/app.test.ts
deleted file mode 100644
index d45bc0d..0000000
--- a/packages/app/e2e-tests/app.test.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2020 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { test, expect } from '@playwright/test';
-
-test('App should render the welcome page', async ({ page }) => {
- await page.goto('/');
-
- await expect(page.getByText('My Company Catalog')).toBeVisible();
-});
diff --git a/packages/app/package.json b/packages/app/package.json
index 8b3df52..f8ec459 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -13,30 +13,34 @@
"test": "backstage-cli package test",
- "lint": "backstage-cli package lint"
+ "lint": "backstage-cli package lint",
+ "test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev",
+ "test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run",
+ "cy:dev": "cypress open",
+ "cy:run": "cypress run --browser chrome"
},
"dependencies": {
- "@backstage/app-defaults": "^1.4.4-next.2",
- "@backstage/catalog-model": "^1.4.3-next.0",
- "@backstage/cli": "^0.23.0-next.2",
- "@backstage/core-app-api": "^1.11.0-next.2",
- "@backstage/core-components": "^0.13.6-next.2",
- "@backstage/core-plugin-api": "^1.7.0-next.1",
- "@backstage/integration-react": "^1.1.20-next.2",
- "@backstage/plugin-api-docs": "^0.9.12-next.2",
- "@backstage/plugin-catalog": "^1.14.0-next.2",
- "@backstage/plugin-catalog-common": "^1.0.17-next.0",
- "@backstage/plugin-catalog-graph": "^0.2.37-next.2",
- "@backstage/plugin-catalog-import": "^0.10.1-next.2",
- "@backstage/plugin-catalog-react": "^1.8.5-next.2",
- "@backstage/plugin-github-actions": "^0.6.6-next.2",
- "@backstage/plugin-org": "^0.6.15-next.2",
- "@backstage/plugin-permission-react": "^0.4.16-next.1",
- "@backstage/plugin-scaffolder": "^1.15.1-next.2",
- "@backstage/plugin-search": "^1.4.1-next.2",
- "@backstage/plugin-search-react": "^1.7.1-next.2",
- "@backstage/plugin-tech-radar": "^0.6.9-next.2",
- "@backstage/plugin-techdocs": "^1.7.1-next.2",
- "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.1-next.2",
- "@backstage/plugin-techdocs-react": "^1.1.12-next.2",
- "@backstage/plugin-user-settings": "^0.7.11-next.2",
- "@backstage/theme": "^0.4.3-next.0",
+ "@backstage/app-defaults": "^1.4.3",
+ "@backstage/catalog-model": "^1.4.2",
+ "@backstage/cli": "^0.22.13",
+ "@backstage/core-app-api": "^1.10.0",
+ "@backstage/core-components": "^0.13.5",
+ "@backstage/core-plugin-api": "^1.6.0",
+ "@backstage/integration-react": "^1.1.19",
+ "@backstage/plugin-api-docs": "^0.9.11",
+ "@backstage/plugin-catalog": "^1.13.0",
+ "@backstage/plugin-catalog-common": "^1.0.16",
+ "@backstage/plugin-catalog-graph": "^0.2.36",
+ "@backstage/plugin-catalog-import": "^0.10.0",
+ "@backstage/plugin-catalog-react": "^1.8.4",
+ "@backstage/plugin-github-actions": "^0.6.5",
+ "@backstage/plugin-org": "^0.6.14",
+ "@backstage/plugin-permission-react": "^0.4.15",
+ "@backstage/plugin-scaffolder": "^1.15.0",
+ "@backstage/plugin-search": "^1.4.0",
+ "@backstage/plugin-search-react": "^1.7.0",
+ "@backstage/plugin-tech-radar": "^0.6.8",
+ "@backstage/plugin-techdocs": "^1.7.0",
+ "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.0",
+ "@backstage/plugin-techdocs-react": "^1.1.10",
+ "@backstage/plugin-user-settings": "^0.7.9",
+ "@backstage/theme": "^0.4.2",
"@material-ui/core": "^4.12.2",
@@ -51,4 +55,3 @@
"devDependencies": {
- "@backstage/test-utils": "^1.4.4-next.2",
- "@playwright/test": "^1.32.3",
+ "@backstage/test-utils": "^1.4.3",
"@testing-library/jest-dom": "^5.10.1",
@@ -58,3 +61,6 @@
"@types/react-dom": "*",
- "cross-env": "^7.0.0"
+ "cross-env": "^7.0.0",
+ "cypress": "^9.7.0",
+ "eslint-plugin-cypress": "^2.10.3",
+ "start-server-and-test": "^1.10.11"
},
diff --git a/packages/app/public/index.html b/packages/app/public/index.html
index fc758ee..c6083b3 100644
--- a/packages/app/public/index.html
+++ b/packages/app/public/index.html
@@ -10,2 +10,3 @@
/>
+ <link rel="apple-touch-icon" href="<%= publicPath %>/logo192.png" />
<!--
diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile
index 18548e9..a60fee7 100644
--- a/packages/backend/Dockerfile
+++ b/packages/backend/Dockerfile
@@ -11,3 +11,3 @@

-FROM node:18-bookworm-slim
+FROM node:16-bullseye-slim

diff --git a/packages/backend/package.json b/packages/backend/package.json
index a3f1b3e..6734182 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -18,19 +18,19 @@
"dependencies": {
- "@backstage/backend-common": "^0.19.8-next.2",
- "@backstage/backend-tasks": "^0.5.11-next.2",
- "@backstage/catalog-client": "^1.4.5-next.0",
- "@backstage/catalog-model": "^1.4.3-next.0",
- "@backstage/config": "^1.1.1-next.0",
- "@backstage/plugin-app-backend": "^0.3.54-next.2",
- "@backstage/plugin-auth-backend": "^0.19.3-next.2",
- "@backstage/plugin-auth-node": "^0.4.0-next.2",
- "@backstage/plugin-catalog-backend": "^1.14.0-next.2",
- "@backstage/plugin-permission-common": "^0.7.9-next.0",
- "@backstage/plugin-permission-node": "^0.7.17-next.2",
- "@backstage/plugin-proxy-backend": "^0.4.3-next.2",
- "@backstage/plugin-scaffolder-backend": "^1.18.0-next.2",
- "@backstage/plugin-search-backend": "^1.4.6-next.2",
- "@backstage/plugin-search-backend-module-pg": "^0.5.15-next.2",
- "@backstage/plugin-search-backend-node": "^1.2.10-next.2",
- "@backstage/plugin-techdocs-backend": "^1.8.0-next.2",
+ "@backstage/backend-common": "^0.19.5",
+ "@backstage/backend-tasks": "^0.5.8",
+ "@backstage/catalog-client": "^1.4.4",
+ "@backstage/catalog-model": "^1.4.2",
+ "@backstage/config": "^1.1.0",
+ "@backstage/plugin-app-backend": "^0.3.51",
+ "@backstage/plugin-auth-backend": "^0.19.0",
+ "@backstage/plugin-auth-node": "^0.3.0",
+ "@backstage/plugin-catalog-backend": "^1.13.0",
+ "@backstage/plugin-permission-common": "^0.7.8",
+ "@backstage/plugin-permission-node": "^0.7.14",
+ "@backstage/plugin-proxy-backend": "^0.4.0",
+ "@backstage/plugin-scaffolder-backend": "^1.17.0",
+ "@backstage/plugin-search-backend": "^1.4.3",
+ "@backstage/plugin-search-backend-module-pg": "^0.5.12",
+ "@backstage/plugin-search-backend-node": "^1.2.7",
+ "@backstage/plugin-techdocs-backend": "^1.7.0",
"app": "link:../app",
@@ -44,3 +44,3 @@
"devDependencies": {
- "@backstage/cli": "^0.23.0-next.2",
+ "@backstage/cli": "^0.22.13",
"@types/dockerode": "^3.3.0",
diff --git a/playwright.config.ts b/playwright.config.ts
deleted file mode 100644
index 37c7fb1..0000000
--- a/playwright.config.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2023 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { defineConfig } from '@playwright/test';
-import { generateProjects } from '@backstage/e2e-test-utils/playwright';
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
- timeout: 60_000,
-
- expect: {
- timeout: 5_000,
- },
-
- // Run your local dev server before starting the tests
- webServer: process.env.CI
- ? []
- : [
- {
- command: 'yarn start',
- port: 3000,
- reuseExistingServer: true,
- timeout: 60_000,
- },
- ],
-
- forbidOnly: !!process.env.CI,
-
- retries: process.env.CI ? 2 : 0,
-
- reporter: [['html', { open: 'never', outputFolder: 'e2e-test-report' }]],
-
- use: {
- actionTimeout: 0,
- baseURL:
- process.env.PLAYWRIGHT_URL ??
- (process.env.CI ? 'http://localhost:7007' : 'http://localhost:3000'),
- screenshot: 'only-on-failure',
- trace: 'on-first-retry',
- },
-
- outputDir: 'node_modules/.cache/e2e-test-results',
-
- projects: generateProjects(), // Find all packages with e2e-test folders
-});
Loading

0 comments on commit 2872690

Please sign in to comment.