chore: pull guidebook store from @guidebooks/store npm

Rather than explicitly mirroring it here, use the pre-optimized published store. This also gives us version pegging.

Author: starpit

bin/codeflare

@@ -100,16 +100,15 @@ fi
 export KUI_ELECTRON_HOME="${KUI_ELECTRON_HOME-$NODE}"
 
 if [ -z "$GUIDEBOOK_STORE" ]; then
-    if [  -d "$HEADLESS"/../../store ]; then
+    if [  -d "$HEADLESS"/../../node_modules/@guidebooks/store ]; then
         # development builds
         export GUIDEBOOK_STORE="$HEADLESS"/../../store
     elif [  -d "$HEADLESS"/store ]; then
         # docker builds
         export GUIDEBOOK_STORE="$HEADLESS"/store
     else
-        # otherwise, we can't find a local mirror, so pull directly from
-        # git (network transfers!)
-        export GUIDEBOOK_STORE=git
+        echo "Cannot find guidebook store"
+        exit 1
     fi
 fi
 

deploy/cli/Dockerfile

@@ -7,7 +7,7 @@ ENV CODEFLARE_HEADLESS_HOME=/usr/local/CodeFlare
 
 # TODO hard-coded arch
 ADD dist/headless /usr/local/CodeFlare
-ADD store /usr/local/CodeFlare/store
+ADD node_modules/@guidebooks/store /usr/local/CodeFlare/store
 ADD bin/codeflare /usr/local/bin/codeflare
 
 RUN apt update && apt -y install python3 python3-pip sudo curl \

deploy/log-aggregator/Dockerfile

@@ -7,7 +7,7 @@ ENV CODEFLARE_HEADLESS_HOME=/usr/local/CodeFlare
 
 # TODO hard-coded arch
 ADD dist/headless /usr/local/CodeFlare
-ADD store /usr/local/CodeFlare/store
+ADD node_modules/@guidebooks/store /usr/local/CodeFlare/store
 ADD bin/codeflare /usr/local/bin/codeflare
 ADD deploy/log-aggregator/wait-for.sh /usr/local/bin/wait-for
 ADD deploy/log-aggregator/wait-for-and-cat.sh /usr/local/bin/wait-for-and-cat

package-lock.json

@@ -18,33 +18,30 @@
     "pty:electron": "npm run pty:rebuild electron",
     "pty:nodejs": "npm run pty:rebuild node",
     "prepare": "cross-env husky install",
-    "preprod": "npm run mirror",
     "build:docker:cli": "npm run build:docker1 && docker build -f deploy/cli/Dockerfile -t ghcr.io/project-codeflare/codeflare-cli .",
     "build:docker:logs": "npm run build:docker1 && docker build -f deploy/log-aggregator/Dockerfile -t ghcr.io/project-codeflare/codeflare-log-aggregator .",
     "build:docker1": "if [ ! -n \"$FAST\" ]; then npm run build:docker0; fi",
-    "build:docker0": "npm run mirror && CLIENT_HOME=$PWD webpack-cli --mode=${MODE-production} --config node_modules/@kui-shell/webpack/headless-webpack.config.js",
+    "build:docker0": "CLIENT_HOME=$PWD webpack-cli --mode=${MODE-production} --config node_modules/@kui-shell/webpack/headless-webpack.config.js",
     "docker:debug": "ENTRYPOINT=bash ./bin/codeflare -d",
-    "build:electron:mac:amd64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=mac ARCH=x64 kui-build-electron",
-    "build:electron:mac:arm64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=mac ARCH=arm64 kui-build-electron",
-    "build:electron:osx:amd64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare npm run build:electron:mac:amd64",
-    "build:electron:osx:arm64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare npm run build:electron:mac:arm64",
+    "build:electron:mac:amd64": "KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=mac ARCH=x64 kui-build-electron",
+    "build:electron:mac:arm64": "KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=mac ARCH=arm64 kui-build-electron",
+    "build:electron:osx:amd64": "KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare npm run build:electron:mac:amd64",
+    "build:electron:osx:arm64": "KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare npm run build:electron:mac:arm64",
     "build:electron:macOS:X64": "npm run build:electron:mac:amd64",
     "build:electron:macOS:ARM64": "npm run build:electron:mac:arm64",
-    "build:electron:linux:amd64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=linux ARCH=x64 kui-build-electron",
-    "build:electron:linux:arm64": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=linux ARCH=arm64 kui-build-electron",
+    "build:electron:linux:amd64": "KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=linux ARCH=x64 kui-build-electron",
+    "build:electron:linux:arm64": "KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=linux ARCH=arm64 kui-build-electron",
     "build:electron:Linux:X64": "npm run build:electron:linux:amd64",
     "build:electron:Linux:ARM64": "npm run build:electron:linux:armd64",
-    "build:electron:win32:amd64": "npm run preprod && cross-env KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=win32 ARCH=x64 kui-build-electron",
+    "build:electron:win32:amd64": "cross-env KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare PLATFORM=win32 ARCH=x64 kui-build-electron",
     "build:electron:Windows:X64": "npm run build:electron:win32:amd64",
-    "build:electron:all": "npm run preprod && KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare kui-build-electron",
+    "build:electron:all": "KUI_HEADLESS_WEBPACK=true KUI_LAUNCHER=$PWD/bin/codeflare kui-build-electron",
     "build": "npm run compile && webpack --mode production",
     "postinstall": "npm run compile",
     "format": "prettier --write '**/*.{scss,css,html,js,json,md,ts,tsx}'",
     "lint": "eslint . --ext '**/*.{js,ts,tsx}'",
     "open": "./bin/codeflare hello",
     "start": "WATCH_ARGS='-open' npm run watch",
-    "mirror": "cross-env rm -rf tmp && cross-env git clone --depth=1 https://github.com/guidebooks/store.git $PWD/tmp/store && cross-env madwizard mirror $PWD/tmp/store/guidebooks $PWD/store && rm -rf tmp",
-    "mirror-if-needed": "if [ ! -d ./store ]; then npm run mirror; fi",
     "test": "cross-env RUNNING_KUI_TEST=true playwright test --workers 1"
   },
   "keywords": [],
@@ -115,6 +112,7 @@
     "typescript": "4.7.4"
   },
   "dependencies": {
+    "@guidebooks/store": "^0.0.1",
     "@kui-shell/client": "file:./plugins/plugin-client-default",
     "@kui-shell/core": "11.5.0-dev-20220807-191654",
     "@kui-shell/plugin-bash-like": "11.5.0-dev-20220807-191654",