fix: linking CLI version output with package.json (#6097)

* fix: Importing package.json `version` via script during `changeset version` so that the value doesn't need to be updated separately from release automation. Updating auto-publish values + changeset generation to be more frictionless
electron-userland · Jul 29, 2021 · a4eae34 · a4eae34
1 parent b9b275f
commit a4eae34
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 40 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -1,9 +1,20 @@
 {
   "$schema": "https://unpkg.com/@changesets/config@1.6.0/schema.json",
   "changelog": "@changesets/changelog-git",
-  "commit": true,
-  "linked": [],
-  "access": "restricted",
+  "commit": false,
+  "linked": [[
+    "app-builder-lib",
+    "builder-util",
+    "dmg-builder",
+    "electron-builder",
+    "electron-builder-squirrel-windows",
+    "electron-forge-maker-appimage",
+    "electron-forge-maker-nsis",
+    "electron-forge-maker-nsis-web",
+    "electron-forge-maker-snap",
+    "electron-publish"
+  ]],
+  "access": "public",
   "baseBranch": "master",
   "updateInternalDependencies": "patch",
   "ignore": ["@electron-builder/test"]

diff --git a/.changeset/fast-peaches-play.md b/.changeset/fast-peaches-play.md
@@ -0,0 +1,16 @@
+---
+"app-builder-lib": patch
+"builder-util": patch
+"builder-util-runtime": patch
+"dmg-builder": patch
+"electron-builder": patch
+"electron-builder-squirrel-windows": patch
+"electron-forge-maker-appimage": patch
+"electron-forge-maker-nsis": patch
+"electron-forge-maker-nsis-web": patch
+"electron-forge-maker-snap": patch
+"electron-publish": patch
+"electron-updater": patch
+---
+
+Synchronizing CLI and package.json versions. Updating auto-publish values + changeset generation to be more frictionless
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -18,7 +18,7 @@
       "npm:unpublishSafe",
       "helpers:disableTypesNodeMajor"
     ],
-    "schedule": ["every weekend"],
+    "schedule": ["before 3am on the first day of the month"],
     "packageRules": [
       {
         "groupName": "ESLint and Prettier",
@@ -29,9 +29,7 @@
   },
   "circleci": {
     "enabled": true,
-    // "automerge": true,
-    // "automergeType": "branch",
-    "schedule": ["before 9am on Friday"],
+    "schedule": ["before 3am on the first day of the month"],
     "pinDigests": true,
     "semanticCommitScope": "docker",
     "semanticCommitType": "ci",

diff --git a/.github/workflows/pr-release.yml b/.github/workflows/pr-release.yml
@@ -18,27 +18,44 @@ jobs:
           # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
           fetch-depth: 0
 
-      - name: setup node.js
-        uses: actions/setup-node@v2
+      - uses: pnpm/action-setup@v2
         with:
-          node-version: 14
+          version: 6.10.0
 
-      - name: install pnpm
-        run: npm i pnpm@latest -g
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+          cache: 'pnpm'
+
+      - name: Set up NPM credentials
+        run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: setup pnpm config
         run: pnpm config set store-dir $PNPM_CACHE_FOLDER
 
-      - name: install dependencies
-        run: pnpm install
-        
-      - name: create versions PR & prepare publish
+      - run: pnpm install
+
+      - name: Create versions PR & prepare publish
+        id: changesets
         uses: changesets/action@master
         with:
           version: pnpm ci:version
-          commit: 'chore(deploy): Bump versions'
-          title: 'chore(deploy): Bump versions'
+          commit: 'chore(deploy): Release'
+          title: 'chore(deploy): Release'
           publish: pnpm ci:publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Send a stream message
+        uses: zulip/github-actions-zulip/send-message@v1
+        if: steps.changesets.outputs.published == 'true'
+        with:
+          api-key: ${{ secrets.ZULIP_API_KEY }}
+          email: ${{ secrets.ZULIP_EMAIL }}
+          organization-url: 'https://electron-builder.zulipchat.com'
+          to: 'releases'
+          type: 'stream'
+          content: ${{ steps.changesets.outputs.publishedPackages }}
diff --git a/package.json b/package.json
@@ -22,8 +22,9 @@
     "test-update": "UPDATE_SNAPSHOT=true pnpm test-all",
     "docker-images": "docker/build.sh",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md",
-    "ci:version": "pnpm changelog && changeset version",
-    "ci:publish": "pnpm compile && pnpm publish -r --filter ./packages --tag next",
+    "generate-changeset": "pnpm changeset",
+    "ci:version": "pnpm changelog && changeset version && node scripts/update-package-version-export.js && git add .",
+    "ci:publish": "pnpm compile && changeset publish",
     "schema": "typescript-json-schema packages/app-builder-lib/tsconfig.json Configuration --out packages/app-builder-lib/scheme.json --noExtraProps --useTypeOfKeyword --strictNullChecks --required && node ./scripts/fix-schema.js",
     "jsdoc": "ts2jsdoc packages/builder-util-runtime packages/builder-util packages/app-builder-lib packages/electron-builder packages/electron-publish",
     "jsdoc2md": "node scripts/jsdoc2md.js",
@@ -64,5 +65,9 @@
     "typescript": "4.3.5",
     "typescript-json-schema": "0.50.1",
     "v8-compile-cache": "2.3.0"
+  },
+  "engines": {
+    "node": ">=14",
+    "pnpm": ">=6"
   }
 }
diff --git a/packages/app-builder-lib/src/version.ts b/packages/app-builder-lib/src/version.ts
@@ -1 +1 @@
-export const PACKAGE_VERSION = "22.11.8"
+export const PACKAGE_VERSION = "22.11.10"
diff --git a/scripts/babel-plugin-version-transform.js b/scripts/babel-plugin-version-transform.js
diff --git a/scripts/update-package-version-export.js b/scripts/update-package-version-export.js
@@ -0,0 +1,7 @@
+const path = require("path")
+const version = require(path.join(__dirname, "../packages/app-builder-lib/package.json")).version
+
+const destFile = path.join(__dirname, '../packages/app-builder-lib/src/version.ts')
+
+const { writeFileSync } = require("fs")
+writeFileSync(destFile, `export const PACKAGE_VERSION = "${version}"`)
diff --git a/test/package.json b/test/package.json
@@ -1,5 +1,6 @@
 {
   "name": "@electron-builder/test",
+  "version": "0.0.0",
   "private": true,
   "dependencies": {
     "7zip-bin": "~5.1.1",