strict no longer a partial bundle - generate at build step

archmoj · archmoj · commit f94aa457a7f2 · 2022-03-11T16:07:36.000-05:00
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "use-draftlogs": "node tasks/use_draftlogs.js",
     "empty-draftlogs": "node tasks/empty_draftlogs.js",
     "empty-dist": "node tasks/empty_dist.js",
-    "build": "npm run empty-dist && npm run preprocess && npm run find-strings && npm run bundle && npm run extra-bundles basic && npm run extra-bundles cartesian && npm run extra-bundles geo && npm run extra-bundles gl2d && npm run extra-bundles gl3d && npm run extra-bundles mapbox && npm run extra-bundles finance && npm run extra-bundles strict && npm run locales && npm run schema dist && npm run stats",
+    "build": "npm run empty-dist && npm run preprocess && npm run find-strings && npm run bundle && npm run extra-bundles basic && npm run extra-bundles cartesian && npm run extra-bundles geo && npm run extra-bundles gl2d && npm run extra-bundles gl3d && npm run extra-bundles mapbox && npm run extra-bundles finance && npm run locales && npm run schema dist && npm run stats",
     "regl-codegen": "node devtools/regl_codegen/server.js",
     "cibuild": "npm run empty-dist && npm run preprocess && node tasks/cibundle.js",
     "watch": "node tasks/watch.js",
diff --git a/tasks/bundle.js b/tasks/bundle.js
@@ -10,6 +10,11 @@ var pathToPlotlyDist = constants.pathToPlotlyDist;
 var pathToPlotlyIndex = constants.pathToPlotlyIndex;
 var pathToPlotlyDistMin = constants.pathToPlotlyDistMin;
 var pathToPlotlyDistWithMeta = constants.pathToPlotlyDistWithMeta;
+
+var pathToPlotlyStrict = constants.pathToPlotlyStrict;
+var pathToPlotlyStrictDist = constants.pathToPlotlyStrictDist;
+var pathToPlotlyStrictDistMin = constants.pathToPlotlyStrictDistMin;
+
 var pathToPlotlyGeoAssetsSrc = constants.pathToPlotlyGeoAssetsSrc;
 var pathToPlotlyGeoAssetsDist = constants.pathToPlotlyGeoAssetsDist;
 
@@ -39,6 +44,19 @@ tasks.push(function(done) {
     });
 });
 
+// Browserify plotly.js-strict
+tasks.push(function(done) {
+    _bundle(pathToPlotlyStrict, pathToPlotlyStrictDist, {
+        standalone: 'Plotly',
+        pathToMinBundle: pathToPlotlyStrictDistMin
+    }, function() {
+        prependFile(pathToPlotlyStrictDist, header, common.throwOnError);
+        prependFile(pathToPlotlyStrictDistMin, header, common.throwOnError);
+
+        done();
+    });
+});
+
 // Browserify the geo assets
 tasks.push(function(done) {
     _bundle(pathToPlotlyGeoAssetsSrc, pathToPlotlyGeoAssetsDist, {
diff --git a/tasks/stats.js b/tasks/stats.js
@@ -123,7 +123,7 @@ function getMainBundleInfo() {
         '> The minified version of each partial bundle is also published to npm in a separate "dist-min" package.',
         '',
         [
-            '> The strict partial bundle includes everything except the traces that require function constructors.',
+            '> The strict partial bundle now includes all traces, noting that for regl-based traces the functions are provided inside the bundle.',
             'Over time we hope to include more of the remaining trace types here, after which we intend to work on other strict CSP issues',
             'such as inline CSS that we may not be able to include in the main bundle.',
         ].join(' '),
diff --git a/tasks/util/constants.js b/tasks/util/constants.js
@@ -200,6 +200,8 @@ module.exports = {
     pathToPlotlyDist: path.join(pathToDist, 'plotly.js'),
     pathToPlotlyDistMin: path.join(pathToDist, 'plotly.min.js'),
     pathToPlotlyDistWithMeta: path.join(pathToDist, 'plotly-with-meta.js'),
+    pathToPlotlyStrictDist: path.join(pathToDist, 'plotly-strict.js'),
+    pathToPlotlyStrictDistMin: path.join(pathToDist, 'plotly-strict.min.js'),
 
     pathToSchemaDiff: path.join(pathToTest, 'plot-schema.json'),
     pathToSchemaDist: path.join(pathToDist, 'plot-schema.json'),

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ function getMainBundleInfo() {`
`123`	`123`	`'> The minified version of each partial bundle is also published to npm in a separate "dist-min" package.',`
`124`	`124`	`'',`
`125`	`125`	`[`
`126`		`- '> The strict partial bundle includes everything except the traces that require function constructors.',`
	`126`	`+ '> The strict partial bundle now includes all traces, noting that for regl-based traces the functions are provided inside the bundle.',`
`127`	`127`	`'Over time we hope to include more of the remaining trace types here, after which we intend to work on other strict CSP issues',`
`128`	`128`	`'such as inline CSS that we may not be able to include in the main bundle.',`
`129`	`129`	`].join(' '),`