chore: merge master into develop #38

Norgate-AV · May 5, 2022 · df1fb25 · df1fb25
2 parents 3395d6c + 1899ced
commit df1fb25
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -45,6 +45,7 @@ jobs:
           npm run test
           npm run build
           npm run build:archive
+          npm run build:electron
 
       - name: Create Template (yarn)
         run: |
@@ -57,6 +58,7 @@ jobs:
           yarn test
           yarn build
           yarn build:archive
+          yarn build:electron
 
   publish:
     runs-on: ubuntu-latest
@@ -67,6 +69,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
 
       - name: Setup Node ${{ matrix.node-version }}
         uses: actions/setup-node@v2
@@ -83,7 +87,7 @@ jobs:
         run: yarn semantic-release
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
           GIT_AUTHOR_NAME: ${{ secrets.SEMANTIC_RELEASE_GIT_NAME }}
           GIT_AUTHOR_EMAIL: ${{ secrets.SEMANTIC_RELEASE_GIT_EMAIL }}
           GIT_COMMITTER_NAME: ${{ secrets.SEMANTIC_RELEASE_GIT_NAME }}

diff --git a/.releaserc.json b/.releaserc.json
@@ -41,7 +41,12 @@
             }
         ],
         "@semantic-release/npm",
-        "@semantic-release/git",
+        [
+            "@semantic-release/git",
+            {
+                "message": "chore(release): ${nextRelease.version} [skip ci]"
+            }
+        ],
         "@semantic-release/github"
     ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,22 @@
