Skip to content

Commit b847dd7

Browse files
update Collaboration.md and dependencies (#4001)
Co-authored-by: Kristjan ESPERANTO <[email protected]>
1 parent 56fe067 commit b847dd7

File tree

3 files changed

+59
-44
lines changed

3 files changed

+59
-44
lines changed

Collaboration.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Are done by
4646
- [ ] add label `mastermerge`
4747
- [ ] title of the PR is `Release 2.xx.0`
4848
- [ ] description of the PR is the body of the draft release with name `v2.xx.0`
49+
- [ ] check if new PR has merge conflicts, if so, merge `master` into the new PR and solve the conflicts
4950
- [ ] after PR tests run without issues, merge PR
5051
- [ ] edit draft release with name `v2.xx.0`
5152
- [ ] set corresponding version tag `v2.xx.0` (with `Select tag` and then `Create new tag`)
@@ -61,11 +62,24 @@ Are done by
6162

6263
### After release
6364

64-
- [ ] publish release notes with link to github release on forum in new locked topic
65+
- [ ] publish release notes with link to github release on forum in new locked topic (use edit release on github to copy the content with markdown syntax)
6566
- [ ] close all issues with label `ready (coming with next release)`
6667
- [ ] release new documentation by merging `develop` on `master` in documentation repository
6768
- [ ] publish new version on [npm](https://www.npmjs.com/package/magicmirror)
6869
- [ ] use a clean environment (e.g. container)
6970
- [ ] clone this repository with the new `master` branch and `cd` into the local repository directory
70-
- [ ] log in to npm with `npm login --auth-type legacy` which will ask for username and password and one-time-password which is sent via mail
71-
- [ ] execute `npm publish`
71+
- [ ] **Method 1 (recommended): With browser and 2FA**
72+
- [ ] execute `npm login` which will open a browser window
73+
- [ ] log in with your npm credentials and enter your 2FA code
74+
- [ ] execute `npm publish`
75+
- [ ] **Method 2 (fallback for headless environments): With token (bypasses 2FA)**
76+
- [ ] ⚠️ Note: This method bypasses 2FA and should only be used when a browser is not available
77+
- [ ] goto `https://www.npmjs.com/settings/<username>/tokens/` and click `generate new token`
78+
- [ ] enable `Bypass two-factor authentication (2FA)` and under `Packages and scopes` give `Read and write` permission to the `magicmirror` package, press `Generate token`
79+
- [ ] execute:
80+
81+
```bash
82+
NPM_TOKEN="npm_xxxxxx"
83+
npm set "//registry.npmjs.org/:_authToken=$NPM_TOKEN"
84+
npm publish
85+
```

package-lock.json

Lines changed: 40 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"pm2": "^6.0.14",
9898
"socket.io": "^4.8.3",
9999
"suncalc": "^1.9.0",
100-
"systeminformation": "^5.28.2",
100+
"systeminformation": "^5.28.8",
101101
"undici": "^7.16.0",
102102
"weathericons": "^2.1.0"
103103
},
@@ -108,7 +108,7 @@
108108
"cspell": "^9.4.0",
109109
"eslint-plugin-import-x": "^4.16.1",
110110
"eslint-plugin-jsdoc": "^61.5.0",
111-
"eslint-plugin-package-json": "^0.85.0",
111+
"eslint-plugin-package-json": "^0.87.1",
112112
"eslint-plugin-playwright": "^2.4.0",
113113
"eslint-plugin-vitest": "^0.5.4",
114114
"express-basic-auth": "^1.2.1",

0 commit comments

Comments
 (0)