Skip to content

Fix/upgrade mercury #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DiegoScaffo wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix/upgrade mercury #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2daa90f
Update mercury and add new build scripts
Nov 25, 2025
980da84
Add mercury config to customize font-size (like the Host IDE)
Nov 25, 2025
41284f4
Update tokens
Nov 25, 2025
9a95801
Minor fixes
Nov 25, 2025
e8c845d
Several refacotring for standalone tests
Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions frontend/packages/components/mercury.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import type { MercuryConfig } from "@genexus/mercury-cli";

export default {
overrides: {
tokens: {
semantic: {
"font-size": {
body: {
"font-size-body-xl": "var(--size-16)",
"font-size-body-l": "var(--size-14)",
"font-size-body-m": "var(--size-12)",
"font-size-body-s": "var(--size-11)",
"font-size-body-xs": "var(--size-10)"
},
caption: {
"font-size-caption-l": "var(--size-12)",
"font-size-caption-m": "var(--size-11)",
"font-size-caption-s": "var(--size-10)"
},
header: {
"font-size-header-h1": "var(--size-28)",
"font-size-header-h2": "var(--size-24)",
"font-size-header-h3": "22px", // This size doesn't exists in Mercury
"font-size-header-h4": "var(--size-20)",
"font-size-header-h5": "var(--size-18)",
"font-size-header-h6": "var(--size-16)"
},
subtitle: {
"font-size-subtitle-l": "var(--size-16)",
"font-size-subtitle-m": "15px", // This size doesn't exists in Mercury
"font-size-subtitle-s": "var(--size-14)"
}
}
}
}
}
} satisfies MercuryConfig;
20 changes: 14 additions & 6 deletions frontend/packages/components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@
],
"scripts": {
"watch": "yarn build.icons && stencil build --watch",
"build": "yarn build.icons && stencil build",
"build": "yarn build.mercury && yarn build.icons && stencil build",
"build.docs": "stencil build --dev --docs",
"build.icons": "yarn icons-svg && yarn icons-sass && yarn build.css",
"build.css": "sass --no-source-map --style compressed src/assets/global.scss:src/assets/generated/css/global.css",
"build.mercury": "mercury --i=mercury/generated/assets/icons/ --f=../../fonts/ && tsc node_modules/.genexus/mercury/bundle-to-hash-mappings.ts --module ESNext --skipLibCheck",
"start": "yarn build.icons && yarn start.light",
"start.light": "stencil build --dev --watch --serve",
"prettier": "prettier src/**/*.{tsx,ts,jsx,js,css,json,md} --write",
Expand All @@ -35,8 +36,10 @@
"icons-sass": "ssg-sass --srcDir=src/assets/generated/icons/ --outDir=src/assets/generated/sass/ --configFilePath=src/icons/config/color-states.json --vendorAlias=sv"
},
"devDependencies": {
"@genexus/chameleon-controls-library": "6.0.0-next.55",
"@genexus/mercury": "0.13.1",
"@genexus/chameleon-controls-library": "6.26.0",
"@genexus/mercury": "1.0.0-beta.2",
"@genexus/mercury-build": "1.0.0-beta.2",
"@genexus/mercury-cli": "1.0.0-beta.2",
"@genexus/svg-sass-generator": ">=1.1.20",
"@stencil-community/eslint-plugin": "~0.7.1",
"@stencil/core": "^4.19.1",
Expand All @@ -46,22 +49,27 @@
"@types/prettier": "~2.4.0",
"@typescript-eslint/eslint-plugin": "~6.20.0",
"@typescript-eslint/parser": "~6.20.0",
"copyfiles": "2.4.0",
"eslint": "~8.56.0",
"eslint-config-prettier": "~8.8.0",
"eslint-plugin-prettier": "~4.2.1",
"eslint-plugin-react": "~7.33.2",
"jest": "~29.7.0",
"jest-cli": "~29.7.0",
"lit": "^3.3.1",
"prettier": "~2.8.8",
"puppeteer": "~22.12.1",
"sass": "~1.77.8",
"typescript": "~5.4.5"
},
"peerDependencies": {
"@genexus/chameleon-controls-library": "6.0.0-next.55",
"@genexus/mercury": "0.13.1",
"@genexus/chameleon-controls-library": "6.26.0",
"@genexus/mercury": "1.0.0-beta.2",
"@genexus/mercury-build": "1.0.0-beta.2",
"@genexus/mercury-cli": "1.0.0-beta.2",
"@genexus/svg-sass-generator": ">=1.1.20",
"@genexus/web-standard-functions": ">= 0.65.0"
"@genexus/web-standard-functions": ">= 0.65.0",
"lit": "^3.3.1"
},
"dependencies": {
"@genexusm-plugin-sample/common": "*"
Expand Down
12 changes: 6 additions & 6 deletions frontend/packages/components/src/components/echo-console/echo-console.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
display: grid;
grid-template-rows: max-content 1fr max-content;
height: 100%;
padding: var(--mer-spacing--xs);
padding: var(--mer-spacing--xs, 8px);
}

