Skip to content

Commit

Permalink
Merge branch 'v0.8' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoenescu committed Oct 23, 2016
2 parents ffc3361 + 402c3f9 commit c569360
Show file tree
Hide file tree
Showing 187 changed files with 4,148 additions and 4,251 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module'
},
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

# Quasar Framework

> Build responsive websites and hybrid mobile Apps (that look native!) using same code, with VueJs.
```
Vue 2 compatibility work has started. Branch "v0.8" is used for this.
```
> Build responsive websites and hybrid mobile Apps (that look native!) using same code, with VueJs 2.
<a href="https://badge.fury.io/js/quasar-framework" target="_blank"><img src="https://badge.fury.io/js/quasar-framework.svg"></a>
[![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)
Expand All @@ -19,6 +15,10 @@ Quasar Framework is an MIT-licensed open source project. Its ongoing development

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

## Stay in Touch

For latest releases and announcements, follow on Twitter: [@quasarframework](https://twitter.com/quasarframework)

## Community Forum

Head on to the official community forum: [http://forum.quasar-framework.org](http://forum.quasar-framework.org)
Expand Down
26 changes: 16 additions & 10 deletions build/script.build.javascript.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ var
' * (c) ' + new Date().getFullYear() + ' Razvan Stoenescu\n' +
' * Released under the MIT License.\n' +
' */',
vueConfig = {
compileTemplate: true,
htmlMinifier: {collapseBooleanAttributes: false}
},
babelConfig = {
exclude: 'node_modules/**'
},
Expand All @@ -27,19 +31,17 @@ var
'fastclick',
'hammerjs',
'moment',
'velocity-animate',
'velocity-animate/velocity.ui'
'velocity-animate'
],
globals = {
fastclick: 'FastClick',
hammerjs: 'Hammer',
moment: 'moment',
'velocity-animate': 'Velocity',
'velocity-animate/velocity.ui': 'velui'
'velocity-animate': 'Velocity'
},
rollupConfig = {
entry: 'src/index.js',
plugins: [vue(), string(stringConfig), babel(babelConfig)],
plugins: [vue(vueConfig), string(stringConfig), babel(babelConfig)],
external: external
}

Expand All @@ -57,22 +59,24 @@ rollup
return write('dist/quasar.common.js', bundle.generate({
format: 'cjs',
banner: banner,
globals: globals
globals: globals,
useStrict: false
}).code)
})
// ES6 Dev Build
.then(function () {
return rollup
.rollup({
entry: 'src/index.es6.js',
plugins: [vue(), string(stringConfig)],
plugins: [vue(vueConfig), string(stringConfig)],
external: external
})
.then(function (bundle) {
return write('dist/quasar.es6.js', bundle.generate({
exports: 'named',
banner: banner,
globals: globals
globals: globals,
useStrict: false
}).code)
})
})
Expand All @@ -87,7 +91,8 @@ rollup
format: 'umd',
banner: banner,
moduleName: 'Quasar',
globals: globals
globals: globals,
useStrict: false
}).code)
})
})
Expand All @@ -104,7 +109,8 @@ rollup
format: 'umd',
moduleName: 'Quasar',
banner: banner,
globals: globals
globals: globals,
useStrict: false
}).code

