Showing
5 changed files
with
14 additions
and
6 deletions
@@ -30,7 +30,6 @@ rm(path.join(clientConfig.output.path), err => { | @@ -30,7 +30,6 @@ rm(path.join(clientConfig.output.path), err => { | ||
30 | if (err) { | 30 | if (err) { |
31 | throw rmerr; | 31 | throw rmerr; |
32 | } | 32 | } |
33 | - shelljs.exec(`cp -R ${path.join(clientConfig.output.path, './static/')} ${path.join(distDir, './static')}`, {async: true}); | ||
34 | webpack(serverConfig, (serverErr, serverStats) => { | 33 | webpack(serverConfig, (serverErr, serverStats) => { |
35 | if (serverErr) { | 34 | if (serverErr) { |
36 | throw serverErr; | 35 | throw serverErr; |
1 | const path = require('path'); | 1 | const path = require('path'); |
2 | const ExtractTextPlugin = require('extract-text-webpack-plugin'); | 2 | const ExtractTextPlugin = require('extract-text-webpack-plugin'); |
3 | const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin'); | 3 | const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin'); |
4 | +const pkg = require('../package.json'); | ||
5 | +const distDir = path.join(__dirname, `../public/dist/${pkg.name}/bundle`); | ||
4 | 6 | ||
5 | module.exports = { | 7 | module.exports = { |
6 | output: { | 8 | output: { |
7 | filename: 'static/js/[name].[chunkhash].js', | 9 | filename: 'static/js/[name].[chunkhash].js', |
8 | - path: path.resolve(__dirname, '../bundle'), | 10 | + path: `${distDir}`, |
9 | chunkFilename: 'static/js/[name].[chunkhash].js', | 11 | chunkFilename: 'static/js/[name].[chunkhash].js', |
10 | publicPath: '/' | 12 | publicPath: '/' |
11 | }, | 13 | }, |
@@ -3,6 +3,7 @@ const path = require('path'); | @@ -3,6 +3,7 @@ const path = require('path'); | ||
3 | const merge = require('webpack-merge'); | 3 | const merge = require('webpack-merge'); |
4 | const VueSSRClientPlugin = require('vue-server-renderer/client-plugin'); | 4 | const VueSSRClientPlugin = require('vue-server-renderer/client-plugin'); |
5 | const UglifyJSPlugin = require('uglifyjs-webpack-plugin'); | 5 | const UglifyJSPlugin = require('uglifyjs-webpack-plugin'); |
6 | +const pkg = require('../package.json'); | ||
6 | const shelljs = require('shelljs'); | 7 | const shelljs = require('shelljs'); |
7 | 8 | ||
8 | let baseConfig = require('./webpack.base.conf'); | 9 | let baseConfig = require('./webpack.base.conf'); |
@@ -53,7 +54,9 @@ const webpackConfig = merge(baseConfig, { | @@ -53,7 +54,9 @@ const webpackConfig = merge(baseConfig, { | ||
53 | new webpack.optimize.CommonsChunkPlugin({ | 54 | new webpack.optimize.CommonsChunkPlugin({ |
54 | name: 'manifest', | 55 | name: 'manifest', |
55 | }), | 56 | }), |
56 | - new VueSSRClientPlugin() | 57 | + new VueSSRClientPlugin({ |
58 | + filename: `yoho-ssr-client-${pkg.version}.json` | ||
59 | + }) | ||
57 | ] | 60 | ] |
58 | }); | 61 | }); |
59 | 62 |
@@ -3,6 +3,7 @@ const merge = require('webpack-merge'); | @@ -3,6 +3,7 @@ const merge = require('webpack-merge'); | ||
3 | const nodeExternals = require('webpack-node-externals'); | 3 | const nodeExternals = require('webpack-node-externals'); |
4 | const VueSSRServerPlugin = require('vue-server-renderer/server-plugin'); | 4 | const VueSSRServerPlugin = require('vue-server-renderer/server-plugin'); |
5 | let baseConfig = require('./webpack.base.conf'); | 5 | let baseConfig = require('./webpack.base.conf'); |
6 | +const pkg = require('../package.json'); | ||
6 | const postcssConfig = require('./postcss.config.js'); | 7 | const postcssConfig = require('./postcss.config.js'); |
7 | 8 | ||
8 | const isProd = process.env.NODE_ENV === 'production'; | 9 | const isProd = process.env.NODE_ENV === 'production'; |
@@ -39,7 +40,9 @@ let webpackConfig = merge(baseConfig, { | @@ -39,7 +40,9 @@ let webpackConfig = merge(baseConfig, { | ||
39 | 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development'), | 40 | 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development'), |
40 | 'process.env.VUE_ENV': '"server"' | 41 | 'process.env.VUE_ENV': '"server"' |
41 | }), | 42 | }), |
42 | - new VueSSRServerPlugin(), | 43 | + new VueSSRServerPlugin({ |
44 | + filename: `yoho-ssr-server-${pkg.version}.json` | ||
45 | + }), | ||
43 | ] | 46 | ] |
44 | }); | 47 | }); |
45 | 48 |
1 | const fs = require('fs'); | 1 | const fs = require('fs'); |
2 | const path = require('path'); | 2 | const path = require('path'); |
3 | +const pkg = require('../../package.json'); | ||
3 | const {createBundleRenderer} = require('vue-server-renderer'); | 4 | const {createBundleRenderer} = require('vue-server-renderer'); |
4 | 5 | ||
5 | const isDev = process.env.NODE_ENV === 'development' || !process.env.NODE_ENV; | 6 | const isDev = process.env.NODE_ENV === 'development' || !process.env.NODE_ENV; |
@@ -32,8 +33,8 @@ const render = (req, res, next) => { | @@ -32,8 +33,8 @@ const render = (req, res, next) => { | ||
32 | }; | 33 | }; |
33 | 34 | ||
34 | if (!isDev) { | 35 | if (!isDev) { |
35 | - const serverBundle = require('../../bundle/vue-ssr-server-bundle.json'); | ||
36 | - const clientManifest = require('../../bundle/vue-ssr-client-manifest.json'); | 36 | + const serverBundle = require(`https://cdn.yoho.cn/yohoblk-wap/bundle/yoho-ssr-server-${pkg.version}.json`); |
37 | + const clientManifest = require(`https://cdn.yoho.cn/yohoblk-wap/bundle/yoho-ssr-client-${pkg.version}.json`); | ||
37 | 38 | ||
38 | renderer = createBundleRenderer(serverBundle, { | 39 | renderer = createBundleRenderer(serverBundle, { |
39 | runInNewContext: false, | 40 | runInNewContext: false, |
-
Please register or login to post a comment