Skip to content

Commit 8fcd1d3

Browse files
authored
Merge branch 'develop' into order
2 parents b38dcf9 + 7b4d363 commit 8fcd1d3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ planned for 2025-07-01
1414
### Added
1515

1616
- [config] Allow to change module order for final renderer (or dynamicaly with CSS): Feature `order` in config. (#3762)
17-
- [clock] Added option 'disableNextEvent' to hide next sun event.
17+
- [clock] Added option 'disableNextEvent' to hide next sun event (#3769)
1818

1919
### Changed
2020

2121
- [refactor] Simplify module loading process (#3766)
22-
- Use "node --run" instead of "npm run" (#3764)
22+
- Use `node --run` instead of `npm run` (#3764) and adapt `start:dev` script.
2323
- [workflow] Run linter und spellcheck with LTS node version (#3767)
2424
- [workflow] Split "Run test" step into two steps for more clarity (#3767)
2525

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"prepare": "[ -f node_modules/.bin/husky ] && husky || echo no husky installed.",
3838
"server": "node ./serveronly",
3939
"start": "node --run start:x11",
40-
"start:dev": "node --run start -- dev",
40+
"start:dev": "node --run start:x11 -- dev",
4141
"start:wayland": "WAYLAND_DISPLAY=\"${WAYLAND_DISPLAY:=wayland-1}\" ./node_modules/.bin/electron js/electron.js --enable-features=UseOzonePlatform --ozone-platform=wayland",
4242
"start:wayland:dev": "node --run start:wayland -- dev",
4343
"start:windows": ".\\node_modules\\.bin\\electron js\\electron.js",

0 commit comments

Comments
 (0)