.header {
display: grid;
grid-template-columns: 1fr max-content;
gap: var(--mer-spacing--sm);
gap: var(--mer-spacing--sm, 12px);
}

.console {
background-color: var(--mer-elevation__background-color--01);
color: var(--mer-color__message-green--100);
padding: var(--mer-spacing--xs);
background-color: var(--color-accent-surface-elevation-1);
color: var(--color-text-success-default);
padding: var(--mer-spacing--xs, 8px);
overflow-y: auto;
}

.footer {
display: grid;
grid-template-columns: max-content max-content;
gap: var(--mer-spacing--sm);
gap: var(--mer-spacing--sm, 12px);
justify-content: flex-end;
}
2 changes: 1 addition & 1 deletion frontend/packages/components/src/components/echo-console/echo-console.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class SVEchoConsole {
value="Test value"
ref={(el) => this.#inputRef = el}
/>
<button class="button-secondary button-icon-and-text" onClick={this.#callToServerHandler}>
<button class="button-primary button-icon-and-text" onClick={this.#callToServerHandler}>
<ch-image src={this.#getCallServerIcon()} class="icon-sm"></ch-image>
{this.#componentLocale.callServer}
</button>
Expand Down
6 changes: 3 additions & 3 deletions frontend/packages/components/src/components/kb-object-name-editor/kb-object-name-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
display: grid;
grid-template-rows: 1fr auto;
height: 100%;
padding: var(--mer-spacing--xs);
gap: var(--mer-spacing--xs);
padding: var(--mer-spacing--xs, 8px);
gap: var(--mer-spacing--xs, 8px);
}

.content {
Expand All @@ -13,5 +13,5 @@
.footer {
display: flex;
justify-content: flex-end;
gap: var(--mer-spacing--xs);
gap: var(--mer-spacing--xs, 8px);
}
7 changes: 2 additions & 5 deletions frontend/packages/components/src/components/object-selector/object-selector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:host {
display: grid;
padding: var(--mer-spacing--md);
padding: var(--mer-spacing--md, 16px);
overflow-y: hidden;
grid-template:
"header" max-content
Expand All @@ -11,9 +11,6 @@
.header {
grid-area: header;
text-align: center;
color: var(--mer-color__primary-blue--200);
font-size: var(--mer-font__size--md);
font-weight: var(--mer-font__weight--semi-bold);
}

.type-selector{
Expand All @@ -25,6 +22,6 @@
display: grid;
grid-template-columns: 1fr 1fr;
grid-template-rows: 100%;
gap: var(--mer-spacing--md);
gap: var(--mer-spacing--md, 16px);
}

2 changes: 1 addition & 1 deletion frontend/packages/components/src/components/object-selector/object-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export class SVObjectSelector {
return (
<Host class="layout">
<ch-theme model={CSS_BUNDLES} />
<p class="header">{this.#componentLocale.header}</p>
<p class="header heading-1">{this.#componentLocale.header}</p>
<ch-combo-box-render
id="type-selector"
class="type-selector combo-box"
Expand Down
Loading