Skip to content

Commit

Permalink
fix: upgrade @dhis2/cli-helpers-engine to 1.5.0 (#176)
Browse files Browse the repository at this point in the history
  • Loading branch information
amcgee authored Nov 22, 2019
1 parent 71ee81d commit 83e8a92
Show file tree
Hide file tree
Showing 15 changed files with 478 additions and 140 deletions.
3 changes: 1 addition & 2 deletions cli/config/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// rollup.config.js
const path = require('path')

const chalk = require('chalk')
const resolve = require('rollup-plugin-node-resolve')
const babel = require('rollup-plugin-babel')
const commonjs = require('rollup-plugin-commonjs')
Expand All @@ -10,7 +9,7 @@ const postcss = require('rollup-plugin-postcss')
const replace = require('rollup-plugin-replace')
const visualize = require('rollup-plugin-visualizer')

const { reporter } = require('@dhis2/cli-helpers-engine')
const { reporter, chalk } = require('@dhis2/cli-helpers-engine')

const standardLibs = require('./standard-libs.json')

Expand Down
3 changes: 1 addition & 2 deletions cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.6.0",
"@dhis2/app-runtime": "^2.0.4",
"@dhis2/cli-helpers-engine": "^1.4.2",
"@dhis2/cli-helpers-engine": "^1.5.0",
"@dhis2/d2-i18n": "^1.0.5",
"@dhis2/ui-core": "^3.11.0",
"archiver": "^3.1.1",
"babel-jest": "^24.9.0",
"chalk": "^3.0.0",
"classnames": "^2.2.6",
"detect-port": "^1.3.0",
"dotenv": "^8.1.0",
Expand Down
3 changes: 1 addition & 2 deletions cli/src/commands/build.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const { reporter } = require('@dhis2/cli-helpers-engine')
const { reporter, chalk } = require('@dhis2/cli-helpers-engine')

const fs = require('fs-extra')
const chalk = require('chalk')
const path = require('path')

const i18n = require('../lib/i18n')
Expand Down
3 changes: 1 addition & 2 deletions cli/src/commands/init.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const { reporter, exec } = require('@dhis2/cli-helpers-engine')
const { reporter, chalk, exec } = require('@dhis2/cli-helpers-engine')
const path = require('path')
const fs = require('fs-extra')
const chalk = require('chalk')
const gitignore = require('parse-gitignore')

const makePaths = require('../lib/paths')
Expand Down
3 changes: 1 addition & 2 deletions cli/src/commands/start.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const { reporter } = require('@dhis2/cli-helpers-engine')
const chalk = require('chalk')
const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
const detectPort = require('detect-port')

const i18n = require('../lib/i18n')
Expand Down
3 changes: 1 addition & 2 deletions cli/src/lib/bundleApp.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
const fs = require('fs-extra')
const chalk = require('chalk')
const path = require('path')
const archiver = require('archiver')
const { reporter } = require('@dhis2/cli-helpers-engine')
const { reporter, chalk } = require('@dhis2/cli-helpers-engine')

module.exports = (inDir, outFile) => {
return new Promise((resolve, reject) => {
Expand Down
3 changes: 1 addition & 2 deletions cli/src/lib/compile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const { reporter } = require('@dhis2/cli-helpers-engine')
const { reporter, chalk } = require('@dhis2/cli-helpers-engine')

const chalk = require('chalk')
const path = require('path')
const fs = require('fs-extra')
const rollup = require('rollup')
Expand Down
3 changes: 1 addition & 2 deletions cli/src/lib/i18n/extract.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
const fs = require('fs-extra')
const path = require('path')
const chalk = require('chalk')
const {
ensureDirectoryExists,
walkDirectory,
arrayEqual,
} = require('./helpers')
const { reporter } = require('@dhis2/cli-helpers-engine')
const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
const scanner = require('i18next-scanner')
const { i18nextToPot, gettextToI18next } = require('i18next-conv')

Expand Down
3 changes: 1 addition & 2 deletions cli/src/lib/i18n/helpers.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const { reporter } = require('@dhis2/cli-helpers-engine')
const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
const fs = require('fs-extra')
const path = require('path')
const chalk = require('chalk')

const supportedExtensions = ['.js', '.jsx', '.ts', '.tsx']

Expand Down
3 changes: 1 addition & 2 deletions cli/src/lib/parseConfig.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const { reporter } = require('@dhis2/cli-helpers-engine')
const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
const { defaultsDeep, has, isPlainObject } = require('lodash')
const fs = require('fs-extra')
const chalk = require('chalk')
const parseAuthorString = require('parse-author')

const requiredConfigFields = {
Expand Down
3 changes: 1 addition & 2 deletions cli/src/lib/shell/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const fs = require('fs-extra')
const path = require('path')
const chalk = require('chalk')
const { reporter, exec } = require('@dhis2/cli-helpers-engine')
const { reporter, chalk, exec } = require('@dhis2/cli-helpers-engine')

const bootstrapShell = async (paths, { shell, force = false } = {}) => {
const source = shell ? path.resolve(shell) : paths.shellSource,
Expand Down
Loading

0 comments on commit 83e8a92

Please sign in to comment.