+# Changelog
+
+## [0.6.0](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/compare/v0.5.3...v0.6.0) (2022-05-05)
+
+### Features
+
+-   **template:** add @norgate-av/react-crestron-ch5-hooks to template ([bd14e4c](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/bd14e4c38972dd062f934c2e784b16623565e70c))
+-   add basic GitHub Actions CI config ([fb8e51b](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/fb8e51b7b07bd85a39e1f1fb8170d5c0b3b8b754))
+-   **template:** add classnames package ([c1647cb](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/c1647cb26f8f7b45f0fcfeb3bd12ddbbdc79a4a9))
+-   add components directory ([8a2e523](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/8a2e523e92c967128842258c7ea62a533ca0325f))
+-   add containers directory ([4570a5d](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/4570a5d8b62a4c652204588f27d1fe5fc58a6e33))
+-   add docker support ([#29](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/issues/29)) ([ff03738](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/ff03738e6e6cd381ad39d15c3b46ed8019cf1982))
+-   **tailwindcss:** add dracula theme colour palette as custom classes ([2b7a482](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/2b7a482e13794c49ccc31097044ab12fa46b1281))
+-   add electron support ([#35](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/issues/35)) ([51ee5f7](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/51ee5f78d078fb48930c42334864fbb7b124c776))
+-   add hooks directory ([f802b04](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/f802b04ba7fb339001b955524e69afbb02aa227e))
+-   **tailwind:** add tailwind declarations to index.css ([f6c5be1](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/f6c5be125bb5ca8f1ac3580f7c06e994a9150bfb))
+-   **template:** add tailwindcss ([e0bad26](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/e0bad268aa734cd88a93496362b2e6cf4185d2bc))
+
+### Bug Fixes
+
+-   **electron:** move electron-is-dev from dev-deps to deps ([b915503](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/b915503dd4b8241060d8daf70fec24197eb74ab9))
+-   **scripts:** use jq binary from node_modules in resolve:crcomlib ([#25](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/issues/25)) ([#26](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/issues/26)) ([261a6e0](https://github.com/Norgate-AV-Solutions-Ltd/cra-template-crestron-ch5-typescript/commit/261a6e018272fa9f348276e0eece2eac07dc7ad9))
diff --git a/package.json b/package.json
@@ -1,13 +1,18 @@
 {
     "name": "@norgate-av/cra-template-crestron-ch5-typescript",
-    "version": "0.0.0-development",
+    "version": "0.6.0",
     "keywords": [
         "ch5",
         "crestron",
         "react",
         "create-react-app",
         "template",
-        "typescript"
+        "typescript",
+        "docker",
+        "electron",
+        "tailwindcss",
+        "redux",
+        "styled-components"
     ],
     "description": "Crestron CH5 TypeScript template for Create React App.",
     "main": "template.json",

diff --git a/template.json b/template.json
@@ -8,6 +8,7 @@
             "@norgate-av/react-crestron-ch5-hooks": "^1.0.0",
             "@reduxjs/toolkit": "^1.8.1",
             "axios": "^0.27.2",
+            "electron-is-dev": "^2.0.0",
             "eruda": "^2.4.1",
             "react-icons": "^4.3.1",
             "react-redux": "^8.0.1",
@@ -18,9 +19,10 @@
             "styled-components": "^5.3.3"
         },
         "scripts": {
+            "clean:app": "rimraf app",
             "clean:build": "rimraf build",
             "clean:dist": "rimraf dist",
-            "clean:all": "yarn clean:build && yarn clean:dist",
+            "clean:all": "yarn clean:app && yarn clean:build && yarn clean:dist",
             "copylib": "run-script-os",
             "copylib:default": "ncp $npm_package_crestron_crcomlib_bundle_path_umd public/$npm_package_crestron_crcomlib_bundle_name",
             "copylib:windows": "ncp %npm_package_crestron_crcomlib_bundle_path_umd% public/%npm_package_crestron_crcomlib_bundle_name%",
@@ -48,7 +50,11 @@
             "commit": "git-cz",
             "husky:install": "husky install",
             "pretty:fix": "prettier --write .",
-            "build:electron": "yarn build && electron-builder -wml",
+            "build:electron": "run-script-os",
+            "build:electron:macos": "yarn clean:app && electron-builder --mac",
+            "build:electron:windows": "yarn clean:app && electron-builder --win",
+            "build:electron:default": "yarn clean:app && electron-builder --linux",
+            "build:electron:all": "yarn clean:app && electron-builder -wml",
             "electron:dev": "concurrently \"cross-env BROWSER=none yarn start\" \"wait-on http://127.0.0.1:3000 && electron .\""
         },
         "eslintConfig": {
@@ -113,7 +119,6 @@
             "cz-conventional-changelog": "3.3.0",
             "electron": "^18.2.0",
             "electron-builder": "^23.0.3",
-            "electron-is-dev": "^2.0.0",
             "eslint": "^8.11.0",
             "eslint-config-airbnb": "^19.0.4",
             "eslint-config-airbnb-typescript": "^17.0.0",

diff --git a/template/README.md b/template/README.md
@@ -225,7 +225,7 @@ You can then view your application at [http://localhost:8080](http://localhost:8
 
 #### `yarn build:electron`
 
-Builds the application into a standalone Electron desktop application.
+Builds the application into a standalone Electron desktop application and outputs to the app directory.
 
 #### `yarn electron:dev`
 
@@ -237,7 +237,7 @@ You will also see any lint errors in the console.
 
 #### `yarn clean:all`
 
-Deletes the `build` and `dist` directories.
+Deletes the `app`, `build` and `dist` directories.
 
 #### `yarn commit`
 

diff --git a/template/electron-builder.json b/template/electron-builder.json
@@ -0,0 +1,18 @@
+{
+    "extends": null,
+    "mac": {
+        "artifactName": "${productName}-${version}-mac.${ext}",
+        "category": "public.app-category.utilities"
+    },
+    "linux": {
+        "artifactName": "${productName}-${version}-${arch}-linux.${ext}",
+        "target": ["tar.gz", "snap", "AppImage"]
+    },
+    "win": {
+        "artifactName": "${productName}-${version}-${arch}-win.${ext}"
+    },
+    "files": ["electron/**/*", "build/**/*", "node_modules/**/*"],
+    "directories": {
+        "output": "app"
+    }
+}
diff --git a/template/gitignore b/template/gitignore
@@ -1,17 +1,21 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
+
 /node_modules
 /.pnp
 .pnp.js
 
 # testing
+
 /coverage
 
 # production
+
 /build
 
 # misc
+
 .DS_Store
 .env
 .env.local
@@ -21,11 +25,14 @@
 
 npm-debug.log*
 yarn-debug.log*
-yarn-error.log*
+yarn-error.log\*
 
 # output files
+
 /dist
 public/cr-com-lib.js
+/app
 
 # local history folder
+
 /.history