Skip to content

Fix start-scheduler and build-scheduler #1036

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

Merged
merged 5 commits into from
Oct 22, 2025
Merged

Fix start-scheduler and build-scheduler #1036

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
055674e
fix: yarn start-scheduler
MatiasArriola Oct 20, 2025
10c1f57
chore: update yarn.lock
MatiasArriola Oct 21, 2025
bd37457
fix: don't use import.meta.env for compat with build-scheduler
MatiasArriola Oct 21, 2025
365a9c0
refactor: use process.env instead of import.meta
MatiasArriola Oct 21, 2025
eed2ec4
Merge branch 'development' into fix/scheduler-vite-imports
MiquelAdell Oct 22, 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
4 changes: 2 additions & 2 deletions i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2025-10-21T06:49:24.192Z\n"
"PO-Revision-Date: 2025-10-21T06:49:24.192Z\n"
"POT-Creation-Date: 2025-10-20T15:52:19.670Z\n"
"PO-Revision-Date: 2025-10-20T15:52:19.670Z\n"

msgid ""
"THIS NEW RELEASE INCLUDES SHARING SETTINGS PER INSTANCES. FOR THIS VERSION "
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
"start:pre": "yarn localize && d2-manifest package.json manifest.webapp",
"start:run": "vite",
"start:variant": "yarn start:pre && yarn start:run",
"start-scheduler": "yarn run-ts --files src/scheduler/cli.ts",
"start-scheduler": "yarn run-ts src/scheduler/cli.ts",
"build": "yarn run-ts scripts/run.ts build",
"build:variant": "vite build && cp -r i18n icon.png build",
"preview": "vite preview",
"prebuild": "yarn localize && yarn test",
"build-scheduler": "ncc build src/scheduler/cli.ts -m -o $npm_package_name-server && zip -r $npm_package_name-server.zip $npm_package_name-server && npx rimraf $npm_package_name-server/",
"run-ts": "ts-node --files -O '{\"module\":\"commonjs\"}'",
"run-ts": "tsx",
"migrate": "yarn run-ts src/migrations/cli.ts",
"test": "vitest run",
"test:ui": "vitest --ui",
Expand Down Expand Up @@ -130,7 +130,7 @@
"prop-types": "15.7.2",
"rimraf": "3.0.2",
"ts-mockito": "^2.6.1",
"ts-node": "^10.8.2",
"tsx": "^4.20.6",
"typescript": "4.9.5",
"vite": "^4.0.0",
"vite-plugin-node-polyfills": "^0.24.0",
Expand Down
10 changes: 5 additions & 5 deletions src/utils/Config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ import { Maybe } from "../types/utils";

class Config {
get mode(): string {
return import.meta.env.MODE;
return process.env.MODE ?? process.env.NODE_ENV ?? "production";
}

get isDevelopment(): boolean {
return this.mode === "development";
}

get presentationTitle(): Maybe<string> {
return import.meta.env.VITE_PRESENTATION_TITLE;
return process.env.VITE_PRESENTATION_TITLE;
}

get presentationVariant(): Maybe<string> {
return import.meta.env.VITE_PRESENTATION_VARIANT;
return process.env.VITE_PRESENTATION_VARIANT;
}

get appPresentationVariant(): AppVariant {
Expand All @@ -25,12 +25,12 @@ class Config {

get presentationType(): PresentationType {
const DEFAULT = "webapp";
const type = import.meta.env.VITE_PRESENTATION_TYPE;
const type = process.env.VITE_PRESENTATION_TYPE;
return this.isValidPresentationType(type) ? type : DEFAULT;
}

get isCypressEnabled(): boolean {
return Boolean(import.meta.env.VITE_CYPRESS);
return Boolean(process.env.VITE_CYPRESS);
}

private isValidAppVariant(variant: Maybe<string>): variant is AppVariant {
Expand Down
8 changes: 0 additions & 8 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
"ts-node": {
// these options are overrides used only by ts-node
// same as our --compilerOptions flag and our TS_NODE_COMPILER_OPTIONS environment variable
"compilerOptions": {
"module": "commonjs",
"typeRoots": ["./src/types", "./node_modules/@types"]
}
},
"compilerOptions": {
"target": "es2015",
"allowJs": true,
Expand Down
5 changes: 5 additions & 0 deletions vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ export default defineConfig(({ mode }) => {
define: {
// Preserve process.env access for compatibility
"process.env.NODE_ENV": JSON.stringify(env.NODE_ENV || mode),
// preserve process.env.VITE_ variables for backwards compatibility with CJS
"process.env.VITE_PRESENTATION_VARIANT": JSON.stringify(env.VITE_PRESENTATION_VARIANT),
"process.env.VITE_PRESENTATION_TITLE": JSON.stringify(env.VITE_PRESENTATION_TITLE),
"process.env.VITE_PRESENTATION_TYPE": JSON.stringify(env.VITE_PRESENTATION_TYPE),
"process.env.VITE_CYPRESS": JSON.stringify(env.VITE_CYPRESS),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also caused issues for us in CPR. Just as a note, what we did there was use vite-node to run the scripts so that the import.meta references keep working.

That’s not to say this approach is wrong, moving everything to environment variables is reasonable.

// Polyfill Node.js globals
__dirname: JSON.stringify("/"),
__filename: JSON.stringify("/index.js"),
Expand Down
Loading
Loading