Merge branch 'dev'

.babelrc

@@ -0,0 +1,12 @@
+{
+  "env": {
+    "development": {
+      "presets": ["es2015", "stage-2"],
+      "comments": false
+    },
+    "production": {
+      "presets": ["es2015-rollup"],
+      "comments": false
+    }
+  }
+}

.bithoundrc

@@ -1,6 +1,7 @@
 {
   "ignore": [
-    "**/*dependencies*",
-    "dist/**"
+    "dist/**",
+    "test/**",
+    "dev/**"
   ]
 }

.codeclimate.yml

@@ -4,5 +4,5 @@ exclude_paths:
   - "node_modules/*"
   - "dist/*"
   - "test/*"
-  - "src/lib/core/environment/environment.js"
+  - "src/lib/core/platform/platform.js"
   - "preview/*"

.eslintrc.js

@@ -0,0 +1,26 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    sourceType: 'module'
+  },
+  env: {
+    browser: true
+  },
+  globals: {
+    '__THEME': true,
+    'Velocity': true
+  },
+  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+  extends: 'standard',
+  // required to lint *.vue files
+  plugins: [
+    'html'
+  ],
+  // add your custom rules here
+  'rules': {
+    'arrow-parens': 0,
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'one-var': 0,
+    'brace-style': [2, 'stroustrup', { 'allowSingleLine': true }]
+  }
+}

.gitignore

@@ -1,9 +1,7 @@
-/node_modules
-/dist
-/coverage
-/preview/node_modules
-preview/coverage
-/preview/dist
-/preview/wrapper/platforms/*
-/preview/wrapper/plugins
+.DS_Store
+node_modules/
+dist/
 npm-debug.log
+test/unit/coverage/
+test/e2e/dist/
+cordova

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Razvan Stoenescu
+Copyright (c) 2016 Razvan Stoenescu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

README.md

@@ -6,21 +6,13 @@
 > Simultaneously build desktop/mobile SPA websites & phone/tablet apps.
 
 <a href="https://badge.fury.io/js/quasar-framework"><img src="https://badge.fury.io/js/quasar-framework.svg"></a>
-<a href="https://circleci.com/gh/rstoenescu/quasar-framework/tree/master"><img src="https://circleci.com/gh/rstoenescu/quasar-framework/tree/master.svg?style=shield"></a>
-
-<a href="https://david-dm.org/rstoenescu/quasar-framework" title="Dependency status"><img src="https://david-dm.org/rstoenescu/quasar-framework.svg"/></a>
-<a href="https://david-dm.org/rstoenescu/quasar-framework#info=devDependencies" title="devDependency status"><img src="https://david-dm.org/rstoenescu/quasar-framework/dev-status.svg"/></a>
-
-<a href="https://codecov.io/github/rstoenescu/quasar-framework"><img src="http://codecov.io/github/rstoenescu/quasar-framework/coverage.svg" alt="Coverage via Codecov"></a>
-<a href="https://codeclimate.com/github/rstoenescu/quasar-framework"><img src="https://codeclimate.com/github/rstoenescu/quasar-framework/badges/gpa.svg" /></a>
-<a href="https://www.bithound.io/github/rstoenescu/quasar-framework"><img src="https://www.bithound.io/github/rstoenescu/quasar-framework/badges/code.svg" alt="bitHound Code"></a>
 
 ## Description
 
 * Modern HTML5 SPA front-end framework on steroids.
+* With VueJS.
 * Desktop and Mobile. Native Mobile Apps included.
 * Full Stack Toolkit.
-* With VueJS.
 
 ## Documentation
 
@@ -29,12 +21,13 @@ Head on to the Quasar Framework official website: [http://quasar-framework.org](
 ## Related Components
 
 * [Quasar Framework CLI](https://github.com/rstoenescu/quasar-cli)
+* [Quasar Framework Templates](https://github.com/rstoenescu/quasar-templates)
 
 ## Contributing
 
 I'm excited if you want to contribute to Quasar under any form (report bugs, write a plugin, fix an issue, write a new feature).
 
-I'm only asking that you [read this](http://quasar-framework.org/guide/contributing-to-quasar.html) first.
+I'm only asking that you [read this](http://quasar-framework.org/guide/contributing.html) first.
 
 ## License
 

build/hot-reload.js

@@ -0,0 +1,9 @@
+/* eslint-disable */
+require('eventsource-polyfill')
+var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
+
+hotClient.subscribe(function (event) {
+  if (event.action === 'reload') {
+    window.location.reload()
+  }
+})

