Skip to content

Commit c569360

Browse files
committed
Merge branch 'v0.8' into dev
2 parents ffc3361 + 402c3f9 commit c569360

File tree

187 files changed

+4148
-4251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+4148
-4251
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module.exports = {
22
root: true,
3+
parser: 'babel-eslint',
34
parserOptions: {
45
sourceType: 'module'
56
},

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
# Quasar Framework
44

5-
> Build responsive websites and hybrid mobile Apps (that look native!) using same code, with VueJs.
6-
7-
```
8-
Vue 2 compatibility work has started. Branch "v0.8" is used for this.
9-
```
5+
> Build responsive websites and hybrid mobile Apps (that look native!) using same code, with VueJs 2.
106
117
<a href="https://badge.fury.io/js/quasar-framework" target="_blank"><img src="https://badge.fury.io/js/quasar-framework.svg"></a>
128
[![Join the chat at https://gitter.im/quasarframework/Lobby](https://badges.gitter.im/quasarframework/Lobby.svg)](https://gitter.im/quasarframework/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -19,6 +15,10 @@ Quasar Framework is an MIT-licensed open source project. Its ongoing development
1915

2016
Head on to the Quasar Framework official website: [http://quasar-framework.org](http://quasar-framework.org)
2117

18+
## Stay in Touch
19+
20+
For latest releases and announcements, follow on Twitter: [@quasarframework](https://twitter.com/quasarframework)
21+
2222
## Community Forum
2323

2424
Head on to the official community forum: [http://forum.quasar-framework.org](http://forum.quasar-framework.org)

build/script.build.javascript.js

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ var
1717
' * (c) ' + new Date().getFullYear() + ' Razvan Stoenescu\n' +
1818
' * Released under the MIT License.\n' +
1919
' */',
20+
vueConfig = {
21+
compileTemplate: true,
22+
htmlMinifier: {collapseBooleanAttributes: false}
23+
},
2024
babelConfig = {
2125
exclude: 'node_modules/**'
2226
},
@@ -27,19 +31,17 @@ var
2731
'fastclick',
2832
'hammerjs',
2933
'moment',
30-
'velocity-animate',
31-
'velocity-animate/velocity.ui'
34+
'velocity-animate'
3235
],
3336
globals = {
3437
fastclick: 'FastClick',
3538
hammerjs: 'Hammer',
3639
moment: 'moment',
37-
'velocity-animate': 'Velocity',
38-
'velocity-animate/velocity.ui': 'velui'
40+
'velocity-animate': 'Velocity'
3941
},
4042
rollupConfig = {
4143
entry: 'src/index.js',
42-
plugins: [vue(), string(stringConfig), babel(babelConfig)],
44+
plugins: [vue(vueConfig), string(stringConfig), babel(babelConfig)],
4345
external: external
4446
}
4547

@@ -57,22 +59,24 @@ rollup
5759
return write('dist/quasar.common.js', bundle.generate({
5860
format: 'cjs',
5961
banner: banner,
60-
globals: globals
62+
globals: globals,
63+
useStrict: false
6164
}).code)
6265
})
6366
// ES6 Dev Build
6467
.then(function () {
6568
return rollup
6669
.rollup({
6770
entry: 'src/index.es6.js',
68-
plugins: [vue(), string(stringConfig)],
71+
plugins: [vue(vueConfig), string(stringConfig)],
6972
external: external
7073
})
7174
.then(function (bundle) {
7275
return write('dist/quasar.es6.js', bundle.generate({
7376
exports: 'named',
7477
banner: banner,
75-
globals: globals
78+
globals: globals,
79+
useStrict: false
7680
}).code)
7781
})
7882
})
@@ -87,7 +91,8 @@ rollup
8791
format: 'umd',
8892
banner: banner,
8993
moduleName: 'Quasar',
90-
globals: globals
94+
globals: globals,
95+
useStrict: false
9196
}).code)
9297
})
9398
})
@@ -104,7 +109,8 @@ rollup
104109
format: 'umd',
105110
moduleName: 'Quasar',
106111
banner: banner,
107-
globals: globals
112+
globals: globals,
113+
useStrict: false
108114
}).code
109115

