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.

Sign up for GitHub

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

Build cleanup #2078

Merged
merged 5 commits into from
Jan 18, 2023
Merged

Build cleanup #2078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8dee0a0
Publish CI built assets to NPM and replace `github_changelog_generator`
texodus Jan 7, 2023
4706d19
Remove lerna
texodus Jan 8, 2023
1331619
Use wasm build of `procss` for non-rust projects
texodus Jan 8, 2023
812f0a5
Remove `babel-jest` and inline record reporting
texodus Jan 8, 2023
6a195f8
Clean JS dependencies
texodus Jan 9, 2023
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
76 changes: 43 additions & 33 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,50 +345,65 @@ jobs:
# (listed here in the same order they appear in the directory)
- uses: actions/upload-artifact@v3
with:
name: perspective-build
name: perspective-dist
path: packages/perspective/dist/

- uses: actions/upload-artifact@v3
with:
name: perspective-jupyterlab-build
name: perspective-jupyterlab-dist
path: packages/perspective-jupyterlab/dist/

- uses: actions/upload-artifact@v3
with:
name: perspective-viewer-d3fc-build
name: perspective-viewer-d3fc-dist
path: packages/perspective-viewer-d3fc/dist

- uses: actions/upload-artifact@v3
with:
name: perspective-viewer-datagrid-build
name: perspective-viewer-datagrid-dist
path: packages/perspective-viewer-datagrid/dist

- uses: actions/upload-artifact@v3
with:
name: perspective-workspace-build
path: packages/perspective-workspace/dist
name: perspective-viewer-openlayers-dist
path: packages/perspective-viewer-openlayers/dist

- uses: actions/upload-artifact@v3
with:
name: perspective-viewer-build
path: rust/perspective-viewer/dist
name: perspective-esbuild-plugin-dist
path: packages/perspective-esbuild-plugin/dist

- uses: actions/upload-artifact@v3
with:
name: perspective-webpack-plugin-dist
path: packages/perspective-webpack-plugin/dist

- uses: actions/upload-artifact@v3
with:
name: perspective-cli-dist
path: packages/perspective-cli/dist

- uses: actions/upload-artifact@v3
with:
name: perspective-viewer-build-build
path: rust/perspective-viewer/build
name: perspective-workspace-dist
path: packages/perspective-workspace/dist

- uses: actions/upload-artifact@v3
with:
name: perspective-viewer-dist
path: rust/perspective-viewer/dist

######################################################
# Upload Jupyter artifacts for python build/test/dist
- uses: actions/upload-artifact@v3
with:
name: nbextension-build
name: nbextension-dist
path: python/perspective/perspective/nbextension
# if-no-files-found: error # TODO

- uses: actions/upload-artifact@v3
with:
name: labextension-build
name: labextension-dist
path: python/perspective/perspective/labextension
# if-no-files-found: error # TODO

Expand Down Expand Up @@ -641,39 +656,34 @@ jobs:
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
- uses: actions/download-artifact@v3
with:
name: perspective-build
name: perspective-dist
path: packages/perspective/dist/

- uses: actions/download-artifact@v3
with:
name: perspective-jupyterlab-build
name: perspective-jupyterlab-dist
path: packages/perspective-jupyterlab/dist/

- uses: actions/download-artifact@v3
with:
name: perspective-viewer-d3fc-build
name: perspective-viewer-d3fc-dist
path: packages/perspective-viewer-d3fc/dist

- uses: actions/download-artifact@v3
with:
name: perspective-viewer-datagrid-build
name: perspective-viewer-datagrid-dist
path: packages/perspective-viewer-datagrid/dist

- uses: actions/download-artifact@v3
with:
name: perspective-workspace-build
name: perspective-workspace-dist
path: packages/perspective-workspace/dist

- uses: actions/download-artifact@v3
with:
name: perspective-viewer-build
name: perspective-viewer-dist
path: rust/perspective-viewer/dist

- uses: actions/download-artifact@v3
with:
name: perspective-viewer-build-build
path: rust/perspective-viewer/build

###############
# WebAssembly #
###############
Expand Down Expand Up @@ -796,13 +806,13 @@ jobs:
# TODO
# - uses: actions/download-artifact@v3
# with:
# name: nbextension-build
# name: nbextension-dist
# python: python/perspective/perspective/nbextension

# TODO
# - uses: actions/download-artifact@v3
# with:
# name: labextension-build
# name: labextension-dist
# python: python/perspective/perspective/labextension

##########
Expand Down Expand Up @@ -1048,44 +1058,44 @@ jobs:

- uses: actions/download-artifact@v3
with:
name: perspective-build
name: perspective-dist
path: packages/perspective/dist/

- uses: actions/download-artifact@v3
with:
name: perspective-jupyterlab-build
name: perspective-jupyterlab-dist
path: packages/perspective-jupyterlab/dist/

- uses: actions/download-artifact@v3
with:
name: perspective-viewer-d3fc-build
name: perspective-viewer-d3fc-dist
path: packages/perspective-viewer-d3fc/dist

- uses: actions/download-artifact@v3
with:
name: perspective-viewer-datagrid-build
name: perspective-viewer-datagrid-dist
path: packages/perspective-viewer-datagrid/dist

- uses: actions/download-artifact@v3
with:
name: perspective-workspace-build
name: perspective-workspace-dist
path: packages/perspective-workspace/dist

- uses: actions/download-artifact@v3
with:
name: perspective-viewer-build
name: perspective-viewer-dist
path: rust/perspective-viewer/dist

# TODO
# - uses: actions/download-artifact@v3
# with:
# name: nbextension-build
# name: nbextension-dist
# python: python/perspective/perspective/nbextension

# TODO
# - uses: actions/download-artifact@v3
# with:
# name: labextension-build
# name: labextension-dist
# python: python/perspective/perspective/labextension

