Skip to content

Commit

Permalink
chore: merge branch 'master' into feature/implement-conf
Browse files Browse the repository at this point in the history
  • Loading branch information
damienbutt committed Jul 26, 2024
2 parents 94fa09e + a3febd7 commit 2db1c41
Show file tree
Hide file tree
Showing 117 changed files with 12,601 additions and 8,073 deletions.
2 changes: 1 addition & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projectName": "genlinx",
"projectOwner": "Norgate-AV-Solutions-Ltd",
"projectOwner": "Norgate-AV",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
Expand Down
13 changes: 13 additions & 0 deletions .changelogrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"header": "Changelog",
"types": [
{ "type": "feat", "section": "🌟 Features" },
{ "type": "fix", "section": "πŸ› Bug Fixes" },
{ "type": "chore", "hidden": true },
{ "type": "docs", "section": "πŸ“– Documentation" },
{ "type": "style", "hidden": true },
{ "type": "refactor", "section": "✨ Refactor" },
{ "type": "perf", "section": "πŸš€ Performance" },
{ "type": "test", "hidden": true }
]
}
9 changes: 0 additions & 9 deletions .eslintignore

This file was deleted.

36 changes: 0 additions & 36 deletions .eslintrc.json

This file was deleted.

63 changes: 53 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,69 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
persist-credentials: false

- name: Setup PNPM
uses: pnpm/action-setup@v2
with:
version: 8

- name: Setup Node ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: pnpm

- name: Install (with cache)
uses: bahmutov/npm-install@v1
with:
install-command: yarn --frozen-lockfile --network-timeout 1000000
- name: Install Dependencies
run: pnpm install

- name: Lint
run: yarn lint
run: pnpm lint

release:
name: Run Semantic Release

runs-on: ubuntu-latest

if: ${{ github.ref == 'refs/heads/master' }}

needs: [build]

steps:
- name: Checkout
uses: actions/checkout@v3
with:
persist-credentials: false

- name: Setup PNPM
uses: pnpm/action-setup@v2
with:
version: 8

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
cache: pnpm

- name: Install Dependencies
run: pnpm install

- name: Build
run: pnpm build

- name: Test
run: yarn test
- name: Release
run: pnpm semantic-release
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_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 }}
GIT_COMMITTER_EMAIL: ${{ secrets.SEMANTIC_RELEASE_GIT_EMAIL }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,5 @@ dist

# Local history
.history/

tests/
4 changes: 1 addition & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn commitlint --edit $1
pnpm commitlint --edit $1
4 changes: 1 addition & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint-staged
pnpm lint-staged
4 changes: 2 additions & 2 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"*?(test|spec).{js,jsx,ts,tsx}": ["yarn lint:fix", "yarn pretty:fix"],
"*.{css,scss,md,html,json,yml,yaml}": ["yarn pretty:fix"]
"*?(test|spec).{js,jsx,ts,tsx}": ["prettier --write"],
"*.{css,scss,md,html,json,yml,yaml}": ["prettier --write"]
}
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
access=public
enable-pre-post-scripts=true
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.15.0
20.15.1
19 changes: 8 additions & 11 deletions .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
"@semantic-release/commit-analyzer",
{
"preset": "conventionalcommits",
"releaseRules": [
{ "type": "docs", "scope": "README", "release": "patch" },
{ "type": "refactor", "release": "patch" },
{ "type": "style", "release": "patch" }
],
"releaseRules": [{ "type": "refactor", "release": "patch" }],
"parserOpts": {
"noteKeywords": [
"BREAKING CHANGE",
Expand All @@ -35,14 +31,15 @@
"commitsSort": ["subject", "scope"]
},
"presetConfig": {
"header": "Changelog",
"types": [
{ "type": "feat", "section": "Features" },
{ "type": "fix", "section": "Bug Fixes" },
{ "type": "feat", "section": "🌟 Features" },
{ "type": "fix", "section": "πŸ› Bug Fixes" },
{ "type": "chore", "hidden": true },
{ "type": "docs", "section": "Documentation" },
{ "type": "style", "section": "Style" },
{ "type": "refactor", "section": "Refactor" },
{ "type": "perf", "section": "Performance" },
{ "type": "docs", "section": "πŸ“– Documentation" },
{ "type": "style", "hidden": true },
{ "type": "refactor", "section": "✨ Refactor" },
{ "type": "perf", "section": "πŸš€ Performance" },
{ "type": "test", "hidden": true }
]
}
Expand Down
14 changes: 12 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"typescript.validate.enable": true,
"typescript.tsdk": "./node_modules/typescript/lib",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
Expand Down Expand Up @@ -31,6 +32,15 @@
}
},
"editor.codeActionsOnSave": {
"source.fixAll.markdownlint": true
}
"source.fixAll.markdownlint": "explicit"
},
"[dotenv]": {
"editor.formatOnSave": false
},
"json.schemas": [
{
"url": "./tsup.schema.json",
"fileMatch": ["package.json", "tsup.config.json"]
}
]
}
Loading

0 comments on commit 2db1c41

Please sign in to comment.