build/karma.base.config.js

@@ -0,0 +1,21 @@
+var webpackConfig = require('./webpack.test.config')
+
+delete webpackConfig.entry
+webpackConfig.devtool = 'inline-source-map'
+
+// shared config for all unit tests
+module.exports = {
+  frameworks: ['jasmine'],
+  files: [
+    '../test/unit/lib/jquery.js',
+    '../test/unit/index.js'
+  ],
+  preprocessors: {
+    '../test/unit/index.js': ['webpack', 'sourcemap']
+  },
+  webpack: webpackConfig,
+  webpackMiddleware: {
+    noInfo: true
+  },
+  singleRun: true
+}

build/karma.cover.config.js

@@ -0,0 +1,18 @@
+var
+  assign = require('object-assign'),
+  base = require('./karma.base.config.js')
+
+module.exports = function (config) {
+  var options = assign(base, {
+    browsers: ['PhantomJS'],
+    reporters: ['progress', 'coverage'],
+    coverageReporter: {
+      reporters: [
+        { type: 'lcov', dir: '../test/unit/coverage', subdir: '.' },
+        { type: 'text-summary', dir: '../test/unit/coverage', subdir: '.' }
+      ]
+    }
+  })
+
+  config.set(options)
+}

build/karma.sauce.config.js

@@ -0,0 +1,83 @@
+
+/**
+ * Having too many tests running concurrently on saucelabs
+ * causes timeouts and errors, so we have to run them in
+ * smaller batches.
+ */
+
+var
+  assign = require('object-assign'),
+  base = require('./karma.base.config.js'),
+  batches = [
+    // the cool kids
+    {
+      sl_chrome: {
+        base: 'SauceLabs',
+        browserName: 'chrome',
+        platform: 'Windows 7'
+      },
+      sl_firefox: {
+        base: 'SauceLabs',
+        browserName: 'firefox'
+      },
+      sl_mac_safari: {
+        base: 'SauceLabs',
+        browserName: 'safari',
+        platform: 'OS X 10.10'
+      }
+    },
+    // ie family
+    {
+      sl_ie_9: {
+        base: 'SauceLabs',
+        browserName: 'internet explorer',
+        platform: 'Windows 7',
+        version: '9'
+      },
+      sl_ie_10: {
+        base: 'SauceLabs',
+        browserName: 'internet explorer',
+        platform: 'Windows 8',
+        version: '10'
+      },
+      sl_ie_11: {
+        base: 'SauceLabs',
+        browserName: 'internet explorer',
+        platform: 'Windows 8.1',
+        version: '11'
+      }
+    },
+    // mobile
+    {
+      sl_ios_safari: {
+        base: 'SauceLabs',
+        browserName: 'iphone',
+        platform: 'OS X 10.9',
+        version: '7.1'
+      },
+      sl_android: {
+        base: 'SauceLabs',
+        browserName: 'android',
+        platform: 'Linux',
+        version: '4.2'
+      }
+    }
+  ]
+
+module.exports = function (config) {
+  var batch = batches[process.argv[4] || 0]
+
+  config.set(assign(base, {
+    browsers: Object.keys(batch),
+    customLaunchers: batch,
+    reporters: ['progress', 'saucelabs'],
+    sauceLabs: {
+      testName: 'Quasar Framework unit tests',
+      recordScreenshots: false,
+      build: process.env.CIRCLE_BUILD_NUM || process.env.SAUCE_BUILD_ID || Date.now()
+    },
+    // mobile emulators are really slow
+    captureTimeout: 300000,
+    browserNoActivityTimeout: 300000
+  }))
+}

build/karma.unit.config.js

@@ -0,0 +1,10 @@
+var
+  assign = require('object-assign'),
+  base = require('./karma.base.config.js')
+
+module.exports = function (config) {
+  config.set(assign(base, {
+    browsers: ['Chrome', 'Firefox'],
+    reporters: ['progress']
+  }))
+}

build/platform.js

@@ -0,0 +1,6 @@
+var theme = process.argv[2] || 'mat'
+
+module.exports = {
+  theme: theme,
+  cordovaAssets: './cordova/platforms/' + (theme === 'mat' ? 'android' : 'ios') + '/platform_www'
+}