feat(cli): add webpack config for JS and CSS

dhis2 · Aug 23, 2022 · a04b7c6 · a04b7c6
1 parent cec6339
commit a04b7c6
Show file tree

Hide file tree

Showing 8 changed files with 1,018 additions and 479 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -35,6 +35,7 @@
  "archiver": "^3.1.1",
  "axios": "^0.25.0",
  "babel-jest": "^27.0.6",
+ "babel-loader": "^8.1.0",
  "babel-plugin-react-require": "^3.1.3",
  "chokidar": "^3.3.0",
  "detect-port": "^1.3.0",
@@ -49,9 +50,11 @@
  "i18next-scanner": "^2.10.3",
  "inquirer": "^7.3.3",
  "lodash": "^4.17.11",
+ "mini-css-extract-plugin": "^2.5.3",
  "node-http-proxy-json": "^0.1.9",
  "parse-author": "^2.0.0",
  "parse-gitignore": "^1.0.1",
+ "react-dev-utils": "^12.0.0",
  "styled-jsx": "^4.0.1",
  "webpack": "^5.41.1",
  "workbox-build": "^6.1.5"

diff --git a/cli/src/lib/paths.js b/cli/src/lib/paths.js
@@ -63,7 +63,7 @@ module.exports = (cwd = process.cwd()) => {
  shellApp: path.join(base, `./.d2/shell/${shellAppDirname}`),
  shellPluginBundleEntrypoint: path.join(
  base,
- './.d2/shell/src/plugin.js'
+ './.d2/shell/src/plugin.index.js'
  ),
  shellPluginEntrypoint: path.join(base, './.d2/shell/src/Plugin.js'),
  shellSrcServiceWorker: path.join(

diff --git a/cli/src/lib/plugin/build.js b/cli/src/lib/plugin/build.js
@@ -43,11 +43,11 @@ module.exports = async ({ paths }) => {
  return
  }
 
- if (stats.hasWarnings()) {
- console.warn(info.warnings)
- reject(new Error(info.warnings))
- return
- }
+ /*if (stats.hasWarnings()) {
+ console.warn(
+  info.warnings.map(warning => warning.message).join('\n')
+ )
+ }*/
 
  resolve()
  })

diff --git a/cli/src/lib/plugin/index.js b/cli/src/lib/plugin/index.js
@@ -3,6 +3,7 @@ const start = require('./start')
 
 module.exports = ({ config, paths }) => ({
  // build: () => build({ config, paths }),
+ // XXX
  build: async () => {
  try {
  await build({ config, paths })

diff --git a/cli/src/lib/plugin/old.webpack.config.js b/cli/src/lib/plugin/old.webpack.config.js
diff --git a/cli/src/lib/plugin/webpack.config.js b/cli/src/lib/plugin/webpack.config.js
diff --git a/shell/src/plugin.js → shell/src/plugin.index.js b/shell/src/plugin.js → shell/src/plugin.index.js
@@ -3,7 +3,7 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import Plugin from './Plugin'
 import 'typeface-roboto'
-import './index.css'
+// import './index.css'
 
 ReactDOM.render(
  <>

diff --git a/yarn.lock b/yarn.lock