Skip to content

Commit 255a324

Browse files
JounQinyyx990803
authored andcommitted
fix #251, close #247, #216, #209 (#253)
* 1. fix issue related to `route-cache` 2. use `this.$route` directly in component method 3. bump dependencies * use webpack ModuleConcatenationPlugin on production * use req.originalUrl as cacheKey
1 parent 6c70f41 commit 255a324

File tree

6 files changed

+633
-300
lines changed

6 files changed

+633
-300
lines changed

build/webpack.base.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ module.exports = {
6161
new webpack.optimize.UglifyJsPlugin({
6262
compress: { warnings: false }
6363
}),
64+
new webpack.optimize.ModuleConcatenationPlugin(),
6465
new ExtractTextPlugin({
6566
filename: 'common.[chunkhash].css'
6667
})

package.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,43 @@
1515
"npm": ">=4.0"
1616
},
1717
"dependencies": {
18-
"compression": "^1.6.2",
19-
"cross-env": "^4.0.0",
20-
"es6-promise": "^4.1.0",
21-
"express": "^4.15.2",
22-
"extract-text-webpack-plugin": "^2.1.0",
23-
"firebase": "^3.7.2",
24-
"lru-cache": "^4.0.2",
25-
"route-cache": "0.4.2",
26-
"serve-favicon": "^2.4.1",
27-
"vue": "^2.4.1",
18+
"compression": "^1.7.0",
19+
"cross-env": "^5.0.5",
20+
"es6-promise": "^4.1.1",
21+
"express": "^4.15.4",
22+
"extract-text-webpack-plugin": "^3.0.0",
23+
"firebase": "^4.3.1",
24+
"lru-cache": "^4.1.1",
25+
"route-cache": "0.4.3",
26+
"serve-favicon": "^2.4.4",
27+
"vue": "^2.4.4",
2828
"vue-router": "^2.7.0",
29-
"vue-server-renderer": "^2.4.1",
30-
"vuex": "^2.3.1",
31-
"vuex-router-sync": "^4.1.2"
29+
"vue-server-renderer": "^2.4.4",
30+
"vuex": "^2.4.0",
31+
"vuex-router-sync": "^4.3.1"
3232
},
3333
"devDependencies": {
34-
"autoprefixer": "^6.7.7",
35-
"babel-core": "^6.24.1",
36-
"babel-loader": "^7.1.1",
34+
"autoprefixer": "^7.1.4",
35+
"babel-core": "^6.26.0",
36+
"babel-loader": "^7.1.2",
3737
"babel-plugin-syntax-dynamic-import": "^6.18.0",
38-
"babel-preset-env": "^1.4.0",
39-
"css-loader": "^0.28.0",
40-
"file-loader": "^0.11.1",
38+
"babel-preset-env": "^1.6.0",
39+
"css-loader": "^0.28.7",
40+
"file-loader": "^0.11.2",
4141
"friendly-errors-webpack-plugin": "^1.6.1",
42-
"glob": "^7.1.1",
43-
"rimraf": "^2.6.1",
42+
"glob": "^7.1.2",
43+
"rimraf": "^2.6.2",
4444
"stylus": "^0.54.5",
4545
"stylus-loader": "^3.0.1",
46-
"sw-precache-webpack-plugin": "^0.10.1",
47-
"url-loader": "^0.5.8",
48-
"vue-loader": "^13.0.1",
49-
"vue-style-loader": "^3.0.0",
50-
"vue-template-compiler": "^2.4.1",
51-
"webpack": "^3.2.0",
52-
"webpack-dev-middleware": "^1.10.1",
53-
"webpack-hot-middleware": "^2.17.1",
46+
"sw-precache-webpack-plugin": "^0.11.4",
47+
"url-loader": "^0.5.9",
48+
"vue-loader": "^13.0.4",
49+
"vue-style-loader": "^3.0.3",
50+
"vue-template-compiler": "^2.4.4",
51+
"webpack": "^3.6.0",
52+
"webpack-dev-middleware": "^1.12.0",
53+
"webpack-hot-middleware": "^2.19.1",
5454
"webpack-merge": "^4.0.0",
55-
"webpack-node-externals": "^1.5.4"
55+
"webpack-node-externals": "^1.6.0"
5656
}
5757
}

server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ app.use('/service-worker.js', serve('./dist/service-worker.js'))
7272
// headers.
7373
// 1-second microcache.
7474
// https://www.nginx.com/blog/benefits-of-microcaching-nginx/
75-
app.use(microcache.cacheSeconds(1, () => useMicroCache))
75+
app.use(microcache.cacheSeconds(1, req => useMicroCache && req.originalUrl))
7676

7777
function render (req, res) {
7878
const s = Date.now()

src/entry-server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default context => {
1313
const { app, router, store } = createApp()
1414

1515
const { url } = context
16-
const fullPath = router.resolve(url).route.fullPath
16+
const { fullPath } = router.resolve(url).route
1717

1818
if (fullPath !== url) {
1919
reject({ url: fullPath })

src/views/ItemList.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ export default {
3636
data () {
3737
return {
3838
transition: 'slide-right',
39-
displayedPage: Number(this.$store.state.route.params.page) || 1,
39+
displayedPage: Number(this.$route.params.page) || 1,
4040
displayedItems: this.$store.getters.activeItems
4141
}
4242
},
4343
4444
computed: {
4545
page () {
46-
return Number(this.$store.state.route.params.page) || 1
46+
return Number(this.$route.params.page) || 1
4747
},
4848
maxPage () {
4949
const { itemsPerPage, lists } = this.$store.state

0 commit comments

Comments
 (0)