Skip to content

Commit d8f887d

Browse files
committed
Merge branch 'next2' into next
2 parents 8de0b04 + 6ff4084 commit d8f887d

File tree

322 files changed

+7323
-5613
lines changed

Some content is hidden

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

322 files changed

+7323
-5613
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.eslintrc.js

Lines changed: 0 additions & 55 deletions
This file was deleted.

README.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
QIconPicker (Vue Plugin, UMD and Quasar App Extension)
22
===
33

4-
![](https://img.shields.io/npm/v/@quasar/quasar-ui-qiconpicker.svg?label=@quasar/quasar-ui-qiconpicker)
5-
![](https://img.shields.io/npm/v/@quasar/quasar-app-extension-qiconpicker.svg?label=@quasar/quasar-app-extension-qiconpicker)
4+
![](https://img.shields.io/npm/v/@quasar/quasar-ui-qiconpicker/next?label=@quasar/quasar-ui-qiconpicker)
5+
![](https://img.shields.io/npm/v/@quasar/quasar-app-extension-qiconpicker/next?label=@quasar/quasar-app-extension-qiconpicker)
66
[![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/quasarframework/app-extension-qiconpicker.svg)]()
77
[![GitHub repo size in bytes](https://img.shields.io/github/repo-size/quasarframework/app-extension-qiconpicker.svg)]()
88

@@ -14,6 +14,25 @@ QIconPicker (Vue Plugin, UMD and Quasar App Extension)
1414
* [/demo](demo) - demo and examples
1515
* [Live Demo](https://quasarframework.github.io/quasar-ui-qiconpicker/docs)
1616

17+
# Demo Workflow
18+
If you fork or download this project, make sure you have the Quasar CLI globally installed:
19+
20+
```
21+
$ npm i -g @quasar/cli
22+
or
23+
yarn global add @quasar/cli
24+
```
25+
26+
The workflow to build the demo, on a fresh project, is as follows:
27+
```
28+
$ cd ui
29+
$ yarn
30+
$ yarn build
31+
$ cd ../docs
32+
$ yarn
33+
$ quasar dev
34+
```
35+
1736
# Donate
1837
If you appreciate the work that went into this, please consider donating to [Quasar](https://donate.quasar.dev) or [Jeff](https://github.com/sponsors/hawkeye64).
1938

File renamed without changes.

app-extension/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The **QIconPicker App Extension** allows you to seamlessly add the [QIconPicker]
99

1010
# Install
1111
```bash
12-
quasar ext add @quasar/qiconpicker
12+
quasar ext add @quasar/qiconpicker@next
1313
```
1414
Quasar CLI will retrieve it from NPM and install the extension.
1515

app-extension/jsconfig.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
{
3+
"compilerOptions": {
4+
"module": "commonjs",
5+
"target": "es6"
6+
},
7+
"exclude": ["node_modules"],
8+
"include": ["src/**/*"]
9+
}

app-extension/package.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@quasar/quasar-app-extension-qiconpicker",
3-
"version": "1.3.3",
3+
"version": "2.0.0-alpha.1",
44
"description": "QIconPicker - A Quasar App Extension",
55
"author": "Jeff Galbraith <[email protected]>",
66
"license": "MIT",
@@ -31,14 +31,7 @@
3131
"icon picker"
3232
],
3333
"dependencies": {
34-
"@quasar/quasar-ui-qiconpicker": "^1.3.3"
35-
},
36-
"devDependencies": {
37-
"@vue/eslint-config-standard": "^6.0.0",
38-
"babel-eslint": "^10.1.0",
39-
"eslint": "^7.28.0",
40-
"eslint-loader": "^4.0.2",
41-
"eslint-plugin-vue": "^7.11.1"
34+
"@quasar/quasar-ui-qiconpicker": "^2.0.0-alpha.1"
4235
},
4336
"engines": {
4437
"node": ">= 10.0.0",

app-extension/src/boot/register.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import Vue from 'vue'
1+
import { boot } from 'quasar/wrappers'
22
import VuePlugin from '@quasar/quasar-ui-qiconpicker'
33

4-
Vue.use(VuePlugin)
4+
export default boot(({ app }) => {
5+
app.use(VuePlugin)
6+
})

app-extension/src/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ module.exports = function (api) {
2222
// Quasar compatibility check; you may need
2323
// hard dependencies, as in a minimum version of the "quasar"
2424
// package or a minimum version of "@quasar/app" CLI
25-
api.compatibleWith('quasar', '^1.5.0')
26-
api.compatibleWith('@quasar/app', '^1.3.0 || ^2.0.0') // needed for describe to work properly
27-
api.compatibleWith('@quasar/extras', '^1.8.0') // needed for latest font and svg support
25+
api.compatibleWith('quasar', '^2.0.0')
26+
api.compatibleWith('@quasar/app', '^3.0.0')
27+
api.compatibleWith('@quasar/extras', '^1.10.0') // needed for latest font and svg support
2828

2929
// Uncomment the line below if you provide a JSON API for your component
3030
api.registerDescribeApi('QIconPicker', '~@quasar/quasar-ui-qiconpicker/dist/api/QIconPicker.json')

demo/.eslintignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)