From 80c4854f3935fc18f275da27a2afd705dba6e1df Mon Sep 17 00:00:00 2001 From: Jeremy Maitin-Shepard Date: Mon, 11 Dec 2017 10:29:37 -0800 Subject: [PATCH] chore(dependent-project): fix errors in webpack config Thanks to Gergely Csucs (github user Tevemadar) for identifying the problem and providing an initial fix. --- examples/dependent-project/config/webpack.config.js | 2 +- examples/dependent-project/config/webpack_helpers.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/dependent-project/config/webpack.config.js b/examples/dependent-project/config/webpack.config.js index 6b1f82267b..3663f0ed82 100644 --- a/examples/dependent-project/config/webpack.config.js +++ b/examples/dependent-project/config/webpack.config.js @@ -21,5 +21,5 @@ const webpack_helpers = require('./webpack_helpers'); module.exports = env => { env = env || 'dev'; return webpack_helpers.getViewerConfigFromEnv( - {outputPath: path.resolve(__dirname, '../dist/' + outputSuffix)}, env); + {outputPath: path.resolve(__dirname, '../dist/' + env)}, env); }; diff --git a/examples/dependent-project/config/webpack_helpers.js b/examples/dependent-project/config/webpack_helpers.js index e8f25c9092..9d3bcc812a 100644 --- a/examples/dependent-project/config/webpack_helpers.js +++ b/examples/dependent-project/config/webpack_helpers.js @@ -17,7 +17,7 @@ 'use strict'; const path = require('path'); -const original_webpack_helpers = require('neuroglancer/config/webpack_helpers'); +const originalWebpackHelpers = require('neuroglancer/config/webpack_helpers'); const resolveReal = require('neuroglancer/config/resolve_real'); function modifyViewerOptions(options) { @@ -40,6 +40,6 @@ function modifyViewerOptions(options) { return options; } -exports.getViewerConfig = function(options) { - return original_webpack_helpers.getViewerConfig(modifyViewerOptions(options)); +exports.getViewerConfigFromEnv = function(options, env) { + return originalWebpackHelpers.getViewerConfigFromEnv(modifyViewerOptions(options), env); };