Skip to content

Commit d0ddf03

Browse files
authored
Merge pull request #5508 from plotly/improve-mk-bundles
Revise process of making bundles and simplify making partial bundles
2 parents e65718e + a66d56a commit d0ddf03

Some content is hidden

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

59 files changed

+499
-251
lines changed

README.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,9 @@ Then elsewhere in your code:
9696
var Plotly = require('./path/to/custom-plotly');
9797
```
9898

99-
#### Non-ascii characters
99+
Alternatively you could browserify a custom bundle of desired trace modules e.g. `pie` and `choropleth` using
100+
`npm run partial-bundle pie choropleth --name=custom`
100101

101-
Important: the plotly.js code base contains some non-ascii characters. Therefore, please make sure to set the `charset` attribute to `"utf-8"` in the script tag that imports your plotly.js bundle. For example:
102-
103-
```html
104-
<script src="my-plotly-bundle.js" charset="utf-8"></script>
105-
```
106102

107103
## Building plotly.js
108104

lib/index-basic.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,18 @@
33
var Plotly = require('./core');
44

55
Plotly.register([
6+
// traces
67
require('./bar'),
7-
require('./pie')
8+
require('./pie'),
9+
10+
// transforms
11+
require('./aggregate'),
12+
require('./filter'),
13+
require('./groupby'),
14+
require('./sort'),
15+
16+
// components
17+
require('./calendars')
818
]);
919

10-
module.exports = require('./register_extra')(Plotly);
20+
module.exports = Plotly;

lib/index-cartesian.js

+14-4
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,27 @@
33
var Plotly = require('./core');
44

55
Plotly.register([
6+
// traces
67
require('./bar'),
78
require('./box'),
89
require('./heatmap'),
910
require('./histogram'),
1011
require('./histogram2d'),
1112
require('./histogram2dcontour'),
12-
require('./image'),
13-
require('./pie'),
1413
require('./contour'),
1514
require('./scatterternary'),
16-
require('./violin')
15+
require('./violin'),
16+
require('./image'),
17+
require('./pie'),
18+
19+
// transforms
20+
require('./aggregate'),
21+
require('./filter'),
22+
require('./groupby'),
23+
require('./sort'),
24+
25+
// components
26+
require('./calendars')
1727
]);
1828

19-
module.exports = require('./register_extra')(Plotly);
29+
module.exports = Plotly;

lib/index-finance.js

+14-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,25 @@
33
var Plotly = require('./core');
44

55
Plotly.register([
6+
// traces
67
require('./bar'),
78
require('./histogram'),
9+
require('./funnel'),
10+
require('./waterfall'),
811
require('./pie'),
912
require('./funnelarea'),
13+
require('./indicator'),
1014
require('./ohlc'),
1115
require('./candlestick'),
12-
require('./funnel'),
13-
require('./waterfall'),
14-
require('./indicator')
16+
17+
// transforms
18+
require('./aggregate'),
19+
require('./filter'),
20+
require('./groupby'),
21+
require('./sort'),
22+
23+
// components
24+
require('./calendars')
1525
]);
1626

17-
module.exports = require('./register_extra')(Plotly);
27+
module.exports = Plotly;

lib/index-geo.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,18 @@
33
var Plotly = require('./core');
44

55
Plotly.register([
6+
// traces
67
require('./scattergeo'),
7-
require('./choropleth')
8+
require('./choropleth'),
9+
10+
// transforms
11+
require('./aggregate'),
12+
require('./filter'),
13+
require('./groupby'),
14+
require('./sort'),
15+
16+
// components
17+
require('./calendars')
818
]);
919

10-
module.exports = require('./register_extra')(Plotly);
20+
module.exports = Plotly;

lib/index-gl2d.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,21 @@
33
var Plotly = require('./core');
44

55
Plotly.register([
6+
// traces
67
require('./scattergl'),
78
require('./splom'),
89
require('./pointcloud'),
910
require('./heatmapgl'),
10-
require('./parcoords')
11+
require('./parcoords'),
12+
13+
// transforms
14+
require('./aggregate'),
15+
require('./filter'),
16+
require('./groupby'),
17+
require('./sort'),
18+
19+
// components
20+
require('./calendars')
1121
]);
1222

13-
module.exports = require('./register_extra')(Plotly);
23+
module.exports = Plotly;

lib/index-gl3d.js

+13-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,23 @@
33
var Plotly = require('./core');
44

55
Plotly.register([
6+
// traces
67
require('./scatter3d'),
78
require('./surface'),
8-
require('./mesh3d'),
99
require('./isosurface'),
1010
require('./volume'),
11+
require('./mesh3d'),
1112
require('./cone'),
12-
require('./streamtube')
13+
require('./streamtube'),
14+
15+
// transforms
16+
require('./aggregate'),
17+
require('./filter'),
18+
require('./groupby'),
19+
require('./sort'),
20+
21+
// components
22+
require('./calendars')
1323
]);
1424

15-
module.exports = require('./register_extra')(Plotly);
25+
module.exports = Plotly;

lib/index-mapbox.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,19 @@
33
var Plotly = require('./core');
44

55
Plotly.register([
6+
// traces
67
require('./scattermapbox'),
78
require('./choroplethmapbox'),
8-
require('./densitymapbox')
9+
require('./densitymapbox'),
10+
11+
// transforms
12+
require('./aggregate'),
13+
require('./filter'),
14+
require('./groupby'),
15+
require('./sort'),
16+
17+
// components
18+
require('./calendars')
919
]);
1020

11-
module.exports = require('./register_extra')(Plotly);
21+
module.exports = Plotly;

lib/index-strict.js

+12-13
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
var Plotly = require('./core');
44

5-
// traces
65
Plotly.register([
6+
// traces
77
require('./bar'),
88
require('./box'),
99
require('./heatmap'),
@@ -16,40 +16,39 @@ Plotly.register([
1616
require('./funnel'),
1717
require('./waterfall'),
1818
require('./image'),
19-
2019
require('./pie'),
2120
require('./sunburst'),
2221
require('./treemap'),
2322
require('./funnelarea'),
24-
2523
require('./scattergeo'),
2624
require('./choropleth'),
27-
2825
require('./scattergl'),
2926
require('./splom'),
30-
3127
require('./parcoords'),
3228
require('./parcats'),
33-
3429
require('./scattermapbox'),
3530
require('./choroplethmapbox'),
3631
require('./densitymapbox'),
37-
3832
require('./sankey'),
3933
require('./indicator'),
40-
4134
require('./table'),
42-
4335
require('./carpet'),
4436
require('./scattercarpet'),
4537
require('./contourcarpet'),
46-
4738
require('./ohlc'),
4839
require('./candlestick'),
49-
5040
require('./scatterpolar'),
5141
require('./scatterpolargl'),
52-
require('./barpolar')
42+
require('./barpolar'),
43+
44+
// transforms
45+
require('./aggregate'),
46+
require('./filter'),
47+
require('./groupby'),
48+
require('./sort'),
49+
50+
// components
51+
require('./calendars')
5352
]);
5453

55-
module.exports = require('./register_extra')(Plotly);
54+
module.exports = Plotly;

lib/index.js

+12-16
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
var Plotly = require('./core');
44

5-
// traces
65
Plotly.register([
6+
// traces
77
require('./bar'),
88
require('./box'),
99
require('./heatmap'),
@@ -16,52 +16,48 @@ Plotly.register([
1616
require('./funnel'),
1717
require('./waterfall'),
1818
require('./image'),
19-
2019
require('./pie'),
2120
require('./sunburst'),
2221
require('./treemap'),
2322
require('./funnelarea'),
24-
2523
require('./scatter3d'),
2624
require('./surface'),
2725
require('./isosurface'),
2826
require('./volume'),
2927
require('./mesh3d'),
3028
require('./cone'),
3129
require('./streamtube'),
32-
3330
require('./scattergeo'),
3431
require('./choropleth'),
35-
3632
require('./scattergl'),
3733
require('./splom'),
38-
3934
require('./pointcloud'),
4035
require('./heatmapgl'),
41-
4236
require('./parcoords'),
43-
4437
require('./parcats'),
45-
4638
require('./scattermapbox'),
4739
require('./choroplethmapbox'),
4840
require('./densitymapbox'),
49-
5041
require('./sankey'),
5142
require('./indicator'),
52-
5343
require('./table'),
54-
5544
require('./carpet'),
5645
require('./scattercarpet'),
5746
require('./contourcarpet'),
58-
5947
require('./ohlc'),
6048
require('./candlestick'),
61-
6249
require('./scatterpolar'),
6350
require('./scatterpolargl'),
64-
require('./barpolar')
51+
require('./barpolar'),
52+
53+
// transforms
54+
require('./aggregate'),
55+
require('./filter'),
56+
require('./groupby'),
57+
require('./sort'),
58+
59+
// components
60+
require('./calendars')
6561
]);
6662

67-
module.exports = require('./register_extra')(Plotly);
63+
module.exports = Plotly;

lib/register_extra.js

-27
This file was deleted.

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
"plotly"
2222
],
2323
"scripts": {
24+
"partial-bundle": "node tasks/partial_bundle.js",
2425
"bundle": "node tasks/bundle.js",
25-
"header-dist": "node tasks/header_dist.js",
26+
"extra-bundles": "node tasks/extra_bundles.js",
2627
"stats": "node tasks/stats.js",
2728
"find-strings": "node tasks/find_locale_strings.js",
2829
"preprocess": "node tasks/preprocess.js",
29-
"build": "node tasks/empty_dist.js && npm run preprocess && npm run find-strings && npm run bundle && npm run header-dist && npm run stats",
30+
"build": "node tasks/empty_dist.js && npm run preprocess && npm run find-strings && npm run bundle && npm run extra-bundles && npm run stats",
3031
"cibuild": "node tasks/empty_dist.js && npm run preprocess && node tasks/cibundle.js",
3132
"watch": "node tasks/watch.js",
3233
"lint": "eslint --version && eslint .",
@@ -51,7 +52,7 @@
5152
"baseline": "node tasks/baseline.js",
5253
"noci-baseline": "npm run cibuild && ./tasks/noci_test.sh image && git checkout dist && echo 'Please do not commit unless the change was expected!'",
5354
"preversion": "check-node-version --node 12 --npm 6.14 && npm-link-check && npm ls --prod",
54-
"version": "npm run build && npm run no-bad-char && git add -A dist build src/version.js",
55+
"version": "npm run build && npm run no-bad-char && git add -A lib dist build src/version.js",
5556
"postversion": "node -e \"console.log('Version bumped and committed. If ok, run: git push && git push --tags')\"",
5657
"postpublish": "node tasks/sync_packages.js",
5758
"postshrinkwrap": "chttps ."

0 commit comments

Comments
 (0)