Merge 63372e7 into 8e351a2

.gitlab-ci.yml

@@ -1,13 +1,12 @@
 test:
-  image: node:11
+  image: node:12
   before_script:
     - npm config set cache "$(pwd)/.npm"
     - npm install
   script:
-    - npm run build
-    - npm run lint
-    - npm run test
-    - npm run markdownlint
+    - yarn run dev
+    - yarn run build --coverage
+    - yarn run markdownlint
     # Make sure build output has been committed.
     - git status --porcelain || (echo "Repo is dirty"; git diff; false)
   cache:
@@ -17,6 +16,6 @@ test:
   coverage: '/All files[^|]*\|[^|]*\s+([\d\.]+)/'
   artifacts:
     reports:
-      junit: junit-*.xml
+      junit: coverage/junit.xml
     paths:
       - coverage

.prettierrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  ...require('@grafana/toolkit/src/config/prettier.plugin.config.json'),
+};

.travis.yml

@@ -1,13 +1,12 @@
 language: node_js
 node_js:
-  - "14"
+  - "12"
 before_script:
   - npm install
 script:
-  - npm run build
-  - npm run lint
-  - npm run test
-  - npm run markdownlint
+  - yarn run dev
+  - yarn run build --coverage
+  - yarn run markdownlint
   # Make sure build output has been committed.
   - git status --porcelain || (echo "Repo is dirty"; git diff; false)
 after_success:

CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0] - 2020-11-08
+
+### Fixed
+
+- Glitches in graphs caused by out of order data. ([#29](https://github.com/fetzerch/grafana-sunandmoon-datasource/issues/29),
+  [grafana/#28804](https://github.com/grafana/grafana/issues/28804))
+- Annotations are no longer shown. ([#31](https://github.com/fetzerch/grafana-sunandmoon-datasource/issues/31))
+
+### Changes
+
+- The plugin was migrated to the new plugin framework introduced in Grafana
+  7.0 and is no longer compatible with older versions of Grafana.
+
 ## [0.1.6] - 2020-05-24
 
 ### Fixed
@@ -56,7 +69,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial version with sun and moon calculation and annotations.
 
-[Unreleased]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.6...HEAD
+[Unreleased]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.6...v0.2.0
 [0.1.6]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.4...v0.1.5
 [0.1.4]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.3...v0.1.4

config/jest-setup.ts

@@ -0,0 +1,4 @@
+import { configure } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+configure({ adapter: new Adapter() });