@jakubmazanec/carson-templates 3.2.0-unstable.1f0ba35d → 3.2.0-unstable.2bf2d5ce

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jakubmazanec/carson-templates",
-  "version": "3.2.0-unstable.1f0ba35d",
+  "version": "3.2.0-unstable.2bf2d5ce",
   "description": "Collection of Carson templates.",
   "repository": {
     "type": "git",

package/templates/workspace/.github/workflows/manual-update-pull-request.yaml.ejs

@@ -12,12 +12,11 @@ strategy: overwrite
 
 name: Update pull request
 
-on: [workflow_dispatch]
+on: [push]
 
 jobs:
   update_pull_request:
     name: Update pull request
-    if: ${{ (github.actor == 'renovate[bot]' && contains(github.head_ref, 'renovate/')) || event.actor }}
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -46,7 +45,7 @@ jobs:
             let {promises: fs} = require('node:fs');
             let path = require('node:path');
 
-            async function getPackagesNames(files) {
+            async function getProjects(files) {
               let names = [];
 
               for (let file of files) {
@@ -58,16 +57,30 @@ jobs:
               return names;
             }
 
-            async function createChangeset(fileName, packageBumps, packages) {
+            async function createChangeset(fileName, dependencyBumps, projects) {
               let message = '';
 
-              for (let [packageName, bump] of packageBumps) {
-                message = message + `Dependency \`${packageName}\` updated to version \`${bump}\`.\n`;
+              for (let [dependencyName, bump] of dependencyBumps) {
+                message = message + `Dependency \`${dependencyName}\` updated to version \`${bump}\`.\n`;
               }
 
               message = message.replace('\n', ' ');
 
-              let header = packages.map((packageName) => `'${packageName}': patch`).join('\n');
+              let header = projects.map((projectName) => `'${projectName}': patch`).join('\n');
+
+              await fs.writeFile(fileName, `---\n${header}\n---\n${message.trim()}\n`);
+            }
+
+            async function createChangesetForCarsonTemplates(fileName, dependencyBumps, projects) {
+              let message = '';
+
+              for (let [dependencyName, bump] of dependencyBumps) {
+                message = message + `Applies templates from \`${dependencyName}\` updated to version \`${bump}\`.\n`;
+              }
+
+              message = message.replace('\n', ' ');
+
+              let header = projects.map((projectName) => `'${projectName}': patch`).join('\n');
 
               await fs.writeFile(fileName, `---\n${header}\n---\n${message.trim()}\n`);
             }
@@ -92,19 +105,19 @@ jobs:
               return bumps;
             }
 
-            async function getPackageUsingCarsonNames(dir = process.cwd(), result = []) {
+            async function getProjectsUsingCarsonTemplates(dir = process.cwd(), result = []) {
               let entries = await fs.readdir(dir, {withFileTypes: true});
 
               for (let entry of entries) {
                 let fullPath = path.join(dir, entry.name);
 
                 if (entry.isDirectory()) {
-                  if (entry.name === '.carson') {
+                  if (entry.name === '.carson' && dir !== process.cwd()) {
                     let packageJson = JSON.parse(await fs.readFile(path.join(dir, 'package.json'), 'utf8'));
 
                     result.push(packageJson.name);
                   } else {
-                    await getPackageUsingCarsonNames(fullPath, result);
+                    await getProjectsUsingCarsonTemplates(fullPath, result);
                   }
                 }
               }
@@ -124,18 +137,26 @@ jobs:
             let files = diffFiles
               .filter((file) => file !== 'package.json') // skip root package.json
               .filter((file) => file.includes('package.json'));
-            let packageNames = await getPackagesNames(files);
+            let filesWithWorkspace = diffFiles
+              .filter((file) => file.includes('package.json'));
             let {stdout: shortHash} = await exec.getExecOutput('git rev-parse --short HEAD');
-            let fileName = `.changeset/renovate-${shortHash.trim()}.md`;
-            let packageBumps = await getBumps(files);
+            let changesetName = `.changeset/renovate-${shortHash.trim()}.md`;
+            let projects = await getProjects(files);
+            let dependencyBumpsWithWorkspace = await getBumps(filesWithWorkspace);
 
             if (
-              !packageNames.length &&
-              packageBumps.size === 1 &&
-              packageBumps.has('<%- TEMPLATE_PACKAGE_NAME %>')
+              !projects.length &&
+              dependencyBumpsWithWorkspace.size === 1 &&
+              dependencyBumpsWithWorkspace.has('<%- TEMPLATE_PACKAGE_NAME %>')
             ) {
-              packageNames = await getPackageUsingCarsonNames();
-            } else if (!packageNames.length) {
+              projects = await getProjectsUsingCarsonTemplates();
+
+              let dependencyBumps = await getBumps(filesWithWorkspace);
+
+              await createChangesetForCarsonTemplates(changesetName, dependencyBumps, projects);
+
+              return;
+            } else if (!projects.length) {
               console.log('No package.json changes to published packages, skipping...');
 
               await exec.exec('npx', ['changeset', '--empty']);
@@ -143,8 +164,9 @@ jobs:
               return;
             }
 
-            await createChangeset(fileName, packageBumps, packageNames);
+            let dependencyBumps = await getBumps(files);
 
+            await createChangeset(changesetName, dependencyBumps, projects);
 
       - name: Update Carson
         run: |