10000 Revise process of making bundles and simplify making partial bundles by archmoj · Pull Request #5508 · plotly/plotly.js · GitHub
[go: up one dir, main page]

Skip to content

8000 Revise process of making bundles and simplify making partial bundles #5508

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

Merged
merged 15 commits into from
Feb 22, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
write component files to lib
 - generated component files using preprocess in lib
 - deprecate component files in lib
  • Loading branch information
archmoj committed Feb 22, 2021
commit 01136b75cfd01cf4f10ca9e88d0c8d981c3adbc4
3 changes: 3 additions & 0 deletions lib/aggregate.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/transforms/aggregate instead of lib/aggregate
module.exports = require('../src/transforms/aggregate');
3 changes: 3 additions & 0 deletions lib/bar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/bar instead of lib/bar
module.exports = require('../src/traces/bar');
3 changes: 3 additions & 0 deletions lib/barpolar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/barpolar instead of lib/barpolar
module.exports = require('../src/traces/barpolar');
3 changes: 3 additions & 0 deletions lib/box.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/box instead of lib/box
module.exports = require('../src/traces/box');
3 changes: 3 additions & 0 deletions lib/calendars.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/components/calendars instead of lib/calendars
module.exports = require('../src/components/calendars');
3 changes: 3 additions & 0 deletions lib/candlestick.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/candlestick instead of lib/candlestick
module.exports = require('../src/traces/candlestick');
3 changes: 3 additions & 0 deletions lib/carpet.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/carpet instead of lib/carpet
module.exports = require('../src/traces/carpet');
3 changes: 3 additions & 0 deletions lib/choropleth.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/choropleth instead of lib/choropleth
module.exports = require('../src/traces/choropleth');
3 changes: 3 additions & 0 deletions lib/choroplethmapbox.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/choroplethmapbox instead of lib/choroplethmapbox
module.exports = require('../src/traces/choroplethmapbox');
3 changes: 3 additions & 0 deletions lib/cone.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/cone instead of lib/cone
module.exports = require('../src/traces/cone');
3 changes: 3 additions & 0 deletions lib/contour.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/contour instead of lib/contour
module.exports = require('../src/traces/contour');
3 changes: 3 additions & 0 deletions lib/contourcarpet.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/contourcarpet instead of lib/contourcarpet
module.exports = require('../src/traces/contourcarpet');
3 changes: 3 additions & 0 deletions lib/densitymapbox.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/densitymapbox instead of lib/densitymapbox
module.exports = require('../src/traces/densitymapbox');
3 changes: 3 additions & 0 deletions lib/filter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/transforms/filter instead of lib/filter
module.exports = require('../src/transforms/filter');
3 changes: 3 additions & 0 deletions lib/funnel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/funnel instead of lib/funnel
module.exports = require('../src/traces/funnel');
3 changes: 3 additions & 0 deletions lib/funnelarea.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/funnelarea instead of lib/funnelarea
module.exports = require('../src/traces/funnelarea');
3 changes: 3 additions & 0 deletions lib/groupby.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/transforms/groupby instead of lib/groupby
module.exports = require('../src/transforms/groupby');
3 changes: 3 additions & 0 deletions lib/heatmap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/heatmap instead of lib/heatmap
module.exports = require('../src/traces/heatmap');
3 changes: 3 additions & 0 deletions lib/heatmapgl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/heatmapgl instead of lib/heatmapgl
module.exports = require('../src/traces/heatmapgl');
3 changes: 3 additions & 0 deletions lib/histogram.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/histogram instead of lib/histogram
module.exports = require('../src/traces/histogram');
3 changes: 3 additions & 0 deletions lib/histogram2d.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/histogram2d instead of lib/histogram2d
module.exports = require('../src/traces/histogram2d');
3 changes: 3 additions & 0 deletions lib/histogram2dcontour.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/histogram2dcontour instead of lib/histogram2dcontour
module.exports = require('../src/traces/histogram2dcontour');
3 changes: 3 additions & 0 deletions lib/image.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/image instead of lib/image
module.exports = require('../src/traces/image');
3 changes: 3 additions & 0 deletions lib/indicator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/indicator instead of lib/indicator
module.exports = require('../src/traces/indicator');
3 changes: 3 additions & 0 deletions lib/isosurface.js
Origi 1CF5 nal file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/isosurface instead of lib/isosurface
module.exports = require('../src/traces/isosurface');
3 changes: 3 additions & 0 deletions lib/mesh3d.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/mesh3d instead of lib/mesh3d
module.exports = require('../src/traces/mesh3d');
3 changes: 3 additions & 0 deletions lib/ohlc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/ohlc instead of lib/ohlc
module.exports = require('../src/traces/ohlc');
3 changes: 3 additions & 0 deletions lib/parcats.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/parcats instead of lib/parcats
module.exports = require('../src/traces/parcats');
3 changes: 3 additions & 0 deletions lib/parcoords.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/parcoords instead of lib/parcoords
module.exports = require('../src/traces/parcoords');
3 changes: 3 additions & 0 deletions lib/pie.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/pie instead of lib/pie
module.exports = require('../src/traces/pie');
3 changes: 3 additions & 0 deletions lib/pointcloud.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/pointcloud instead of lib/pointcloud
module.exports = require('../src/traces/pointcloud');
3 changes: 3 additions & 0 deletions lib/sankey.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/sankey instead of lib/sankey
module.exports = require('../src/traces/sankey');
3 changes: 3 additions & 0 deletions lib/scatter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/scatter instead of lib/scatter
module.exports = require('../src/traces/scatter');
3 changes: 3 additions & 0 deletions lib/scatter3d.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/scatter3d instead of lib/scatter3d
module.exports = require('../src/traces/scatter3d');
3 changes: 3 additions & 0 deletions lib/scattercarpet.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/scattercarpet instead of lib/scattercarpet
module.exports = require('../src/traces/scattercarpet');
3 changes: 3 additions & 0 deletions lib/scattergeo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/scattergeo instead of lib/scattergeo
module.exports = require('../src/traces/scattergeo');
3 changes: 3 additions & 0 deletions lib/scattergl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/scattergl instead of lib/scattergl
module.exports = require('../src/traces/scattergl');
3 changes: 3 additions & 0 deletions lib/scattermapbox.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/scattermapbox instead of lib/scattermapbox
module.exports = require('../src/traces/scattermapbox');
3 changes: 3 additions & 0 deletions lib/scatterpolar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/scatterpolar instead of lib/scatterpolar
module.exports = require('../src/traces/scatterpolar');
3 changes: 3 additions & 0 deletions lib/scatterpolargl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/scatterpolargl instead of lib/scatterpolargl
module.exports = require('../src/traces/scatterpolargl');
3 changes: 3 additions & 0 deletions lib/scatterternary.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/scatterternary instead of lib/scatterternary
module.exports = require('../src/traces/scatterternary');
3 changes: 3 additions & 0 deletions lib/sort.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/transforms/sort instead of lib/sort
module.exports = require('../src/transforms/sort');
3 changes: 3 additions & 0 deletions lib/splom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/splom instead of lib/splom
module.exports = require('../src/traces/splom');
3 changes: 3 additions & 0 deletions lib/streamtube.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/streamtube instead of lib/streamtube
module.exports = require('../src/traces/streamtube');
3 changes: 3 additions & 0 deletions lib/sunburst.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/sunburst instead of lib/sunburst
module.exports = require('../src/traces/sunburst');
3 changes: 3 additions & 0 deletions lib/surface.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/surface instead of lib/surface
module.exports = require('../src/traces/surface');
3 changes: 3 additions & 0 deletions lib/table.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/table instead of lib/table
module.exports = require('../src/traces/table');
3 changes: 3 additions & 0 deletions lib/treemap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/treemap instead of lib/treemap
module.exports = require('../src/traces/treemap');
3 changes: 3 additions & 0 deletions lib/violin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/violin instead of lib/violin
module.exports = require('../src/traces/violin');
3 changes: 3 additions & 0 deletions lib/volume.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/volume instead of lib/volume
module.exports = require('../src/traces/volume');
3 changes: 3 additions & 0 deletions lib/waterfall.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';
// deprecated in plotly.js v2 - one may use src/traces/waterfall instead of lib/waterfall
module.exports = require('../src/traces/waterfall');
7 changes: 3 additions & 4 deletions tasks/partial_bundle.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var fs = require('fs');
var path = require('path');
var runSeries = require('run-series');
var prependFile = require('prepend-file');
Expand All @@ -8,8 +7,8 @@ var common = require('./util/common');
var _bundle = require('./util/browserify_wrapper');

