Skip to content

Commit

Permalink
Merge pull request #32 from phillipivan/main
Browse files Browse the repository at this point in the history
Use Variables, update dependencies
  • Loading branch information
phillipivan authored Sep 16, 2024
2 parents cc4c0d3 + af11e37 commit a2b5154
Show file tree
Hide file tree
Showing 22 changed files with 4,642 additions and 3,817 deletions.
3 changes: 0 additions & 3 deletions .eslintrc.js

This file was deleted.

9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

**/node_modules
dist/
*.log
/pkg
/pkg.tgz
/.vscode
DEBUG-*
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint-staged
5 changes: 0 additions & 5 deletions .prettierrc.json

This file was deleted.

1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
3 changes: 3 additions & 0 deletions companion/HELP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Generic Ember Plus

- [Ember Plus](https://github.com/Lawo/ember-plus)
52 changes: 28 additions & 24 deletions companion/manifest.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
{
"id": "generic-emberplus",
"name": "generic-emberplus",
"shortname": "emberplus",
"description": "Ember+ module for Companion",
"version": "0.0.0",
"license": "MIT",
"repository": "git+https://github.com/bitfocus/companion-module-generic-emberplus.git",
"bugs": "https://github.com/bitfocus/companion-module-generic-emberplus/issues",
"maintainers": [
{
"name": "Mint de Wit",
"email": "[email protected]"
}
],
"legacyIds": [],
"runtime": {
"type": "node18",
"api": "nodejs-ipc",
"apiVersion": "0.0.0",
"entrypoint": "../dist/index.js"
},
"manufacturer": "Generic",
"products": ["Ember+"],
"keywords": ["ember", "emberplus"]
"id": "generic-emberplus",
"name": "generic-emberplus",
"shortname": "emberplus",
"description": "Ember+ module for Companion",
"version": "0.0.0",
"license": "MIT",
"repository": "git+https://github.com/bitfocus/companion-module-generic-emberplus.git",
"bugs": "https://github.com/bitfocus/companion-module-generic-emberplus/issues",
"maintainers": [
{
"name": "Mint de Wit",
"email": "[email protected]"
},
{
"name": "Phillip Ivan Pietruschka",
"email": "[email protected]"
}
],
"legacyIds": [],
"runtime": {
"type": "node18",
"api": "nodejs-ipc",
"apiVersion": "0.0.0",
"entrypoint": "../dist/index.js"
},
"manufacturer": "Generic",
"products": ["Ember+"],
"keywords": ["ember", "emberplus"]
}
20 changes: 20 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { generateEslintConfig } from '@companion-module/tools/eslint/config.mjs'

const baseConfig = await generateEslintConfig({
enableTypescript: true,
})

const customConfig = [
...baseConfig,

{
rules: {
'@typescript-eslint/no-unsafe-enum-comparison': 'off',
// misconfiguration of ts or something?
'n/no-missing-import': 'off',
// 'm/no-unpublished-import': 'off',
},
},
]

export default customConfig
36 changes: 21 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"name": "generic-emberplus",
"version": "2.2.0",
"version": "2.3.0",
"main": "dist/index.js",
"scripts": {
"prepare": "husky install",
"prepare": "husky",
"dev": "yarn build:watch",
"build": "rimraf dist && yarn build:main",
"build:main": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json --watch",
"lint:raw": "eslint --ext .ts",
"lint": "yarn lint:raw ."
"lint:raw": "eslint",
"lint": "yarn lint:raw .",
"dist": "yarn companion-module-build"
},
"repository": {
"type": "git",
Expand All @@ -20,23 +21,28 @@
"*.{js,json,md}": [
"prettier --write"
],
"*.{ts}": [
"*.ts": [
"yarn lint:raw --fix"
]
},
"engines": {
"node": "^18.12"
"node": "^18.20"
},
"dependencies": {
"@companion-module/base": "~1.1.1",
"@types/node": "^18.13.0",
"@companion-module/base": "~1.10.0",
"@types/node": "^18.19.45",
"emberplus-connection": "^0.2.1"
},
"devDependencies": {
"@companion-module/tools": "^1.0.0",
"husky": "^8.0.3",
"lint-staged": "^13.1.2",
"rimraf": "^4.1.2",
"typescript": "~4.9"
}
}
"@companion-module/tools": "^2.0.3",
"eslint": "^9.10.0",
"husky": "^9.1.6",
"lint-staged": "^15.2.0",
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"typescript": "~5.5.4",
"typescript-eslint": "^8.5.0"
},
"prettier": "@companion-module/tools/.prettierrc.json",
"packageManager": "[email protected]"
}
Loading

0 comments on commit a2b5154

Please sign in to comment.