@kreftforeningen/web-react 1.0.5 → 1.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -6
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -110,7 +110,17 @@ Lockfile policy:
|
|
|
110
110
|
- Lockfile conflicts are avoided via `.gitattributes` (`pnpm-lock.yaml merge=ours`) which keeps `develop`’s lockfile.
|
|
111
111
|
- If your change updates `package.json`, do not hand-merge the lockfile in the PR; let `develop` win and regenerate on `develop` later.
|
|
112
112
|
|
|
113
|
-
4.
|
|
113
|
+
4. Sync `main` back into `develop` before every release cycle
|
|
114
|
+
|
|
115
|
+
```bash
|
|
116
|
+
git checkout develop
|
|
117
|
+
git pull origin develop
|
|
118
|
+
git pull origin main --ff-only
|
|
119
|
+
```
|
|
120
|
+
|
|
121
|
+
This ensures `develop` already contains whatever `main` emitted during the last release, so `package.json` / `CHANGELOG.md` stay in sync and avoid conflicts.
|
|
122
|
+
|
|
123
|
+
5. Prepare release on develop (after features are merged and branches are in sync)
|
|
114
124
|
|
|
115
125
|
```bash
|
|
116
126
|
git checkout develop
|
|
@@ -119,24 +129,38 @@ git pull origin develop
|
|
|
119
129
|
# Bump versions with Changesets
|
|
120
130
|
pnpm changeset
|
|
121
131
|
pnpm changeset version
|
|
132
|
+
|
|
133
|
+
# Stage the generated changelog + version bump
|
|
134
|
+
git add .changeset/ package.json CHANGELOG.md
|
|
122
135
|
```
|
|
123
136
|
|
|
124
|
-
|
|
137
|
+
6. Regenerate lockfile deterministically
|
|
125
138
|
|
|
126
139
|
```bash
|
|
127
140
|
rm -f pnpm-lock.yaml
|
|
128
141
|
pnpm install --lockfile-only --ignore-scripts
|
|
129
142
|
|
|
130
|
-
git add
|
|
143
|
+
git add pnpm-lock.yaml
|
|
131
144
|
git commit -m "chore: version and lockfile"
|
|
132
145
|
git push origin develop
|
|
133
146
|
```
|
|
134
147
|
|
|
135
|
-
|
|
148
|
+
7. Release PR: develop → main
|
|
136
149
|
|
|
137
150
|
- Open PR from `develop` into `main`.
|
|
138
|
-
-
|
|
139
|
-
- Merge to `main` to release.
|
|
151
|
+
- Keep the versions/changelog from `develop` (those are the canonical ones generated in step 5).
|
|
152
|
+
- Merge to `main` to release. The GitHub Actions release workflow runs `pnpm changeset publish` only—**do not run `changeset version` again on `main`.**
|
|
153
|
+
|
|
154
|
+
8. After the release workflow finishes, fast-forward `main` back into `develop`:
|
|
155
|
+
|
|
156
|
+
```bash
|
|
157
|
+
git checkout develop
|
|
158
|
+
git pull origin develop
|
|
159
|
+
git pull origin main --ff-only
|
|
160
|
+
git push origin develop
|
|
161
|
+
```
|
|
162
|
+
|
|
163
|
+
This final sync keeps both branches aligned for the next cycle.
|
|
140
164
|
|
|
141
165
|
Notes:
|
|
142
166
|
|