Skip to content

Headless mode fixes #14526

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
vitvakatu wants to merge 3 commits into
base: develop
Choose a base branch
from
+258 −622
Open

Headless mode fixes #14526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
581c7cf
Bring .env files back to gui, read config at runtime in electron-client
vitvakatu Dec 17, 2025
7ee9faf
Moving submodule
vitvakatu Dec 18, 2025
351ef88
Update dev-env submodule
vitvakatu Dec 19, 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
45 changes: 24 additions & 21 deletions .github/workflows/ide-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ jobs:
with:
name: fbs-schema
path: engine/language-server/src/main/schema/
- name: Archive project-manager
run: tar -cvf project-manager.tar -C dist/backend .
- name: Upload project-manager
- name: Archive backend
run: tar -cvf backend.tar -C dist/backend .
- name: Upload backend
uses: actions/upload-artifact@v4
with:
name: project-manager-linux
path: project-manager.tar
name: backend-linux
path: backend.tar
- name: Cleanup
run: rm project-manager.tar
run: rm backend.tar
- if: "${{ (always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || (github.ref == 'refs/heads/develop') || inputs.clean_build_required) }}"
name: Clean after
run: corepack pnpm run git-clean --verbose --clean-bazel
Expand Down Expand Up @@ -127,15 +127,15 @@ jobs:
- run: ./run backend get
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Archive project-manager
run: tar -cvf project-manager.tar -C dist/backend .
- name: Upload project-manager
- name: Archive backend
run: tar -cvf backend.tar -C dist/backend .
- name: Upload backend
uses: actions/upload-artifact@v4
with:
name: project-manager-windows
path: project-manager.tar
name: backend-windows
path: backend.tar
- name: Cleanup
run: rm project-manager.tar
run: rm backend.tar
- if: "${{ (always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || (github.ref == 'refs/heads/develop') || inputs.clean_build_required) }}"
name: Clean after
run: corepack pnpm run git-clean --verbose --clean-bazel
Expand Down Expand Up @@ -196,6 +196,7 @@ jobs:
ENSO_IDE_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
ENSO_IDE_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID }}
ENSO_IDE_HOST: ${{ vars.ENSO_HOST }}
ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
ENSO_IDE_MS365_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_MS365_OAUTH_CLIENT_ID }}
ENSO_IDE_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
Expand Down Expand Up @@ -265,6 +266,7 @@ jobs:
ENSO_IDE_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
ENSO_IDE_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID }}
ENSO_IDE_HOST: ${{ vars.ENSO_HOST }}
ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
ENSO_IDE_MS365_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_MS365_OAUTH_CLIENT_ID }}
ENSO_IDE_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
Expand Down Expand Up @@ -319,17 +321,16 @@ jobs:
run: corepack pnpm run git-clean --verbose --clean-bazel
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Download project-manager
- name: Download backend
uses: actions/download-artifact@v4
with:
name: project-manager-linux
name: backend-linux
path: dist/backend
- run: |-
tar -xvf dist/backend/project-manager.tar -C dist/backend
rm dist/backend/project-manager.tar
tar -xvf dist/backend/backend.tar -C dist/backend
rm dist/backend/backend.tar
- run: ./run ide build --backend-source local --gui-upload-artifact false
env:
ENSO_IDE_HOST: ${{ vars.ENSO_HOST }}
ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
ENSO_IDE_API_URL: ${{ vars.ENSO_CLOUD_API_URL }}
ENSO_IDE_AUTH_ENDPOINT: ${{ vars.ENSO_CLOUD_AUTH_ENDPOINT }}
Expand All @@ -341,6 +342,7 @@ jobs:
ENSO_IDE_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
ENSO_IDE_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID }}
ENSO_IDE_HOST: ${{ vars.ENSO_HOST }}
ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
ENSO_IDE_MS365_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_MS365_OAUTH_CLIENT_ID }}
ENSO_IDE_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
Expand Down Expand Up @@ -425,14 +427,14 @@ jobs:
run: corepack pnpm run git-clean --verbose --clean-bazel
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Download project-manager
- name: Download backend
uses: actions/download-artifact@v4
with:
name: project-manager-windows
name: backend-windows
path: dist/backend
- run: |-
tar -xvf dist/backend/project-manager.tar -C dist/backend
rm dist/backend/project-manager.tar
tar -xvf dist/backend/backend.tar -C dist/backend
rm dist/backend/backend.tar
- run: ./run ide build --backend-source local --gui-upload-artifact false
env:
ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
Expand All @@ -446,6 +448,7 @@ jobs:
ENSO_IDE_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
ENSO_IDE_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID }}
ENSO_IDE_HOST: ${{ vars.ENSO_HOST }}
ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
ENSO_IDE_MS365_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_MS365_OAUTH_CLIENT_ID }}
ENSO_IDE_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: ./run ide upload --backend-source release --backend-release ${{env.ENSO_RELEASE_ID}} --sign-artifacts
env:
ENSO_IDE_HOST: ${{ vars.ENSO_HOST }}
ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
ENSO_IDE_API_URL: ${{ vars.ENSO_CLOUD_API_URL }}
ENSO_IDE_AUTH_ENDPOINT: ${{ vars.ENSO_CLOUD_AUTH_ENDPOINT }}
Expand All @@ -454,6 +453,7 @@ jobs:
ENSO_IDE_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
ENSO_IDE_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID }}
ENSO_IDE_HOST: ${{ vars.ENSO_HOST }}
ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
ENSO_IDE_MS365_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_MS365_OAUTH_CLIENT_ID }}
ENSO_IDE_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
Expand Down Expand Up @@ -540,6 +540,7 @@ jobs:
ENSO_IDE_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
ENSO_IDE_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID }}
ENSO_IDE_HOST: ${{ vars.ENSO_HOST }}
ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
ENSO_IDE_MS365_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_MS365_OAUTH_CLIENT_ID }}
ENSO_IDE_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
Expand Down Expand Up @@ -618,6 +619,7 @@ jobs:
ENSO_IDE_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
ENSO_IDE_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_GOOGLE_OAUTH_CLIENT_ID }}
ENSO_IDE_HOST: ${{ vars.ENSO_HOST }}
ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
ENSO_IDE_MS365_OAUTH_CLIENT_ID: ${{ secrets.ENSO_IDE_MS365_OAUTH_CLIENT_ID }}
ENSO_IDE_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "app/common/.dev-env"]
path = app/common/.dev-env
[submodule "app/gui/.dev-env"]
path = app/gui/.dev-env
url = ../dev-env.git
4 changes: 2 additions & 2 deletions BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ write_source_files(
buildifier(
name = "lint_bazel_files",
exclude_patterns = [
"./app/common/.env.bazel",
"./app/gui/.env.bazel",
],
lint_mode = "warn",
mode = "diff",
Expand All @@ -51,7 +51,7 @@ buildifier(
buildifier(
name = "format_bazel_files",
exclude_patterns = [
"./app/common/.env.bazel",
"./app/gui/.env.bazel",
],
lint_mode = "fix",
mode = "fix",
Expand Down
1 change: 0 additions & 1 deletion app/common/.dev-env
Open in desktop
Submodule .dev-env deleted from 9857b9
7 changes: 0 additions & 7 deletions app/common/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
load("@aspect_rules_js//npm:defs.bzl", "npm_package")
load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
load("@npm//:defs.bzl", "npm_link_all_packages", "npm_link_targets")
Expand Down Expand Up @@ -37,9 +36,3 @@ npm_package(
],
visibility = ["//visibility:public"],
)

copy_to_bin(
name = "env_files",
srcs = glob([".env*"]),
visibility = ["//visibility:public"],
)
5 changes: 1 addition & 4 deletions app/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"types": "./src/index.ts",
"import": "./dist/index.js"
},
"./src/config.json": "./src/config.json",
"./src/*": {
"source": "./src/*.ts",
"types": "./src/*.ts",
Expand All @@ -19,20 +18,18 @@
"scripts": {
"test:unit": "vitest run",
"typecheck": "tsc --noEmit",
"compile": "vite build",
"compile": "tsc",
"lint": "eslint ./src --cache --max-warnings=0"
},
"dependencies": {
"@internationalized/date": "3.7.0",
"@types/node": "catalog:",
"is-network-error": "^1.1.0",
"vite": "catalog:",
"vue": "catalog:",
"zod": "catalog:"
},
"devDependencies": {
"@fast-check/vitest": "catalog:",
"vite-plugin-dts": "^4.5.4",
"vitest": "catalog:"
}
}
97 changes: 0 additions & 97 deletions app/common/src/config.ts
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions app/common/src/services/RemoteBackend.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/
import { markRaw } from 'vue'
import { z } from 'zod'
import { $config } from '../config.js'
import type { DownloadOptions } from '../download.js'
import type { DefaultGetText } from '../text.js'
import { delay } from '../utilities/async.js'
Expand Down Expand Up @@ -49,29 +48,30 @@ export type GetProjectArchiveFunction = (
export class RemoteBackend extends backend.Backend {
static readonly type = backend.BackendType.remote
override readonly type = RemoteBackend.type
override readonly baseUrl: URL = new URL(
$config.API_URL ?? '',
typeof location !== 'undefined' ? location.href : 'https://example.com',
)
override readonly baseUrl: URL
private user: objects.Mutable<backend.User> | null = null
private readonly downloadCloudProject: DownloadCloudProjectFunction
readonly getProjectArchive: GetProjectArchiveFunction

/** Create a {@link RemoteBackend}. */
constructor({
apiUrl,
getText,
client,
downloader,
downloadCloudProject,
getProjectArchive,
}: {
apiUrl: string
getText: DefaultGetText
client: HttpClient
downloader: (options: DownloadOptions) => void | Promise<void>
downloadCloudProject: DownloadCloudProjectFunction
getProjectArchive: GetProjectArchiveFunction
}) {
super(getText, client, downloader)
const baseOrigin = typeof location !== 'undefined' ? location.href : 'https://example.com'
this.baseUrl = new URL(apiUrl, baseOrigin)
this.downloadCloudProject = downloadCloudProject
this.getProjectArchive = getProjectArchive
}
Expand Down
26 changes: 0 additions & 26 deletions app/common/vite.config.ts
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions app/electron-client/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ esbuild(
"utf-8-validate",
"encoding",
"supports-color",
"original-fs",
],
format = "esm",
output_dir = True,
Expand Down
Loading
Loading