feat: use webpack to build html template

Fixes #3544

Author: myan9

bin/watch-webpack.sh

@@ -14,9 +14,6 @@ export CLIENT=${CLIENT-default}
 CLIENT_DEFN_PLUGIN=`cat clients/"$CLIENT"/package.json | jq --raw-output .kui.client`
 THEME=$(cd node_modules/@kui-shell/client && pwd)
 
-# rebuild the html in case the user has changed CLIENT
-npm run build:html
-
 # rebuild the node-pty native code, in case the user is switching from
 # electron to webpack (each of which may use a different node ABI)
 if [ "$TARGET" = "electron-renderer" ]; then
@@ -51,10 +48,6 @@ mkdir -p clients/$CLIENT/$TARGETDIR/css
      for i in "$THEME"/css/*; do ln -sf $i; done \
     )
 
-# link in any config.json settings that the CLIENT definition may specify
-(cd node_modules/@kui-shell/settings && \
-     rm -f config-dev.json; if [ -f "$THEME"/config.d/config.json ]; then echo "linking config-dev.json"; cp "$THEME"/config.d/config.json config-dev.json; fi)
-
 # display extra build progress?
 if [ -z "$TRAVIS_JOB_ID" ]; then
     PROGRESS="--progress"

package.json

@@ -13,7 +13,7 @@
     "test3": "PORT_OFFSET=2 npm run testv2",
     "test4": "PORT_OFFSET=3 npm run testv2",
     "kill": "kill $(lsof -t -i:908${PORT_OFFSET-0}) > /dev/null 2> /dev/null || true",
-    "watch:webpack": "npm run compile:prescan && npm run kill; ./bin/watch-webpack.sh",
+    "watch:webpack": "npm run compile:prescan && npm run link && npm run kill; ./bin/watch-webpack.sh",
     "watch:electron": "TARGET=electron-renderer npm run watch:webpack",
     "proxy": "npm run pty:nodejs && cd packages/proxy/app && npm install && PORT=8081 KUI_USE_HTTP=true ../../../tools/travis/proxy.sh ..",
     "watch": "tsc --build . --watch",
@@ -32,8 +32,8 @@
     "pty:rebuild": "kui-pty-rebuild",
     "pty:electron": "npm run pty:rebuild electron",
     "pty:nodejs": "npm run pty:rebuild node",
-    "build:html": "CLIENT=${CLIENT-default}; rm -f node_modules/@kui-shell/settings/config-dev.json; npm run pty:electron && CLIENT_HOME=\"$(cd ./clients/$CLIENT && pwd)\" node packages/builder/lib/configure.js && CLIENT_HOME=\"$(cd ./clients/$CLIENT && pwd)\" ./packages/builder/dist/dev/build.sh && CLIENT_HOME=\"$(cd ./clients/$CLIENT && pwd)\" ./packages/builder/bin/seticon.js",
-    "postinstall": "npm run build:html && npm run compile",
+    "link": "CLIENT=${CLIENT-default}; CLIENT_HOME=\"$(cd ./clients/$CLIENT && pwd)\" ./packages/builder/dist/dev/build.sh; CLIENT=${CLIENT-default}; CLIENT_HOME=\"$(cd ./clients/$CLIENT && pwd)\" ./packages/builder/bin/seticon.js",
+    "postinstall": "npm run compile",
     "open": "electron . shell",
     "start": "npm run watch:electron && npm run open"
   },

packages/builder/bin/compile.sh

@@ -51,8 +51,9 @@ else
   npx tsc -b ${1-.}
 fi
 
-# initialize the html bits
-CLIENT_HOME="$CLIENT_HOME" KUI_STAGE="$CLIENT_HOME" node node_modules/@kui-shell/builder/lib/configure.js
+if [ ! -d node_modules/@kui-shell/build ]; then
+  mkdir -p node_modules/@kui-shell/build
+fi
 
 # link in the theme bits
 (cd node_modules/@kui-shell/build && rm -rf css && mkdir css && cd css && for i in ../../../../node_modules/@kui-shell/core/web/css/*; do ln -sf $i; done && for i in ../../client/css/*; do ln -sf $i; done)

packages/builder/bin/seticon.sh

@@ -18,7 +18,6 @@
 
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 TOPDIR="${SCRIPTDIR}/../../.."
-CONFDIR="$TOPDIR"/node_modules/@kui-shell/settings
 THEME="${TOPDIR}"/node_modules/@kui-shell/client
 
 echo "Using CLIENT_HOME=$CLIENT_HOME"

packages/builder/dist/dev/build.sh

@@ -21,6 +21,10 @@ TOPDIR="${SCRIPTDIR}/../../../.."
 STAGING="${TOPDIR}"/node_modules/@kui-shell/build
 THEME="${TOPDIR}"/node_modules/@kui-shell/client
 
+if [ ! -d "$STAGING" ]; then
+  mkdir -p "$STAGING"
+fi
+
 (cd "$STAGING" && rm -f css && ln -s "$TOPDIR"/packages/core/web/css)
 
 if [ -d "$THEME"/icons ]; then

packages/builder/dist/electron/build.sh

@@ -112,7 +112,6 @@ function tarCopy {
 
 # TODO share this with headless/build.sh, as they are identical
 function configure {
-    CLIENT_HOME="$CLIENT_HOME" KUI_STAGE="$STAGING" node "$BUILDER_HOME"/lib/configure.js
     UGLIFY=true npx --no-install kui-prescan
 }
 

packages/builder/dist/headless/build.sh

@@ -157,7 +157,6 @@ function tarCopy {
 
 function configure {
     UGLIFY=true npx --no-install kui-prescan
-    CLIENT_HOME=$CLIENT_HOME KUI_STAGE="$STAGING"/kui node "$BUILDER_HOME"/lib/configure.js
     echo "nothing to do"
 }