Skip to content

Commit 3cbaf88

Browse files
starpitstarpit
committed
chore: avoid directly invoking madwizard nodejs code
Instead, we can go through the normal kui code paths, which puts us in control of bundling decisions, and also gives us the opportunity to use kui commands to handle e.g. popping up windows
1 parent c72401f commit 3cbaf88

File tree

5 files changed

+27
-25
lines changed

5 files changed

+27
-25
lines changed

‎bin/codeflare

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,14 @@ if [ "$do_cli" = "1" ]; then
125125
# launch headless version; here, we use madwizard directly, but
126126
# using electron as the nodejs binary (this is what
127127
# ELECTRON_RUN_AS_NODE does for us)
128+
export KUI_HEADLESS=true
129+
export KUI_S3=false
128130
export ELECTRON_RUN_AS_NODE=true
129-
export MWSTORE="$GUIDEBOOK_STORE"
130-
exec "$NODE" \
131-
--experimental-specifier-resolution=node --no-warnings --experimental-import-meta-resolve \
132-
"$HEADLESS"/../../node_modules/madwizard/bin/madwizard.js \
133-
$*
131+
# export MWSTORE="$GUIDEBOOK_STORE"
132+
# exec "$NODE" \
133+
# --experimental-specifier-resolution=node --no-warnings --experimental-import-meta-resolve \
134+
# "$HEADLESS"/../../node_modules/madwizard/bin/madwizard.js \
135+
# $*
134136
else
135137
# tell the command handlers to run in UI mode
136138
EXTRAPREFIX="$EXTRAPREFIX -u"
@@ -159,4 +161,5 @@ if [ ! -f ~/.codeflare ] && [ $(uname) = Linux ]; then
159161
fi
160162

161163
# otherwise, we launch the UI version
162-
exec "$NODE" "$HEADLESS"/codeflare.min.js -- $EXTRAPREFIX $* 3>&1 1>&2 2>&3 3>&- | grep -v WebSwapCGLLayer
164+
"$NODE" "$HEADLESS"/codeflare.min.js -- $EXTRAPREFIX $*
165+
stty sane

‎mw-node-modules.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"pty:electron": "npm run pty:rebuild electron",
1919
"pty:nodejs": "npm run pty:rebuild node",
2020
"preprod": "npm run mirror",
21-
"build:electron:mac:amd64": "npm run preprod && KUI_KEEP_NODE_MODULE=\"$(cat mw-node-modules.txt)\" KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=mac ARCH=x64 kui-build-electron",
22-
"build:electron:mac:arm64": "npm run preprod && KUI_KEEP_NODE_MODULE=\"$(cat mw-node-modules.txt)\" KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=mac ARCH=arm64 kui-build-electron",
23-
"build:electron:osx:amd64": "npm run preprod && KUI_KEEP_NODE_MODULE=\"$(cat mw-node-modules.txt)\" KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare npm run build:electron:mac:amd64",
24-
"build:electron:osx:arm64": "npm run preprod && KUI_KEEP_NODE_MODULE=\"$(cat mw-node-modules.txt)\" KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare npm run build:electron:mac:arm64",
25-
"build:electron:linux:amd64": "npm run preprod && KUI_KEEP_NODE_MODULE=\"$(cat mw-node-modules.txt)\" KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=linux ARCH=x64 kui-build-electron",
26-
"build:electron:linux:arm64": "npm run preprod && KUI_KEEP_NODE_MODULE=\"$(cat mw-node-modules.txt)\" KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=linux ARCH=arm64 kui-build-electron",
27-
"build:electron:win32:amd64": "npm run preprod && KUI_KEEP_NODE_MODULE=\"$(cat mw-node-modules.txt)\" KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=win32 ARCH=x64 kui-build-electron",
28-
"build:electron:windows:amd64": "npm run preprod && KUI_KEEP_NODE_MODULE=\"$(cat mw-node-modules.txt)\" KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=win32 ARCH=x64 kui-build-electron",
29-
"build:electron:all": "npm run preprod && KUI_KEEP_NODE_MODULE=\"$(cat mw-node-modules.txt)\" KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare kui-build-electron",
21+
"build:electron:mac:amd64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=mac ARCH=x64 kui-build-electron",
22+
"build:electron:mac:arm64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=mac ARCH=arm64 kui-build-electron",
23+
"build:electron:osx:amd64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare npm run build:electron:mac:amd64",
24+
"build:electron:osx:arm64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare npm run build:electron:mac:arm64",
25+
"build:electron:linux:amd64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=linux ARCH=x64 kui-build-electron",
26+
"build:electron:linux:arm64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=linux ARCH=arm64 kui-build-electron",
27+
"build:electron:win32:amd64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=win32 ARCH=x64 kui-build-electron",
28+
"build:electron:windows:amd64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=win32 ARCH=x64 kui-build-electron",
29+
"build:electron:all": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare kui-build-electron",
3030
"build": "npm run compile && webpack --mode production",
3131
"postinstall": "npm run compile",
3232
"format": "prettier --write '**/*.{scss,css,html,js,json,md,ts,tsx}'",

‎plugins/plugin-madwizard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"madwizard": "^0.8.2"
26+
"madwizard": "^0.8.3"
2727
}
2828
}

0 commit comments

Comments
 (0)