@jakubmazanec/carson-templates 2.0.0-next.439463c → 2.0.0-next.75b0d46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jakubmazanec/carson-templates",
-  "version": "2.0.0-next.439463c",
+  "version": "2.0.0-next.75b0d46",
   "description": "Collection of Carson templates.",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "semver": "^7.3.6"
   },
   "devDependencies": {
-    "@jakubmazanec/carson": "0.3.0-next.439463c",
+    "@jakubmazanec/carson": "0.3.0-next.75b0d46",
     "@jakubmazanec/fs-utils": "^0.1.0",
     "@jest/globals": "^29.5.0",
     "@types/fs-extra": "^9.0.13",
@@ -45,7 +45,7 @@
     "zen-observable": "^0.10.0"
   },
   "peerDependencies": {
-    "@jakubmazanec/carson": "0.3.0-next.439463c"
+    "@jakubmazanec/carson": "0.3.0-next.75b0d46"
   },
   "packageManager": "npm@8.19.4",
   "engines": {

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

@@ -10,7 +10,8 @@ on:
       - development
 
 jobs:
-  pull_request_check:
+  check_pull_request:
+    name: Check pull request
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -19,6 +20,11 @@ jobs:
           token: ${{secrets.GITHUB_TOKEN}}
           fetch-depth: 0
 
+      - name: Configure git
+        run: |
+          git config user.email "bot@mazanec.dev"
+          git config user.name "Bot"
+
       - uses: actions/setup-node@v3
         with:
           node-version: 16
@@ -27,6 +33,7 @@ jobs:
         run: npm ci
 
       - name: Check for changes
+        if: "github.actor != 'renovate[bot]'"
         run: |
           git config core.filemode false
           git_status=$(git status --porcelain)
@@ -44,6 +51,7 @@ jobs:
         run: npm test
 
       - name: Check for changes
+        if: "github.actor != 'renovate[bot]'"
         run: |
           git config core.filemode false
           git_status=$(git status --porcelain)
@@ -58,4 +66,5 @@ jobs:
           git config --unset core.filemode
 
       - name: Check for changesets
-        run: npx changeset status --since=origin/development
+        if: "github.actor != 'renovate[bot]'"
+        run: npx changeset status --since=origin/<%- getDevelopmentBranch(workspace) %>

package/templates/workspace/.github/workflows/release.yaml.ejs

@@ -7,7 +7,7 @@ name: Release
 on: [push, workflow_dispatch]
 
 jobs:
-  main_branch_release:
+  release_main_branch:
     name: Main branch release
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -43,7 +43,7 @@ jobs:
 
           if [[ -n $git_status ]]; then
             echo "You have uncommitted changes!"
-            git status --porcelain
+            git diff
             git config --unset core.filemode
             exit 1
           fi
@@ -60,7 +60,7 @@ jobs:
 
           if [[ -n $git_status ]]; then
             echo "You have uncommitted changes!"
-            git status --porcelain
+            git diff
             git config --unset core.filemode
             exit 1
           fi
@@ -131,7 +131,7 @@ jobs:
           git merge <%- getMainBranch(workspace) %> --no-verify
           git push -u origin <%- getDevelopmentBranch(workspace) %> --no-verify
 
-  development_branch_release:
+  release_development_branch:
     name: Development branch release
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -167,7 +167,7 @@ jobs:
 
           if [[ -n $git_status ]]; then
             echo "You have uncommitted changes!"
-            git status --porcelain
+            git diff
             git config --unset core.filemode
             exit 1
           fi
@@ -184,7 +184,7 @@ jobs:
 
           if [[ -n $git_status ]]; then
             echo "You have uncommitted changes!"
-            git status --porcelain
+            git diff
             git config --unset core.filemode
             exit 1
           fi
@@ -224,7 +224,7 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-  feature_branch_release:
+  release_feature_branch:
     name: Feature branch release
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -260,7 +260,7 @@ jobs:
 
           if [[ -n $git_status ]]; then
             echo "You have uncommitted changes!"
-            git status --porcelain
+            git diff
             git config --unset core.filemode
             exit 1
           fi
@@ -277,7 +277,7 @@ jobs:
 
           if [[ -n $git_status ]]; then
             echo "You have uncommitted changes!"
-            git status --porcelain
+            git diff
             git config --unset core.filemode
             exit 1
           fi
@@ -306,202 +306,3 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-  renovate_bot_release:
-    name: Renovate bot release
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    if: "github.ref_name != '<%- getMainBranch(workspace) %>' && github.ref_name != '<%- getDevelopmentBranch(workspace) %>' && github.actor == 'renovate[bot]'"
-    steps:
-      - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
-
-      - name: Configure git
-        run: |
-          git config user.email "bot@mazanec.dev"
-          git config user.name "Bot"
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Install packages
-        run: npm ci
-
-      - name: Check for changes
-        run: |
-          git config core.filemode false
-          git_status=$(git status --porcelain)
-
-          if [[ -n $git_status ]]; then
-            echo "You have uncommitted changes!"
-            git status --porcelain
-            git config --unset core.filemode
-            exit 1
-          fi
-
-          git config --unset core.filemode
-
-      - name: Run tests
-        run: npm test
-
-      - name: Check for changes
-        run: |
-          git config core.filemode false
-          git_status=$(git status --porcelain)
-
-          if [[ -n $git_status ]]; then
-            echo "You have uncommitted changes!"
-            git status --porcelain
-            git config --unset core.filemode
-            exit 1
-          fi
-
-          git config --unset core.filemode
-
-      - name: Build packages
-        run: npm run build
-
-      - name: Generate changeset
-        uses: actions/github-script@v6
-        with:
-          script: |
-            let { promises: fs } = require('fs');
-
-            async function getPackagesNames(files) {
-              let names = [];
-
-              for (let file of files) {
-                let data = JSON.parse(await fs.readFile(file, 'utf8'));
-
-                if (!data.private) {
-                  names.push(data.name);
-                }
-              }
-
-              return names;
-            }
-
-            async function createChangeset(fileName, packageBumps, packages) {
-              let message = '';
-
-              for (let [packageName, bump] of packageBumps) {
-                message =
-                  message + `Dependency \`${packageName}\` updated to \`${bump}\`.\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;
-            }
-
-            let branch = await exec.getExecOutput('git branch --show-current');
-
-            if (!branch.stdout.startsWith('renovate/')) {
-              console.log('Not a renovate branch, skipping...');
-
-              return;
-            }
-
-            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);
-
-            if (!packageNames.length) {
-              console.log('No package.json changes to published packages, skipping...');
-
-              await exec.exec('npx', ['changeset', '--empty']);
-              await exec.exec('git', ['add', '.', '--all']);
-              await exec.exec('git commit -C HEAD --amend --no-edit');
-              await exec.exec('git push --force');
-
-              return;
-            }
-
-            let { stdout: shortHash } = await exec.getExecOutput(
-              'git rev-parse --short HEAD',
-            );
-            let fileName = `.changeset/renovate-${shortHash.trim()}.md`;
-            let packageBumps = await getBumps(files);
-
-            await createChangeset(fileName, packageBumps, packageNames);
-            await exec.exec('git', ['add', '.', '--all']);
-            await exec.exec('git commit -C HEAD --amend --no-edit');
-            await exec.exec('git push --force');
-
-      - name: Update Carson
-        uses: actions/github-script@v6
-        with:
-          script: |
-            let branch = await exec.getExecOutput('git branch --show-current');
-
-            if (!branch.stdout.startsWith('renovate/')) {
-              console.log('Not a renovate branch, skipping...');
-
-              return;
-            }
-
-            await exec.exec('npm', ['install']);
-            await exec.exec('git', ['add', '.', '--all']);
-            await exec.exec('git commit -m"Run Carson update [skip actions]"');
-            await exec.exec('git push --force');
-
-      - name: Authenticate to npm registry
-        run: |
-          echo "//registry.npmjs.com/:_authToken=NPM_TOKEN" > .npmrc
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Version packages
-        run: |
-          npx changeset version --snapshot unstable --snapshot-prerelease-template "{tag}.{commit}"
-          git status
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish packages
-        run: |
-          npx changeset publish --tag unstable --no-git-tag
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

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

@@ -0,0 +1,135 @@
+---
+to: '.github/workflows/update-pull-request.yaml'
+strategy: overwrite
+---
+name: Update pull request
+
+on:
+  pull_request_target:
+    branches:
+      - development
+
+jobs:
+  update_pull_request:
+    name: Update pull request
+    if: github.actor == 'renovate[bot]'
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{secrets.GITHUB_TOKEN}}
+          fetch-depth: 0
+
+      - name: Configure git
+        run: |
+          git config user.email "bot@mazanec.dev"
+          git config user.name "Bot"
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Install packages
+        run: npm ci
+
+      - name: Generate changeset
+        uses: actions/github-script@v6
+        if: ${{ github.actor == 'renovate[bot]' }}
+        with:
+          script: |
+            let { promises: fs } = require('fs');
+
+            async function getPackagesNames(files) {
+              let names = [];
+
+              for (let file of files) {
+                let data = JSON.parse(await fs.readFile(file, 'utf8'));
+
+                if (!data.private) {
+                  names.push(data.name);
+                }
+              }
+
+              return names;
+            }
+
+            async function createChangeset(fileName, packageBumps, packages) {
+              let message = '';
+
+              for (let [packageName, bump] of packageBumps) {
+                message =
+                  message + `Dependency \`${packageName}\` updated to \`${bump}\`.\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;
+            }
+
+            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);
+
+            if (!packageNames.length) {
+              console.log('No package.json changes to published packages, skipping...');
+
+              await exec.exec('npx', ['changeset', '--empty']);
+              await exec.exec('git', ['add', '.', '--all']);
+              await exec.exec('git commit -m"Add changeset [skip actions]"');
+              await exec.exec('git push --force');
+
+              return;
+            }
+
+            let { stdout: shortHash } = await exec.getExecOutput(
+              'git rev-parse --short HEAD',
+            );
+            let fileName = `.changeset/renovate-${shortHash.trim()}.md`;
+            let packageBumps = await getBumps(files);
+
+            await createChangeset(fileName, packageBumps, packageNames);
+            await exec.exec('git', ['add', '.', '--all']);
+            await exec.exec('git commit -m"Add changeset [skip actions]"');
+            await exec.exec('git push --force');
+
+      - name: Update Carson
+        if: ${{ github.actor == 'renovate[bot]' }}
+        run: |
+          npm install
+          git add . --all
+          git commit -m"Run Carson update [skip actions]"
+          git push --force