feat(cli): plugin start script

dhis2 · Aug 23, 2022 · 9fea158 · 9fea158
1 parent 3f1b1f2
commit 9fea158
Show file tree

Hide file tree

Showing 8 changed files with 344 additions and 664 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -31,6 +31,7 @@
  "@dhis2/app-shell": "10.0.0",
  "@dhis2/cli-helpers-engine": "^3.2.0",
  "@jest/core": "^27.0.6",
+ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
  "@yarnpkg/lockfile": "^1.1.0",
  "archiver": "^3.1.1",
  "axios": "^0.25.0",
@@ -57,9 +58,11 @@
  "parse-author": "^2.0.0",
  "parse-gitignore": "^1.0.1",
  "react-dev-utils": "^12.0.0",
+ "react-refresh": "^0.11.0",
  "styled-jsx": "^4.0.1",
  "terser-webpack-plugin": "^5.3.1",
  "webpack": "^5.41.1",
+ "webpack-dev-server": "^4.7.4",
  "workbox-build": "^6.1.5"
  },
  "bin": {

diff --git a/cli/src/commands/start.js b/cli/src/commands/start.js
@@ -133,7 +133,7 @@ const handler = async ({
  const shellStartPromise = shell.start({ port: newPort })
 
  if (config.entryPoints.plugin) {
- const pluginPort = await detectPort(newPort)
+ const pluginPort = await detectPort(newPort + 1)
  reporter.print(
  `The plugin is now available on port ${pluginPort}`
  )
@@ -149,8 +149,10 @@ const handler = async ({
  },
  {
  name: 'start',
- onError: () =>
- reporter.error('Start script exited with non-zero exit code'),
+ onError: err => {
+ reporter.error(err)
+ reporter.error('Start script exited with non-zero exit code')
+ },
  }
  )
 }

diff --git a/cli/src/lib/plugin/build.js b/cli/src/lib/plugin/build.js
@@ -4,11 +4,12 @@
 process.env.BABEL_ENV = 'production'
 process.env.NODE_ENV = 'production'
 
+const { reporter } = require('@dhis2/cli-helpers-engine')
 const webpack = require('webpack')
 const webpackConfigFactory = require('./webpack.config')
 
 module.exports = async ({ paths }) => {
- console.log('Building plugin...')
+ reporter.debug('Building plugin...')
 
  const webpackConfig = webpackConfigFactory({ env: 'production', paths })
  const compiler = webpack(webpackConfig)
@@ -43,11 +44,11 @@ module.exports = async ({ paths }) => {
  return
  }
 
- /*if (stats.hasWarnings()) {
- console.warn(
- info.warnings.map(warning => warning.message).join('\n')
- )
- }*/
+ if (stats.hasWarnings()) {
+ for (const warning of info.warnings) {
+ reporter.warn(warning.message)
+ }
+ }
 
  resolve()
  })

diff --git a/cli/src/lib/plugin/index.js b/cli/src/lib/plugin/index.js
@@ -2,17 +2,6 @@ const build = require('./build')
 const start = require('./start')
 
 module.exports = ({ config, paths }) => ({
- // build: () => build({ config, paths }),
- // XXX
- build: async () => {
- try {
- await build({ config, paths })
- } catch (error) {
- console.log('\n\nerror building plugin:')
- console.error(error)
- console.log('\n')
- throw error
- }
- },
+ build: () => build({ config, paths }),
  start: ({ port }) => start({ port, config, paths }),
 })