##########
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ cmake-build-debug
.python-version
.pytest_cache

package.json.lerna_backup
website/static/css/material-dark.css

# CPP Compile
Expand Down
8 changes: 4 additions & 4 deletions cpp/perspective/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
],
"scripts": {
"build": "node ../../scripts/run_emsdk.js node ./build.js",
"clean": "rimraf dist",
"test": ":",
"test:run": ":",
"test:build": ":"
"clean": "rimraf dist"
},
"devDependencies": {
"fflate": "^0.7.4"
}
}
2 changes: 1 addition & 1 deletion docs/docusaurus.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const config = {
defaultLocale: "en",
locales: ["en"],
},
plugins: ["perspective-loader"],
plugins: ["./plugins/perspective-loader"],
presets: [
[
"classic",
Expand Down
2 changes: 0 additions & 2 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"scripts": {
"docusaurus": "docusaurus",
"start": "docusaurus start",
"build": ":",
"docs": "docusaurus build",
"swizzle": "docusaurus swizzle",
"deploy": "docusaurus deploy",
Expand All @@ -25,7 +24,6 @@
"@mdx-js/react": "^1.6.22",
"blocks": "^1.9.1",
"clsx": "^1.1.1",
"perspective-loader": "file:plugins/perspective-loader",
"prism-react-renderer": "^1.3.3",
"react": "^17.0.2",
"react-dom": "^17.0.2"
Expand Down
2 changes: 2 additions & 0 deletions examples/blocks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"@finos/perspective-viewer": "^1.9.1",
"@finos/perspective-viewer-d3fc": "^1.9.1",
"@finos/perspective-viewer-datagrid": "^1.9.1",
"@finos/perspective-viewer-openlayers": "^1.9.1",
"@finos/perspective-workspace": "^1.9.1",
"superstore-arrow": "1.0.0"
}
}
1 change: 1 addition & 0 deletions examples/esbuild-example/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ async function build() {
outdir: "dist",
format: "esm",
bundle: true,
target: "es2020",
loader: {
".ttf": "file",
".arrow": "file",
Expand Down
5 changes: 3 additions & 2 deletions examples/esbuild-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
"@finos/perspective-viewer": "^1.9.1",
"@finos/perspective-viewer-d3fc": "^1.9.1",
"@finos/perspective-viewer-datagrid": "^1.9.1",
"@finos/perspective-viewer-openlayers": "^1.9.1"
"@finos/perspective-viewer-openlayers": "^1.9.1",
"superstore-arrow": "^1.0.0"
},
"devDependencies": {
"@finos/perspective-esbuild-plugin": "^1.9.1",
"esbuild": "^0.13.12",
"esbuild": "^0.14.54",
"http-server": "^0.11.1"
}
}
8 changes: 0 additions & 8 deletions examples/promo/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ module.exports = {
test: /\.css$/,
use: [{ loader: "style-loader" }, { loader: "css-loader" }],
},
{
test: /\.less$/,
use: [
{ loader: "style-loader" },
{ loader: "css-loader" },
{ loader: "less-loader" },
],
},
{
test: /\.(png|jpe?g|gif)$/i,
type: "asset/resource",
Expand Down
10 changes: 5 additions & 5 deletions examples/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "react",
"name": "example-react",
"private": true,
"version": "1.9.1",
"description": "An example app built using `@finos/perspective-viewer`.",
Expand All @@ -14,13 +14,13 @@
"@finos/perspective-viewer": "^1.9.1",
"@finos/perspective-viewer-d3fc": "^1.9.1",
"@finos/perspective-viewer-datagrid": "^1.9.1",
"react": "16.8.6",
"react-dom": "16.8.6"
"react": "^16.14.0",
"react-dom": "^16.9.17"
},
"devDependencies": {
"@finos/perspective-webpack-plugin": "^1.9.1",
"@types/react": "^16.8.6",
"@types/react-dom": "^16.9.4",
"@types/react": "^16.14.0",
"@types/react-dom": "^16.9.17",
"source-map-loader": "^0.2.4",
"ts-loader": "^6.2.1"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/webpack-cross-origin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"style-loader": "^0.18.2",
"webpack": "^5.14.0",
"webpack-cli": "^4.3.1",
"webpack-dev-server": "^3.11.2"
"webpack-dev-server": "^4.11.1"
}
}
2 changes: 1 addition & 1 deletion examples/webpack-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"style-loader": "^0.18.2",
"webpack": "^5.14.0",
"webpack-cli": "^4.3.1",
"webpack-dev-server": "^3.11.2"
"webpack-dev-server": "^4.11.1"
}
}
8 changes: 4 additions & 4 deletions examples/webpack-example/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ const worker = perspective.shared_worker();

// superstore.arrow located in node_modules/superstore-arrow/ and it's
// configured by 'devServer' in 'webpack.config.js'
// const req = fetch("./superstore.arrow");
const req = fetch("./superstore.arrow");

window.addEventListener("DOMContentLoaded", async () => {
const viewer = document.createElement("perspective-viewer");
document.body.append(viewer);

// const resp = await req;
// const buffer = await resp.arrayBuffer();
const table = worker.table({ x: [1, 2, 3, 4, 5] });
const resp = await req;
const buffer = await resp.arrayBuffer();
const table = worker.table(buffer);

viewer.load(table);

Expand Down
2 changes: 1 addition & 1 deletion examples/webpack-example/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module.exports = {
entrypoints: false,
},
devServer: {
contentBase: [
static: [
path.join(__dirname, "dist"),
path.join(__dirname, "../../node_modules/superstore-arrow"),
],
Expand Down
10 changes: 0 additions & 10 deletions lerna.json
View file
Open in desktop

This file was deleted.

Loading