Authored by 陈峰

comit

@@ -3,7 +3,6 @@ process.env.NODE_ENV = 'production'; @@ -3,7 +3,6 @@ process.env.NODE_ENV = 'production';
3 const rm = require('rimraf'); 3 const rm = require('rimraf');
4 const path = require('path'); 4 const path = require('path');
5 const webpack = require('webpack'); 5 const webpack = require('webpack');
6 -const shelljs = require('shelljs');  
7 const clientConfig = require('./webpack.client.conf'); 6 const clientConfig = require('./webpack.client.conf');
8 const serverConfig = require('./webpack.server.conf'); 7 const serverConfig = require('./webpack.server.conf');
9 const pkg = require('../package.json'); 8 const pkg = require('../package.json');
@@ -3,6 +3,7 @@ const path = require('path'); @@ -3,6 +3,7 @@ const path = require('path');
3 const MFS = require('memory-fs'); 3 const MFS = require('memory-fs');
4 const webpackDevMiddleware = require('webpack-dev-middleware'); 4 const webpackDevMiddleware = require('webpack-dev-middleware');
5 const webpackHotMiddleware = require('webpack-hot-middleware'); 5 const webpackHotMiddleware = require('webpack-hot-middleware');
  6 +const pkg = require('../package.json');
6 let clientConfig = require('./webpack.client.conf.js'); 7 let clientConfig = require('./webpack.client.conf.js');
7 let serverConfig = require('./webpack.server.conf.js'); 8 let serverConfig = require('./webpack.server.conf.js');
8 9
@@ -66,7 +67,7 @@ exports.devServer = (app, cb) => { @@ -66,7 +67,7 @@ exports.devServer = (app, cb) => {
66 if (stats.errors.length) { 67 if (stats.errors.length) {
67 return; 68 return;
68 } 69 }
69 - clientManifest = JSON.parse(_readFile(devMiddleware.fileSystem, 'vue-ssr-client-manifest.json')); 70 + clientManifest = JSON.parse(_readFile(devMiddleware.fileSystem, `yoho-ssr-client-${pkg.version}.json`));
70 71
71 if (bundle) { 72 if (bundle) {
72 ready({bundle, options: {clientManifest}}); 73 ready({bundle, options: {clientManifest}});
@@ -88,8 +89,8 @@ exports.devServer = (app, cb) => { @@ -88,8 +89,8 @@ exports.devServer = (app, cb) => {
88 if (stats.errors.length) { 89 if (stats.errors.length) {
89 return; 90 return;
90 } 91 }
91 - bundle = JSON.parse(_readFile(mfs, 'vue-ssr-server-bundle.json'));  
92 - console.log('clientManifest') 92 + bundle = JSON.parse(_readFile(mfs, `yoho-ssr-server-${pkg.version}.json`));
  93 +
93 if (clientManifest) { 94 if (clientManifest) {
94 ready({bundle, options: {clientManifest}}); 95 ready({bundle, options: {clientManifest}});
95 } 96 }
@@ -6,9 +6,9 @@ const distDir = path.join(__dirname, `../public/dist/${pkg.name}/bundle`); @@ -6,9 +6,9 @@ const distDir = path.join(__dirname, `../public/dist/${pkg.name}/bundle`);
6 6
7 module.exports = { 7 module.exports = {
8 output: { 8 output: {
9 - filename: 'static/js/[name].[chunkhash].js', 9 + filename: 'bundle/static/js/[name].[chunkhash].js',
10 path: `${distDir}`, 10 path: `${distDir}`,
11 - chunkFilename: 'static/js/[name].[chunkhash].js', 11 + chunkFilename: 'bundle/static/js/[name].[chunkhash].js',
12 publicPath: '/' 12 publicPath: '/'
13 }, 13 },
14 resolve: { 14 resolve: {