@jakubmazanec/carson-templates 7.1.0-unstable.f3a920ed → 7.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jakubmazanec/carson-templates",
-  "version": "7.1.0-unstable.f3a920ed",
+  "version": "7.1.0",
   "description": "Collection of Carson templates.",
   "repository": {
     "type": "git",
@@ -31,29 +31,29 @@
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "semver": "^7.7.2"
+    "semver": "^7.7.3"
   },
   "devDependencies": {
     "@jakubmazanec/carson": "^3.0.0",
     "@jakubmazanec/eslint-config": "^4.1.0",
     "@jakubmazanec/fs-utils": "^0.2.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/lodash": "^4.17.20",
+    "@types/lodash": "^4.17.21",
     "@types/node": "^24.0.4",
-    "@types/semver": "^7.7.0",
+    "@types/semver": "^7.7.1",
     "@types/zen-observable": "^0.8.7",
     "@vitest/coverage-v8": "^3.2.4",
     "del-cli": "^6.0.0",
-    "esbuild": "^0.25.9",
+    "esbuild": "^0.27.0",
     "eslint": "^9.33.0",
     "execa": "^9.6.0",
     "fast-glob": "^3.3.3",
-    "fs-extra": "^11.3.1",
+    "fs-extra": "^11.3.2",
     "prettier": "^3.6.2",
     "prettier-plugin-packagejson": "^2.5.19",
-    "typedoc": "^0.28.10",
-    "typedoc-plugin-markdown": "^4.8.1",
-    "typescript": "^5.9.2",
+    "typedoc": "^0.28.14",
+    "typedoc-plugin-markdown": "^4.9.0",
+    "typescript": "^5.9.3",
     "vitest": "^3.2.4",
     "zen-observable": "^0.10.0"
   },

package/templates/workspace/.github/tools/create-dependencies-changeset.ts.ejs

