Fix docs site

.github/workflows/build.yml

@@ -333,6 +333,9 @@ jobs:
               env:
                   PSP_USE_CCACHE: 1
 
+            - name: Docs Build
+              run: yarn docs
+
             #################################
             # Compress and upload Artifacts #
             #################################

docs/build.js

@@ -13,9 +13,13 @@
 const puppeteer = require("puppeteer");
 const fs = require("fs");
 const cp = require("child_process");
+const path = require("node:path");
+const mkdirp = require("mkdirp");
 const EXAMPLES = require("./src/components/ExampleGallery/features.js").default;
 const { convert } = require("@finos/perspective-viewer/dist/cjs/migrate.js");
 
+const { WebSocketServer } = require("@finos/perspective");
+
 const DEFAULT_VIEWPORT = {
     width: 400,
     height: 300,
@@ -101,11 +105,18 @@ async function run_with_theme(page, is_dark = false) {
 
 async function run() {
     if (!fs.existsSync("static/features")) {
-        const browser = await puppeteer.launch({ headless: false });
+        mkdirp(path.join(__dirname, "static/features"));
+        const server = new WebSocketServer({
+            assets: [path.join(__dirname, "..")],
+        });
+
+        const browser = await puppeteer.launch({ headless: true });
         const page = await browser.newPage();
         await run_with_theme(page);
         await run_with_theme(page, true);
+        await page.close();
         await browser.close();
+        await server.close();
     }
 
     // TODO There is a typescript module annoyingly called `blocks`.

docs/docs/expressions.md

@@ -120,7 +120,7 @@ Perspective adds many of its own functions in addition to `ExprTK`'s standard
 ones, including common functions for `datetime` and `string` types such as
 `substring()`, `bucket()`, `day_of_week()`, etc. A full list of available
 functions is available in the
-[Expression Columns API](obj/perspective-viewer-exprtk).
+[Expression Columns API](../obj/perspective-viewer-exprtk).
 
 ## Examples
 

docs/src/components/ExampleGallery/index.js

@@ -18,7 +18,7 @@ import EXAMPLES from "./features.js";
 import styles from "./styles.module.css";
 import BrowserOnly from "@docusaurus/BrowserOnly";
 
-const { convert } = require("@finos/perspective-viewer/src/ts/migrate");
+const { convert } = require("@finos/perspective-viewer/dist/cjs/migrate");
 
 export default function ExampleGallery(props) {
     const { colorMode } = useColorMode();
@@ -80,12 +80,6 @@ function OverlayDemo(props) {
     const perspectiveRef = useCallback(
         (viewer) => {
             if (viewer !== null) {
-                // console.log(
-                //     convert({
-                //         ...EXAMPLES.default[props.index].config,
-                //         settings: true,
-                //     })
-                // );
                 viewer.load(SUPERSTORE_TABLE);
                 viewer.restore(
                     convert({

docs/src/pages/index.js

@@ -22,7 +22,7 @@ import styles from "./index.module.css";
 
 function HomepageHeader() {
     const { siteConfig } = useDocusaurusContext();
-    console.log(siteConfig);
+
     // const { colorMode, setColorMode } = useColorMode();
     return (
         <header className={clsx("hero", styles.heroBanner)}>

packages/perspective/package.json

@@ -36,7 +36,7 @@
         "build": "node build.js",
         "docs": "npm-run-all docs:jsdoc docs:deploy",
         "docs:jsdoc": "jsdoc2md src/js/perspective.js -p list --separators --no-gfm > README.md",
-        "docs:deploy": "(echo \"---\nid: perspective\ntitle: perspective API\n---\n\n\"; cat README.md) > ../../docs/docs/obj/perspective.md",
+        "docs:deploy": "mkdir -p ../../docs/docs/obj && (echo \"---\nid: perspective\ntitle: perspective API\n---\n\n\"; cat README.md) > ../../docs/docs/obj/perspective.md",
         "test:run": "jest --color --ci --rootDir=. --config=../../tools/perspective-test/jest.config.js",
         "test": "npm-run-all test:run",
         "clean": "rimraf dist"

rust/perspective-viewer/build.js

@@ -30,7 +30,7 @@ const BUILD = [
     {
         entryPoints: ["src/ts/perspective-viewer.ts"],
         format: "esm",
-        plugins: [NodeModulesExternal()],
+        plugins: [NodeModulesExternal("@finos/perspective/")],
         external: ["*.wasm", "*.worker.js"],
         outdir: "dist/esm",
     },

rust/perspective-viewer/src/less/column-selector.less

@@ -121,11 +121,10 @@
 
 :host {
     #add-expression {
-        border: var(--column-add--border, none);
+        border: var(--column-add--border, 1px solid transparent);
         min-height: 24px;
         flex-direction: row;
         font-size: 12px;
-        border: 1px solid transparent;
         background-color: #8b868045;
         border-radius: 2px;
         display: flex;

rust/perspective-viewer/src/ts/migrate/2-6-1.ts

@@ -28,7 +28,10 @@ export default function migrate_2_6_1(old, options) {
     old.version = new Semver(next_version);
 
     // Migrate X/Y Scatter plugin
-    if (old.plugin === "X/Y Scatter") {
+    if (
+        old.plugin === "X/Y Scatter" &&
+        typeof old.plugin_config?.columns === "object"
+    ) {
         for (const i in old.plugin_config.columns) {
             const entries = Object.entries(old.plugin_config.columns[i]);
             const mapped_entries = entries.map(([grp_name, grp_val]) => {