From dfd73903a60b5cfa90a87a350fed43923f9bcb93 Mon Sep 17 00:00:00 2001 From: Razvan Stoenescu Date: Sun, 2 Oct 2016 15:04:48 +0300 Subject: [PATCH 01/75] feat: Vue 2 compatibility work --- .eslintrc.js | 1 + README.md | 2 ++ package.json | 37 +++++++++++++++++++------------------ src/install.js | 1 - 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 21de5897c70..b1323aa795b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,6 @@ module.exports = { root: true, + parser: 'babel-eslint', parserOptions: { sourceType: 'module' }, diff --git a/README.md b/README.md index b8096a57ac2..f87a5432aee 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ![Quasar Framework logo](http://quasar-framework.org/images/logo/xxhdpi.png) +**This branch is used for Vue 2 compatibility. It is a work in progress.** + # Quasar Framework > Build responsive websites and hybrid mobile Apps (that look native!) using same code, with VueJs. diff --git a/package.json b/package.json index 128271062fc..ef2e77e7a93 100644 --- a/package.json +++ b/package.json @@ -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", @@ -50,13 +50,14 @@ }, "homepage": "http://quasar-framework.org", "devDependencies": { - "autoprefixer": "^6.4.0", - "babel-core": "^6.0.0", + "autoprefixer": "^6.5.0", + "babel-core": "^6.17.0", + "babel-eslint": "^7.0.0", "babel-loader": "^6.0.0", "babel-plugin-transform-runtime": "^6.0.0", - "babel-preset-es2015": "^6.0.0", + "babel-preset-es2015": "^6.16.0", "babel-preset-es2015-rollup": "^1.1.1", - "babel-preset-stage-2": "^6.0.0", + "babel-preset-stage-2": "^6.17.0", "babel-runtime": "^6.0.0", "bundle-loader": "^0.5.4", "casperjs": "^1.1.2", @@ -64,13 +65,13 @@ "colors": "^1.1.2", "connect-history-api-fallback": "^1.2.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-html": "^1.5.3", "eslint-plugin-promise": "^2.0.0", - "eslint-plugin-standard": "^2.0.0", + "eslint-plugin-standard": "^2.0.1", "eventsource-polyfill": "^0.9.6", "express": "^4.14.0", "extract-text-webpack-plugin": "^1.0.1", @@ -94,30 +95,30 @@ "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", "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" }, @@ -126,7 +127,7 @@ "hammerjs": "^2.0.8", "moment": "^2.14.1", "velocity-animate": "^1.2.3", - "vue": "^1.0.26", + "vue": "^2.0.0", "vue-touch": "^1.1.0" } } diff --git a/src/install.js b/src/install.js index bcd04dc2362..6719fc8f982 100644 --- a/src/install.js +++ b/src/install.js @@ -1,4 +1,3 @@ - import Platform from './platform' import Events from './events' import { current as theme } from './theme' From d09153590adbf7e084968ec3a19c5160022ef990 Mon Sep 17 00:00:00 2001 From: Kristian Mandrup Date: Mon, 3 Oct 2016 17:01:47 +0200 Subject: [PATCH 02/75] update dependencies --- package.json | 16 ++++++++-------- src/index.js | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index ef2e77e7a93..7defc078b88 100644 --- a/package.json +++ b/package.json @@ -53,24 +53,24 @@ "autoprefixer": "^6.5.0", "babel-core": "^6.17.0", "babel-eslint": "^7.0.0", - "babel-loader": "^6.0.0", - "babel-plugin-transform-runtime": "^6.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.1.1", + "babel-preset-es2015-rollup": "^1.2.0", "babel-preset-stage-2": "^6.17.0", - "babel-runtime": "^6.0.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.7.0", "eslint-config-standard": "^6.2.0", "eslint-friendly-formatter": "^2.0.6", - "eslint-loader": "^1.4.1", + "eslint-loader": "^1.5.0", "eslint-plugin-html": "^1.5.3", - "eslint-plugin-promise": "^2.0.0", + "eslint-plugin-promise": "^2.0.1", "eslint-plugin-standard": "^2.0.1", "eventsource-polyfill": "^0.9.6", "express": "^4.14.0", diff --git a/src/index.js b/src/index.js index 7956eedaaca..625445006f6 100644 --- a/src/index.js +++ b/src/index.js @@ -26,7 +26,7 @@ import Utils from './utils' import { LocalStorage, SessionStorage } from './web-storage' let Quasar = { - version: '0.7.0', + version: '0.8.0', install, start, theme, From e28d267a23c60713342bbd222738016bb3f89b61 Mon Sep 17 00:00:00 2001 From: Razvan Stoenescu Date: Mon, 3 Oct 2016 19:58:28 +0300 Subject: [PATCH 03/75] feat: [vue2] One time bindings --- .../action-sheet/action-sheet-ios.html | 16 ++++++------ .../action-sheet/action-sheet-material.html | 18 ++++++------- src/components/dialog/dialog.html | 25 ++++++------------- src/vue-components/select/select.vue | 12 +++------ 4 files changed, 25 insertions(+), 46 deletions(-) diff --git a/src/components/action-sheet/action-sheet-ios.html b/src/components/action-sheet/action-sheet-ios.html index b6c8ee0c96b..f395590f75f 100644 --- a/src/components/action-sheet/action-sheet-ios.html +++ b/src/components/action-sheet/action-sheet-ios.html @@ -1,8 +1,6 @@ -
+
-
- {{{* title}}} -
+
@@ -12,10 +10,10 @@ @click="close(button.handler)" :class="button.classes" > - {{* button.icon}} + {{ button.icon }} - {{* button.label}} + {{ button.label }}
@@ -25,10 +23,10 @@ @click="close(button.handler)" :class="button.classes" > - {{* button.icon}} + {{ button.icon}}
- {{* button.label}} + {{ button.label}}
@@ -42,7 +40,7 @@ :class="dismissButton.classes" >
- {{* dismissButton.label}} + {{ dismissButton.label }}
diff --git a/src/components/action-sheet/action-sheet-material.html b/src/components/action-sheet/action-sheet-material.html index f8d4d24fd33..73cf9a3a9dc 100644 --- a/src/components/action-sheet/action-sheet-material.html +++ b/src/components/action-sheet/action-sheet-material.html @@ -1,7 +1,5 @@ -
-
- {{{* title}}} -
+
+
@@ -11,10 +9,10 @@ @click="close(button.handler)" :class="button.classes" > - {{* button.icon}} + {{ button.icon }} - {{* button.label}} + {{ button.label }}
@@ -24,10 +22,10 @@ @click="close(button.handler)" :class="button.classes" > - {{* button.icon}} + {{ button.icon }}
- {{* button.label}} + {{ button.label }}
@@ -39,9 +37,9 @@ @click="close(dismissButton.handler)" :class="dismissButton.classes" > - {{* dismissButton.icon}} + {{ dismissButton.icon }}
- {{* dismissButton.label}} + {{ dismissButton.label }}
diff --git a/src/components/dialog/dialog.html b/src/components/dialog/dialog.html index 98f6e5c382c..d33cc4748e9 100644 --- a/src/components/dialog/dialog.html +++ b/src/components/dialog/dialog.html @@ -1,10 +1,6 @@
-
- {{{* title || ''}}} -
-
- {{{* message}}} -
+
+
@@ -16,9 +12,7 @@
-
- {{{* radio.label}}} -
+
@@ -26,16 +20,12 @@
-
- {{{* checkbox.label}}} -
+
diff --git a/src/vue-components/select/select.vue b/src/vue-components/select/select.vue index 076458bb718..fbc8d7fad89 100644 --- a/src/vue-components/select/select.vue +++ b/src/vue-components/select/select.vue @@ -11,9 +11,7 @@
-
- {{{* radio.label}}} -
+
-
- {{{* checkbox.label}}} -
+