fix: change executable icon and fix release action

Author: KucingKode

.eslintrc.json

@@ -9,7 +9,7 @@
     "sourceType": "module",
     "ecmaVersion": 12
   },
-  "ignorePatterns": ["rollup.config.js", "build", "bin"],
+  "ignorePatterns": ["rollup.config.js", "*.json", "build", "bin", "scripts"],
   "rules": {
     "prettier/prettier": "error",
     "no-unused-vars": "warn",

.github/workflows/release.yaml

@@ -2,7 +2,30 @@ name: Release
 on: [push]
 
 jobs:
+  bundle-javascript-file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+
+      - name: install dependencies
+        run: npm ci
+      - name: bundle javascript files
+        run: npm run build
+
+      - name: upload bundled javascript file
+        uses: actions/upload-artifact@v2
+        with:
+          name: cithak-bundle
+          path: build/file/cithak.js
+          retention-days: 1
+
   build-and-release:
+    needs: ['bundle-javascript-file']
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -15,13 +38,27 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 14
+
+      - name: download javascript bundle file
+        uses: actions/download-artifact@v2
+        with:
+          name: cithak-bundle
+          path: build/file/
+
       - name: install dependencies
         run: npm ci
       - name: install pkg
         run: npm install -D pkg
+      - name: install resourcehacker
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: npm install -D node-resourcehacker
 
-      - name: build
+      - name: build executable
         run: npm run build-${{ matrix.os }}
+      - name: change executable icon
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: node scripts/setIcon.js
+
       - name: add to release
         uses: softprops/action-gh-release@v1
         with:

.npmignore

@@ -8,8 +8,8 @@ docs
 test
 images
 build/bin
+scripts
 CHANGELOG.md
-README.md
 CONTRIBUTING.md
 .prettierignore
 .prettierrc

.prettierignore

@@ -2,4 +2,5 @@ src/helpers/info.js
 test/**/*
 rollup.config.js
 build
-bin
+bin
+*.json

README.md

@@ -1,6 +1,6 @@
 # Cithak
 
-![icon](./icon.svg)
+![icon](./images/icon.svg)
 
 ---
 

icon.ico

@@ -1,23 +1,20 @@
 {
   "name": "cithak",
-  "version": "1.3.1-beta",
+  "version": "1.3.2-beta",
   "description": "Simple, Secure yet Powerful template manager",
   "main": "build/file/cithak.js",
   "scripts": {
     "build": "NODE_ENV=production rollup -c",
     "publish": "npm run build",
     "dev": "rollup -cw",
-    "build-ubuntu-latest": "pkg -t linux -c ./package.json -o ./build/bin/cithak-linux ./cithak.js",
-    "build-windows-latest": "pkg -t win -c ./package.json -o ./build/bin/cithak-win ./cithak.js",
-    "build-macos-latest": "pkg -t mac -c ./package.json -o ./build/bin/cithak-mac ./cithak.js"
+    "build-ubuntu-latest": "pkg -t linux -o ./build/bin/cithak-linux ./cithak.js",
+    "build-windows-latest": "pkg -t win -o ./build/bin/cithak-win ./cithak.js",
+    "build-macos-latest": "pkg -t mac -o ./build/bin/cithak-mac ./cithak.js"
   },
   "bin": {
     "cithak": "bin/cithak",
     "cth": "bin/cithak"
   },
-  "pkg": {
-    "assets": "./package.json"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -52,6 +49,7 @@
   },
   "devDependencies": {
     "@rollup/plugin-eslint": "^8.0.1",
+    "@rollup/plugin-json": "^4.1.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-node": "^4.1.0",

icon.svg renamed to images/icon.svg

@@ -1,4 +1,5 @@
 import eslint from '@rollup/plugin-eslint'
+import json from '@rollup/plugin-json'
 import { terser } from 'rollup-plugin-terser'
 
 const production = process.env.NODE_ENV === 'production'
@@ -18,6 +19,7 @@ const config = {
     'shelljs'
   ],
   plugins: [
+    json(),
     eslint(),
     production && terser()
   ],

package-lock.json

@@ -0,0 +1,24 @@
+const resourceHacker = require('node-resourcehacker')
+
+// Use the beta release of Resource Hacker.
+process.env.SOURCE_RESOURCE_HACKER =
+  'http://www.angusj.com/resourcehacker/resource_hacker.zip'
+
+resourceHacker(
+  {
+    operation: 'addoverwrite',
+    input: '../build/bin/cithak-win.exe',
+    output: '../build/bin/cithak-win.exe',
+    resource: '../icon.ico',
+    resourceType: 'ICONGROUP',
+    resourceName: '1',
+  },
+  (err) => {
+    if (err) {
+      console.error(err)
+      return
+    }
+
+    console.log('Done')
+  }
+)

package.json

@@ -1,8 +1,7 @@
 import chalk from 'chalk'
-import fs from 'fs-extra'
-import * as paths from './path'
+import pkg from '../../package.json'
 
-const VERSION = fs.readJSONSync(paths.PACKAGE_JSON).version
+const VERSION = pkg.version
 
 export const stuck = `
    ${chalk.blue.bold('INFO!')} For more info please type ${chalk.yellow('cth --help')}

rollup.config.js

@@ -1,7 +1,6 @@
 import { join } from 'path'
 import { homedir } from 'os'
 
-export const PACKAGE_JSON = join(__dirname, '../../package.json')
 export const STORAGE = join(homedir(), '.cithak-templates-storage/templates')
 export const DATA_JSON = join(homedir(), '.cithak-templates-storage/data.json')
 export const state = {

scripts/setIcon.js

@@ -1,5 +1,6 @@
 import arg from 'arg'
 import fs from 'fs-extra'
+import pkg from '../package.json'
 
 import * as pathHelper from './helpers/path'
 import * as errorHelper from './helpers/error'
@@ -101,7 +102,7 @@ exports.cli = (args) => {
   if (options.err) return
 
   if (options.needVersion) {
-    console.log(`v${fs.readJSONSync(pathHelper.PACKAGE_JSON).version}`)
+    console.log(`v${pkg.version}`)
   } else if (options.action === 'help' || options.needHelp) {
     actions.help(options)
   } else if (actions[options.action]) {