Merge pull request #2705 from finos/fix-jlab-win

Fix Windows JupyterLab packaging

Author: texodus

.gitignore

@@ -244,5 +244,5 @@ rust/perspective-js/docs
 rust/perspective-python/docs
 
 .pyodide-*/
-rust/perspective-python/perspective.data/data/share/jupyter/labextensions/@finos/perspective-jupyterlab/static
-rust/perspective-python/perspective.data/data/share/jupyter/labextensions/@finos/perspective-jupyterlab/package.json
+rust/perspective-python/*.data
+# rust/perspective-python/perspective.data/data/share/jupyter/labextensions/@finos/perspective-jupyterlab/package.json

packages/perspective-jupyterlab/build.mjs

@@ -13,13 +13,14 @@
 import cpy from "cpy";
 import { WasmPlugin } from "@finos/perspective-esbuild-plugin/wasm.js";
 import { WorkerPlugin } from "@finos/perspective-esbuild-plugin/worker.js";
-import { AMDLoader } from "@finos/perspective-esbuild-plugin/amd.js";
+// import { AMDLoader } from "@finos/perspective-esbuild-plugin/amd.js";
 import { build } from "@finos/perspective-esbuild-plugin/build.js";
 import * as path from "node:path";
 import { BuildCss } from "@prospective.co/procss/target/cjs/procss.js";
-import fs from "node:fs";
+import * as fs from "node:fs";
 import * as url from "node:url";
 import { createRequire } from "node:module";
+import { execSync } from "node:child_process";
 
 const _require = createRequire(import.meta.url);
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url)).slice(0, -1);
@@ -130,6 +131,18 @@ async function build_all() {
 
     await Promise.all(BUILD.map(build)).catch(() => process.exit(1));
     cpy(["src/less/*"], "dist/less");
+    execSync("jupyter labextension build .", { stdio: "inherit" });
+
+    const pkg = JSON.parse(fs.readFileSync("../../package.json").toString());
+    const version = pkg.version.replace(/-(rc|alpha|beta)\.\d+/, (x) =>
+        x.replace("-", "").replace(".", "")
+    );
+
+    const psp_dir = `perspective_python-${version}.data`;
+    await cpy(
+        ["dist/cjs/**/*"],
+        `../../rust/perspective-python/${psp_dir}/data/share/jupyter/labextensions/@finos/perspective-jupyterlab`
+    );
 }
 
 build_all();

packages/perspective-jupyterlab/package.json

@@ -20,9 +20,7 @@
         "bench": "npm-run-all bench:build bench:run",
         "bench:build": "echo \"No Benchmarks\"",
         "bench:run": "echo \"No Benchmarks\"",
-        "build": "npm-run-all build:js build:labextension",
-        "build:js": "node build.mjs",
-        "build:labextension": "jupyter labextension build .",
+        "build": "node build.mjs",
         "clean": "npm-run-all clean:*",
         "clean:dist": "rimraf dist",
         "clean:lib": "rimraf lib",
@@ -49,13 +47,14 @@
         "@finos/perspective-esbuild-plugin": "workspace:^",
         "@finos/perspective-test": "workspace:^",
         "@jupyterlab/builder": "^4",
+        "copy-webpack-plugin": "~12",
         "@prospective.co/procss": "^0.1.15",
         "cpy": "^9.0.1"
     },
     "jupyterlab": {
         "webpackConfig": "./webpack.config.js",
         "extension": true,
-        "outputDir": "../../rust/perspective-python/perspective.data/data/share/jupyter/labextensions/@finos/perspective-jupyterlab",
+        "outputDir": "./dist/cjs",
         "sharedPackages": {
             "@jupyter-widgets/base": {
                 "bundled": false,

packages/perspective-jupyterlab/webpack.config.js

@@ -18,10 +18,7 @@ module.exports = {
     },
     plugins: [
         new CopyPlugin({
-            patterns: [
-                { from: "./install.json", to: "../install.json" },
-                // { from: "other", to: "public" },
-            ],
+            patterns: [{ from: "./install.json", to: "../install.json" }],
         }),
     ],
 };

pnpm-lock.yaml

@@ -11,6 +11,8 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 import { execSync } from "child_process";
+import * as fs from "node:fs";
+import pkg from "./package.json" assert { type: "json" };
 
 let flags = "--release";
 if (!!process.env.PSP_DEBUG) {
@@ -25,6 +27,12 @@ const opts = {
     },
 };
 
+const version = pkg.version.replace(/-(rc|alpha|beta)\.\d+/, (x) =>
+    x.replace("-", "").replace(".", "")
+);
+
+fs.mkdirSync(`./perspective_python-${version}.data`, { recursive: true });
+
 const build_wheel = !!process.env.PSP_BUILD_WHEEL;
 const build_sdist = !!process.env.PSP_BUILD_SDIST;
 

rust/perspective-python/build.mjs

@@ -16,7 +16,6 @@ build-backend = "maturin"
 
 [project]
 name = "perspective-python"
-version = "3.0.0-rc1"
 requires-python = ">=3.9"
 dynamic = ["version"]
 classifiers = [
@@ -26,7 +25,7 @@ classifiers = [
 
 [tool.maturin]
 module-name = "perspective"
-data = "perspective.data"
+data = "perspective_python-3.0.0rc1.data"
 features = ["pyo3/extension-module"]
 
 [tool.pytest.ini_options]

rust/perspective-python/perspective.data/data/share/jupyter/labextensions/@finos/perspective-jupyterlab/install.json

@@ -12,21 +12,21 @@
 
 import { execSync } from "node:child_process";
 import * as fs from "node:fs";
-import * as path from "node:path";
 import pkg from "../../package.json" assert { type: "json" };
 
-const __dirname = new URL(".", import.meta.url).pathname;
-
 const wheel_file = fs.readdirSync(".").filter((x) => x.endsWith(".whl"))[0];
-const pkg_name = wheel_file.split("-").slice(0, 2).join("-");
 execSync(`wheel unpack ${wheel_file}`);
-
-fs.cpSync(
-    path.join(__dirname, "../../rust/perspective-python/perspective.data"),
-    `${pkg_name}/perspective_python-${pkg.version.replace(/-rc\.\d+/, (x) =>
-        x.replace("-", "").replace(".", "")
-    )}.data`,
-    { recursive: true }
+const pkg_name = wheel_file.split("-").slice(0, 2).join("-");
+const version = pkg.version.replace(/-(rc|alpha|beta)\.\d+/, (x) =>
+    x.replace("-", "").replace(".", "")
 );
 
+const dest = `${pkg_name}/perspective_python-${version}.data`;
+const src = `rust/perspective-python/perspective_python-${version}.data`;
+fs.cpSync(src, dest, {
+    recursive: true,
+});
+
 execSync(`wheel pack ${pkg_name}`);
+
+// what kind of customers