Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integration fixes #303

Merged
merged 3 commits into from
Nov 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [0.2.5] - 2018-11-09
### Fixes
* [#301](https://github.com/jpmorganchase/perspective/pull/301) Fixed missing `webpack-plugin` export and `babel-polyfill` import.

## [0.2.4] - 2018-11-08
### Added
* [#299](https://github.com/jpmorganchase/perspective/pull/299) Added a new Menu bar (accessible via right-click on the config button) for `reset`, `copy` and `download` actions, and an API for `download()` (`copy()` and `reset()` already exist).
Expand Down
1 change: 1 addition & 0 deletions examples/webpack/in.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/

const perspective = require("@jpmorganchase/perspective").default;
require("@jpmorganchase/perspective-viewer");

const table = perspective.worker().table([{x: 1}]);
table.view().to_json(console.log);
3 changes: 2 additions & 1 deletion examples/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"keywords": [],
"license": "Apache-2.0",
"dependencies": {
"@jpmorganchase/perspective": "^0.2.5"
"@jpmorganchase/perspective": "^0.2.5",
"@jpmorganchase/perspective-viewer": "^0.2.5"
}
}
2 changes: 1 addition & 1 deletion packages/perspective-viewer/src/js/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ class View extends ViewPrivate {
this.shadowRoot.querySelector("#app").classList.remove("columns_horizontal");
}

if (!document.hidden && this.offsetParent && document.contains(this)) {
if (!document.hidden && this.offsetParent) {
this._plugin.resize.call(this);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-viewer/src/less/default.less
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
}

#drop_target {
background: white;
background: var(--plugin--background, #fff);
}

#drop_target_inner h3 {
Expand Down
5 changes: 4 additions & 1 deletion packages/perspective/webpack-plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ const WORKER_LOADER_PATH = require.resolve("./src/loader/file_worker_loader");
const WASM_LOADER_PATH = require.resolve("./src/loader/cross_origin_file_loader.js");
const BLOB_LOADER_PATH = require.resolve("./src/loader/blob_worker_loader.js");

const BABEL_CONFIG = require("./babel.config.js");

class PerspectiveWebpackPlugin {
constructor(options = {}) {
this.options = options;
Expand Down Expand Up @@ -63,7 +65,8 @@ class PerspectiveWebpackPlugin {
test: /\.js$/,
include: load_path,
exclude: /node_modules\/(?!(\@apache|\@jupyterlab))|psp\.(asmjs|async|sync)\.js/,
loader: "babel-loader"
loader: "babel-loader",
options: BABEL_CONFIG
});

rules.push({
Expand Down