mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-18 16:02:10 +00:00
hugocasa
9de38f9a09
* feat(forks): handle triggers and schedules in wmill workspace merge Closes #9001. Brings CLI parity with the merge UI by routing trigger and schedule diffs through the existing workspace_diff tally infrastructure and lifting the deploy logic into the shared windmill-utils-internal module. - Backend: extend tally + compare to all 10 trigger kinds + schedule; new compare_two_trigger_or_schedule helper using to_jsonb minus runtime ignore set; CompareSummary gains schedules_changed/triggers_changed. - Operational-state invariant: fork operations never flip target's mode/enabled. Triggers strip mode/enabled in both UI and CLI deploy payloads (preserved by is_mode_unspecified on backend). Schedules drop the setScheduleEnabled mirror entirely on merge — EditSchedule lacks enabled by design. - Shared module: DeployKind extended with schedule + per-kind triggers; DeployProvider gains per-kind dispatch methods. - Frontend: ~600 lines of client-side trigger-diff machinery deleted; rows flow through comparison.diffs like every other kind. Diff drawer returns full GET response stripped of runtime fields, matching backend semantics. Default selection excludes triggers/schedules (opt-in). - CLI (merge.ts): per-kind provider, GCP-specific transforms (audience reset, base_endpoint with /api stripped to match frontend), summary table rows for Schedules/Triggers, default-deselect mirroring the UI. - Bumps windmill-utils-internal to 1.5.0 (new exports for trigger per-kind dispatch); frontend depends on ^1.5.0. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(enterprise): clarify [ee] prefix applies whenever an EE companion PR exists Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: update ee-repo-ref to 6ee680c25e3413d928fc22002be6deb118092668 This commit updates the EE repository reference after PR #557 was merged in windmill-ee-private. Previous ee-repo-ref: ad35a056627656fd426fb19856ea945955d4727f New ee-repo-ref: 6ee680c25e3413d928fc22002be6deb118092668 Automated by sync-ee-ref workflow. * fix(forks): preserve target state on merge update, mirror source on create Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(forks): strip server-managed trigger fields and honor --include with --skip-conflicts Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com> Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
39 lines
1.0 KiB
JSON
39 lines
1.0 KiB
JSON
{
|
|
"name": "windmill-utils-internal",
|
|
"version": "1.7.0",
|
|
"description": "Internal utility functions for Windmill",
|
|
"main": "dist/cjs/index.js",
|
|
"module": "dist/esm/index.js",
|
|
"types": "dist/esm/index.d.ts",
|
|
"exports": {
|
|
".": {
|
|
"require": "./dist/cjs/index.js",
|
|
"import": "./dist/esm/index.js",
|
|
"types": "./dist/esm/index.d.ts"
|
|
},
|
|
"./config": {
|
|
"require": "./dist/cjs/config/index.js",
|
|
"import": "./dist/esm/config/index.js",
|
|
"types": "./dist/esm/config/index.d.ts"
|
|
}
|
|
},
|
|
"scripts": {
|
|
"dev": "./gen_wm_client.sh && ./remove-ts-ext.sh",
|
|
"build:cjs": "tsc -p tsconfig.cjs.json",
|
|
"build:esm": "tsc -p tsconfig.esm.json",
|
|
"build": "./gen_wm_client.sh && ./remove-ts-ext.sh && npm run build:cjs && npm run build:esm",
|
|
"prepublishOnly": "npm run build"
|
|
},
|
|
"keywords": [
|
|
"windmill"
|
|
],
|
|
"author": "Ruben Fiszel",
|
|
"license": "Apache 2.0",
|
|
"devDependencies": {
|
|
"@types/node": "^24.2.0",
|
|
"typescript": "^5.0.0"
|
|
},
|
|
"files": [
|
|
"dist/**/*"
|
|
]
|
|
} |