Fixing the damn build (#3179)

* Fixing the build

* Going deeper
This commit is contained in:
Maxime Beauchemin 2017-07-25 13:57:29 -07:00 committed by GitHub
parent 40d9e15126
commit 49ab09101b
4 changed files with 10 additions and 10 deletions

View File

@ -8,7 +8,7 @@ import { QUERY_TIMEOUT_THRESHOLD } from '../constants';
const utils = require('./utils'); const utils = require('./utils');
/* eslint wrap-iife: 0*/ /* eslint wrap-iife: 0 */
const px = function () { const px = function () {
let slice; let slice;
function getParam(name) { function getParam(name) {

View File

@ -57,7 +57,6 @@
"jquery": "^3.2.1", "jquery": "^3.2.1",
"jsdom": "9.12.0", "jsdom": "9.12.0",
"lodash.throttle": "^4.1.1", "lodash.throttle": "^4.1.1",
"mapbox-gl": "^0.26.0",
"moment": "^2.14.1", "moment": "^2.14.1",
"mustache": "^2.2.1", "mustache": "^2.2.1",
"nvd3": "1.8.5", "nvd3": "1.8.5",
@ -72,7 +71,7 @@
"react-dom": "^15.5.1", "react-dom": "^15.5.1",
"react-gravatar": "^2.6.1", "react-gravatar": "^2.6.1",
"react-grid-layout": "^0.14.4", "react-grid-layout": "^0.14.4",
"react-map-gl": "^1.7.0", "react-map-gl": "^2.0.3",
"react-redux": "^5.0.2", "react-redux": "^5.0.2",
"react-resizable": "^1.3.3", "react-resizable": "^1.3.3",
"react-select": "1.0.0-rc.3", "react-select": "1.0.0-rc.3",

View File

@ -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 d3 from 'd3';
import { category21 } from '../javascripts/modules/colors'; import { category21 } from '../javascripts/modules/colors';

View File

@ -10,6 +10,9 @@ const APP_DIR = path.resolve(__dirname, './');
const BUILD_DIR = path.resolve(__dirname, './dist'); const BUILD_DIR = path.resolve(__dirname, './dist');
const config = { const config = {
node: {
fs: 'empty',
},
entry: { entry: {
'css-theme': APP_DIR + '/javascripts/css-theme.js', 'css-theme': APP_DIR + '/javascripts/css-theme.js',
common: APP_DIR + '/javascripts/common.js', common: APP_DIR + '/javascripts/common.js',
@ -32,9 +35,7 @@ const config = {
], ],
alias: { alias: {
webworkify: 'webworkify-webpack', webworkify: 'webworkify-webpack',
'mapbox-gl/js/geo/transform': path.join( 'mapbox-gl$': path.join(__dirname, '/node_modules/mapbox-gl/dist/mapbox-gl.js'),
__dirname, '/node_modules/mapbox-gl/js/geo/transform'),
'mapbox-gl': path.join(__dirname, '/node_modules/mapbox-gl/dist/mapbox-gl.js'),
}, },
}, },
@ -57,10 +58,10 @@ const config = {
], ],
}, },
}, },
/* for react-map-gl overlays */ /* for mapbox-gl/js/geo/transform */
{ {
test: /\.react\.js$/, test: /\.js$/,
include: APP_DIR + '/node_modules/react-map-gl/src/overlays', include: APP_DIR + '/node_modules/mapbox-gl/js',
loader: 'babel-loader', loader: 'babel-loader',
}, },
/* for require('*.css') */ /* for require('*.css') */