chore: fix linter issues

cli/src/commands/build.js

@@ -27,95 +27,95 @@ const handler = ({
  verify,
  pack: packAppOutput,
  verbose,
-}) => exitOnCatch(
- async () => {
- const paths = makePaths(cwd)
- const mode = determineBuildMode(modeArg, dev)
+}) =>
+ exitOnCatch(
+ async () => {
+ const paths = makePaths(cwd)
+ const mode = determineBuildMode(modeArg, dev)
 
- loadEnvFiles(paths, mode)
+  loadEnvFiles(paths, mode)
 
- reporter.print(chalk.green.bold('Build parameters:'))
- printBuildParam('Mode', mode)
+  reporter.print(chalk.green.bold('Build parameters:'))
+  printBuildParam('Mode', mode)
 
- const config = parseConfig(paths)
+  const config = parseConfig(paths)
 
- if (config.type === 'app') {
- setAppParameters(standalone, config)
- }
-
- await fs.remove(paths.buildOutput)
- await exitWhenPackageInvalid(config, paths, verify)
-
- reporter.info('Generating internationalization strings...')
- await i18n.extractAndGenerate(paths)
-
- reporter.info(
- `Building ${config.type} ${chalk.bold(config.name)}...`
- )
-
- if (config.type === 'app') {
- // Manifest generation moved here so these static assets can be
- // precached by Workbox during the shell build step
- reporter.info('Generating manifests...')
- await generateManifests(paths, config, process.env.PUBLIC_URL)
-
- // @TODO: Figure out how to do this
- // const { injectPrecacheManifest } = require('../lib/pwa')
- // if (config.pwa.enabled) {
- // reporter.info('Injecting precache manifest...')
- // await injectPrecacheManifest(paths, config)
- // }
-
- reporter.info('Ensuring that a build folder exists')
- fs.ensureDirSync(paths.buildOutput)
-
- // CRA Manages service worker compilation here
- reporter.info('Creating a production build...')
- await craBuild({ config, verbose, cwd })
-
- if (!fs.pathExistsSync(paths.buildAppOutput)) {
- reporter.error('No build output found')
- process.exit(1)
+ if (config.type === 'app') {
+ setAppParameters(standalone, config)
  }
 
- if (packAppOutput) {
- const bundle = path.parse(paths.buildAppBundle)
-
- await fs.remove(paths.buildAppBundleOutput)
-
- // update bundle archive
- await pack({
- destination: path.resolve(cwd, bundle.dir),
- filename: bundle.base,
- })
+ await fs.remove(paths.buildOutput)
+ await exitWhenPackageInvalid(config, paths, verify)
+
+ reporter.info('Generating internationalization strings...')
+ await i18n.extractAndGenerate(paths)
+
+ reporter.info(
+ `Building ${config.type} ${chalk.bold(config.name)}...`
+ )
+
+ if (config.type === 'app') {
+ // Manifest generation moved here so these static assets can be
+ // precached by Workbox during the shell build step
+ reporter.info('Generating manifests...')
+ await generateManifests(paths, config, process.env.PUBLIC_URL)
+
+ // @TODO: Figure out how to do this
+ // const { injectPrecacheManifest } = require('../lib/pwa')
+ // if (config.pwa.enabled) {
+ // reporter.info('Injecting precache manifest...')
+ // await injectPrecacheManifest(paths, config)
+ // }
+
+ reporter.info('Ensuring that a build folder exists')
+ fs.ensureDirSync(paths.buildOutput)
+
+ // CRA Manages service worker compilation here
+ reporter.info('Creating a production build...')
+ await craBuild({ config, verbose, cwd })
+
+ if (!fs.pathExistsSync(paths.buildAppOutput)) {
+ reporter.error('No build output found')
+ process.exit(1)
+ }
+
+ if (packAppOutput) {
+ const bundle = path.parse(paths.buildAppBundle)
+
+ await fs.remove(paths.buildAppBundleOutput)
+
+ // update bundle archive
+ await pack({
+ destination: path.resolve(cwd, bundle.dir),
+ filename: bundle.base,
+ })
+ }
+
+ reporter.print(chalk.green('\n**** DONE! ****'))
+ } else {
+ await Promise.all([
+ compile({
+ config,
+ paths,
+ moduleType: 'es',
+ mode,
+ watch,
+ }),
+ compile({
+ config,
+ paths,
+ moduleType: 'cjs',
+ mode,
+ watch,
+ }),
+ ])
  }
-
- reporter.print(chalk.green('\n**** DONE! ****'))
- } else {
- await Promise.all([
- compile({
- config,
- paths,
- moduleType: 'es',
- mode,
- watch,
- }),
- compile({
- config,
- paths,
- moduleType: 'cjs',
- mode,
- watch,
- }),
- ])
+ },
+ {
+ name: 'build',
+ onError: () => reporter.error('Build script failed'),
  }
- },
- {
- name: 'build',
- onError: () => reporter.error('Build script failed'),
- }
-)
-
+ )
 
 const command = {
  aliases: 'b',

cli/src/commands/init.js

@@ -1,10 +1,7 @@
 const { initApp, initLibrary } = require('../lib/index.js')
 
-const handler = async options => await (
- options.lib
- ? initLibrary(options)
- : initApp(options)
-)
+const handler = async options =>
+ await (options.lib ? initLibrary(options) : initApp(options))
 
 const command = {
  command: 'init <name>',

cli/src/commands/start.js

@@ -21,60 +21,60 @@ const handler = ({
  proxy,
  proxyPort,
  verbose,
-}) => exitOnCatch(
- async () => {
- const mode = 'development'
- const paths = makePaths(cwd)
+}) =>
+ exitOnCatch(
+ async () => {
+ const mode = 'development'
+ const paths = makePaths(cwd)
 
- loadEnvFiles(paths, mode)
+  loadEnvFiles(paths, mode)
 
- const config = parseConfig(paths)
+  const config = parseConfig(paths)
 
- verifyIsApp(config)
+  verifyIsApp(config)
 
- const appPort = await detectPort(port)
+  const appPort = await detectPort(port)
 
- await createLocalProxyServer({ proxy, proxyPort, appPort })
- await notifyWhenPackageInvalid(config, paths)
+  await createLocalProxyServer({ proxy, proxyPort, appPort })
+  await notifyWhenPackageInvalid(config, paths)
 
- reporter.info('Generating internationalization strings...')
- await i18n.extractAndGenerate(paths)
+  reporter.info('Generating internationalization strings...')
+  await i18n.extractAndGenerate(paths)
 
- // Manifests added here so app has access to manifest.json for pwa
- reporter.info('Generating manifests...')
- await generateManifests(paths, config, process.env.PUBLIC_URL)
+  // Manifests added here so app has access to manifest.json for pwa
+  reporter.info('Generating manifests...')
+  await generateManifests(paths, config, process.env.PUBLIC_URL)
 
- if (String(appPort) !== String(port)) {
- reporter.print('')
- reporter.warn(
- `Something is already running on port ${port}, using ${appPort} instead.`
- )
- }
+  if (String(appPort) !== String(port)) {
+  reporter.print('')
+  reporter.warn(
+  `Something is already running on port ${port}, using ${appPort} instead.`
+  )
+  }
 
- // @TODO: Figure out how to do this properly
- // const { compileServiceWorker } = require('../lib/pwa')
- // if (config.pwa.enabled) {
- // reporter.info('Compiling service worker...')
- // await compileServiceWorker({
- // config,
- // paths,
- // mode: 'development',
- // })
- // }
+  // @TODO: Figure out how to do this properly
+  // const { compileServiceWorker } = require('../lib/pwa')
+  // if (config.pwa.enabled) {
+  // reporter.info('Compiling service worker...')
+  // await compileServiceWorker({
+  // config,
+  // paths,
+  // mode: 'development',
+  // })
+  // }
 
- try {
- await craStart({ port, cwd: paths.base, config, verbose })
- } catch (code) {
- process.exit(code)
+ try {
+ await craStart({ port, cwd: paths.base, config, verbose })
+ } catch (code) {
+ process.exit(code)
+ }
+ },
+ {
+ name: 'start',
+ onError: () =>
+ reporter.error('Start script exited with non-zero exit code'),
  }
- },
- {
- name: 'start',
- onError: () =>
- reporter.error('Start script exited with non-zero exit code'),
- }
-)
-
+ )
 
 const command = {
  command: 'start',

cli/src/commands/test.js

@@ -13,14 +13,11 @@ const handler = async ({ cwd }) => {
 
  reporter.info('Running tests...')
 
- await exitOnCatch(
- async () => await craTest({ cwd, testArgs }),
- {
- name: 'test',
- onError: () =>
- reporter.error('Test script exited with non-zero exit code'),
- }
- )
+ await exitOnCatch(async () => await craTest({ cwd, testArgs }), {
+ name: 'test',
+ onError: () =>
+ reporter.error('Test script exited with non-zero exit code'),
+ })
 }
 
 const command = {

cli/src/lib/init/init-app.js

@@ -6,7 +6,9 @@ const { craInit } = require('../shell')
 // See https://github.com/facebook/create-react-app/issues/9849
 function addMissingFieldsToPackageJson(appFolder) {
  const packageJsonPath = path.join(appFolder, 'package.json')
- const packageJsonRaw = fs.readFileSync(packageJsonPath, { encoding: 'utf8' })
+ const packageJsonRaw = fs.readFileSync(packageJsonPath, {
+ encoding: 'utf8',
+ })
  const packageJsonContents = JSON.parse(packageJsonRaw)
  const packageJsonPatched = {
  ...packageJsonContents,
@@ -24,11 +26,7 @@ function addMissingFieldsToPackageJson(appFolder) {
  fs.writeFileSync(packageJsonPath, packageJsonPatchedString)
 }
 
-module.exports = async function initApp({
- cwd: cwdArg,
- verbose,
- name,
-}) {
+module.exports = async function initApp({ cwd: cwdArg, verbose, name }) {
  const cwd = cwdArg || process.cwd()
  const appFolder = path.join(cwd, name)
 
@@ -41,5 +39,4 @@ module.exports = async function initApp({
  reporter.info(
  `Successfully created the dhis2 app. You can now navigate to \`${appFolder}\` and run \`yarn start\``
  )
-
 }

cli/src/lib/init/init-library.js

@@ -81,10 +81,7 @@ module.exports = async function initLibrary({ force, name, cwdArg }) {
  )
  } else {
  reporter.info('Importing d2.config.js defaults')
- fs.copyFileSync(
- paths.configDefaultsLib,
- paths.config
- )
+ fs.copyFileSync(paths.configDefaultsLib, paths.config)
  }
 
  if (!fs.existsSync(paths.package)) {

cli/src/lib/paths.js

@@ -2,9 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const { reporter } = require('@dhis2/cli-helpers-engine')
 
-const shellSource = path.dirname(
- require.resolve('@dhis2/app-shell')
-)
+const shellSource = path.dirname(require.resolve('@dhis2/app-shell'))
 const shellAppDirname = 'src/D2App'
 
 const findYarnLock = base => {