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

Fixing the damn build #3179

Merged
merged 2 commits into from
Jul 25, 2017
Merged

Fixing the damn build #3179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2643fca
Fixing the build
mistercrunch Jul 25, 2017
1a6647c
Going deeper
mistercrunch 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
3 changes: 1 addition & 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,6 @@
"jquery": "^3.2.1",
"jsdom": "9.12.0",
"lodash.throttle": "^4.1.1",
"mapbox-gl": "^0.26.0",
"moment": "^2.14.1",
"mustache": "^2.2.1",
"nvd3": "1.8.5",
Expand All @@ -72,7 +71,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
13 changes: 7 additions & 6 deletions superset/assets/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ const APP_DIR = path.resolve(__dirname, './');
const BUILD_DIR = path.resolve(__dirname, './dist');

const config = {
node: {
fs: 'empty',
},
entry: {
'css-theme': APP_DIR + '/javascripts/css-theme.js',
common: APP_DIR + '/javascripts/common.js',
Expand All @@ -32,9 +35,7 @@ const config = {
],
alias: {
webworkify: 'webworkify-webpack',
'mapbox-gl/js/geo/transform': path.join(
__dirname, '/node_modules/mapbox-gl/js/geo/transform'),
'mapbox-gl': path.join(__dirname, '/node_modules/mapbox-gl/dist/mapbox-gl.js'),
'mapbox-gl$': path.join(__dirname, '/node_modules/mapbox-gl/dist/mapbox-gl.js'),
},

},
Expand All @@ -57,10 +58,10 @@ const config = {
],
},
},
/* for react-map-gl overlays */
/* for mapbox-gl/js/geo/transform */
{
test: /\.react\.js$/,
include: APP_DIR + '/node_modules/react-map-gl/src/overlays',
test: /\.js$/,
include: APP_DIR + '/node_modules/mapbox-gl/js',
loader: 'babel-loader',
},
/* for require('*.css') */
Expand Down