diff --git a/docs/package.json b/docs/package.json index 9871a01e6a..e812047711 100644 --- a/docs/package.json +++ b/docs/package.json @@ -26,7 +26,7 @@ "clsx": "^2.0.0", "mkdirp": "3", "prism-react-renderer": "^1.3.3", - "puppeteer": "22.10.0", + "puppeteer": "^23", "react": "^18.0.0", "react-dom": "^18.0.0", "superstore-arrow": "3.0.0" diff --git a/examples/webpack-example/package.json b/examples/webpack-example/package.json index 49c9e2c0c1..5beb3f5415 100644 --- a/examples/webpack-example/package.json +++ b/examples/webpack-example/package.json @@ -22,7 +22,6 @@ "html-webpack-plugin": "^5.1.0", "style-loader": "^0.18.2", "webpack": "^5.14.0", - "webpack-cli": "^4.7.0", - "webpack-dev-server": "^4.11.1" + "webpack-cli": "^4.7.0" } } diff --git a/examples/workspace/src/index.css b/examples/workspace/src/index.css new file mode 100644 index 0000000000..7e13ee874f --- /dev/null +++ b/examples/workspace/src/index.css @@ -0,0 +1,12 @@ +body { + display: flex; + flex-direction: column; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: 0; + padding: 0; + overflow: hidden; +} diff --git a/examples/workspace/src/index.js b/examples/workspace/src/index.js index 7af41c623d..f07f0ceb1c 100644 --- a/examples/workspace/src/index.js +++ b/examples/workspace/src/index.js @@ -16,13 +16,15 @@ import "@finos/perspective-viewer"; import "@finos/perspective-viewer-datagrid"; import "@finos/perspective-viewer-d3fc"; -import "./index.less"; +import "./index.css"; +import "@finos/perspective-workspace/dist/css/pro.css"; +import "@finos/perspective-viewer/dist/css/themes.css"; const datasource = async () => { const req = fetch("./superstore.lz4.arrow"); const resp = await req; const buffer = await resp.arrayBuffer(); - const worker = perspective.worker(); + const worker = await perspective.worker(); return await worker.table(buffer); }; diff --git a/examples/workspace/src/index.less b/examples/workspace/src/index.less deleted file mode 100644 index 769bc0a71e..0000000000 --- a/examples/workspace/src/index.less +++ /dev/null @@ -1,27 +0,0 @@ -// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -// ┃ ██████ ██████ ██████ █ █ █ █ █ █▄ ▀███ █ ┃ -// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█ ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄ ▀█ █ ▀▀▀▀▀ ┃ -// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄ █ ▄▄▄▄▄ ┃ -// ┃ █ ██████ █ ▀█▄ █ ██████ █ ███▌▐███ ███████▄ █ ┃ -// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫ -// ┃ Copyright (c) 2017, the Perspective Authors. ┃ -// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃ -// ┃ This file is part of the Perspective library, distributed under the terms ┃ -// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃ -// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ - -@import "~@finos/perspective-workspace/dist/css/pro-dark.css"; -@import "~@finos/perspective-viewer/dist/css/themes.css"; - -body { - display: flex; - flex-direction: column; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - margin: 0; - padding: 0; - overflow: hidden; -} diff --git a/examples/workspace/webpack.config.js b/examples/workspace/webpack.config.js index 26c302b369..27a8dbd94a 100644 --- a/examples/workspace/webpack.config.js +++ b/examples/workspace/webpack.config.js @@ -30,17 +30,8 @@ module.exports = { module: { rules: [ { - test: /\.js$/, - enforce: "pre", - use: ["source-map-loader"], - }, - { - test: /\.less$/, - use: [ - { loader: "style-loader" }, - { loader: "css-loader" }, - { loader: "less-loader" }, - ], + test: /\.css$/, + use: [{ loader: "style-loader" }, { loader: "css-loader" }], }, { test: /\.(png|jpe?g|gif)$/i, diff --git a/package.json b/package.json index 4352da62a2..5729c613e1 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@finos/perspective-viewer-openlayers": "workspace:^", "@finos/perspective-workspace": "workspace:^", "@fontsource/roboto-mono": "4.5.10", - "@playwright/test": "1.37.1", + "@playwright/test": "^1.47", "@types/ws": "^7.2.2", "@zip.js/zip.js": "^2.7.27", "auto-changelog": "^2.4.0", @@ -57,42 +57,27 @@ "dotenv": "^8.1.0", "esbuild": "^0.14.54", "fs-extra": "^8.1.0", - "glob": "^7.2.0", + "glob": "^11", "glob-gitignore": "^1.0.14", - "html-webpack-plugin": "^5.1.0", "husky": "^7.0.4", "inquirer": "^7.0.0", - "jsdoc-to-markdown": "^8.0.0", - "less": "^4.1.3", - "less-loader": "^7.2.1", "minimatch": "^5.1.2", - "minimist": "^1.2.0", "mkdirp": "^0.5.1", - "npm-pack-here": "^1.2.0", "npm-run-all": "^4.1.3", "octokit": "^1.7.2", "prettier": "^2.7.1", - "pretty-error": "^4.0.0", - "puppeteer": "^13.1.3", - "rimraf": "^2.6.2", - "sinon": "^7.3.1", + "puppeteer": "^23", + "rimraf": "^6", "stoppable": "^1.1.0", "style-loader": "^3.3.1", "superstore-arrow": "3.0.0", "tar": "^6.1.13", - "term-img": "^4.1.0", - "timezone-mock": "^1.3.6", - "tiny-glob": "^0.2.9", "ts-loader": "^6.2.0", "ts-node": "^10.9.2", "tsx": "^4.7.1", - "typedoc": "^0.24.8", - "typedoc-plugin-markdown": "^3.15.4", - "typedoc-plugin-no-inherit": "^1.4.0", "typescript": "5.1.6", "webpack": "^5.60.0", - "webpack-cli": "^4.7.0", - "webpack-dev-server": "^4.11.1" + "webpack-cli": "^4.7.0" }, "scripts": { "preinstall": "npx only-allow pnpm", @@ -123,12 +108,5 @@ "fix": "node tools/perspective-scripts/fix.mjs", "version": "node tools/perspective-scripts/version.mjs", "jlab_link": "pip3 install ./python/perspective --no-build-isolation" - }, - "dependencies": { - "canvas": "^2.11.2", - "fast-xml-parser": "^4.4.0", - "gif-encoder-2": "^1.0.5", - "gifencoder": "^2.0.1", - "svg-parser": "^2.0.4" } } diff --git a/packages/perspective-cli/package.json b/packages/perspective-cli/package.json index afbc2998e3..ba1d597361 100644 --- a/packages/perspective-cli/package.json +++ b/packages/perspective-cli/package.json @@ -32,6 +32,6 @@ "@finos/perspective-viewer-openlayers": "workspace:^", "@finos/perspective-workspace": "workspace:^", "commander": "^2.19.0", - "puppeteer": "^13.1.3" + "puppeteer": "^23" } } diff --git a/rust/perspective-js/test/js/constructors.spec.js b/rust/perspective-js/test/js/constructors.spec.js index b4b578b76f..06b3918db6 100644 --- a/rust/perspective-js/test/js/constructors.spec.js +++ b/rust/perspective-js/test/js/constructors.spec.js @@ -149,7 +149,7 @@ let arrow_lists_data = { ], float_arr: [ "[]", - "[3.14,3.141592653589793,6.283185307179586,1.4142135623730951]", + "[3.14,3.141592653589793,6.283185307179586,1.4142135623730952]", "[12.00001]", "[100000000.0,100000000.0,100000000.0,100000000.0]", ], diff --git a/tools/perspective-scripts/lint_cpp.mjs b/tools/perspective-scripts/lint_cpp.mjs index f63a1298de..e07e000d39 100644 --- a/tools/perspective-scripts/lint_cpp.mjs +++ b/tools/perspective-scripts/lint_cpp.mjs @@ -14,7 +14,7 @@ import sh from "./sh.mjs"; import * as fs from "fs"; import * as url from "url"; import * as os from "os"; -import glob from "glob"; +import * as glob from "glob"; import { execSync } from "child_process"; import * as dotenv from "dotenv"; diff --git a/tools/perspective-scripts/sh_perspective.mjs b/tools/perspective-scripts/sh_perspective.mjs index b3d1132417..c68fcc7bb5 100644 --- a/tools/perspective-scripts/sh_perspective.mjs +++ b/tools/perspective-scripts/sh_perspective.mjs @@ -14,7 +14,7 @@ import * as dotenv from "dotenv"; import * as _path from "path"; import * as fs from "fs"; import fse from "fs-extra"; -import rimraf from "rimraf"; +import * as rimraf from "rimraf"; import { createRequire } from "node:module"; import sh from "./sh.mjs"; import * as url from "url"; diff --git a/tools/perspective-scripts/version.mjs b/tools/perspective-scripts/version.mjs index a26273e665..9230c8c476 100644 --- a/tools/perspective-scripts/version.mjs +++ b/tools/perspective-scripts/version.mjs @@ -11,7 +11,7 @@ // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ import fs from "fs"; -import glob from "glob"; +import * as glob from "glob"; import { Octokit } from "octokit"; import { parseReleases } from "auto-changelog/src/releases.js"; import { fetchTags } from "auto-changelog/src/tags.js"; diff --git a/tools/perspective-test/src/js/global_teardown.ts b/tools/perspective-test/src/js/global_teardown.ts index 479b20ff61..4be892f1bf 100644 --- a/tools/perspective-test/src/js/global_teardown.ts +++ b/tools/perspective-test/src/js/global_teardown.ts @@ -12,7 +12,7 @@ import tar from "tar"; import fs from "fs"; -import glob from "glob"; +import * as glob from "glob"; import path from "path"; import url from "node:url"; diff --git a/tools/perspective-test/src/js/simple_viewer_tests.ts b/tools/perspective-test/src/js/simple_viewer_tests.ts index 9ce0d45e35..7da59e6268 100644 --- a/tools/perspective-test/src/js/simple_viewer_tests.ts +++ b/tools/perspective-test/src/js/simple_viewer_tests.ts @@ -10,8 +10,8 @@ // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃ // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ -import { test } from "@playwright/test"; -import { getSvgContentString, compareContentsToSnapshot } from "./utils"; +import { getSvgContentString, compareContentsToSnapshot } from "./utils.ts"; +import { test } from "./index.js"; import type { PerspectiveViewerConfig } from "@finos/perspective-viewer"; export type ContentExtractor = (page: any) => Promise;