From 53baaf787ac2bb786ee3f724ce72223a59f7ff18 Mon Sep 17 00:00:00 2001 From: GermanBluefox Date: Sun, 13 Feb 2022 12:53:15 +0100 Subject: [PATCH] * (bluefox) Updated some GUI libraries * (bluefox) Updated releaser --- .github/workflows/test-and-release.yml | 2 +- .npmignore | 11 ----------- .releaseconfig.json | 10 ++++------ LICENSE | 2 +- README.md | 9 ++++++--- gulpfile.js | 2 +- main.js | 2 +- package.json | 12 ++++++++++-- src/package.json | 14 +++++++------- 9 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 .npmignore diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 429fa7d..166ec1e 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -146,7 +146,7 @@ jobs: tag_name: ${{ github.ref }} release_name: Release v${{ steps.extract_release.outputs.VERSION }} draft: false - # Prerelease versions create prereleases on Github + # Prerelease versions create pre-releases on GitHub prerelease: ${{ contains(steps.extract_release.outputs.VERSION, '-') }} body: ${{ steps.extract_release.outputs.BODY }} diff --git a/.npmignore b/.npmignore deleted file mode 100644 index 317a2c1..0000000 --- a/.npmignore +++ /dev/null @@ -1,11 +0,0 @@ -/**/* -/gulpfile.js -gulpfile.js -!/admin/**/* -!/admin/* -!/io-package.json -!/package.json -!/LICENSE -!/main.js -!/README.md -admin/i18n diff --git a/.releaseconfig.json b/.releaseconfig.json index 3da1374..3ce9936 100644 --- a/.releaseconfig.json +++ b/.releaseconfig.json @@ -1,8 +1,6 @@ { - "all": true, - "lerna": false, - - "scripts": { - "beforePush": "npm run build" + "plugins": ["iobroker", "license"], + "exec": { + "before_commit": "npm run build" } -} \ No newline at end of file +} diff --git a/LICENSE b/LICENSE index 5210594..6b95cc0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2021, Bluefox (dogafox@gmail.com) +Copyright (c) 2015-2022, Bluefox (dogafox@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index b93d2d3..a4b4eeb 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ [![Translation status](https://weblate.iobroker.net/widgets/adapters/-/scenes/svg-badge.svg)](https://weblate.iobroker.net/engage/adapters/?utm_source=widget) [![Downloads](https://img.shields.io/npm/dm/iobroker.scenes.svg)](https://www.npmjs.com/package/iobroker.scenes) - _scenes Adapter_ can create scenes and execute them in ioBroker environment. **This adapter uses Sentry libraries to automatically report exceptions and code errors to the developers.** For more details and for information how to disable the error reporting see [Sentry-Plugin Documentation](https://github.com/ioBroker/plugin-sentry#plugin-sentry)! Sentry reporting is used starting with js-controller 3.0. @@ -102,7 +101,7 @@ Additionally, you can define the behaviour for which value should be taken for t You can provide following aggregations (available only in advanced mode): - `uncertain` - (default) - the value of the group will have text `uncertain`. -- `any` - first non zero value of all states in group. +- `any` - first non-zero value of all states in group. - `min` - minimal value of all states in group. - `max` - maximal value of all states in group. - `avg` - average value of all states in group. @@ -128,6 +127,10 @@ The adapter will read all actual values for IDs defined in this scene and save i --> ## Changelog +### __WORK IN PROGRESS__ +* (bluefox) Updated some GUI libraries +* (bluefox) Updated releaser + ### 2.3.8 (2021-08-31) * (Apollon77) Handle case where states are not set but used as value (Sentry IOBROKER-SCENES-13) * (TyrionWarMage) Added the aggregation mode for the virtual groups. @@ -252,7 +255,7 @@ The adapter will read all actual values for IDs defined in this scene and save i ## License The MIT License (MIT) -Copyright (c) 2015-2021, Bluefox (dogafox@gmail.com) +Copyright (c) 2015-2022, Bluefox (dogafox@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/gulpfile.js b/gulpfile.js index 829c729..df43e87 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,5 @@ /** - * Copyright 2018-2020 bluefox + * Copyright 2018-2022 bluefox * * MIT License * diff --git a/main.js b/main.js index 330ea91..0d8a7d2 100644 --- a/main.js +++ b/main.js @@ -1,4 +1,4 @@ -// Copyright Bluefox 2015-2021 +// Copyright Bluefox 2015-2022 // // Structure of one scene diff --git a/package.json b/package.json index 03c5714..d65c9f1 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,12 @@ "@iobroker/adapter-core": "^2.5.1" }, "devDependencies": { - "@alcalzone/release-script": "^2.2.1", + "@alcalzone/release-script": "^3.5.2", + "@alcalzone/release-script-plugin-iobroker": "^3.5.1", + "@alcalzone/release-script-plugin-license": "^3.5.0", "gulp": "^4.0.2", "mocha": "^9.2.0", - "chai": "^4.3.6", + "chai": "~4.3.6", "gulp-rename": "^2.0.0", "del": "^6.0.0" }, @@ -31,6 +33,12 @@ "url": "https://github.com/ioBroker/ioBroker.scenes/issues" }, "main": "main.js", + "files": [ + "admin/", + "io-package.json", + "LICENSE", + "main.js" + ], "scripts": { "test": "node node_modules/mocha/bin/mocha --exit", "prepublishOnly": "node node_modules/gulp/bin/gulp.js", diff --git a/src/package.json b/src/package.json index c7f9df9..6d3bf1f 100644 --- a/src/package.json +++ b/src/package.json @@ -3,20 +3,20 @@ "version": "2.3.8", "private": true, "dependencies": { - "@iobroker/adapter-react": "^2.0.10", + "@iobroker/adapter-react": "^2.0.18", "@material-ui/core": "^4.12.3", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.57", - "@sentry/browser": "^6.12.0", - "@sentry/integrations": "^6.12.0", + "@sentry/browser": "^6.17.7", + "@sentry/integrations": "^6.17.7", "react-beautiful-dnd": "^13.1.0", - "react-dnd-html5-backend": "^14.0.1", - "react-dnd": "^14.0.3", + "react-dnd-html5-backend": "^15.1.2", + "react-dnd": "^15.1.1", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-icons": "^4.2.0", + "react-icons": "^4.3.1", "react-scripts": "^4.0.3", - "react-ace": "^9.4.3", + "react-ace": "^9.5.0", "clsx": "^1.1.1" }, "scripts": {