@@ -24,7 +24,7 @@ type ProjectDependencyBumps = Map<string, string>;
 type DependencyBumps = Map<string, ProjectDependencyBumps>;
 
 /**
- * A function that returns all proejcts that use Carson.
+ * A function that returns all projects that use Carson.
  */
 async function getProjectsWithCarson(dir = process.cwd(), result: string[] = []) {
   let entries = await fs.readdir(dir, {withFileTypes: true});
@@ -76,8 +76,8 @@ async function checkCarsonTemplatesPackage(dependencyBumps: DependencyBumps) {
         let newMajorVersion = semver.major(semver.minVersion(bump)!);
         let oldMajorVersion = semver.major(semver.minVersion(result[0])!);
 
+        // Node.js is a special case, because it isn't specified in `dependencies` field
         if (newMajorVersion > oldMajorVersion || dependencyName === 'node') {
-          // Node.js is a special case, because it isn't specified in `dependencies` field
           throw new Error(
             `Bumping major version of dependency "${dependencyName}" that is handled by Carson, update of the Carson template package is needed!`,
           );
@@ -173,37 +173,31 @@ async function getDependencyBumps(files: string[]): Promise<DependencyBumps> {
   return bumps;
 }
 
-let {stdout: diffOutput} = await $`git diff --name-only HEAD~1`;
-let diffLines = diffOutput.split('\n');
+let {stdout: diff} = await $`git diff --name-only HEAD~1`;
+let files = diff.split('\n').filter((file) => file.endsWith('package.json'));
+let {stdout: shortHash} = await $`git rev-parse --short HEAD`;
+let getChangesetName = (suffix?: string) =>
+  suffix === undefined ?
+    `.changeset/dependencies-update-${shortHash.trim()}.md`
+  : `.changeset/dependencies-update-${shortHash.trim()}-${suffix.replaceAll('/', '-')}.md`;
 
-if (diffLines.some((diffLine) => diffLine.startsWith('.changeset'))) {
-  console.log('Changeset already exists!');
+let dependencyBumps = await getDependencyBumps(files);
+
+console.log('Dependecy bumps:', dependencyBumps);
+
+if (dependencyBumps.get(WORKSPACE_PLACEHOLDER_NAME)?.has(TEMPLATE_PACKAGE_NAME)) {
+  await createChangesetForCarsonTemplates(getChangesetName, dependencyBumps);
+} else if (
+  dependencyBumps.size === 0 ||
+  (dependencyBumps.size === 1 && dependencyBumps.has(WORKSPACE_PLACEHOLDER_NAME))
+) {
+  console.log('No package.json changes to projects, creating empty changeset...');
+
+  await fs.writeFile(getChangesetName(), '---\n---\n');
+  await checkCarsonTemplatesPackage(dependencyBumps);
 } else {
-  let files = diffLines.filter((file) => file.endsWith('package.json'));
-  let {stdout: shortHash} = await $`git rev-parse --short HEAD`;
-  let getChangesetName = (suffix?: string) =>
-    suffix === undefined ?
-      `.changeset/dependencies-update-${shortHash.trim()}.md`
-    : `.changeset/dependencies-update-${shortHash.trim()}-${suffix.replaceAll('/', '-')}.md`;
-
-  let dependencyBumps = await getDependencyBumps(files);
-
-  console.log('Dependecy bumps:', dependencyBumps);
-
-  if (dependencyBumps.get(WORKSPACE_PLACEHOLDER_NAME)?.has(TEMPLATE_PACKAGE_NAME)) {
-    await createChangesetForCarsonTemplates(getChangesetName, dependencyBumps);
-  } else if (
-    dependencyBumps.size === 0 ||
-    (dependencyBumps.size === 1 && dependencyBumps.has(WORKSPACE_PLACEHOLDER_NAME))
-  ) {
-    console.log('No package.json changes to projects, creating empty changeset...');
-
-    await fs.writeFile(getChangesetName(), '---\n---\n');
-    await checkCarsonTemplatesPackage(dependencyBumps);
-  } else {
-    await createChangeset(getChangesetName, dependencyBumps);
-    await checkCarsonTemplatesPackage(dependencyBumps);
-  }
+  await createChangeset(getChangesetName, dependencyBumps);
+  await checkCarsonTemplatesPackage(dependencyBumps);
 }
 
 console.log('Done!');

package/templates/workspace/.github/tools/create-templates-changeset.ts.ejs

@@ -0,0 +1,131 @@
+---
+to: 'tools/scripts/create-templates-changeset.mts'
+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.
+ */
+
+import {$} from 'execa';
+import _ from 'lodash';
+import {promises as fs} from 'node:fs';
+import semver from 'semver';
+
+const WORKSPACE_PLACEHOLDER_NAME = '@';
+const WORKSPACE_PACKAGE_JSON_PATH = 'package.json';
+const TEMPLATE_PACKAGE_NAME = '<%- TEMPLATE_PACKAGE_NAME %>';
+
+type ProjectDependencyBumps = Map<string, string>;
+type DependencyBumps = Map<string, ProjectDependencyBumps>;
+
+/**
+ * A function that checks if one of the updated dependencies was a major version bump that necessitates manual update of the Carson template package.
+ */
+async function checkCarsonTemplatesPackage(
+  getChangesetName: (suffix?: string) => string,
+  dependencyBumps: DependencyBumps,
+) {
+  let constantsFilePath = '<%- `${workspace.projects.find((project) => project.name === TEMPLATE_PACKAGE_NAME)?.relativePath ?? ''}/source/constants.ts` %>';
+  let constantsFile = await fs.readFile(constantsFilePath, 'utf8');
+  let templatesBump: ProjectDependencyBumps = new Map();
+
+  for (let [, projectDependencyBumps] of dependencyBumps) {
+    if (!projectDependencyBumps.size) {
+      continue;
+    }
+
+    for (let [dependencyName, bump] of projectDependencyBumps) {
+      let regexp = new RegExp(
+        `(?<=('${_.escapeRegExp(dependencyName)}'|${_.escapeRegExp(dependencyName)}):\\s+')\\^\\d+\\.\\d+\\.\\d+(?='.*$)`,
+        'mi',
+      );
+      let result = regexp.exec(constantsFile);
+
+      if (result?.[0]) {
+        let newMajorVersion = semver.major(semver.minVersion(bump)!);
+        let oldMajorVersion = semver.major(semver.minVersion(result[0])!);
+
+        // Node.js is a special case, because it isn't specified in `dependencies` field
+        if (newMajorVersion > oldMajorVersion || dependencyName === 'node') {
+          templatesBump.set(dependencyName, `${newMajorVersion}`);
+        }
+      }
+    }
+  }
+
+  if (templatesBump.size) {
+    console.log('Creating changeset for project:', TEMPLATE_PACKAGE_NAME);
+
+    let message = '';
+
+    for (let [dependencyName, dependencyBump] of templatesBump) {
+      message += `Templates were updated to use \`${dependencyName}\` v${dependencyBump}.\n`;
+    }
+
+    message = message.replaceAll('\n', ' ');
+
+    await fs.writeFile(
+      getChangesetName(),
+      `---\n'${TEMPLATE_PACKAGE_NAME}': major\n---\n${message.trim()}\n`,
+    );
+  }
+}
+
+/**
+ * A function that returns workspace and projects and their updated dependencies. based on `git diff`.
+ */
+async function getDependencyBumps(files: string[]): Promise<DependencyBumps> {
+  let bumps: DependencyBumps = new Map();
+
+  for (let file of files) {
+    let projectBumps: ProjectDependencyBumps = new Map();
+    let {stdout: changes} = await $`git diff HEAD~1 -- ${file}`;
+
+    for (let change of changes.split('\n')) {
+      if (!change.startsWith('+ ')) {
+        continue;
+      }
+
+      let match = change.match(/"(.*?)"/g);
+
+      if (match?.[0] && match[1] && semver.validRange(match[1].replaceAll('"', ''))) {
+        projectBumps.set(match[0].replaceAll('"', ''), match[1].replaceAll('"', ''));
+      }
+    }
+
+    if (file === WORKSPACE_PACKAGE_JSON_PATH && projectBumps.size) {
+      bumps.set(WORKSPACE_PLACEHOLDER_NAME, projectBumps);
+    } else if (projectBumps.size) {
+      let projectName = (JSON.parse(await fs.readFile(file, 'utf8')) as {name: string}).name;
+
+      bumps.set(projectName, projectBumps);
+    }
+  }
+
+  return bumps;
+}
+
+// eslint-disable-next-line no-constant-condition, @typescript-eslint/no-unnecessary-condition -- this is autogenerated
+if (<%- workspace.projects.some((project) => project.name === TEMPLATE_PACKAGE_NAME) %>) {
+  let {stdout: diff} = await $`git diff --name-only HEAD~1`;
+  let files = diff.split('\n').filter((file) => file.endsWith('package.json'));
+  let {stdout: shortHash} = await $`git rev-parse --short HEAD`;
+  let getChangesetName = (suffix?: string) =>
+    suffix === undefined ?
+      `.changeset/templates-update-${shortHash.trim()}.md`
+    : `.changeset/templates-update-${shortHash.trim()}-${suffix.replaceAll('/', '-')}.md`;
+
+  let dependencyBumps = await getDependencyBumps(files);
+
+  console.log('Dependecy bumps:', dependencyBumps);
+
+  await checkCarsonTemplatesPackage(getChangesetName, dependencyBumps);
+
+  console.log('Done!');
+} else {
+  console.log(`Repository doesn't contain project "${TEMPLATE_PACKAGE_NAME}"!`);
+}

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

@@ -42,7 +42,7 @@ jobs:
         run: npm ci
 
       - name: Generate changeset
-        run: npx tsx tools/scripts/create-dependencies-changeset.ts
+        run: npx tsx tools/scripts/create-dependencies-changeset.mts
 
       - name: Update Carson
         run: |

package/templates/workspace/renovate.json.ejs

@@ -15,6 +15,7 @@ strategy: overwrite
 
   "enabledManagers": ["npm", "nodenv", "nvm", "github-actions"],
   "rangeStrategy": "bump",
+  "minimumReleaseAge": "14 days",
 
   "packageRules": [
     {