🔨 Add changelog and version updates to release.sh

CHANGELOG.md

@@ -1,8 +1,6 @@
 # Changelog
 
-All notable changes to Congo will be documented in this file.
-
-Things that need attention when upgrading from a prior version are marked ⚠️.
+All notable changes to Congo will be documented in this file. Things that need attention when upgrading from a prior version are marked ⚠️.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
@@ -59,7 +57,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [1.0.0] - 2020-08-16
 
-### Initial release 🎉
+### Added
 
 - Built with Tailwind CSS JIT for minified stylesheets without any excess code
 - Fully responsive layout

assets/css/compiled/main.css

@@ -1,3 +1,5 @@
+/*! Congo v1.1.1 | MIT License | https://github.com/jpanther/congo */
+
 /*! tailwindcss v2.2.7 | MIT License | https://tailwindcss.com */
 
 /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */

assets/css/main.css

@@ -1,3 +1,5 @@
+/*! Congo v1.1.1 | MIT License | https://github.com/jpanther/congo */
+
 @tailwind base;
 @tailwind components;
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "hugo-congo-theme",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "hugo-congo-theme",
-      "version": "1.0.0",
+      "version": "1.1.1",
       "license": "MIT",
       "devDependencies": {
         "@tailwindcss/typography": "^0.4.1",

package.json

@@ -5,6 +5,7 @@
   "main": "index.js",
   "scripts": {
     "dev": "NODE_ENV=development ./node_modules/tailwindcss/lib/cli.js -i ./assets/css/main.css -o ./assets/css/compiled/main.css --jit -w",
+    "build": "NODE_ENV=production ./node_modules/tailwindcss/lib/cli.js -i ./assets/css/main.css -o ./assets/css/compiled/main.css --jit",
     "example": "hugo server --source exampleSite --themesDir ../.. --buildDrafts"
   },
   "repository": {

release.sh

@@ -6,34 +6,63 @@ branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
 # push any local changes
 git push
 
-# checkout stable branch (this will catch uncommitted changes)
-git checkout stable || exit 1
+# run a build to catch any uncommitted updates
+npm run build
 
 # branch validation
 if [ $branch = "dev" ]; then
-	echo "Enter the release version (eg. v1.0.0):"
-	read version
+	# check current branch is clean
+	if output=$(git status --porcelain) && [ -z "$output" ]; then
 		
-	echo "Started releasing $version for Congo..."
+		# get the version number
+		echo "Enter the release version (eg. v1.0.0):"
+		read version
 
-	# pull latest from stable
-	git pull
+		echo "Started releasing Congo $version..."
 
-	# merge in changes from dev branch
-	git merge --no-ff dev -m "🔖 Release $version"
+		# update package version
+		jq --arg version "$version" '.version=$version' package.json > package.tmp && mv package.tmp package.json
+		sed -i -e "1s/^\(\/\*! Congo \)v[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/\1$version/" assets/css/main.css
 
-	# create tag
-	git tag $version
+		# update changelog
+		chan release $version || exit
+		npx prettier --write CHANGELOG.md
 
-	# push commit and tag to remote
-	git push
-	git push --tags
+		# build project
+		npm run build
 
-	echo "$version successfully released!"
-	echo "Returning to dev branch..."
+		# commit version updates
+		git commit -a -m "🔨 Preparing release $version"
+		git push
 
-	git checkout dev
+		# switch to stable branch
+		git checkout stable
 
+		# pull latest from stable
+		git pull
+
+		# merge in changes from dev branch
+		git merge --no-ff dev -m "🔖 Release $version"
+
+		# create tag
+		git tag $version
+
+		# push commit and tag to remote
+		git push
+		git push --tags
+
+		# publish GitHub release
+		timeout 2 chan gh-release $version
+
+		echo "Congo $version successfully released! 🎉"
+		echo "Returning to dev branch..."
+
+		git checkout dev
+
+	else	
+		echo "ERROR: There are unstaged changes in development!"
+		echo "Clean the working directory and try again."
+	fi
 else 
-	echo "Releases can only be published from the dev branch!"
+	echo "ERROR: Releases can only be published from the dev branch!"
 fi