-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Better mapbox minification fix #2792
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
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
1f1e47c
undo 'typeofs' compress for min bundles that include mapbox-gl
etpinard 7171bc4
add minified bundle test
etpinard 2a3afe7
turn off 'typeof' compress options for all minify steps
etpinard dd8bf6c
extract all mock lists from plot_api suites
etpinard 89d7aa8
use mock list in minified bundle suite
etpinard 9ba473d
run test-bundle in series
etpinard d1992b4
try adding long timeout (for mapbox)
etpinard 810e91f
move test-bundle to jasmine test container
etpinard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,46 @@ | ||
| var path = require('path'); | ||
| var exec = require('child_process').exec; | ||
| var glob = require('glob'); | ||
| var runSeries = require('run-series'); | ||
|
|
||
| var constants = require('./util/constants'); | ||
| var common = require('./util/common'); | ||
| var pathToJasmineBundleTests = path.join(constants.pathToJasmineBundleTests); | ||
|
|
||
| var pathToJasmineBundleTests = constants.pathToJasmineBundleTests; | ||
|
|
||
| /** | ||
| * Run all jasmine 'bundle' test in series | ||
| * | ||
| * To run specific bundle tests, use | ||
| * | ||
| * $ npm run test-jasmine -- --bundleTest=<name-of-suite> | ||
| */ | ||
| glob(pathToJasmineBundleTests + '/*.js', function(err, files) { | ||
| files.forEach(function(file) { | ||
| var baseName = path.basename(file); | ||
| var cmd = 'npm run test-jasmine -- --bundleTest=' + baseName; | ||
| var tasks = files.map(function(file) { | ||
| return function(cb) { | ||
| var cmd = [ | ||
| 'karma', 'start', | ||
| path.join(constants.pathToRoot, 'test', 'jasmine', 'karma.conf.js'), | ||
| '--bundleTest=' + path.basename(file), | ||
| '--nowatch' | ||
| ].join(' '); | ||
|
|
||
| console.log('Running: ' + cmd); | ||
|
|
||
| exec(cmd, function(err) { | ||
| cb(null, err); | ||
| }).stdout.pipe(process.stdout); | ||
| }; | ||
| }); | ||
|
|
||
| runSeries(tasks, function(err, results) { | ||
| if(err) throw err; | ||
|
|
||
| var failed = results.filter(function(r) { return r; }); | ||
|
|
||
| common.execCmd(cmd); | ||
| if(failed.length) { | ||
| console.log('\ntest-bundle summary:'); | ||
| failed.forEach(function(r) { console.warn('- ' + r.cmd + ' failed'); }); | ||
| console.log(''); | ||
| process.exit(1); | ||
| } | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // list of mocks that should include *all* plotly.js trace modules | ||
|
|
||
| var svgMockList = [ | ||
| ['1', require('@mocks/1.json')], | ||
| ['4', require('@mocks/4.json')], | ||
| ['5', require('@mocks/5.json')], | ||
| ['10', require('@mocks/10.json')], | ||
| ['11', require('@mocks/11.json')], | ||
| ['17', require('@mocks/17.json')], | ||
| ['21', require('@mocks/21.json')], | ||
| ['22', require('@mocks/22.json')], | ||
| ['airfoil', require('@mocks/airfoil.json')], | ||
| ['annotations-autorange', require('@mocks/annotations-autorange.json')], | ||
| ['axes_enumerated_ticks', require('@mocks/axes_enumerated_ticks.json')], | ||
| ['axes_visible-false', require('@mocks/axes_visible-false.json')], | ||
| ['bar_and_histogram', require('@mocks/bar_and_histogram.json')], | ||
| ['basic_error_bar', require('@mocks/basic_error_bar.json')], | ||
| ['binding', require('@mocks/binding.json')], | ||
| ['cheater_smooth', require('@mocks/cheater_smooth.json')], | ||
| ['finance_style', require('@mocks/finance_style.json')], | ||
| ['geo_first', require('@mocks/geo_first.json')], | ||
| ['layout_image', require('@mocks/layout_image.json')], | ||
| ['layout-colorway', require('@mocks/layout-colorway.json')], | ||
| ['polar_categories', require('@mocks/polar_categories.json')], | ||
| ['polar_direction', require('@mocks/polar_direction.json')], | ||
| ['range_selector_style', require('@mocks/range_selector_style.json')], | ||
| ['range_slider_multiple', require('@mocks/range_slider_multiple.json')], | ||
| ['sankey_energy', require('@mocks/sankey_energy.json')], | ||
| ['scattercarpet', require('@mocks/scattercarpet.json')], | ||
| ['shapes', require('@mocks/shapes.json')], | ||
| ['splom_iris', require('@mocks/splom_iris.json')], | ||
| ['table_wrapped_birds', require('@mocks/table_wrapped_birds.json')], | ||
| ['ternary_fill', require('@mocks/ternary_fill.json')], | ||
| ['text_chart_arrays', require('@mocks/text_chart_arrays.json')], | ||
| ['transforms', require('@mocks/transforms.json')], | ||
| ['updatemenus', require('@mocks/updatemenus.json')], | ||
| ['violin_side-by-side', require('@mocks/violin_side-by-side.json')], | ||
| ['world-cals', require('@mocks/world-cals.json')], | ||
| ['typed arrays', { | ||
| data: [{ | ||
| x: new Float32Array([1, 2, 3]), | ||
| y: new Float32Array([1, 2, 1]) | ||
| }] | ||
| }] | ||
| ]; | ||
|
|
||
| var glMockList = [ | ||
| ['gl2d_heatmapgl', require('@mocks/gl2d_heatmapgl.json')], | ||
| ['gl2d_line_dash', require('@mocks/gl2d_line_dash.json')], | ||
| ['gl2d_parcoords_2', require('@mocks/gl2d_parcoords_2.json')], | ||
| ['gl2d_pointcloud-basic', require('@mocks/gl2d_pointcloud-basic.json')], | ||
| ['gl3d_annotations', require('@mocks/gl3d_annotations.json')], | ||
| ['gl3d_set-ranges', require('@mocks/gl3d_set-ranges.json')], | ||
| ['gl3d_world-cals', require('@mocks/gl3d_world-cals.json')], | ||
| ['gl3d_cone-autorange', require('@mocks/gl3d_cone-autorange.json')], | ||
| ['gl3d_streamtube-simple', require('@mocks/gl3d_streamtube-simple.json')], | ||
| ['glpolar_style', require('@mocks/glpolar_style.json')], | ||
| ]; | ||
|
|
||
| var mapboxMockList = [ | ||
| ['scattermapbox', require('@mocks/mapbox_bubbles-text.json')] | ||
| ]; | ||
|
|
||
| module.exports = { | ||
| svg: svgMockList, | ||
| gl: glMockList, | ||
| mapbox: mapboxMockList, | ||
| all: svgMockList.concat(glMockList).concat(mapboxMockList) | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* global Plotly:false */ | ||
|
|
||
| var MAPBOX_ACCESS_TOKEN = require('@build/credentials.json').MAPBOX_ACCESS_TOKEN; | ||
| var mockLists = require('../assets/mock_lists'); | ||
|
|
||
| // only needed for mapbox subplots | ||
| var LONG_TIMEOUT_INTERVAL = 5 * jasmine.DEFAULT_TIMEOUT_INTERVAL; | ||
|
|
||
| describe('Test plotly.min.js', function() { | ||
| 'use strict'; | ||
|
|
||
| var gd = document.createElement('div'); | ||
| document.body.appendChild(gd); | ||
|
|
||
| it('should expose Plotly global', function() { | ||
| expect(window.Plotly).toBeDefined(); | ||
| }); | ||
|
|
||
| Plotly.setPlotConfig({ | ||
| mapboxAccessToken: MAPBOX_ACCESS_TOKEN | ||
| }); | ||
|
|
||
| mockLists.all.forEach(function(mockSpec) { | ||
| it('can plot "' + mockSpec[0] + '"', function(done) { | ||
| Plotly.newPlot(gd, mockSpec[1]).catch(fail).then(done); | ||
| }, LONG_TIMEOUT_INTERVAL); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
which gives:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
⚖️ 👍
💃 still applies :)