Skip to content

Commit 5effbc9

Browse files
texodustexodus
authored
Merge pull request #2078 from finos/build-cleanup
Build cleanup
2 parents f518511 + 6a195f8 commit 5effbc9

File tree

101 files changed

+5422
-9338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+5422
-9338
lines changed

‎.github/workflows/build.yml‎

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -345,50 +345,65 @@ jobs:
345345
# (listed here in the same order they appear in the directory)
346346
- uses: actions/upload-artifact@v3
347347
with:
348-
name: perspective-build
348+
name: perspective-dist
349349
path: packages/perspective/dist/
350350

351351
- uses: actions/upload-artifact@v3
352352
with:
353-
name: perspective-jupyterlab-build
353+
name: perspective-jupyterlab-dist
354354
path: packages/perspective-jupyterlab/dist/
355355

356356
- uses: actions/upload-artifact@v3
357357
with:
358-
name: perspective-viewer-d3fc-build
358+
name: perspective-viewer-d3fc-dist
359359
path: packages/perspective-viewer-d3fc/dist
360360

361361
- uses: actions/upload-artifact@v3
362362
with:
363-
name: perspective-viewer-datagrid-build
363+
name: perspective-viewer-datagrid-dist
364364
path: packages/perspective-viewer-datagrid/dist
365365

366366
- uses: actions/upload-artifact@v3
367367
with:
368-
name: perspective-workspace-build
369-
path: packages/perspective-workspace/dist
368+
name: perspective-viewer-openlayers-dist
369+
path: packages/perspective-viewer-openlayers/dist
370370

371371
- uses: actions/upload-artifact@v3
372372
with:
373-
name: perspective-viewer-build
374-
path: rust/perspective-viewer/dist
373+
name: perspective-esbuild-plugin-dist
374+
path: packages/perspective-esbuild-plugin/dist
375+
376+
- uses: actions/upload-artifact@v3
377+
with:
378+
name: perspective-webpack-plugin-dist
379+
path: packages/perspective-webpack-plugin/dist
380+
381+
- uses: actions/upload-artifact@v3
382+
with:
383+
name: perspective-cli-dist
384+
path: packages/perspective-cli/dist
375385

376386
- uses: actions/upload-artifact@v3
377387
with:
378-
name: perspective-viewer-build-build
379-
path: rust/perspective-viewer/build
388+
name: perspective-workspace-dist
389+
path: packages/perspective-workspace/dist
390+
391+
- uses: actions/upload-artifact@v3
392+
with:
393+
name: perspective-viewer-dist
394+
path: rust/perspective-viewer/dist
380395

381396
######################################################
382397
# Upload Jupyter artifacts for python build/test/dist
383398
- uses: actions/upload-artifact@v3
384399
with:
385-
name: nbextension-build
400+
name: nbextension-dist
386401
path: python/perspective/perspective/nbextension
387402
# if-no-files-found: error # TODO
388403

389404
- uses: actions/upload-artifact@v3
390405
with:
391-
name: labextension-build
406+
name: labextension-dist
392407
path: python/perspective/perspective/labextension
393408
# if-no-files-found: error # TODO
394409

@@ -641,39 +656,34 @@ jobs:
641656
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
642657
- uses: actions/download-artifact@v3
643658
with:
644-
name: perspective-build
659+
name: perspective-dist
645660
path: packages/perspective/dist/
646661

647662
- uses: actions/download-artifact@v3
648663
with:
649-
name: perspective-jupyterlab-build
664+
name: perspective-jupyterlab-dist
650665
path: packages/perspective-jupyterlab/dist/
651666

652667
- uses: actions/download-artifact@v3
653668
with:
654-
name: perspective-viewer-d3fc-build
669+
name: perspective-viewer-d3fc-dist
655670
path: packages/perspective-viewer-d3fc/dist
656671

657672
- uses: actions/download-artifact@v3
658673
with:
659-
name: perspective-viewer-datagrid-build
674+
name: perspective-viewer-datagrid-dist
660675
path: packages/perspective-viewer-datagrid/dist
661676

662677
- uses: actions/download-artifact@v3
663678
with:
664-
name: perspective-workspace-build
679+
name: perspective-workspace-dist
665680
path: packages/perspective-workspace/dist
666681

667682
- uses: actions/download-artifact@v3
668683
with:
669-
name: perspective-viewer-build
684+
name: perspective-viewer-dist
670685
path: rust/perspective-viewer/dist
671686

672-
- uses: actions/download-artifact@v3
673-
with:
674-
name: perspective-viewer-build-build
675-
path: rust/perspective-viewer/build
676-
677687
###############
678688
# WebAssembly #
679689
###############
@@ -796,13 +806,13 @@ jobs:
796806
# TODO
797807
# - uses: actions/download-artifact@v3
798808
# with:
799-
# name: nbextension-build
809+
# name: nbextension-dist
800810
# python: python/perspective/perspective/nbextension
801811

802812
# TODO
803813
# - uses: actions/download-artifact@v3
804814
# with:
805-
# name: labextension-build
815+
# name: labextension-dist
806816
# python: python/perspective/perspective/labextension
807817

808818
##########
@@ -1048,44 +1058,44 @@ jobs:
10481058

10491059
- uses: actions/download-artifact@v3
10501060
with:
1051-
name: perspective-build
1061+
name: perspective-dist
10521062
path: packages/perspective/dist/
10531063

10541064
- uses: actions/download-artifact@v3
10551065
with:
1056-
name: perspective-jupyterlab-build
1066+
name: perspective-jupyterlab-dist
10571067
path: packages/perspective-jupyterlab/dist/
10581068

10591069
- uses: actions/download-artifact@v3
10601070
with:
1061-
name: perspective-viewer-d3fc-build
1071+
name: perspective-viewer-d3fc-dist
10621072
path: packages/perspective-viewer-d3fc/dist
10631073

