@jakubmazanec/carson-templates 3.2.0-unstable.f510a46c → 3.2.0

package/package.json

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

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

@@ -48,7 +48,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) {
@@ -60,16 +60,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`);
             }
@@ -94,19 +108,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,20 +138,28 @@ jobs:
             }
 
             let files = diffFiles
-              .filter((file) => file !== 'package.json') // skip root package.json
+              .filter((file) => file !== 'package.json') // skip workspace package.json
+              .filter((file) => file.includes('package.json'));
+            let filesWithWorkspace = diffFiles
               .filter((file) => file.includes('package.json'));
-            let packageNames = await getPackagesNames(files);
             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']);
@@ -145,8 +167,9 @@ jobs:
               return;
             }
 
-            await createChangeset(fileName, packageBumps, packageNames);
+            let dependencyBumps = await getBumps(files);
 
+            await createChangeset(changesetName, dependencyBumps, projects);
 
       - name: Update Carson
         run: |

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

@@ -1,156 +0,0 @@
----
-to: '.github/workflows/manual-update-pull-request.yaml'
-strategy: overwrite
----
-#
-# DO NOT EDIT!
-# This file was autogenerated by Carson.
-# Changes may cause incorrect behavior and will be lost when the file is regenerated.
-#
-# Run `npx carson update workspace` to regenerate.
-#
-
-name: Update pull request
-
-on: [push]
-
-jobs:
-  update_pull_request:
-    name: Update pull request
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-          token: ${{ secrets.PAT }}
-          fetch-depth: 0
-
-      - name: Configure git
-        run: |
-          git config user.email "bot@mazanec.dev"
-          git config user.name "Bot"
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: <%- semver.major(semver.minVersion(DEPENDENCY_VERSIONS.node)) %>
-
-      - name: Install packages
-        run: npm ci
-
-      - name: Generate changeset
-        uses: actions/github-script@v6
-        with:
-          script: |
-            let {promises: fs} = require('node:fs');
-            let path = require('node:path');
-
-            async function getPackagesNames(files) {
-              let names = [];
-
-              for (let file of files) {
-                let packageJson = JSON.parse(await fs.readFile(file, 'utf8'));
-
-                names.push(packageJson.name);
-              }
-
-              return names;
-            }
-
-            async function createChangeset(fileName, packageBumps, packages) {
-              let message = '';
-
-              for (let [packageName, bump] of packageBumps) {
-                message = message + `Dependency \`${packageName}\` updated to version \`${bump}\`.\n`;
-              }
-
-              message = message.replace('\n', ' ');
-
-              let header = packages.map((packageName) => `'${packageName}': patch`).join('\n');
-
-              await fs.writeFile(fileName, `---\n${header}\n---\n${message.trim()}\n`);
-            }
-
-            async function getBumps(files) {
-              let bumps = new Map();
-
-              for (let file of files) {
-                let {stdout: changes} = await exec.getExecOutput('git', ['show', file]);
-
-                for (let change of changes.split('\n')) {
-                  if (!change.startsWith('+ ')) {
-                    continue;
-                  }
-
-                  let match = change.match(/"(.*?)"/g);
-
-                  bumps.set(match[0].replace(/"/g, ''), match[1].replace(/"/g, ''));
-                }
-              }
-
-              return bumps;
-            }
-
-            async function getPackageUsingCarsonNames(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') {
-                    let packageJson = JSON.parse(await fs.readFile(path.join(dir, 'package.json'), 'utf8'));
-
-                    result.push(packageJson.name);
-                  } else {
-                    await getPackageUsingCarsonNames(fullPath, result);
-                  }
-                }
-              }
-
-              return result;
-            }
-
-            let diffOutput = await exec.getExecOutput('git diff --name-only HEAD~1');
-            let diffFiles = diffOutput.stdout.split('\n');
-
-            if (diffFiles.find((diffFile) => diffFile.startsWith('.changeset'))) {
-              console.log('Changeset already exists, skipping...');
-
-              return;
-            }
-
-            let files = diffFiles
-              .filter((file) => file !== 'package.json') // skip root package.json
-              .filter((file) => file.includes('package.json'));
-            let packageNames = await getPackagesNames(files);
-            let {stdout: shortHash} = await exec.getExecOutput('git rev-parse --short HEAD');
-            let fileName = `.changeset/renovate-${shortHash.trim()}.md`;
-            let packageBumps = await getBumps(files);
-
-            if (
-              !packageNames.length &&
-              packageBumps.size === 1 &&
-              packageBumps.has('<%- TEMPLATE_PACKAGE_NAME %>')
-            ) {
-              packageNames = await getPackageUsingCarsonNames();
-            } else if (!packageNames.length) {
-              console.log('No package.json changes to published packages, skipping...');
-
-              await exec.exec('npx', ['changeset', '--empty']);
-
-              return;
-            }
-
-            await createChangeset(fileName, packageBumps, packageNames);
-
-
-      - name: Update Carson
-        run: |
-          npm install
-
-      - name: Commit and push changes
-        run: |
-          git add . --all
-          git commit -m"Update"
-          git push --force