From 64e27d1393fb587679c0f9d88310e950f8d92c73 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Mon, 29 Apr 2019 13:45:43 +0200 Subject: [PATCH] Publish data-visualizer-plugin with @dhis2 namespace - v32 (#278) --- packages/app/package.json | 3 ++- .../src/components/Visualization/Visualization.js | 2 +- .../Visualization/__tests__/Visualization.spec.js | 4 ++-- packages/plugin/package.json | 2 +- yarn.lock | 13 +++++++++++++ 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 55580a480f..b2d6791a82 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "32.0.2", "description": "DHIS2 Data Visualizer app", "license": "BSD-3-Clause", + "private": true, "homepage": ".", "devDependencies": { "@dhis2/d2-i18n-extract": "^1.0.6", @@ -29,6 +30,7 @@ "@dhis2/d2-ui-core": "5.3.8", "@dhis2/d2-ui-file-menu": "5.3.9", "@dhis2/d2-ui-interpretations": "5.2.10", + "@dhis2/data-visualizer-plugin": "^32.0.3", "@dhis2/ui": "^1.0.0-beta.11", "@material-ui/core": "^3.1.2", "@material-ui/icons": "^3.0.1", @@ -46,7 +48,6 @@ "d2": "31.2.1", "d2-charts-api": "32.0.5", "d2-manifest": "^1.0.0", - "data-visualizer-plugin": "32.0.3", "dotenv": "6.0.0", "dotenv-expand": "4.2.0", "eslint": "5.4.0", diff --git a/packages/app/src/components/Visualization/Visualization.js b/packages/app/src/components/Visualization/Visualization.js index 5f19311f4e..3fe03ca783 100644 --- a/packages/app/src/components/Visualization/Visualization.js +++ b/packages/app/src/components/Visualization/Visualization.js @@ -6,7 +6,7 @@ import i18n from '@dhis2/d2-i18n'; import debounce from 'lodash-es/debounce'; import styles from './styles/Visualization.style'; -import ChartPlugin from 'data-visualizer-plugin'; +import ChartPlugin from '@dhis2/data-visualizer-plugin'; import { sGetVisualization } from '../../reducers/visualization'; import { sGetCurrent } from '../../reducers/current'; diff --git a/packages/app/src/components/Visualization/__tests__/Visualization.spec.js b/packages/app/src/components/Visualization/__tests__/Visualization.spec.js index 9f84d5c263..6d0564f924 100644 --- a/packages/app/src/components/Visualization/__tests__/Visualization.spec.js +++ b/packages/app/src/components/Visualization/__tests__/Visualization.spec.js @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import ChartPlugin from 'data-visualizer-plugin'; +import ChartPlugin from '@dhis2/data-visualizer-plugin'; import { Visualization, chartConfigSelector, @@ -9,7 +9,7 @@ import { import BlankCanvas from '../BlankCanvas'; import * as validator from '../../../modules/layoutValidation'; -jest.mock('data-visualizer-plugin', () => () =>
); +jest.mock('@dhis2/data-visualizer-plugin', () => () =>
); describe('Visualization', () => { describe('component', () => { diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 4c21abc9a7..0f8dea2bb8 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -1,5 +1,5 @@ { - "name": "data-visualizer-plugin", + "name": "@dhis2/data-visualizer-plugin", "version": "32.0.3", "description": "DHIS2 Data Visualizer plugin", "main": "./build/index.js", diff --git a/yarn.lock b/yarn.lock index c7a42acf39..a2d5ab6452 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4307,6 +4307,19 @@ cypress@^3.1.1: url "0.11.0" yauzl "2.10.0" +d2-charts-api@32.0.1: + version "32.0.1" + resolved "https://registry.yarnpkg.com/d2-charts-api/-/d2-charts-api-32.0.1.tgz#f402a5352a08fe3281a437652afc2dc8fd7fd22e" + integrity sha512-s6VlDLCkcjNluOXwUp1csa/6ZaNDBtbu9RWmaa8kb5gPpc1BDovwx0lE34FPrEUIefF5JNpisl3fwlrLrH592Q== + dependencies: + d2-utilizr "0.2.13" + d3-color "1.0.1" + highcharts "^6.2.0" + highcharts-exporting "^0.1.7" + highcharts-more "^0.1.7" + highcharts-no-data-to-display "^0.1.7" + highcharts-solid-gauge "^0.1.7" + d2-charts-api@32.0.5: version "32.0.5" resolved "https://registry.yarnpkg.com/d2-charts-api/-/d2-charts-api-32.0.5.tgz#ff2f0dccdfc0f1ca0a60685ccb74ad87008002f4"