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.

Sign up for GitHub

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

try to unbreak the javascript build #3177

Closed
wants to merge 3 commits into from
Closed

try to unbreak the javascript build #3177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4acb51f
assets: bump mapbox-gl related versions
xrmx Jul 25, 2017
e70a145
assets: please the linter
xrmx Jul 25, 2017
0bb6a38
assets: use babel to load mapbox-gl js
xrmx Jul 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion superset/assets/javascripts/modules/superset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { QUERY_TIMEOUT_THRESHOLD } from '../constants';

const utils = require('./utils');

/* eslint wrap-iife: 0*/
/* eslint wrap-iife: 0 */
const px = function () {
let slice;
function getParam(name) {
Expand Down
4 changes: 2 additions & 2 deletions superset/assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"jquery": "^3.2.1",
"jsdom": "9.12.0",
"lodash.throttle": "^4.1.1",
"mapbox-gl": "^0.26.0",
"mapbox-gl": "^0.32.1",
"moment": "^2.14.1",
"mustache": "^2.2.1",
"nvd3": "1.8.5",
Expand All @@ -72,7 +72,7 @@
"react-dom": "^15.5.1",
"react-gravatar": "^2.6.1",
"react-grid-layout": "^0.14.4",
"react-map-gl": "^1.7.0",
"react-map-gl": "^2.0.3",
"react-redux": "^5.0.2",
"react-resizable": "^1.3.3",
"react-select": "1.0.0-rc.3",
Expand Down
2 changes: 1 addition & 1 deletion superset/assets/visualizations/treemap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable no-shadow, no-param-reassign, no-underscore-dangle, no-use-before-define*/
/* eslint-disable no-shadow, no-param-reassign, no-underscore-dangle, no-use-before-define */
import d3 from 'd3';
import { category21 } from '../javascripts/modules/colors';

Expand Down
10 changes: 9 additions & 1 deletion superset/assets/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,20 @@ const config = {

},
module: {
noParse: /mapbox-gl\/dist/,
loaders: [
{
test: /datatables\.net.*/,
loader: 'imports-loader?define=>false',
},
{
test: /mapbox-gl\/.*\.js$/,
loader: 'babel-loader',
query: {
presets: [
'es2015',
],
},
},
{
test: /\.jsx?$/,
exclude: APP_DIR + '/node_modules',
Expand Down