Skip to content

Commit 1b4fd15

Browse files
committed
Merge remote-tracking branch 'origin/master' into new-d3-geo
2 parents 557ebde + 59390cb commit 1b4fd15

File tree

181 files changed

+377
-3067
lines changed

Some content is hidden

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

181 files changed

+377
-3067
lines changed

.circleci/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,11 @@ jobs:
167167
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plotly.min.js
168168
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plot-schema.json
169169
- run:
170-
name: Test bundles
170+
name: Test certain bundles against function constructors
171171
command: npm run no-new-func
172+
- run:
173+
name: Test plotly bundles againt unexpected characters
174+
command: npm run no-bad-char
172175

173176
workflows:
174177
version: 2

dist/plotly-strict.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/**
2+
* plotly.js (strict) v2.0.0
3+
* Copyright 2012-2021, Plotly, Inc.
4+
* All rights reserved.
5+
* Licensed under the MIT license
6+
*/

dist/plotly-strict.min.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/**
2+
* plotly.js (strict) v2.0.0
3+
* Copyright 2012-2021, Plotly, Inc.
4+
* All rights reserved.
5+
* Licensed under the MIT license
6+
*/

lib/contourgl.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

lib/index-basic.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,5 @@ Plotly.register([
1515
require('./pie')
1616
]);
1717

18-
// transforms
19-
Plotly.register([
20-
require('./aggregate'),
21-
require('./filter'),
22-
require('./groupby'),
23-
require('./sort')
24-
]);
25-
18+
require('./register_extra')(Plotly);
2619
module.exports = Plotly;

lib/index-cartesian.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,5 @@ Plotly.register([
2424
require('./violin')
2525
]);
2626

27-
// transforms
28-
Plotly.register([
29-
require('./aggregate'),
30-
require('./filter'),
31-
require('./groupby'),
32-
require('./sort')
33-
]);
34-
27+
require('./register_extra')(Plotly);
3528
module.exports = Plotly;

lib/index-finance.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,5 @@ Plotly.register([
2222
require('./indicator')
2323
]);
2424

25-
// transforms
26-
Plotly.register([
27-
require('./aggregate'),
28-
require('./filter'),
29-
require('./groupby'),
30-
require('./sort')
31-
]);
32-
25+
require('./register_extra')(Plotly);
3326
module.exports = Plotly;

lib/index-geo.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,5 @@ Plotly.register([
1515
require('./choropleth')
1616
]);
1717

18-
// transforms
19-
Plotly.register([
20-
require('./aggregate'),
21-
require('./filter'),
22-
require('./groupby'),
23-
require('./sort')
24-
]);
25-
18+
require('./register_extra')(Plotly);
2619
module.exports = Plotly;

lib/index-gl2d.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,9 @@ var Plotly = require('./core');
1313
Plotly.register([
1414
require('./scattergl'),
1515
require('./splom'),
16-
require('./pointcloud'),
1716
require('./heatmapgl'),
18-
require('./contourgl'),
1917
require('./parcoords')
2018
]);
2119

22-
// transforms
23-
Plotly.register([
24-
require('./aggregate'),
25-
require('./filter'),
26-
require('./groupby'),
27-
require('./sort')
28-
]);
29-
20+
require('./register_extra')(Plotly);
3021
module.exports = Plotly;

lib/index-gl3d.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,5 @@ Plotly.register([
2020
require('./streamtube')
2121
]);
2222

23-
// transforms
24-
Plotly.register([
25-
require('./aggregate'),
26-
require('./filter'),
27-
require('./groupby'),
28-
require('./sort')
29-
]);
30-
23+
require('./register_extra')(Plotly);
3124
module.exports = Plotly;

0 commit comments

Comments
 (0)