res = uglify.minify(code, {
Expand Down
57 changes: 27 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "quasar-framework",
"version": "0.7.0",
"version": "0.8.0",
"description": "Simultaneously build desktop/mobile SPA websites & phone/tablet apps with VueJS",
"main": "dist/quasar.common.js",
"jsnext:main": "dist/quasar.es6.js",
Expand Down Expand Up @@ -50,34 +50,34 @@
},
"homepage": "http://quasar-framework.org",
"devDependencies": {
"autoprefixer": "^6.4.0",
"babel-core": "^6.0.0",
"babel-loader": "^6.0.0",
"babel-plugin-transform-runtime": "^6.0.0",
"babel-preset-es2015": "^6.0.0",
"babel-preset-es2015-rollup": "^1.1.1",
"babel-preset-stage-2": "^6.0.0",
"babel-runtime": "^6.0.0",
"autoprefixer": "^6.5.0",
"babel-core": "^6.17.0",
"babel-eslint": "^7.0.0",
"babel-loader": "^6.2.5 ",
"babel-plugin-transform-runtime": "^6.15.0",
"babel-preset-es2015": "^6.16.0",
"babel-preset-es2015-rollup": "^1.2.0",
"babel-preset-stage-2": "^6.17.0",
"babel-runtime": "^6.11.6",
"bundle-loader": "^0.5.4",
"casperjs": "^1.1.2",
"casperjs": "^1.1.3",
"codecov.io": "^0.1.6",
"colors": "^1.1.2",
"connect-history-api-fallback": "^1.2.0",
"connect-history-api-fallback": "^1.3.0",
"css-loader": "^0.25.0",
"eslint": "^3.1.0",
"eslint-config-standard": "^6.0.1",
"eslint": "^3.7.0",
"eslint-config-standard": "^6.2.0",
"eslint-friendly-formatter": "^2.0.6",
"eslint-loader": "^1.4.1",
"eslint-plugin-html": "^1.5.1",
"eslint-plugin-promise": "^2.0.0",
"eslint-plugin-standard": "^2.0.0",
"eslint-loader": "^1.5.0",
"eslint-plugin-html": "^1.5.3",
"eslint-plugin-promise": "^2.0.1",
"eslint-plugin-standard": "^2.0.1",
"eventsource-polyfill": "^0.9.6",
"express": "^4.14.0",
"extract-text-webpack-plugin": "^1.0.1",
"fastclick": "^1.0.6",
"file-loader": "^0.9.0",
"function-bind": "^1.1.0",
"hammerjs": "^2.0.8",
"html-webpack-plugin": "^2.22.0",
"isparta-loader": "^2.0.0",
"jasmine-core": "^2.4.1",
Expand All @@ -94,40 +94,37 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^1.7.0",
"material-design-icons": "^3.0.1",
"moment": "^2.14.1",
"moment": "^2.15.1",
"object-assign": "^4.1.0",
"phantomjs": "^2.1.7",
"postcss-loader": "^0.13.0",
"raw-loader": "^0.5.1",
"rgb-hex": "^2.0.0",
"roboto-fontface": "^0.6.0",
"rollup": "^0.35.12",
"rollup": "^0.36.1",
"rollup-plugin-babel": "^2.6.1",
"rollup-plugin-string": "^2.0.2",
"rollup-plugin-vue": "^2.0.1",
"rollup-plugin-vue": "^2.2.5",
"stylint": "^1.5.6",
"stylus": "^0.54.5",
"stylus-loader": "^2.1.1",
"url-loader": "^0.5.7",
"velocity-animate": "^1.2.3",
"vue": "^1.0.26",
"vue-hot-reload-api": "^1.3.3",
"vue": "^2.0.0",
"vue-hot-reload-api": "^2.0.6",
"vue-html-loader": "^1.2.3",
"vue-loader": "^8.5.3",
"vue-router": "^0.7.13",
"vue-loader": "^9.5.1",
"vue-router": "^2.0.0",
"vue-style-loader": "^1.0.0",
"vue-touch": "^1.1.0",
"webpack": "^1.13.1",
"webpack-dev-middleware": "^1.6.1",
"webpack-dev-middleware": "^1.8.3",
"webpack-hot-middleware": "^2.12.1",
"webpack-merge": "^0.14.0"
},
"peerDependencies": {
"fastclick": "^1.0.6",
"hammerjs": "^2.0.8",
"moment": "^2.14.1",
"velocity-animate": "^1.2.3",
"vue": "^1.0.26",
"vue-touch": "^1.1.0"
"vue": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion src/app-visibility.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function onchange (evt) {
}

appVisibility = state
Events.trigger('app:visibility', state)
Events.$emit('app:visibility', state)
}

Utils.dom.ready(() => {
Expand Down
Loading

0 comments on commit c569360

Please sign in to comment.