var header = constants.licenseDist + '\n';
var allTraces = fs.readdirSync(path.join(constants.pathToSrc, 'traces'));
var fullIndex = fs.readFileSync(constants.pathToPlotlyIndex, 'utf-8');
var allTraces = constants.allTraces;
var mainIndex = constants.mainIndex;

var argv = process.argv;

Expand Down Expand Up @@ -61,7 +60,7 @@ function partialBundle(tasks, opts) {
var traceList = opts.traceList;

tasks.push(function(done) {
var partialIndex = fullIndex;
var partialIndex = mainIndex;
allTraces.forEach(function(trace) {
if(traceList.indexOf(trace) === -1) {
var WHITESPACE_BEFORE = '\\s*';
Expand Down
41 changes: 41 additions & 0 deletions tasks/preprocess.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var fs = require('fs-extra');
var path = require('path');
var sass = require('node-sass');

var constants = require('./util/constants');
Expand All @@ -8,6 +9,7 @@ var updateVersion = require('./util/update_version');

// main
makeBuildCSS();
exposePartsInLib();
copyTopojsonFiles();
updateVersion(constants.pathToPlotlyVersion);

Expand All @@ -24,6 +26,45 @@ function makeBuildCSS( 10000 ) {
});
}

function exposePartsInLib() {
var obj = {};

var insert = function(name, folder) {
obj[name] = folder + '/' + name;
};

insert('calendars', 'src/components');

[
'aggregate',
'filter',
'groupby',
'sort'
].forEach(function(k) {
insert(k, 'src/transforms');
});

constants.allTraces.forEach(function(k) {
insert(k, 'src/traces');
});

writeLibFiles(obj);
}

function writeLibFiles(obj) {
for(var name in obj) {
common.writeFile(
path.join(constants.pathToLib, name + '.js'),
[
'\'use strict\';',
'// deprecated in plotly.js v2 - one may use ' + obj[name] + ' instead of ' + 'lib/' + name,
'module.exports = require(\'../' + obj[name] + '\');',
''
].join('\n')
);
}
}

// copy topojson files from sane-topojson to dist/
function copyTopojsonFiles() {
fs.copy(
Expand Down
11 changes: 10 additions & 1 deletion tasks/util/constants.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
var fs = require('fs');
var path = require('path');
var pkg = require('../../package.json');

Expand All @@ -10,6 +11,11 @@ var pathToVendor = path.join(pathToRoot, 'vendor/');
var pathToDist = path.join(pathToRoot, 'dist/');
var pathToBuild = path.join(pathToRoot, 'build/');

var pathToPlotlyIndex = path.join(pathToLib, 'index.js');
var mainIndex = fs.readFileSync(pathToPlotlyIndex, 'utf-8');
var pathToPlotlyTraces = path.join(pathToSrc, 'traces');
var allTraces = fs.readdirSync(pathToPlotlyTraces);

var pathToTopojsonSrc;
try {
pathToTopojsonSrc = path.join(path.dirname(require.resolve('sane-topojson')), 'dist/');
Expand Down Expand Up @@ -153,7 +159,10 @@ module.exports = {
pathToVendor: pathToVendor,
pathToDist: pathToDist,

pathToPlotlyIndex: path.join(pathToLib, 'index.js'),
allTraces: allTraces,
mainIndex: mainIndex,
pathToPlotlyIndex: pathToPlotlyIndex,
pathToPlotlyTraces: pathToPlotlyTraces,
pathToPlotlyCore: path.join(pathToSrc, 'core.js'),
pathToPlotlyVersion: path.join(pathToSrc, 'version.js'),
pathToPlotlyBuild: path.join(pathToBuild, 'plotly.js'),
Expand Down
0