Skip to content

Commit 7112d33

Browse files
committed
Update library paths
1 parent a2cce65 commit 7112d33

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

devtools/test_dashboard/devtools.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var Tabs = {
1717
Plotly.setPlotConfig({
1818

1919
// use local topojson files
20-
topojsonURL: "../../dist/topojson/",
20+
topojsonURL: "../../topojson/dist",
2121
// register mapbox access token
2222
// run `npm run preset` if you haven't yet
2323
mapboxAccessToken: credentials.MAPBOX_ACCESS_TOKEN,
@@ -267,4 +267,3 @@ function handleOnLoad() {
267267
Tabs.setPlotConfig();
268268
plotFromHash();
269269
}
270-

tasks/preprocess.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ var updateVersion = require('./util/update_version');
1111
// main
1212
makeBuildCSS();
1313
exposePartsInLib();
14+
copyTopojsonFiles();
1415
updateVersion(constants.pathToPlotlyVersion);
1516

1617
// convert scss to css to js and static css file
@@ -71,3 +72,12 @@ function writeLibFiles(obj) {
7172
);
7273
}
7374
}
75+
76+
function copyTopojsonFiles() {
77+
fs.copy(
78+
constants.pathToTopojsonSrc,
79+
constants.pathToTopojsonDist,
80+
{ clobber: true },
81+
common.throwOnError
82+
);
83+
}

tasks/util/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var strictIndex = fs.readFileSync(pathToPlotlyStrict, 'utf-8');
2424
var allTraces = fs.readdirSync(path.join(pathToSrc, 'traces'))
2525
.filter(startsWithLowerCase);
2626

27-
var pathToTopojsonSrc = path.join(pathToDist, 'topojson/');
27+
var pathToTopojsonSrc = path.join(pathToRoot, 'topojson/dist');
2828

2929
var partialBundleNames = [
3030
'basic', 'cartesian', 'geo', 'gl3d', 'gl2d', 'mapbox', 'finance', 'strict'

test/jasmine/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if(isFullSuite) {
118118
}
119119

120120
var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
121-
var pathToTopojsonDist = path.join(__dirname, '..', '..', 'dist', 'topojson');
121+
var pathToTopojsonDist = path.join(__dirname, '..', '..', 'topojson', 'dist');
122122
var pathToMathJax2 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v2');
123123
var pathToMathJax3 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v3');
124124
var pathToVirtualWebgl = path.join(__dirname, '..', '..', 'node_modules', 'virtual-webgl', 'src', 'virtual-webgl.js');

test/jasmine/tests/geo_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var DBLCLICKDELAY = require('../../../src/plot_api/plot_config').dfltConfig.doub
2323
var HOVERMINTIME = require('../../../src/components/fx').constants.HOVERMINTIME;
2424

2525
// use local topojson files
26-
Plotly.setPlotConfig({ topojsonURL: '/base/dist/topojson/' });
26+
Plotly.setPlotConfig({ topojsonURL: '/base/topojson/dist' });
2727

2828
function move(fromX, fromY, toX, toY, delay) {
2929
return new Promise(function(resolve) {

0 commit comments

Comments
 (0)