Skip to content

Commit 692a708

Browse files
👻 Bump the tools group with 4 updates (#28)
* 👻 Bump the tools group with 4 updates Bumps the tools group with 4 updates: [@hey-api/openapi-ts](https://github.com/hey-api/openapi-ts), [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/tree/HEAD/packages/plugin-react), [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) and [vite-plugin-static-copy](https://github.com/sapphi-red/vite-plugin-static-copy). Updates `@hey-api/openapi-ts` from 0.77.0 to 0.80.9 - [Release notes](https://github.com/hey-api/openapi-ts/releases) - [Changelog](https://github.com/hey-api/openapi-ts/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/hey-api/openapi-ts/compare/@hey-api/[email protected]...@hey-api/[email protected]) Updates `@vitejs/plugin-react` from 4.7.0 to 5.0.0 - [Release notes](https://github.com/vitejs/vite-plugin-react/releases) - [Changelog](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite-plugin-react/commits/[email protected]/packages/plugin-react) Updates `vite` from 6.3.5 to 7.1.2 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v7.1.2/packages/vite) Updates `vite-plugin-static-copy` from 2.3.1 to 3.1.1 - [Release notes](https://github.com/sapphi-red/vite-plugin-static-copy/releases) - [Changelog](https://github.com/sapphi-red/vite-plugin-static-copy/blob/main/CHANGELOG.md) - [Commits](https://github.com/sapphi-red/vite-plugin-static-copy/compare/[email protected]@3.1.1) --- updated-dependencies: - dependency-name: "@hey-api/openapi-ts" dependency-version: 0.80.9 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: tools - dependency-name: "@vitejs/plugin-react" dependency-version: 5.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: tools - dependency-name: vite dependency-version: 7.1.2 dependency-type: direct:development update-type: version-update:semver-major dependency-group: tools - dependency-name: vite-plugin-static-copy dependency-version: 3.1.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: tools ... Signed-off-by: dependabot[bot] <[email protected]> * Upgrade server deps too Signed-off-by: Carlos Feria <[email protected]> * fix: fix proxies Signed-off-by: Carlos Feria <[email protected]> * fix: format Signed-off-by: Carlos Feria <[email protected]> * fix proxy Signed-off-by: Carlos Feria <[email protected]> * remove old images Signed-off-by: Carlos Feria <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Carlos Feria <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Carlos Feria <[email protected]>
1 parent 807770d commit 692a708

File tree

13 files changed

+561
-644
lines changed

13 files changed

+561
-644
lines changed

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONSOLE_IMAGE=quay.io/securesign/rhtas-console@sha256:e352149af297ea1790a1004a93042a8105135303502b841d7a95f0127058927f
2+
CONSOLE_UI_IMAGE=quay.io/securesign/rhtas-console-ui@sha256:bc575b49f36a9d6cff312cf61163de61f7350d239bc57af8640fc33b02570886

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ web_modules/
7373
.yarn-integrity
7474

7575
# dotenv environment variable files
76-
.env
7776
.env.development.local
7877
.env.test.local
7978
.env.production.local

client/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
"victory": "^37.3.4"
3939
},
4040
"devDependencies": {
41-
"@hey-api/openapi-ts": "^0.77.0",
41+
"@hey-api/openapi-ts": "^0.80.9",
4242
"@testing-library/react": "^16.0.0",
4343
"@types/file-saver": "^2.0.2",
4444
"@types/react": "^18.2.0",
4545
"@types/react-dom": "^18.2.0",
46-
"@vitejs/plugin-react": "^4.5.2",
46+
"@vitejs/plugin-react": "^5.0.0",
4747
"typescript": "^5.8.3",
48-
"vite": "^6.3.5",
48+
"vite": "^7.1.2",
4949
"vite-plugin-ejs": "^1.7.0",
50-
"vite-plugin-static-copy": "^2.2.0"
50+
"vite-plugin-static-copy": "^3.1.1"
5151
},
5252
"browserslist": {
5353
"production": [

client/vite.config.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import fs from "fs";
2-
import path from "path";
32
import { createRequire } from "module";
3+
import path from "path";
44

5+
import react from "@vitejs/plugin-react";
56
import { defineConfig } from "vite";
67
import { ViteEjsPlugin } from "vite-plugin-ejs";
78
import { viteStaticCopy } from "vite-plugin-static-copy";
8-
import react from "@vitejs/plugin-react";
99

10-
import { encodeEnv, proxyMap, SERVER_ENV_KEYS, CONSOLE_ENV, brandingStrings } from "@console-ui/common";
10+
import { brandingStrings, CONSOLE_ENV, encodeEnv, SERVER_ENV_KEYS } from "@console-ui/common";
1111

1212
const require = createRequire(import.meta.url);
1313
export const brandingAssetPath = () =>
@@ -84,6 +84,11 @@ export default defineConfig({
8484
},
8585
},
8686
server: {
87-
proxy: proxyMap,
87+
proxy: {
88+
"/api": {
89+
target: CONSOLE_ENV.CONSOLE_API_URL ?? "http://localhost:8080",
90+
changeOrigin: true,
91+
},
92+
},
8893
},
8994
});

common/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export * from "./environment.js";
2-
export * from "./proxies.js";
32
export * from "./branding.js";
43

54
/**

common/src/proxies.ts

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

docker-compose.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
networks:
2+
console:
3+
4+
services:
5+
console:
6+
image: ${CONSOLE_IMAGE}
7+
ports:
8+
- "8087:8080"
9+
networks:
10+
- console
11+
12+
console-ui:
13+
image: ${CONSOLE_UI_IMAGE}
14+
environment:
15+
CONSOLE_API_URL: http://console:8080
16+
AUTH_REQUIRED: "false"
17+
ports:
18+
- "8088:8080"
19+
networks:
20+
- console
21+
depends_on:
22+
console:
23+
condition: service_started

entrypoint.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)