Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
- v1-vue-{{ .Branch }}-
- v1-vue-
- run: npm install
- run: cd packages/vue-server-renderer && npm install vue
- save_cache:
key: v1-vue-{{ .Branch }}-{{ checksum "package-lock.json" }}
paths:
Expand Down
16 changes: 1 addition & 15 deletions build/setup.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
const { test, ln, chmod, cd, exec } = require('shelljs')
const path = require('path')

const baseUrl = path.resolve()
const { test, ln, chmod } = require('shelljs')

function installHooks () {
if (test('-e', '.git/hooks')) {
Expand All @@ -12,15 +9,4 @@ function installHooks () {
}
}

function setupSSR () {
const ssrBase = path.resolve('packages/vue-server-renderer')
if (!test('-e', path.join(ssrBase, 'node_modules'))) {
cd(ssrBase)
exec('npm install')
cd(baseUrl)
}
}

installHooks()
setupSSR()

6 changes: 3 additions & 3 deletions dist/vue.runtime.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -3777,8 +3777,8 @@ function renderStatic (
) {
// static trees can be rendered once and cached on the contructor options
// so every instance shares the same cached trees
var renderFns = this.$options.staticRenderFns;
var cached = renderFns.cached || (renderFns.cached = []);
var options = this.$options;
var cached = options.cached || (options.cached = []);
var tree = cached[index];
// if has already-rendered static tree and not inside v-for,
// we can reuse the same tree by doing a shallow clone.
Expand All @@ -3788,7 +3788,7 @@ function renderStatic (
: cloneVNode(tree)
}
// otherwise, render a fresh tree.
tree = cached[index] = renderFns[index].call(this._renderProxy, null, this);
tree = cached[index] = options.staticRenderFns[index].call(this._renderProxy, null, this);
markStatic(tree, ("__static__" + index), false);
return tree
}
Expand Down
6 changes: 5 additions & 1 deletion types/test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
],
"module": "commonjs",
"strict": true,
"noEmit": true
"noEmit": true,
"baseUrl": ".",
"paths": {
"vue": ["../index.d.ts"]
}
},
"files": [
"../index.d.ts",
Expand Down