Skip to content

Commit

Permalink
chore: remove node 10 support (#567)
Browse files Browse the repository at this point in the history
* chore: remove node 10 support

BREAKING CHANGE: New minimum version for NodeJS is 12.x.

* chore(deps): update cli deps to latest major
  • Loading branch information
varl authored Jun 14, 2021
2 parents c2107c3 + 85bcfa7 commit cbee9cb
Show file tree
Hide file tree
Showing 10 changed files with 489 additions and 193 deletions.
1 change: 1 addition & 0 deletions .hooks/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .hooks/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn d2-style check commit "$1"
4 changes: 4 additions & 0 deletions .hooks/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn d2-style check --staged
14 changes: 0 additions & 14 deletions .huskyrc.js

This file was deleted.

5 changes: 2 additions & 3 deletions cli/config/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
),
Expand Down
4 changes: 2 additions & 2 deletions cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@dhis2/cli-app-scripts",
"version": "6.2.0",
"engines": {
"node": ">=10"
"node": ">=12"
},
"repository": {
"type": "git",
Expand All @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions cli/src/commands/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 2 additions & 3 deletions examples/simple-app/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit cbee9cb

Please sign in to comment.