Merge pull request #53 from ansidev/release/2.1.0

Release v2.1.0
ansidev · Mar 1, 2023 · 355ccf3 · 355ccf3
2 parents 949116d + 1b18b3e
commit 355ccf3
Show file tree

Hide file tree

Showing 19 changed files with 75,627 additions and 130 deletions.
diff --git a/.changes/v2.1.0.md b/.changes/v2.1.0.md
@@ -0,0 +1,19 @@
+## [v2.1.0](https://github.com/ansidev/astro-basic-template/compare/v2.0.1...v2.1.0) (2023-03-01)
+
+### Bug Fixes
+
+- set dir for internal task to avoid wrong working directory
+
+- delete existing branch before initializing
+
+### Features
+
+- **cli-command:** add command `leetcode` for generating new solution post
+
+- **deploy:** update environment variable
+
+- **disqus-comment:** add Disqus comment to post page
+
+- **seo:** add canonical URL meta field
+
+Full Changelog: [v2.0.1...v2.1.0](https://github.com/ansidev/astro-basic-template/compare/v2.0.1...v2.1.0)
diff --git a/.github/workflows/deploy_to_netlify.yaml b/.github/workflows/deploy_to_netlify.yaml
@@ -120,13 +120,15 @@ jobs:
           SITE_GA_ID: ${{ vars.SITE_GA_ID }}
           SITE_SWETRIX_ID: ${{ vars.SITE_SWETRIX_ID }}
           SITE_COUNTER_ANALYTICS_ID: ${{ vars.SITE_COUNTER_ANALYTICS_ID }}
+          SITE_DISQUS_ID: ${{ vars.SITE_DISQUS_ID }}
         shell: bash
         run: |
           set -e
           [[ ${PROD:-false} == "true" ]] && \
             OUTPUT=$(GA_ID=$SITE_GA_ID \
               SWETRIX_ID=$SITE_SWETRIX_ID \
               COUNTER_ANALYTICS_ID=$SITE_COUNTER_ANALYTICS_ID \
+              DISQUS_ID=$SITE_DISQUS_ID \
               pnpm netlify deploy \
               --auth ${{ env.NETLIFY_AUTH_TOKEN }} \
               --site ${{ env.NETLIFY_SITE_ID }} \

diff --git a/.taskfiles/task_dep.yaml b/.taskfiles/task_dep.yaml
@@ -10,6 +10,7 @@ includes:
   site:
     taskfile: ./task_site.yaml
     internal: true
+    dir: ../
   git:
     taskfile: ./task_git.yaml
     internal: true
@@ -22,7 +23,7 @@ tasks:
     desc: Init git branch {{.BRANCH_DEP_PREFIX}}/*
     cmds:
       - git pull {{.GIT_REMOTE}} {{.BRANCH_BASE}}:{{.BRANCH_BASE}}
-      - git switch {{.BRANCH_DEP_PREFIX}}/{{.BRANCH_NAME}} {{.BRANCH_BASE}} 2>/dev/null || git switch -c {{.BRANCH_DEP_PREFIX}}/{{.BRANCH_NAME}} {{.BRANCH_BASE}}
+      - git branch -D {{.BRANCH_DEP_PREFIX}}/{{.BRANCH_NAME}} 2>/dev/null || git switch -c {{.BRANCH_DEP_PREFIX}}/{{.BRANCH_NAME}} {{.BRANCH_BASE}}
     silent: true
 
   update:

diff --git a/.taskfiles/task_leetcode.yaml b/.taskfiles/task_leetcode.yaml
@@ -0,0 +1,15 @@
+version: "3"
+
+tasks:
+  new:
+    desc: Generate new post for LeetCode solution
+    cmds:
+      - pnpm lc:new {{.CLI_ARGS}}
+    silent: true
+
+  commit:
+    desc: Commit code for a specific LeetCode problem
+    cmds:
+      - |
+        git commit -m "chore(solution): add solution for LeetCode problem No.{{.CLI_ARGS}}"
+    silent: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v2.1.0](https://github.com/ansidev/astro-basic-template/compare/v2.0.1...v2.1.0) (2023-03-01)
+
+### Bug Fixes
+
+- set dir for internal task to avoid wrong working directory
+
+- delete existing branch before initializing
+
+### Features
+
+- **cli-command:** add command `leetcode` for generating new solution post
+
+- **deploy:** update environment variable
+
+- **disqus-comment:** add Disqus comment to post page
+
+- **seo:** add canonical URL meta field
+
+Full Changelog: [v2.0.1...v2.1.0](https://github.com/ansidev/astro-basic-template/compare/v2.0.1...v2.1.0)
+
 ## [v2.0.1](https://github.com/ansidev/astro-basic-template/compare/v2.0.0...v2.0.1) (2023-02-26)
 
 ### Bug Fixes

diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -5,3 +5,4 @@ includes:
   git: ./.taskfiles/task_git.yaml
   release: ./.taskfiles/task_release.yaml
   dep: ./.taskfiles/task_dep.yaml
+  lc: ./.taskfiles/task_leetcode.yaml
diff --git a/package.json b/package.json
@@ -2,9 +2,10 @@
   "name": "leetcode-blog",
   "description": "Solutions for LeetCode problems - Written by ansidev",
   "type": "module",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "license": "MIT",
   "scripts": {
+    "lc:new": "tsx ./src/cmd/leetcode.ts",
     "dev": "astro dev",
     "start": "astro dev",
     "build": "astro build",
@@ -19,8 +20,8 @@
     "@astrojs/rss": "^2.1.1",
     "@astrojs/sitemap": "^1.1.0",
     "@astrojs/tailwind": "^3.0.1",
-    "astro": "^2.0.15",
-    "astro-compress": "^1.1.34",
+    "astro": "^2.0.16",
+    "astro-compress": "^1.1.35",
     "astro-purgecss": "^2.0.0",
     "tailwindcss": "^3.2.7"
   },
@@ -31,19 +32,24 @@
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash.get": "^4.4.7",
     "@types/lodash.kebabcase": "^4.1.7",
-    "@types/node": "^18.14.1",
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
-    "@typescript-eslint/parser": "^5.53.0",
+    "@types/mustache": "^4.2.2",
+    "@types/node": "^18.14.2",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
+    "commander": "^10.0.0",
     "commitizen": "^4.3.0",
+    "dayjs": "^1.11.7",
     "dotenv": "^16.0.3",
-    "eslint": "^8.34.0",
+    "eslint": "^8.35.0",
     "eslint-plugin-astro": "^0.23.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "husky": "^8.0.3",
     "lodash.get": "^4.4.2",
     "lodash.kebabcase": "^4.1.1",
+    "mustache": "^4.2.0",
     "sass": "^1.58.3",
     "tailwindcss-themer": "^3.0.1",
+    "tsx": "^3.12.3",
     "typescript": "^4.9.5"
   }
 }