Brute force

.github/workflows/dhis2-verify-app.yml

@@ -21,7 +21,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v1
               with:
-                  node-version: 12.x
+                  node-version: 14.x
 
             - uses: actions/cache@v2
               id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
@@ -41,7 +41,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v1
               with:
-                  node-version: 12.x
+                  node-version: 14.x
 
             - uses: actions/cache@v2
               id: yarn-cache
@@ -68,7 +68,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v1
               with:
-                  node-version: 12.x
+                  node-version: 14.x
 
             - uses: actions/cache@v2
               id: yarn-cache
@@ -87,7 +87,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v1
               with:
-                  node-version: 12.x
+                  node-version: 14.x
 
             - uses: actions/cache@v2
               id: yarn-cache
@@ -109,7 +109,7 @@ jobs:
 
             - uses: actions/setup-node@v1
               with:
-                  node-version: 12.x
+                  node-version: 14.x
 
             - uses: actions/download-artifact@v2
               with:
@@ -135,7 +135,7 @@ jobs:
 
             - uses: actions/setup-node@v1
               with:
-                  node-version: 12.x
+                  node-version: 14.x
 
             - name: Publish release to GitHub
               run: npx @dhis2/cli-utils release

.gitignore

@@ -1,10 +1,12 @@
+.d2
+
 *.iml
 .idea/*
 .vscode/*
 
 node_modules*
 .sass-cache
-src/css/*
+src/css/**/*.scss
 coverage/*
 .nyc_output/
 

.jshintrc.bak

@@ -0,0 +1,10 @@
+{
+  "node": true,
+
+  "curly": true,
+  "latedef": true,
+  "quotmark": true,
+  "undef": true,
+  "unused": true,
+  "trailing": true
+}

d2.config.js

@@ -0,0 +1,14 @@
+const config = {
+    type: 'app',
+    name: 'maintenance',
+    title: 'DHIS2 Maintenance app',
+    description: '@TODO',
+    coreApp: true,
+    pwa: { enabled: false },
+
+    entryPoints: {
+        app: './src/app.js',
+    },
+}
+
+module.exports = config

jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    setupTestFrameworkScriptFile: '<rootDir>/config/setup.js',
+    setupFilesAfterEnv: ['<rootDir>/src/setup-tests.js'],
     collectCoverageFrom: ['src/**/*.js'],
     testPathIgnorePatterns: [
         '/node_modules/',

package.json

@@ -8,87 +8,108 @@
   },
   "license": "BSD-3-Clause",
   "scripts": {
-    "prestart": "d2-manifest package.json manifest.webapp",
-    "start": "webpack-dev-server",
+    "_prestart": "d2-manifest package.json manifest.webapp",
+    "_start": "webpack-dev-server",
+    "start": "concurrently 'yarn start:app' 'yarn wait-for-app && yarn copy-legacy-i18n'",
+    "copy-legacy-i18n": "rm -rf ./.d2/shell/public/i18n && cp -r ./i18n ./.d2/shell/public/",
+    "wait-for-app": "wait-on http-get://localhost:3000",
+    "prestart:app": "rm -rf .d2",
+    "start:app": "d2-app-scripts start --force",
     "coverage": "npm test -- --coverage",
-    "test": "jest",
+    "test": "d2-app-scripts test",
     "test:watch": "npm test -- --watch",
-    "prebuild": "rm -rf build",
-    "build": "npm test && NODE_ENV=production webpack --progress && npm run manifest",
-    "postbuild": "cp -r src/i18n icon.png package.json ./build/ && yarn copy-ckeditor",
+    "_prebuild": "rm -rf build",
+    "_build": "npm test && NODE_ENV=production webpack --progress && npm run manifest",
+    "build": "d2-app-scripts build",
     "validate": "npm ls --depth 0",
     "manifest": "d2-manifest package.json build/manifest.webapp",
     "lint": "eslint ./src",
-    "profile": "npm run start -- --profile",
-    "copy-ckeditor": "mkdir ./build/vendor && cp -r ./node_modules/ckeditor ./build/vendor"
+    "profile": "npm run start -- --profile"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
+    "@babel/cli": "^7.15.7",
+    "@babel/core": "^7.15.8",
+    "@babel/plugin-proposal-class-properties": "^7.14.5",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-modules-commonjs": "^7.15.4",
+    "@babel/plugin-transform-runtime": "^7.15.8",
+    "@babel/preset-env": "^7.15.8",
+    "@babel/preset-react": "^7.14.5",
     "babel-eslint": "^8.2.3",
     "babel-jest": "^23.0.1",
-    "babel-loader": "latest",
+    "babel-loader": "^8.2.2",
     "babel-plugin-dynamic-import-node": "^1.2.0",
+    "babel-plugin-react-require": "^3.1.3",
     "babel-plugin-transform-runtime": "^6.12.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-es2015": "^6.13.2",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-0": "^6.5.0",
     "classnames": "^2.2.3",
+    "concurrently": "^7.0.0",
     "css-loader": "^0.28.1",
     "d2-manifest": "^1.0.0-2",
     "d2-utilizr": "^0.2.9",
     "d3-color": "^1.0.2",
     "d3-format": "^1.0.2",
     "d3-scale": "^1.0.3",
-    "enzyme": "^3.0.0",
+    "enzyme": "^3.11.0",
     "enzyme-adapter-react-15": "^1.0.0",
-    "eslint": "^5.0.1",
-    "eslint-config-prettier": "^2.9.0",
-    "eslint-config-react-app": "^2.1.0",
-    "eslint-plugin-flowtype": "^2.49.3",
-    "eslint-plugin-import": "^2.13.0",
-    "eslint-plugin-jsx-a11y": "^5.0.1",
-    "eslint-plugin-react": "^7.10.0",
+    "enzyme-adapter-react-16": "^1.15.6",
+    "eslint-config-react-app": "^7.0.0",
+    "eslint-plugin-react": "^7.29.4",
     "fbjs": "^0.8.8",
     "file-loader": "2",
     "glob": "^7.1.1",
     "html-webpack-plugin": "^2.26.0",
     "ignore-styles": "^5.0.1",
-    "jest": "^23.0.1",
-    "jest-enzyme": "^4.0.0",
+    "jest-enzyme": "^7.1.2",
     "json-loader": "^0.5.4",
     "lodash.isfinite": "^3.3.1",
     "lodash.isnumber": "^3.0.3",
     "loglevel": "^1.4.0",
     "moment": "^2.16.0",
     "node-fetch": "^1.6.3",
     "node-pre-gyp": "^0.6.30",
-    "node-sass": "^4.13.1",
+    "node-sass": "^6.0.1",
     "precommit-hook": "^3.0.0",
     "prettier": "^1.13.7",
     "recompose": "^0.23.1",
     "redux-logger": "^3.0.6",
     "sass-loader": "^6.0.5",
     "style-loader": "^0.16.1",
+    "wait-on": "^6.0.1",
     "webpack": "^2.5.1",
     "webpack-bundle-analyzer": "^2.7.0",
     "webpack-dev-server": "^2.4.5",
     "webpack-visualizer-plugin": "^0.1.5"
   },
   "dependencies": {
-    "@dhis2/d2-ui-header-bar": "^1.1.4",
-    "@dhis2/d2-ui-sharing-dialog": "^1.0.12",
+    "@babel/runtime": "^7.15.4",
+    "@dhis2/app-runtime": "^3.4.0",
+    "@dhis2/app-runtime-adapter-d2": "^1.1.0",
+    "@dhis2/cli-app-scripts": "^9.0.0",
+    "@dhis2/d2-i18n": "^1.1.0",
+    "@dhis2/d2-ui-core": "^7.3.4",
+    "@dhis2/d2-ui-expression-manager": "^7.3.4",
+    "@dhis2/d2-ui-forms": "^7.3.4",
+    "@dhis2/d2-ui-group-editor": "^7.3.4",
+    "@dhis2/d2-ui-icon-picker": "^7.3.4",
+    "@dhis2/d2-ui-legend": "^7.3.4",
+    "@dhis2/d2-ui-org-unit-select": "^7.3.4",
+    "@dhis2/d2-ui-org-unit-tree": "^7.3.4",
+    "@dhis2/d2-ui-sharing-dialog": "^7.3.4",
+    "@dhis2/d2-ui-translation-dialog": "^7.3.4",
+    "@dhis2/prop-types": "^3.0.0",
+    "@dhis2/ui": "^8.1.6",
     "ckeditor": "4.6.1",
-    "d2": "30.2.2",
-    "d2-ui": "29.0.34",
+    "ckeditor4-react": "^3.0.0",
+    "create-react-class": "^15.7.0",
+    "d2": "^31.10.2",
     "lodash": "^4.17.11",
     "material-design-icons-iconfont": "^4.0.5",
-    "material-ui": "^0.17.0",
+    "material-ui": "0.20.0",
     "nyc": "10.1.2",
     "prop-types": "^15.6.0",
-    "react": "~15.5.0",
+    "react": "16.14.0",
     "react-addons-create-fragment": "^15.5.4",
     "react-addons-css-transition-group": "^15.3.1",
     "react-addons-linked-state-mixin": "^15.3.1",
@@ -98,18 +119,25 @@
     "react-color": "^2.11.7",
     "react-dnd": "^2.4.0",
     "react-dnd-html5-backend": "^2.4.1",
-    "react-dom": "~15.5.0",
+    "react-dom": "16.14.0",
     "react-loadable": "5.3",
     "react-redux": "^5.0.3",
     "react-router": "^3.0.0",
     "react-sortable-hoc": "^0.6.1",
     "react-speed-dial": "^0.4.7",
-    "react-tap-event-plugin": "2.0.1",
     "react-test-renderer": "15",
     "redux": "^3.6.0",
     "redux-observable": "0.18.0",
     "rxjs": "^5.2.0",
-    "typeface-roboto": "^0.0.54"
+    "typeface-roboto": "^0.0.54",
+    "use-debounce": "^7.0.1"
+  },
+  "resolutions": {
+    "@dhis2/app-runtime": "3.4.0",
+    "material-ui": "0.20.0",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
+    "react-error-overlay": "6.0.9"
   },
   "pre-commit": [
     "test"

scss/maintenance.scss

@@ -1,7 +1,3 @@
-// Component stylesheets from dependencies
-@import '../node_modules/d2-ui/lib/css/DataTable';
-@import '../node_modules/d2-ui/lib/css/Pagination';
-
 @import '../scss/List/DetailsBox';
 @import '../scss/List/List';
 @import '../scss/SqlView/SqlView';

src/App/AccessDenied.component.js

@@ -1,5 +1,4 @@
-import React from 'react';
-import Heading from 'd2-ui/lib/headings/Heading.component';
+import { Heading } from '@dhis2/d2-ui-core';
 
 export default function AccessDenied() {
     return (