no message

Author: jasonbahl

.github/workflows/generate-changeset.yml

@@ -180,8 +180,15 @@ jobs:
           mkdir -p /tmp/release-notes
           
           # Generate release notes from all changesets to a temporary file
-          # Pass the branch parameter to filter changesets for this branch
-          npm run release:notes -- --branch="${{ steps.target_branch.outputs.name }}" > /tmp/release-notes/temp_notes_raw.md
+          # For develop branch, include all changesets (including those from milestone branches)
+          if [[ "${{ steps.target_branch.outputs.name }}" == "develop" ]]; then
+            echo "Generating release notes for develop branch (including milestone branch changesets)"
+            npm run release:notes > /tmp/release-notes/temp_notes_raw.md
+          else
+            # For other branches, filter by branch
+            echo "Generating release notes for ${{ steps.target_branch.outputs.name }} branch"
+            npm run release:notes -- --branch="${{ steps.target_branch.outputs.name }}" > /tmp/release-notes/temp_notes_raw.md
+          fi
           
           # Remove the "Found X changesets" line and any lines starting with ">"
           grep -v "^>" /tmp/release-notes/temp_notes_raw.md | sed -n '/^Found/!p' > /tmp/release-notes/temp_notes.md

scripts/generate-release-notes.js

@@ -125,6 +125,31 @@ async function isFirstTimeContributor(author, repoUrl, token) {
   }
 }
 
+// Update the readChangesets function to handle milestone branch changesets
+async function readChangesets(options = {}) {
+  const { branch } = options;
+  
+  // Read all changesets
+  const changesets = await readAllChangesets();
+  
+  // If no branch filter is specified, return all changesets
+  if (!branch) {
+    return changesets;
+  }
+  
+  // Special case: if branch is 'develop', include changesets from milestone branches
+  // This ensures that when milestone branches are merged to develop, their changesets are included
+  if (branch === 'develop') {
+    return changesets.filter(changeset => 
+      changeset.branch === branch || 
+      changeset.branch.startsWith('milestone/')
+    );
+  }
+  
+  // Otherwise, filter by the specified branch
+  return changesets.filter(changeset => changeset.branch === branch);
+}
+
 // Generate release notes in markdown format
 async function generateMarkdownReleaseNotes(changesets, repoUrl, token) {
   // Categorize changesets
@@ -331,7 +356,7 @@ async function generateReleaseNotes() {
   const token = getGitHubToken();
 
   // Read all changesets, filtering by branch if specified
-  const changesets = await readAllChangesets(argv.branch);
+  const changesets = await readChangesets({ branch: argv.branch });
 
   // Log the number of changesets found
   console.log(`Found ${changesets.length} changesets${argv.branch ? ` for branch ${argv.branch}` : ''}.`);

scripts/utils/changesets.js

@@ -68,40 +68,55 @@ async function readChangeset(filePath) {
 }
 
 /**
- * Read all changesets
+ * Read all changesets from the .changesets directory
  * 
- * @returns {Promise<Object[]>} Array of parsed changesets
+ * @param {Object} options Options for reading changesets
+ * @param {string} options.branch Branch to filter changesets by
+ * @returns {Promise<Array>} Array of changeset objects
  */
-async function readAllChangesets(branch = null) {
-  const dir = getChangesetDir();
+async function readAllChangesets(options = {}) {
+  const { branch } = options;
 
-  try {
-    const files = await fs.readdir(dir);
-    const changesets = await Promise.all(files.map(async file => {
-      const filepath = path.join(dir, file);
-      const content = await fs.readFile(filepath, 'utf8');
-      const { data, content: description } = matter(content);
+  // Get all changeset files
+  const changesetDir = path.join(process.cwd(), '.changesets');
+  const files = await fs.readdir(changesetDir);
+  const changesetFiles = files.filter(file => file.endsWith('.md'));
+  
+  // Read each changeset file
+  const changesets = await Promise.all(
+    changesetFiles.map(async file => {
+      const filePath = path.join(changesetDir, file);
+      const content = await fs.readFile(filePath, 'utf8');
 
-      return {
-        ...data,
-        description: description.trim(),
-        file
-      };
-    }));
-    
-    if (branch) {
+      // Parse the changeset content
+      const changeset = parseChangeset(content);
+      
+      // Add the filename to the changeset
+      changeset.filename = file;
+      
+      return changeset;
+    })
+  );
+  
+  // If branch is specified, filter changesets by branch
+  if (branch) {
+    // Special case for develop branch - include milestone branch changesets
+    if (branch === 'develop') {
       return changesets.filter(changeset => 
-        !changeset.branch || changeset.branch === branch
+        changeset.branch === branch || 
+        changeset.branch === undefined || // Include changesets without branch info
+        changeset.branch.startsWith('milestone/')
       );
     }
 
-    return changesets;
-  } catch (error) {
-    if (error.code === 'ENOENT') {
-      return [];
-    }
-    throw error;
+    // Otherwise, filter by the specified branch
+    return changesets.filter(changeset => 
+      changeset.branch === branch || 
+      changeset.branch === undefined // Include changesets without branch info
+    );
   }
+  
+  return changesets;
 }
 
 /**