Merge branch 'next' into dev

Author: hawkeye64

.gitignore

@@ -1,10 +1,11 @@
 .DS_Store
 .thumbs.db
 node_modules
+dist
+yarn.lock
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-yarn.lock
 
 # Editor directories and files
 .idea

.npmignore

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Quasar Framework
+Copyright (c) 2019 Jeff Galbraith <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,37 +1,20 @@
-QIconPicker (@quasar/qiconpicker)
+QIconPicker (Vue Plugin, UMD and Quasar App Extension)
 ===
 
-![official icon](https://img.shields.io/badge/Quasar%201.0-Official%20UI%20App%20Extension-blue.svg)
-![npm (scoped)](https://img.shields.io/npm/v/@quasar/quasar-app-extension-qiconpicker.svg?style=plastic)
+![](https://img.shields.io/npm/v/@quasar/quasar-ui-qiconpicker.svg?label=@quasar/quasar-ui-qiconpicker)
+![](https://img.shields.io/npm/v/@quasar/quasar-app-extension-qiconpicker.svg?label=@quasar/quasar-app-extension-qiconpicker)
 [![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/quasarframework/app-extension-qiconpicker.svg)]()
 [![GitHub repo size in bytes](https://img.shields.io/github/repo-size/quasarframework/app-extension-qiconpicker.svg)]()
-[![npm](https://img.shields.io/npm/dt/@quasar/quasar-app-extension-qiconpicker.svg)](https://www.npmjs.com/package/@quasar/quasar-app-extension-qiconpicker)
 
-QIconPicker is an `UI App Extension` for [Quasar Framework v1](https://quasar.dev/). It will not work with legacy versions of Quasar Framework.
+![QIconPicker](https://raw.githubusercontent.com/quasarframework/quasar-ui-qiconpicker/dev/demo/src/statics/q-icon-picker.png)
 
-![QIconPicker](https://raw.githubusercontent.com/quasarframework/app-extension-qiconpicker/dev/demo/src/statics/q-icon-picker.png)
-
-# Demo Project (source)
-Can be found [here](https://github.com/quasarframework/app-extension-qiconpicker/tree/master/demo).
-
-
-# Documentation and Examples
-Can be found [here](https://quasarframework.github.io/app-extension-qiconpicker).
-
-# Install
-To add this App Extension to your Quasar application, run the following (in your Quasar app folder):
-```
-quasar ext add @quasar/qiconpicker
-```
-
-# Uninstall
-To remove this App Extension from your Quasar application, run the following (in your Quasar app folder):
-```
-quasar ext remove @quasar/qiconpicker
-```
-
-# Describe
-You can use `quasar describe QIconPicker`
+# Structure
+* [/ui](ui) - standalone npm package
+* [/app-extension](app-extension) - Quasar app extension
+* [/demo](demo) - demo and examples
 
 # Donate
-If you appreciate the work that went into this App Extension, please consider [donating to Quasar](https://donate.quasar.dev).
+If you appreciate the work that went into this project, please consider [donating to Quasar](https://donate.quasar.dev).
+
+# License
+MIT (c) Jeff Galbraith <[email protected]>

README.md

@@ -0,0 +1,17 @@
+.DS_Store
+.thumbs.db
+yarn.lock
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+.editorconfig
+.eslintignore
+.eslintrc.js

_redirects

@@ -0,0 +1,33 @@
+# Quasar App Extension qiconpicker
+
+> Add a short description of your App Extension. What does it do? How is it beneficial? Why would someone want to use it?
+
+[![npm](https://img.shields.io/npm/v/@quasar/quasar-app-extension-qiconpicker.svg?label=@quasar/quasar-app-extension-qiconpicker)](https://www.npmjs.com/package/quasar-app-extension-qiconpicker)
+[![npm](https://img.shields.io/npm/dt/@quasar/quasar-app-extension-qiconpicker.svg)](https://www.npmjs.com/package/@quasar/quasar-app-extension-qiconpicker)
+
+# Install
+```bash
+quasar ext add @quasar/qiconpicker
+```
+Quasar CLI will retrieve it from NPM and install the extension.
+
+## Prompts
+
+> If your app extension uses prompts, explain them here, otherwise remove this section.
+
+# Uninstall
+```bash
+quasar ext remove @quasar/qiconpicker
+```
+
+# Info
+> Add longer information here that will help the user of your app extension.
+
+# Other Info
+> Add other information that's not as important to know
+
+# Donate
+If you appreciate the work that went into this App Extension, please consider [donating to Quasar](https://donate.quasar.dev).
+
+# License
+MIT (c) Jeff Galbraith <[email protected]>

app-extension/.npmignore

@@ -1,20 +1,10 @@
 {
-  "name": "@quasar/quasar-app-extension-qiconpicker",
-  "version": "1.0.3",
-  "description": "QIconPicker - Quasar App Extension",
+  "name": "quasar-app-extension-qiconpicker",
+  "version": "1.0.4",
+  "description": "A Quasar App Extension",
   "author": "Jeff Galbraith <[email protected]>",
+  "license": "MIT",
   "main": "src/index.js",
-  "scripts": {
-    "lint": "eslint --ext .js,.vue src",
-    "lint-fix": "eslint --ext .js,.vue src --fix",
-    "build-demo": "cd ./demo && yarn build && cd .. && cp ./_redirects ./demo/dist/spa && rm -r -f ./docs && cp -r ./demo/dist/spa/. ./docs",
-    "test": "echo \"No test specified\" && exit 0"
-  },
-  "engines": {
-    "node": ">= 8.9.0",
-    "npm": ">= 5.6.0",
-    "yarn": ">= 1.6.0"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -24,28 +14,19 @@
     "url": "git+https://github.com/quasarframework/app-extension-qiconpicker.git"
   },
   "homepage": "https://github.com/quasarframework/app-extension-qiconpicker",
-  "license": "MIT",
-  "keywords": [
-    "quasar",
-    "app",
-    "app extension",
-    "extension",
-    "calendar",
-    "daily",
-    "weekly",
-    "monthly",
-    "events",
-    "reminders"
-  ],
+  "dependencies": {
+    "quasar-ui-qiconpicker": "latest"
+  },
   "devDependencies": {
-    "@quasar/extras": "^1.3.2",
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.4.0",
     "eslint-loader": "^3.0.2",
     "eslint-plugin-vue": "^5.2.3"
   },
-  "dependencies": {
-    "quasar-mixin-colorize": "^1.0.0-alpha.9"
+  "engines": {
+    "node": ">= 8.9.0",
+    "npm": ">= 5.6.0",
+    "yarn": ">= 1.6.0"
   }
 }

app-extension/README.md

@@ -0,0 +1,4 @@
+import Vue from 'vue'
+import VuePlugin from 'quasar-ui-qiconpicker'
+
+Vue.use(VuePlugin)

package.json renamed to app-extension/package.json

@@ -0,0 +1,32 @@
+/**
+ * Quasar App Extension index/runner script
+ * (runs on each dev/build)
+ *
+ * Docs: https://quasar.dev/app-extensions/development-guide/index-api
+ * API: https://github.com/quasarframework/quasar/blob/master/app/lib/app-extension/IndexAPI.js
+ */
+
+function extendConf (conf) {
+  // register our boot file
+  conf.boot.push('~quasar-app-extension-qiconpicker/src/boot/register.js')
+
+  // make sure app extension files & ui package gets transpiled
+  conf.build.transpileDependencies.push(/quasar-app-extension-qiconpicker[\\/]src/)
+
+  // make sure the stylesheet goes through webpack to avoid SSR issues
+  conf.css.push('~quasar-ui-qiconpicker/src/index.sass')
+}
+
+module.exports = function (api) {
+  // Quasar compatibility check; you may need
+  // hard dependencies, as in a minimum version of the "quasar"
+  // package or a minimum version of "@quasar/app" CLI
+  api.compatibleWith('quasar', '^1.1.1')
+  api.compatibleWith('@quasar/app', '^1.1.0')
+
+  // Uncomment the line below if you provide a JSON API for your component
+  // api.registerDescribeApi('QIconPicker', '~quasar-ui-qiconpicker/src/component/QIconPicker.json')
+
+  // We extend /quasar.conf.js
+  api.extendQuasarConf(extendConf)
+}