From 1595672324fdaaa3b3b36887b649d560d08ea910 Mon Sep 17 00:00:00 2001 From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 23 Oct 2024 04:30:26 +0200 Subject: [PATCH 1/5] Add wayland and windows options --- package.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 35be4b4424..0926a10ee7 100644 --- a/package.json +++ b/package.json @@ -24,11 +24,18 @@ ], "main": "js/electron.js", "scripts": { - "start": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js", - "start:dev": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js dev", + "start": "npm run start:x11", + "start:dev": "npm run start -- dev", + "start:wayland": "WAYLAND_DISPLAY=\"${WAYLAND_DISPLAY:=wayland-1}\" ./node_modules/.bin/electron js/electron.js --enable-features=UseOzonePlatform --ozone-platform=wayland", + "start:wayland:dev": "npm run start:wayland -- dev", + "start:windows": ".\\node_modules\\.bin\\electron js\\electron.js", + "start:windows:dev": "npm run start:windows -- dev", + "start:x11": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js", + "start:x11:dev": "npm run start -- dev", "server": "node ./serveronly", "install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev", "install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier", + "install-mm:windows": "cmd /c 'npm install --ignore-scripts --no-audit --no-fund --no-update-notifier --only=prod --omit=dev && echo 'Installing vendor files ...\n' && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier && echo 'Installing fonts ...\n' && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier'", "install-vendor": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier", "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier", "postinstall": "npm run install-vendor && npm run install-fonts && echo \"MagicMirror² installation finished successfully! \n\"", From 8ad9eeb846f14b5b5d1e16ded93b42ca551a9996 Mon Sep 17 00:00:00 2001 From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 23 Oct 2024 05:07:51 +0200 Subject: [PATCH 2/5] Fix install-mm:windows --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0926a10ee7..e6669930b3 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "server": "node ./serveronly", "install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev", "install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier", - "install-mm:windows": "cmd /c 'npm install --ignore-scripts --no-audit --no-fund --no-update-notifier --only=prod --omit=dev && echo 'Installing vendor files ...\n' && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier && echo 'Installing fonts ...\n' && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier'", + "install-mm:windows": "cmd /c npm install --ignore-scripts --no-audit --no-fund --no-update-notifier --only=prod --omit=dev && echo 'Installing vendor files ...' && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier && echo 'Installing fonts ...' && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier", "install-vendor": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier", "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier", "postinstall": "npm run install-vendor && npm run install-fonts && echo \"MagicMirror² installation finished successfully! \n\"", From 518189a5d1cf2d467878699af7e0dd2b4adc8f5d Mon Sep 17 00:00:00 2001 From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 23 Oct 2024 05:31:02 +0200 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 570b041087..749ba17bae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ _This release is scheduled to be released on 2025-01-01._ ### Added -- [linter] re-added `eslint-plugin-import`now that it supports ESLint v9 +- [linter] re-added `eslint-plugin-import`now that it supports ESLint v9 (#3586) +- [core] Add wayland and windows options to package.json (#3594) ### Removed @@ -22,7 +23,7 @@ _This release is scheduled to be released on 2025-01-01._ - [repo] reactivated `stale.yaml` as github action to mark issues as stale after 60 days and close them 7 days later (if no activity) - [core] Update electron dependency to v32 (test electron rebuild) - [tests] All test configs have been updated to allow full external access, allowing for easier debugging (especially when running as a container) -- [core] Run and test with node 23 +- [core] Run and test with node 23 (#3588) ### Fixed From a151c205ccc9585dddd160b24880494c5ae43696 Mon Sep 17 00:00:00 2001 From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:15:05 +0200 Subject: [PATCH 4/5] Remove windows install --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 71536b81ae..dcc8912b99 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "server": "node ./serveronly", "install-mm": "npm install --no-audit --no-fund --no-update-notifier --only=prod --omit=dev", "install-mm:dev": "npm install --no-audit --no-fund --no-update-notifier", - "install-mm:windows": "cmd /c npm install --ignore-scripts --no-audit --no-fund --no-update-notifier --only=prod --omit=dev && echo 'Installing vendor files ...' && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier && echo 'Installing fonts ...' && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier", "install-vendor": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error --no-audit --no-fund --no-update-notifier", "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error --no-audit --no-fund --no-update-notifier", "postinstall": "npm run install-vendor && npm run install-fonts && echo \"MagicMirror² installation finished successfully! \n\"", From 2974fa24ddcb83b3f017190f084342da51da9d93 Mon Sep 17 00:00:00 2001 From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:17:22 +0200 Subject: [PATCH 5/5] Optimize entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3168485c62..731ef6c30f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ _This release is scheduled to be released on 2025-01-01._ ### Added -- [core] Add wayland and windows options to package.json (#3594) +- [core] Add wayland and windows start options to `package.json` (#3594) - [linter] re-added `eslint-plugin-import`now that it supports ESLint v9 (#3586) - [docs] Added step for npm publishing in release process (#3595)