From 21518c86964d141815337531d306a6049ea8f661 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Tue, 12 Sep 2017 17:07:57 -0400 Subject: [PATCH] revert react router update and webpack config --- package.json | 2 +- webpack.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1dde78ad..f0afc5f7 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react-draggable": "3.0.3", "react-dropzone": "4.1.2", "react-onclickoutside": "6.5.0", - "react-router": "4.2.0", + "react-router": "3.0.5", "redux": "3.7.2", "riek": "1.1.0", "simplewebrtc": "2.2.2", diff --git a/webpack.config.js b/webpack.config.js index d55d151f..b24e1513 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -47,7 +47,7 @@ module.exports = { 'metamaps.bundle': './frontend/src/index.js' }, output: { - path: './app/assets/javascripts/webpacked', + path: __dirname + '/app/assets/javascripts/webpacked', filename: '[name].js', devtoolModuleFilenameTemplate: '[absolute-resource-path]' }