From 91d95c7eab7df767ede33b5d66d116d7a8c411a7 Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Thu, 1 Feb 2024 04:50:06 +0100 Subject: [PATCH] update --- package.json | 2 +- public/fonts/WorkSans/font.css | 39 ---------------------------------- src/BASE_URL.ts | 2 +- vite.config.ts | 9 +++++++- yarn.lock | 8 +++---- 5 files changed, 14 insertions(+), 46 deletions(-) delete mode 100644 public/fonts/WorkSans/font.css diff --git a/package.json b/package.json index 0f0a2d6..f965ce3 100755 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "dependencies": { "evt": "^2.5.7", "oidc-spa": "^4.0.0", - "keycloakify": "^9.2.0", + "keycloakify": "9.3.0-rc.0", "powerhooks": "^1.0.8", "tsafe": "^1.6.6", "zod": "^3.22.4", diff --git a/public/fonts/WorkSans/font.css b/public/fonts/WorkSans/font.css deleted file mode 100644 index f4e3265..0000000 --- a/public/fonts/WorkSans/font.css +++ /dev/null @@ -1,39 +0,0 @@ -/* - - - - - -*/ - -@font-face { - font-family: "Work Sans"; - font-style: normal; - font-weight: normal; /*400*/ - font-display: swap; - src: url("./worksans-regular-webfont.woff2") format("woff2"); -} - -@font-face { - font-family: "Work Sans"; - font-style: normal; - font-weight: 500; - font-display: swap; - src: url("./worksans-medium-webfont.woff2") format("woff2"); -} - -@font-face { - font-family: "Work Sans"; - font-style: normal; - font-weight: 600; - font-display: swap; - src: url("./worksans-semibold-webfont.woff2") format("woff2"); -} - -@font-face { - font-family: "Work Sans"; - font-style: normal; - font-weight: bold; /*700*/ - font-display: swap; - src: url("./worksans-bold-webfont.woff2") format("woff2"); -} \ No newline at end of file diff --git a/src/BASE_URL.ts b/src/BASE_URL.ts index 35e99f9..c6cc15d 100644 --- a/src/BASE_URL.ts +++ b/src/BASE_URL.ts @@ -26,6 +26,6 @@ export const BASE_URL = (()=>{ return (kcContext === undefined || import.meta.env.MODE === 'development') ? import.meta.env.BASE_URL - : `${kcContext.url.resourcesPath}/build`; + : `${kcContext.url.resourcesPath}/build/`; })(); \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts index 48155c5..ec27ff8 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -3,8 +3,15 @@ import react from '@vitejs/plugin-react' // NOTE: This is just for the Keycloakify core contributors to be able to dynamically link // to a local version of the keycloakify package. This is not needed for normal usage. import commonjs from "vite-plugin-commonjs"; +//import { keycloakify } from "keycloakify/vite-plugin"; // https://vitejs.dev/config/ export default defineConfig({ - plugins: [react(), commonjs()], + plugins: [ + react(), + commonjs(), + //keycloakify() + ], + assetsInclude: ["**/*.md"], + base: '/abcde12345/' }) diff --git a/yarn.lock b/yarn.lock index 680d3a0..bf75869 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2600,10 +2600,10 @@ jwt-decode@^3.1.2: resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59" integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A== -keycloakify@^9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/keycloakify/-/keycloakify-9.2.0.tgz#236edadcc35f4ab039529577b26fc28c117bd55b" - integrity sha512-VbQ5EL7hvsEuoEr9pXd+2KDhVcNd4YOJuKG6+/pH0RfNeO6sow63WD8C+XiGY6HoEIKb22S2NNKR3mjclRaCrA== +keycloakify@9.3.0-rc.0: + version "9.3.0-rc.0" + resolved "https://registry.yarnpkg.com/keycloakify/-/keycloakify-9.3.0-rc.0.tgz#3640b13578bd011ba9a495eb7f01e6bc387f4008" + integrity sha512-YuKIEsL18DQyrbEIYAG1OaE23WjnOsCo5MUK5R8/a+4A2ftXsmZTZR000qaWERZ9QFt7VFp1rJpzZQOgp6LXew== dependencies: "@babel/generator" "^7.22.9" "@babel/parser" "^7.22.7"