Merge branch 'master' into 36.x

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [35.20.18](https://github.com/dhis2/data-visualizer-app/compare/v35.20.17...v35.20.18) (2021-03-12)
+
+
+### Bug Fixes
+
+* upgrade analytics ([#1659](https://github.com/dhis2/data-visualizer-app/issues/1659)) ([34f989e](https://github.com/dhis2/data-visualizer-app/commit/34f989ec03cb598770f8ff1c64e83cb6a276c015))
+
+## [35.20.17](https://github.com/dhis2/data-visualizer-app/compare/v35.20.16...v35.20.17) (2021-03-11)
+
+
+### Bug Fixes
+
+* upgrade to @dhis2/cli-app-scripts@6 (DHIS2-9893) ([#1657](https://github.com/dhis2/data-visualizer-app/issues/1657)) ([0df0a93](https://github.com/dhis2/data-visualizer-app/commit/0df0a932680a26a943f0e36e85d9df29ff784a12))
+
+## [35.20.16](https://github.com/dhis2/data-visualizer-app/compare/v35.20.15...v35.20.16) (2021-03-11)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([7f35b01](https://github.com/dhis2/data-visualizer-app/commit/7f35b0177259008099a52bacfc08ae9974ca8774))
+
 ## [35.20.15](https://github.com/dhis2/data-visualizer-app/compare/v35.20.14...v35.20.15) (2021-03-09)
 
 

package.json

@@ -2,6 +2,10 @@
     "name": "data-visualizer",
     "description": "DHIS2 Data Visualizer",
     "private": true,
+    "version": "35.20.18",
+    "workspaces": [
+        "packages/*"
+    ],
     "license": "BSD-3-Clause",
     "devDependencies": {
         "@dhis2/cli-style": "^7.2.2",
@@ -29,12 +33,5 @@
         "cypress:start": "BROWSER=none yarn start",
         "cy:open": "d2-utils-cypress open --appStart 'yarn cypress:start'",
         "cy:run": "d2-utils-cypress run --appStart 'yarn cypress:start'"
-    },
-    "workspaces": [
-        "packages/*"
-    ],
-    "version": "35.20.15",
-    "resolutions": {
-        "@dhis2/ui": "^6.5.1"
     }
 }

packages/app/d2.config.js

@@ -1,10 +1,11 @@
 const config = {
     type: 'app',
+    name: 'data-visualizer',
     title: 'Data Visualizer',
     coreApp: true,
 
     entryPoints: {
-        app: './src/AppWrapper',
+        app: './src/AppWrapper.js',
     },
 }
 

packages/app/package.json

@@ -1,24 +1,24 @@
 {
     "name": "data-visualizer-app",
-    "version": "35.20.15",
+    "version": "35.20.18",
     "description": "DHIS2 Data Visualizer app",
     "license": "BSD-3-Clause",
     "private": true,
     "homepage": ".",
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "^5.5.0",
+        "@dhis2/cli-app-scripts": "^6.0.0",
         "@dhis2/cli-utils-cypress": "^4.0.0",
         "@dhis2/cypress-commands": "^5.0.0",
         "eslint-plugin-cypress": "^2.11.2",
         "redux-mock-store": "^1.5.4"
     },
     "dependencies": {
-        "@dhis2/analytics": "^16.0.11",
-        "@dhis2/app-runtime": "*",
-        "@dhis2/d2-i18n": "*",
+        "@dhis2/analytics": "^16.0.15",
+        "@dhis2/app-runtime": "^2.8.0",
+        "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-ui-interpretations": "^7.1.6",
-        "@dhis2/data-visualizer-plugin": "35.20.15",
-        "@dhis2/ui": "^6.5.1",
+        "@dhis2/data-visualizer-plugin": "35.20.18",
+        "@dhis2/ui": "^6.5.5",
         "@material-ui/icons": "^3.0.1",
         "d2": "^31.9.1",
         "history": "^4.7.2",

packages/app/src/actions/__tests__/index.spec.js

@@ -1,7 +1,6 @@
 import configureMockStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
 
-import * as analytics from '@dhis2/analytics'
 import * as fromActions from '../index'
 import * as api from '../../api/visualization'
 import * as history from '../../modules/history'
@@ -40,13 +39,16 @@ const digitGroupSeparator = 'COMMA'
 selectors.sGetRootOrgUnit = () => rootOrganisationUnit
 selectors.sGetRelativePeriod = () => relativePeriod
 selectors.sGetSettingsDigitGroupSeparator = () => digitGroupSeparator
-analytics.apiFetchOrganisationUnitLevels = () =>
-    Promise.resolve([
-        {
-            level: 2,
-            id: '2nd-floor',
-        },
-    ])
+jest.mock('@dhis2/analytics', () => ({
+    ...jest.requireActual('@dhis2/analytics'),
+    apiFetchOrganisationUnitLevels: () =>
+        Promise.resolve([
+            {
+                level: 2,
+                id: '2nd-floor',
+            },
+        ]),
+}))
 /* eslint-enable no-import-assign, import/namespace */
 
 jest.mock('../../modules/orgUnit', () => ({

packages/plugin/d2.config.js

@@ -2,7 +2,7 @@ const config = {
     type: 'lib',
 
     entryPoints: {
-        lib: './src/index',
+        lib: './src/index.js',
     },
 }
 

packages/plugin/package.json

@@ -1,17 +1,23 @@
 {
     "name": "@dhis2/data-visualizer-plugin",
-    "version": "35.20.15",
+    "version": "35.20.18",
     "description": "DHIS2 Data Visualizer plugin",
-    "main": "./build/cjs/lib.js",
-    "module": "./build/es/lib.js",
+    "main": "./build/cjs/index.js",
+    "module": "./build/es/index.js",
+    "exports": {
+        "import": "./build/es/index.js",
+        "require": "./build/cjs/index.js"
+    },
     "license": "BSD-3-Clause",
     "private": false,
     "publishConfig": {
         "access": "public"
     },
     "dependencies": {
-        "@dhis2/analytics": "^16.0.11",
-        "@dhis2/ui": "^6.5.1",
+        "@dhis2/analytics": "^16.0.15",
+        "@dhis2/app-runtime": "^2.8.0",
+        "@dhis2/d2-i18n": "^1.1.0",
+        "@dhis2/ui": "^6.5.5",
         "lodash-es": "^4.17.11"
     },
     "peerDependencies": {
@@ -20,7 +26,7 @@
         "react-dom": "^16.8"
     },
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "^5.5.0"
+        "@dhis2/cli-app-scripts": "^6.0.0"
     },
     "scripts": {
         "clean": "rm -rf ./build/*",