Skip to content
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

Use topojson input from node_modules/sane-topojson #5492

Merged
merged 4 commits into from
Feb 11, 2021

Conversation

archmoj
Copy link
Contributor

@archmoj archmoj commented Feb 11, 2021

Removing topojson files from vendor folder to avoid duplicates on (dist and vendor) and simplify build process by using raw files from sane-topojson/dist iwithin node_modules folder.

@plotly/plotly_js

@archmoj archmoj added this to the NEXT milestone Feb 11, 2021
@archmoj archmoj requested a review from alexcjohnson February 11, 2021 15:27
@@ -5,6 +5,7 @@
var Fuse = require('fuse.js/dist/fuse.common.js');
var mocks = require('../../build/test_dashboard_mocks.json');
var credentials = require('../../build/credentials.json');
var constants = require('@src/plots/geo/constants');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't you want tasks/util/constants?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is exactly the same as what is used in geo_test

var constants = require('@src/plots/geo/constants');

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. We are not really using local files here and in geo_test on this branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!
Fixed in 343faa8.

@@ -19,7 +19,7 @@ var Tabs = {
Plotly.setPlotConfig({

// use local topojson files
topojsonURL: '../../vendor/topojson/',
topojsonURL: '/node_modules/sane-topojson/dist/',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or it should be

topojsonURL: '../../node_modules/sane-topojson/dist/',

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 815d047.

@archmoj archmoj requested a review from alexcjohnson February 11, 2021 16:55
Copy link
Collaborator

@alexcjohnson alexcjohnson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💃 LGTM!

@archmoj archmoj merged commit 7347bed into master Feb 11, 2021
@archmoj archmoj deleted the avoid-duplicate-topojson branch February 11, 2021 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants