Merge pull request #5492 from plotly/avoid-duplicate-topojson

Use topojson input from node_modules/sane-topojson

Author: archmoj

Diff for: devtools/test_dashboard/devtools.js

@@ -19,7 +19,7 @@ var Tabs = {
         Plotly.setPlotConfig({
 
             // use local topojson files
-            topojsonURL: '../../vendor/topojson/',
+            topojsonURL: '../../node_modules/sane-topojson/dist/',
 
             // register mapbox access token
             // run `npm run preset` if you haven't yet

Diff for: package.json

@@ -21,12 +21,12 @@
     "plotly"
   ],
   "scripts": {
-    "preprocess": "node tasks/preprocess.js",
     "bundle": "node tasks/bundle.js",
     "header-dist": "node tasks/header_dist.js",
     "stats": "node tasks/stats.js",
     "find-strings": "node tasks/find_locale_strings.js",
-    "build": "node tasks/empty_dist.js && npm run preprocess && node tasks/topojson_dist.js && npm run find-strings && npm run bundle && npm run header-dist && npm run stats",
+    "preprocess": "node tasks/preprocess.js",
+    "build": "node tasks/empty_dist.js && npm run preprocess && npm run find-strings && npm run bundle && npm run header-dist && npm run stats",
     "cibuild": "node tasks/empty_dist.js && npm run preprocess && node tasks/cibundle.js",
     "watch": "node tasks/watch.js",
     "lint": "eslint --version && eslint .",

Diff for: tasks/preprocess.js

@@ -24,11 +24,11 @@ function makeBuildCSS() {
     });
 }
 
-// copy topojson files from sane-topojson to vendor/
+// copy topojson files from sane-topojson to dist/
 function copyTopojsonFiles() {
     fs.copy(
         constants.pathToTopojsonSrc,
-        constants.pathToTopojsonVendor,
+        constants.pathToTopojsonDist,
         { clobber: true },
         common.throwOnError
     );

Diff for: tasks/topojson_dist.js

@@ -65,7 +65,6 @@ module.exports = {
 
     pathToTopojsonSrc: pathToTopojsonSrc,
     pathToTopojsonDist: path.join(pathToDist, 'topojson/'),
-    pathToTopojsonVendor: path.join(pathToVendor, 'topojson/'),
     pathToPlotlyGeoAssetsSrc: path.join(pathToSrc, 'assets/geo_assets.js'),
     pathToPlotlyGeoAssetsDist: path.join(pathToDist, 'plotly-geo-assets.js'),
 

Diff for: tasks/util/constants.js

@@ -121,6 +121,7 @@ var pathToStrictD3 = path.join(__dirname, '..', '..', 'tasks', 'util', 'strict_d
 var pathToJQuery = path.join(__dirname, 'assets', 'jquery-1.8.3.min.js');
 var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
 var pathToUnpolyfill = path.join(__dirname, 'assets', 'unpolyfill.js');
+var pathToSaneTopojsonDist = path.join(__dirname, '..', '..', 'node_modules', 'sane-topojson', 'dist');
 var pathToMathJax = path.join(constants.pathToVendor, 'extras', 'mathjax');
 
 var reporters = [];
@@ -179,11 +180,11 @@ func.defaultConfig = {
     files: [
         pathToCustomMatchers,
         pathToUnpolyfill,
-        // available to fetch from /base/path/to/mathjax
+        // available to fetch from /base/vendor/extras/mathjax/
         // more info: http://karma-runner.github.io/3.0/config/files.html
         {pattern: pathToMathJax + '/**', included: false, watched: false, served: true},
-        // available to fetch local topojson files
-        {pattern: constants.pathToTopojsonVendor + '/**', included: false, watched: false, served: true}
+        // available to fetch from /base/node_modules/sane-topojson/dist/
+        {pattern: pathToSaneTopojsonDist + '/**', included: false, watched: false, served: true}
     ],
 
     // list of files / pattern to exclude

Diff for: test/jasmine/karma.conf.js

@@ -24,7 +24,7 @@ var HOVERMINTIME = require('@src/components/fx').constants.HOVERMINTIME;
 
 // use local topojson files
 Plotly.setPlotConfig({
-    topojsonURL: '/base/vendor/topojson/'
+    topojsonURL: '/base/node_modules/sane-topojson/dist/'
 });
 
 function move(fromX, fromY, toX, toY, delay) {