10641074
- uses: actions/download-artifact@v3
10651075
with:
1066-
name: perspective-viewer-datagrid-build
1076+
name: perspective-viewer-datagrid-dist
10671077
path: packages/perspective-viewer-datagrid/dist
10681078

10691079
- uses: actions/download-artifact@v3
10701080
with:
1071-
name: perspective-workspace-build
1081+
name: perspective-workspace-dist
10721082
path: packages/perspective-workspace/dist
10731083

10741084
- uses: actions/download-artifact@v3
10751085
with:
1076-
name: perspective-viewer-build
1086+
name: perspective-viewer-dist
10771087
path: rust/perspective-viewer/dist
10781088

10791089
# TODO
10801090
# - uses: actions/download-artifact@v3
10811091
# with:
1082-
# name: nbextension-build
1092+
# name: nbextension-dist
10831093
# python: python/perspective/perspective/nbextension
10841094

10851095
# TODO
10861096
# - uses: actions/download-artifact@v3
10871097
# with:
1088-
# name: labextension-build
1098+
# name: labextension-dist
10891099
# python: python/perspective/perspective/labextension
10901100

10911101
##########

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ cmake-build-debug
122122
.python-version
123123
.pytest_cache
124124

125-
package.json.lerna_backup
126125
website/static/css/material-dark.css
127126

128127
# CPP Compile

‎cpp/perspective/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
],
1212
"scripts": {
1313
"build": "node ../../scripts/run_emsdk.js node ./build.js",
14-
"clean": "rimraf dist",
15-
"test": ":",
16-
"test:run": ":",
17-
"test:build": ":"
14+
"clean": "rimraf dist"
15+
},
16+
"devDependencies": {
17+
"fflate": "^0.7.4"
1818
}
1919
}

‎docs/docusaurus.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const config = {
5757
defaultLocale: "en",
5858
locales: ["en"],
5959
},
60-
plugins: ["perspective-loader"],
60+
plugins: ["./plugins/perspective-loader"],
6161
presets: [
6262
[
6363
"classic",

‎docs/package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"scripts": {
66
"docusaurus": "docusaurus",
77
"start": "docusaurus start",
8-
"build": ":",
98
"docs": "docusaurus build",
109
"swizzle": "docusaurus swizzle",
1110
"deploy": "docusaurus deploy",
@@ -25,7 +24,6 @@
2524
"@mdx-js/react": "^1.6.22",
2625
"blocks": "^1.9.1",
2726
"clsx": "^1.1.1",
28-
"perspective-loader": "file:plugins/perspective-loader",
2927
"prism-react-renderer": "^1.3.3",
3028
"react": "^17.0.2",
3129
"react-dom": "^17.0.2"

‎examples/blocks/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
"@finos/perspective-viewer": "^1.9.1",
1515
"@finos/perspective-viewer-d3fc": "^1.9.1",
1616
"@finos/perspective-viewer-datagrid": "^1.9.1",
17+
"@finos/perspective-viewer-openlayers": "^1.9.1",
18+
"@finos/perspective-workspace": "^1.9.1",
1719
"superstore-arrow": "1.0.0"
1820
}
1921
}

‎examples/esbuild-example/build.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ async function build() {
1212
outdir: "dist",
1313
format: "esm",
1414
bundle: true,
15+
target: "es2020",
1516
loader: {
1617
".ttf": "file",
1718
".arrow": "file",

‎examples/esbuild-example/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
"@finos/perspective-viewer": "^1.9.1",
1515
"@finos/perspective-viewer-d3fc": "^1.9.1",
1616
"@finos/perspective-viewer-datagrid": "^1.9.1",
17-
"@finos/perspective-viewer-openlayers": "^1.9.1"
17+
"@finos/perspective-viewer-openlayers": "^1.9.1",
18+
"superstore-arrow": "^1.0.0"
1819
},
1920
"devDependencies": {
2021
"@finos/perspective-esbuild-plugin": "^1.9.1",
21-
"esbuild": "^0.13.12",
22+
"esbuild": "^0.14.54",
2223
"http-server": "^0.11.1"
2324
}
2425
}

‎examples/promo/webpack.config.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ module.exports = {
3434
test: /\.css$/,
3535
use: [{ loader: "style-loader" }, { loader: "css-loader" }],
3636
},
37-
{
38-
test: /\.less$/,
39-
use: [
40-
{ loader: "style-loader" },
41-
{ loader: "css-loader" },
42-
{ loader: "less-loader" },
43-
],
44-
},
4537
{
4638
test: /\.(png|jpe?g|gif)$/i,
4739
type: "asset/resource",

‎examples/react/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "react",
2+
"name": "example-react",
33
"private": true,
44
"version": "1.9.1",
55
"description": "An example app built using `@finos/perspective-viewer`.",
@@ -14,13 +14,13 @@
1414
"@finos/perspective-viewer": "^1.9.1",
1515
"@finos/perspective-viewer-d3fc": "^1.9.1",
1616
"@finos/perspective-viewer-datagrid": "^1.9.1",
17-
"react": "16.8.6",
18-
"react-dom": "16.8.6"
17+
"react": "^16.14.0",
18+
"react-dom": "^16.9.17"
1919
},
2020
"devDependencies": {
2121
"@finos/perspective-webpack-plugin": "^1.9.1",
22-
"@types/react": "^16.8.6",
23-
"@types/react-dom": "^16.9.4",
22+
"@types/react": "^16.14.0",
23+
"@types/react-dom": "^16.9.17",
2424
"source-map-loader": "^0.2.4",
2525
"ts-loader": "^6.2.1"
2626
}

0 commit comments

Comments
 (0)