110116
res = uglify.minify(code, {

package.json

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "quasar-framework",
3-
"version": "0.7.0",
3+
"version": "0.8.0",
44
"description": "Simultaneously build desktop/mobile SPA websites & phone/tablet apps with VueJS",
55
"main": "dist/quasar.common.js",
66
"jsnext:main": "dist/quasar.es6.js",
@@ -50,34 +50,34 @@
5050
},
5151
"homepage": "http://quasar-framework.org",
5252
"devDependencies": {
53-
"autoprefixer": "^6.4.0",
54-
"babel-core": "^6.0.0",
55-
"babel-loader": "^6.0.0",
56-
"babel-plugin-transform-runtime": "^6.0.0",
57-
"babel-preset-es2015": "^6.0.0",
58-
"babel-preset-es2015-rollup": "^1.1.1",
59-
"babel-preset-stage-2": "^6.0.0",
60-
"babel-runtime": "^6.0.0",
53+
"autoprefixer": "^6.5.0",
54+
"babel-core": "^6.17.0",
55+
"babel-eslint": "^7.0.0",
56+
"babel-loader": "^6.2.5 ",
57+
"babel-plugin-transform-runtime": "^6.15.0",
58+
"babel-preset-es2015": "^6.16.0",
59+
"babel-preset-es2015-rollup": "^1.2.0",
60+
"babel-preset-stage-2": "^6.17.0",
61+
"babel-runtime": "^6.11.6",
6162
"bundle-loader": "^0.5.4",
62-
"casperjs": "^1.1.2",
63+
"casperjs": "^1.1.3",
6364
"codecov.io": "^0.1.6",
6465
"colors": "^1.1.2",
65-
"connect-history-api-fallback": "^1.2.0",
66+
"connect-history-api-fallback": "^1.3.0",
6667
"css-loader": "^0.25.0",
67-
"eslint": "^3.1.0",
68-
"eslint-config-standard": "^6.0.1",
68+
"eslint": "^3.7.0",
69+
"eslint-config-standard": "^6.2.0",
6970
"eslint-friendly-formatter": "^2.0.6",
70-
"eslint-loader": "^1.4.1",
71-
"eslint-plugin-html": "^1.5.1",
72-
"eslint-plugin-promise": "^2.0.0",
73-
"eslint-plugin-standard": "^2.0.0",
71+
"eslint-loader": "^1.5.0",
72+
"eslint-plugin-html": "^1.5.3",
73+
"eslint-plugin-promise": "^2.0.1",
74+
"eslint-plugin-standard": "^2.0.1",
7475
"eventsource-polyfill": "^0.9.6",
7576
"express": "^4.14.0",
7677
"extract-text-webpack-plugin": "^1.0.1",
7778
"fastclick": "^1.0.6",
7879
"file-loader": "^0.9.0",
7980
"function-bind": "^1.1.0",
80-
"hammerjs": "^2.0.8",
8181
"html-webpack-plugin": "^2.22.0",
8282
"isparta-loader": "^2.0.0",
8383
"jasmine-core": "^2.4.1",
@@ -94,40 +94,37 @@
9494
"karma-sourcemap-loader": "^0.3.7",
9595
"karma-webpack": "^1.7.0",
9696
"material-design-icons": "^3.0.1",
97-
"moment": "^2.14.1",
97+
"moment": "^2.15.1",
9898
"object-assign": "^4.1.0",
9999
"phantomjs": "^2.1.7",
100100
"postcss-loader": "^0.13.0",
101101
"raw-loader": "^0.5.1",
102102
"rgb-hex": "^2.0.0",
103103
"roboto-fontface": "^0.6.0",
104-
"rollup": "^0.35.12",
104+
"rollup": "^0.36.1",
105105
"rollup-plugin-babel": "^2.6.1",
106106
"rollup-plugin-string": "^2.0.2",
107-
"rollup-plugin-vue": "^2.0.1",
107+
"rollup-plugin-vue": "^2.2.5",
108108
"stylint": "^1.5.6",
109109
"stylus": "^0.54.5",
110110
"stylus-loader": "^2.1.1",
111111
"url-loader": "^0.5.7",
112112
"velocity-animate": "^1.2.3",
113-
"vue": "^1.0.26",
114-
"vue-hot-reload-api": "^1.3.3",
113+
"vue": "^2.0.0",
114+
"vue-hot-reload-api": "^2.0.6",
115115
"vue-html-loader": "^1.2.3",
116-
"vue-loader": "^8.5.3",
117-
"vue-router": "^0.7.13",
116+
"vue-loader": "^9.5.1",
117+
"vue-router": "^2.0.0",
118118
"vue-style-loader": "^1.0.0",
119-
"vue-touch": "^1.1.0",
120119
"webpack": "^1.13.1",
121-
"webpack-dev-middleware": "^1.6.1",
120+
"webpack-dev-middleware": "^1.8.3",
122121
"webpack-hot-middleware": "^2.12.1",
123122
"webpack-merge": "^0.14.0"
124123
},
125124
"peerDependencies": {
126125
"fastclick": "^1.0.6",
127-
"hammerjs": "^2.0.8",
128126
"moment": "^2.14.1",
129127
"velocity-animate": "^1.2.3",
130-
"vue": "^1.0.26",
131-
"vue-touch": "^1.1.0"
128+
"vue": "^2.0.0"
132129
}
133130
}

src/app-visibility.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function onchange (evt) {
2929
}
3030

3131
appVisibility = state
32-
Events.trigger('app:visibility', state)
32+
Events.$emit('app:visibility', state)
3333
}
3434

3535
Utils.dom.ready(() => {

0 commit comments

Comments
 (0)