Skip to content

Commit

Permalink
[build] 2.0.0-alpha.4
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Jun 16, 2016
1 parent f2419a7 commit 6d4f23c
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 15 deletions.
9 changes: 7 additions & 2 deletions dist/vue.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ var config = {
*/
errorHandler: null,

/**
* Ignore certain custom elements
*/
ignoredElements: null,

/**
* Check if a tag is reserved so that it cannot be registered as a
* component. This is platform-dependent and may be overwritten.
Expand Down Expand Up @@ -1801,7 +1806,7 @@ function renderElement(tag, data, namespace) {
return createComponent(Ctor, data, parent, context, host, tag);
} else {
if (process.env.NODE_ENV !== 'production') {
if (!namespace && config.isUnknownElement(tag)) {
if (!namespace && !(config.ignoredElements && config.ignoredElements.indexOf(tag) > -1) && config.isUnknownElement(tag)) {
warn('Unknown custom element: <' + tag + '> - did you ' + 'register the component correctly? For recursive components, ' + 'make sure to provide the "name" option.');
}
}
Expand Down Expand Up @@ -2752,7 +2757,7 @@ Object.defineProperty(Vue.prototype, '$isServer', {
}
});

Vue.version = '2.0.0-alpha.3';
Vue.version = '2.0.0-alpha.4';

// attributes that should be using props for binding
var mustUseProp = makeMap('value,selected,checked,muted');
Expand Down
13 changes: 9 additions & 4 deletions dist/vue.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Vue.js v2.0.0-alpha.3
* Vue.js v2.0.0-alpha.4
* (c) 2014-2016 Evan You
* Released under the MIT License.
*/
Expand Down Expand Up @@ -203,6 +203,11 @@
*/
errorHandler: null,

/**
* Ignore certain custom elements
*/
ignoredElements: null,

/**
* Check if a tag is reserved so that it cannot be registered as a
* component. This is platform-dependent and may be overwritten.
Expand Down Expand Up @@ -1808,7 +1813,7 @@
return createComponent(Ctor, data, parent, context, host, tag);
} else {
if ("development" !== 'production') {
if (!namespace && config.isUnknownElement(tag)) {
if (!namespace && !(config.ignoredElements && config.ignoredElements.indexOf(tag) > -1) && config.isUnknownElement(tag)) {
warn('Unknown custom element: <' + tag + '> - did you ' + 'register the component correctly? For recursive components, ' + 'make sure to provide the "name" option.');
}
}
Expand Down Expand Up @@ -2757,7 +2762,7 @@
}
});

Vue.version = '2.0.0-alpha.3';
Vue.version = '2.0.0-alpha.4';

// attributes that should be using props for binding
var mustUseProp = makeMap('value,selected,checked,muted');
Expand Down Expand Up @@ -5584,7 +5589,7 @@ var nodeOps = Object.freeze({
// operators like typeof, instanceof and in are allowed
var prohibitedKeywordRE = new RegExp('\\b' + ('do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,' + 'super,throw,while,yield,delete,export,import,return,switch,default,' + 'extends,finally,continue,debugger,function,arguments').split(',').join('\\b|\\b') + '\\b');
// check valid identifier for v-for
var identRE = /[^\w$\.](?:[A-Za-z_$][\w$]*)/;
var identRE = /[A-Za-z_$][\w$]*/;

// detect problematic expressions in a template
function detectErrors(ast) {
Expand Down
6 changes: 3 additions & 3 deletions dist/vue.min.js

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion packages/vue-server-renderer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,11 @@ var config = {
*/
errorHandler: null,

/**
* Ignore certain custom elements
*/
ignoredElements: null,

/**
* Check if a tag is reserved so that it cannot be registered as a
* component. This is platform-dependent and may be overwritten.
Expand Down Expand Up @@ -1943,7 +1948,7 @@ function renderElement(tag, data, namespace) {
return createComponent(Ctor, data, parent, context, host, tag);
} else {
if (process.env.NODE_ENV !== 'production') {
if (!namespace && config.isUnknownElement(tag)) {
if (!namespace && !(config.ignoredElements && config.ignoredElements.indexOf(tag) > -1) && config.isUnknownElement(tag)) {
warn('Unknown custom element: <' + tag + '> - did you ' + 'register the component correctly? For recursive components, ' + 'make sure to provide the "name" option.');
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-server-renderer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-server-renderer",
"version": "2.0.0-alpha.3",
"version": "2.0.0-alpha.4",
"description": "server renderer for Vue 2.0",
"main": "index.js",
"repository": {
Expand Down
9 changes: 7 additions & 2 deletions packages/vue-template-compiler/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,11 @@ var config = {
*/
errorHandler: null,

/**
* Ignore certain custom elements
*/
ignoredElements: null,

/**
* Check if a tag is reserved so that it cannot be registered as a
* component. This is platform-dependent and may be overwritten.
Expand Down Expand Up @@ -1808,7 +1813,7 @@ function renderElement(tag, data, namespace) {
return createComponent(Ctor, data, parent, context, host, tag);
} else {
if (process.env.NODE_ENV !== 'production') {
if (!namespace && config.isUnknownElement(tag)) {
if (!namespace && !(config.ignoredElements && config.ignoredElements.indexOf(tag) > -1) && config.isUnknownElement(tag)) {
warn('Unknown custom element: <' + tag + '> - did you ' + 'register the component correctly? For recursive components, ' + 'make sure to provide the "name" option.');
}
}
Expand Down Expand Up @@ -3851,7 +3856,7 @@ function compile$2(template, options) {
// operators like typeof, instanceof and in are allowed
var prohibitedKeywordRE = new RegExp('\\b' + ('do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,' + 'super,throw,while,yield,delete,export,import,return,switch,default,' + 'extends,finally,continue,debugger,function,arguments').split(',').join('\\b|\\b') + '\\b');
// check valid identifier for v-for
var identRE = /[^\w$\.](?:[A-Za-z_$][\w$]*)/;
var identRE = /[A-Za-z_$][\w$]*/;

// detect problematic expressions in a template
function detectErrors(ast) {
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-template-compiler/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-template-compiler",
"version": "2.0.0-alpha.3",
"version": "2.0.0-alpha.4",
"description": "template compiler for Vue 2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/core/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ Object.defineProperty(Vue.prototype, '$isServer', {
get: () => config._isServer
})

Vue.version = '2.0.0-alpha.3'
Vue.version = '2.0.0-alpha.4'

export default Vue

0 comments on commit 6d4f23c

Please sign in to comment.