chore(deps): update cli deps to latest major

dhis2 · Jun 14, 2021 · 85bcfa7 · 85bcfa7
1 parent 5900a39
commit 85bcfa7
Show file tree

Hide file tree

Showing 10 changed files with 488 additions and 192 deletions.
diff --git a/.hooks/.gitignore b/.hooks/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/.hooks/commit-msg b/.hooks/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn d2-style check commit "$1"
diff --git a/.hooks/pre-commit b/.hooks/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn d2-style check --staged
diff --git a/.huskyrc.js b/.huskyrc.js
diff --git a/cli/config/jest.config.js b/cli/config/jest.config.js
@@ -5,9 +5,8 @@ module.exports = {
     },
     moduleNameMapper: {
         '\\.(css|less)$': require.resolve('./jest.identity.mock.js'),
-        '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': require.resolve(
-            './jest.file.mock.js'
-        ),
+        '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
+            require.resolve('./jest.file.mock.js'),
         '^styled-jsx/(css|macro)$': require.resolve(
             './jest.styled-jsx-css.mock.js'
         ),

diff --git a/cli/package.json b/cli/package.json
@@ -29,7 +29,7 @@
         "@babel/preset-react": "^7.0.0",
         "@babel/preset-typescript": "^7.6.0",
         "@dhis2/app-shell": "6.2.0",
-        "@dhis2/cli-helpers-engine": "^2.1.1",
+        "@dhis2/cli-helpers-engine": "^3.0.0",
         "archiver": "^3.1.1",
         "axios": "^0.20.0",
         "babel-jest": "^24.9.0",

diff --git a/cli/src/commands/start.js b/cli/src/commands/start.js
@@ -101,8 +101,7 @@ const handler = async ({
 const command = {
     command: 'start',
     aliases: 's',
-    desc:
-        'Start a development server running a DHIS2 app within the DHIS2 app-shell',
+    desc: 'Start a development server running a DHIS2 app within the DHIS2 app-shell',
     builder: {
         port: {
             alias: 'p',

diff --git a/examples/simple-app/src/App.js b/examples/simple-app/src/App.js
@@ -23,9 +23,8 @@ const Component = () => {
                     <h1>{i18n.t('Hello {{name}}', { name: data.me.name })}</h1>
                     <h3>
                         {i18n.t('Have a great {{dayOfTheWeek}}!', {
-                            dayOfTheWeek: moment.weekdays(true)[
-                                moment().weekday()
-                            ],
+                            dayOfTheWeek:
+                                moment.weekdays(true)[moment().weekday()],
                         })}
                     </h3>
                     <Alerter />

diff --git a/package.json b/package.json
@@ -15,13 +15,13 @@
         ]
     },
     "devDependencies": {
-        "@dhis2/cli-style": "^7.3.0",
-        "@dhis2/cli-utils-docsite": "^2.0.2",
+        "@dhis2/cli-style": "^9.0.0",
+        "@dhis2/cli-utils-docsite": "^3.0.0",
         "concurrently": "^6.0.0"
     },
     "scripts": {
-        "format": "d2-style js apply && d2-style text apply",
-        "lint": "d2-style js check && d2-style text check",
+        "format": "d2-style apply",
+        "lint": "d2-style check",
         "build": "yarn build:adapter && yarn build:example",
         "build:adapter": "yarn workspace @dhis2/app-adapter build",
         "build:example": "yarn workspace simple-app build",