- if self.is_open { { items.collect::() } }
+ if self.is_open {
+
{ items.collect::() }
+ }
>
}
diff --git a/packages/perspective-esbuild-plugin/README.md b/tools/perspective-esbuild-plugin/README.md
similarity index 77%
rename from packages/perspective-esbuild-plugin/README.md
rename to tools/perspective-esbuild-plugin/README.md
index 290a4f1706..4e4fc88c40 100644
--- a/packages/perspective-esbuild-plugin/README.md
+++ b/tools/perspective-esbuild-plugin/README.md
@@ -2,11 +2,14 @@
Applications bundled with `esbuild` can make use of the
`@finos/perspective-esbuild-plugin` module. A full example can be found in the
-repo under [`examples/esbuild-example`](https://github.com/finos/perspective/tree/master/examples/esbuild-example).
+repo under
+[`examples/esbuild-example`](https://github.com/finos/perspective/tree/master/examples/esbuild-example).
```javascript
const esbuild = require("esbuild");
-const {PerspectiveEsbuildPlugin} = require("@finos/perspective-esbuild-plugin");
+const {
+ PerspectiveEsbuildPlugin,
+} = require("@finos/perspective-esbuild-plugin");
esbuild.build({
entryPoints: ["src/index.js"],
@@ -15,6 +18,7 @@ esbuild.build({
bundle: true,
loader: {
".ttf": "file",
+ ".wasm": "file",
},
});
```
diff --git a/packages/perspective-esbuild-plugin/amd.js b/tools/perspective-esbuild-plugin/amd.js
similarity index 100%
rename from packages/perspective-esbuild-plugin/amd.js
rename to tools/perspective-esbuild-plugin/amd.js
diff --git a/packages/perspective-esbuild-plugin/build.js b/tools/perspective-esbuild-plugin/build.js
similarity index 100%
rename from packages/perspective-esbuild-plugin/build.js
rename to tools/perspective-esbuild-plugin/build.js
diff --git a/packages/perspective-esbuild-plugin/external.js b/tools/perspective-esbuild-plugin/external.js
similarity index 100%
rename from packages/perspective-esbuild-plugin/external.js
rename to tools/perspective-esbuild-plugin/external.js
diff --git a/packages/perspective-esbuild-plugin/index.js b/tools/perspective-esbuild-plugin/index.js
similarity index 88%
rename from packages/perspective-esbuild-plugin/index.js
rename to tools/perspective-esbuild-plugin/index.js
index 5328ada8a2..d15d51c6bc 100644
--- a/packages/perspective-esbuild-plugin/index.js
+++ b/tools/perspective-esbuild-plugin/index.js
@@ -16,18 +16,23 @@ const { WorkerPlugin } = require("./worker.js");
exports.PerspectiveEsbuildPlugin = function PerspectiveEsbuildPlugin(
options = {}
) {
- const wasm_plugin = WasmPlugin(
- !!options.wasm?.inline,
- !options.wasm?.webpack_hack
- );
+ // const wasm_plugin = WasmPlugin(
+ // !!options.wasm?.inline,
+ // !options.wasm?.webpack_hack
+ // );
const worker_plugin = WorkerPlugin({
targetdir: options.worker?.targetdir,
});
function setup(build) {
- wasm_plugin.setup(build);
- worker_plugin.setup(build);
+ // if (options.wasm !== false) {
+ // wasm_plugin.setup(build);
+ // }
+
+ if (options.worker !== false) {
+ worker_plugin.setup(build);
+ }
}
return {
diff --git a/packages/perspective-esbuild-plugin/package.json b/tools/perspective-esbuild-plugin/package.json
similarity index 100%
rename from packages/perspective-esbuild-plugin/package.json
rename to tools/perspective-esbuild-plugin/package.json
diff --git a/packages/perspective-esbuild-plugin/resolve.js b/tools/perspective-esbuild-plugin/resolve.js
similarity index 100%
rename from packages/perspective-esbuild-plugin/resolve.js
rename to tools/perspective-esbuild-plugin/resolve.js
diff --git a/packages/perspective-esbuild-plugin/wasm.js b/tools/perspective-esbuild-plugin/wasm.js
similarity index 95%
rename from packages/perspective-esbuild-plugin/wasm.js
rename to tools/perspective-esbuild-plugin/wasm.js
index e55a107292..7276048076 100644
--- a/packages/perspective-esbuild-plugin/wasm.js
+++ b/tools/perspective-esbuild-plugin/wasm.js
@@ -24,10 +24,13 @@ exports.WasmPlugin = function WasmPlugin(inline, webpack_hack) {
args.namespace === "wasm-stub" ||
args.namespace === "wasm-inline"
) {
- const entryPoint = path.join(
- args.pluginData.resolveDir,
- args.path
- );
+ let entryPoint = args.path;
+ if (args.path.startsWith(".")) {
+ entryPoint = path.join(
+ args.pluginData.resolveDir,
+ entryPoint
+ );
+ }
return {
path: entryPoint,
diff --git a/packages/perspective-esbuild-plugin/worker.js b/tools/perspective-esbuild-plugin/worker.js
similarity index 100%
rename from packages/perspective-esbuild-plugin/worker.js
rename to tools/perspective-esbuild-plugin/worker.js
diff --git a/tools/perspective-test/playwright.config.ts b/tools/perspective-test/playwright.config.ts
index 1f42a4cdb1..6d0d430807 100644
--- a/tools/perspective-test/playwright.config.ts
+++ b/tools/perspective-test/playwright.config.ts
@@ -199,9 +199,9 @@ const GLOBAL_TEARDOWN_PATH = __require.resolve(
// See https://playwright.dev/docs/test-configuration.
export default defineConfig({
- timeout: 360_000,
+ timeout: 30_000,
expect: {
- timeout: 360_000,
+ timeout: 30_000,
},
forbidOnly: !!process.env.CI,
retries: 0,