Merge branch 'core-vue-bootstrap' of https://github.com/nasa/openmct into core-vue-bootstrap

This commit is contained in:
charlesh88
2018-08-08 13:55:44 -07:00
3 changed files with 20 additions and 5 deletions

22
app.js
View File

@ -42,15 +42,29 @@ app.use('/proxyUrl', function proxyRequest(req, res, next) {
const webpack = require('webpack'); const webpack = require('webpack');
const webpackConfig = require('./webpack.config.js'); const webpackConfig = require('./webpack.config.js');
webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
webpackConfig.entry.openmct = [
'webpack-hot-middleware/client',
webpackConfig.entry.openmct
];
const compiler = webpack(webpackConfig); const compiler = webpack(webpackConfig);
const webpackDevRoute = require('webpack-dev-middleware')(
compiler, { app.use(require('webpack-dev-middleware')(
compiler,
{
publicPath: '/dist', publicPath: '/dist',
logLevel: 'warn' logLevel: 'warn'
} }
); ));
app.use(webpackDevRoute); app.use(require('webpack-hot-middleware')(
compiler,
{
}
));
// Expose index.html for development users. // Expose index.html for development users.
app.get('/', function (req, res) { app.get('/', function (req, res) {

View File

@ -67,6 +67,7 @@
"webpack": "^4.16.2", "webpack": "^4.16.2",
"webpack-cli": "^3.1.0", "webpack-cli": "^3.1.0",
"webpack-dev-middleware": "^3.1.3", "webpack-dev-middleware": "^3.1.3",
"webpack-hot-middleware": "^2.22.3",
"zepto": "^1.2.0" "zepto": "^1.2.0"
}, },
"scripts": { "scripts": {

View File

@ -57,7 +57,7 @@ const webpackConfig = {
{ {
test: /\.(sc|sa|c)ss$/, test: /\.(sc|sa|c)ss$/,
use: [ use: [
MiniCssExtractPlugin.loader, devMode ? 'style-loader': MiniCssExtractPlugin.loader,
'css-loader', 'css-loader',
{ {
loader: 'fast-sass-loader', loader: 'fast-sass-loader',