Skip to content

Commit

Permalink
Publish data-visualizer-plugin with @dhis2 namespace (#279)
Browse files Browse the repository at this point in the history
Set the version to 33.0.0 so it doesn't clash with the version on the v32 branch.
  • Loading branch information
jenniferarnesen committed Apr 29, 2019
1 parent 93f71ab commit 08de917
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 6 deletions.
3 changes: 2 additions & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/components/Visualization/Visualization.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -9,7 +9,7 @@ import {
import BlankCanvas from '../BlankCanvas';
import * as validator from '../../../modules/layoutValidation';

jest.mock('data-visualizer-plugin', () => () => <div />);
jest.mock('@dhis2/data-visualizer-plugin', () => () => <div />);

describe('Visualization', () => {
describe('component', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "data-visualizer-plugin",
"version": "32.0.3",
"name": "@dhis2/data-visualizer-plugin",
"version": "33.0.0",
"description": "DHIS2 Data Visualizer plugin",
"main": "./build/index.js",
"license": "BSD-3-Clause",
Expand Down
24 changes: 24 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,17 @@
recompose "^0.26.0"
rxjs "^5.5.7"

"@dhis2/data-visualizer-plugin@^32.0.3":
version "32.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-32.0.3.tgz#70552cb7b4f3240d4eebb14f685788b49dd5d145"
integrity sha512-1aFTOz7KiCcEmyZNGJDjpdbIW2kUrQTXPTCGjHXFF8EorTXBPf4Avw+rEKajGuhlJ9f1+gCGr21BP6rQOgZOUA==
dependencies:
"@material-ui/core" "^3.1.2"
d2-charts-api "32.0.1"
lodash-es "^4.17.11"
react "^16.6.0"
react-dom "^16.6.0"

"@dhis2/ui@^1.0.0-beta.11":
version "1.0.0-beta.15"
resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-1.0.0-beta.15.tgz#3dc7484174f1db686dd6f10cbad8271d84f3a0b9"
Expand Down Expand Up @@ -4307,6 +4318,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"
Expand Down

0 comments on commit 08de917

Please sign in to comment.