hash
stringlengths 40
40
| date
stringdate 2016-01-13 02:22:49
2025-03-03 16:03:28
| author
stringclasses 78
values | commit_message
stringlengths 16
242
| is_merge
bool 1
class | masked_commit_message
stringlengths 5
208
| type
stringclasses 6
values | git_diff
stringlengths 194
41.5M
|
|---|---|---|---|---|---|---|---|
914e3addf0f7d42f695272b663e679cf305fdf73
|
2021-04-23 10:42:03
|
Razvan Stoenescu
|
feat(docs): update quasar.conf
| false
|
update quasar.conf
|
feat
|
diff --git a/app/lib/quasar-conf-file.js b/app/lib/quasar-conf-file.js
index 743855c9c26..0aa66257b71 100644
--- a/app/lib/quasar-conf-file.js
+++ b/app/lib/quasar-conf-file.js
@@ -568,7 +568,9 @@ class QuasarConfFile {
prodPort: 3000, // gets superseeded in production by an eventual process.env.PORT
maxAge: 1000 * 60 * 60 * 24 * 30
}, cfg.ssr, {
- directiveTransforms: { // not meant to be configurable directly by the user
+ // not meant to be configurable directly by the user,
+ // which is why we're overriding it here
+ directiveTransforms: {
...require('quasar/dist/ssr-directives/index.js'),
...this.devlandSsrDirectives
}
diff --git a/docs/quasar.conf.js b/docs/quasar.conf.js
index 6c329a9c605..3f7c140f9ad 100644
--- a/docs/quasar.conf.js
+++ b/docs/quasar.conf.js
@@ -1,6 +1,8 @@
// Configuration for your app
const path = require('path')
const ESLintPlugin = require('eslint-webpack-plugin')
+const { merge } = require('webpack-merge')
+const transformAssetUrls = require('quasar/dist/transforms/loader-asset-urls.json')
module.exports = function (ctx) {
return {
@@ -27,7 +29,7 @@ module.exports = function (ctx) {
distDir: 'dist/quasar.dev',
// analyze: true,
- chainWebpack (chain) {
+ chainWebpack (chain, { isServer }) {
chain.plugin('eslint-webpack-plugin')
.use(ESLintPlugin, [{
extensions: [ 'js', 'vue' ],
@@ -50,16 +52,26 @@ module.exports = function (ctx) {
rule.use('v-loader')
.loader('vue-loader')
.options({
- productionMode: ctx.prod,
+ isServerBuild: isServer === true,
compilerOptions: {
- preserveWhitespace: false
+ preserveWhitespace: false,
+ ...(
+ isServer
+ ? { ssr: true, directiveTransforms: require('quasar/dist/ssr-directives/index.js') }
+ : {}
+ )
},
- transformAssetUrls: {
- video: 'src',
- source: 'src',
- img: 'src',
- image: 'xlink:href'
- }
+ transformAssetUrls: merge({
+ base: null,
+ includeAbsolute: false,
+ tags: {
+ video: [ 'src', 'poster' ],
+ source: ['src'],
+ img: ['src'],
+ image: [ 'xlink:href', 'href' ],
+ use: [ 'xlink:href', 'href' ]
+ }
+ }, transformAssetUrls)
})
rule.use('md-loader')
diff --git a/docs/src/pages/start/upgrade-guide.md b/docs/src/pages/start/upgrade-guide.md
index 481a86d717d..fb62ede639d 100644
--- a/docs/src/pages/start/upgrade-guide.md
+++ b/docs/src/pages/start/upgrade-guide.md
@@ -914,6 +914,8 @@ electron: {
If you are using Workbox in InjectManifest mode, then it's useful to know that the `/src-pwa/custom-service-worker.[js|ts]` is now being compiled too. This means that in your code you can now import with relative path too.
+Due to the upgrade to Webpack 5, you will need to also upgrade `workbox-webpack-plugin` to v6+.
+
You can now enable ESLint for the custom service worker too. And it [supports TS](/quasar-cli/developing-pwa/pwa-with-typescript) out of the box (in which case, rename the extension to `.ts`).
Enabling ESLint for the custom service worker is done by editing quasar.conf.js:
|
d7a41cf6f3f44182669555fb2c735796c11f4530
|
2023-04-06 18:09:08
|
Razvan Stoenescu
|
chore(docs): small tweak to toc css
| false
|
small tweak to toc css
|
chore
|
diff --git a/docs/src/layouts/doc-layout/DocPage.vue b/docs/src/layouts/doc-layout/DocPage.vue
index d5f6c038034..aaeff646583 100644
--- a/docs/src/layouts/doc-layout/DocPage.vue
+++ b/docs/src/layouts/doc-layout/DocPage.vue
@@ -224,8 +224,6 @@ body.body--light .doc-page
&__toc-container .q-item
color: $header-btn-color--light
- &:hover
- color: $header-btn-hover-color--light
body.body--dark .doc-page
&__related
@@ -238,6 +236,4 @@ body.body--dark .doc-page
&__toc-container .q-item
color: $header-btn-color--dark
- &:not(.disabled):hover
- color: $header-btn-hover-color--dark
</style>
|
34d4fbeb26aa1c7b941a01cf20d59aa10d477815
|
2021-01-30 16:55:48
|
Razvan Stoenescu
|
chore(app): Bump alpha version
| false
|
Bump alpha version
|
chore
|
diff --git a/app/bin/quasar-build b/app/bin/quasar-build
index b5422e249cb..e157fdc4b32 100755
--- a/app/bin/quasar-build
+++ b/app/bin/quasar-build
@@ -91,9 +91,10 @@ if (argv.help) {
// TODO vue3 - remove when ready
if (argv.mode === 'ssr') {
console.log(
+ '\n' +
'##############################################################\n' +
'# SSR mode is not *yet* supported and is disabled currently. #\n' +
- '##############################################################\n\n'
+ '##############################################################\n'
)
process.exit(1)
}
diff --git a/app/bin/quasar-dev b/app/bin/quasar-dev
index 6891c586c13..519efd54ab1 100755
--- a/app/bin/quasar-dev
+++ b/app/bin/quasar-dev
@@ -77,9 +77,10 @@ if (argv.help) {
// TODO vue3 - remove when ready
if (argv.mode === 'ssr') {
console.log(
+ '\n' +
'##############################################################\n' +
'# SSR mode is not *yet* supported and is disabled currently. #\n' +
- '##############################################################\n\n'
+ '##############################################################\n'
)
process.exit(1)
}
diff --git a/app/bin/quasar-inspect b/app/bin/quasar-inspect
index 5dae9023f8b..ccf13dbb5bc 100755
--- a/app/bin/quasar-inspect
+++ b/app/bin/quasar-inspect
@@ -47,9 +47,10 @@ if (argv.help) {
// TODO vue3 - remove when ready
if (argv.mode === 'ssr') {
console.log(
+ '\n' +
'##############################################################\n' +
'# SSR mode is not *yet* supported and is disabled currently. #\n' +
- '##############################################################\n\n'
+ '##############################################################\n'
)
process.exit(1)
}
diff --git a/app/bin/quasar-mode b/app/bin/quasar-mode
index 023d49db1e9..41adffded11 100755
--- a/app/bin/quasar-mode
+++ b/app/bin/quasar-mode
@@ -59,9 +59,10 @@ async function run () {
// TODO vue3 - remove when ready
if (mode === 'ssr') {
console.log(
+ '\n' +
'##############################################################\n' +
'# SSR mode is not *yet* supported and is disabled currently. #\n' +
- '##############################################################\n\n'
+ '##############################################################\n'
)
process.exit(1)
}
diff --git a/app/package.json b/app/package.json
index aa3256e6c2a..88ac79e8afb 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/app",
- "version": "3.0.0-alpha.8",
+ "version": "3.0.0-alpha.9",
"description": "Quasar Framework local CLI",
"bin": {
"quasar": "./bin/quasar"
|
6559a047c83ac363e497a7660eb0f2d61ba0422c
|
2020-03-30 16:02:33
|
Razvan Stoenescu
|
feat(app): out of the box support for .mjs files #6689
| false
|
out of the box support for .mjs files #6689
|
feat
|
diff --git a/app/lib/webpack/create-chain.js b/app/lib/webpack/create-chain.js
index 1cf81c88e46..b729f44625e 100644
--- a/app/lib/webpack/create-chain.js
+++ b/app/lib/webpack/create-chain.js
@@ -48,7 +48,7 @@ module.exports = function (cfg, configName) {
chain.resolve.symlinks(false)
chain.resolve.extensions
- .merge([ '.js', '.vue', '.json' ])
+ .merge([ '.mjs', '.js', '.vue', '.json' ])
chain.resolve.modules
.merge(resolveModules)
@@ -214,6 +214,14 @@ module.exports = function (cfg, configName) {
lessLoaderOptions: cfg.build.lessLoaderOptions
})
+ chain.module // fixes https://github.com/graphql/graphql-js/issues/1272
+ .rule('mjs')
+ .test(/\.mjs$/)
+ .include
+ .add(/node_modules/)
+ .end()
+ .type('javascript/auto')
+
chain.plugin('vue-loader')
.use(VueLoaderPlugin)
|
2e9883bab978e08a2e000f1a175f57ef759b5444
|
2020-08-21 16:27:17
|
Razvan Stoenescu
|
fix(lang/kur-ckb): format error
| false
|
format error
|
fix
|
diff --git a/ui/lang/index.json b/ui/lang/index.json
index 5c6c1546b76..f98099820a9 100644
--- a/ui/lang/index.json
+++ b/ui/lang/index.json
@@ -91,6 +91,10 @@
"isoName": "ko-kr",
"nativeName": "한국어"
},
+ {
+ "isoName": "kur-ckb",
+ "nativeName": "کوردی سۆرانی"
+ },
{
"isoName": "lu",
"nativeName": "Kiluba"
diff --git a/ui/lang/kur-ckb.js b/ui/lang/kur-ckb.js
index d824a644bea..99101da944e 100644
--- a/ui/lang/kur-ckb.js
+++ b/ui/lang/kur-ckb.js
@@ -1,103 +1,103 @@
export default {
- isoName: "kur-ckb",
- nativeName: "کوردی سۆرانی",
+ isoName: 'kur-ckb',
+ nativeName: 'کوردی سۆرانی',
rtl: true,
label: {
- clear: "پاککردنەوە",
- ok: "باشە",
- cancel: "هەڵوەشاندنەوە",
- close: "داخستن",
- set: "دانان",
- select: "هەڵبژاردن",
- reset: "رێکخستنەوه",
- remove: "لابردن",
- update: "نوێکردنەوە",
- create: "دروستکردن",
- search: "گەڕان",
- filter: "پاڵاوتن",
- refresh: "تازەکردنەوە"
+ clear: 'پاککردنەوە',
+ ok: 'باشە',
+ cancel: 'هەڵوەشاندنەوە',
+ close: 'داخستن',
+ set: 'دانان',
+ select: 'هەڵبژاردن',
+ reset: 'رێکخستنەوه',
+ remove: 'لابردن',
+ update: 'نوێکردنەوە',
+ create: 'دروستکردن',
+ search: 'گەڕان',
+ filter: 'پاڵاوتن',
+ refresh: 'تازەکردنەوە'
},
date: {
- days: "یەک شەممە_دووشەممە_سێ شەممە_چوار شەممە_پێنج شەممە_هەینی_شەممە".split(
- "_"
+ days: 'یەک شەممە_دووشەممە_سێ شەممە_چوار شەممە_پێنج شەممە_هەینی_شەممە'.split(
+ '_'
),
- daysShort: "١شم_٢شم_٣شم_٤شم_٥شم_هەینی_شەممە".split(
- "_"
+ daysShort: '١شم_٢شم_٣شم_٤شم_٥شم_هەینی_شەممە'.split(
+ '_'
),
- months: "مانگی یەک_مانگی دوو_مانگی سێ_مانگی چوار_مانگی پێنج_مانگی شەش_مانگی حەوت_مانگی هەشت_مانگی نۆ_مانگی دە_مانگی یانزە_مانگی دووانزە".split(
- "_"
+ months: 'مانگی یەک_مانگی دوو_مانگی سێ_مانگی چوار_مانگی پێنج_مانگی شەش_مانگی حەوت_مانگی هەشت_مانگی نۆ_مانگی دە_مانگی یانزە_مانگی دووانزە'.split(
+ '_'
),
- monthsShort: "مانگی یەک_مانگی دوو_مانگی سێ_مانگی چوار_مانگی پێنج_مانگی شەش_مانگی حەوت_مانگی هەشت_مانگی نۆ_مانگی دە_مانگی یانزە_مانگی دووانزە".split(
- "_"
+ monthsShort: 'مانگی یەک_مانگی دوو_مانگی سێ_مانگی چوار_مانگی پێنج_مانگی شەش_مانگی حەوت_مانگی هەشت_مانگی نۆ_مانگی دە_مانگی یانزە_مانگی دووانزە'.split(
+ '_'
),
firstDayOfWeek: 6, // 0-6, 0 - Sunday, 1 Monday, ...
format24h: false,
- singleDay: "ڕۆژ",
- pluralDay: "ڕۆژەکان"
+ singleDay: 'ڕۆژ',
+ pluralDay: 'ڕۆژەکان'
},
table: {
- noData: "هیچ داتەیەک نییە",
- noResults: "هیچ ئەنجامێک نییە",
- loading: "چاوەڕوانبە...",
+ noData: 'هیچ داتەیەک نییە',
+ noResults: 'هیچ ئەنجامێک نییە',
+ loading: 'چاوەڕوانبە...',
selectedRecords: function (rows) {
return rows === 1
- ? "یەک ڕیکۆرد هەڵبژێردراوە"
- : (rows === 0 ? "0" : rows) + "ڕیکۆرد هەڵبژێرداوە.";
+ ? 'یەک ڕیکۆرد هەڵبژێردراوە'
+ : (rows === 0 ? '0' : rows) + 'ڕیکۆرد هەڵبژێرداوە.';
},
- recordsPerPage: "ئەنجام بۆهەر پەڕەیەک:",
- allRows: "هەمووی",
+ recordsPerPage: 'ئەنجام بۆهەر پەڕەیەک:',
+ allRows: 'هەمووی',
pagination: function (start, end, total) {
- return start + "-" + end + " لە " + total;
+ return start + '-' + end + ' لە ' + total;
},
- columns: "ڕیز"
+ columns: 'ڕیز'
},
editor: {
- url: "لینک",
- bold: "تۆخ",
- italic: "لار",
- strikethrough: "خەتپیاهاتوو",
- underline: "خەتبەژێرهاتوو",
- unorderedList: "لیستی ڕیزنەکراو",
- orderedList: "لیستی ڕیزکراو",
- subscript: "ژێرهێڵ",
- superscript: "سەرهێڵ",
- hyperlink: "لینک",
- toggleFullscreen: "پربە شاشە یان نا",
- quote: "دەق",
- left: "لای چەپ",
- center: "ناوەڕاست",
- right: "لای ڕاست",
- justify: "بە یەکسانی",
- print: "پرینت",
- outdent: "کەمکردنەوەی بۆشای",
- indent: "زۆرکردنی بۆشای",
- removeFormat: "لابردنی ستایل",
- formatting: "ستایل",
- fontSize: "قەبارەی فۆنت",
- align: "ڕێککردن",
- hr: "دانانی هیڵی ئاسۆی",
- undo: "پاشگەزبونەوە",
- redo: "کردنەوە",
- heading1: "ناونیشان ١",
- heading2: "ناونیشان ٢",
- heading3: "ناونیشان ٣",
- heading4: "ناونیشان ٤",
- heading5: "ناونیشان ٥",
- heading6: "ناونیشان ٦",
- paragraph: "بڕگە",
- code: "کۆد",
- size1: "زۆر بچووک",
- size2: "بچووک",
- size3: "ئاسای",
- size4: "ناوەند",
- size5: "گەورە",
- size6: "زۆر گەورە",
- size7: "گەورەترین",
- defaultFont: "فۆنتی بنەڕەت",
- viewSource: "سەیرکردنی سەرچاوە"
+ url: 'لینک',
+ bold: 'تۆخ',
+ italic: 'لار',
+ strikethrough: 'خەتپیاهاتوو',
+ underline: 'خەتبەژێرهاتوو',
+ unorderedList: 'لیستی ڕیزنەکراو',
+ orderedList: 'لیستی ڕیزکراو',
+ subscript: 'ژێرهێڵ',
+ superscript: 'سەرهێڵ',
+ hyperlink: 'لینک',
+ toggleFullscreen: 'پربە شاشە یان نا',
+ quote: 'دەق',
+ left: 'لای چەپ',
+ center: 'ناوەڕاست',
+ right: 'لای ڕاست',
+ justify: 'بە یەکسانی',
+ print: 'پرینت',
+ outdent: 'کەمکردنەوەی بۆشای',
+ indent: 'زۆرکردنی بۆشای',
+ removeFormat: 'لابردنی ستایل',
+ formatting: 'ستایل',
+ fontSize: 'قەبارەی فۆنت',
+ align: 'ڕێککردن',
+ hr: 'دانانی هیڵی ئاسۆی',
+ undo: 'پاشگەزبونەوە',
+ redo: 'کردنەوە',
+ heading1: 'ناونیشان ١',
+ heading2: 'ناونیشان ٢',
+ heading3: 'ناونیشان ٣',
+ heading4: 'ناونیشان ٤',
+ heading5: 'ناونیشان ٥',
+ heading6: 'ناونیشان ٦',
+ paragraph: 'بڕگە',
+ code: 'کۆد',
+ size1: 'زۆر بچووک',
+ size2: 'بچووک',
+ size3: 'ئاسای',
+ size4: 'ناوەند',
+ size5: 'گەورە',
+ size6: 'زۆر گەورە',
+ size7: 'گەورەترین',
+ defaultFont: 'فۆنتی بنەڕەت',
+ viewSource: 'سەیرکردنی سەرچاوە'
},
tree: {
- noNodes: "هیچ نۆدێک نیە",
- noResults: "هیچ نۆدێک نەدۆزرایەوە"
+ noNodes: 'هیچ نۆدێک نیە',
+ noResults: 'هیچ نۆدێک نەدۆزرایەوە'
}
}
|
6509a43ed0d8301d202a9bb5e295d9c485f669e7
|
2021-02-16 16:15:59
|
Razvan Stoenescu
|
feat(docs): temporarily revert the new search
| false
|
temporarily revert the new search
|
feat
|
diff --git a/docs/build/search.js b/docs/build/search.js
deleted file mode 100644
index 3b50045265d..00000000000
--- a/docs/build/search.js
+++ /dev/null
@@ -1,264 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const fg = require('fast-glob')
-const jsYaml = require('js-yaml')
-const SimpleMarkdown = require('simple-markdown')
-
-const mdParse = SimpleMarkdown.defaultBlockParse
-// eslint-disable-next-line no-useless-escape
-const yamlBlockPattern = /^(?:\-\-\-)(.*?)(?:\-\-\-|\.\.\.)/s
-
-const folders = '../src/pages/**/*.md'
-const intro = '../src/pages/'
-// const base = 'https://next.quasar.dev/'
-
-let objectID = 1
-const getObjectID = () => objectID++
-
-const slugify = (str) => {
- return encodeURIComponent(String(str).trim().replace(/\s+/g, '-'))
-}
-
-const createFolder = (folder) => {
- const dir = path.join(__dirname, '..', folder)
- if (!fs.existsSync(dir)) {
- fs.mkdirSync(dir)
- }
-}
-
-const createIndex = (data) => {
- const requiredFields = [ 'hierarchy_lvl0', 'hierarchy_lvl1', 'url' ]
- const missingFields = requiredFields.filter(
- (requiredField) => !data[ requiredField ]
- )
- if (missingFields.length) {
- throw new Error(
- `Missing fields for indexing page ${data.url}: ${missingFields.join(
- ', '
- )}`
- )
- }
- return {
- objectID: getObjectID(),
- hierarchy_radio_lvl0: null,
- hierarchy_radio_lvl1: null,
- hierarchy_radio_lvl2: null,
- hierarchy_radio_lvl3: null,
- hierarchy_radio_lvl4: null,
- hierarchy_radio_lvl5: null,
- hierarchy_lvl0: null,
- hierarchy_lvl1: null,
- hierarchy_lvl2: null,
- hierarchy_lvl3: null,
- hierarchy_lvl4: null,
- hierarchy_lvl5: null,
- hierarchy_lvl6: null,
- content: null,
- anchor: null,
- ...data
- }
-}
-
-// returns the contents of the assciated file
-const getFileContents = (mdPath) => {
- return fs.readFileSync(path.resolve(__dirname, mdPath), {
- encoding: 'utf8'
- })
-}
-
-// retrieves yaml from a markdown page
-const getYaml = (md) => {
- return yamlBlockPattern.exec(md)[ 1 ]
-}
-
-// returns title and desc yaml field
-const getYamlFields = (yaml) => {
- return {
- title: jsYaml.load(yaml).title,
- desc: jsYaml.load(yaml).desc
- }
-}
-
-const buildParagraph = (content, text2 = '', skip = 0) => {
- const text = []
-
- const addText = (data) => {
- text.push(data)
- }
-
- content.forEach((node, index) => {
- if (index >= skip) {
- if (node.type === 'text' || node.type === 'inlineCode') {
- addText(node.content)
- }
- else {
- if (node.content && Array.isArray(node.content)) {
- const data = buildParagraph(node.content)
- addText(data.text)
- }
- else if (node.items && Array.isArray(node.items)) {
- node.items.forEach(leaf => {
- const data = buildParagraph(leaf)
- addText(data.text)
- })
- }
- else {
- if (node.type !== 'image' && node.type !== 'codeBlock') {
- console.log(node)
- }
- }
- }
- }
- })
-
- return { text: text.join('') }
-}
-
-const processNode = (node) => {
- const text = []
- if (Array.isArray(node)) {
- node.forEach(leaf => {
- const data = processNode(leaf)
- text.push(data.text)
- })
- }
- else if (node.type === 'list' && node.items && Array.isArray(node.items)) {
- node.items.forEach(leaf => {
- const data = buildParagraph(leaf)
- text.push(data.text)
- })
- }
- else if (node.type === 'paragraph' && Array.isArray(node.content)) {
- if (node.content[ 0 ].type === 'text' && node.content[ 0 ].content.startsWith('#')) {
- let text = ''
- let remaining = ''
- let index = 0
- for (; index < node.content.length; ++index) {
- const content = node.content[ index ].content
- const parts = content.split('\n')
- text += parts[ 0 ]
- if (parts.length > 1) {
- parts.shift()
- remaining += parts.join('')
- break
- }
- }
- const level = text.indexOf(' ')
- const subheading = text.slice(level + 1)
- const slug = slugify(subheading)
- const id = {
- anchor: slug,
- [ 'hierarchy_lvl' + (level - 1) ]: subheading
- }
- const data = buildParagraph(node.content, remaining, index + 1)
- id.content = data.text
- return id
- }
-
- const data = buildParagraph(node.content)
- text.push(data.text)
- }
- else if (node.type === 'heading') {
- const data = buildParagraph(node.content)
- const subheading = data.text
- const level = node.level
- const slug = slugify(subheading)
- const id = {
- anchor: slug,
- [ 'hierarchy_lvl' + (level - 1) ]: subheading
- }
- return id
- }
- else if (node.type === 'blockQuote') {
- const data = processNode(node.content)
- text.push(data.text)
- }
- else {
- if (node.type !== 'table' && node.type !== 'codeBlock') {
- const data = buildParagraph(node.content)
- text.push(data.text)
- }
- }
- return { text: text.join(' ') }
-}
-
-const processMarkdown = (syntaxTree, entries, entry) => {
- const contents = []
- syntaxTree.forEach((node, index) => {
- // skip first one which is the yaml
- if (index > 1) {
- const val = processNode(node)
- if (val.anchor) {
- const text = contents.join(' ')
- .replace(/\n/g, ' ')
- .replace(/<br>/g, '')
- .replace(/\s\s+/g, ' ')
- .trim()
-
- // handle text from previous
- const data = createIndex({ ...entry, content: text })
- entries.push(data)
-
- // start a new subheading
- entry = { ...entry, ...val, content: '' }
-
- // clean up contents array
- contents.splice(0, contents.length)
- }
- // don't accept components embedded into the page
- else if (val.text.charAt(0) !== '<' && val.text.charAt(val.text.length - 1) !== '>') {
- contents.push(val.text)
- }
- }
- })
-}
-
-const processFile = (page, entries) => {
- const key = page.replace(intro, '').replace('.md', '')
- const url = '/' + key
-
- console.log('Processing', page, url)
-
- const md = getFileContents(page)
- const yaml = getYaml(md)
- const { title, desc } = getYamlFields(yaml)
-
- const syntaxTree = mdParse(md)
-
- const entry = {
- hierarchy_lvl0: title,
- hierarchy_lvl1: desc,
- content: '',
- anchor: 'Introduction',
- url
- }
-
- processMarkdown(syntaxTree, entries, entry)
-}
-
-// -- Begin processing
-
-const run = () => {
- const start = new Date().getTime()
-
- createFolder('search')
-
- const entries = []
-
- // retrieve all the markdown pages paths
- const pages = fg.sync(folders, {
- cwd: __dirname
- })
-
- pages.forEach(mdPage => {
- processFile(mdPage, entries)
- })
-
- fs.writeFileSync(path.resolve(__dirname, '../search/indices.json'), JSON.stringify(entries, null, 2), () => {})
-
- const end = new Date().getTime()
- const time = end - start
- console.log(`Finished ${pages.length} pages with ${entries.length} indices in ${time}ms`)
-}
-
-run()
diff --git a/docs/package.json b/docs/package.json
index caf2ce8773d..9f7922313e4 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -9,14 +9,13 @@
"dev": "quasar dev",
"dev:ssr": "quasar dev -m ssr",
"build": "quasar build -m pwa",
- "build:search": "node build/search.js",
"lint": "eslint --ext .js,.vue src",
"test": "echo \"No test specified\" && exit 0"
},
"dependencies": {
"@quasar/extras": "^1.0.0",
"core-js": "^3.6.5",
- "docs-searchbar.js": "^1.1.11",
+ "docsearch.js": "^2.6.2",
"prismjs": "^1.15.0",
"quasar": "^2.0.0-beta.1"
},
@@ -31,15 +30,12 @@
"eslint-plugin-quasar": "^1.0.0",
"eslint-plugin-vue": "^7.0.0",
"eslint-webpack-plugin": "^2.4.0",
- "fast-glob": "^3.2.5",
"gray-matter": "^4.0.2",
- "js-yaml": "^4.0.0",
"markdown-it": "^10.0.0",
"markdown-it-container": "^2.0.0",
"pug": "^2.0.0",
"pug-plain-loader": "^1.0.0",
"raw-loader": "^4.0.0",
- "simple-markdown": "^0.7.3",
"toml": "^3.0.0",
"workbox-webpack-plugin": "^5.1.3"
},
diff --git a/docs/quasar.conf.js b/docs/quasar.conf.js
index f0ded5af91b..ba95128f639 100644
--- a/docs/quasar.conf.js
+++ b/docs/quasar.conf.js
@@ -27,16 +27,6 @@ module.exports = function (ctx) {
distDir: 'dist/quasar.dev',
// analyze: true,
- env: {
- search: {
- apiKey: 'e3b57f8578a57aaa539b19127bfdf0174926c47edd73cfaee5d66e44e84e403c',
- hostUrl: ctx.prod ? 'https://next.quasar.dev:7700' : 'http://127.0.0.1:7700',
- indexUid: 'docs',
- inputSelector: '.doc-algolia input',
- debug: true // Set debug to true if you want to inspect the dropdown
- }
- },
-
chainWebpack (chain) {
chain.plugin('eslint-webpack-plugin')
.use(ESLintPlugin, [{
@@ -88,7 +78,8 @@ module.exports = function (ctx) {
config: {
loadingBar: {
- color: 'teal'
+ color: 'orange',
+ size: '4px'
}
},
diff --git a/docs/src/css/docsearch.sass b/docs/src/css/docsearch.sass
index fc1d5576fc3..177f7424bdd 100644
--- a/docs/src/css/docsearch.sass
+++ b/docs/src/css/docsearch.sass
@@ -1,33 +1,6 @@
// initial part taken from
// https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css
-// /* Main dropdown wrapper */
-// .meilisearch-autocomplete .dsb-dropdown-menu
-// width: 500px
-
-// /* Main category */
-// .meilisearch-autocomplete .docs-searchbar-suggestion--category-header
-// color: darkgray
-// border: 1px solid gray
-
-// /* Category */
-// .meilisearch-autocomplete .docs-searchbar-suggestion--subcategory-column
-// color: gray
-
-// /* Title */
-// .meilisearch-autocomplete .docs-searchbar-suggestion--title
-// font-weight: bold
-// color: black
-
-// /* Description */
-// .meilisearch-autocomplete .docs-searchbar-suggestion--text
-// font-size: 0.8rem
-// color: gray
-
-// /* Highlighted text */
-// .meilisearch-autocomplete .docs-searchbar-suggestion--highlight
-// color: blue
-
.searchbox
display: inline-block
position: relative
@@ -37,8 +10,7 @@
box-sizing: border-box
visibility: visible !important
-.searchbox .algolia-autocomplete,
-.searchbox .meilisearch-autocomplete
+.searchbox .algolia-autocomplete
display: block
width: 100%
height: 100%
@@ -187,26 +159,21 @@
transform: none
opacity: 1
-.algolia-autocomplete.algolia-autocomplete-right .ds-dropdown-menu,
-.meilisearch-autocomplete.meilisearch-autocomplete-right .dsb-dropdown-menu
+.algolia-autocomplete.algolia-autocomplete-right .ds-dropdown-menu
right: 0 !important
left: inherit !important
-.algolia-autocomplete.algolia-autocomplete-right .ds-dropdown-menu:before,
-.meilisearch-autocomplete.meilisearch-autocomplete-right .dsb-dropdown-menu:before
+.algolia-autocomplete.algolia-autocomplete-right .ds-dropdown-menu:before
right: 48px
-.algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu,
-.meilisearch-autocomplete.meilisearch-autocomplete-left .dsb-dropdown-menu
+.algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu
left: 0!important
right: inherit!important
-.algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu:before,
-.meilisearch-autocomplete.meilisearch-autocomplete-left .dsb-dropdown-menu:before
+.algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu:before
left: 48px
-.algolia-autocomplete .ds-dropdown-menu,
-.meilisearch-autocomplete .dsb-dropdown-menu
+.algolia-autocomplete .ds-dropdown-menu
top: -6px
border-radius: 4px
margin: 6px 0 0
@@ -221,8 +188,7 @@
min-width: 500px
box-shadow: 0 1px 0 0 rgba(0,0,0,.2),0 2px 3px 0 rgba(0,0,0,.1)
-.algolia-autocomplete .ds-dropdown-menu:before,
-.meilisearch-autocomplete .dsb-dropdown-menu:before
+.algolia-autocomplete .ds-dropdown-menu:before
display: block
position: absolute
content: ""
@@ -237,26 +203,21 @@
transform: rotate(-45deg)
border-radius: 2px
-.algolia-autocomplete .ds-dropdown-menu .ds-suggestions,
-.meilisearch-autocomplete .dsb-dropdown-menu .dsb-suggestions
+.algolia-autocomplete .ds-dropdown-menu .ds-suggestions
position: relative
z-index: 1000
margin-top: 8px
-.algolia-autocomplete .ds-dropdown-menu .ds-suggestions a:hover,
-.meilisearch-autocomplete .dsb-dropdown-menu .dsb-suggestions a:hover
+.algolia-autocomplete .ds-dropdown-menu .ds-suggestions a:hover
text-decoration: none
-.algolia-autocomplete .ds-dropdown-menu .ds-suggestion,
-.meilisearch-autocomplete .dsb-dropdown-menu .dsb-suggestion
+.algolia-autocomplete .ds-dropdown-menu .ds-suggestion
cursor: pointer
-.algolia-autocomplete .ds-dropdown-menu .ds-suggestion.ds-cursor .algolia-docsearch-suggestion.suggestion-layout-simple,.algolia-autocomplete .ds-dropdown-menu .ds-suggestion.ds-cursor .algolia-docsearch-suggestion:not(.suggestion-layout-simple) .algolia-docsearch-suggestion--content,
-.meilisearch-autocomplete .dsb-dropdown-menu .dsb-suggestion.dsb-cursor .docs-searchbar-suggestion.suggestion-layout-simple,.meilisearch-autocomplete .dsb-dropdown-menu .dsb-suggestion.ds-cursor .docs-searchbar-suggestion:not(.suggestion-layout-simple) .docs-searchbar-suggestion--content
+.algolia-autocomplete .ds-dropdown-menu .ds-suggestion.ds-cursor .algolia-docsearch-suggestion.suggestion-layout-simple,.algolia-autocomplete .ds-dropdown-menu .ds-suggestion.ds-cursor .algolia-docsearch-suggestion:not(.suggestion-layout-simple) .algolia-docsearch-suggestion--content
background-color: rgba(69,142,225,.05)
-.algolia-autocomplete .ds-dropdown-menu [class^=ds-dataset-],
-.meilisearch-autocomplete .dsb-dropdown-menu [class^=ds-dataset-]
+.algolia-autocomplete .ds-dropdown-menu [class^=ds-dataset-]
position: relative
border: 1px solid #d9d9d9
background: #fff
@@ -264,12 +225,10 @@
overflow: auto
padding: 0 8px 8px
-.algolia-autocomplete .ds-dropdown-menu *,
-.meilisearch-autocomplete .dsb-dropdown-menu *
+.algolia-autocomplete .ds-dropdown-menu *
box-sizing: border-box
-.algolia-autocomplete .algolia-docsearch-suggestion,
-.meilisearch-autocomplete .docs-searchbar-suggestion
+.algolia-autocomplete .algolia-docsearch-suggestion
display: block
position: relative
padding: 0 8px
@@ -277,21 +236,18 @@
color: #02060c
overflow: hidden
-.algolia-autocomplete .algolia-docsearch-suggestion--highlight,
-.meilisearch-autocomplete .docs-searchbar-suggestion--highlight
+.algolia-autocomplete .algolia-docsearch-suggestion--highlight
color: #174d8c
background: rgba(143,187,237,.1)
padding: .1em .05em
-.algolia-autocomplete .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl0 .algolia-docsearch-suggestion--highlight,.algolia-autocomplete .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl1 .algolia-docsearch-suggestion--highlight,.algolia-autocomplete .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight,
-.meilisearch-autocomplete .docs-searchbar-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl0 .algolia-docsearch-suggestion--highlight,.algolia-autocomplete .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl1 .algolia-docsearch-suggestion--highlight,.algolia-autocomplete .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight
+.algolia-autocomplete .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl0 .algolia-docsearch-suggestion--highlight,.algolia-autocomplete .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl1 .algolia-docsearch-suggestion--highlight,.algolia-autocomplete .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight
padding: 0 0 1px
background: inherit
box-shadow: inset 0 -2px 0 0 rgba(69,142,225,.8)
color: inherit
-.algolia-autocomplete .algolia-docsearch-suggestion--content,
-.meilisearch-autocomplete .docs-searchbar-suggestion--content
+.algolia-autocomplete .algolia-docsearch-suggestion--content
display: block
float: right
width: 70%
@@ -299,8 +255,7 @@
padding: 5.33333px 0 5.33333px 10.66667px
cursor: pointer
-.algolia-autocomplete .algolia-docsearch-suggestion--content:before,
-.meilisearch-autocomplete .docs-searchbar-suggestion--content:before
+.algolia-autocomplete .algolia-docsearch-suggestion--content:before
content: ""
position: absolute
display: block
@@ -310,8 +265,7 @@
background: #ddd
left: -1px
-.algolia-autocomplete .algolia-docsearch-suggestion--category-header,
-.meilisearch-autocomplete .docs-searchbar-suggestion--category-header
+.algolia-autocomplete .algolia-docsearch-suggestion--category-header
position: relative
border-bottom: 1px solid #ddd
display: none
@@ -320,14 +274,12 @@
font-size: 1em
color: #33363d
-.algolia-autocomplete .algolia-docsearch-suggestion--wrapper,
-.meilisearch-autocomplete .docs-searchbar-suggestion--wrapper
+.algolia-autocomplete .algolia-docsearch-suggestion--wrapper
width: 100%
float: left
padding: 8px 0 0
-.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column,
-.meilisearch-autocomplete .docs-searchbar-suggestion--subcategory-column
+.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column
float: left
width: 30%
text-align: right
@@ -337,8 +289,7 @@
font-size: .9em
word-wrap: break-word
-.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column:before,
-.meilisearch-autocomplete .docs-searchbar-suggestion--subcategory-column:before
+.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column:before
content: ""
position: absolute
display: block
@@ -348,37 +299,31 @@
background: #ddd
right: 0
-.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-inline,
-.meilisearch-autocomplete .docs-searchbar-suggestion--subcategory-inline
+.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-inline
display: none
-.algolia-autocomplete .algolia-docsearch-suggestion--title,
-.meilisearch-autocomplete .docs-searchbar-suggestion--title
+.algolia-autocomplete .algolia-docsearch-suggestion--title
margin-bottom: 4px
color: #02060c
font-size: .9em
font-weight: 700
-.algolia-autocomplete .algolia-docsearch-suggestion--text,
-.meilisearch-autocomplete .docs-searchbar-suggestion--text
+.algolia-autocomplete .algolia-docsearch-suggestion--text
display: block
line-height: 1.2em
font-size: .85em
color: #63676d
-.algolia-autocomplete .algolia-docsearch-suggestion--no-results,
-.meilisearch-autocomplete .docs-searchbar-suggestion--no-results
+.algolia-autocomplete .algolia-docsearch-suggestion--no-results
width: 100%
padding: 8px 0
text-align: center
font-size: 1.2em
-.algolia-autocomplete .algolia-docsearch-suggestion--no-results:before,
-.meilisearch-autocomplete .docs-searchbar-suggestion--no-results:before
+.algolia-autocomplete .algolia-docsearch-suggestion--no-results:before
display: none
-.algolia-autocomplete .algolia-docsearch-suggestion code,
-.meilisearch-autocomplete .docs-searchbar-suggestion code
+.algolia-autocomplete .algolia-docsearch-suggestion code
padding: 1px 5px
font-size: 90%
border: none
@@ -387,22 +332,18 @@
border-radius: 3px
font-family: Menlo,Monaco,Consolas,Courier New,monospace
-.algolia-autocomplete .algolia-docsearch-suggestion code .algolia-docsearch-suggestion--highlight,
-.meilisearch-autocomplete .docs-searchbar-suggestion code .docs-searchbar-suggestion--highlight
+.algolia-autocomplete .algolia-docsearch-suggestion code .algolia-docsearch-suggestion--highlight
background: none
-.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__main .algolia-docsearch-suggestion--category-header,.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__secondary,
-.meilisearch-autocomplete .docs-searchbar-suggestion.docs-searchbar-suggestion__main .algolia-docsearch-suggestion--category-header,.algolia-autocomplete .docs-searchbar-suggestion.docs-searchbar-suggestion__secondary
+.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__main .algolia-docsearch-suggestion--category-header,.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__secondary
display: block
@media (min-width:768px)
- .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column,
- .meilisearch-autocomplete .docs-searchbar-suggestion .docs-searchbar-suggestion--subcategory-column
+ .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column
display: block
@media (max-width:768px)
- .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column,
- .meilisearch-autocomplete .docs-searchbar-suggestion .docs-searchbar-suggestion--subcategory-column
+ .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column
display: inline-block
width: auto
float: left
@@ -413,89 +354,74 @@
text-align: left
opacity: .5
- .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column:before,
- .meilisearch-autocomplete .docs-searchbar-suggestion .docs-searchbar-suggestion--subcategory-column:before
+ .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column:before
display: none
- .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column:after,
- .meilisearch-autocomplete .docs-searchbar-suggestion .docs-searchbar-suggestion--subcategory-column:after
+ .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column:after
content: "|"
- .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--content,
- .meilisearch-autocomplete .docs-searchbar-suggestion .docs-searchbar-suggestion--content
+ .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--content
display: inline-block
width: auto
text-align: left
float: left
padding: 0
- .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--content:before,
- .meilisearch-autocomplete .docs-searchbar-suggestion .docs-searchbar-suggestion--content:before
+ .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--content:before
display: none
-.algolia-autocomplete .suggestion-layout-simple.algolia-docsearch-suggestion,
-.meilisearch-autocomplete .suggestion-layout-simple.docs-searchbar-suggestion
+.algolia-autocomplete .suggestion-layout-simple.algolia-docsearch-suggestion
border-bottom: 1px solid #eee
padding: 8px
margin: 0
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--content,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--content
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--content
width: 100%
padding: 0
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--content:before,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--content:before
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--content:before
display: none
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--category-header
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header
margin: 0
padding: 0
display: block
width: 100%
border: none
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl0,.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl1,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--category-header-lvl0,.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--category-header-lvl1
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl0,.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl1
opacity: .6
font-size: .85em
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl1:before,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--category-header-lvl1:before
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl1:before
background-image: url('data:image/svg+xmlutf8,<svg width="10" height="10" viewBox="0 0 20 38" xmlns="http://www.w3.org/2000/svg"><path d="M1.49 4.31l14 16.126.002-2.624-14 16.074-1.314 1.51 3.017 2.626 1.313-1.508 14-16.075 1.142-1.313-1.14-1.313-14-16.125L3.2.18.18 2.8l1.31 1.51z" fill-rule="evenodd" fill="%231D3657" /></svg>')
content: ""
width: 10px
height: 10px
display: inline-block
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--wrapper,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--wrapper
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--wrapper
width: 100%
float: left
margin: 0
padding: 0
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--duplicate-content,.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--subcategory-inline,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--duplicate-content,.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--subcategory-inline
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--duplicate-content,.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--subcategory-inline
display: none!important
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--title,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--title
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--title
margin: 0
color: #458ee1
font-size: .9em
font-weight: 400
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--title:before,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--title:before
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--title:before
content: "#"
font-weight: 700
color: #458ee1
display: inline-block
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--text,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--text
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--text
margin: 4px 0 0
display: block
line-height: 1.4em
@@ -504,14 +430,12 @@
font-size: .85em
opacity: .8
-.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight,
-.meilisearch-autocomplete .suggestion-layout-simple .docs-searchbar-suggestion--text .docs-searchbar-suggestion--highlight
+.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight
color: #3f4145
font-weight: 700
box-shadow: none
-.algolia-autocomplete .algolia-docsearch-footer,
-.meilisearch-autocomplete .docs-docsearch-footer
+.algolia-autocomplete .algolia-docsearch-footer
width: 134px
height: 20px
z-index: 2000
@@ -520,8 +444,7 @@
font-size: 0
line-height: 0
-.algolia-autocomplete .algolia-docsearch-footer--logo,
-.meilisearch-autocomplete .docs-docsearch-footer--logo
+.algolia-autocomplete .algolia-docsearch-footer--logo
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='168' height='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cpath d='M78.988.938h16.594a2.968 2.968 0 0 1 2.966 2.966V20.5a2.967 2.967 0 0 1-2.966 2.964H78.988a2.967 2.967 0 0 1-2.966-2.964V3.897A2.961 2.961 0 0 1 78.988.938zm41.937 17.866c-4.386.02-4.386-3.54-4.386-4.106l-.007-13.336 2.675-.424v13.254c0 .322 0 2.358 1.718 2.364v2.248zm-10.846-2.18c.821 0 1.43-.047 1.855-.129v-2.719a6.334 6.334 0 0 0-1.574-.199 5.7 5.7 0 0 0-.897.069 2.699 2.699 0 0 0-.814.24c-.24.116-.439.28-.582.491-.15.212-.219.335-.219.656 0 .628.219.991.616 1.23s.938.362 1.615.362zm-.233-9.7c.883 0 1.629.109 2.231.328.602.218 1.088.525 1.444.915.363.396.609.922.76 1.483.157.56.232 1.175.232 1.85v6.874a32.5 32.5 0 0 1-1.868.314c-.834.123-1.772.185-2.813.185-.69 0-1.327-.069-1.895-.198a4.001 4.001 0 0 1-1.471-.636 3.085 3.085 0 0 1-.951-1.134c-.226-.465-.343-1.12-.343-1.803 0-.656.13-1.073.384-1.525a3.24 3.24 0 0 1 1.047-1.106c.445-.287.95-.492 1.532-.615a8.8 8.8 0 0 1 1.82-.185 8.404 8.404 0 0 1 1.972.24v-.438c0-.307-.035-.6-.11-.874a1.88 1.88 0 0 0-.384-.73 1.784 1.784 0 0 0-.724-.493 3.164 3.164 0 0 0-1.143-.205c-.616 0-1.177.075-1.69.164a7.735 7.735 0 0 0-1.26.307l-.321-2.192c.335-.117.834-.233 1.478-.349a10.98 10.98 0 0 1 2.073-.178zm52.842 9.626c.822 0 1.43-.048 1.854-.13V13.7a6.347 6.347 0 0 0-1.574-.199c-.294 0-.595.021-.896.069a2.7 2.7 0 0 0-.814.24 1.46 1.46 0 0 0-.582.491c-.15.212-.218.335-.218.656 0 .628.218.991.615 1.23.404.245.938.362 1.615.362zm-.226-9.694c.883 0 1.629.108 2.231.327.602.219 1.088.526 1.444.915.355.39.609.923.759 1.483a6.8 6.8 0 0 1 .233 1.852v6.873c-.41.088-1.034.19-1.868.314-.834.123-1.772.184-2.813.184-.69 0-1.327-.068-1.895-.198a4.001 4.001 0 0 1-1.471-.635 3.085 3.085 0 0 1-.951-1.134c-.226-.465-.343-1.12-.343-1.804 0-.656.13-1.073.384-1.524.26-.45.608-.82 1.047-1.107.445-.286.95-.491 1.532-.614a8.803 8.803 0 0 1 2.751-.13c.329.034.671.096 1.04.185v-.437a3.3 3.3 0 0 0-.109-.875 1.873 1.873 0 0 0-.384-.731 1.784 1.784 0 0 0-.724-.492 3.165 3.165 0 0 0-1.143-.205c-.616 0-1.177.075-1.69.164a7.75 7.75 0 0 0-1.26.307l-.321-2.193c.335-.116.834-.232 1.478-.348a11.633 11.633 0 0 1 2.073-.177zm-8.034-1.271a1.626 1.626 0 0 1-1.628-1.62c0-.895.725-1.62 1.628-1.62.904 0 1.63.725 1.63 1.62 0 .895-.733 1.62-1.63 1.62zm1.348 13.22h-2.689V7.27l2.69-.423v11.956zm-4.714 0c-4.386.02-4.386-3.54-4.386-4.107l-.008-13.336 2.676-.424v13.254c0 .322 0 2.358 1.718 2.364v2.248zm-8.698-5.903c0-1.156-.253-2.119-.746-2.788-.493-.677-1.183-1.01-2.067-1.01-.882 0-1.574.333-2.065 1.01-.493.676-.733 1.632-.733 2.788 0 1.168.246 1.953.74 2.63.492.683 1.183 1.018 2.066 1.018.882 0 1.574-.342 2.067-1.019.492-.683.738-1.46.738-2.63zm2.737-.007c0 .902-.13 1.584-.397 2.33a5.52 5.52 0 0 1-1.128 1.906 4.986 4.986 0 0 1-1.752 1.223c-.685.286-1.739.45-2.265.45-.528-.006-1.574-.157-2.252-.45a5.096 5.096 0 0 1-1.744-1.223c-.487-.527-.863-1.162-1.137-1.906a6.345 6.345 0 0 1-.41-2.33c0-.902.123-1.77.397-2.508a5.554 5.554 0 0 1 1.15-1.892 5.133 5.133 0 0 1 1.75-1.216c.679-.287 1.425-.423 2.232-.423.808 0 1.553.142 2.237.423a4.88 4.88 0 0 1 1.753 1.216 5.644 5.644 0 0 1 1.135 1.892c.287.738.431 1.606.431 2.508zm-20.138 0c0 1.12.246 2.363.738 2.882.493.52 1.13.78 1.91.78.424 0 .828-.062 1.204-.178.377-.116.677-.253.917-.417V9.33a10.476 10.476 0 0 0-1.766-.226c-.971-.028-1.71.37-2.23 1.004-.513.636-.773 1.75-.773 2.788zm7.438 5.274c0 1.824-.466 3.156-1.404 4.004-.936.846-2.367 1.27-4.296 1.27-.705 0-2.17-.137-3.34-.396l.431-2.118c.98.205 2.272.26 2.95.26 1.074 0 1.84-.219 2.299-.656.459-.437.684-1.086.684-1.948v-.437a8.07 8.07 0 0 1-1.047.397c-.43.13-.93.198-1.492.198-.739 0-1.41-.116-2.018-.349a4.206 4.206 0 0 1-1.567-1.025c-.431-.45-.774-1.017-1.013-1.694-.24-.677-.363-1.885-.363-2.773 0-.834.13-1.88.384-2.577.26-.696.629-1.298 1.129-1.796.493-.498 1.095-.881 1.8-1.162a6.605 6.605 0 0 1 2.428-.457c.87 0 1.67.109 2.45.24.78.129 1.444.265 1.985.415V18.17z' fill='%235468FF'/%3E%3Cpath d='M6.972 6.677v1.627c-.712-.446-1.52-.67-2.425-.67-.585 0-1.045.13-1.38.391a1.24 1.24 0 0 0-.502 1.03c0 .425.164.765.494 1.02.33.256.835.532 1.516.83.447.192.795.356 1.045.495.25.138.537.332.862.582.324.25.563.548.718.894.154.345.23.741.23 1.188 0 .947-.334 1.691-1.004 2.234-.67.542-1.537.814-2.601.814-1.18 0-2.16-.229-2.936-.686v-1.708c.84.628 1.814.942 2.92.942.585 0 1.048-.136 1.388-.407.34-.271.51-.646.51-1.125 0-.287-.1-.55-.302-.79-.203-.24-.42-.42-.655-.542-.234-.123-.585-.29-1.053-.503a61.27 61.27 0 0 1-.582-.271 13.67 13.67 0 0 1-.55-.287 4.275 4.275 0 0 1-.567-.351 6.92 6.92 0 0 1-.455-.4c-.18-.17-.31-.34-.39-.51-.08-.17-.155-.37-.224-.598a2.553 2.553 0 0 1-.104-.742c0-.915.333-1.638.998-2.17.664-.532 1.523-.798 2.576-.798.968 0 1.793.17 2.473.51zm7.468 5.696v-.287c-.022-.607-.187-1.088-.495-1.444-.309-.357-.75-.535-1.324-.535-.532 0-.99.194-1.373.583-.382.388-.622.949-.717 1.683h3.909zm1.005 2.792v1.404c-.596.34-1.383.51-2.362.51-1.255 0-2.255-.377-3-1.132-.744-.755-1.116-1.744-1.116-2.968 0-1.297.34-2.316 1.021-3.055.68-.74 1.548-1.11 2.6-1.11 1.033 0 1.852.323 2.458.966.606.644.91 1.572.91 2.784 0 .33-.033.676-.096 1.038h-5.314c.107.702.405 1.239.894 1.611.49.372 1.106.558 1.85.558.862 0 1.58-.202 2.155-.606zm6.605-1.77h-1.212c-.596 0-1.045.116-1.349.35-.303.234-.454.532-.454.894 0 .372.117.664.35.877.235.213.575.32 1.022.32.51 0 .912-.142 1.204-.424.293-.281.44-.651.44-1.108v-.91zm-4.068-2.554V9.325c.627-.361 1.457-.542 2.489-.542 2.116 0 3.175 1.026 3.175 3.08V17h-1.548v-.957c-.415.68-1.143 1.02-2.186 1.02-.766 0-1.38-.22-1.843-.661-.462-.442-.694-1.003-.694-1.684 0-.776.293-1.38.878-1.81.585-.431 1.404-.647 2.457-.647h1.34V11.8c0-.554-.133-.971-.399-1.253-.266-.282-.707-.423-1.324-.423a4.07 4.07 0 0 0-2.345.718zm9.333-1.93v1.42c.394-1 1.101-1.5 2.123-1.5.148 0 .313.016.494.048v1.531a1.885 1.885 0 0 0-.75-.143c-.542 0-.989.24-1.34.718-.351.479-.527 1.048-.527 1.707V17h-1.563V8.91h1.563zm5.01 4.084c.022.82.272 1.492.75 2.019.479.526 1.15.79 2.01.79.639 0 1.235-.176 1.788-.527v1.404c-.521.319-1.186.479-1.995.479-1.265 0-2.276-.4-3.031-1.197-.755-.798-1.133-1.792-1.133-2.984 0-1.16.38-2.151 1.14-2.975.761-.825 1.79-1.237 3.088-1.237.702 0 1.346.149 1.93.447v1.436a3.242 3.242 0 0 0-1.77-.495c-.84 0-1.513.266-2.019.798-.505.532-.758 1.213-.758 2.042zM40.24 5.72v4.579c.458-1 1.293-1.5 2.505-1.5.787 0 1.42.245 1.899.734.479.49.718 1.17.718 2.042V17h-1.564v-5.106c0-.553-.14-.98-.422-1.284-.282-.303-.652-.455-1.11-.455-.531 0-1.002.202-1.411.606-.41.405-.615 1.022-.615 1.851V17h-1.563V5.72h1.563zm14.966 10.02c.596 0 1.096-.253 1.5-.758.404-.506.606-1.157.606-1.955 0-.915-.202-1.62-.606-2.114-.404-.495-.92-.742-1.548-.742-.553 0-1.05.224-1.491.67-.442.447-.662 1.133-.662 2.058 0 .958.212 1.67.638 2.138.425.469.946.703 1.563.703zM53.004 5.72v4.42c.574-.894 1.388-1.341 2.44-1.341 1.022 0 1.857.383 2.506 1.149.649.766.973 1.781.973 3.047 0 1.138-.309 2.109-.925 2.912-.617.803-1.463 1.205-2.537 1.205-1.075 0-1.894-.447-2.457-1.34V17h-1.58V5.72h1.58zm9.908 11.104l-3.223-7.913h1.739l1.005 2.632 1.26 3.415c.096-.32.48-1.458 1.15-3.415l.909-2.632h1.66l-2.92 7.866c-.777 2.074-1.963 3.11-3.559 3.11a2.92 2.92 0 0 1-.734-.079v-1.34c.17.042.351.064.543.064 1.032 0 1.755-.57 2.17-1.708z' fill='%235D6494'/%3E%3Cpath d='M89.632 5.967v-.772a.978.978 0 0 0-.978-.977h-2.28a.978.978 0 0 0-.978.977v.793c0 .088.082.15.171.13a7.127 7.127 0 0 1 1.984-.28c.65 0 1.295.088 1.917.259.082.02.164-.04.164-.13m-6.248 1.01l-.39-.389a.977.977 0 0 0-1.382 0l-.465.465a.973.973 0 0 0 0 1.38l.383.383c.062.061.15.047.205-.014.226-.307.472-.601.746-.874.281-.28.568-.526.883-.751.068-.042.075-.137.02-.2m4.16 2.453v3.341c0 .096.104.165.192.117l2.97-1.537c.068-.034.089-.117.055-.184a3.695 3.695 0 0 0-3.08-1.866c-.068 0-.136.054-.136.13m0 8.048a4.489 4.489 0 0 1-4.49-4.482 4.488 4.488 0 0 1 4.49-4.482 4.488 4.488 0 0 1 4.489 4.482 4.484 4.484 0 0 1-4.49 4.482m0-10.85a6.363 6.363 0 1 0 0 12.729 6.37 6.37 0 0 0 6.372-6.368 6.358 6.358 0 0 0-6.371-6.36' fill='%23FFF'/%3E%3C/g%3E%3C/svg%3E")
background-repeat: no-repeat
background-position: 50%
@@ -548,8 +471,7 @@
.q-field__append
cursor: text
-.algolia-autocomplete,
-.meilisearch-autocomplete
+.algolia-autocomplete
width: auto
min-width: 0
max-width: 100%
@@ -557,8 +479,7 @@
// fix for IE
display: flex !important
- .ds-dropdown-menu,
- .dsb-dropdown-menu
+ .ds-dropdown-menu
box-shadow: $shadow-2
max-width: 93vw
width: 500px
@@ -573,22 +494,19 @@
max-height: 80vh
overflow: auto
- .ds-suggestions,
- .dsb-suggestions
+ .ds-suggestions
margin-top: 0
border-bottom: 1px solid #ddd
- .algolia-docsearch, .docs-docsearch
+ .algolia-docsearch
&-suggestion
text-decoration: none
&-suggestion--no-results
background: $primary !important
- &, .algolia-docsearch-suggestion--text,
- &, .docs-searchbar-suggestion--text
+ &, .algolia-docsearch-suggestion--text
color: white
- .algolia-docsearch-suggestion--text,
- .docs-searchbar-suggestion--text
+ .algolia-docsearch-suggestion--text
margin-top: 0
padding: 8px
@@ -610,8 +528,7 @@
&-suggestion--text
margin-top: 4px
- .algolia-docsearch-suggestion--highlight,
- .docs-searchbar-suggestion--highlight
+ .algolia-docsearch-suggestion--highlight
color: $primary
&-suggestion--highlight
@@ -640,4 +557,3 @@
&-suggestion--no-results
margin: -6px 0
width: 100% !important
-
diff --git a/docs/src/layouts/DocLayout.vue b/docs/src/layouts/DocLayout.vue
index 5fc5bd5bc30..8c35d471b39 100644
--- a/docs/src/layouts/DocLayout.vue
+++ b/docs/src/layouts/DocLayout.vue
@@ -81,7 +81,7 @@ q-layout.doc-layout(view="lHh LpR lff", @scroll="onScroll")
)
//- template(v-slot:append)
- //- q-icon(
+ //- q-icon.cursor-pointer(
//- :name="mdiMagnify"
//- @click="onSearchIconClick"
//- )
@@ -167,9 +167,9 @@ export default {
useAlgolia(scope, $q, $route)
// TODO vue3 - re-enable search when docs are released as SSR
- scope.onSearchIconClick = () => {
- scope.algoliaInputRef.value.focus()
- }
+ // scope.onSearchIconClick = () => {
+ // scope.algoliaInputRef.value.focus()
+ // }
return scope
}
diff --git a/docs/src/layouts/doc-layout/use-algolia.js b/docs/src/layouts/doc-layout/use-algolia.js
index 8a4dcd6f44d..68540ddd600 100644
--- a/docs/src/layouts/doc-layout/use-algolia.js
+++ b/docs/src/layouts/doc-layout/use-algolia.js
@@ -1,142 +1,85 @@
-import { provideDocStore } from 'src/assets/doc-store'
-import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
-import { useRouter } from 'vue-router'
-// import { ref } from 'vue'
+// import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
+// import { useRouter } from 'vue-router'
+import { ref } from 'vue'
-export default function useAlgolia (scope, $q, $route) {
+export default function useAlgolia (scope/* , $q, $route */) {
const search = ref('')
const searchFocused = ref(false)
const algoliaInputRef = ref(null)
- function focusOnSearch (evt) {
- if (
- evt.target.tagName !== 'INPUT' &&
- String.fromCharCode(evt.keyCode) === '/'
- ) {
- evt.preventDefault()
- search.value = ''
-
- if (scope.leftDrawerState.value !== true) {
- scope.leftDrawerState.value = true
- }
-
- setTimeout(() => {
- algoliaInputRef.value.focus()
- })
- }
- }
-
- onMounted(() => {
- const $router = useRouter()
-
- // If we have a search string in the query (mostly from tab-to-search functionality),
- // we need to open the drawer to fill in the search string in the input later
- const searchQuery = $route.query.search
-
- if (searchQuery) {
- scope.leftDrawerState.value = true
- }
-
- // import(
- // /* webpackChunkName: "algolia" */
- // 'docsearch.js'
- // ).then(docsearch => {
- // docsearch.default({
- // apiKey: '5c15f3938ef24ae49e3a0e69dc4a140f',
- // indexName: 'quasar-framework',
- // inputSelector: '.doc-algolia input',
- // algoliaOptions: {
- // hitsPerPage: 7
- // },
- // handleSelected: (a, b, suggestion, c, context) => {
- // const url = suggestion.url.replace('https://quasar.dev', '')
-
- // search.value = ''
- // $router.push(url).catch(() => {})
- // algoliaInputRef.value.blur()
- // }
- // })
- import(
- /* webpackChunkName: "algolia" */
- 'docs-searchbar.js'
- ).then(docsearch => {
- // console.log({
- // apiKey: process.env.search.apiKey,
- // hostUrl: process.env.search.hostUrl,
- // indexName: process.env.search.indexUid,
- // inputSelector: process.env.search.inputSelector,
- // debug: process.env.search.debug,
- // })
- docsearch.default({
- apiKey: process.env.search.apiKey,
- hostUrl: process.env.search.hostUrl,
- indexUid: process.env.search.indexUid,
- inputSelector: process.env.search.inputSelector,
- debug: process.env.search.debug,
- meilisearchOptions: {
- limit: 7
- },
- // autocompleteOptions: {
-
- // }
- /**
- * queryHook takes a callback function as value. This function will be
- * called on every keystroke to transform the typed keywords before
- * querying MeiliSearch. By default, it does not do anything, but it
- * is the perfect place for you to add some preprocessing or custom
- * functionality.
- */
- // queryHook () {
- // },
- /**
- * transformData takes a callback function as value. This function
- * will be called on every hit before displaying them. By default,
- * it does not do anything, but it lets you add any post-processing
- * around the data you received from MeiliSearch.
- */
- // transformData () {
- // },
- /**
- * https://github.com/meilisearch/docs-searchbar.js#handleselected-
- * @param {Element} input a reference to the search input element. It comes with the .open(), .close(), .getVal() and .setVal() methods.
- * @param {Event} event the actual event triggering the selection.
- * @param {Object} suggestion the object representing the current selection. It contains a .url key representing the destination.
- * @param {Number} datasetNumber this should always be equal to 1 as docs-searchbar.js is searching into one dataset at a time. You can ignore this attribute.
- * @param {Any} context additional information about the selection. Contains a .selectionMethod key that can be either click, enterKey, tabKey or blur, depending on how the suggestion was selected.
- */
- handleSelected: (input, event, suggestion, datasetNumber, context) => {
- const url = suggestion.url.replace('https://quasar.dev', '')
-
- search.value = ''
- $router.push(url).catch(() => {})
- algoliaInputRef.value.blur()
- }
- })
-
- if ($q.platform.is.desktop === true) {
- window.addEventListener('keypress', focusOnSearch)
- }
-
- if (searchQuery) {
- // Here we put search string from query into the input and open the search popup.
- // Unfortunately, this input is managed completely by Algolia and their code doesn't seem to
- // have a method of opening the popup programmatically, so we need to simulate typing on that input element.
- // We also need to dispatch the event only after the input text is populated and Vue will
- // do that in next render, so we schedule it on the next event loop iteration with setTimeout.
- search.value = searchQuery
- algoliaInputRef.value.focus()
- setTimeout(() => {
- algoliaInputRef.value.$refs.input.dispatchEvent(new Event('input', {}))
- })
- }
- })
- })
-
- onBeforeUnmount(() => {
- if ($q.platform.is.desktop === true) {
- window.removeEventListener('keypress', focusOnSearch)
- }
- })
+ // function focusOnSearch (evt) {
+ // if (
+ // evt.target.tagName !== 'INPUT' &&
+ // String.fromCharCode(evt.keyCode) === '/'
+ // ) {
+ // evt.preventDefault()
+ // search.value = ''
+
+ // if (scope.leftDrawerState.value !== true) {
+ // scope.leftDrawerState.value = true
+ // }
+
+ // setTimeout(() => {
+ // algoliaInputRef.value.focus()
+ // })
+ // }
+ // }
+
+ // onMounted(() => {
+ // const $router = useRouter()
+
+ // // If we have a search string in the query (mostly from tab-to-search functionality),
+ // // we need to open the drawer to fill in the search string in the input later
+ // const searchQuery = $route.query.search
+
+ // if (searchQuery) {
+ // scope.leftDrawerState.value = true
+ // }
+
+ // import(
+ // /* webpackChunkName: "algolia" */
+ // 'docsearch.js'
+ // ).then(docsearch => {
+ // docsearch.default({
+ // apiKey: '5c15f3938ef24ae49e3a0e69dc4a140f',
+ // indexName: 'quasar-framework',
+ // inputSelector: '.doc-algolia input',
+ // algoliaOptions: {
+ // hitsPerPage: 7
+ // },
+ // handleSelected: (a, b, suggestion, c, context) => {
+ // const url = suggestion.url.replace('https://quasar.dev', '')
+
+ // search.value = ''
+ // $router.push(url).catch(() => {})
+ // algoliaInputRef.value.blur()
+ // }
+ // })
+
+ // if ($q.platform.is.desktop === true) {
+ // window.addEventListener('keypress', focusOnSearch)
+ // }
+
+ // if (searchQuery) {
+ // // Here we put search string from query into the input and open the search popup.
+ // // Unfortunately, this input is managed completely by Algolia and their code doesn't seem to
+ // // have a method of opening the popup programmatically, so we need to simulate typing on that input element.
+ // // We also need to dispatch the event only after the input text is populated and Vue will
+ // // do that in next render, so we schedule it on the next event loop iteration with setTimeout.
+ // search.value = searchQuery
+ // algoliaInputRef.value.focus()
+ // setTimeout(() => {
+ // algoliaInputRef.value.$refs.input.dispatchEvent(new Event('input', {}))
+ // })
+ // }
+ // })
+ // })
+
+ // onBeforeUnmount(() => {
+ // if ($q.platform.is.desktop === true) {
+ // window.removeEventListener('keypress', focusOnSearch)
+ // }
+ // })
Object.assign(scope, {
search,
|
c036edf81eacb02eb8ee19fc9fb9226db2e10ec6
|
2018-02-20 06:46:43
|
Razvan Stoenescu
|
fix(QTable): top & bottom responsiveness
| false
|
top & bottom responsiveness
|
fix
|
diff --git a/dev/components/components/data-table2.vue b/dev/components/components/data-table2.vue
index 44d0bd2af42..00986d1a2da 100644
--- a/dev/components/components/data-table2.vue
+++ b/dev/components/components/data-table2.vue
@@ -94,6 +94,7 @@
<h4>Filter, Column selection</h4>
<q-table
:data="data"
+ title="Filter, Column selection"
:columns="columns"
:filter="filter"
:visible-columns="visibleColumns"
@@ -101,9 +102,9 @@
color="primary"
>
<template slot="top-right" slot-scope="props">
- <q-search hide-underline color="primary" v-model="filter" />
- <q-table-columns color="primary" class="on-right" v-model="visibleColumns" :columns="columns" />
- <q-btn color="primary" flat round dense icon="more_vert" class="on-right">
+ <q-search hide-underline color="primary" class="q-mr-sm" v-model="filter" />
+ <q-table-columns color="primary" class="q-mr-sm" v-model="visibleColumns" :columns="columns" />
+ <q-btn color="primary" flat round dense icon="more_vert">
<q-popover ref="popover">
<q-list link>
<q-item @click.native="$refs.popover.hide()">
diff --git a/src/components/table/table-bottom.js b/src/components/table/table-bottom.js
index 7f876b84596..a4ad5c553af 100644
--- a/src/components/table/table-bottom.js
+++ b/src/components/table/table-bottom.js
@@ -22,9 +22,10 @@ export default {
const bottom = this.$scopedSlots.bottom
- return h('div', { staticClass: 'q-table-bottom row items-center gutter-x-sm justify-between' },
- bottom ? [ bottom(this.marginalsProps) ] : this.getPaginationRow(h)
- )
+ return h('div', {
+ staticClass: 'q-table-bottom row items-center',
+ 'class': bottom ? null : 'justify-end'
+ }, bottom ? [ bottom(this.marginalsProps) ] : this.getPaginationRow(h))
},
getPaginationRow (h) {
const
@@ -33,12 +34,15 @@ export default {
paginationSlot = this.$scopedSlots.pagination
return [
- h('div', { staticClass: 'col-auto' }, [
- this.hasSelectionMode && this.rowsSelectedNumber > 0
- ? (this.selectedRowsLabel || this.$q.i18n.table.selectedRows)(this.rowsSelectedNumber)
- : ''
+ h('div', { staticClass: 'q-table-control' }, [
+ h('div', [
+ this.hasSelectionMode && this.rowsSelectedNumber > 0
+ ? (this.selectedRowsLabel || this.$q.i18n.table.selectedRows)(this.rowsSelectedNumber)
+ : ''
+ ])
]),
- h('div', { staticClass: 'col-auto flex items-center no-wrap' }, [
+ h('div', { staticClass: 'q-table-separator col' }),
+ h('div', { staticClass: 'q-table-control' }, [
h('span', { staticClass: 'q-table-bottom-item' }, [
this.rowsPerPageLabel || this.$q.i18n.table.rowsPerPage
]),
@@ -59,7 +63,9 @@ export default {
})
}
}
- }),
+ })
+ ]),
+ h('div', { staticClass: 'q-table-control' }, [
paginationSlot
? paginationSlot(this.marginalsProps)
: [
diff --git a/src/components/table/table-top.js b/src/components/table/table-top.js
index 4fa034f23ca..81d14675eec 100644
--- a/src/components/table/table-top.js
+++ b/src/components/table/table-top.js
@@ -22,7 +22,7 @@ export default {
topRight = this.$scopedSlots['top-right'],
topSelection = this.$scopedSlots['top-selection'],
hasSelection = this.hasSelectionMode && topSelection && this.rowsSelectedNumber > 0,
- staticClass = 'q-table-top relative-position row no-wrap items-center',
+ staticClass = 'q-table-top relative-position row items-center',
child = []
if (top) {
@@ -34,16 +34,28 @@ export default {
}
else {
if (topLeft) {
- child.push(topLeft(this.marginalsProps))
+ child.push(
+ h('div', { staticClass: 'q-table-control' }, [
+ topLeft(this.marginalsProps)
+ ])
+ )
}
else if (this.title) {
- child.push(h('div', { staticClass: 'q-table-title' }, this.title))
+ child.push(
+ h('div', { staticClass: 'q-table-control' }, [
+ h('div', { staticClass: 'q-table-title' }, this.title)
+ ])
+ )
}
}
if (topRight) {
child.push(h('div', { staticClass: 'q-table-separator col' }))
- child.push(topRight(this.marginalsProps))
+ child.push(
+ h('div', { staticClass: 'q-table-control' }, [
+ topRight(this.marginalsProps)
+ ])
+ )
}
if (child.length === 0) {
diff --git a/src/components/table/table.ios.styl b/src/components/table/table.ios.styl
index fb9e65c82f3..058c141e1e4 100644
--- a/src/components/table/table.ios.styl
+++ b/src/components/table/table.ios.styl
@@ -7,7 +7,7 @@
.q-table-top
min-height 64px
- padding 4px 24px
+ padding 8px 24px
&:before
content ''
position absolute
@@ -18,17 +18,20 @@
left 0
opacity .2
transition $table-transition
+ .q-table-control
+ min-height 36px
+ padding 8px 0
+ flex-wrap wrap
+.q-table-title
+ font-size 20px
+ letter-spacing 0.005em
+ font-weight 400
.q-table-separator
min-width 8px !important
.q-table-nodata .q-icon
font-size 200%
padding-right 15px
-.q-table-title
- font-size 20px
- letter-spacing .005em
- font-weight 400
-
.q-table-progress
height 0 !important
td
@@ -44,8 +47,14 @@
.q-table-bottom
min-height 48px
- padding 0 14px 0 24px
+ padding 4px 14px 4px 24px
font-size 12px
+ .q-table-control
+ min-height 24px
+
+.q-table-control
+ display flex
+ align-items center
.q-table-sort-icon
transition $table-transition
@@ -148,7 +157,9 @@ table-dense()
.q-table
th, td
padding 4px 8px
- thead tr, tbody td
+ thead tr
+ height 40px
+ tbody td
height 28px
.q-table-bottom-item
diff --git a/src/components/table/table.mat.styl b/src/components/table/table.mat.styl
index fb9e65c82f3..058c141e1e4 100644
--- a/src/components/table/table.mat.styl
+++ b/src/components/table/table.mat.styl
@@ -7,7 +7,7 @@
.q-table-top
min-height 64px
- padding 4px 24px
+ padding 8px 24px
&:before
content ''
position absolute
@@ -18,17 +18,20 @@
left 0
opacity .2
transition $table-transition
+ .q-table-control
+ min-height 36px
+ padding 8px 0
+ flex-wrap wrap
+.q-table-title
+ font-size 20px
+ letter-spacing 0.005em
+ font-weight 400
.q-table-separator
min-width 8px !important
.q-table-nodata .q-icon
font-size 200%
padding-right 15px
-.q-table-title
- font-size 20px
- letter-spacing .005em
- font-weight 400
-
.q-table-progress
height 0 !important
td
@@ -44,8 +47,14 @@
.q-table-bottom
min-height 48px
- padding 0 14px 0 24px
+ padding 4px 14px 4px 24px
font-size 12px
+ .q-table-control
+ min-height 24px
+
+.q-table-control
+ display flex
+ align-items center
.q-table-sort-icon
transition $table-transition
@@ -148,7 +157,9 @@ table-dense()
.q-table
th, td
padding 4px 8px
- thead tr, tbody td
+ thead tr
+ height 40px
+ tbody td
height 28px
.q-table-bottom-item
|
2abb603d99420703e88e492f73637917b5408a87
|
2024-05-03 21:12:29
|
Razvan Stoenescu
|
fix(ui): JSON > model-value definition for QBtnDropdown/QDialog/QDrawer/QExpansionItem/QFab/QMenu/QTooltip/QFab
| false
|
JSON > model-value definition for QBtnDropdown/QDialog/QDrawer/QExpansionItem/QFab/QMenu/QTooltip/QFab
|
fix
|
diff --git a/ui/src/components/fab/QFab.json b/ui/src/components/fab/QFab.json
index 528d18cb0c4..a57471d93fe 100644
--- a/ui/src/components/fab/QFab.json
+++ b/ui/src/components/fab/QFab.json
@@ -3,10 +3,7 @@
"props": {
"model-value": {
- "extends": "model-value",
- "desc": "Controls state of fab actions (showing/hidden); Works best with v-model directive, otherwise use along listening to 'update:modelValue' event",
- "category": "model",
- "required": false
+ "desc": "Controls state of fab actions (showing/hidden); Works best with v-model directive, otherwise use along listening to 'update:modelValue' event"
},
"icon": {
diff --git a/ui/src/composables/private.use-model-toggle/use-model-toggle.json b/ui/src/composables/private.use-model-toggle/use-model-toggle.json
index 38c7014cd4e..e9c82275af1 100644
--- a/ui/src/composables/private.use-model-toggle/use-model-toggle.json
+++ b/ui/src/composables/private.use-model-toggle/use-model-toggle.json
@@ -1,9 +1,11 @@
{
"props": {
"model-value": {
- "type": "Boolean",
+ "type": [ "Boolean", "null" ],
"desc": "Model of the component defining shown/hidden state; Either use this property (along with a listener for 'update:model-value' event) OR use v-model directive",
- "category": "model"
+ "default": "null",
+ "category": "model",
+ "examples": [ "# v-model=\"state\"" ]
}
},
|
18d6d0d70d12171f26f9afc2bc55cd3b60bdb19b
|
2021-03-30 16:35:47
|
Paolo Caleffi
|
feat(app/ts): add Vuex typings, fix #8511, #8500 (#8712)
| false
|
add Vuex typings, fix #8511, #8500 (#8712)
|
feat
|
diff --git a/app/templates/entry/app.js b/app/templates/entry/app.js
index cd6bffbc648..28fc670e039 100644
--- a/app/templates/entry/app.js
+++ b/app/templates/entry/app.js
@@ -61,6 +61,10 @@ export default async function (createAppFn<%= ctx.mode.ssr ? ', ssrContext' : ''
const store = typeof createStore === 'function'
? await createStore({<%= ctx.mode.ssr ? 'ssrContext' : '' %>})
: createStore
+
+
+ // obtain Vuex injection key in case we use TypeScript
+ const { storeKey } = await import('app/src/store/index');
<% } %>
const router = typeof createRouter === 'function'
? await createRouter({<%= ctx.mode.ssr ? 'ssrContext' + (store ? ',' : '') : '' %><%= store ? 'store' : '' %>})
@@ -89,7 +93,7 @@ export default async function (createAppFn<%= ctx.mode.ssr ? ', ssrContext' : ''
// different depending on whether we are in a browser or on the server.
return {
app,
- <%= store ? 'store,' : '' %>
+ <%= store ? 'store, storeKey,' : '' %>
router
}
}
diff --git a/app/templates/entry/client-entry.js b/app/templates/entry/client-entry.js
index f0ae28c2146..1a670beadad 100644
--- a/app/templates/entry/client-entry.js
+++ b/app/templates/entry/client-entry.js
@@ -69,7 +69,7 @@ const doubleSlashRE = /\/\//
const addPublicPath = url => (publicPath + url).replace(doubleSlashRE, '/')
<% } %>
-async function start ({ app, router<%= store ? ', store' : '' %> }<%= bootEntries.length > 0 ? ', bootFiles' : '' %>) {
+async function start ({ app, router<%= store ? ', store, storeKey' : '' %> }<%= bootEntries.length > 0 ? ', bootFiles' : '' %>) {
<% if (ctx.mode.ssr && store && ssr.manualHydration !== true) { %>
// prime the store with server-initialized state.
// the state is determined during SSR and inlined in the page markup.
@@ -121,7 +121,7 @@ async function start ({ app, router<%= store ? ', store' : '' %> }<%= bootEntrie
<% } %>
app.use(router)
- <% if (store) { %>app.use(store)<% } %>
+ <% if (store) { %>app.use(store, storeKey)<% } %>
<% if (ctx.mode.ssr) { %>
<% if (ctx.mode.pwa) { %>
diff --git a/app/templates/entry/server-entry.js b/app/templates/entry/server-entry.js
index b0a6d4f4ac1..28be7e1f2b4 100644
--- a/app/templates/entry/server-entry.js
+++ b/app/templates/entry/server-entry.js
@@ -73,7 +73,7 @@ function redirectBrowser (url, router, reject, httpStatusCode) {
// return a Promise that resolves to the app instance.
export default ssrContext => {
return new Promise(async (resolve, reject) => {
- const { app, router<%= store ? ', store' : '' %> } = await createQuasarApp(createApp, ssrContext)
+ const { app, router<%= store ? ', store, storeKey' : '' %> } = await createQuasarApp(createApp, ssrContext)
<% if (bootNames.length > 0) { %>
let hasRedirected = false
@@ -106,7 +106,7 @@ export default ssrContext => {
<% } %>
app.use(router)
- <% if (store) { %>app.use(store)<% } %>
+ <% if (store) { %>app.use(store, storeKey)<% } %>
const url = ssrContext.url<% if (build.publicPath !== '/') { %>.replace(publicPath, '')<% } %>
const { fullPath } = router.resolve(url)
diff --git a/app/templates/store/ts/index.ts b/app/templates/store/ts/index.ts
index 7333989eb96..2bae8e4ff73 100644
--- a/app/templates/store/ts/index.ts
+++ b/app/templates/store/ts/index.ts
@@ -1,5 +1,10 @@
import { store } from 'quasar/wrappers'
-import { createStore } from 'vuex'
+import { InjectionKey } from 'vue'
+import {
+ createStore,
+ Store as VuexStore,
+ useStore as vuexUseStore,
+} from 'vuex'
// import example from './module-example'
// import { ExampleStateInterface } from './module-example/state';
@@ -20,6 +25,16 @@ export interface StateInterface {
example: unknown;
}
+// provide typings for `this.$store`
+declare module '@vue/runtime-core' {
+ interface ComponentCustomProperties {
+ $store: VuexStore<StateInterface>
+ }
+}
+
+// provide typings for `useStore` helper
+export const storeKey: InjectionKey<VuexStore<StateInterface>> = Symbol('vuex-key')
+
export default store(function (/* { ssrContext } */) {
const Store = createStore<StateInterface>({
modules: {
@@ -33,3 +48,7 @@ export default store(function (/* { ssrContext } */) {
return Store
})
+
+export function useStore() {
+ return vuexUseStore(storeKey)
+}
\ No newline at end of file
diff --git a/docs/src/pages/quasar-cli/prefetch-feature.md b/docs/src/pages/quasar-cli/prefetch-feature.md
index c96249d0898..f7a5f1654a6 100644
--- a/docs/src/pages/quasar-cli/prefetch-feature.md
+++ b/docs/src/pages/quasar-cli/prefetch-feature.md
@@ -260,7 +260,7 @@ interface StateInterface {
}
export default {
- preFetch: preFetch<Store<StateInterface>>(({ store }) => {
+ preFetch: preFetch<StateInterface>(({ store }) => {
// Do something with your newly-typed store parameter
}),
}
|
72d8a60ab6a2b844b76c4b2dee62c5cafb6421e5
|
2018-12-28 18:47:44
|
Razvan Stoenescu
|
feat(app): Sync modifier banner
| false
|
Sync modifier banner
|
feat
|
diff --git a/app/bin/quasar-describe b/app/bin/quasar-describe
index 8ebf8670aab..45eeed2fb16 100644
--- a/app/bin/quasar-describe
+++ b/app/bin/quasar-describe
@@ -86,6 +86,9 @@ function describeComponent (api) {
const prop = api.props[propName]
console.log(`\n ${prop.required ? chalk.red('*') : ' '} ${chalk.green(propName)} (${prop.type})${prop.required ? chalk.red(' [Required]') : ''}`)
console.log(` ${prop.desc}`)
+ if (prop.sync) {
+ console.log(` ".sync" modifier required!`)
+ }
if (prop.link) {
console.log(` Link: ${prop.link}`)
}
diff --git a/quasar/src/components/chip/QChip.json b/quasar/src/components/chip/QChip.json
index 1a2ca0fe606..96807370b08 100644
--- a/quasar/src/components/chip/QChip.json
+++ b/quasar/src/components/chip/QChip.json
@@ -98,7 +98,7 @@
},
"update:selected": {
- "desc": "Emitted when 'selected' state changes; Works along the sync prop 'selected'",
+ "desc": "Used by Vue on 'selected.sync' prop for updating its value",
"params": {
"state": {
"type": "Boolean",
|
06ef9484203ce8552d3bce7a4e5f770f362e705d
|
2017-11-23 17:14:43
|
Razvan Stoenescu
|
refactor: Model toggle updates
| false
|
Model toggle updates
|
refactor
|
diff --git a/dev/components/global/dialog.vue b/dev/components/global/dialog.vue
index 9a9dc924b98..ffb113a407a 100644
--- a/dev/components/global/dialog.vue
+++ b/dev/components/global/dialog.vue
@@ -43,16 +43,16 @@ export default {
this.showDialog = !this.showDialog
},
onOk (data) {
- console.log('onOK', data)
+ console.log('>>> onOK', data)
},
onCancel (data) {
- console.log('onCancel', data)
+ console.log('>>> onCancel', data)
},
onHide (data) {
- console.log('onHide', data)
+ console.log('>>> onHide', data)
},
onShow (data) {
- console.log('onShow', data)
+ console.log('>>> onShow', data)
},
adHoc () {
this.$q.dialog({
@@ -66,9 +66,9 @@ export default {
// preventClose: true,
color: 'secondary'
}).then(data => {
- console.log('OK, received:', data)
+ console.log('>>>> OK, received:', data)
}).catch(() => {
- console.log('dismissed')
+ console.log('>>>> Cancel')
})
},
adHoc2 () {
@@ -89,9 +89,9 @@ export default {
preventClose: true,
color: 'secondary'
}).then(data => {
- console.log('OK, received:', data)
+ console.log('>>>> OK, received:', data)
}).catch(() => {
- console.log('dismissed')
+ console.log('>>>> Cancel')
})
},
adHoc3 () {
@@ -101,9 +101,9 @@ export default {
cancel: true,
preventClose: true
}).then(() => {
- console.log('OK')
+ console.log('>>> OK')
}).catch(() => {
- console.log('Cancel')
+ console.log('>>> Cancel')
})
}
}
diff --git a/src/components/dialog/QDialog.js b/src/components/dialog/QDialog.js
index 63599c5d719..1dad05c0a55 100644
--- a/src/components/dialog/QDialog.js
+++ b/src/components/dialog/QDialog.js
@@ -25,11 +25,6 @@ export default {
default: 'primary'
}
},
- watch: {
- value (val) {
- this[val ? 'show' : 'hide']()
- }
- },
render (h) {
const
child = [],
@@ -90,19 +85,38 @@ export default {
return h(QModal, {
ref: 'modal',
props: {
+ value: this.value,
minimized: true,
noBackdropDismiss: this.preventClose,
noEscDismiss: this.preventClose,
position: this.position
},
on: {
+ input: val => {
+ this.$emit('input', val)
+ },
show: () => {
+ console.log('DIALOG show emitting show')
this.$emit('show')
- this.$emit('input', true)
+
+ if (!this.$q.platform.is.desktop) {
+ return
+ }
+
+ let node = this.$refs.modal.$el.getElementsByTagName('INPUT')
+ if (node.length) {
+ node[0].focus()
+ return
+ }
+
+ node = this.$refs.modal.$el.getElementsByTagName('INPUT')
+ if (node.length) {
+ node[node.length - 1].focus()
+ }
},
hide: () => {
+ console.log('DIALOG hide emitting hide')
this.$emit('hide')
- this.$emit('input', false)
},
dismiss: () => {
console.log('DIALOG received dismiss, hiding then emitting cancel')
@@ -135,24 +149,7 @@ export default {
methods: {
show () {
console.log('DIALOG show')
- return this.$refs.modal.show().then(() => {
- console.log('DIALOG show emitting show')
-
- if (!this.$q.platform.is.desktop) {
- return
- }
-
- let node = this.$refs.modal.$el.getElementsByTagName('INPUT')
- if (node.length) {
- node[0].focus()
- return
- }
-
- node = this.$refs.modal.$el.getElementsByTagName('INPUT')
- if (node.length) {
- node[node.length - 1].focus()
- }
- })
+ return this.$refs.modal.show()
},
hide () {
let data
@@ -163,7 +160,7 @@ export default {
console.log('DIALOG hide')
return this.$refs.modal.hide().then(() => {
- console.log('DIALOG hide', data)
+ console.log('DIALOG hide data:', data)
return data
})
},
diff --git a/src/components/modal/QModal.js b/src/components/modal/QModal.js
index b44a46d3e6b..f986b4889f8 100644
--- a/src/components/modal/QModal.js
+++ b/src/components/modal/QModal.js
@@ -49,6 +49,10 @@ let openedModalNumber = 0
export default {
name: 'q-modal',
mixins: [ModelToggleMixin],
+ modelToggle: {
+ history: true,
+ showOnMount: true
+ },
props: {
position: {
type: String,
@@ -133,7 +137,7 @@ export default {
})
},
__show () {
- console.log('MODAL show')
+ console.log('MODAL __show')
const body = document.body
body.appendChild(this.$el)
@@ -147,21 +151,18 @@ export default {
}
})
- this.$once('show', () => {
- console.log('trigger')
- let content = this.$refs.content
- content.scrollTop = 0
- ;['modal-scroll', 'layout-view'].forEach(c => {
- [].slice.call(content.getElementsByClassName(c)).forEach(el => {
- el.scrollTop = 0
- })
+ openedModalNumber++
+
+ let content = this.$refs.content
+ content.scrollTop = 0
+ ;['modal-scroll', 'layout-view'].forEach(c => {
+ [].slice.call(content.getElementsByClassName(c)).forEach(el => {
+ el.scrollTop = 0
})
})
-
- openedModalNumber++
},
__hide () {
- console.log('MODAL hide')
+ console.log('MODAL __hide')
EscapeKey.pop()
openedModalNumber--
@@ -173,11 +174,6 @@ export default {
}
}
},
- mounted () {
- if (this.value) {
- this.show()
- }
- },
beforeDestroy () {
if (this.$el.parentNode) {
this.$el.parentNode.removeChild(this.$el)
@@ -192,19 +188,19 @@ export default {
},
on: {
afterEnter: () => {
- console.log('show resolve')
+ console.log('MODAL show resolve')
this.showPromise && this.showPromiseResolve()
},
enterCancelled: () => {
- console.log('show cancel')
+ console.log('MODAL show cancel')
this.showPromise && this.showPromiseReject()
},
afterLeave: () => {
- console.log('hide resolve')
+ console.log('MODAL hide resolve')
this.hidePromise && this.hidePromiseResolve()
},
leaveCancelled: () => {
- console.log('hide reject')
+ console.log('MODAL hide reject')
this.hidePromise && this.hidePromiseReject()
}
}
diff --git a/src/mixins/model-toggle.js b/src/mixins/model-toggle.js
index f1a91bd7582..c81e0c6df67 100644
--- a/src/mixins/model-toggle.js
+++ b/src/mixins/model-toggle.js
@@ -16,36 +16,16 @@ export default {
},
watch: {
value (val) {
- console.log(this.$options.name, '__updateModel value watcher', val, this.showing)
if (this.disable && val) {
+ console.log(this.$options.name, '__updateModel value watcher -- disabled, emitting false')
this.$emit('input', false)
return
}
+ console.log(this.$options.name, '__updateModel value watcher', val, this.showing)
if (val !== this.showing) {
this[val ? 'show' : 'hide']()
}
- },
- showing (val) {
- console.log(this.$options.name, '__updateModel showing watcher', val, this.value)
- if (this.value !== val) {
- this.$emit('input', val)
- }
-
- if (this.$options.noShowingHistory) {
- return
- }
-
- if (val) {
- this.__historyEntry = {
- handler: this.hide
- }
- History.add(this.__historyEntry)
- }
- else if (this.__historyEntry) {
- History.remove(this.__historyEntry)
- this.__historyEntry = null
- }
}
},
methods: {
@@ -59,68 +39,112 @@ export default {
return Promise.reject(new Error())
}
- console.log('show')
+ console.log('MODEL-TOGGLE show')
if (this.showing) {
- return this.showPromise || Promise.resolve()
+ console.log('MODEL-TOGGLE show already in progress')
+ return this.showPromise || Promise.resolve(evt)
+ }
+
+ if (this.hidePromise) {
+ console.log('MODEL-TOGGLE rejecting hide promise')
+ this.hidePromiseReject()
}
this.showing = true
+ if (this.value !== void 0) {
+ console.log('MODEL-TOGGLE emitting false')
+ this.$emit('input', true)
+ }
+
+ if (this.$options.modelToggle.history) {
+ this.__historyEntry = {
+ handler: this.hide
+ }
+ History.add(this.__historyEntry)
+ }
+
+ if (!this.__show) {
+ this.$emit('show')
+ return Promise.resolve(evt)
+ }
+
this.showPromise = new Promise((resolve, reject) => {
this.showPromiseResolve = () => {
+ console.log('MODEL-TOGGLE showPromiseResolve')
this.showPromise = null
this.$emit('show')
- resolve()
+ resolve(evt)
}
this.showPromiseReject = () => {
+ console.log('MODEL-TOGGLE showPromiseReject')
this.showPromise = null
reject(new Error())
}
})
- this.$nextTick(() => {
- if (this.__show) {
- this.__show(evt)
- }
- else {
- this.showPromiseResolve()
- }
- })
-
- return this.showPromise
+ console.log('MODEL-TOGGLE calling __show')
+ this.__show(evt)
+ return this.showPromise || Promise.resolve(evt)
},
hide (evt) {
- console.log('hide')
+ if (this.disable) {
+ return Promise.reject(new Error())
+ }
+
+ console.log('MODEL-TOGGLE hide')
if (!this.showing) {
- console.log('hide aborting')
+ console.log('MODEL-TOGGLE already hiding')
return this.hidePromise || Promise.resolve()
}
+ if (this.showPromise) {
+ console.log('MODEL-TOGGLE rejecting show promise')
+ this.showPromiseReject()
+ }
+
this.showing = false
+ if (this.value !== void 0) {
+ console.log('MODEL-TOGGLE emitting false')
+ this.$emit('input', false)
+ }
+
+ if (this.__historyEntry) {
+ History.remove(this.__historyEntry)
+ this.__historyEntry = null
+ }
+
+ if (!this.__hide) {
+ this.$emit('hide')
+ return Promise.resolve()
+ }
+
this.hidePromise = new Promise((resolve, reject) => {
this.hidePromiseResolve = () => {
+ console.log('MODEL-TOGGLE hidePromiseResolve')
this.hidePromise = null
this.$emit('hide')
resolve()
}
this.hidePromiseReject = () => {
+ console.log('MODEL-TOGGLE hidePromiseReject')
this.hidePromise = null
reject(new Error())
}
})
- this.$nextTick(() => {
- if (this.__hide) {
- this.__hide(evt)
- }
- else {
- this.hidePromiseResolve()
- }
- })
- return this.hidePromise
+
+ console.log('MODEL-TOGGLE calling __hide')
+ this.__hide(evt)
+ return this.hidePromise || Promise.resolve()
+ }
+ },
+ mounted () {
+ if (this.$options.modelToggle.showOnMount && this.value) {
+ this.show()
}
},
beforeDestroy () {
if (this.showing) {
- console.log('beforeDestroy calling hide')
+ console.log('MODEL-TOGGLE beforeDestroy calling hide')
this.showPromise && this.showPromiseReject()
this.hidePromise && this.hidePromiseReject()
this.$emit('input', false)
|
4002b65ae2f79ba3152b84203d22a671e7a03f8f
|
2024-12-20 19:05:51
|
Razvan Stoenescu
|
fix(app-vite/app-webpack): pin down esbuild to 0.24.0 due to compile error
| false
|
pin down esbuild to 0.24.0 due to compile error
|
fix
|
diff --git a/app-vite/package.json b/app-vite/package.json
index cfbcc67e6ea..454bc916014 100644
--- a/app-vite/package.json
+++ b/app-vite/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/app-vite",
- "version": "2.0.3",
+ "version": "2.0.4",
"description": "Quasar Framework App CLI with Vite",
"bin": {
"quasar": "./bin/quasar.js"
@@ -99,7 +99,7 @@
"dotenv": "^16.4.5",
"dotenv-expand": "^11.0.6",
"elementtree": "0.1.7",
- "esbuild": "^0.24.0",
+ "esbuild": "=0.24.0",
"express": "^4.21.1",
"fs-extra": "^11.2.0",
"html-minifier-terser": "^7.2.0",
diff --git a/app-webpack/package.json b/app-webpack/package.json
index 860ac9a491c..36ac5b6aa00 100644
--- a/app-webpack/package.json
+++ b/app-webpack/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/app-webpack",
- "version": "4.0.3",
+ "version": "4.0.4",
"description": "Quasar Framework App CLI with Webpack",
"bin": {
"quasar": "./bin/quasar"
@@ -107,7 +107,7 @@
"dotenv-expand": "^11.0.6",
"elementtree": "0.1.7",
"error-stack-parser": "^2.1.4",
- "esbuild": "^0.24.0",
+ "esbuild": "=0.24.0",
"express": "^4.21.1",
"file-loader": "^6.2.0",
"fs-extra": "^11.2.0",
|
d6cd8dbff4c62a1143b665753fbeba4c69306926
|
2022-03-10 19:45:41
|
Razvan Stoenescu
|
feat(create-project): more options; merge app/app-extension/ui-kit into one single create package
| false
|
more options; merge app/app-extension/ui-kit into one single create package
|
feat
|
diff --git a/app-webpack/lib/webpack/create-chain.js b/app-webpack/lib/webpack/create-chain.js
index 01323f9ae74..92229dc6e24 100644
--- a/app-webpack/lib/webpack/create-chain.js
+++ b/app-webpack/lib/webpack/create-chain.js
@@ -86,7 +86,7 @@ module.exports = function (cfg, configName) {
pages: appPaths.resolve.src(`pages`),
assets: appPaths.resolve.src(`assets`),
boot: appPaths.resolve.src(`boot`),
- store: appPaths.resolve.store(`store`),
+ store: appPaths.resolve.src(`store`),
'src-bex': appPaths.bexDir // needed for app/templates
})
diff --git a/create/app-extension/.gitignore b/create-project/.gitignore
similarity index 100%
rename from create/app-extension/.gitignore
rename to create-project/.gitignore
diff --git a/create/app-extension/README.md b/create-project/README.md
similarity index 100%
rename from create/app-extension/README.md
rename to create-project/README.md
diff --git a/create/app-extension/assets/logo.art b/create-project/assets/logo.art
similarity index 100%
rename from create/app-extension/assets/logo.art
rename to create-project/assets/logo.art
diff --git a/create-project/index.js b/create-project/index.js
new file mode 100755
index 00000000000..335062ac5e0
--- /dev/null
+++ b/create-project/index.js
@@ -0,0 +1,140 @@
+#!/usr/bin/env node
+
+const { readFileSync, readdirSync, existsSync } = require('fs')
+const parseArgs = require('minimist')
+
+// display banner
+console.log(
+ readFileSync(
+ require('path').join(__dirname, 'assets/logo.art'),
+ 'utf8'
+ )
+)
+
+const utils = require('./utils')
+
+// should error out if already inside of a Quasar project
+utils.ensureOutsideProject()
+
+const argv = parseArgs(process.argv.slice(2), {
+ alias: {
+ v: 'version',
+ t: 'type'
+ },
+ string: [ 'v', 't' ]
+})
+
+let dir = argv._[0]
+const defaultProjectFolder = 'quasar-project'
+
+async function run () {
+ const scope = {}
+
+ await utils.prompts(scope, [
+ {
+ type: 'select',
+ name: 'projectType',
+ initial: 0,
+ message: 'What would you like to build?',
+ choices: [
+ { title: `App with Quasar CLI, let's go!`, value: 'app', description: 'spa/pwa/ssr/bex/electron/capacitor/cordova' },
+ { title: 'AppExtension (AE) for Quasar CLI', value: 'app-extension', description: 'Quasar CLI AE' },
+ { title: 'Quasar UI kit', value: 'ui-kit', description: 'Vue component and/or directive' }
+ ]
+ },
+ {
+ type: 'text',
+ name: 'projectFolder',
+ message: 'Project folder:',
+ initial: defaultProjectFolder,
+ format: val => {
+ const name = (val && val.trim()) || defaultProjectFolder
+ // inject the "short" name
+ scope.projectFolderName = name
+ return utils.join(process.cwd(), name)
+ }
+ },
+ {
+ type: (_, { projectFolder }) =>
+ !existsSync(projectFolder) || readdirSync(projectFolder).length === 0 ? null : 'confirm',
+ name: 'overwrite',
+ message: () =>
+ (scope.projectFolderName === '.'
+ ? 'Current directory'
+ : `Target directory "${scope.projectFolderName}"`) +
+ ` is not empty. Remove existing files and continue?`
+ },
+ {
+ type: (_, { overwrite } = {}) => {
+ if (overwrite === false) {
+ utils.logger.fatal('Scaffolding cancelled')
+ }
+ return null
+ },
+ name: 'overwriteConfirmation'
+ }
+ ])
+
+ const projectScript = require(`./templates/${scope.projectType}`)
+ await projectScript({ scope, utils })
+
+ utils.sortPackageJson(scope.projectFolder)
+
+ console.log()
+ utils.logger.success('The project has been scaffolded')
+ console.log()
+
+ if (scope.skipDepsInstall !== true) {
+ await utils.prompts(scope, [
+ {
+ type: 'select',
+ name: 'packageManager',
+ message:
+ 'Install project dependencies? (recommended)',
+ choices: () => (
+ utils.runningPackageManager
+ ? [
+ { title: `Yes, use ${utils.runningPackageManager}`, value: utils.runningPackageManager },
+ { title: 'No, I will handle that myself', value: false }
+ ]
+ : [
+ { title: 'Yes, use Yarn (recommended)', value: 'yarn' },
+ { title: 'Yes, use NPM', value: 'npm' },
+ { title: 'No, I will handle that myself', value: false }
+ ]
+ )
+ }
+ ], {
+ onCancel: () => {
+ scope.packageManager = false
+ utils.printFinalMessage(scope)
+ process.exit(0)
+ }
+ })
+
+ if (scope.packageManager !== false) {
+ try {
+ await utils.installDeps(scope)
+ }
+ catch {
+ utils.logger.warn('Could not auto install dependencies. Probably a temporary npm registry issue?')
+ scope.packageManager = false
+ utils.printFinalMessage(scope)
+ process.exit(0)
+ }
+
+ if (scope.lint) {
+ try {
+ await utils.lintFolder(scope)
+ }
+ catch {
+ utils.logger.warn('Could not auto lint fix the project folder.')
+ }
+ }
+ }
+ }
+
+ utils.printFinalMessage(scope)
+}
+
+run()
diff --git a/create/app-extension/package.json b/create-project/package.json
similarity index 82%
rename from create/app-extension/package.json
rename to create-project/package.json
index 1eb2b774dcf..c8f095bb58c 100644
--- a/create/app-extension/package.json
+++ b/create-project/package.json
@@ -1,7 +1,7 @@
{
- "name": "@quasar/app-extension",
+ "name": "@quasar/project",
"version": "1.0.0",
- "description": "Scaffolds Quasar App Extension (AE) for Quasar CLI consumption",
+ "description": "Scaffolds Quasar Apps, AppExtensions or UI kits",
"author": {
"name": "Razvan Stoenescu",
"email": "[email protected]",
@@ -10,7 +10,8 @@
"license": "MIT",
"main": "index.js",
"bin": {
- "create-quasar-ae": "index.js"
+ "create-quasar-project": "index.js",
+ "cqp": "index.js"
},
"repository": {
"type": "git",
diff --git a/create/app-extension/templates/ae-v1/BASE/README.md b/create-project/templates/app-extension/ae-v1/BASE/README.md
similarity index 100%
rename from create/app-extension/templates/ae-v1/BASE/README.md
rename to create-project/templates/app-extension/ae-v1/BASE/README.md
diff --git a/create/app-extension/templates/ae-v1/BASE/_gitignore b/create-project/templates/app-extension/ae-v1/BASE/_gitignore
similarity index 100%
rename from create/app-extension/templates/ae-v1/BASE/_gitignore
rename to create-project/templates/app-extension/ae-v1/BASE/_gitignore
diff --git a/create/app-extension/templates/ae-v1/BASE/package.json b/create-project/templates/app-extension/ae-v1/BASE/package.json
similarity index 100%
rename from create/app-extension/templates/ae-v1/BASE/package.json
rename to create-project/templates/app-extension/ae-v1/BASE/package.json
diff --git a/create/app-extension/templates/ae-v1/BASE/src/index.js b/create-project/templates/app-extension/ae-v1/BASE/src/index.js
similarity index 100%
rename from create/app-extension/templates/ae-v1/BASE/src/index.js
rename to create-project/templates/app-extension/ae-v1/BASE/src/index.js
diff --git a/create/app-extension/templates/ae-v1/BASE/src/templates/_gitkeep b/create-project/templates/app-extension/ae-v1/BASE/src/templates/_gitkeep
similarity index 100%
rename from create/app-extension/templates/ae-v1/BASE/src/templates/_gitkeep
rename to create-project/templates/app-extension/ae-v1/BASE/src/templates/_gitkeep
diff --git a/create-project/templates/app-extension/ae-v1/index.js b/create-project/templates/app-extension/ae-v1/index.js
new file mode 100644
index 00000000000..36420c97b77
--- /dev/null
+++ b/create-project/templates/app-extension/ae-v1/index.js
@@ -0,0 +1,85 @@
+
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
+ {
+ type: 'confirm',
+ name: 'needOrgName',
+ initial: false,
+ message: 'Will you use an organization to publish it? Eg. "@my-org/..."'
+ },
+ {
+ type: (_, { needOrgName } = {}) => needOrgName ? 'text' : null,
+ name: 'orgName',
+ message: 'Organization name, eg. "my-org":',
+ validate: val =>
+ val && val.length > 0 || 'Please type the organization name'
+ },
+ {
+ type: 'text',
+ name: 'name',
+ message: 'Quasar App Extension ext-id (without "quasar-app-extension" prefix), eg. "my-ext"',
+ validate: (val) =>
+ utils.isValidPackageName(val) || 'Invalid App Extension name'
+ },
+
+ utils.commonPrompts.description,
+ utils.commonPrompts.author,
+ {
+ type: 'text',
+ name: 'license',
+ initial: 'MIT',
+ message: 'License type:'
+ },
+ {
+ type: 'multiselect',
+ name: 'preset',
+ message: 'Pick the needed scripts:',
+ choices: [
+ {
+ title: 'Prompts script',
+ value: 'prompts'
+ },
+ {
+ title: 'Install script',
+ value: 'install'
+ },
+ {
+ title: 'Uninstall script',
+ value: 'uninstall'
+ }
+ ],
+ format: utils.convertArrayToObject
+ },
+ {
+ type: 'text',
+ name: 'repositoryType',
+ initial: 'git',
+ message: 'Repository type:'
+ },
+ {
+ type: 'text',
+ name: 'repositoryURL',
+ message: 'Repository URL (eg https://github.com/quasarframework/quasar):'
+ },
+ {
+ type: 'text',
+ name: 'homepage',
+ message: 'Homepage URL:'
+ },
+ {
+ type: 'text',
+ name: 'bugs',
+ message: 'Issue reporting URL (eg https://github.com/quasarframework/quasar/issues):'
+ }
+ ])
+
+ utils.createTargetDir(scope)
+ utils.renderTemplate(utils.join(__dirname, 'BASE'), scope)
+
+ if (scope.preset.prompts) utils.renderTemplate(utils.join(__dirname, 'prompts-script'), scope)
+ if (scope.preset.install) utils.renderTemplate(utils.join(__dirname, 'install-script'), scope)
+ if (scope.preset.uninstall) utils.renderTemplate(utils.join(__dirname, 'uninstall-script'), scope)
+
+ // nothing to install, so we'll skip it
+ scope.skipDepsInstall = true
+}
diff --git a/create/app-extension/templates/ae-v1/install-script/install.js b/create-project/templates/app-extension/ae-v1/install-script/install.js
similarity index 100%
rename from create/app-extension/templates/ae-v1/install-script/install.js
rename to create-project/templates/app-extension/ae-v1/install-script/install.js
diff --git a/create/app-extension/templates/ae-v1/prompts-script/prompts.js b/create-project/templates/app-extension/ae-v1/prompts-script/prompts.js
similarity index 100%
rename from create/app-extension/templates/ae-v1/prompts-script/prompts.js
rename to create-project/templates/app-extension/ae-v1/prompts-script/prompts.js
diff --git a/create/app-extension/templates/ae-v1/uninstall-script/uninstall.js b/create-project/templates/app-extension/ae-v1/uninstall-script/uninstall.js
similarity index 100%
rename from create/app-extension/templates/ae-v1/uninstall-script/uninstall.js
rename to create-project/templates/app-extension/ae-v1/uninstall-script/uninstall.js
diff --git a/create-project/templates/app-extension/index.js b/create-project/templates/app-extension/index.js
new file mode 100644
index 00000000000..99eb911d39e
--- /dev/null
+++ b/create-project/templates/app-extension/index.js
@@ -0,0 +1,4 @@
+module.exports = async function ({ scope, utils }) {
+ const script = require('./ae-v1')
+ await script({ scope, utils })
+}
diff --git a/create-project/templates/app/index.js b/create-project/templates/app/index.js
new file mode 100644
index 00000000000..7b641ba1992
--- /dev/null
+++ b/create-project/templates/app/index.js
@@ -0,0 +1,10 @@
+
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
+ utils.commonPrompts.quasarVersion,
+ utils.commonPrompts.scriptType
+ ])
+
+ const script = require(`./quasar-${scope.quasarVersion}`)
+ await script({ scope, utils })
+}
diff --git a/create-project/templates/app/quasar-v1/index.js b/create-project/templates/app/quasar-v1/index.js
new file mode 100644
index 00000000000..300898cb48c
--- /dev/null
+++ b/create-project/templates/app/quasar-v1/index.js
@@ -0,0 +1,19 @@
+
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
+ {
+ type: 'text',
+ name: 'name',
+ message: 'Package name:',
+ initial: () => utils.inferPackageName(scope.projectFolderName),
+ validate: (val) =>
+ utils.isValidPackageName(val) || 'Invalid package.json name'
+ },
+ utils.commonPrompts.productName,
+ utils.commonPrompts.description,
+ utils.commonPrompts.author
+ ])
+
+ const script = require(`./${scope.scriptType}`)
+ await script({ scope, utils })
+}
diff --git a/create/app/templates/quasar-v1/js/BASE/README.md b/create-project/templates/app/quasar-v1/js/BASE/README.md
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/README.md
rename to create-project/templates/app/quasar-v1/js/BASE/README.md
diff --git a/create/app/templates/quasar-v1/js/BASE/_editorconfig b/create-project/templates/app/quasar-v1/js/BASE/_editorconfig
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/_editorconfig
rename to create-project/templates/app/quasar-v1/js/BASE/_editorconfig
diff --git a/create/app/templates/quasar-v1/js/BASE/_gitignore b/create-project/templates/app/quasar-v1/js/BASE/_gitignore
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/_gitignore
rename to create-project/templates/app/quasar-v1/js/BASE/_gitignore
diff --git a/create/app/templates/quasar-v1/js/BASE/_postcssrc.js b/create-project/templates/app/quasar-v1/js/BASE/_postcssrc.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/_postcssrc.js
rename to create-project/templates/app/quasar-v1/js/BASE/_postcssrc.js
diff --git a/create/app/templates/quasar-v1/js/BASE/_vscode/extensions.json b/create-project/templates/app/quasar-v1/js/BASE/_vscode/extensions.json
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/_vscode/extensions.json
rename to create-project/templates/app/quasar-v1/js/BASE/_vscode/extensions.json
diff --git a/create/app/templates/quasar-v1/js/BASE/_vscode/settings.json b/create-project/templates/app/quasar-v1/js/BASE/_vscode/settings.json
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/_vscode/settings.json
rename to create-project/templates/app/quasar-v1/js/BASE/_vscode/settings.json
diff --git a/create/app/templates/quasar-v1/js/BASE/babel.config.js b/create-project/templates/app/quasar-v1/js/BASE/babel.config.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/babel.config.js
rename to create-project/templates/app/quasar-v1/js/BASE/babel.config.js
diff --git a/create/app/templates/quasar-v1/js/BASE/jsconfig.json b/create-project/templates/app/quasar-v1/js/BASE/jsconfig.json
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/jsconfig.json
rename to create-project/templates/app/quasar-v1/js/BASE/jsconfig.json
diff --git a/create/app/templates/quasar-v1/js/BASE/package.json b/create-project/templates/app/quasar-v1/js/BASE/package.json
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/package.json
rename to create-project/templates/app/quasar-v1/js/BASE/package.json
diff --git a/create/app/templates/quasar-v1/js/BASE/public/favicon.ico b/create-project/templates/app/quasar-v1/js/BASE/public/favicon.ico
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/public/favicon.ico
rename to create-project/templates/app/quasar-v1/js/BASE/public/favicon.ico
diff --git a/create/app/templates/quasar-v1/js/BASE/public/icons/favicon-128x128.png b/create-project/templates/app/quasar-v1/js/BASE/public/icons/favicon-128x128.png
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/public/icons/favicon-128x128.png
rename to create-project/templates/app/quasar-v1/js/BASE/public/icons/favicon-128x128.png
diff --git a/create/app/templates/quasar-v1/js/BASE/public/icons/favicon-16x16.png b/create-project/templates/app/quasar-v1/js/BASE/public/icons/favicon-16x16.png
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/public/icons/favicon-16x16.png
rename to create-project/templates/app/quasar-v1/js/BASE/public/icons/favicon-16x16.png
diff --git a/create/app/templates/quasar-v1/js/BASE/public/icons/favicon-32x32.png b/create-project/templates/app/quasar-v1/js/BASE/public/icons/favicon-32x32.png
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/public/icons/favicon-32x32.png
rename to create-project/templates/app/quasar-v1/js/BASE/public/icons/favicon-32x32.png
diff --git a/create/app/templates/quasar-v1/js/BASE/public/icons/favicon-96x96.png b/create-project/templates/app/quasar-v1/js/BASE/public/icons/favicon-96x96.png
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/public/icons/favicon-96x96.png
rename to create-project/templates/app/quasar-v1/js/BASE/public/icons/favicon-96x96.png
diff --git a/create/app/templates/quasar-v1/js/BASE/quasar.conf.js b/create-project/templates/app/quasar-v1/js/BASE/quasar.conf.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/quasar.conf.js
rename to create-project/templates/app/quasar-v1/js/BASE/quasar.conf.js
diff --git a/create/app/templates/quasar-v1/js/BASE/src/App.vue b/create-project/templates/app/quasar-v1/js/BASE/src/App.vue
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/App.vue
rename to create-project/templates/app/quasar-v1/js/BASE/src/App.vue
diff --git a/create/app/templates/quasar-v1/js/BASE/src/assets/quasar-logo-vertical.svg b/create-project/templates/app/quasar-v1/js/BASE/src/assets/quasar-logo-vertical.svg
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/assets/quasar-logo-vertical.svg
rename to create-project/templates/app/quasar-v1/js/BASE/src/assets/quasar-logo-vertical.svg
diff --git a/create/app/templates/quasar-v1/js/BASE/src/boot/_gitkeep b/create-project/templates/app/quasar-v1/js/BASE/src/boot/_gitkeep
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/boot/_gitkeep
rename to create-project/templates/app/quasar-v1/js/BASE/src/boot/_gitkeep
diff --git a/create/app/templates/quasar-v1/js/BASE/src/components/EssentialLink.vue b/create-project/templates/app/quasar-v1/js/BASE/src/components/EssentialLink.vue
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/components/EssentialLink.vue
rename to create-project/templates/app/quasar-v1/js/BASE/src/components/EssentialLink.vue
diff --git a/create/app/templates/quasar-v1/js/BASE/src/index.template.html b/create-project/templates/app/quasar-v1/js/BASE/src/index.template.html
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/index.template.html
rename to create-project/templates/app/quasar-v1/js/BASE/src/index.template.html
diff --git a/create/app/templates/quasar-v1/js/BASE/src/layouts/MainLayout.vue b/create-project/templates/app/quasar-v1/js/BASE/src/layouts/MainLayout.vue
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/layouts/MainLayout.vue
rename to create-project/templates/app/quasar-v1/js/BASE/src/layouts/MainLayout.vue
diff --git a/create/app/templates/quasar-v1/js/BASE/src/pages/Error404.vue b/create-project/templates/app/quasar-v1/js/BASE/src/pages/Error404.vue
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/pages/Error404.vue
rename to create-project/templates/app/quasar-v1/js/BASE/src/pages/Error404.vue
diff --git a/create/app/templates/quasar-v1/js/BASE/src/pages/Index.vue b/create-project/templates/app/quasar-v1/js/BASE/src/pages/Index.vue
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/pages/Index.vue
rename to create-project/templates/app/quasar-v1/js/BASE/src/pages/Index.vue
diff --git a/create/app/templates/quasar-v1/js/BASE/src/router/index.js b/create-project/templates/app/quasar-v1/js/BASE/src/router/index.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/router/index.js
rename to create-project/templates/app/quasar-v1/js/BASE/src/router/index.js
diff --git a/create/app/templates/quasar-v1/js/BASE/src/router/routes.js b/create-project/templates/app/quasar-v1/js/BASE/src/router/routes.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/BASE/src/router/routes.js
rename to create-project/templates/app/quasar-v1/js/BASE/src/router/routes.js
diff --git a/create/app/templates/quasar-v1/js/axios/src/boot/axios.js b/create-project/templates/app/quasar-v1/js/axios/src/boot/axios.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/axios/src/boot/axios.js
rename to create-project/templates/app/quasar-v1/js/axios/src/boot/axios.js
diff --git a/create/app/templates/quasar-v1/js/css/src/css/app.css b/create-project/templates/app/quasar-v1/js/css/src/css/app.css
similarity index 100%
rename from create/app/templates/quasar-v1/js/css/src/css/app.css
rename to create-project/templates/app/quasar-v1/js/css/src/css/app.css
diff --git a/create/app/templates/quasar-v1/js/i18n/src/boot/i18n.js b/create-project/templates/app/quasar-v1/js/i18n/src/boot/i18n.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/i18n/src/boot/i18n.js
rename to create-project/templates/app/quasar-v1/js/i18n/src/boot/i18n.js
diff --git a/create/app/templates/quasar-v1/js/i18n/src/i18n/en-US/index.js b/create-project/templates/app/quasar-v1/js/i18n/src/i18n/en-US/index.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/i18n/src/i18n/en-US/index.js
rename to create-project/templates/app/quasar-v1/js/i18n/src/i18n/en-US/index.js
diff --git a/create/app/templates/quasar-v1/js/i18n/src/i18n/index.js b/create-project/templates/app/quasar-v1/js/i18n/src/i18n/index.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/i18n/src/i18n/index.js
rename to create-project/templates/app/quasar-v1/js/i18n/src/i18n/index.js
diff --git a/create/app/templates/quasar-v1/js/index.js b/create-project/templates/app/quasar-v1/js/index.js
similarity index 83%
rename from create/app/templates/quasar-v1/js/index.js
rename to create-project/templates/app/quasar-v1/js/index.js
index 26d22a338e3..b62de64b919 100644
--- a/create/app/templates/quasar-v1/js/index.js
+++ b/create-project/templates/app/quasar-v1/js/index.js
@@ -1,10 +1,6 @@
-module.exports = async function ({
- scope,
- dir,
- utils
-}) {
- const answers = await utils.prompts([
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
{
type: 'select',
name: 'css',
@@ -58,14 +54,12 @@ module.exports = async function ({
}
])
- Object.assign(scope, answers)
+ utils.createTargetDir(scope)
+ utils.renderTemplate(utils.join(__dirname, 'BASE'), scope)
+ utils.renderTemplate(utils.join(__dirname, scope.css), scope)
- utils.createTargetDir(dir, scope)
- utils.renderTemplate(utils.join(__dirname, 'BASE'), dir, scope)
- utils.renderTemplate(utils.join(__dirname, scope.css), dir, scope)
-
- if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
- if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
- if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
- if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
+ if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), scope)
+ if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), scope)
+ if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), scope)
+ if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), scope)
}
diff --git a/create/app/templates/quasar-v1/js/lint/_eslintignore b/create-project/templates/app/quasar-v1/js/lint/_eslintignore
similarity index 100%
rename from create/app/templates/quasar-v1/js/lint/_eslintignore
rename to create-project/templates/app/quasar-v1/js/lint/_eslintignore
diff --git a/create/app/templates/quasar-v1/js/lint/_eslintrc.js b/create-project/templates/app/quasar-v1/js/lint/_eslintrc.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/lint/_eslintrc.js
rename to create-project/templates/app/quasar-v1/js/lint/_eslintrc.js
diff --git a/create/app/templates/quasar-v1/js/sass/src/css/app.sass b/create-project/templates/app/quasar-v1/js/sass/src/css/app.sass
similarity index 100%
rename from create/app/templates/quasar-v1/js/sass/src/css/app.sass
rename to create-project/templates/app/quasar-v1/js/sass/src/css/app.sass
diff --git a/create/app/templates/quasar-v1/js/sass/src/css/quasar.variables.sass b/create-project/templates/app/quasar-v1/js/sass/src/css/quasar.variables.sass
similarity index 100%
rename from create/app/templates/quasar-v1/js/sass/src/css/quasar.variables.sass
rename to create-project/templates/app/quasar-v1/js/sass/src/css/quasar.variables.sass
diff --git a/create/app/templates/quasar-v1/js/scss/src/css/app.scss b/create-project/templates/app/quasar-v1/js/scss/src/css/app.scss
similarity index 100%
rename from create/app/templates/quasar-v1/js/scss/src/css/app.scss
rename to create-project/templates/app/quasar-v1/js/scss/src/css/app.scss
diff --git a/create/app/templates/quasar-v1/js/scss/src/css/quasar.variables.scss b/create-project/templates/app/quasar-v1/js/scss/src/css/quasar.variables.scss
similarity index 100%
rename from create/app/templates/quasar-v1/js/scss/src/css/quasar.variables.scss
rename to create-project/templates/app/quasar-v1/js/scss/src/css/quasar.variables.scss
diff --git a/create/app/templates/quasar-v1/js/styl/_stylintrc b/create-project/templates/app/quasar-v1/js/styl/_stylintrc
similarity index 100%
rename from create/app/templates/quasar-v1/js/styl/_stylintrc
rename to create-project/templates/app/quasar-v1/js/styl/_stylintrc
diff --git a/create/app/templates/quasar-v1/js/styl/src/css/app.styl b/create-project/templates/app/quasar-v1/js/styl/src/css/app.styl
similarity index 100%
rename from create/app/templates/quasar-v1/js/styl/src/css/app.styl
rename to create-project/templates/app/quasar-v1/js/styl/src/css/app.styl
diff --git a/create/app/templates/quasar-v1/js/styl/src/css/quasar.variables.styl b/create-project/templates/app/quasar-v1/js/styl/src/css/quasar.variables.styl
similarity index 100%
rename from create/app/templates/quasar-v1/js/styl/src/css/quasar.variables.styl
rename to create-project/templates/app/quasar-v1/js/styl/src/css/quasar.variables.styl
diff --git a/create/app/templates/quasar-v1/js/vuex/src/store/index.js b/create-project/templates/app/quasar-v1/js/vuex/src/store/index.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/vuex/src/store/index.js
rename to create-project/templates/app/quasar-v1/js/vuex/src/store/index.js
diff --git a/create/app/templates/quasar-v1/js/vuex/src/store/module-example/actions.js b/create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/actions.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/vuex/src/store/module-example/actions.js
rename to create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/actions.js
diff --git a/create/app/templates/quasar-v1/js/vuex/src/store/module-example/getters.js b/create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/getters.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/vuex/src/store/module-example/getters.js
rename to create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/getters.js
diff --git a/create/app/templates/quasar-v1/js/vuex/src/store/module-example/index.js b/create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/index.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/vuex/src/store/module-example/index.js
rename to create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/index.js
diff --git a/create/app/templates/quasar-v1/js/vuex/src/store/module-example/mutations.js b/create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/mutations.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/vuex/src/store/module-example/mutations.js
rename to create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/mutations.js
diff --git a/create/app/templates/quasar-v1/js/vuex/src/store/module-example/state.js b/create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/state.js
similarity index 100%
rename from create/app/templates/quasar-v1/js/vuex/src/store/module-example/state.js
rename to create-project/templates/app/quasar-v1/js/vuex/src/store/module-example/state.js
diff --git a/create/app/templates/quasar-v1/ts/BASE/README.md b/create-project/templates/app/quasar-v1/ts/BASE/README.md
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/README.md
rename to create-project/templates/app/quasar-v1/ts/BASE/README.md
diff --git a/create/app/templates/quasar-v1/ts/BASE/_editorconfig b/create-project/templates/app/quasar-v1/ts/BASE/_editorconfig
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/_editorconfig
rename to create-project/templates/app/quasar-v1/ts/BASE/_editorconfig
diff --git a/create/app/templates/quasar-v1/ts/BASE/_gitignore b/create-project/templates/app/quasar-v1/ts/BASE/_gitignore
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/_gitignore
rename to create-project/templates/app/quasar-v1/ts/BASE/_gitignore
diff --git a/create/app/templates/quasar-v1/ts/BASE/_postcssrc.js b/create-project/templates/app/quasar-v1/ts/BASE/_postcssrc.js
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/_postcssrc.js
rename to create-project/templates/app/quasar-v1/ts/BASE/_postcssrc.js
diff --git a/create/app/templates/quasar-v1/ts/BASE/_vscode/extensions.json b/create-project/templates/app/quasar-v1/ts/BASE/_vscode/extensions.json
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/_vscode/extensions.json
rename to create-project/templates/app/quasar-v1/ts/BASE/_vscode/extensions.json
diff --git a/create/app/templates/quasar-v1/ts/BASE/_vscode/settings.json b/create-project/templates/app/quasar-v1/ts/BASE/_vscode/settings.json
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/_vscode/settings.json
rename to create-project/templates/app/quasar-v1/ts/BASE/_vscode/settings.json
diff --git a/create/app/templates/quasar-v1/ts/BASE/babel.config.js b/create-project/templates/app/quasar-v1/ts/BASE/babel.config.js
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/babel.config.js
rename to create-project/templates/app/quasar-v1/ts/BASE/babel.config.js
diff --git a/create/app/templates/quasar-v1/ts/BASE/package.json b/create-project/templates/app/quasar-v1/ts/BASE/package.json
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/package.json
rename to create-project/templates/app/quasar-v1/ts/BASE/package.json
diff --git a/create/app/templates/quasar-v1/ts/BASE/public/favicon.ico b/create-project/templates/app/quasar-v1/ts/BASE/public/favicon.ico
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/public/favicon.ico
rename to create-project/templates/app/quasar-v1/ts/BASE/public/favicon.ico
diff --git a/create/app/templates/quasar-v1/ts/BASE/public/icons/favicon-128x128.png b/create-project/templates/app/quasar-v1/ts/BASE/public/icons/favicon-128x128.png
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/public/icons/favicon-128x128.png
rename to create-project/templates/app/quasar-v1/ts/BASE/public/icons/favicon-128x128.png
diff --git a/create/app/templates/quasar-v1/ts/BASE/public/icons/favicon-16x16.png b/create-project/templates/app/quasar-v1/ts/BASE/public/icons/favicon-16x16.png
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/public/icons/favicon-16x16.png
rename to create-project/templates/app/quasar-v1/ts/BASE/public/icons/favicon-16x16.png
diff --git a/create/app/templates/quasar-v1/ts/BASE/public/icons/favicon-32x32.png b/create-project/templates/app/quasar-v1/ts/BASE/public/icons/favicon-32x32.png
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/public/icons/favicon-32x32.png
rename to create-project/templates/app/quasar-v1/ts/BASE/public/icons/favicon-32x32.png
diff --git a/create/app/templates/quasar-v1/ts/BASE/public/icons/favicon-96x96.png b/create-project/templates/app/quasar-v1/ts/BASE/public/icons/favicon-96x96.png
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/public/icons/favicon-96x96.png
rename to create-project/templates/app/quasar-v1/ts/BASE/public/icons/favicon-96x96.png
diff --git a/create/app/templates/quasar-v1/ts/BASE/quasar.conf.js b/create-project/templates/app/quasar-v1/ts/BASE/quasar.conf.js
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/quasar.conf.js
rename to create-project/templates/app/quasar-v1/ts/BASE/quasar.conf.js
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/App.vue b/create-project/templates/app/quasar-v1/ts/BASE/src/App.vue
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/App.vue
rename to create-project/templates/app/quasar-v1/ts/BASE/src/App.vue
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/assets/quasar-logo-vertical.svg b/create-project/templates/app/quasar-v1/ts/BASE/src/assets/quasar-logo-vertical.svg
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/assets/quasar-logo-vertical.svg
rename to create-project/templates/app/quasar-v1/ts/BASE/src/assets/quasar-logo-vertical.svg
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/boot/_gitkeep b/create-project/templates/app/quasar-v1/ts/BASE/src/boot/_gitkeep
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/boot/_gitkeep
rename to create-project/templates/app/quasar-v1/ts/BASE/src/boot/_gitkeep
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/components/EssentialLink.vue b/create-project/templates/app/quasar-v1/ts/BASE/src/components/EssentialLink.vue
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/components/EssentialLink.vue
rename to create-project/templates/app/quasar-v1/ts/BASE/src/components/EssentialLink.vue
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/components/ExampleComponent.vue b/create-project/templates/app/quasar-v1/ts/BASE/src/components/ExampleComponent.vue
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/components/ExampleComponent.vue
rename to create-project/templates/app/quasar-v1/ts/BASE/src/components/ExampleComponent.vue
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/components/models.ts b/create-project/templates/app/quasar-v1/ts/BASE/src/components/models.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/components/models.ts
rename to create-project/templates/app/quasar-v1/ts/BASE/src/components/models.ts
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/env.d.ts b/create-project/templates/app/quasar-v1/ts/BASE/src/env.d.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/env.d.ts
rename to create-project/templates/app/quasar-v1/ts/BASE/src/env.d.ts
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/index.template.html b/create-project/templates/app/quasar-v1/ts/BASE/src/index.template.html
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/index.template.html
rename to create-project/templates/app/quasar-v1/ts/BASE/src/index.template.html
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/layouts/MainLayout.vue b/create-project/templates/app/quasar-v1/ts/BASE/src/layouts/MainLayout.vue
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/layouts/MainLayout.vue
rename to create-project/templates/app/quasar-v1/ts/BASE/src/layouts/MainLayout.vue
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/pages/Error404.vue b/create-project/templates/app/quasar-v1/ts/BASE/src/pages/Error404.vue
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/pages/Error404.vue
rename to create-project/templates/app/quasar-v1/ts/BASE/src/pages/Error404.vue
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/pages/Index.vue b/create-project/templates/app/quasar-v1/ts/BASE/src/pages/Index.vue
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/pages/Index.vue
rename to create-project/templates/app/quasar-v1/ts/BASE/src/pages/Index.vue
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/router/index.ts b/create-project/templates/app/quasar-v1/ts/BASE/src/router/index.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/router/index.ts
rename to create-project/templates/app/quasar-v1/ts/BASE/src/router/index.ts
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/router/routes.ts b/create-project/templates/app/quasar-v1/ts/BASE/src/router/routes.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/router/routes.ts
rename to create-project/templates/app/quasar-v1/ts/BASE/src/router/routes.ts
diff --git a/create/app/templates/quasar-v1/ts/BASE/src/shims-vue.d.ts b/create-project/templates/app/quasar-v1/ts/BASE/src/shims-vue.d.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/src/shims-vue.d.ts
rename to create-project/templates/app/quasar-v1/ts/BASE/src/shims-vue.d.ts
diff --git a/create/app/templates/quasar-v1/ts/BASE/tsconfig.json b/create-project/templates/app/quasar-v1/ts/BASE/tsconfig.json
similarity index 100%
rename from create/app/templates/quasar-v1/ts/BASE/tsconfig.json
rename to create-project/templates/app/quasar-v1/ts/BASE/tsconfig.json
diff --git a/create/app/templates/quasar-v1/ts/axios/src/boot/axios.ts b/create-project/templates/app/quasar-v1/ts/axios/src/boot/axios.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/axios/src/boot/axios.ts
rename to create-project/templates/app/quasar-v1/ts/axios/src/boot/axios.ts
diff --git a/create/app/templates/quasar-v1/ts/composition/src/boot/composition-api.ts b/create-project/templates/app/quasar-v1/ts/composition/src/boot/composition-api.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/composition/src/boot/composition-api.ts
rename to create-project/templates/app/quasar-v1/ts/composition/src/boot/composition-api.ts
diff --git a/create/app/templates/quasar-v1/ts/css/src/css/app.css b/create-project/templates/app/quasar-v1/ts/css/src/css/app.css
similarity index 100%
rename from create/app/templates/quasar-v1/ts/css/src/css/app.css
rename to create-project/templates/app/quasar-v1/ts/css/src/css/app.css
diff --git a/create/app/templates/quasar-v1/ts/i18n/src/boot/i18n.ts b/create-project/templates/app/quasar-v1/ts/i18n/src/boot/i18n.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/i18n/src/boot/i18n.ts
rename to create-project/templates/app/quasar-v1/ts/i18n/src/boot/i18n.ts
diff --git a/create/app/templates/quasar-v1/ts/i18n/src/i18n/en-US/index.ts b/create-project/templates/app/quasar-v1/ts/i18n/src/i18n/en-US/index.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/i18n/src/i18n/en-US/index.ts
rename to create-project/templates/app/quasar-v1/ts/i18n/src/i18n/en-US/index.ts
diff --git a/create/app/templates/quasar-v1/ts/i18n/src/i18n/index.ts b/create-project/templates/app/quasar-v1/ts/i18n/src/i18n/index.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/i18n/src/i18n/index.ts
rename to create-project/templates/app/quasar-v1/ts/i18n/src/i18n/index.ts
diff --git a/create/app/templates/quasar-v1/ts/index.js b/create-project/templates/app/quasar-v1/ts/index.js
similarity index 85%
rename from create/app/templates/quasar-v1/ts/index.js
rename to create-project/templates/app/quasar-v1/ts/index.js
index 8182b7c98d1..282f5ed1254 100644
--- a/create/app/templates/quasar-v1/ts/index.js
+++ b/create-project/templates/app/quasar-v1/ts/index.js
@@ -1,10 +1,6 @@
-module.exports = async function ({
- scope,
- dir,
- utils
-}) {
- const answers = await utils.prompts([
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
{
type: 'select',
name: 'typescriptConfig',
@@ -69,15 +65,13 @@ module.exports = async function ({
}
])
- Object.assign(scope, answers)
+ utils.createTargetDir(scope)
+ utils.renderTemplate(utils.join(__dirname, 'BASE'), scope)
+ utils.renderTemplate(utils.join(__dirname, scope.css), scope)
- utils.createTargetDir(dir, scope)
- utils.renderTemplate(utils.join(__dirname, 'BASE'), dir, scope)
- utils.renderTemplate(utils.join(__dirname, scope.css), dir, scope)
-
- if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
- if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
- if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
- if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
- if (scope.typescriptConfig === 'composition') utils.renderTemplate(utils.join(__dirname, 'composition'), dir, scope)
+ if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), scope)
+ if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), scope)
+ if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), scope)
+ if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), scope)
+ if (scope.typescriptConfig === 'composition') utils.renderTemplate(utils.join(__dirname, 'composition'), scope)
}
diff --git a/create/app/templates/quasar-v1/ts/lint/_eslintignore b/create-project/templates/app/quasar-v1/ts/lint/_eslintignore
similarity index 100%
rename from create/app/templates/quasar-v1/ts/lint/_eslintignore
rename to create-project/templates/app/quasar-v1/ts/lint/_eslintignore
diff --git a/create/app/templates/quasar-v1/ts/lint/_eslintrc.js b/create-project/templates/app/quasar-v1/ts/lint/_eslintrc.js
similarity index 100%
rename from create/app/templates/quasar-v1/ts/lint/_eslintrc.js
rename to create-project/templates/app/quasar-v1/ts/lint/_eslintrc.js
diff --git a/create/app/templates/quasar-v1/ts/sass/src/css/app.sass b/create-project/templates/app/quasar-v1/ts/sass/src/css/app.sass
similarity index 100%
rename from create/app/templates/quasar-v1/ts/sass/src/css/app.sass
rename to create-project/templates/app/quasar-v1/ts/sass/src/css/app.sass
diff --git a/create/app/templates/quasar-v1/ts/sass/src/css/quasar.variables.sass b/create-project/templates/app/quasar-v1/ts/sass/src/css/quasar.variables.sass
similarity index 100%
rename from create/app/templates/quasar-v1/ts/sass/src/css/quasar.variables.sass
rename to create-project/templates/app/quasar-v1/ts/sass/src/css/quasar.variables.sass
diff --git a/create/app/templates/quasar-v1/ts/scss/src/css/app.scss b/create-project/templates/app/quasar-v1/ts/scss/src/css/app.scss
similarity index 100%
rename from create/app/templates/quasar-v1/ts/scss/src/css/app.scss
rename to create-project/templates/app/quasar-v1/ts/scss/src/css/app.scss
diff --git a/create/app/templates/quasar-v1/ts/scss/src/css/quasar.variables.scss b/create-project/templates/app/quasar-v1/ts/scss/src/css/quasar.variables.scss
similarity index 100%
rename from create/app/templates/quasar-v1/ts/scss/src/css/quasar.variables.scss
rename to create-project/templates/app/quasar-v1/ts/scss/src/css/quasar.variables.scss
diff --git a/create/app/templates/quasar-v1/ts/styl/_stylintrc b/create-project/templates/app/quasar-v1/ts/styl/_stylintrc
similarity index 100%
rename from create/app/templates/quasar-v1/ts/styl/_stylintrc
rename to create-project/templates/app/quasar-v1/ts/styl/_stylintrc
diff --git a/create/app/templates/quasar-v1/ts/styl/src/css/app.styl b/create-project/templates/app/quasar-v1/ts/styl/src/css/app.styl
similarity index 100%
rename from create/app/templates/quasar-v1/ts/styl/src/css/app.styl
rename to create-project/templates/app/quasar-v1/ts/styl/src/css/app.styl
diff --git a/create/app/templates/quasar-v1/ts/styl/src/css/quasar.variables.styl b/create-project/templates/app/quasar-v1/ts/styl/src/css/quasar.variables.styl
similarity index 100%
rename from create/app/templates/quasar-v1/ts/styl/src/css/quasar.variables.styl
rename to create-project/templates/app/quasar-v1/ts/styl/src/css/quasar.variables.styl
diff --git a/create/app/templates/quasar-v1/ts/vuex/src/store/index.ts b/create-project/templates/app/quasar-v1/ts/vuex/src/store/index.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/vuex/src/store/index.ts
rename to create-project/templates/app/quasar-v1/ts/vuex/src/store/index.ts
diff --git a/create/app/templates/quasar-v1/ts/vuex/src/store/module-example/actions.ts b/create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/actions.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/vuex/src/store/module-example/actions.ts
rename to create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/actions.ts
diff --git a/create/app/templates/quasar-v1/ts/vuex/src/store/module-example/getters.ts b/create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/getters.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/vuex/src/store/module-example/getters.ts
rename to create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/getters.ts
diff --git a/create/app/templates/quasar-v1/ts/vuex/src/store/module-example/index.ts b/create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/index.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/vuex/src/store/module-example/index.ts
rename to create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/index.ts
diff --git a/create/app/templates/quasar-v1/ts/vuex/src/store/module-example/mutations.ts b/create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/mutations.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/vuex/src/store/module-example/mutations.ts
rename to create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/mutations.ts
diff --git a/create/app/templates/quasar-v1/ts/vuex/src/store/module-example/state.ts b/create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/state.ts
similarity index 100%
rename from create/app/templates/quasar-v1/ts/vuex/src/store/module-example/state.ts
rename to create-project/templates/app/quasar-v1/ts/vuex/src/store/module-example/state.ts
diff --git a/create-project/templates/app/quasar-v2/index.js b/create-project/templates/app/quasar-v2/index.js
new file mode 100644
index 00000000000..ca725b13c5a
--- /dev/null
+++ b/create-project/templates/app/quasar-v2/index.js
@@ -0,0 +1,30 @@
+
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
+ {
+ type: 'select',
+ name: 'engine',
+ message: 'Pick Quasar App CLI variant:',
+ initial: 0,
+ choices: [
+ { title: 'Quasar App CLI with Webpack (stable)', value: 'webpack' },
+ { title: 'Quasar App CLI with Vite (beta stage)', value: 'vite' }
+ ]
+ },
+ {
+ type: 'text',
+ name: 'name',
+ message: 'Package name:',
+ initial: () => utils.inferPackageName(scope.projectFolderName),
+ validate: (val) =>
+ utils.isValidPackageName(val) || 'Invalid package.json name'
+ },
+
+ utils.commonPrompts.productName,
+ utils.commonPrompts.description,
+ utils.commonPrompts.author
+ ])
+
+ const script = require(`./${scope.scriptType}-${scope.engine}`)
+ await script({ scope, utils })
+}
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/README.md b/create-project/templates/app/quasar-v2/js-vite/BASE/README.md
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/README.md
rename to create-project/templates/app/quasar-v2/js-vite/BASE/README.md
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/_editorconfig b/create-project/templates/app/quasar-v2/js-vite/BASE/_editorconfig
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/_editorconfig
rename to create-project/templates/app/quasar-v2/js-vite/BASE/_editorconfig
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/_gitignore b/create-project/templates/app/quasar-v2/js-vite/BASE/_gitignore
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/_gitignore
rename to create-project/templates/app/quasar-v2/js-vite/BASE/_gitignore
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/_vscode/extensions.json b/create-project/templates/app/quasar-v2/js-vite/BASE/_vscode/extensions.json
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/_vscode/extensions.json
rename to create-project/templates/app/quasar-v2/js-vite/BASE/_vscode/extensions.json
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/_vscode/settings.json b/create-project/templates/app/quasar-v2/js-vite/BASE/_vscode/settings.json
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/_vscode/settings.json
rename to create-project/templates/app/quasar-v2/js-vite/BASE/_vscode/settings.json
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/index.html b/create-project/templates/app/quasar-v2/js-vite/BASE/index.html
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/index.html
rename to create-project/templates/app/quasar-v2/js-vite/BASE/index.html
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/jsconfig.json b/create-project/templates/app/quasar-v2/js-vite/BASE/jsconfig.json
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/jsconfig.json
rename to create-project/templates/app/quasar-v2/js-vite/BASE/jsconfig.json
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/package.json b/create-project/templates/app/quasar-v2/js-vite/BASE/package.json
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/package.json
rename to create-project/templates/app/quasar-v2/js-vite/BASE/package.json
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/postcss.config.js b/create-project/templates/app/quasar-v2/js-vite/BASE/postcss.config.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/postcss.config.js
rename to create-project/templates/app/quasar-v2/js-vite/BASE/postcss.config.js
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/public/favicon.ico b/create-project/templates/app/quasar-v2/js-vite/BASE/public/favicon.ico
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/public/favicon.ico
rename to create-project/templates/app/quasar-v2/js-vite/BASE/public/favicon.ico
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/public/icons/favicon-128x128.png b/create-project/templates/app/quasar-v2/js-vite/BASE/public/icons/favicon-128x128.png
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/public/icons/favicon-128x128.png
rename to create-project/templates/app/quasar-v2/js-vite/BASE/public/icons/favicon-128x128.png
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/public/icons/favicon-16x16.png b/create-project/templates/app/quasar-v2/js-vite/BASE/public/icons/favicon-16x16.png
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/public/icons/favicon-16x16.png
rename to create-project/templates/app/quasar-v2/js-vite/BASE/public/icons/favicon-16x16.png
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/public/icons/favicon-32x32.png b/create-project/templates/app/quasar-v2/js-vite/BASE/public/icons/favicon-32x32.png
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/public/icons/favicon-32x32.png
rename to create-project/templates/app/quasar-v2/js-vite/BASE/public/icons/favicon-32x32.png
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/public/icons/favicon-96x96.png b/create-project/templates/app/quasar-v2/js-vite/BASE/public/icons/favicon-96x96.png
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/public/icons/favicon-96x96.png
rename to create-project/templates/app/quasar-v2/js-vite/BASE/public/icons/favicon-96x96.png
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/quasar.config.js b/create-project/templates/app/quasar-v2/js-vite/BASE/quasar.config.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/quasar.config.js
rename to create-project/templates/app/quasar-v2/js-vite/BASE/quasar.config.js
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/src/App.vue b/create-project/templates/app/quasar-v2/js-vite/BASE/src/App.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/src/App.vue
rename to create-project/templates/app/quasar-v2/js-vite/BASE/src/App.vue
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/src/assets/quasar-logo-vertical.svg b/create-project/templates/app/quasar-v2/js-vite/BASE/src/assets/quasar-logo-vertical.svg
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/src/assets/quasar-logo-vertical.svg
rename to create-project/templates/app/quasar-v2/js-vite/BASE/src/assets/quasar-logo-vertical.svg
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/src/boot/_gitkeep b/create-project/templates/app/quasar-v2/js-vite/BASE/src/boot/_gitkeep
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/src/boot/_gitkeep
rename to create-project/templates/app/quasar-v2/js-vite/BASE/src/boot/_gitkeep
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/src/components/EssentialLink.vue b/create-project/templates/app/quasar-v2/js-vite/BASE/src/components/EssentialLink.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/src/components/EssentialLink.vue
rename to create-project/templates/app/quasar-v2/js-vite/BASE/src/components/EssentialLink.vue
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/src/layouts/MainLayout.vue b/create-project/templates/app/quasar-v2/js-vite/BASE/src/layouts/MainLayout.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/src/layouts/MainLayout.vue
rename to create-project/templates/app/quasar-v2/js-vite/BASE/src/layouts/MainLayout.vue
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/src/pages/Error404.vue b/create-project/templates/app/quasar-v2/js-vite/BASE/src/pages/Error404.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/src/pages/Error404.vue
rename to create-project/templates/app/quasar-v2/js-vite/BASE/src/pages/Error404.vue
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/src/pages/Index.vue b/create-project/templates/app/quasar-v2/js-vite/BASE/src/pages/Index.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/src/pages/Index.vue
rename to create-project/templates/app/quasar-v2/js-vite/BASE/src/pages/Index.vue
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/src/router/index.js b/create-project/templates/app/quasar-v2/js-vite/BASE/src/router/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/src/router/index.js
rename to create-project/templates/app/quasar-v2/js-vite/BASE/src/router/index.js
diff --git a/create/app/templates/quasar-v2/js-vite/BASE/src/router/routes.js b/create-project/templates/app/quasar-v2/js-vite/BASE/src/router/routes.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/BASE/src/router/routes.js
rename to create-project/templates/app/quasar-v2/js-vite/BASE/src/router/routes.js
diff --git a/create/app/templates/quasar-v2/js-vite/axios/src/boot/axios.js b/create-project/templates/app/quasar-v2/js-vite/axios/src/boot/axios.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/axios/src/boot/axios.js
rename to create-project/templates/app/quasar-v2/js-vite/axios/src/boot/axios.js
diff --git a/create/app/templates/quasar-v2/js-vite/css/src/css/app.css b/create-project/templates/app/quasar-v2/js-vite/css/src/css/app.css
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/css/src/css/app.css
rename to create-project/templates/app/quasar-v2/js-vite/css/src/css/app.css
diff --git a/create/app/templates/quasar-v2/js-vite/i18n/src/boot/i18n.js b/create-project/templates/app/quasar-v2/js-vite/i18n/src/boot/i18n.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/i18n/src/boot/i18n.js
rename to create-project/templates/app/quasar-v2/js-vite/i18n/src/boot/i18n.js
diff --git a/create/app/templates/quasar-v2/js-vite/i18n/src/i18n/en-US/index.js b/create-project/templates/app/quasar-v2/js-vite/i18n/src/i18n/en-US/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/i18n/src/i18n/en-US/index.js
rename to create-project/templates/app/quasar-v2/js-vite/i18n/src/i18n/en-US/index.js
diff --git a/create/app/templates/quasar-v2/js-vite/i18n/src/i18n/index.js b/create-project/templates/app/quasar-v2/js-vite/i18n/src/i18n/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/i18n/src/i18n/index.js
rename to create-project/templates/app/quasar-v2/js-vite/i18n/src/i18n/index.js
diff --git a/create/app/templates/quasar-v2/js-webpack/index.js b/create-project/templates/app/quasar-v2/js-vite/index.js
similarity index 79%
rename from create/app/templates/quasar-v2/js-webpack/index.js
rename to create-project/templates/app/quasar-v2/js-vite/index.js
index 1b7304081b3..fa21e5a3975 100644
--- a/create/app/templates/quasar-v2/js-webpack/index.js
+++ b/create-project/templates/app/quasar-v2/js-vite/index.js
@@ -1,10 +1,6 @@
-module.exports = async function ({
- scope,
- dir,
- utils
-}) {
- const answers = await utils.prompts([
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
{
type: 'select',
name: 'css',
@@ -41,16 +37,14 @@ module.exports = async function ({
}
])
- Object.assign(scope, answers)
+ utils.createTargetDir(scope)
+ utils.renderTemplate(utils.join(__dirname, 'BASE'), scope)
+ utils.renderTemplate(utils.join(__dirname, scope.css), scope)
- utils.createTargetDir(dir, scope)
- utils.renderTemplate(utils.join(__dirname, 'BASE'), dir, scope)
- utils.renderTemplate(utils.join(__dirname, scope.css), dir, scope)
+ if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), scope)
+ if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), scope)
+ if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), scope)
- if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
- if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
- if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
-
- if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
- else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
+ if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), scope)
+ else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), scope)
}
diff --git a/create/app/templates/quasar-v2/js-vite/lint/_eslintignore b/create-project/templates/app/quasar-v2/js-vite/lint/_eslintignore
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/lint/_eslintignore
rename to create-project/templates/app/quasar-v2/js-vite/lint/_eslintignore
diff --git a/create/app/templates/quasar-v2/js-vite/lint/_eslintrc.js b/create-project/templates/app/quasar-v2/js-vite/lint/_eslintrc.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/lint/_eslintrc.js
rename to create-project/templates/app/quasar-v2/js-vite/lint/_eslintrc.js
diff --git a/create/app/templates/quasar-v2/js-vite/pinia/src/store/example/index.js b/create-project/templates/app/quasar-v2/js-vite/pinia/src/store/example/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/pinia/src/store/example/index.js
rename to create-project/templates/app/quasar-v2/js-vite/pinia/src/store/example/index.js
diff --git a/create/app/templates/quasar-v2/js-vite/pinia/src/store/index.js b/create-project/templates/app/quasar-v2/js-vite/pinia/src/store/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/pinia/src/store/index.js
rename to create-project/templates/app/quasar-v2/js-vite/pinia/src/store/index.js
diff --git a/create/app/templates/quasar-v2/js-vite/pinia/src/store/store-flag.d.ts b/create-project/templates/app/quasar-v2/js-vite/pinia/src/store/store-flag.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/pinia/src/store/store-flag.d.ts
rename to create-project/templates/app/quasar-v2/js-vite/pinia/src/store/store-flag.d.ts
diff --git a/create/app/templates/quasar-v2/js-vite/sass/src/css/app.sass b/create-project/templates/app/quasar-v2/js-vite/sass/src/css/app.sass
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/sass/src/css/app.sass
rename to create-project/templates/app/quasar-v2/js-vite/sass/src/css/app.sass
diff --git a/create/app/templates/quasar-v2/js-vite/sass/src/css/quasar.variables.sass b/create-project/templates/app/quasar-v2/js-vite/sass/src/css/quasar.variables.sass
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/sass/src/css/quasar.variables.sass
rename to create-project/templates/app/quasar-v2/js-vite/sass/src/css/quasar.variables.sass
diff --git a/create/app/templates/quasar-v2/js-vite/scss/src/css/app.scss b/create-project/templates/app/quasar-v2/js-vite/scss/src/css/app.scss
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/scss/src/css/app.scss
rename to create-project/templates/app/quasar-v2/js-vite/scss/src/css/app.scss
diff --git a/create/app/templates/quasar-v2/js-vite/scss/src/css/quasar.variables.scss b/create-project/templates/app/quasar-v2/js-vite/scss/src/css/quasar.variables.scss
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/scss/src/css/quasar.variables.scss
rename to create-project/templates/app/quasar-v2/js-vite/scss/src/css/quasar.variables.scss
diff --git a/create/app/templates/quasar-v2/js-vite/vuex/src/store/index.js b/create-project/templates/app/quasar-v2/js-vite/vuex/src/store/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/vuex/src/store/index.js
rename to create-project/templates/app/quasar-v2/js-vite/vuex/src/store/index.js
diff --git a/create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/actions.js b/create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/actions.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/actions.js
rename to create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/actions.js
diff --git a/create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/getters.js b/create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/getters.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/getters.js
rename to create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/getters.js
diff --git a/create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/index.js b/create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/index.js
rename to create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/index.js
diff --git a/create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/mutations.js b/create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/mutations.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/mutations.js
rename to create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/mutations.js
diff --git a/create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/state.js b/create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/state.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/vuex/src/store/module-example/state.js
rename to create-project/templates/app/quasar-v2/js-vite/vuex/src/store/module-example/state.js
diff --git a/create/app/templates/quasar-v2/js-vite/vuex/store-flag.d.ts b/create-project/templates/app/quasar-v2/js-vite/vuex/store-flag.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/js-vite/vuex/store-flag.d.ts
rename to create-project/templates/app/quasar-v2/js-vite/vuex/store-flag.d.ts
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/README.md b/create-project/templates/app/quasar-v2/js-webpack/BASE/README.md
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/README.md
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/README.md
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/_editorconfig b/create-project/templates/app/quasar-v2/js-webpack/BASE/_editorconfig
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/_editorconfig
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/_editorconfig
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/_gitignore b/create-project/templates/app/quasar-v2/js-webpack/BASE/_gitignore
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/_gitignore
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/_gitignore
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/_postcssrc.js b/create-project/templates/app/quasar-v2/js-webpack/BASE/_postcssrc.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/_postcssrc.js
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/_postcssrc.js
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/_vscode/extensions.json b/create-project/templates/app/quasar-v2/js-webpack/BASE/_vscode/extensions.json
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/_vscode/extensions.json
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/_vscode/extensions.json
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/_vscode/settings.json b/create-project/templates/app/quasar-v2/js-webpack/BASE/_vscode/settings.json
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/_vscode/settings.json
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/_vscode/settings.json
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/babel.config.js b/create-project/templates/app/quasar-v2/js-webpack/BASE/babel.config.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/babel.config.js
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/babel.config.js
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/jsconfig.json b/create-project/templates/app/quasar-v2/js-webpack/BASE/jsconfig.json
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/jsconfig.json
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/jsconfig.json
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/package.json b/create-project/templates/app/quasar-v2/js-webpack/BASE/package.json
similarity index 98%
rename from create/app/templates/quasar-v2/js-webpack/BASE/package.json
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/package.json
index de7b868b950..a1119796e08 100644
--- a/create/app/templates/quasar-v2/js-webpack/BASE/package.json
+++ b/create-project/templates/app/quasar-v2/js-webpack/BASE/package.json
@@ -26,6 +26,7 @@
"@babel/eslint-parser": "^7.13.14",
"eslint": "^8.10.0",
"eslint-plugin-vue": "^8.5.0",
+ "eslint-webpack-plugin": "^3.1.1",
<% if (lintConfig === 'standard') { %>
"eslint-config-standard": "^16.0.2",
"eslint-plugin-import": "^2.19.1",
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/public/favicon.ico b/create-project/templates/app/quasar-v2/js-webpack/BASE/public/favicon.ico
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/public/favicon.ico
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/public/favicon.ico
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/public/icons/favicon-128x128.png b/create-project/templates/app/quasar-v2/js-webpack/BASE/public/icons/favicon-128x128.png
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/public/icons/favicon-128x128.png
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/public/icons/favicon-128x128.png
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/public/icons/favicon-16x16.png b/create-project/templates/app/quasar-v2/js-webpack/BASE/public/icons/favicon-16x16.png
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/public/icons/favicon-16x16.png
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/public/icons/favicon-16x16.png
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/public/icons/favicon-32x32.png b/create-project/templates/app/quasar-v2/js-webpack/BASE/public/icons/favicon-32x32.png
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/public/icons/favicon-32x32.png
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/public/icons/favicon-32x32.png
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/public/icons/favicon-96x96.png b/create-project/templates/app/quasar-v2/js-webpack/BASE/public/icons/favicon-96x96.png
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/public/icons/favicon-96x96.png
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/public/icons/favicon-96x96.png
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/quasar.config.js b/create-project/templates/app/quasar-v2/js-webpack/BASE/quasar.config.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/quasar.config.js
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/quasar.config.js
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/App.vue b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/App.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/App.vue
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/App.vue
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/assets/quasar-logo-vertical.svg b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/assets/quasar-logo-vertical.svg
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/assets/quasar-logo-vertical.svg
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/assets/quasar-logo-vertical.svg
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/boot/_gitkeep b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/boot/_gitkeep
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/boot/_gitkeep
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/boot/_gitkeep
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/components/EssentialLink.vue b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/components/EssentialLink.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/components/EssentialLink.vue
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/components/EssentialLink.vue
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/index.template.html b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/index.template.html
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/index.template.html
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/index.template.html
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/layouts/MainLayout.vue b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/layouts/MainLayout.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/layouts/MainLayout.vue
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/layouts/MainLayout.vue
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/pages/Error404.vue b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/pages/Error404.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/pages/Error404.vue
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/pages/Error404.vue
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/pages/Index.vue b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/pages/Index.vue
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/pages/Index.vue
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/pages/Index.vue
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/router/index.js b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/router/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/router/index.js
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/router/index.js
diff --git a/create/app/templates/quasar-v2/js-webpack/BASE/src/router/routes.js b/create-project/templates/app/quasar-v2/js-webpack/BASE/src/router/routes.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/BASE/src/router/routes.js
rename to create-project/templates/app/quasar-v2/js-webpack/BASE/src/router/routes.js
diff --git a/create/app/templates/quasar-v2/js-webpack/axios/src/boot/axios.js b/create-project/templates/app/quasar-v2/js-webpack/axios/src/boot/axios.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/axios/src/boot/axios.js
rename to create-project/templates/app/quasar-v2/js-webpack/axios/src/boot/axios.js
diff --git a/create/app/templates/quasar-v2/js-webpack/css/src/css/app.css b/create-project/templates/app/quasar-v2/js-webpack/css/src/css/app.css
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/css/src/css/app.css
rename to create-project/templates/app/quasar-v2/js-webpack/css/src/css/app.css
diff --git a/create/app/templates/quasar-v2/js-webpack/i18n/src/boot/i18n.js b/create-project/templates/app/quasar-v2/js-webpack/i18n/src/boot/i18n.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/i18n/src/boot/i18n.js
rename to create-project/templates/app/quasar-v2/js-webpack/i18n/src/boot/i18n.js
diff --git a/create/app/templates/quasar-v2/js-webpack/i18n/src/i18n/en-US/index.js b/create-project/templates/app/quasar-v2/js-webpack/i18n/src/i18n/en-US/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/i18n/src/i18n/en-US/index.js
rename to create-project/templates/app/quasar-v2/js-webpack/i18n/src/i18n/en-US/index.js
diff --git a/create/app/templates/quasar-v2/js-webpack/i18n/src/i18n/index.js b/create-project/templates/app/quasar-v2/js-webpack/i18n/src/i18n/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/i18n/src/i18n/index.js
rename to create-project/templates/app/quasar-v2/js-webpack/i18n/src/i18n/index.js
diff --git a/create/app/templates/quasar-v2/js-vite/index.js b/create-project/templates/app/quasar-v2/js-webpack/index.js
similarity index 79%
rename from create/app/templates/quasar-v2/js-vite/index.js
rename to create-project/templates/app/quasar-v2/js-webpack/index.js
index 1b7304081b3..fa21e5a3975 100644
--- a/create/app/templates/quasar-v2/js-vite/index.js
+++ b/create-project/templates/app/quasar-v2/js-webpack/index.js
@@ -1,10 +1,6 @@
-module.exports = async function ({
- scope,
- dir,
- utils
-}) {
- const answers = await utils.prompts([
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
{
type: 'select',
name: 'css',
@@ -41,16 +37,14 @@ module.exports = async function ({
}
])
- Object.assign(scope, answers)
+ utils.createTargetDir(scope)
+ utils.renderTemplate(utils.join(__dirname, 'BASE'), scope)
+ utils.renderTemplate(utils.join(__dirname, scope.css), scope)
- utils.createTargetDir(dir, scope)
- utils.renderTemplate(utils.join(__dirname, 'BASE'), dir, scope)
- utils.renderTemplate(utils.join(__dirname, scope.css), dir, scope)
+ if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), scope)
+ if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), scope)
+ if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), scope)
- if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
- if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
- if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
-
- if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
- else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
+ if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), scope)
+ else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), scope)
}
diff --git a/create/app/templates/quasar-v2/js-webpack/lint/_eslintignore b/create-project/templates/app/quasar-v2/js-webpack/lint/_eslintignore
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/lint/_eslintignore
rename to create-project/templates/app/quasar-v2/js-webpack/lint/_eslintignore
diff --git a/create/app/templates/quasar-v2/js-webpack/lint/_eslintrc.js b/create-project/templates/app/quasar-v2/js-webpack/lint/_eslintrc.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/lint/_eslintrc.js
rename to create-project/templates/app/quasar-v2/js-webpack/lint/_eslintrc.js
diff --git a/create/app/templates/quasar-v2/js-webpack/pinia/src/store/example/index.js b/create-project/templates/app/quasar-v2/js-webpack/pinia/src/store/example/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/pinia/src/store/example/index.js
rename to create-project/templates/app/quasar-v2/js-webpack/pinia/src/store/example/index.js
diff --git a/create/app/templates/quasar-v2/js-webpack/pinia/src/store/index.js b/create-project/templates/app/quasar-v2/js-webpack/pinia/src/store/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/pinia/src/store/index.js
rename to create-project/templates/app/quasar-v2/js-webpack/pinia/src/store/index.js
diff --git a/create/app/templates/quasar-v2/js-webpack/pinia/src/store/store-flag.d.ts b/create-project/templates/app/quasar-v2/js-webpack/pinia/src/store/store-flag.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/pinia/src/store/store-flag.d.ts
rename to create-project/templates/app/quasar-v2/js-webpack/pinia/src/store/store-flag.d.ts
diff --git a/create/app/templates/quasar-v2/js-webpack/sass/src/css/app.sass b/create-project/templates/app/quasar-v2/js-webpack/sass/src/css/app.sass
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/sass/src/css/app.sass
rename to create-project/templates/app/quasar-v2/js-webpack/sass/src/css/app.sass
diff --git a/create/app/templates/quasar-v2/js-webpack/sass/src/css/quasar.variables.sass b/create-project/templates/app/quasar-v2/js-webpack/sass/src/css/quasar.variables.sass
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/sass/src/css/quasar.variables.sass
rename to create-project/templates/app/quasar-v2/js-webpack/sass/src/css/quasar.variables.sass
diff --git a/create/app/templates/quasar-v2/js-webpack/scss/src/css/app.scss b/create-project/templates/app/quasar-v2/js-webpack/scss/src/css/app.scss
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/scss/src/css/app.scss
rename to create-project/templates/app/quasar-v2/js-webpack/scss/src/css/app.scss
diff --git a/create/app/templates/quasar-v2/js-webpack/scss/src/css/quasar.variables.scss b/create-project/templates/app/quasar-v2/js-webpack/scss/src/css/quasar.variables.scss
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/scss/src/css/quasar.variables.scss
rename to create-project/templates/app/quasar-v2/js-webpack/scss/src/css/quasar.variables.scss
diff --git a/create/app/templates/quasar-v2/js-webpack/vuex/src/store/index.js b/create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/vuex/src/store/index.js
rename to create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/index.js
diff --git a/create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/actions.js b/create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/actions.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/actions.js
rename to create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/actions.js
diff --git a/create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/getters.js b/create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/getters.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/getters.js
rename to create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/getters.js
diff --git a/create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/index.js b/create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/index.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/index.js
rename to create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/index.js
diff --git a/create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/mutations.js b/create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/mutations.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/mutations.js
rename to create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/mutations.js
diff --git a/create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/state.js b/create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/state.js
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/vuex/src/store/module-example/state.js
rename to create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/module-example/state.js
diff --git a/create/app/templates/quasar-v2/js-webpack/vuex/src/store/store-flag.d.ts b/create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/store-flag.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/js-webpack/vuex/src/store/store-flag.d.ts
rename to create-project/templates/app/quasar-v2/js-webpack/vuex/src/store/store-flag.d.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/README.md b/create-project/templates/app/quasar-v2/ts-vite/BASE/README.md
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/README.md
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/README.md
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/_editorconfig b/create-project/templates/app/quasar-v2/ts-vite/BASE/_editorconfig
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/_editorconfig
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/_editorconfig
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/_gitignore b/create-project/templates/app/quasar-v2/ts-vite/BASE/_gitignore
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/_gitignore
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/_gitignore
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/_vscode/extensions.json b/create-project/templates/app/quasar-v2/ts-vite/BASE/_vscode/extensions.json
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/_vscode/extensions.json
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/_vscode/extensions.json
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/_vscode/settings.json b/create-project/templates/app/quasar-v2/ts-vite/BASE/_vscode/settings.json
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/_vscode/settings.json
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/_vscode/settings.json
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/index.html b/create-project/templates/app/quasar-v2/ts-vite/BASE/index.html
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/index.html
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/index.html
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/package.json b/create-project/templates/app/quasar-v2/ts-vite/BASE/package.json
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/package.json
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/package.json
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/postcssrc.config.js b/create-project/templates/app/quasar-v2/ts-vite/BASE/postcssrc.config.js
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/postcssrc.config.js
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/postcssrc.config.js
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/public/favicon.ico b/create-project/templates/app/quasar-v2/ts-vite/BASE/public/favicon.ico
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/public/favicon.ico
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/public/favicon.ico
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/public/icons/favicon-128x128.png b/create-project/templates/app/quasar-v2/ts-vite/BASE/public/icons/favicon-128x128.png
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/public/icons/favicon-128x128.png
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/public/icons/favicon-128x128.png
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/public/icons/favicon-16x16.png b/create-project/templates/app/quasar-v2/ts-vite/BASE/public/icons/favicon-16x16.png
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/public/icons/favicon-16x16.png
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/public/icons/favicon-16x16.png
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/public/icons/favicon-32x32.png b/create-project/templates/app/quasar-v2/ts-vite/BASE/public/icons/favicon-32x32.png
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/public/icons/favicon-32x32.png
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/public/icons/favicon-32x32.png
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/public/icons/favicon-96x96.png b/create-project/templates/app/quasar-v2/ts-vite/BASE/public/icons/favicon-96x96.png
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/public/icons/favicon-96x96.png
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/public/icons/favicon-96x96.png
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/quasar.config.js b/create-project/templates/app/quasar-v2/ts-vite/BASE/quasar.config.js
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/quasar.config.js
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/quasar.config.js
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/App.vue b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/App.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/App.vue
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/App.vue
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/assets/quasar-logo-vertical.svg b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/assets/quasar-logo-vertical.svg
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/assets/quasar-logo-vertical.svg
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/assets/quasar-logo-vertical.svg
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/boot/_gitkeep b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/boot/_gitkeep
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/boot/_gitkeep
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/boot/_gitkeep
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/components/EssentialLink.vue b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/components/EssentialLink.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/components/EssentialLink.vue
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/components/EssentialLink.vue
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/components/ExampleComponent.vue b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/components/ExampleComponent.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/components/ExampleComponent.vue
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/components/ExampleComponent.vue
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/components/models.ts b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/components/models.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/components/models.ts
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/components/models.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/env.d.ts b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/env.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/env.d.ts
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/env.d.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/layouts/MainLayout.vue b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/layouts/MainLayout.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/layouts/MainLayout.vue
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/layouts/MainLayout.vue
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/pages/Error404.vue b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/pages/Error404.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/pages/Error404.vue
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/pages/Error404.vue
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/pages/Index.vue b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/pages/Index.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/pages/Index.vue
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/pages/Index.vue
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/quasar.d.ts b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/quasar.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/quasar.d.ts
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/quasar.d.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/router/index.ts b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/router/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/router/index.ts
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/router/index.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/router/routes.ts b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/router/routes.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/router/routes.ts
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/router/routes.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/src/shims-vue.d.ts b/create-project/templates/app/quasar-v2/ts-vite/BASE/src/shims-vue.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/src/shims-vue.d.ts
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/src/shims-vue.d.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/tsconfig.json b/create-project/templates/app/quasar-v2/ts-vite/BASE/tsconfig.json
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/tsconfig.json
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/tsconfig.json
diff --git a/create/app/templates/quasar-v2/ts-vite/BASE/tsconfig.node.json b/create-project/templates/app/quasar-v2/ts-vite/BASE/tsconfig.node.json
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/BASE/tsconfig.node.json
rename to create-project/templates/app/quasar-v2/ts-vite/BASE/tsconfig.node.json
diff --git a/create/app/templates/quasar-v2/ts-vite/axios/src/boot/axios.ts b/create-project/templates/app/quasar-v2/ts-vite/axios/src/boot/axios.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/axios/src/boot/axios.ts
rename to create-project/templates/app/quasar-v2/ts-vite/axios/src/boot/axios.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/css/src/css/app.css b/create-project/templates/app/quasar-v2/ts-vite/css/src/css/app.css
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/css/src/css/app.css
rename to create-project/templates/app/quasar-v2/ts-vite/css/src/css/app.css
diff --git a/create/app/templates/quasar-v2/ts-vite/i18n/src/boot/i18n.ts b/create-project/templates/app/quasar-v2/ts-vite/i18n/src/boot/i18n.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/i18n/src/boot/i18n.ts
rename to create-project/templates/app/quasar-v2/ts-vite/i18n/src/boot/i18n.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/i18n/src/i18n/en-US/index.ts b/create-project/templates/app/quasar-v2/ts-vite/i18n/src/i18n/en-US/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/i18n/src/i18n/en-US/index.ts
rename to create-project/templates/app/quasar-v2/ts-vite/i18n/src/i18n/en-US/index.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/i18n/src/i18n/index.ts b/create-project/templates/app/quasar-v2/ts-vite/i18n/src/i18n/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/i18n/src/i18n/index.ts
rename to create-project/templates/app/quasar-v2/ts-vite/i18n/src/i18n/index.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/index.js b/create-project/templates/app/quasar-v2/ts-vite/index.js
similarity index 80%
rename from create/app/templates/quasar-v2/ts-vite/index.js
rename to create-project/templates/app/quasar-v2/ts-vite/index.js
index 34f767dea40..351c6e6f080 100644
--- a/create/app/templates/quasar-v2/ts-vite/index.js
+++ b/create-project/templates/app/quasar-v2/ts-vite/index.js
@@ -1,10 +1,6 @@
-module.exports = async function ({
- scope,
- dir,
- utils
-}) {
- const answers = await utils.prompts([
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
{
type: 'select',
name: 'typescriptConfig',
@@ -52,21 +48,19 @@ module.exports = async function ({
}
])
- Object.assign(scope, answers)
+ utils.createTargetDir(scope)
+ utils.renderTemplate(utils.join(__dirname, 'BASE'), scope)
+ utils.renderTemplate(utils.join(__dirname, scope.css), scope)
- utils.createTargetDir(dir, scope)
- utils.renderTemplate(utils.join(__dirname, 'BASE'), dir, scope)
- utils.renderTemplate(utils.join(__dirname, scope.css), dir, scope)
-
- if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
- if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
+ if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), scope)
+ if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), scope)
if (scope.preset.lint) {
- utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
+ utils.renderTemplate(utils.join(__dirname, 'lint'), scope)
if (scope.lintConfig === 'prettier') {
- utils.renderTemplate(utils.join(__dirname, 'prettier'), dir, scope)
+ utils.renderTemplate(utils.join(__dirname, 'prettier'), scope)
}
}
- if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
- else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
+ if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), scope)
+ else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), scope)
}
diff --git a/create/app/templates/quasar-v2/ts-vite/lint/_eslintignore b/create-project/templates/app/quasar-v2/ts-vite/lint/_eslintignore
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/lint/_eslintignore
rename to create-project/templates/app/quasar-v2/ts-vite/lint/_eslintignore
diff --git a/create/app/templates/quasar-v2/ts-vite/lint/_eslintrc.js b/create-project/templates/app/quasar-v2/ts-vite/lint/_eslintrc.js
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/lint/_eslintrc.js
rename to create-project/templates/app/quasar-v2/ts-vite/lint/_eslintrc.js
diff --git a/create/app/templates/quasar-v2/ts-vite/pinia/src/store/example/index.ts b/create-project/templates/app/quasar-v2/ts-vite/pinia/src/store/example/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/pinia/src/store/example/index.ts
rename to create-project/templates/app/quasar-v2/ts-vite/pinia/src/store/example/index.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/pinia/src/store/index.ts b/create-project/templates/app/quasar-v2/ts-vite/pinia/src/store/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/pinia/src/store/index.ts
rename to create-project/templates/app/quasar-v2/ts-vite/pinia/src/store/index.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/pinia/src/store/store-flag.d.ts b/create-project/templates/app/quasar-v2/ts-vite/pinia/src/store/store-flag.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/pinia/src/store/store-flag.d.ts
rename to create-project/templates/app/quasar-v2/ts-vite/pinia/src/store/store-flag.d.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/prettier/_prettierrc b/create-project/templates/app/quasar-v2/ts-vite/prettier/_prettierrc
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/prettier/_prettierrc
rename to create-project/templates/app/quasar-v2/ts-vite/prettier/_prettierrc
diff --git a/create/app/templates/quasar-v2/ts-vite/sass/src/css/app.sass b/create-project/templates/app/quasar-v2/ts-vite/sass/src/css/app.sass
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/sass/src/css/app.sass
rename to create-project/templates/app/quasar-v2/ts-vite/sass/src/css/app.sass
diff --git a/create/app/templates/quasar-v2/ts-vite/sass/src/css/quasar.variables.sass b/create-project/templates/app/quasar-v2/ts-vite/sass/src/css/quasar.variables.sass
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/sass/src/css/quasar.variables.sass
rename to create-project/templates/app/quasar-v2/ts-vite/sass/src/css/quasar.variables.sass
diff --git a/create/app/templates/quasar-v2/ts-vite/scss/src/css/app.scss b/create-project/templates/app/quasar-v2/ts-vite/scss/src/css/app.scss
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/scss/src/css/app.scss
rename to create-project/templates/app/quasar-v2/ts-vite/scss/src/css/app.scss
diff --git a/create/app/templates/quasar-v2/ts-vite/scss/src/css/quasar.variables.scss b/create-project/templates/app/quasar-v2/ts-vite/scss/src/css/quasar.variables.scss
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/scss/src/css/quasar.variables.scss
rename to create-project/templates/app/quasar-v2/ts-vite/scss/src/css/quasar.variables.scss
diff --git a/create/app/templates/quasar-v2/ts-vite/vuex/src/store/index.ts b/create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/vuex/src/store/index.ts
rename to create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/index.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/actions.ts b/create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/actions.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/actions.ts
rename to create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/actions.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/getters.ts b/create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/getters.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/getters.ts
rename to create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/getters.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/index.ts b/create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/index.ts
rename to create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/index.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/mutations.ts b/create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/mutations.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/mutations.ts
rename to create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/mutations.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/state.ts b/create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/state.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/vuex/src/store/module-example/state.ts
rename to create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/state.ts
diff --git a/create/app/templates/quasar-v2/ts-vite/vuex/src/store/store-flag.d.ts b/create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/store-flag.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-vite/vuex/src/store/store-flag.d.ts
rename to create-project/templates/app/quasar-v2/ts-vite/vuex/src/store/store-flag.d.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/README.md b/create-project/templates/app/quasar-v2/ts-webpack/BASE/README.md
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/README.md
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/README.md
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/_editorconfig b/create-project/templates/app/quasar-v2/ts-webpack/BASE/_editorconfig
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/_editorconfig
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/_editorconfig
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/_gitignore b/create-project/templates/app/quasar-v2/ts-webpack/BASE/_gitignore
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/_gitignore
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/_gitignore
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/_postcssrc.js b/create-project/templates/app/quasar-v2/ts-webpack/BASE/_postcssrc.js
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/_postcssrc.js
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/_postcssrc.js
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/_vscode/extensions.json b/create-project/templates/app/quasar-v2/ts-webpack/BASE/_vscode/extensions.json
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/_vscode/extensions.json
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/_vscode/extensions.json
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/_vscode/settings.json b/create-project/templates/app/quasar-v2/ts-webpack/BASE/_vscode/settings.json
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/_vscode/settings.json
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/_vscode/settings.json
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/babel.config.js b/create-project/templates/app/quasar-v2/ts-webpack/BASE/babel.config.js
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/babel.config.js
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/babel.config.js
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/package.json b/create-project/templates/app/quasar-v2/ts-webpack/BASE/package.json
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/package.json
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/package.json
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/public/favicon.ico b/create-project/templates/app/quasar-v2/ts-webpack/BASE/public/favicon.ico
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/public/favicon.ico
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/public/favicon.ico
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/public/icons/favicon-128x128.png b/create-project/templates/app/quasar-v2/ts-webpack/BASE/public/icons/favicon-128x128.png
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/public/icons/favicon-128x128.png
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/public/icons/favicon-128x128.png
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/public/icons/favicon-16x16.png b/create-project/templates/app/quasar-v2/ts-webpack/BASE/public/icons/favicon-16x16.png
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/public/icons/favicon-16x16.png
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/public/icons/favicon-16x16.png
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/public/icons/favicon-32x32.png b/create-project/templates/app/quasar-v2/ts-webpack/BASE/public/icons/favicon-32x32.png
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/public/icons/favicon-32x32.png
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/public/icons/favicon-32x32.png
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/public/icons/favicon-96x96.png b/create-project/templates/app/quasar-v2/ts-webpack/BASE/public/icons/favicon-96x96.png
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/public/icons/favicon-96x96.png
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/public/icons/favicon-96x96.png
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/quasar.config.js b/create-project/templates/app/quasar-v2/ts-webpack/BASE/quasar.config.js
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/quasar.config.js
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/quasar.config.js
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/App.vue b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/App.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/App.vue
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/App.vue
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/assets/quasar-logo-vertical.svg b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/assets/quasar-logo-vertical.svg
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/assets/quasar-logo-vertical.svg
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/assets/quasar-logo-vertical.svg
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/boot/_gitkeep b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/boot/_gitkeep
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/boot/_gitkeep
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/boot/_gitkeep
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/components/EssentialLink.vue b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/components/EssentialLink.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/components/EssentialLink.vue
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/components/EssentialLink.vue
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/components/ExampleComponent.vue b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/components/ExampleComponent.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/components/ExampleComponent.vue
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/components/ExampleComponent.vue
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/components/models.ts b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/components/models.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/components/models.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/components/models.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/env.d.ts b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/env.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/env.d.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/env.d.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/index.template.html b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/index.template.html
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/index.template.html
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/index.template.html
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/layouts/MainLayout.vue b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/layouts/MainLayout.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/layouts/MainLayout.vue
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/layouts/MainLayout.vue
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/pages/Error404.vue b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/pages/Error404.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/pages/Error404.vue
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/pages/Error404.vue
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/pages/Index.vue b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/pages/Index.vue
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/pages/Index.vue
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/pages/Index.vue
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/quasar.d.ts b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/quasar.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/quasar.d.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/quasar.d.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/router/index.ts b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/router/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/router/index.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/router/index.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/router/routes.ts b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/router/routes.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/router/routes.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/router/routes.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/src/shims-vue.d.ts b/create-project/templates/app/quasar-v2/ts-webpack/BASE/src/shims-vue.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/src/shims-vue.d.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/src/shims-vue.d.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/BASE/tsconfig.json b/create-project/templates/app/quasar-v2/ts-webpack/BASE/tsconfig.json
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/BASE/tsconfig.json
rename to create-project/templates/app/quasar-v2/ts-webpack/BASE/tsconfig.json
diff --git a/create/app/templates/quasar-v2/ts-webpack/axios/src/boot/axios.ts b/create-project/templates/app/quasar-v2/ts-webpack/axios/src/boot/axios.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/axios/src/boot/axios.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/axios/src/boot/axios.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/css/src/css/app.css b/create-project/templates/app/quasar-v2/ts-webpack/css/src/css/app.css
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/css/src/css/app.css
rename to create-project/templates/app/quasar-v2/ts-webpack/css/src/css/app.css
diff --git a/create/app/templates/quasar-v2/ts-webpack/i18n/src/boot/i18n.ts b/create-project/templates/app/quasar-v2/ts-webpack/i18n/src/boot/i18n.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/i18n/src/boot/i18n.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/i18n/src/boot/i18n.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/i18n/src/i18n/en-US/index.ts b/create-project/templates/app/quasar-v2/ts-webpack/i18n/src/i18n/en-US/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/i18n/src/i18n/en-US/index.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/i18n/src/i18n/en-US/index.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/i18n/src/i18n/index.ts b/create-project/templates/app/quasar-v2/ts-webpack/i18n/src/i18n/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/i18n/src/i18n/index.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/i18n/src/i18n/index.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/index.js b/create-project/templates/app/quasar-v2/ts-webpack/index.js
similarity index 80%
rename from create/app/templates/quasar-v2/ts-webpack/index.js
rename to create-project/templates/app/quasar-v2/ts-webpack/index.js
index 3e2fcd6a5a3..929193e489b 100644
--- a/create/app/templates/quasar-v2/ts-webpack/index.js
+++ b/create-project/templates/app/quasar-v2/ts-webpack/index.js
@@ -1,10 +1,6 @@
-module.exports = async function ({
- scope,
- dir,
- utils
-}) {
- const answers = await utils.prompts([
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
{
type: 'select',
name: 'typescriptConfig',
@@ -52,21 +48,19 @@ module.exports = async function ({
}
])
- Object.assign(scope, answers)
+ utils.createTargetDir(scope)
+ utils.renderTemplate(utils.join(__dirname, 'BASE'), scope)
+ utils.renderTemplate(utils.join(__dirname, scope.css), scope)
- utils.createTargetDir(dir, scope)
- utils.renderTemplate(utils.join(__dirname, 'BASE'), dir, scope)
- utils.renderTemplate(utils.join(__dirname, scope.css), dir, scope)
-
- if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
- if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
+ if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), scope)
+ if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), scope)
if (scope.preset.lint) {
- utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
+ utils.renderTemplate(utils.join(__dirname, 'lint'), scope)
if (scope.lintConfig === 'prettier') {
- utils.renderTemplate(utils.join(__dirname, 'prettier'), dir, scope)
+ utils.renderTemplate(utils.join(__dirname, 'prettier'), scope)
}
}
- if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
- else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
+ if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), scope)
+ else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), scope)
}
diff --git a/create/app/templates/quasar-v2/ts-webpack/lint/_eslintignore b/create-project/templates/app/quasar-v2/ts-webpack/lint/_eslintignore
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/lint/_eslintignore
rename to create-project/templates/app/quasar-v2/ts-webpack/lint/_eslintignore
diff --git a/create/app/templates/quasar-v2/ts-webpack/lint/_eslintrc.js b/create-project/templates/app/quasar-v2/ts-webpack/lint/_eslintrc.js
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/lint/_eslintrc.js
rename to create-project/templates/app/quasar-v2/ts-webpack/lint/_eslintrc.js
diff --git a/create/app/templates/quasar-v2/ts-webpack/pinia/src/store/example/index.ts b/create-project/templates/app/quasar-v2/ts-webpack/pinia/src/store/example/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/pinia/src/store/example/index.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/pinia/src/store/example/index.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/pinia/src/store/index.ts b/create-project/templates/app/quasar-v2/ts-webpack/pinia/src/store/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/pinia/src/store/index.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/pinia/src/store/index.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/pinia/src/store/store-flag.d.ts b/create-project/templates/app/quasar-v2/ts-webpack/pinia/src/store/store-flag.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/pinia/src/store/store-flag.d.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/pinia/src/store/store-flag.d.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/prettier/_prettierrc b/create-project/templates/app/quasar-v2/ts-webpack/prettier/_prettierrc
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/prettier/_prettierrc
rename to create-project/templates/app/quasar-v2/ts-webpack/prettier/_prettierrc
diff --git a/create/app/templates/quasar-v2/ts-webpack/sass/src/css/app.sass b/create-project/templates/app/quasar-v2/ts-webpack/sass/src/css/app.sass
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/sass/src/css/app.sass
rename to create-project/templates/app/quasar-v2/ts-webpack/sass/src/css/app.sass
diff --git a/create/app/templates/quasar-v2/ts-webpack/sass/src/css/quasar.variables.sass b/create-project/templates/app/quasar-v2/ts-webpack/sass/src/css/quasar.variables.sass
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/sass/src/css/quasar.variables.sass
rename to create-project/templates/app/quasar-v2/ts-webpack/sass/src/css/quasar.variables.sass
diff --git a/create/app/templates/quasar-v2/ts-webpack/scss/src/css/app.scss b/create-project/templates/app/quasar-v2/ts-webpack/scss/src/css/app.scss
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/scss/src/css/app.scss
rename to create-project/templates/app/quasar-v2/ts-webpack/scss/src/css/app.scss
diff --git a/create/app/templates/quasar-v2/ts-webpack/scss/src/css/quasar.variables.scss b/create-project/templates/app/quasar-v2/ts-webpack/scss/src/css/quasar.variables.scss
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/scss/src/css/quasar.variables.scss
rename to create-project/templates/app/quasar-v2/ts-webpack/scss/src/css/quasar.variables.scss
diff --git a/create/app/templates/quasar-v2/ts-webpack/vuex/src/store/index.ts b/create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/vuex/src/store/index.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/index.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/actions.ts b/create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/actions.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/actions.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/actions.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/getters.ts b/create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/getters.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/getters.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/getters.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/index.ts b/create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/index.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/index.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/index.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/mutations.ts b/create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/mutations.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/mutations.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/mutations.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/state.ts b/create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/state.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/vuex/src/store/module-example/state.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/state.ts
diff --git a/create/app/templates/quasar-v2/ts-webpack/vuex/src/store/store-flag.d.ts b/create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/store-flag.d.ts
similarity index 100%
rename from create/app/templates/quasar-v2/ts-webpack/vuex/src/store/store-flag.d.ts
rename to create-project/templates/app/quasar-v2/ts-webpack/vuex/src/store/store-flag.d.ts
diff --git a/create-project/templates/ui-kit/index.js b/create-project/templates/ui-kit/index.js
new file mode 100644
index 00000000000..9d610cf9fbb
--- /dev/null
+++ b/create-project/templates/ui-kit/index.js
@@ -0,0 +1,106 @@
+
+module.exports = async function ({ scope, utils }) {
+ await utils.prompts(scope, [
+ utils.commonPrompts.quasarVersion,
+
+ {
+ type: 'text',
+ message: 'Project name (npm name, kebab-case, without "quasar-ui" prefix)',
+ validate: (val) =>
+ utils.isValidPackageName(val) || 'Invalid package.json name'
+ },
+
+ utils.commonPrompts.author,
+ utils.commonPrompts.license,
+
+ {
+ type: 'multiselect',
+ name: 'features',
+ message: 'Pick what you will be interested in:',
+ format: utils.convertArrayToObject,
+ choices: [
+ {
+ title: 'Vue component',
+ value: 'component',
+ selected: true
+ },
+ {
+ title: 'Vue directive',
+ value: 'directive'
+ },
+ {
+ title: 'Quasar App Extension',
+ value: 'ae',
+ selected: true
+ }
+ ]
+ },
+
+ {
+ type: 'text',
+ name: 'packageDescription',
+ message: 'Package description',
+ initial: 'My awesome component',
+ },
+
+ {
+ type: 'text',
+ name: 'umdExportName',
+ message: 'UMD export name (global variable, camelCased)',
+ validate: val => val && val.length > 0
+ },
+
+ {
+ type: (_, { features }) => features.component ? 'text' : null,
+ name: 'componentName',
+ message: 'Component name (PascalCase)',
+ initial: 'MyComponent',
+ validate: val => val && val.length > 0
+ },
+
+ {
+ type: (_, { features }) => features.directive ? 'text' : null,
+ name: 'directiveName',
+ message: 'Directive name (kebab-case, without "v-" prefix)',
+ initial: 'my-directive',
+ validate: val => val && val.length > 0
+ },
+
+ {
+ type: (_, { features }) => features.ae ? 'text' : null,
+ name: 'aeDescription',
+ message: 'App Extension description',
+ initial: 'A Quasar App Extension',
+ validate: val => val && val.length > 0
+ },
+
+ {
+ type: (_, { features }) => features.ae ? 'multiselect' : null,
+ name: 'preset',
+ message: 'Pick the needed App Extension scripts:',
+ format: utils.convertArrayToObject,
+ choices: [
+ {
+ title: 'Prompts script',
+ value: 'prompts'
+ },
+ {
+ title: 'Install script',
+ value: 'install'
+ },
+ {
+ title: 'Uninstall script',
+ value: 'uninstall'
+ }
+ ]
+ },
+
+ utils.commonPrompts.repositoryType,
+ utils.commonPrompts.repositoryURL,
+ utils.commonPrompts.homepage,
+ utils.commonPrompts.bugs
+ ])
+
+ const script = require(`./quasar-${scope.quasarVersion}`)
+ await script({ scope, utils })
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/LICENSE b/create-project/templates/ui-kit/quasar-v2/BASE/LICENSE
new file mode 100644
index 00000000000..65abeeaeda5
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) <%= author %>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+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.
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/README.md b/create-project/templates/ui-kit/quasar-v2/BASE/README.md
new file mode 100644
index 00000000000..c85b32c8586
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/README.md
@@ -0,0 +1,16 @@
+<img src="https://img.shields.io/npm/v/quasar-ui-<%= name %>.svg?label=quasar-ui-<%= name %>">
+{{#features.ae}}<img src="https://img.shields.io/npm/v/quasar-app-extension-<%= name %>.svg?label=quasar-app-extension-<%= name %>">{{/features.ae}}
+
+Compatible with Quasar UI v2 and Vue 3.
+
+# Structure
+* [/ui](ui) - standalone npm package
+{{#features.ae}}
+* [/app-extension](app-extension) - Quasar app extension
+{{/features.ae}}
+
+# Donate
+If you appreciate the work that went into this project, please consider [donating to Quasar](https://donate.quasar.dev).
+
+# License
+<%= license %> (c) <%= author %>
diff --git a/create/app/.gitignore b/create-project/templates/ui-kit/quasar-v2/BASE/_gitignore
similarity index 86%
rename from create/app/.gitignore
rename to create-project/templates/ui-kit/quasar-v2/BASE/_gitignore
index 8fa40ec7644..c63da5335ba 100644
--- a/create/app/.gitignore
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/_gitignore
@@ -1,16 +1,16 @@
.DS_Store
.thumbs.db
node_modules
-
-# Log files
+dist
+yarn.lock
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Editor directories and files
.idea
+.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
-
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/jsconfig.json b/create-project/templates/ui-kit/quasar-v2/BASE/jsconfig.json
new file mode 100644
index 00000000000..eb57d1afa87
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/jsconfig.json
@@ -0,0 +1,11 @@
+
+{
+ "compilerOptions": {
+ // This must be specified if "paths" is set
+ "baseUrl": ".",
+ // Relative to "baseUrl"
+ "paths": {
+ "ui/*": ["src/*"]
+ }
+ }
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/README.md b/create-project/templates/ui-kit/quasar-v2/BASE/ui/README.md
new file mode 100644
index 00000000000..90dfe0ae7b1
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/README.md
@@ -0,0 +1,162 @@
+# {{#features.component}}Component <%= componentName %>{{#features.directive}} and {{/features.directive}}{{/features.component}}{{#features.directive}}Directive v-<%= directiveName %>{{/features.directive}}
+
+[](https://www.npmjs.com/package/quasar-ui-<%= name %>)
+[](https://www.npmjs.com/package/quasar-ui-<%= name %>)
+
+**Compatible with Quasar UI v2 and Vue 3**.
+
+{{#features.component}}
+# Component <%= componentName %>
+> Short description of the component
+{{/features.component}}
+
+{{#features.directive}}
+# Directive v-<%= directiveName %>
+> Short description of the directive
+{{/features.directive}}
+
+# Usage
+
+## Quasar CLI project
+{{#features.ae}}
+
+Install the [App Extension](../app-extension).
+
+**OR**:
+
+{{/features.ae}}
+Create and register a boot file:
+
+```js
+import Vue from 'vue'
+import Plugin from 'quasar-ui-<%= name %>'{{#or componentCss directiveCss}}
+import 'quasar-ui-<%= name %>/dist/index.css'{{/or}}
+
+Vue.use(Plugin)
+```
+
+**OR**:
+
+```html
+{{#or componentCss directiveCss}}<style src="quasar-ui-<%= name %>/dist/index.css"></style>
+
+{{/or}}
+<script>
+import { {{#features.component}}Component as <%= componentName %>{{/features.component}}{{#features.directive}}, {{/features.directive}}{{#features.directive}}Directive{{/features.directive}} } from 'quasar-ui-<%= name %>'
+
+export default {
+ {{#features.component}}
+ components: {
+ <%= componentName %>
+ }{{#features.directive}},{{/features.directive}}
+ {{/features.component}}
+ {{#features.directive}}
+ directives: {
+ Directive
+ }
+ {{/features.directive}}
+}
+</script>
+```
+
+## Vue CLI project
+
+```js
+import Vue from 'vue'
+import Plugin from 'quasar-ui-<%= name %>'{{#or componentCss directiveCss}}
+import 'quasar-ui-<%= name %>/dist/index.css'{{/or}}
+
+Vue.use(Plugin)
+```
+
+**OR**:
+
+```html
+{{#or componentCss directiveCss}}<style src="quasar-ui-<%= name %>/dist/index.css"></style>
+
+{{/or}}
+<script>
+import { {{#features.component}}Component as <%= componentName %>{{/features.component}}{{#features.directive}}, {{/features.directive}}{{#features.directive}}Directive{{/features.directive}} } from 'quasar-ui-<%= name %>'
+
+export default {
+ {{#features.component}}
+ components: {
+ <%= componentName %>
+ }{{#features.directive}},{{/features.directive}}
+ {{/features.component}}
+ {{#features.directive}}
+ directives: {
+ Directive
+ }
+ {{/features.directive}}
+}
+</script>
+```
+
+## UMD variant
+
+Exports `window.<%= umdExportName %>`.
+
+Add the following tag(s) after the Quasar ones:
+
+```html
+{{#or componentCss directiveCss}}
+<head>
+ <!-- AFTER the Quasar stylesheet tags: -->
+ <link href="https://cdn.jsdelivr.net/npm/quasar-ui-<%= name %>/dist/index.min.css" rel="stylesheet" type="text/css">
+</head>
+{{/or}}
+<body>
+ <!-- at end of body, AFTER Quasar script(s): -->
+ <script src="https://cdn.jsdelivr.net/npm/quasar-ui-<%= name %>/dist/index.umd.min.js"></script>
+</body>
+```
+{{#or componentCss directiveCss}}
+If you need the RTL variant of the CSS, then go for the following (instead of the above stylesheet link):
+```html
+<link href="https://cdn.jsdelivr.net/npm/quasar-ui-<%= name %>/dist/index.rtl.min.css" rel="stylesheet" type="text/css">
+```
+{{/or}}
+
+# Setup
+```bash
+$ yarn
+```
+
+# Developing
+```bash
+# start dev in SPA mode
+$ yarn dev
+
+# start dev in UMD mode
+$ yarn dev:umd
+
+# start dev in SSR mode
+$ yarn dev:ssr
+
+# start dev in Cordova iOS mode
+$ yarn dev:ios
+
+# start dev in Cordova Android mode
+$ yarn dev:android
+
+# start dev in Electron mode
+$ yarn dev:electron
+```
+
+# Building package
+```bash
+$ yarn build
+```
+
+# Adding Testing Components
+in the `ui/dev/src/pages` you can add Vue files to test your component/directive. When using `yarn dev` to build the UI, any pages in that location will automatically be picked up by dynamic routing and added to the test page.
+
+# Adding Assets
+If you have a component that has assets, like language or icon-sets, you will need to provide these for UMD. In the `ui/build/script.javascript.js` file, you will find a couple of commented out commands that call `addAssets`. Uncomment what you need and add your assets to have them be built and put into the `ui/dist` folder.
+
+# Donate
+If you appreciate the work that went into this, please consider [donating to Quasar](https://donate.quasar.dev).
+
+# License
+<%= license %> (c) <%= author %>
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/_npmignore b/create-project/templates/ui-kit/quasar-v2/BASE/ui/_npmignore
new file mode 100644
index 00000000000..c8b033b748f
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/_npmignore
@@ -0,0 +1,21 @@
+/build
+/dev
+umd-test.html
+
+.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
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/config.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/config.js
new file mode 100644
index 00000000000..c997ed50443
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/config.js
@@ -0,0 +1,13 @@
+const { name, author, version } = require('../package.json')
+const year = (new Date()).getFullYear()
+
+module.exports = {
+ name,
+ version,
+ banner:
+ '/*!\n' +
+ ' * ' + name + ' v' + version + '\n' +
+ ' * (c) ' + year + ' ' + author + '\n' +
+ ' * Released under the MIT License.\n' +
+ ' */\n'
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/index.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/index.js
new file mode 100644
index 00000000000..c7a5637984d
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/index.js
@@ -0,0 +1,27 @@
+process.env.NODE_ENV = 'production'
+
+{{#or componentCss directiveCss}}
+const parallel = require('os').cpus().length > 1
+const runJob = parallel ? require('child_process').fork : require
+{{/or}}
+const { join } = require('path')
+const { createFolder } = require('./utils')
+const { green, blue } = require('chalk')
+
+console.log()
+
+{{#features.ae}}
+require('./script.app-ext.js').syncAppExt()
+{{/features.ae}}
+require('./script.clean.js')
+
+console.log(` 📦 Building ${green('v' + require('../package.json').version)}...{{#or componentCss directiveCss}}${parallel ? blue(' [multi-threaded]') : ''}{{/or}}\n`)
+
+createFolder('dist')
+
+{{#or componentCss directiveCss}}
+runJob(join(__dirname, './script.javascript.js'))
+runJob(join(__dirname, './script.css.js'))
+{{else}}
+require(join(__dirname, './script.javascript.js'))
+{{/or}}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.clean.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.clean.js
new file mode 100644
index 00000000000..50e33d0f3ee
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.clean.js
@@ -0,0 +1,6 @@
+var
+ rimraf = require('rimraf'),
+ path = require('path')
+
+rimraf.sync(path.resolve(__dirname, '../dist/*'))
+console.log(` 💥 Cleaned build artifacts.\n`)
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.css.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.css.js
new file mode 100644
index 00000000000..99cbfcc9242
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.css.js
@@ -0,0 +1,75 @@
+const path = require('path')
+const sass = require('sass')
+const postcss = require('postcss')
+const cssnano = require('cssnano')
+const rtl = require('rtlcss')
+const autoprefixer = require('autoprefixer')
+
+const buildConf = require('./config')
+const buildUtils = require('./utils')
+
+const postCssCompiler = postcss([ autoprefixer ])
+const postCssRtlCompiler = postcss([ rtl({}) ])
+
+const nano = postcss([
+ cssnano({
+ preset: ['default', {
+ mergeLonghand: false,
+ convertValues: false,
+ cssDeclarationSorter: false,
+ reduceTransforms: false
+ }]
+ })
+])
+
+Promise
+ .all([
+ generate('src/index.sass', `dist/index`)
+ ])
+ .catch(e => {
+ console.error(e)
+ process.exit(1)
+ })
+
+/**
+ * Helpers
+ */
+
+function resolve (_path) {
+ return path.resolve(__dirname, '..', _path)
+}
+
+function generate (src, dest) {
+ src = resolve(src)
+ dest = resolve(dest)
+
+ return new Promise((resolve, reject) => {
+ sass.render({ file: src, includePaths: ['node_modules'] }, (err, result) => {
+ if (err) {
+ reject(err)
+ return
+ }
+
+ resolve(result.css)
+ })
+ })
+ .then(code => buildConf.banner + code)
+ .then(code => postCssCompiler.process(code, { from: void 0 }))
+ .then(code => {
+ code.warnings().forEach(warn => {
+ console.warn(warn.toString())
+ })
+ return code.css
+ })
+ .then(code => Promise.all([
+ generateUMD(dest, code),
+ postCssRtlCompiler.process(code, { from: void 0 })
+ .then(code => generateUMD(dest, code.css, '.rtl'))
+ ]))
+}
+
+function generateUMD (dest, code, ext = '') {
+ return buildUtils.writeFile(`${dest}${ext}.css`, code, true)
+ .then(code => nano.process(code, { from: void 0 }))
+ .then(code => buildUtils.writeFile(`${dest}${ext}.min.css`, code.css, true))
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.javascript.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.javascript.js
new file mode 100644
index 00000000000..b21f8a290d6
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.javascript.js
@@ -0,0 +1,213 @@
+const path = require('path')
+const fs = require('fs')
+const fse = require('fs-extra')
+const rollup = require('rollup')
+const uglify = require('uglify-js')
+const buble = require('@rollup/plugin-buble')
+const json = require('@rollup/plugin-json')
+const { nodeResolve } = require('@rollup/plugin-node-resolve')
+const replace = require('@rollup/plugin-replace')
+
+const { version } = require('../package.json')
+
+const buildConf = require('./config')
+const buildUtils = require('./utils')
+
+const rollupPlugins = [
+ replace({
+ preventAssignment: false,
+ values: {
+ __UI_VERSION__: `'${ version }'`
+ }
+ }),
+ nodeResolve({
+ extensions: ['.js'],
+ preferBuiltins: false
+ }),
+ json(),
+ buble({
+ objectAssign: 'Object.assign'
+ })
+]
+
+const builds = [
+ {
+ rollup: {
+ input: {
+ input: pathResolve('../src/index.esm.js')
+ },
+ output: {
+ file: pathResolve('../dist/index.esm.js'),
+ format: 'es'
+ }
+ },
+ build: {
+ // unminified: true,
+ minified: true
+ }
+ },
+ {
+ rollup: {
+ input: {
+ input: pathResolve('../src/index.common.js')
+ },
+ output: {
+ file: pathResolve('../dist/index.common.js'),
+ format: 'cjs'
+ }
+ },
+ build: {
+ // unminified: true,
+ minified: true
+ }
+ },
+ {
+ rollup: {
+ input: {
+ input: pathResolve('../src/index.umd.js')
+ },
+ output: {
+ name: '<%= umdExportName %>',
+ file: pathResolve('../dist/index.umd.js'),
+ format: 'umd'
+ }
+ },
+ build: {
+ unminified: true,
+ minified: true,
+ minExt: true
+ }
+ }
+]
+
+// Add your asset folders here, if needed
+// addAssets(builds, 'icon-set', 'iconSet')
+// addAssets(builds, 'lang', 'lang')
+
+build(builds)
+
+/**
+ * Helpers
+ */
+
+function pathResolve (_path) {
+ return path.resolve(__dirname, _path)
+}
+
+// eslint-disable-next-line no-unused-vars
+function addAssets (builds, type, injectName) {
+ const
+ files = fs.readdirSync(pathResolve('../../ui/src/components/' + type)),
+ plugins = [ buble(bubleConfig) ],
+ outputDir = pathResolve(`../dist/${type}`)
+
+ fse.mkdirp(outputDir)
+
+ files
+ .filter(file => file.endsWith('.js'))
+ .forEach(file => {
+ const name = file.substr(0, file.length - 3).replace(/-([a-z])/g, g => g[1].toUpperCase())
+ builds.push({
+ rollup: {
+ input: {
+ input: pathResolve(`../src/components/${type}/${file}`),
+ plugins
+ },
+ output: {
+ file: addExtension(pathResolve(`../dist/${type}/${file}`), 'umd'),
+ format: 'umd',
+ name: `<%= umdExportName %>.${injectName}.${name}`
+ }
+ },
+ build: {
+ minified: true
+ }
+ })
+ })
+}
+
+function build (builds) {
+ return Promise
+ .all(builds.map(genConfig).map(buildEntry))
+ .catch(buildUtils.logError)
+}
+
+function genConfig (opts) {
+ Object.assign(opts.rollup.input, {
+ plugins: rollupPlugins,
+ external: [ 'vue', 'quasar' ]
+ })
+
+ Object.assign(opts.rollup.output, {
+ banner: buildConf.banner,
+ globals: { vue: 'Vue', quasar: 'Quasar' }
+ })
+
+ return opts
+}
+
+function addExtension (filename, ext = 'min') {
+ const insertionPoint = filename.lastIndexOf('.')
+ return `${filename.slice(0, insertionPoint)}.${ext}${filename.slice(insertionPoint)}`
+}
+
+function buildEntry (config) {
+ return rollup
+ .rollup(config.rollup.input)
+ .then(bundle => bundle.generate(config.rollup.output))
+ .then(({ output }) => {
+ const code = config.rollup.output.format === 'umd'
+ ? injectVueRequirement(output[0].code)
+ : output[0].code
+
+ return config.build.unminified
+ ? buildUtils.writeFile(config.rollup.output.file, code)
+ : code
+ })
+ .then(code => {
+ if (!config.build.minified) {
+ return code
+ }
+
+ const minified = uglify.minify(code, {
+ compress: {
+ pure_funcs: ['makeMap']
+ }
+ })
+
+ if (minified.error) {
+ return Promise.reject(minified.error)
+ }
+
+ return buildUtils.writeFile(
+ config.build.minExt === true
+ ? addExtension(config.rollup.output.file)
+ : config.rollup.output.file,
+ buildConf.banner + minified.code,
+ true
+ )
+ })
+ .catch(err => {
+ console.error(err)
+ process.exit(1)
+ })
+}
+
+function injectVueRequirement (code) {
+ // eslint-disable-next-line
+ const index = code.indexOf(`Vue = Vue && Vue.hasOwnProperty('default') ? Vue['default'] : Vue`)
+
+ if (index === -1) {
+ return code
+ }
+
+ const checkMe = ` if (Vue === void 0) {
+ console.error('[ Quasar ] Vue is required to run. Please add a script tag for it before loading Quasar.')
+ return
+ }
+ `
+
+ return code.substring(0, index - 1) +
+ checkMe +
+ code.substring(index)
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.open-umd.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.open-umd.js
new file mode 100644
index 00000000000..71d90858984
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/script.open-umd.js
@@ -0,0 +1,6 @@
+const { resolve } = require('path')
+const open = require('open')
+
+open(
+ resolve(__dirname, '../umd-test.html')
+)
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/utils.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/utils.js
new file mode 100644
index 00000000000..73e00723eb9
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/build/utils.js
@@ -0,0 +1,56 @@
+const
+ fs = require('fs'),
+ path = require('path'),
+ zlib = require('zlib'),
+ { green, blue, red, cyan } = require('chalk'),
+ kebabRegex = /[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g
+
+function getSize (code) {
+ return (code.length / 1024).toFixed(2) + 'kb'
+}
+
+module.exports.createFolder = function (folder) {
+ const dir = path.join(__dirname, '..', folder)
+ if (!fs.existsSync(dir)) {
+ fs.mkdirSync(dir)
+ }
+}
+
+module.exports.writeFile = function (dest, code, zip) {
+ const banner = dest.indexOf('.json') > -1
+ ? red('[json]')
+ : dest.indexOf('.js') > -1
+ ? green('[js] ')
+ : dest.indexOf('.ts') > -1
+ ? cyan('[ts] ')
+ : blue('[css] ')
+
+ return new Promise((resolve, reject) => {
+ function report (extra) {
+ console.log(`${banner} ${path.relative(process.cwd(), dest).padEnd(41)} ${getSize(code).padStart(8)}${extra || ''}`)
+ resolve(code)
+ }
+
+ fs.writeFile(dest, code, err => {
+ if (err) return reject(err)
+ if (zip) {
+ zlib.gzip(code, (err, zipped) => {
+ if (err) return reject(err)
+ report(` (gzipped: ${getSize(zipped).padStart(8)})`)
+ })
+ }
+ else {
+ report()
+ }
+ })
+ })
+}
+
+module.exports.readFile = function (file) {
+ return fs.readFileSync(file, 'utf-8')
+}
+
+module.exports.logError = function (err) {
+ console.error('\n' + red('[Error]'), err)
+ console.log()
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/README.md b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/README.md
new file mode 100644
index 00000000000..fbe4ca39e71
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/README.md
@@ -0,0 +1,3 @@
+# Dev app (playground)
+
+Adding .vue files to src/pages/ will auto-add them to the Index page list.
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/_editorconfig b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/_editorconfig
new file mode 100644
index 00000000000..9d08a1a828a
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/_editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/_gitignore b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/_gitignore
new file mode 100644
index 00000000000..d7c7a2d6336
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/_gitignore
@@ -0,0 +1,20 @@
+.quasar
+.DS_Store
+.thumbs.db
+node_modules
+/dist
+/src-cordova/node_modules
+/src-cordova/platforms
+/src-cordova/plugins
+/src-cordova/www
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/_postcssrc.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/_postcssrc.js
new file mode 100644
index 00000000000..1174fe52b74
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/_postcssrc.js
@@ -0,0 +1,8 @@
+// https://github.com/michael-ciniawsky/postcss-load-config
+
+module.exports = {
+ plugins: [
+ // to edit target browsers: use "browserslist" field in package.json
+ require('autoprefixer')
+ ]
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/babel.config.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/babel.config.js
new file mode 100644
index 00000000000..9408c6cd4aa
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/babel.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+ presets: [
+ '@quasar/babel-preset-app'
+ ]
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/package.json b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/package.json
new file mode 100644
index 00000000000..e5e7954ee7a
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/package.json
@@ -0,0 +1,30 @@
+{
+ "name": "dev",
+ "version": "1.0.0",
+ "description": "A Quasar Framework app",
+ "productName": "Quasar App",
+ "private": true,
+ "scripts": {
+ "dev": "quasar dev",
+ "dev:ssr": "quasar dev -m ssr",
+ "dev:ios": "quasar dev -m ios",
+ "dev:android": "quasar dev -m android",
+ "dev:electron": "quasar dev -m electron"
+ },
+ "browserslist": [
+ "last 10 Chrome versions",
+ "last 10 Firefox versions",
+ "last 4 Edge versions",
+ "last 7 Safari versions",
+ "last 8 Android versions",
+ "last 8 ChromeAndroid versions",
+ "last 8 FirefoxAndroid versions",
+ "last 10 iOS versions",
+ "last 5 Opera versions"
+ ],
+ "engines": {
+ "node": ">= 8.9.0",
+ "npm": ">= 5.6.0",
+ "yarn": ">= 1.6.0"
+ }
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/quasar.config.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/quasar.config.js
new file mode 100644
index 00000000000..0570f49f037
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/quasar.config.js
@@ -0,0 +1,75 @@
+// Configuration for your app
+// https://quasar.dev/quasar-cli/quasar-conf-js
+
+const path = require('path')
+const webpack = require('webpack')
+
+module.exports = function (ctx) {
+ return {
+ // app boot file (/src/boot)
+ // --> boot files are part of "main.js"
+ boot: [
+ 'register.js'
+ ],
+
+ css: [
+ {{#or componentCss directiveCss}}
+ 'app.sass'
+ {{/or}}
+ ],
+
+ extras: [
+ // 'ionicons-v4',
+ // 'mdi-v5',
+ // 'fontawesome-v5',
+ // 'eva-icons',
+ // 'themify',
+ // 'line-awesome',
+ // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
+
+ 'roboto-font', // optional, you are not bound to it
+ 'material-icons' // optional, you are not bound to it
+ ],
+
+ framework: {
+ // iconSet: 'material-icons', // Quasar icon set
+ // lang: 'en-US', // Quasar language pack
+
+ config: {},
+
+ // Quasar plugins
+ plugins: []
+ },
+
+ // animations: 'all', // --- includes all animations
+ animations: [],
+
+ // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build
+ build: {
+ vueRouterMode: 'history',
+
+ chainWebpack (chain) {
+ chain.resolve.alias.merge({
+ ui: path.resolve(__dirname, `../src/index.esm.js`)
+ })
+
+ chain.plugin('define-ui')
+ .use(webpack.DefinePlugin, [{
+ __UI_VERSION__: `'${require('../package.json').version}'`
+ }])
+ }
+ },
+
+ devServer: {
+ // port: 8080,
+ open: true // opens browser window automatically
+ },
+
+ ssr: {
+ middlewares: [
+ ctx.prod ? 'compression' : '',
+ 'render' // keep this as last one
+ ]
+ }
+ }
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/App.vue b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/App.vue
new file mode 100644
index 00000000000..1a1ce59509f
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/App.vue
@@ -0,0 +1,9 @@
+<template>
+ <router-view />
+</template>
+
+<script>
+export default {
+ name: 'App'
+}
+</script>
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/assets/_gitkeep b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/assets/_gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/boot/register.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/boot/register.js
new file mode 100644
index 00000000000..cd00d4e948b
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/boot/register.js
@@ -0,0 +1,6 @@
+import { boot } from 'quasar/wrappers'
+import VuePlugin from 'ui' // "ui" is aliased in quasar.conf.js
+
+export default boot(({ app }) => {
+ app.use(VuePlugin)
+})
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/components/_gitkeep b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/components/_gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/css/app.sass b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/css/app.sass
new file mode 100644
index 00000000000..5faa1cef3ae
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/css/app.sass
@@ -0,0 +1,2 @@
+// app global css in Sass form
+@import '../../../src/index.sass'
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/css/quasar.variables.sass b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/css/quasar.variables.sass
new file mode 100644
index 00000000000..66d496562eb
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/css/quasar.variables.sass
@@ -0,0 +1,22 @@
+// Quasar Sass (& SCSS) Variables
+// --------------------------------------------------
+// To customize the look and feel of this app, you can override
+// the Stylus variables found in Quasar's source Stylus files.
+
+// Check documentation for full list of Quasar variables
+
+// Your own variables (that are declared here) and Quasar's own
+// ones will be available out of the box in your .vue/.scss/.sass files
+
+// It's highly recommended to change the default colors
+// to match your app's branding.
+// Tip: Use the "Theme Builder" on Quasar's documentation website.
+
+$primary : #027BE3
+$secondary : #26A69A
+$accent : #9C27B0
+
+$positive : #21BA45
+$negative : #C10015
+$info : #31CCEC
+$warning : #F2C037
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/index.template.html b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/index.template.html
new file mode 100644
index 00000000000..0dea4d93a6f
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/index.template.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title><%= productName %></title>
+
+ <meta charset="utf-8">
+ <meta name="description" content="<%= productDescription %>">
+ <meta name="format-detection" content="telephone=no">
+ <meta name="msapplication-tap-highlight" content="no">
+ <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
+ </head>
+ <body>
+ <!-- DO NOT touch the following DIV -->
+ <div id="q-app"></div>
+ </body>
+</html>
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/layouts/MyLayout.vue b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/layouts/MyLayout.vue
new file mode 100644
index 00000000000..0134d2ddcb6
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/layouts/MyLayout.vue
@@ -0,0 +1,39 @@
+<template>
+ <q-layout view="lHh Lpr lFf">
+ <q-header elevated>
+ <q-toolbar>
+ <q-btn
+ flat
+ dense
+ round
+ to="/"
+ icon="home"
+ />
+
+ <q-toolbar-title>
+ quasar-ui-<%= name %> v{{ version }}
+ </q-toolbar-title>
+
+ <div>Quasar v{{ $q.version }}</div>
+ </q-toolbar>
+ </q-header>
+
+ <q-page-container>
+ <router-view />
+ </q-page-container>
+ </q-layout>
+</template>
+
+<script>
+import { version } from 'ui' // "ui" is aliased in quasar.conf.js
+
+export default {
+ name: 'MyLayout',
+
+ setup () {
+ return {
+ version
+ }
+ }
+}
+</script>
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/pages/Error404.vue b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/pages/Error404.vue
new file mode 100644
index 00000000000..de8bedfb362
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/pages/Error404.vue
@@ -0,0 +1,31 @@
+<template>
+ <div class="fullscreen bg-blue text-white text-center q-pa-md flex flex-center">
+ <div>
+ <div style="font-size: 30vh">
+ 404
+ </div>
+
+ <div class="text-h2" style="opacity:.4">
+ Oops. Nothing here...
+ </div>
+
+ <q-btn
+ class="q-mt-xl"
+ color="white"
+ text-color="blue"
+ unelevated
+ to="/"
+ label="Go Home"
+ no-caps
+ />
+ </div>
+ </div>
+</template>
+
+<script>
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+ name: 'Error404'
+})
+</script>
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/pages/Index.vue b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/pages/Index.vue
new file mode 100644
index 00000000000..e5c70e6d876
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/pages/Index.vue
@@ -0,0 +1,40 @@
+<template>
+ <q-page padding class="row justify-center">
+ <q-list dense class="list">
+ <div class="text-h4 q-mb-md">Test pages</div>
+ <q-item
+ v-for="page in pages"
+ :key="page.path"
+ :to="page.path"
+ >
+ <q-item-section avatar>
+ <q-icon name="pages" />
+ </q-item-section>
+ <q-item-section>
+ \{{ page.title }}
+ </q-item-section>
+ <q-item-section side>
+ <q-icon name="chevron_right" />
+ </q-item-section>
+ </q-item>
+ </q-list>
+ </q-page>
+</template>
+
+<script>
+import pages from '../router/pages'
+
+export default {
+ setup () {
+ return {
+ pages
+ }
+ }
+}
+</script>
+
+<style lang="sass" scoped>
+.list
+ width: 700px
+ max-width: 100%
+</style>
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/pages/Test1.vue b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/pages/Test1.vue
new file mode 100644
index 00000000000..ca6c0d03845
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/pages/Test1.vue
@@ -0,0 +1,18 @@
+<template>
+ <q-page padding>
+ {{#features.component}}
+ <<%= componentName %> />
+ {{/features.component}}
+ {{#features.directive}}
+ <div v-<%= directiveName %> class="directive-target">
+ x
+ </div>
+ {{/features.directive}}
+ </q-page>
+</template>
+
+<style lang="sass" scoped>
+.directive-target
+ width: 50px
+ height: 50px
+</style>
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/router/index.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/router/index.js
new file mode 100644
index 00000000000..dab3aa8a8ba
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/router/index.js
@@ -0,0 +1,48 @@
+import { route } from 'quasar/wrappers'
+import { createRouter, createMemoryHistory, createWebHistory, createWebHashHistory } from 'vue-router'
+
+import routes from './routes'
+
+/*
+ * If not building with SSR mode, you can
+ * directly export the Router instantiation;
+ *
+ * The function below can be async too; either use
+ * async/await or return a Promise which resolves
+ * with the Router instance.
+ */
+
+export default route(function (/* { store, ssrContext } */) {
+ const createHistory = process.env.SERVER
+ ? createMemoryHistory
+ : (process.env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory)
+
+ const Router = createRouter({
+ scrollBehavior: () => ({ left: 0, top: 0 }),
+ routes,
+
+ // Leave this as is and make changes in quasar.conf.js instead!
+ // quasar.conf.js -> build -> vueRouterMode
+ // quasar.conf.js -> build -> publicPath
+ history: createHistory(process.env.MODE === 'ssr' ? void 0 : process.env.VUE_ROUTER_BASE)
+ })
+
+ // we get each page from server first!
+ if (process.env.MODE === 'ssr' && process.env.CLIENT) {
+ console.log('!!!!')
+ console.log('On route change we deliberately load page from server -- in order to test hydration errors')
+ console.log('!!!!')
+
+ let reload = false
+ Router.beforeEach((to, _, next) => {
+ if (reload) {
+ window.location.href = to.fullPath
+ return
+ }
+ reload = true
+ next()
+ })
+ }
+
+ return Router
+})
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/router/pages.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/router/pages.js
new file mode 100644
index 00000000000..616b2a1d548
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/router/pages.js
@@ -0,0 +1,27 @@
+/*
+ * Export files list for /pages folder
+ */
+
+function kebabCase (str) {
+ const result = str.replace(
+ /[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g,
+ match => '-' + match.toLowerCase()
+ )
+ return (str[0] === str[0].toUpperCase())
+ ? result.substring(1)
+ : result
+}
+
+function slugify (str) {
+ return encodeURIComponent(String(str).trim().replace(/\s+/g, '-'))
+}
+
+export default require.context('../pages', true, /^\.\/.*\.vue$/)
+ .keys()
+ .map(page => page.slice(2).replace('.vue', ''))
+ .filter(page => page !== 'Index' && page !== 'Error404')
+ .map(page => ({
+ file: page,
+ title: page + '.vue',
+ path: slugify(kebabCase(page))
+ }))
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/router/routes.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/router/routes.js
new file mode 100644
index 00000000000..dbd8b9108b7
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/dev/src/router/routes.js
@@ -0,0 +1,25 @@
+import pages from './pages'
+
+const children = pages.map(page => ({
+ path: page.path,
+ component: () => import('pages/' + page.file + '.vue')
+}))
+
+const routes = [
+ {
+ path: '/',
+ component: () => import('layouts/MyLayout.vue'),
+ children: [
+ { path: '', component: () => import('pages/Index.vue') }
+ ].concat(children)
+ },
+
+ // Always leave this as last one,
+ // but you can also remove it
+ {
+ path: '/:catchAll(.*)*',
+ component: () => import('pages/Error404.vue')
+ }
+]
+
+export default routes
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/package.json b/create-project/templates/ui-kit/quasar-v2/BASE/ui/package.json
new file mode 100644
index 00000000000..89199b1045f
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/package.json
@@ -0,0 +1,58 @@
+{
+ "name": "quasar-ui-<%= name %>",
+ "version": "0.0.1",
+ "author": "<%= author %>",
+ "description": "<%= packageDescription %>",
+ "license": "<%= license %>",
+ "module": "dist/index.esm.js",
+ "main": "dist/index.common.js",
+ "scripts": {
+ "dev": "cd dev && yarn dev && cd ..",
+ "dev:umd": "yarn build && node build/script.open-umd.js",
+ "dev:ssr": "cd dev && yarn 'dev:ssr' && cd ..",
+ "dev:ios": "cd dev && yarn 'dev:ios' && cd ..",
+ "dev:android": "cd dev && yarn 'dev:android' && cd ..",
+ "dev:electron": "cd dev && yarn 'dev:electron' && cd ..",
+ "build": "node build/index.js",
+ "build:js": "node build/script.javascript.js",
+ "build:css": "node build/script.css.js"
+ },
+ "repository": {
+ "type": "<%= repositoryType %>",
+ "url": "<%= repositoryURL %>"
+ },
+ "bugs": "<%= bugs %>",
+ "homepage": "<%= homepage %>",
+ "devDependencies": {
+ "autoprefixer": "^10.0.2",
+ "cssnano": "^4.1.10",
+ "postcss": "^8.1.9",
+ "rtlcss": "^2.6.1",
+ "sass": "1.32.0",
+ "quasar": "^2.0.0",
+ "@quasar/extras": "^1.0.0",
+ "core-js": "^3.0.0",
+ "@quasar/app": "^3.0.0",
+ "open": "^7.3.0",
+ "fs-extra": "^8.1.0",
+ "chalk": "^4.1.0",
+ "rimraf": "^3.0.0",
+ "rollup": "^2.45.0",
+ "@rollup/plugin-buble": "^0.21.3",
+ "@rollup/plugin-json": "^4.0.0",
+ "@rollup/plugin-node-resolve": "^11.2.1",
+ "@rollup/plugin-replace": "^2.4.2",
+ "uglify-js": "^3.13.3",
+ "zlib": "^1.0.5"
+ },
+ "browserslist": [
+ "last 4 Chrome versions",
+ "last 4 Firefox versions",
+ "last 2 Edge versions",
+ "last 4 Safari versions",
+ "last 4 Android versions",
+ "last 4 ChromeAndroid versions",
+ "last 4 FirefoxAndroid versions",
+ "last 4 iOS versions"
+ ]
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.common.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.common.js
new file mode 100644
index 00000000000..1bf56c0e983
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.common.js
@@ -0,0 +1,2 @@
+
+export * from './vue-plugin'
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.esm.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.esm.js
new file mode 100644
index 00000000000..7755b58d566
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.esm.js
@@ -0,0 +1,5 @@
+
+import * as VuePlugin from './vue-plugin'
+
+export * from './vue-plugin'
+export default VuePlugin
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.sass b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.sass
new file mode 100644
index 00000000000..6b331e43aea
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.sass
@@ -0,0 +1,3 @@
+@import 'quasar/src/css/variables.sass'
+@import './components/Component.sass'
+@import './directives/Directive.sass'
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.umd.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.umd.js
new file mode 100644
index 00000000000..cbc1bc3138e
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/index.umd.js
@@ -0,0 +1,3 @@
+
+import * as VuePlugin from './vue-plugin'
+export default VuePlugin
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/vue-plugin.js b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/vue-plugin.js
new file mode 100644
index 00000000000..dbad3e4c6aa
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/src/vue-plugin.js
@@ -0,0 +1,16 @@
+{{#features.component}}import Component from './components/Component'{{/features.component}}
+{{#features.directive}}import Directive from './directives/Directive'{{/features.directive}}
+
+const version = __UI_VERSION__
+
+function install (app) {
+{{#features.component}} app.component(Component.name, Component){{/features.component}}
+{{#features.directive}} app.directive(Directive.name, Directive){{/features.directive}}
+}
+
+export {
+ version,
+{{#features.component}} Component,{{/features.component}}
+{{#features.directive}} Directive,{{/features.directive}}
+ install
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/BASE/ui/umd-test.html b/create-project/templates/ui-kit/quasar-v2/BASE/ui/umd-test.html
new file mode 100644
index 00000000000..092908dfb2a
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/BASE/ui/umd-test.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en-US">
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="format-detection" content="telephone=no">
+ <meta name="msapplication-tap-highlight" content="no">
+ <meta name="viewport" content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width">
+
+ <title>UMD test</title>
+ <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons" rel="stylesheet" type="text/css">
+ <link href="https://cdn.jsdelivr.net/npm/quasar@2/dist/quasar.prod.css" rel="stylesheet" type="text/css">
+ <link href="dist/index.css" rel="stylesheet" type="text/css">
+ </head>
+ <body>
+ <div id="q-app">
+ <q-layout view="lHh Lpr fff">
+ <q-header class="glossy bg-primary">
+ <q-toolbar>
+ <q-toolbar-title>
+ quasar-ui-qui v{{ version }}
+ </q-toolbar-title>
+
+ <div>Quasar v{{ $q.version }}</div>
+ </q-toolbar>
+ </q-header>
+
+ <q-page-container>
+ <q-page padding>
+ <ul class="q-mb-lg">
+ <li>In /ui, run: "yarn build"</li>
+ <li class="text-red">You need to build & refresh page on each change manually.</li>
+ <li>Use self-closing tags only!</li>
+ <li>Example: <my-component></my-component></li>
+ </ul>
+ </q-page>
+ </q-page-container>
+ </q-layout>
+ </div>
+
+ <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/quasar@2/dist/quasar.umd.prod.js"></script>
+ <script src="dist/index.umd.js"></script>
+
+ <script>
+ const app = Vue.createApp({
+ setup () {
+ return {
+ version: <%= umdExportName %>.version
+ }
+ }
+ })
+
+ app.use(Quasar)
+ app.use(<%= umdExportName %>)
+ app.mount('#q-app')
+ </script>
+ </body>
+</html>
diff --git a/create-project/templates/ui-kit/quasar-v2/ae-install/app-extension/src/install.js b/create-project/templates/ui-kit/quasar-v2/ae-install/app-extension/src/install.js
new file mode 100644
index 00000000000..efbf85b5700
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ae-install/app-extension/src/install.js
@@ -0,0 +1,10 @@
+/**
+ * Quasar App Extension install script
+ *
+ * Docs: https://quasar.dev/app-extensions/development-guide/install-api
+ * API: https://github.com/quasarframework/quasar/blob/master/app/lib/app-extension/InstallAPI.js
+ */
+
+module.exports = function (api) {
+ //
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/ae-prompts/app-extension/src/prompts.js b/create-project/templates/ui-kit/quasar-v2/ae-prompts/app-extension/src/prompts.js
new file mode 100644
index 00000000000..8382318a612
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ae-prompts/app-extension/src/prompts.js
@@ -0,0 +1,44 @@
+/**
+ * Quasar App Extension prompts script
+ *
+ * Docs: https://quasar.dev/app-extensions/development-guide/prompts-api
+ *
+ * Inquirer prompts
+ * (answers are available as "api.prompts" in the other scripts)
+ * https://www.npmjs.com/package/inquirer#question
+ *
+ * Example:
+
+ return [
+ {
+ name: 'name',
+ type: 'string',
+ required: true,
+ message: 'Quasar CLI Extension name (without prefix)',
+ },
+ {
+ name: 'preset',
+ type: 'checkbox',
+ message: 'Check the features needed for your project:',
+ choices: [
+ {
+ name: 'Install script',
+ value: 'install'
+ },
+ {
+ name: 'Prompts script',
+ value: 'prompts'
+ },
+ {
+ name: 'Uninstall script',
+ value: 'uninstall'
+ }
+ ]
+ }
+ ]
+
+ */
+
+module.exports = function () {
+ return []
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/ae-uninstall/app-extension/src/uninstall.js b/create-project/templates/ui-kit/quasar-v2/ae-uninstall/app-extension/src/uninstall.js
new file mode 100644
index 00000000000..7794fda761e
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ae-uninstall/app-extension/src/uninstall.js
@@ -0,0 +1,10 @@
+/**
+ * Quasar App Extension uninstall script
+ *
+ * Docs: https://quasar.dev/app-extensions/development-guide/uninstall-api
+ * API: https://github.com/quasarframework/quasar/blob/master/app/lib/app-extension/UninstallAPI.js
+ */
+
+module.exports = function (api) {
+ //
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/ae/app-extension/README.md b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/README.md
new file mode 100644
index 00000000000..384ba279d4c
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/README.md
@@ -0,0 +1,33 @@
+# Quasar App Extension <%= name %>
+
+> Add a short description of your App Extension. What does it do? How is it beneficial? Why would someone want to use it?
+
+[](https://www.npmjs.com/package/quasar-app-extension-<%= name %>)
+[](https://www.npmjs.com/package/quasar-app-extension-<%= name %>)
+
+# Install
+```bash
+quasar ext add <%= name %>
+```
+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 and remove prompts.js file.
+
+# Uninstall
+```bash
+quasar ext remove <%= name %>
+```
+
+# 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
+<%= license %> (c) <%= author %>
diff --git a/create-project/templates/ui-kit/quasar-v2/ae/app-extension/_npmignore b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/_npmignore
new file mode 100644
index 00000000000..b4084a38f49
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/_npmignore
@@ -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
diff --git a/create-project/templates/ui-kit/quasar-v2/ae/app-extension/package.json b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/package.json
new file mode 100644
index 00000000000..fa4566b084f
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/package.json
@@ -0,0 +1,22 @@
+{
+ "name": "quasar-app-extension-<%= name %>",
+ "version": "0.0.1",
+ "description": "{{aeDescription}}",
+ "author": "<%= author %>",
+ "license": "<%= license %>",
+ "main": "src/index.js",
+ "repository": {
+ "type": "<%= repositoryType %>",
+ "url": "<%= repositoryURL %>"
+ },
+ "bugs": "<%= bugs %>",
+ "homepage": "<%= homepage %>",
+ "dependencies": {
+ "quasar-ui-<%= name %>": "latest"
+ },
+ "engines": {
+ "node": ">= 8.9.0",
+ "npm": ">= 5.6.0",
+ "yarn": ">= 1.6.0"
+ }
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/ae/app-extension/src/boot/register.js b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/src/boot/register.js
new file mode 100644
index 00000000000..c3289020143
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/src/boot/register.js
@@ -0,0 +1,6 @@
+import { boot } from 'quasar/wrappers'
+import VuePlugin from 'quasar-ui-<%= name %>'
+
+export default boot(({ app }) => {
+ app.use(VuePlugin)
+})
diff --git a/create-project/templates/ui-kit/quasar-v2/ae/app-extension/src/index.js b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/src/index.js
new file mode 100644
index 00000000000..23f4e440b17
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/src/index.js
@@ -0,0 +1,39 @@
+/**
+ * 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-<%= name %>/src/boot/register.js')
+
+ // make sure app extension files & ui package gets transpiled
+ conf.build.transpileDependencies.push(/quasar-app-extension-<%= name %>[\\/]src/)
+{{#or componentCss directiveCss}}
+
+ // make sure the stylesheet goes through webpack to avoid SSR issues
+ conf.css.push('~quasar-ui-<%= name %>/src/index.sass')
+{{/or}}
+}
+
+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', '^2.0.0')
+ api.compatibleWith('@quasar/app', '^3.0.0')
+
+{{#features.component}}
+ // Uncomment the line below if you provide a JSON API for your component
+ // api.registerDescribeApi('<%= componentName %>', '~quasar-ui-<%= name %>/src/components/<%= componentName %>.json')
+{{/features.component}}{{#features.directive}}
+ // Uncomment the line below if you provide a JSON API for your directive
+ // api.registerDescribeApi('<%= directiveName %>', '~quasar-ui-<%= name %>/src/directives/<%= directiveName %>.json')
+{{/features.directive}}
+
+ // We extend /quasar.conf.js
+ api.extendQuasarConf(extendConf)
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/ae/app-extension/src/templates/_gitkeep b/create-project/templates/ui-kit/quasar-v2/ae/app-extension/src/templates/_gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/create-project/templates/ui-kit/quasar-v2/index.js b/create-project/templates/ui-kit/quasar-v2/index.js
new file mode 100644
index 00000000000..ad44d46a06c
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/index.js
@@ -0,0 +1,19 @@
+
+module.exports = async function ({ scope, utils }) {
+ utils.createTargetDir(scope)
+ utils.renderTemplate(utils.join(__dirname, 'BASE'), scope)
+
+ if (scope.features.ae) {
+ utils.renderTemplate(utils.join(__dirname, 'ae'), scope)
+ if (scope.preset.install) utils.renderTemplate(utils.join(__dirname, 'ae-install'), scope)
+ if (scope.preset.prompts) utils.renderTemplate(utils.join(__dirname, 'ae-prompts'), scope)
+ if (scope.preset.uninstall) utils.renderTemplate(utils.join(__dirname, 'ae-uninstall'), scope)
+ }
+
+ if (scope.features.component) utils.renderTemplate(utils.join(__dirname, 'ui-component'), scope)
+ if (scope.features.directive) utils.renderTemplate(utils.join(__dirname, 'ui-directive'), scope)
+
+ if (scope.features.ae && (scope.features.component || scope.features.directive)) {
+ utils.renderTemplate(utils.join(__dirname, 'ui-ae'), scope)
+ }
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/ui-ae/ui/build/script.app-ext.js b/create-project/templates/ui-kit/quasar-v2/ui-ae/ui/build/script.app-ext.js
new file mode 100644
index 00000000000..29e1be07154
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ui-ae/ui/build/script.app-ext.js
@@ -0,0 +1,60 @@
+const
+ fs = require('fs'),
+ path = require('path'),
+ root = path.resolve(__dirname, '../..'),
+ resolvePath = file => path.resolve(root, file),
+ { blue } = require('chalk')
+
+const writeJson = function (file, json) {
+ return fs.writeFileSync(file, JSON.stringify(json, null, 2) + '\n', 'utf-8')
+}
+
+module.exports.syncAppExt = function (both = true) {
+ // make sure this project has an app-extension project
+ const appExtDir = resolvePath('app-extension')
+ if (!fs.existsSync(appExtDir)) {
+ return
+ }
+
+ // make sure this project has an ui project
+ const uiDir = resolvePath('ui')
+ if (!fs.existsSync(uiDir)) {
+ return
+ }
+
+ // get version and name from ui package.json
+ const { name, version } = require(resolvePath(resolvePath('ui/package.json')))
+
+ // read app-ext package.json
+ const appExtFile = resolvePath('app-extension/package.json')
+ let appExtJson = require(appExtFile),
+ finished = false
+
+ // sync version numbers
+ if (both === true) {
+ appExtJson.version = version
+ }
+
+ // check dependencies
+ if (appExtJson.dependencies !== void 0) {
+ if (appExtJson.dependencies[name] !== void 0) {
+ appExtJson.dependencies[name] = '^' + version
+ finished = true
+ }
+ }
+ // check devDependencies, if not finished
+ if (finished === false && appExtJson.devDependencies !== void 0) {
+ if (appExtJson.devDependencies[name] !== void 0) {
+ appExtJson.devDependencies[name] = '^' + version
+ finished = true
+ }
+ }
+
+ if (finished === true) {
+ writeJson(appExtFile, appExtJson)
+ console.log(` ⭐️ App Extension version ${blue(appExtJson.name)} synced with UI version.\n`)
+ return
+ }
+
+ console.error(` App Extension version and dependency NOT synced.\n`)
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/ui-component/ui/src/components/Component.js b/create-project/templates/ui-kit/quasar-v2/ui-component/ui/src/components/Component.js
new file mode 100644
index 00000000000..7422056afa2
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ui-component/ui/src/components/Component.js
@@ -0,0 +1,13 @@
+import { h } from 'vue'
+import { QBadge } from 'quasar'
+
+export default {
+ name: '<%= componentName %>',
+
+ setup () {
+ return () => h(QBadge, {
+ class: '<%= componentName %>',
+ label: '<%= componentName %>'
+ })
+ }
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/ui-component/ui/src/components/Component.sass b/create-project/templates/ui-kit/quasar-v2/ui-component/ui/src/components/Component.sass
new file mode 100644
index 00000000000..47398cb7b48
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ui-component/ui/src/components/Component.sass
@@ -0,0 +1,2 @@
+.<%= componentName %>
+ font-weight: bold
diff --git a/create-project/templates/ui-kit/quasar-v2/ui-directive/ui/src/directives/Directive.js b/create-project/templates/ui-kit/quasar-v2/ui-directive/ui/src/directives/Directive.js
new file mode 100644
index 00000000000..58d5c24a729
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ui-directive/ui/src/directives/Directive.js
@@ -0,0 +1,7 @@
+export default {
+ name: '<%= directiveName %>',
+
+ mounted (el) {
+ //
+ }
+}
diff --git a/create-project/templates/ui-kit/quasar-v2/ui-directive/ui/src/directives/Directive.sass b/create-project/templates/ui-kit/quasar-v2/ui-directive/ui/src/directives/Directive.sass
new file mode 100644
index 00000000000..2f1635cbaf2
--- /dev/null
+++ b/create-project/templates/ui-kit/quasar-v2/ui-directive/ui/src/directives/Directive.sass
@@ -0,0 +1,2 @@
+.<%= directiveName %>
+ font-size: 14px
diff --git a/create/app/utils/index.js b/create-project/utils/index.js
similarity index 62%
rename from create/app/utils/index.js
rename to create-project/utils/index.js
index 83207f06aa8..8c2a3d88d5b 100644
--- a/create/app/utils/index.js
+++ b/create-project/utils/index.js
@@ -16,41 +16,24 @@ const TEMPLATING_FILE_EXTENSIONS = [ '', '.json', '.js', '.ts', '.vue', '.md', '
module.exports.join = join
module.exports.logger = logger
-module.exports.prompts = function (questions, opts) {
+module.exports.prompts = async function (scope, questions, opts) {
const options = opts || {
onCancel: () => {
logger.fatal('Scaffolding cancelled')
}
}
- return prompts(questions, options)
+ const answers = await prompts(questions, options)
+ Object.assign(scope, answers)
}
-module.exports.getGitUser = function () {
- let name
- let email
-
- try {
- name = exec('git config --get user.name')
- email = exec('git config --get user.email')
- }
- catch (e) {}
-
- name = name && JSON.stringify(name.toString().trim()).slice(1, -1)
- email = email && (' <' + email.toString().trim() + '>')
-
- return (name || '') + (email || '')
-}
-
-module.exports.createTargetDir = function (dir, scope) {
+module.exports.createTargetDir = function (scope) {
console.log()
logger.log('Generating files...')
console.log()
const fn = scope.overwrite ? emptyDirSync : ensureDirSync
- fn(
- join(process.cwd(), dir)
- )
+ fn(scope.projectFolder)
}
module.exports.convertArrayToObject = function (arr) {
@@ -69,7 +52,7 @@ module.exports.runningPackageManager = (() => {
}
})()
-module.exports.renderTemplate = function (templateDir, dir, scope) {
+module.exports.renderTemplate = function (templateDir, scope) {
const files = fglob.sync(['**/*'], { cwd: templateDir })
for (const rawPath of files) {
@@ -81,7 +64,7 @@ module.exports.renderTemplate = function (templateDir, dir, scope) {
: name
}).join('/')
- const targetPath = resolve(dir, targetRelativePath)
+ const targetPath = resolve(scope.projectFolder, targetRelativePath)
const sourcePath = resolve(templateDir, rawPath)
ensureFileSync(targetPath)
@@ -119,6 +102,22 @@ module.exports.escapeString = function (val) {
return JSON.stringify(val).slice(1, -1)
}
+function getGitUser () {
+ let name
+ let email
+
+ try {
+ name = exec('git config --get user.name')
+ email = exec('git config --get user.email')
+ }
+ catch (e) {}
+
+ name = name && JSON.stringify(name.toString().trim()).slice(1, -1)
+ email = email && (' <' + email.toString().trim() + '>')
+
+ return (name || '') + (email || '')
+}
+
function sortObject (object) {
// Based on https://github.com/yarnpkg/yarn/blob/v1.3.2/src/config.js#L79-L85
const sortedObject = {}
@@ -155,20 +154,21 @@ module.exports.sortPackageJson = function (dir) {
*
* @param {Object} scope Data from questionnaire.
*/
-module.exports.printFinalMessage = function ({ scope, dir, packageManager }) {
+module.exports.printFinalMessage = function (scope) {
+ const verPrefix = scope.quasarVersion ? scope.quasarVersion + '.' : ''
const message = `
To get started:
${yellow(`
- cd ${dir}${ packageManager === false ? `
+ cd ${scope.projectFolderName}${ scope.skipDepsInstall !== true && scope.packageManager === false ? `
yarn #or: npm install
- yarn lint --fix # or: npm run lint -- --fix` : '' }
- quasar dev # or: yarn quasar dev # or: npx quasar dev
+ yarn lint --fix # or: npm run lint -- --fix` : '' }${ scope.skipDepsInstall !== true ? `
+ quasar dev # or: yarn quasar dev # or: npx quasar dev` : '' }
`)}
-Documentation can be found at: https://${scope.quasarVersion}.quasar.dev
+Documentation can be found at: https://${verPrefix}.quasar.dev
Quasar is relying on donations to evolve. We'd be very grateful if you can
-read our manifest on "Why donations are important": https://${scope.quasarVersion}.quasar.dev/why-donate
-Donation campaign: https://${scope.quasarVersion}.donate.quasar.dev
+read our manifest on "Why donations are important": https://${verPrefix}.quasar.dev/why-donate
+Donation campaign: https://${verPrefix}.donate.quasar.dev
Any amount is very welcomed.
If invoices are required, please first contact Razvan Stoenescu.
@@ -209,17 +209,21 @@ function runCommand (cmd, args, options) {
})
}
-module.exports.installDeps = function (dir, packageManager) {
- return runCommand(packageManager, [ 'install' ], { cwd: dir })
+module.exports.installDeps = function (scope) {
+ return runCommand(
+ scope.packageManager,
+ [ 'install' ],
+ { cwd: scope.projectFolder }
+ )
}
-module.exports.lintFolder = function (dir, packageManager) {
+module.exports.lintFolder = function (scope) {
return runCommand(
- packageManager,
- packageManager === 'npm'
+ scope.packageManager,
+ scope.packageManager === 'npm'
? ['run', 'lint', '--', '--fix']
: ['run', 'lint', '--fix'],
- { cwd: dir }
+ { cwd: scope.projectFolder }
)
}
@@ -237,3 +241,85 @@ module.exports.ensureOutsideProject = function () {
dir = normalize(join(dir, '..'))
}
}
+
+const QUASAR_VERSIONS = [
+ { title: 'Quasar v2 (Vue 3 | latest and greatest)', value: 'v2', description: 'recommended' },
+ { title: 'Quasar v1 (Vue 2)', value: 'v1' }
+]
+const SCRIPT_TYPES = [
+ { title: 'Javascript', value: 'js' },
+ { title: 'Typescript', value: 'ts' }
+]
+
+module.exports.commonPrompts = {
+ quasarVersion: {
+ type: 'select',
+ name: 'quasarVersion',
+ message: 'Pick Quasar version:',
+ initial: 0,
+ choices: QUASAR_VERSIONS
+ },
+
+ scriptType: {
+ type: 'select',
+ name: 'scriptType',
+ message: 'Pick script type:',
+ initial: 0,
+ choices: SCRIPT_TYPES
+ },
+
+ productName: {
+ type: 'text',
+ name: 'productName',
+ message: 'Project product name: (must start with letter if building mobile apps)',
+ initial: 'Quasar App',
+ validate: val =>
+ val && val.length > 0 || 'Invalid product name'
+ },
+
+ description: {
+ type: 'text',
+ name: 'description',
+ message: 'Project description:',
+ initial: 'A Quasar Project',
+ format: module.exports.escapeString,
+ validate: val =>
+ val.length > 0 || 'Invalid project description'
+ },
+
+ author: {
+ type: 'text',
+ name: 'author',
+ initial: () => getGitUser(),
+ message: 'Author:'
+ },
+
+ license: {
+ type: 'text',
+ name: 'license',
+ message: 'License type',
+ initial: 'MIT'
+ },
+
+ repositoryType: {
+ type: 'text',
+ name: 'repositoryType',
+ message: 'Repository type:',
+ initial: 'git'
+ },
+ repositoryURL: {
+ type: 'text',
+ name: 'repositoryURL',
+ message: 'Repository URL: (eg https://github.com/quasarframework/quasar)'
+ },
+ homepage: {
+ type: 'text',
+ name: 'homepage',
+ message: 'Homepage URL:'
+ },
+ bugs: {
+ type: 'string',
+ name: 'bugs',
+ message: 'Issue reporting URL: (eg https://github.com/quasarframework/quasar/issues)'
+ }
+}
diff --git a/create/app-extension/utils/logger.js b/create-project/utils/logger.js
similarity index 100%
rename from create/app-extension/utils/logger.js
rename to create-project/utils/logger.js
diff --git a/create/app-extension/index.js b/create/app-extension/index.js
deleted file mode 100755
index 330197933e3..00000000000
--- a/create/app-extension/index.js
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/bin/env node
-
-const { readFileSync, readdirSync, existsSync } = require('fs')
-const parseArgs = require('minimist')
-
-// display banner
-console.log(
- readFileSync(
- require('path').join(__dirname, 'assets/logo.art'),
- 'utf8'
- )
-)
-
-const utils = require('./utils')
-
-const argv = parseArgs(process.argv.slice(2), {
- // nothing yet
-})
-
-let dir = argv._[0]
-const defaultProjectFolder = 'quasar-ae-project'
-
-async function run () {
- const scope = await utils.prompts([
- {
- type: dir ? null : 'text',
- name: 'projectFolder',
- message: 'Project folder:',
- initial: defaultProjectFolder,
- onState: state => (dir = state.value.trim() || defaultProjectFolder)
- },
- {
- type: () =>
- !existsSync(dir) || readdirSync(dir).length === 0 ? null : 'confirm',
- name: 'overwrite',
- message: () =>
- (dir === '.'
- ? 'Current directory'
- : `Target directory "${dir}"`) +
- ` is not empty. Remove existing files and continue?`
- },
- {
- type: (_, { overwrite } = {}) => {
- if (overwrite === false) {
- utils.logger.fatal('Scaffolding cancelled')
- }
- return null
- },
- name: 'overwriteConfirmation'
- },
- {
- type: 'confirm',
- name: 'needOrgName',
- initial: false,
- message: 'Will you use an organization to publish it? Eg. "@my-org/..."'
- },
- {
- type: (_, { needOrgName } = {}) => needOrgName ? 'text' : null,
- name: 'orgName',
- message: 'Organization name, eg. "my-org":',
- validate: val =>
- val && val.length > 0 || 'Please type the organization name'
- },
- {
- type: 'text',
- name: 'name',
- message: 'Quasar App Extension ext-id (without "quasar-app-extension" prefix), eg. "my-ext"',
- validate: (val) =>
- utils.isValidPackageName(val) || 'Invalid App Extension name'
- },
- {
- type: 'text',
- name: 'description',
- message: 'Project description:',
- initial: 'A Quasar App Extension',
- format: utils.escapeString,
- validate: val =>
- val.length > 0 || 'Invalid project description'
- },
- {
- type: 'text',
- name: 'author',
- initial: () => utils.getGitUser(),
- message: 'Author:'
- },
- {
- type: 'text',
- name: 'license',
- initial: 'MIT',
- message: 'License type:'
- },
- {
- type: 'multiselect',
- name: 'preset',
- message: 'Pick the needed scripts:',
- choices: [
- {
- title: 'Prompts script',
- value: 'prompts'
- },
- {
- title: 'Install script',
- value: 'install'
- },
- {
- title: 'Uninstall script',
- value: 'uninstall'
- }
- ],
- format: utils.convertArrayToObject
- },
- {
- type: 'text',
- name: 'repositoryType',
- initial: 'git',
- message: 'Repository type:'
- },
- {
- type: 'text',
- name: 'repositoryURL',
- message: 'Repository URL (eg https://github.com/quasarframework/quasar):'
- },
- {
- type: 'text',
- name: 'homepage',
- message: 'Homepage URL:'
- },
- {
- type: 'text',
- name: 'bugs',
- message: 'Issue reporting URL (eg https://github.com/quasarframework/quasar/issues):'
- }
- ])
-
- const runTemplate = require(`./templates/ae-v1`)
- await runTemplate({ scope, dir, utils })
-
- utils.sortPackageJson(dir)
-
- console.log()
- utils.logger.success('The project has been scaffolded')
- console.log()
-
- utils.printFinalMessage({ scope, dir })
-}
-
-run()
diff --git a/create/app-extension/templates/ae-v1/index.js b/create/app-extension/templates/ae-v1/index.js
deleted file mode 100644
index a384fc385e6..00000000000
--- a/create/app-extension/templates/ae-v1/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-
-module.exports = async function ({
- scope,
- dir,
- utils
-}) {
- utils.createTargetDir(dir, scope)
- utils.renderTemplate(utils.join(__dirname, 'BASE'), dir, scope)
-
- if (scope.preset.prompts) utils.renderTemplate(utils.join(__dirname, 'prompts-script'), dir, scope)
- if (scope.preset.install) utils.renderTemplate(utils.join(__dirname, 'install-script'), dir, scope)
- if (scope.preset.uninstall) utils.renderTemplate(utils.join(__dirname, 'uninstall-script'), dir, scope)
-}
diff --git a/create/app-extension/utils/index.js b/create/app-extension/utils/index.js
deleted file mode 100644
index f11e54160d7..00000000000
--- a/create/app-extension/utils/index.js
+++ /dev/null
@@ -1,168 +0,0 @@
-
-const { readFileSync, writeFileSync } = require('fs')
-const { join, resolve, extname } = require('path')
-const { emptyDirSync, ensureDirSync, ensureFileSync, copySync } = require('fs-extra')
-const prompts = require('prompts')
-const compileTemplate = require('lodash.template')
-const fglob = require('fast-glob')
-const { yellow, green } = require('kolorist')
-const exec = require('child_process').execSync
-
-const logger = require('./logger')
-
-const TEMPLATING_FILE_EXTENSIONS = [ '', '.json', '.js', '.ts', '.vue', '.md', '.html' ]
-
-module.exports.join = join
-module.exports.logger = logger
-
-module.exports.prompts = function (questions, opts) {
- const options = opts || {
- onCancel: () => {
- logger.fatal('Scaffolding cancelled')
- }
- }
-
- return prompts(questions, options)
-}
-
-module.exports.getGitUser = function () {
- let name
- let email
-
- try {
- name = exec('git config --get user.name')
- email = exec('git config --get user.email')
- }
- catch (e) {}
-
- name = name && JSON.stringify(name.toString().trim()).slice(1, -1)
- email = email && (' <' + email.toString().trim() + '>')
-
- return (name || '') + (email || '')
-}
-
-module.exports.createTargetDir = function (dir, scope) {
- console.log()
- logger.log('Generating files...')
- console.log()
-
- const fn = scope.overwrite ? emptyDirSync : ensureDirSync
- fn(
- join(process.cwd(), dir)
- )
-}
-
-module.exports.convertArrayToObject = function (arr) {
- const acc = {}
- arr.forEach(key => {
- acc[key] = true
- })
- return acc
-}
-
-module.exports.renderTemplate = function (templateDir, dir, scope) {
- const files = fglob.sync(['**/*'], { cwd: templateDir })
-
- for (const rawPath of files) {
- const targetRelativePath = rawPath.split('/').map(name => {
- // dotfiles are ignored when published to npm, therefore in templates
- // we need to use underscore instead (e.g. "_gitignore")
- return name.charAt(0) === '_'
- ? `.${name.slice(1)}`
- : name
- }).join('/')
-
- const targetPath = resolve(dir, targetRelativePath)
- const sourcePath = resolve(templateDir, rawPath)
-
- ensureFileSync(targetPath)
-
- console.log(` ${green('-')} ${targetRelativePath}`)
-
- if (TEMPLATING_FILE_EXTENSIONS.includes(extname(targetRelativePath))) {
- const rawContent = readFileSync(sourcePath, 'utf-8')
- const template = compileTemplate(rawContent, { 'interpolate': /<%=([\s\S]+?)%>/g })
-
- writeFileSync(targetPath, template(scope), 'utf-8')
- }
- else {
- copySync(sourcePath, targetPath)
- }
- }
-}
-
-module.exports.isValidPackageName = function (projectName) {
- return /^(?:@[a-z0-9-*~][a-z0-9-*._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/.test(
- projectName
- )
-}
-
-module.exports.inferPackageName = function (projectFolder) {
- return projectFolder
- .trim()
- .toLowerCase()
- .replace(/\s+/g, '-')
- .replace(/^[._]/, '')
- .replace(/[^a-z0-9-~]+/g, '-')
-}
-
-module.exports.escapeString = function (val) {
- return JSON.stringify(val).slice(1, -1)
-}
-
-function sortObject (object) {
- // Based on https://github.com/yarnpkg/yarn/blob/v1.3.2/src/config.js#L79-L85
- const sortedObject = {}
- Object.keys(object)
- .sort()
- .forEach(item => {
- sortedObject[item] = object[item]
- })
- return sortedObject
-}
-
-/**
- * Sorts dependencies in package.json alphabetically.
- * They are unsorted because they were grouped for the templating
- *
- * @param {string} dir Target directory for scaffolding
- */
-module.exports.sortPackageJson = function (dir) {
- const pkgFile = join(dir, 'package.json')
- const pkg = JSON.parse(readFileSync(pkgFile))
-
- if (pkg.dependencies) {
- pkg.dependencies = sortObject(pkg.dependencies)
- }
- if (pkg.devDependencies) {
- pkg.devDependencies = sortObject(pkg.devDependencies)
- }
-
- writeFileSync(pkgFile, JSON.stringify(pkg, null, 2) + '\n')
-}
-
-/**
- * Prints the final message with instructions of necessary next steps.
- */
-module.exports.printFinalMessage = function ({ dir }) {
- const message = `
-To get started:
-
- ${yellow(`cd ${dir}`)}
-
-Documentation can be found at: https://quasar.dev
-
-Quasar is relying on donations to evolve. We'd be very grateful if you can
-read our manifest on "Why donations are important": https://quasar.dev/why-donate
-Donation campaign: https://donate.quasar.dev
-Any amount is very welcomed.
-If invoices are required, please first contact Razvan Stoenescu.
-
-Please give us a star on Github if you appreciate our work:
- https://github.com/quasarframework/quasar
-
-Enjoy! - Quasar Team
-`
-
- console.log(message)
-}
diff --git a/create/app/README.md b/create/app/README.md
deleted file mode 100644
index dbf53835999..00000000000
--- a/create/app/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## WORK IN PROGRESS
diff --git a/create/app/assets/logo.art b/create/app/assets/logo.art
deleted file mode 100644
index cc8f1eae98a..00000000000
--- a/create/app/assets/logo.art
+++ /dev/null
@@ -1,10 +0,0 @@
-
- .d88888b.
-d88P" "Y88b
-888 888
-888 888 888 888 8888b. .d8888b 8888b. 888d888
-888 888 888 888 "88b 88K "88b 888P"
-888 Y8b 888 888 888 .d888888 "Y8888b. .d888888 888
-Y88b.Y8b88P Y88b 888 888 888 X88 888 888 888
- "Y888888" "Y88888 "Y888888 88888P' "Y888888 888
- Y8b
diff --git a/create/app/index.js b/create/app/index.js
deleted file mode 100755
index 24b53a5b49f..00000000000
--- a/create/app/index.js
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/usr/bin/env node
-
-const QUASAR_VERSIONS = [
- { title: 'Quasar v2 (Vue 3 | latest and greatest)', value: 'v2', description: 'recommended' },
- { title: 'Quasar v1 (Vue 2)', value: 'v1' }
-]
-const SCRIPT_TYPES = [
- { title: 'Javascript', value: 'js' },
- { title: 'Typescript', value: 'ts' }
-]
-
-const { readFileSync, readdirSync, existsSync } = require('fs')
-const parseArgs = require('minimist')
-
-// display banner
-console.log(
- readFileSync(
- require('path').join(__dirname, 'assets/logo.art'),
- 'utf8'
- )
-)
-
-const utils = require('./utils')
-
-// should error out if already inside of a Quasar project
-utils.ensureOutsideProject()
-
-const argv = parseArgs(process.argv.slice(2), {
- alias: {
- v: 'version',
- t: 'type'
- },
- string: [ 'v', 't' ]
-})
-
-let dir = argv._[0]
-const defaultProjectFolder = 'quasar-project'
-const versionOptions = QUASAR_VERSIONS.map(entry => entry.value)
-const scriptTypeOptions = SCRIPT_TYPES.map(entry => entry.value)
-
-async function run () {
- const initialAnswers = await utils.prompts([
- {
- type: dir ? null : 'text',
- name: 'projectFolder',
- message: 'Project folder:',
- initial: defaultProjectFolder,
- onState: state => (dir = state.value.trim() || defaultProjectFolder)
- },
- {
- type: () =>
- !existsSync(dir) || readdirSync(dir).length === 0 ? null : 'confirm',
- name: 'overwrite',
- message: () =>
- (dir === '.'
- ? 'Current directory'
- : `Target directory "${dir}"`) +
- ` is not empty. Remove existing files and continue?`
- },
- {
- type: (_, { overwrite } = {}) => {
- if (overwrite === false) {
- utils.logger.fatal('Scaffolding cancelled')
- }
- return null
- },
- name: 'overwriteConfirmation'
- },
- {
- type: argv.version && versionOptions.includes(argv.version) ? null : 'select',
- name: 'quasarVersion',
- message: argv.version && versionOptions.includes(argv.version) === false
- ? `"${argv.version}" isn't a valid Quasar version. Please choose from below: `
- : 'Pick Quasar version:',
- initial: 0,
- choices: QUASAR_VERSIONS
- },
- {
- type: argv.version && scriptTypeOptions.includes(argv.version) === true ? null : 'select',
- name: 'scriptType',
- message: argv.type && scriptTypeOptions.includes(argv.type) === false
- ? `"${argv.version}" isn't a valid script type. Please choose from below: `
- : 'Pick script type:',
- initial: 0,
- choices: SCRIPT_TYPES
- }
- ])
-
- const getTemplateName = require(`./templates/quasar-${initialAnswers.quasarVersion}/get-template-name`)
- const templateName = await getTemplateName(initialAnswers, utils)
-
- const commonAnswers = await utils.prompts([
- {
- type: 'text',
- name: 'name',
- message: 'Package name:',
- initial: () => utils.inferPackageName(dir),
- validate: (val) =>
- utils.isValidPackageName(val) || 'Invalid package.json name'
- },
- {
- type: 'text',
- name: 'productName',
- message: 'Project product name (must start with letter if building mobile apps)',
- initial: 'Quasar App',
- validate: val =>
- val && val.length > 0 || 'Invalid product name'
- },
- {
- type: 'text',
- name: 'description',
- message: 'Project description',
- initial: 'A Quasar Framework app',
- format: utils.escapeString,
- validate: val =>
- val.length > 0 || 'Invalid project description'
- },
- {
- type: 'text',
- name: 'author',
- initial: () => utils.getGitUser(),
- message: 'Author'
- }
- ])
-
- const scope = { ...initialAnswers, ...commonAnswers }
-
- const runTemplate = require(`./templates/quasar-${initialAnswers.quasarVersion}/${templateName}`)
- await runTemplate({ scope, dir, utils })
-
- utils.sortPackageJson(dir)
-
- console.log()
- utils.logger.success('The project has been scaffolded')
- console.log()
-
- const { packageManager } = await utils.prompts([
- {
- type: 'select',
- name: 'packageManager',
- message:
- 'Install project dependencies? (recommended)',
- choices: () => (
- utils.runningPackageManager
- ? [
- { title: `Yes, use ${utils.runningPackageManager}`, value: utils.runningPackageManager },
- { title: 'No, I will handle that myself', value: false }
- ]
- : [
- { title: 'Yes, use Yarn (recommended)', value: 'yarn' },
- { title: 'Yes, use NPM', value: 'npm' },
- { title: 'No, I will handle that myself', value: false }
- ]
- )
- }
- ], {
- onCancel: () => {
- utils.printFinalMessage({ scope, dir, packageManager: false })
- process.exit(0)
- }
- })
-
- if (packageManager !== false) {
- try {
- await utils.installDeps(dir, packageManager)
- }
- catch {
- utils.logger.warn('Could not auto install dependencies. Probably a temporary npm registry issue?')
- utils.printFinalMessage({ scope, dir, packageManager: false })
- process.exit(0)
- }
-
- if (scope.lint) {
- try {
- await utils.lintFolder(dir, packageManager)
- }
- catch {
- utils.logger.warn('Could not auto lint fix the project folder.')
- }
- }
- }
-
- utils.printFinalMessage({ scope, dir, packageManager })
-}
-
-run()
diff --git a/create/app/package.json b/create/app/package.json
deleted file mode 100644
index ee7ef19e1ee..00000000000
--- a/create/app/package.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "name": "@quasar/app",
- "version": "5.0.0",
- "description": "Scaffolds Quasar apps for Quasar CLI consumption",
- "author": {
- "name": "Razvan Stoenescu",
- "email": "[email protected]",
- "url": "https://github.com/quasarframework"
- },
- "license": "MIT",
- "main": "index.js",
- "bin": {
- "create-quasar-app": "index.js",
- "cqa": "index.js"
- },
- "repository": {
- "type": "git",
- "url": "https://github.com/quasarframework/quasar"
- },
- "bugs": "https://github.com/quasarframework/quasar/issues",
- "homepage": "https://quasar.dev",
- "funding": {
- "type": "github",
- "url": "https://donate.quasar.dev"
- },
- "engines": {
- "node": ">=12"
- },
- "dependencies": {
- "fast-glob": "^3.2.11",
- "fs-extra": "^10.0.1",
- "kolorist": "^1.5.1",
- "lodash.template": "^4.5.0",
- "minimist": "^1.2.5",
- "prompts": "^2.4.2"
- },
- "publishConfig": {
- "access": "public"
- }
-}
diff --git a/create/app/templates/quasar-v1/get-template-name.js b/create/app/templates/quasar-v1/get-template-name.js
deleted file mode 100644
index 94d572156f9..00000000000
--- a/create/app/templates/quasar-v1/get-template-name.js
+++ /dev/null
@@ -1,4 +0,0 @@
-
-module.exports = function (initialAnswers) {
- return initialAnswers.scriptType
-}
diff --git a/create/app/templates/quasar-v2/get-template-name.js b/create/app/templates/quasar-v2/get-template-name.js
deleted file mode 100644
index 6d22bbc811e..00000000000
--- a/create/app/templates/quasar-v2/get-template-name.js
+++ /dev/null
@@ -1,17 +0,0 @@
-
-module.exports = async function (initialAnswers, utils) {
- const answer = await utils.prompts([
- {
- type: 'select',
- name: 'engine',
- message: 'Pick Quasar App CLI variant:',
- initial: 0,
- choices: [
- { title: 'Quasar App CLI with Webpack (stable)', value: 'webpack' },
- { title: 'Quasar App CLI with Vite (beta stage)', value: 'vite' }
- ]
- }
- ])
-
- return `${initialAnswers.scriptType}-${answer.engine}`
-}
diff --git a/create/app/utils/logger.js b/create/app/utils/logger.js
deleted file mode 100644
index b1344729be6..00000000000
--- a/create/app/utils/logger.js
+++ /dev/null
@@ -1,134 +0,0 @@
-const {
- bgGreen, green,
- inverse,
- bgRed, red,
- bgYellow, yellow,
- black, white,
- underline
-} = require('kolorist')
-
-const readline = require('readline')
-
-/**
- * Pills
- */
-
-const successPill = msg => bgGreen(black(` ${msg} `))
-const infoPill = msg => inverse(` ${msg} `)
-const errorPill = msg => bgRed(white(` ${msg} `))
-const warningPill = msg => bgYellow(black(` ${msg} `))
-
-/**
- * Main approach
- */
-
-const dot = '•'
-const banner = 'Quasar ' + dot
-const greenBanner = green(banner)
-const redBanner = red(banner)
-const yellowBanner = yellow(banner)
-const tipBanner = `${green('App')} ${dot} ${successPill('TIP')} ${dot} 🚀 `
-
-module.exports.dot = dot
-
-module.exports.clearConsole = process.stdout.isTTY
- ? () => {
- // Fill screen with blank lines. Then move to 0 (beginning of visible part) and clear it
- const blank = '\n'.repeat(process.stdout.rows)
- console.log(blank)
- readline.cursorTo(process.stdout, 0, 0)
- readline.clearScreenDown(process.stdout)
- }
- : () => {}
-
-module.exports.tip = function (msg) {
- console.log(msg ? ` ${tipBanner} ${msg}` : '')
-}
-
-module.exports.log = function (msg) {
- console.log(msg ? ` ${greenBanner} ${msg}` : '')
-}
-
-module.exports.warn = function (msg, pill) {
- if (msg !== void 0) {
- const pillBanner = pill !== void 0
- ? bgYellow(black('', pill, '')) + ' '
- : ''
-
- console.warn(` ${yellowBanner} ⚠️ ${pillBanner}${msg}`)
- }
- else {
- console.warn()
- }
-}
-
-module.exports.fatal = function (msg, pill) {
- if (msg !== void 0) {
- const pillBanner = pill !== void 0
- ? errorPill(pill) + ' '
- : ''
-
- console.error(`\n ${redBanner} ⚠️ ${pillBanner}${msg}\n`)
- }
- else {
- console.error()
- }
-
- process.exit(1)
-}
-
-/**
- * Extended approach - Status & pills
- */
-
-module.exports.successPill = successPill
-module.exports.success = function (msg, title = 'SUCCESS') {
- console.log(` ${greenBanner} ${successPill(title)} ${green(dot + ' ' + msg)}`)
-}
-module.exports.getSuccess = function (msg, title) {
- return ` ${greenBanner} ${successPill(title)} ${green(dot + ' ' + msg)}`
-}
-
-module.exports.infoPill = infoPill
-module.exports.info = function (msg, title = 'INFO') {
- console.log(` ${greenBanner} ${infoPill(title)} ${green(dot)} ${msg}`)
-}
-module.exports.getInfo = function (msg, title) {
- return ` ${greenBanner} ${infoPill(title)} ${green(dot)} ${msg}`
-}
-
-module.exports.errorPill = errorPill
-module.exports.error = function (msg, title = 'ERROR') {
- console.log(` ${redBanner} ${errorPill(title)} ${red(dot + ' ' + msg)}`)
-}
-module.exports.getError = function (msg, title = 'ERROR') {
- return ` ${redBanner} ${errorPill(title)} ${red(dot + ' ' + msg)}`
-}
-
-module.exports.warningPill = warningPill
-module.exports.warning = function (msg, title = 'WARNING') {
- console.log(` ${yellowBanner} ${warningPill(title)} ${yellow(dot + ' ' + msg)}`)
-}
-module.exports.getWarning = function (msg, title = 'WARNING') {
- return ` ${yellowBanner} ${warningPill(title)} ${yellow(dot + ' ' + msg)}`
-}
-
-/**
- * Progress related
- */
-
-module.exports.progress = function start (msg, token) {
- const parseMsg = token !== void 0
- ? text => text.replace('___', underline(green(token)))
- : text => text
-
- module.exports.info(parseMsg(msg), 'WAIT')
-
- const startTime = Date.now()
-
- return msg => {
- const diffTime = +new Date() - startTime
- module.exports.success(`${parseMsg(msg)} ${dot} ${diffTime}ms`, 'DONE')
- module.exports.log()
- }
-}
|
e8e916c7c39d182339038c0180b3bf758ae5bd27
|
2022-03-09 02:15:51
|
Razvan Stoenescu
|
feat(create-app): more work
| false
|
more work
|
feat
|
diff --git a/create-app/templates/quasar-v1/js/BASE/src/pages/Error404.vue b/create-app/templates/quasar-v1/js/BASE/src/pages/Error404.vue
index ab4b5b8682f..c4c2d6cf70f 100644
--- a/create-app/templates/quasar-v1/js/BASE/src/pages/Error404.vue
+++ b/create-app/templates/quasar-v1/js/BASE/src/pages/Error404.vue
@@ -24,6 +24,6 @@
<script>
export default {
- name: 'Error404'
+ name: 'ErrorNotFound'
}
</script>
diff --git a/create-app/templates/quasar-v1/ts/BASE/src/pages/Error404.vue b/create-app/templates/quasar-v1/ts/BASE/src/pages/Error404.vue
index 04e9c2eb2d8..ffe43a055d4 100644
--- a/create-app/templates/quasar-v1/ts/BASE/src/pages/Error404.vue
+++ b/create-app/templates/quasar-v1/ts/BASE/src/pages/Error404.vue
@@ -27,18 +27,18 @@
import { defineComponent } from '@vue/composition-api';
export default defineComponent({
- name: 'Error404',
+ name: 'ErrorNotFound',
});
<% } else if (typescriptConfig === 'class') { %>
import { Vue, Component } from 'vue-property-decorator';
@Component
-export default class Error404 extends Vue {}
+export default class ErrorNotFound extends Vue {}
<% } else if (typescriptConfig === 'options') { %>
import Vue from 'vue';
export default Vue.extend({
- name: 'Error404'
+ name: 'ErrorNotFound'
});
<% } %>
</script>
diff --git a/create-app/templates/quasar-v2/js-vite/BASE/package.json b/create-app/templates/quasar-v2/js-vite/BASE/package.json
index 90cc4e9c27a..8f6dee80345 100644
--- a/create-app/templates/quasar-v2/js-vite/BASE/package.json
+++ b/create-app/templates/quasar-v2/js-vite/BASE/package.json
@@ -22,15 +22,15 @@
},
"devDependencies": {
<% if (preset.lint) { %>
- "eslint": "^7.14.0",
- "eslint-plugin-vue": "^7.0.0",
+ "eslint": "^8.10.0",
+ "eslint-plugin-vue": "^8.5.0",
<% if (lintConfig === 'standard') { %>
"eslint-config-standard": "^16.0.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-node": "^11.0.0",
- "eslint-plugin-promise": "^5.1.0",
+ "eslint-plugin-promise": "^6.0.0",
<% } else if (lintConfig === 'airbnb') { %>
- "eslint-config-airbnb-base": "^14.0.0",
+ "eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.20.1",
<% } else if (lintConfig === 'prettier') { %>
"eslint-config-prettier": "^8.1.0",
diff --git a/create-app/templates/quasar-v2/js-vite/BASE/postcss.config.js b/create-app/templates/quasar-v2/js-vite/BASE/postcss.config.js
index 6dc8abcf7d3..0ee0d8c2127 100644
--- a/create-app/templates/quasar-v2/js-vite/BASE/postcss.config.js
+++ b/create-app/templates/quasar-v2/js-vite/BASE/postcss.config.js
@@ -1,4 +1,4 @@
-/* eslint-env node */
+/* eslint-disable */
// https://github.com/michael-ciniawsky/postcss-load-config
module.exports = {
diff --git a/create-app/templates/quasar-v2/js-vite/BASE/src/pages/Error404.vue b/create-app/templates/quasar-v2/js-vite/BASE/src/pages/Error404.vue
index de8bedfb362..c1c178b3877 100644
--- a/create-app/templates/quasar-v2/js-vite/BASE/src/pages/Error404.vue
+++ b/create-app/templates/quasar-v2/js-vite/BASE/src/pages/Error404.vue
@@ -26,6 +26,6 @@
import { defineComponent } from 'vue'
export default defineComponent({
- name: 'Error404'
+ name: 'ErrorNotFound'
})
</script>
diff --git a/create-app/templates/quasar-v2/js-vite/index.js b/create-app/templates/quasar-v2/js-vite/index.js
index db06b82b0be..1b7304081b3 100644
--- a/create-app/templates/quasar-v2/js-vite/index.js
+++ b/create-app/templates/quasar-v2/js-vite/index.js
@@ -23,7 +23,7 @@ module.exports = async function ({
choices: [
{ title: 'ESLint', value: 'lint', description: 'recommended', selected: true },
{ title: 'State Management (Pinia)', value: 'pinia', description: 'https://pinia.vuejs.org' },
- { title: 'State Management (Vuex) [DEPRECATED; see https://vuejs.org/guide/scaling-up/state-management.html#pinia]', value: 'vuex', disabled: true },
+ { title: 'State Management (Vuex) [DEPRECATED; see https://vuejs.org/guide/scaling-up/state-management.html#pinia]', value: 'vuex' },
{ title: 'Axios', value: 'axios' },
{ title: 'Vue-i18n', value: 'i18n' }
],
@@ -49,7 +49,8 @@ module.exports = async function ({
if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
- if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
- if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
+
+ if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
+ else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
}
diff --git a/create-app/templates/quasar-v2/js-webpack/BASE/_postcssrc.js b/create-app/templates/quasar-v2/js-webpack/BASE/_postcssrc.js
index 6dc8abcf7d3..0ee0d8c2127 100644
--- a/create-app/templates/quasar-v2/js-webpack/BASE/_postcssrc.js
+++ b/create-app/templates/quasar-v2/js-webpack/BASE/_postcssrc.js
@@ -1,4 +1,4 @@
-/* eslint-env node */
+/* eslint-disable */
// https://github.com/michael-ciniawsky/postcss-load-config
module.exports = {
diff --git a/create-app/templates/quasar-v2/js-webpack/BASE/babel.config.js b/create-app/templates/quasar-v2/js-webpack/BASE/babel.config.js
index be49396ab73..063ef53a0cf 100644
--- a/create-app/templates/quasar-v2/js-webpack/BASE/babel.config.js
+++ b/create-app/templates/quasar-v2/js-webpack/BASE/babel.config.js
@@ -1,4 +1,4 @@
-/* eslint-env node */
+/* eslint-disable */
module.exports = api => {
return {
diff --git a/create-app/templates/quasar-v2/js-webpack/BASE/package.json b/create-app/templates/quasar-v2/js-webpack/BASE/package.json
index 4fa1dc7ce1f..40133fe254e 100644
--- a/create-app/templates/quasar-v2/js-webpack/BASE/package.json
+++ b/create-app/templates/quasar-v2/js-webpack/BASE/package.json
@@ -24,16 +24,16 @@
"devDependencies": {
<% if (preset.lint) { %>
"@babel/eslint-parser": "^7.13.14",
- "eslint": "^7.14.0",
- "eslint-plugin-vue": "^7.0.0",
+ "eslint": "^8.10.0",
+ "eslint-plugin-vue": "^8.5.0",
"eslint-webpack-plugin": "^2.4.0",
<% if (lintConfig === 'standard') { %>
"eslint-config-standard": "^16.0.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-node": "^11.0.0",
- "eslint-plugin-promise": "^5.1.0",
+ "eslint-plugin-promise": "^6.0.0",
<% } else if (lintConfig === 'airbnb') { %>
- "eslint-config-airbnb-base": "^14.0.0",
+ "eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.20.1",
<% } else if (lintConfig === 'prettier') { %>
"eslint-config-prettier": "^8.1.0",
diff --git a/create-app/templates/quasar-v2/js-webpack/BASE/src/pages/Error404.vue b/create-app/templates/quasar-v2/js-webpack/BASE/src/pages/Error404.vue
index de8bedfb362..c1c178b3877 100644
--- a/create-app/templates/quasar-v2/js-webpack/BASE/src/pages/Error404.vue
+++ b/create-app/templates/quasar-v2/js-webpack/BASE/src/pages/Error404.vue
@@ -26,6 +26,6 @@
import { defineComponent } from 'vue'
export default defineComponent({
- name: 'Error404'
+ name: 'ErrorNotFound'
})
</script>
diff --git a/create-app/templates/quasar-v2/js-webpack/index.js b/create-app/templates/quasar-v2/js-webpack/index.js
index db06b82b0be..1b7304081b3 100644
--- a/create-app/templates/quasar-v2/js-webpack/index.js
+++ b/create-app/templates/quasar-v2/js-webpack/index.js
@@ -23,7 +23,7 @@ module.exports = async function ({
choices: [
{ title: 'ESLint', value: 'lint', description: 'recommended', selected: true },
{ title: 'State Management (Pinia)', value: 'pinia', description: 'https://pinia.vuejs.org' },
- { title: 'State Management (Vuex) [DEPRECATED; see https://vuejs.org/guide/scaling-up/state-management.html#pinia]', value: 'vuex', disabled: true },
+ { title: 'State Management (Vuex) [DEPRECATED; see https://vuejs.org/guide/scaling-up/state-management.html#pinia]', value: 'vuex' },
{ title: 'Axios', value: 'axios' },
{ title: 'Vue-i18n', value: 'i18n' }
],
@@ -49,7 +49,8 @@ module.exports = async function ({
if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
- if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
- if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
if (scope.preset.lint) utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
+
+ if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
+ else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
}
diff --git a/create-app/templates/quasar-v2/ts-vite/BASE/package.json b/create-app/templates/quasar-v2/ts-vite/BASE/package.json
index 947497e21c9..00707c1b512 100644
--- a/create-app/templates/quasar-v2/ts-vite/BASE/package.json
+++ b/create-app/templates/quasar-v2/ts-vite/BASE/package.json
@@ -26,16 +26,16 @@
"vue-tsc": "^0.29.8",
"@typescript-eslint/eslint-plugin": "^5.10.0",
"@typescript-eslint/parser": "^5.10.0",
- "eslint": "^7.14.0",
- "eslint-plugin-vue": "^7.0.0",
+ "eslint": "^8.10.0",
+ "eslint-plugin-vue": "^8.5.0",
<% if (lintConfig === 'standard') { %>
"eslint-config-standard": "^16.0.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-node": "^11.0.0",
- "eslint-plugin-promise": "^5.1.0",
+ "eslint-plugin-promise": "^6.0.0",
<% } %>
<% if (lintConfig === 'airbnb') { %>
- "eslint-config-airbnb-base": "^14.0.0",
+ "eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.20.1",
<% } %>
<% if (lintConfig === 'prettier') { %>
diff --git a/create-app/templates/quasar-v2/ts-vite/BASE/postcssrc.config.js b/create-app/templates/quasar-v2/ts-vite/BASE/postcssrc.config.js
index 6dc8abcf7d3..0ee0d8c2127 100644
--- a/create-app/templates/quasar-v2/ts-vite/BASE/postcssrc.config.js
+++ b/create-app/templates/quasar-v2/ts-vite/BASE/postcssrc.config.js
@@ -1,4 +1,4 @@
-/* eslint-env node */
+/* eslint-disable */
// https://github.com/michael-ciniawsky/postcss-load-config
module.exports = {
diff --git a/create-app/templates/quasar-v2/ts-vite/BASE/src/pages/Error404.vue b/create-app/templates/quasar-v2/ts-vite/BASE/src/pages/Error404.vue
index 67b77fa90f1..3f1f1d1ca2e 100644
--- a/create-app/templates/quasar-v2/ts-vite/BASE/src/pages/Error404.vue
+++ b/create-app/templates/quasar-v2/ts-vite/BASE/src/pages/Error404.vue
@@ -26,12 +26,12 @@
<% if (typescriptConfig === 'composition') { %>import { defineComponent } from 'vue';
export default defineComponent({
- name: 'Error404'
+ name: 'ErrorNotFound'
});<% } else if (typescriptConfig === 'options') { %>import { defineComponent } from 'vue';
export default defineComponent({
- name: 'Error404'
+ name: 'ErrorNotFound'
});<% } else if (typescriptConfig === 'class') { %>import { Vue } from 'vue-class-component';
-export default class Error404 extends Vue {}<% } %>
+export default class ErrorNotFound extends Vue {}<% } %>
</script>
diff --git a/create-app/templates/quasar-v2/ts-vite/index.js b/create-app/templates/quasar-v2/ts-vite/index.js
index 7e22a140e38..34f767dea40 100644
--- a/create-app/templates/quasar-v2/ts-vite/index.js
+++ b/create-app/templates/quasar-v2/ts-vite/index.js
@@ -34,7 +34,7 @@ module.exports = async function ({
choices: [
{ title: 'ESLint', value: 'lint', description: 'recommended', selected: true },
{ title: 'State Management (Pinia)', value: 'pinia', description: 'https://pinia.vuejs.org' },
- { title: 'State Management (Vuex) [DEPRECATED; see https://vuejs.org/guide/scaling-up/state-management.html#pinia]', value: 'vuex', disabled: true },
+ { title: 'State Management (Vuex) [DEPRECATED; see https://vuejs.org/guide/scaling-up/state-management.html#pinia]', value: 'vuex' },
{ title: 'Axios', value: 'axios' },
{ title: 'Vue-i18n', value: 'i18n' }
],
@@ -60,12 +60,13 @@ module.exports = async function ({
if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
- if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
- if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
if (scope.preset.lint) {
utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
if (scope.lintConfig === 'prettier') {
utils.renderTemplate(utils.join(__dirname, 'prettier'), dir, scope)
}
}
+
+ if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
+ else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
}
diff --git a/create-app/templates/quasar-v2/ts-vite/lint/_eslintignore b/create-app/templates/quasar-v2/ts-vite/lint/_eslintignore
index cdbb6f4615b..7b59e09d273 100644
--- a/create-app/templates/quasar-v2/ts-vite/lint/_eslintignore
+++ b/create-app/templates/quasar-v2/ts-vite/lint/_eslintignore
@@ -4,4 +4,4 @@
/.quasar
/node_modules
.eslintrc.js
-babel.config.js
+/src-ssr
diff --git a/create-app/templates/quasar-v2/ts-webpack/BASE/_postcssrc.js b/create-app/templates/quasar-v2/ts-webpack/BASE/_postcssrc.js
index 6dc8abcf7d3..0ee0d8c2127 100644
--- a/create-app/templates/quasar-v2/ts-webpack/BASE/_postcssrc.js
+++ b/create-app/templates/quasar-v2/ts-webpack/BASE/_postcssrc.js
@@ -1,4 +1,4 @@
-/* eslint-env node */
+/* eslint-disable */
// https://github.com/michael-ciniawsky/postcss-load-config
module.exports = {
diff --git a/create-app/templates/quasar-v2/ts-webpack/BASE/babel.config.js b/create-app/templates/quasar-v2/ts-webpack/BASE/babel.config.js
index be49396ab73..063ef53a0cf 100644
--- a/create-app/templates/quasar-v2/ts-webpack/BASE/babel.config.js
+++ b/create-app/templates/quasar-v2/ts-webpack/BASE/babel.config.js
@@ -1,4 +1,4 @@
-/* eslint-env node */
+/* eslint-disable */
module.exports = api => {
return {
diff --git a/create-app/templates/quasar-v2/ts-webpack/BASE/package.json b/create-app/templates/quasar-v2/ts-webpack/BASE/package.json
index b371675a734..b821f9e1133 100644
--- a/create-app/templates/quasar-v2/ts-webpack/BASE/package.json
+++ b/create-app/templates/quasar-v2/ts-webpack/BASE/package.json
@@ -27,17 +27,17 @@
"vue-tsc": "^0.29.8",
"@typescript-eslint/eslint-plugin": "^5.10.0",
"@typescript-eslint/parser": "^5.10.0",
- "eslint": "^7.14.0",
- "eslint-plugin-vue": "^7.0.0",
+ "eslint": "^8.10.0",
+ "eslint-plugin-vue": "^8.5.0",
<% if (!preset.typescript) { %>"eslint-webpack-plugin": "^2.4.0",<% } %>
<% if (lintConfig === 'standard') { %>
"eslint-config-standard": "^16.0.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-node": "^11.0.0",
- "eslint-plugin-promise": "^5.1.0",
+ "eslint-plugin-promise": "^6.0.0",
<% } %>
<% if (lintConfig === 'airbnb') { %>
- "eslint-config-airbnb-base": "^14.0.0",
+ "eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.20.1",
<% } %>
<% if (lintConfig === 'prettier') { %>
diff --git a/create-app/templates/quasar-v2/ts-webpack/BASE/src/pages/Error404.vue b/create-app/templates/quasar-v2/ts-webpack/BASE/src/pages/Error404.vue
index 67b77fa90f1..3f1f1d1ca2e 100644
--- a/create-app/templates/quasar-v2/ts-webpack/BASE/src/pages/Error404.vue
+++ b/create-app/templates/quasar-v2/ts-webpack/BASE/src/pages/Error404.vue
@@ -26,12 +26,12 @@
<% if (typescriptConfig === 'composition') { %>import { defineComponent } from 'vue';
export default defineComponent({
- name: 'Error404'
+ name: 'ErrorNotFound'
});<% } else if (typescriptConfig === 'options') { %>import { defineComponent } from 'vue';
export default defineComponent({
- name: 'Error404'
+ name: 'ErrorNotFound'
});<% } else if (typescriptConfig === 'class') { %>import { Vue } from 'vue-class-component';
-export default class Error404 extends Vue {}<% } %>
+export default class ErrorNotFound extends Vue {}<% } %>
</script>
diff --git a/create-app/templates/quasar-v2/ts-webpack/index.js b/create-app/templates/quasar-v2/ts-webpack/index.js
index ba83176a0cf..3e2fcd6a5a3 100644
--- a/create-app/templates/quasar-v2/ts-webpack/index.js
+++ b/create-app/templates/quasar-v2/ts-webpack/index.js
@@ -34,7 +34,7 @@ module.exports = async function ({
choices: [
{ title: 'ESLint', value: 'lint', description: 'recommended', selected: true },
{ title: 'State Management (Pinia)', value: 'pinia', description: 'https://pinia.vuejs.org' },
- { title: 'State Management (Vuex) [DEPRECATED; see https://vuejs.org/guide/scaling-up/state-management.html#pinia]', value: 'vuex', disabled: true },
+ { title: 'State Management (Vuex) [DEPRECATED; see https://vuejs.org/guide/scaling-up/state-management.html#pinia]', value: 'vuex' },
{ title: 'Axios', value: 'axios' },
{ title: 'Vue-i18n', value: 'i18n' }
],
@@ -60,12 +60,13 @@ module.exports = async function ({
if (scope.preset.axios) utils.renderTemplate(utils.join(__dirname, 'axios'), dir, scope)
if (scope.preset.i18n) utils.renderTemplate(utils.join(__dirname, 'i18n'), dir, scope)
- if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
- if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
if (scope.preset.lint) {
utils.renderTemplate(utils.join(__dirname, 'lint'), dir, scope)
if (scope.lintConfig === 'prettier') {
utils.renderTemplate(utils.join(__dirname, 'prettier'), dir, scope)
}
}
+
+ if (scope.preset.pinia) utils.renderTemplate(utils.join(__dirname, 'pinia'), dir, scope)
+ else if (scope.preset.vuex) utils.renderTemplate(utils.join(__dirname, 'vuex'), dir, scope)
}
diff --git a/create-app/templates/quasar-v2/ts-webpack/lint/_eslintignore b/create-app/templates/quasar-v2/ts-webpack/lint/_eslintignore
index f5bb4168bf1..47d6d521b48 100644
--- a/create-app/templates/quasar-v2/ts-webpack/lint/_eslintignore
+++ b/create-app/templates/quasar-v2/ts-webpack/lint/_eslintignore
@@ -6,3 +6,4 @@
/node_modules
.eslintrc.js
babel.config.js
+/src-ssr
|
29bfcc40a9fcb47d45a29807a6cdec68b4f6caf3
|
2024-04-15 12:52:13
|
Razvan Stoenescu
|
feat(ui/testing): add frame-debounce test file
| false
|
add frame-debounce test file
|
feat
|
diff --git a/ui/src/utils/debounce.test.js b/ui/src/utils/debounce.test.js
index 2de23838e70..86d6dd3cd45 100644
--- a/ui/src/utils/debounce.test.js
+++ b/ui/src/utils/debounce.test.js
@@ -179,7 +179,7 @@ describe('[debounce API]', () => {
const callback = vi.fn()
debounce(callback, 100)
- vi.advanceTimersByTime(150)
+ vi.runAllTimers()
expect(callback).not.toHaveBeenCalled()
})
diff --git a/ui/src/utils/frame-debounce.js b/ui/src/utils/frame-debounce.js
index 1044b5d22aa..dafd2b56b30 100644
--- a/ui/src/utils/frame-debounce.js
+++ b/ui/src/utils/frame-debounce.js
@@ -6,7 +6,7 @@ export default function (fn) {
if (wait === true) return
wait = true
- frame = requestAnimationFrame(() => {
+ frame = window.requestAnimationFrame(() => {
fn.apply(this, callArgs)
callArgs = void 0
wait = false
diff --git a/ui/src/utils/frame-debounce.test.js b/ui/src/utils/frame-debounce.test.js
new file mode 100644
index 00000000000..a87f0bab555
--- /dev/null
+++ b/ui/src/utils/frame-debounce.test.js
@@ -0,0 +1,127 @@
+import {
+ describe, test, expect, vi,
+ beforeEach, afterEach
+} from 'vitest'
+
+import frameDebounce from './frame-debounce.js'
+
+beforeEach(() => {
+ vi.useFakeTimers()
+})
+
+afterEach(() => {
+ vi.clearAllTimers()
+ vi.restoreAllMocks()
+})
+
+describe('[frameDebounce API]', () => {
+ describe('[Functions]', () => {
+ describe('[(function)default]', () => {
+ test('has correct return value', () => {
+ const fn = frameDebounce(() => {})
+
+ expect(
+ fn
+ ).toBeTypeOf('function')
+
+ expect(
+ fn.cancel
+ ).toBeTypeOf('function')
+ })
+
+ test('should debounce with fast timeout', () => {
+ const callback = vi.fn()
+ const fn = frameDebounce(callback)
+
+ setTimeout(fn, 1)
+ setTimeout(fn, 5)
+ setTimeout(fn, 10)
+ setTimeout(fn, 11)
+
+ vi.advanceTimersByTime(17)
+
+ expect(callback).toHaveBeenCalledTimes(1)
+ })
+
+ test('should not execute prior to timeout', () => {
+ const callback = vi.fn()
+ const fn = frameDebounce(callback)
+
+ setTimeout(fn, 1)
+ setTimeout(fn, 5)
+
+ vi.advanceTimersByTime(7)
+ expect(callback).not.toHaveBeenCalled()
+
+ vi.advanceTimersByTime(100)
+ expect(callback).toHaveBeenCalledTimes(1)
+ })
+
+ test('should cancel frame debounced function', () => {
+ const callback = vi.fn()
+ const fn = frameDebounce(callback)
+
+ fn()
+ fn()
+ fn.cancel()
+ vi.advanceTimersByTime(100)
+
+ expect(callback).not.toHaveBeenCalled()
+ })
+
+ test('should execute with correct args when called again from within timeout', () => {
+ const callback = vi.fn()
+ const fn = frameDebounce(callback)
+
+ fn(1)
+ setTimeout(() => fn(1, 2, '3'), 1)
+ vi.advanceTimersByTime(170)
+
+ expect(callback).toHaveBeenCalledWith(1, 2, '3')
+ })
+
+ test('repeated rapid calls', () => {
+ const callback = vi.fn()
+ const fn = frameDebounce(callback)
+
+ fn()
+ fn()
+ fn()
+ fn()
+ fn()
+
+ vi.advanceTimersByTime(100)
+
+ expect(callback).toHaveBeenCalledTimes(1)
+ })
+
+ test('multiple independent instances', () => {
+ const callback1 = vi.fn()
+ const callback2 = vi.fn()
+ const fn1 = frameDebounce(callback1)
+ const fn2 = frameDebounce(callback2)
+
+ fn1()
+ fn1()
+
+ fn2()
+ fn2()
+ fn2()
+
+ vi.advanceTimersByTime(100)
+
+ expect(callback1).toHaveBeenCalledTimes(1)
+ expect(callback2).toHaveBeenCalledTimes(1)
+ })
+
+ test('no calls made', () => {
+ const callback = vi.fn()
+ frameDebounce(callback)
+
+ vi.runAllTimers()
+
+ expect(callback).not.toHaveBeenCalled()
+ })
+ })
+ })
+})
diff --git a/ui/src/utils/throttle.test.js b/ui/src/utils/throttle.test.js
index 32118f37881..2c6689e0db7 100644
--- a/ui/src/utils/throttle.test.js
+++ b/ui/src/utils/throttle.test.js
@@ -137,7 +137,7 @@ describe('[throttle API]', () => {
const callback = vi.fn()
throttle(callback, 100)
- vi.advanceTimersByTime(150)
+ vi.runAllTimers()
expect(callback).not.toHaveBeenCalled()
})
diff --git a/ui/testing/vitest.config.js b/ui/testing/vitest.config.js
index de61fe52b04..72c61daa748 100644
--- a/ui/testing/vitest.config.js
+++ b/ui/testing/vitest.config.js
@@ -33,6 +33,9 @@ export default defineConfig(() => {
test: {
globals: true,
environment: 'jsdom',
+ environmentOptions: {
+ pretendToBeVisual: true
+ },
// browser: {
// enabled: true,
// headless: true,
|
0c3efa9a00b9f56e02ebc2bbc5fb598230b536a2
|
2018-01-07 16:47:01
|
Razvan Stoenescu
|
chore: Update backers
| false
|
Update backers
|
chore
|
diff --git a/backers.md b/backers.md
index 3ea1cf857d7..b10b8196dd1 100644
--- a/backers.md
+++ b/backers.md
@@ -78,6 +78,7 @@ It could be you!
- Josh Torres
- Stian Mikkelsen
- El Matzo
+- Thomas Gick
- Ken ($5)
- Oliver ($5)
|
efc420afdbb78c0ef176d3198038cb3b957815c4
|
2020-01-14 14:42:17
|
Razvan Stoenescu
|
fix(TouchPan): mouseAllDir ignored on start #6099
| false
|
mouseAllDir ignored on start #6099
|
fix
|
diff --git a/ui/src/directives/TouchPan.js b/ui/src/directives/TouchPan.js
index 2413c401f91..1b9ad1e79f1 100644
--- a/ui/src/directives/TouchPan.js
+++ b/ui/src/directives/TouchPan.js
@@ -180,11 +180,12 @@ export default {
start (evt, mouseEvent) {
client.is.firefox === true && preventDraggable(el, true)
+ let detected = mouseEvent === true && modifiers.mouseAllDir === true
const pos = position(evt)
// stop propagation so possible upper v-touch-pan don't catch this as well
if (
- (mouseEvent === true && modifiers.mouseAllDir === true) ||
+ detected === true ||
(mouseEvent !== true && modifiers.stop === true)
) {
const clone = evt.type.indexOf('mouse') > -1
@@ -213,7 +214,7 @@ export default {
y: pos.top,
time: Date.now(),
mouse: mouseEvent === true,
- detected: false,
+ detected,
isFirst: true,
isFinal: false,
lastX: pos.left,
|
d1768aca2026e20aa8fd42f569f259980dd46312
|
2023-10-21 21:42:14
|
Razvan Stoenescu
|
fix(docs): md tables parsing
| false
|
md tables parsing
|
fix
|
diff --git a/docs/quasar.config.js b/docs/quasar.config.js
index 7e80574ea19..7c1d47fc0cc 100644
--- a/docs/quasar.config.js
+++ b/docs/quasar.config.js
@@ -67,6 +67,9 @@ export default ctx => ({
iconSet: 'svg-mdi-v6',
autoImportVueExtensions: [ 'vue', 'md' ],
+ components: [
+ 'QMarkupTable' // used by md-plugin-table
+ ],
config: {
loadingBar: {
|
4655861d99cbfc048f3a317da62c42d34e678252
|
2016-06-14 01:06:19
|
Razvan Stoenescu
|
chore: Version bump for NPM release
| false
|
Version bump for NPM release
|
chore
|
diff --git a/package.json b/package.json
index d502cee8e86..b893ae017cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "quasar-framework",
- "version": "0.1.1",
+ "version": "0.1.2",
"description": "Simultaneously build desktop/mobile SPA websites & phone/tablet apps.",
"files": [
"dist"
|
69abc12e2edde892ca8d8a6dc63f03c587d0666d
|
2019-02-04 10:18:21
|
Jeff Galbraith
|
feat(docs): Reworked QUploader (#3148)
| false
|
Reworked QUploader (#3148)
|
feat
|
diff --git a/docs/src/examples/QUploader/AutoMultiple.vue b/docs/src/examples/QUploader/AutoMultiple.vue
index 58b10f726b7..6b00636ebc5 100644
--- a/docs/src/examples/QUploader/AutoMultiple.vue
+++ b/docs/src/examples/QUploader/AutoMultiple.vue
@@ -1,23 +1,18 @@
<template>
- <div>
- <div class="q-layout-padding">
- <div class="q-gutter-sm">
- <q-uploader class="q-mb-lg" label="Auto Uploader" auto url="http://localhost:4444/upload" />
- <q-uploader label="Multiple File Uploader" multiple url="http://localhost:4444/upload" />
- </div>
- </div>
+ <div class="q-pa-md q-gutter-sm">
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Auto upload"
+ bordered
+ multiple
+ auto-upload
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Batch upload (min 5 files)"
+ bordered
+ multiple
+ :batch="(files) => files.length >= 5"
+ />
</div>
</template>
-
-<script>
-export default {
- methods: {
- onChange (val) {
- console.log('@change', JSON.stringify(val))
- },
- onInput (val) {
- console.log('@input', JSON.stringify(val))
- }
- }
-}
-</script>
diff --git a/docs/src/examples/QUploader/Basic.vue b/docs/src/examples/QUploader/Basic.vue
deleted file mode 100644
index 3c3b625a495..00000000000
--- a/docs/src/examples/QUploader/Basic.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
- <div class="q-pa-md">
- <q-uploader url="http://localhost:4444/upload" />
- </div>
-</template>
diff --git a/docs/src/examples/QUploader/CustomHeader.vue b/docs/src/examples/QUploader/CustomHeader.vue
new file mode 100644
index 00000000000..6badadec122
--- /dev/null
+++ b/docs/src/examples/QUploader/CustomHeader.vue
@@ -0,0 +1,34 @@
+<template>
+ <div class="q-pa-md">
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Custom header"
+ bordered
+ multiple
+ >
+ <div slot="header" slot-scope="scope" class="row no-wrap items-center q-pa-sm q-gutter-xs">
+ <q-btn v-if="scope.queuedFiles.length > 0" icon="clear_all" @click="scope.removeQueuedFiles" round dense flat >
+ <q-tooltip>Clear All</q-tooltip>
+ </q-btn>
+ <q-btn v-if="scope.uploadedFiles.length > 0" icon="done_all" @click="scope.removeUploadedFiles" round dense flat >
+ <q-tooltip>Remove Uploaded Files</q-tooltip>
+ </q-btn>
+ <q-spinner v-if="scope.isUploading" class="q-uploader__spinner" />
+ <div class="col">
+ <div class="q-uploader__title">Upload your files</div>
+ <div class="q-uploader__subtitle">{{ scope.uploadSizeLabel }} / {{ scope.uploadProgressLabel }}</div>
+ </div>
+ <q-btn v-if="scope.editable" icon="add_box" @click="scope.pickFiles" round dense flat >
+ <q-tooltip>Pick Files</q-tooltip>
+ </q-btn>
+ <q-btn v-if="scope.editable && scope.queuedFiles.length > 0" icon="cloud_upload" @click="scope.upload" round dense flat >
+ <q-tooltip>Upload Files</q-tooltip>
+ </q-btn>
+
+ <q-btn v-if="scope.editable && scope.isUploading" icon="clear" @click="scope.abort" round dense flat >
+ <q-tooltip>Abort Upload</q-tooltip>
+ </q-btn>
+ </div>
+ </q-uploader>
+ </div>
+</template>
diff --git a/docs/src/examples/QUploader/CustomList.vue b/docs/src/examples/QUploader/CustomList.vue
new file mode 100644
index 00000000000..d904fe60ac9
--- /dev/null
+++ b/docs/src/examples/QUploader/CustomList.vue
@@ -0,0 +1,46 @@
+<template>
+ <div class="q-pa-md">
+ <q-uploader
+ style="width: 100%"
+ url="http://localhost:4444/upload"
+ label="Custom list"
+ bordered
+ multiple
+ >
+ <q-list separator dense class="q-pa-sm" slot="list" slot-scope="props">
+
+ <q-item v-ripple v-for="file in props.files" :key="file.name">
+ <q-item-section v-if="file.__img" top thumbnail class="q-ml-none">
+ <img :src="file.__img.src">
+ </q-item-section>
+
+ <q-item-section top>
+ <q-item-label>{{ file.name }}</q-item-label>
+ <q-item-label caption>{{ humanFileSize(file) }}</q-item-label>
+ </q-item-section>
+
+ <q-item-section top side>
+ <div class="text-grey-8 q-gutter-xs">
+ <q-btn class="gt-xs" size="12px" flat dense round icon="delete" ></q-btn>
+ <q-btn class="gt-xs" size="12px" flat dense round icon="done" ></q-btn>
+ <q-btn size="12px" flat dense round icon="more_vert" ></q-btn>
+ </div>
+ </q-item-section>
+
+ </q-item>
+
+ </q-list>
+ </q-uploader>
+ </div>
+</template>
+
+<script>
+export default {
+ methods: {
+ humanFileSize (file) {
+ let i = Math.floor(Math.log(file.size) / Math.log(1024))
+ return (file.size / Math.pow(1024, i)).toFixed(1) * 1 + ['B', 'kB', 'MB', 'GB', 'TB'][i]
+ }
+ }
+}
+</script>
diff --git a/docs/src/examples/QUploader/Dark.vue b/docs/src/examples/QUploader/Dark.vue
new file mode 100644
index 00000000000..57f9676a11e
--- /dev/null
+++ b/docs/src/examples/QUploader/Dark.vue
@@ -0,0 +1,8 @@
+<template>
+ <div class="q-pa-md">
+ <q-uploader
+ url="http://localhost:4444/upload"
+ dark
+ />
+ </div>
+</template>
diff --git a/docs/src/examples/QUploader/Design.vue b/docs/src/examples/QUploader/Design.vue
new file mode 100644
index 00000000000..8afa9c76b21
--- /dev/null
+++ b/docs/src/examples/QUploader/Design.vue
@@ -0,0 +1,48 @@
+<template>
+ <div class="q-pa-md q-gutter-sm">
+ <q-uploader
+ url="http://localhost:4444/upload"
+ bordered
+ label="Color"
+ color="orange-7"
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Text Color"
+ bordered
+ color="yellow-3"
+ text-color="orange-7"
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Inline"
+ bordered
+ inline
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Inline"
+ bordered
+ inline
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Inline"
+ bordered
+ inline
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Disabled"
+ bordered
+ disable
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Readonly"
+ bordered
+ readonly
+ />
+
+ </div>
+</template>
diff --git a/docs/src/examples/QUploader/Filtered.vue b/docs/src/examples/QUploader/Filtered.vue
new file mode 100644
index 00000000000..a829b7b1e8d
--- /dev/null
+++ b/docs/src/examples/QUploader/Filtered.vue
@@ -0,0 +1,32 @@
+<template>
+ <div class="q-pa-md q-gutter-sm">
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Filtered (for <2k size)"
+ bordered
+ multiple
+ :filter="(files) => files.filter(checkFileSize)"
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Filtered (png only)"
+ bordered
+ multiple
+ :filter="(files) => files.filter(checkFileType)"
+ />
+ </div>
+</template>
+
+<script>
+export default {
+ methods: {
+ checkFileSize (file) {
+ return file.size < 2048
+ },
+
+ checkFileType (file) {
+ return file.type === 'image/png'
+ }
+ }
+}
+</script>
diff --git a/docs/src/examples/QUploader/OtherFeatures.vue b/docs/src/examples/QUploader/OtherFeatures.vue
new file mode 100644
index 00000000000..58365bc4438
--- /dev/null
+++ b/docs/src/examples/QUploader/OtherFeatures.vue
@@ -0,0 +1,39 @@
+<template>
+ <div class="q-pa-md q-gutter-sm">
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Multiple files"
+ bordered
+ multiple
+ />
+ <div>In the following example, only images will be displayed in the selection.</div>
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Restricted to images"
+ bordered
+ multiple
+ accept=".jpg, image/*"
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Max file size (2k)"
+ bordered
+ multiple
+ :max-file-size="2048"
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Max upload size (4k)"
+ bordered
+ multiple
+ :max-total-size="4096"
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="No thumbnails"
+ bordered
+ multiple
+ no-thumbnails
+ />
+ </div>
+</template>
diff --git a/docs/src/examples/QUploader/Styling.vue b/docs/src/examples/QUploader/Styling.vue
deleted file mode 100644
index 24c7c16ab5e..00000000000
--- a/docs/src/examples/QUploader/Styling.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
- <div>
- <div class="q-layout-padding" :class="`bg-${dark ? 'black' : 'white'}${dark ? ' text-white' : ''}`">
- <div class="q-gutter-sm q-mb-md">
- <q-toggle v-model="dark" :dark="dark" label="Dark" />
- <q-toggle v-model="square" :dark="dark" label="Square" />
- <q-toggle v-model="flat" :dark="dark" label="Flat" />
- <q-toggle v-model="bordered" :dark="dark" label="Bordered" />
- <q-toggle v-model="inline" :dark="dark" label="Inline" />
- <q-toggle v-model="noThumbnails" :dark="dark" label="No Thumbnails" />
- <q-toggle v-model="label" :dark="dark" label="Label" />
- </div>
-
- <div class="q-gutter-sm">
- <q-uploader v-bind="props" multiple url="http://localhost:4444/upload" />
- <q-uploader v-bind="props" multiple url="http://localhost:4444/upload" />
- <q-uploader v-bind="props" multiple url="http://localhost:4444/upload" />
- </div>
- </div>
- </div>
-</template>
-
-<script>
-export default {
- data () {
- return {
- dark: false,
- square: false,
- flat: false,
- bordered: false,
- inline: true,
- noThumbnails: false,
- label: true
- }
- },
-
- computed: {
- props () {
- return {
- dark: this.dark,
- square: this.square,
- flat: this.flat,
- bordered: this.bordered,
- inline: this.inline,
- noThumbnails: this.noThumbnails,
- label: this.label ? 'Upload files' : null
- }
- }
- },
-
- methods: {
- onChange (val) {
- console.log('@change', JSON.stringify(val))
- },
- onInput (val) {
- console.log('@input', JSON.stringify(val))
- }
- }
-}
-</script>
diff --git a/docs/src/examples/QUploader/Types.vue b/docs/src/examples/QUploader/Types.vue
new file mode 100644
index 00000000000..a8846707040
--- /dev/null
+++ b/docs/src/examples/QUploader/Types.vue
@@ -0,0 +1,29 @@
+<template>
+ <div class="q-pa-md q-gutter-sm">
+ <!-- basic -->
+ <q-uploader
+ url="http://localhost:4444/upload"
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Label"
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Bordered"
+ bordered
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Square"
+ bordered
+ square
+ />
+ <q-uploader
+ url="http://localhost:4444/upload"
+ label="Flat"
+ bordered
+ flat
+ />
+ </div>
+</template>
diff --git a/docs/src/pages/vue-components/uploader.md b/docs/src/pages/vue-components/uploader.md
index 882bd72cdc6..4c66c1483e9 100644
--- a/docs/src/pages/vue-components/uploader.md
+++ b/docs/src/pages/vue-components/uploader.md
@@ -1,18 +1,48 @@
---
title: Uploader
---
-Quasar supplies a way for you to upload files through QUploader component.
+The QUploader component allows end-users to upload files to your server. It has two types of file selection: single or multiple.
## Installation
<doc-installation components="QUploader" />
## Usage
-<doc-example title="Basic" file="QUploader/Basic" />
+::: warning
+QUploader requires a back-end server to receive the files. The examples below will not actually upload.
+:::
-<doc-example title="Styling uploader" file="QUploader/Styling" />
+::: tip
+QUploader is `drag and drop` compliant.
+:::
+
+<doc-example title="Types" file="QUploader/Types" />
+
+### Design
+
+<doc-example title="Design" file="QUploader/Design" />
+
+<doc-example title="Dark" file="QUploader/Dark" dark />
+
+### Other features
+
+<doc-example title="Other Features" file="QUploader/OtherFeatures" />
<doc-example title="Auto upload & batch uploading" file="QUploader/AutoMultiple" />
-## API
+### Filtering
+
+::: tip
+Filtering happens after selection.
+:::
+
+<doc-example title="Filter" file="QUploader/Filtered" />
+
+### Slots
+
+<doc-example title="Custom Header (slot)" file="QUploader/CustomHeader" />
+
+<doc-example title="Custom List (slot)" file="QUploader/CustomList" />
+
+## QUploader API
<doc-api file="QUploader" />
|
7d6236339991a326345318296c78fbaf04a8f0dc
|
2019-01-31 21:12:41
|
Razvan Stoenescu
|
feat(docs): Timeline review
| false
|
Timeline review
|
feat
|
diff --git a/docs/src/examples/QTimeline/Basic.vue b/docs/src/examples/QTimeline/Basic.vue
index 314e07cf867..3bb7bffdbd4 100644
--- a/docs/src/examples/QTimeline/Basic.vue
+++ b/docs/src/examples/QTimeline/Basic.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-px-xl q-py-md">
+ <div class="q-pa-md">
<q-timeline color="secondary">
<q-timeline-entry heading>Timeline heading</q-timeline-entry>
diff --git a/docs/src/examples/QTimeline/Dark.vue b/docs/src/examples/QTimeline/Dark.vue
index 889932f4da6..eba56cd0936 100644
--- a/docs/src/examples/QTimeline/Dark.vue
+++ b/docs/src/examples/QTimeline/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-px-xl q-py-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-10 text-white">
<q-timeline dark color="secondary">
<q-timeline-entry heading>Timeline heading</q-timeline-entry>
diff --git a/docs/src/examples/QTimeline/Layouts.vue b/docs/src/examples/QTimeline/Layouts.vue
index 41fa0b5ef54..3ab3cbb35ab 100644
--- a/docs/src/examples/QTimeline/Layouts.vue
+++ b/docs/src/examples/QTimeline/Layouts.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-px-xl q-py-md">
+ <div class="q-pa-md">
<div class="row q-gutter-md q-mb-sm">
<q-option-group
type="radio"
@@ -15,6 +15,7 @@
type="radio"
dense
v-model="side"
+ :disable="layout === 'loose'"
:options="[
{ label: 'Content on right', value: 'right' },
{ label: 'Content on left', value: 'left' }
diff --git a/docs/src/examples/QTimeline/Responsive.vue b/docs/src/examples/QTimeline/Responsive.vue
index 48a009274a4..05c516054c5 100644
--- a/docs/src/examples/QTimeline/Responsive.vue
+++ b/docs/src/examples/QTimeline/Responsive.vue
@@ -1,7 +1,11 @@
<template>
- <div class="q-px-xl q-py-md">
- <q-timeline :layout="$q.screen.lt.sm ? 'dense' : ($q.screen.lt.md ? 'comfortable' : 'loose')" color="secondary">
- <q-timeline-entry heading>Timeline heading ({{$q.screen.lt.sm ? 'Dense' : ($q.screen.lt.md ? 'Comfortable' : 'Loose')}} layout)</q-timeline-entry>
+ <div class="q-pa-md">
+ <q-timeline :layout="layout" color="secondary">
+ <q-timeline-entry heading>
+ Timeline heading
+ <br>
+ ({{$q.screen.lt.sm ? 'Dense' : ($q.screen.lt.md ? 'Comfortable' : 'Loose')}} layout)
+ </q-timeline-entry>
<q-timeline-entry
title="Event Title"
@@ -80,3 +84,13 @@
</q-timeline>
</div>
</template>
+
+<script>
+export default {
+ computed: {
+ layout () {
+ return this.$q.screen.lt.sm ? 'dense' : (this.$q.screen.lt.md ? 'comfortable' : 'loose')
+ }
+ }
+}
+</script>
diff --git a/docs/src/pages/vue-components/timeline.md b/docs/src/pages/vue-components/timeline.md
index 568c84d2995..9bec97ddf48 100644
--- a/docs/src/pages/vue-components/timeline.md
+++ b/docs/src/pages/vue-components/timeline.md
@@ -1,7 +1,7 @@
---
title: Timeline
---
-A Timeline is a display of a list of events in chronological order. It is typically a graphic design showing a long bar labelled with dates alongside itself and usually events. Timelines can use any time scale, depending on the subject and data.
+The QTimeline component displays a list of events in chronological order. It is typically a graphic design showing a long bar labelled with dates alongside itself and usually events. Timelines can use any time scale, depending on the subject and data.
QTimeline has 3 layouts:
@@ -18,10 +18,18 @@ QTimeline has 3 layouts:
<doc-example title="On dark background" file="QTimeline/Dark" dark scrollable />
+### Layouts and side selection
+
+::: warning
+QTimelineEntry only takes into account its `side` prop if QTimeline has a layout other than `loose`.
+:::
+
<doc-example title="Layouts and side selection" file="QTimeline/Layouts" scrollable />
+### Responsive
+
::: tip
-The examples below uses `$q.screen` to detect changes in window size to see all 3 breakpoints in action.
+The examples below uses `$q.screen` to detect changes in window size to see all 3 layouts in action.
:::
<doc-example title="Responsive layout" file="QTimeline/Responsive" scrollable />
diff --git a/quasar/src/components/timeline/QTimeline.json b/quasar/src/components/timeline/QTimeline.json
index 0f810275f45..e0f76ad85b8 100644
--- a/quasar/src/components/timeline/QTimeline.json
+++ b/quasar/src/components/timeline/QTimeline.json
@@ -6,18 +6,16 @@
"side": {
"type": "String",
- "desc": "Side to place the timeline entries in small and medium size",
+ "desc": "Side to place the timeline entries in dense and comfortable layout; For loose layout it gets overriden by QTimelineEntry side prop",
"default": "right",
- "values": [ "left", "right" ],
- "examples": [ "left" ]
+ "values": [ "left", "right" ]
},
"layout": {
"type": "String",
"desc": "Layout of the timeline. Dense keeps content and labels on one side. Comfortable keeps content on one side and labels on the opposite side. Loose puts content on both sides.",
"default": "large",
- "values": [ "dense", "comfortable", "loose" ],
- "examples": [ "comfortable" ]
+ "values": [ "dense", "comfortable", "loose" ]
},
"dark": {
diff --git a/quasar/src/components/timeline/QTimelineEntry.json b/quasar/src/components/timeline/QTimelineEntry.json
index 6d040b92944..7f3aa708606 100644
--- a/quasar/src/components/timeline/QTimelineEntry.json
+++ b/quasar/src/components/timeline/QTimelineEntry.json
@@ -14,10 +14,9 @@
"side": {
"type": "String",
- "desc": "Side to place the timeline entry",
+ "desc": "Side to place the timeline entry; Works only if QTimeline layout is loose.",
"default": "right",
- "values": [ "left", "right" ],
- "examples": [ "left" ]
+ "values": [ "left", "right" ]
},
"icon": {
|
20a93b27037ceef886e9b8400286b66eb84ff986
|
2018-09-27 15:03:16
|
Razvan Stoenescu
|
fix: floating QChip under next button if on button group
| false
|
floating QChip under next button if on button group
|
fix
|
diff --git a/src/components/chip/chip.styl b/src/components/chip/chip.styl
index 6623affc986..03ce6474304 100644
--- a/src/components/chip/chip.styl
+++ b/src/components/chip/chip.styl
@@ -35,6 +35,7 @@ $chip-height = 32px
top -.4em
right -.5em
pointer-events none
+ z-index 1
.q-avatar
font-size $chip-height
|
f0cf03986c4a6f9c131b1da3f4217d589a559c69
|
2022-10-01 16:57:57
|
Razvan Stoenescu
|
feat(QBtn/QTab): improve onClick navigation
| false
|
improve onClick navigation
|
feat
|
diff --git a/ui/dev/src/pages/components/tabs-router.vue b/ui/dev/src/pages/components/tabs-router.vue
index d0f117349b0..5a5b8b37397 100644
--- a/ui/dev/src/pages/components/tabs-router.vue
+++ b/ui/dev/src/pages/components/tabs-router.vue
@@ -63,7 +63,9 @@ export default {
navRedirect (e, go) {
e.preventDefault() // we cancel the default navigation
- go({ query: { tab: '2', noScroll: true } })
+ go({
+ to: { query: { tab: '2', noScroll: true } }
+ })
},
navPass () {},
diff --git a/ui/dev/src/pages/components/tabs.vue b/ui/dev/src/pages/components/tabs.vue
index 58467b9ba82..7a490176b99 100644
--- a/ui/dev/src/pages/components/tabs.vue
+++ b/ui/dev/src/pages/components/tabs.vue
@@ -327,28 +327,28 @@
<q-toggle v-model="useR1Q1Disabled" label="Insert r.1 q=1 loose & disabled" />
<q-tabs :dense="dense" class="test q-mt-sm" active-class="test-active-class" no-caps outside-arrows>
<q-tab label="Gigi" />
- <q-route-tab v-if="loose" key="01" replace :to="{ name: 'r.1.1' }" label="r.1.1 *" />
- <q-route-tab v-if="loose" key="02" replace :to="{ name: 'r' }" label="r *" />
- <q-route-tab v-if="exact" key="03" replace :to="{ name: 'r' }" exact label="r" />
- <q-route-tab v-if="loose && useR1Q1Disabled" key="04" replace :to="{ name: 'r.1', query: { q: '1' } }" label="r.1 q=1 * disabled" disable />
- <q-route-tab v-if="loose" key="05" replace :to="{ name: 'r.1', query: { q: '1' } }" label="r.1 q=1 *" />
- <q-route-tab v-if="exact" key="06" replace :to="{ name: 'r.1', query: { q: '1' } }" exact label="r.1 q=1" />
- <q-route-tab v-if="exact && useR1" key="07" replace :to="{ name: 'r.1' }" exact label="r.1" />
- <q-route-tab v-if="exact" key="08" replace :to="{ name: 'r.1.1' }" exact label="r.1.1" />
- <q-route-tab v-if="loose" key="04" replace :to="{ name: 'r.2', query: { y: '1' } }" label="r.2 y=1 *" />
- <q-route-tab v-if="loose" key="11" replace :to="{ name: 'r.1.4' }" label="r.1.4 => r.1.1 *" />
- <q-route-tab v-if="loose" key="11" replace :to="{ name: 'r.1.4' }" label="r.1.4 => r.1.1" />
- <q-route-tab v-if="loose" key="09" replace :to="{ name: 'r.1.2' }" label="r.1.2 *" />
- <q-route-tab v-if="exact" key="10" replace :to="{ name: 'r.1.2' }" exact label="r.1.2" />
- <q-route-tab v-if="loose" key="11" replace :to="{ name: 'r.1.3' }" label="r.1.3 => r *" />
- <q-route-tab v-if="exact" key="12" replace :to="{ name: 'r.1.3' }" exact label="r.1.3 => r" />
- <q-route-tab v-if="exact" key="12" replace :to="{ name: 'r.1.3' }" exact label="r.1.3 => r" />
- <q-route-tab v-if="exact" key="13" replace to="/components/tabs/r/2#123456" exact label="r/2#123456" />
- <q-route-tab v-if="exact" key="14" replace to="/components/tabs/r/2#123" exact label="r/2#123" />
- <q-route-tab v-if="loose" key="15" replace :to="{ name: 'r.2' }" label="r.2 *" />
- <q-route-tab v-if="exact" key="16" replace :to="{ name: 'r.2' }" exact label="r.2" />
- <q-route-tab v-if="loose" key="17" replace :to="{ name: 'r.3' }" label="r.3 *" />
- <q-route-tab v-if="exact" key="18" replace :to="{ name: 'r.3' }" exact label="r.3" />
+ <q-route-tab key="01" v-if="loose" replace :to="{ name: 'r.1.1' }" label="r.1.1 *" />
+ <q-route-tab key="02" v-if="loose" replace :to="{ name: 'r' }" label="r *" />
+ <q-route-tab key="03" v-if="exact" replace :to="{ name: 'r' }" exact label="r" />
+ <q-route-tab key="04" v-if="loose && useR1Q1Disabled" replace :to="{ name: 'r.1', query: { q: '1' } }" label="r.1 q=1 * disabled" disable />
+ <q-route-tab key="05" v-if="loose" replace :to="{ name: 'r.1', query: { q: '1' } }" label="r.1 q=1 *" />
+ <q-route-tab key="06" v-if="exact" replace :to="{ name: 'r.1', query: { q: '1' } }" exact label="r.1 q=1" />
+ <q-route-tab key="07" v-if="exact && useR1" replace :to="{ name: 'r.1' }" exact label="r.1" />
+ <q-route-tab key="08" v-if="exact" replace :to="{ name: 'r.1.1' }" exact label="r.1.1" />
+ <q-route-tab key="09" v-if="loose" replace :to="{ name: 'r.2', query: { y: '1' } }" label="r.2 y=1 *" />
+ <q-route-tab key="10" v-if="loose" replace :to="{ name: 'r.1.4' }" label="r.1.4 => r.1.1 *" />
+ <q-route-tab key="11" v-if="loose" replace :to="{ name: 'r.1.4' }" label="r.1.4 => r.1.1" />
+ <q-route-tab key="12" v-if="loose" replace :to="{ name: 'r.1.2' }" label="r.1.2 *" />
+ <q-route-tab key="13" v-if="exact" replace :to="{ name: 'r.1.2' }" exact label="r.1.2" />
+ <q-route-tab key="14" v-if="loose" replace :to="{ name: 'r.1.3' }" label="r.1.3 => r *" />
+ <q-route-tab key="15" v-if="exact" replace :to="{ name: 'r.1.3' }" exact label="r.1.3 => r" />
+ <q-route-tab key="16" v-if="exact" replace :to="{ name: 'r.1.3' }" exact label="r.1.3 => r" />
+ <q-route-tab key="17" v-if="exact" replace to="/components/tabs/r/2#123456" exact label="r/2#123456" />
+ <q-route-tab key="18" v-if="exact" replace to="/components/tabs/r/2#123" exact label="r/2#123" />
+ <q-route-tab key="19" v-if="loose" replace :to="{ name: 'r.2' }" label="r.2 *" />
+ <q-route-tab key="20" v-if="exact" replace :to="{ name: 'r.2' }" exact label="r.2" />
+ <q-route-tab key="21" v-if="loose" replace :to="{ name: 'r.3' }" label="r.3 *" />
+ <q-route-tab key="22" v-if="exact" replace :to="{ name: 'r.3' }" exact label="r.3" />
</q-tabs>
<div class="q-text-subtitle2">Custom click action</div>
@@ -583,7 +583,7 @@ export default {
exact: true,
loose: true,
useR1: true,
- useR1Q1Disabled: true,
+ useR1Q1Disabled: true
}
},
@@ -665,7 +665,9 @@ export default {
routeNavChange (e, go) {
e.preventDefault()
- go({ name: 'r.1.1' })
+ go({
+ to: { name: 'r.1.1' }
+ })
}
}
}
diff --git a/ui/src/components/btn/QBtn.js b/ui/src/components/btn/QBtn.js
index 456e235373c..5d516b311b3 100644
--- a/ui/src/components/btn/QBtn.js
+++ b/ui/src/components/btn/QBtn.js
@@ -147,7 +147,7 @@ export default createComponent({
}
if (hasRouterLink.value === true) {
- const go = returnError => navigateToRouterLink(e, true, returnError)
+ const go = opts => navigateToRouterLink(e, opts)
emit('click', e, go)
e.defaultPrevented !== true && go()
diff --git a/ui/src/components/btn/QBtn.json b/ui/src/components/btn/QBtn.json
index c2f93375c6c..2193e795b44 100644
--- a/ui/src/components/btn/QBtn.json
+++ b/ui/src/components/btn/QBtn.json
@@ -49,19 +49,39 @@
"events": {
"click": {
- "desc": "Emitted when component is clicked (activated)",
+ "desc": "Emitted when the component is clicked",
"params": {
"evt": {
"extends": "evt",
- "desc": "JS event object; If you want to cancel navigation set synchronously 'evt.navigate' to false"
+ "desc": "JS event object; If you are using route navigation ('to'/'replace' props) and you want to cancel navigation then call evt.preventDefault() synchronously in your event handler"
},
"navigateFn": {
"type": "Function",
- "desc": "When you need to control the time at which the button should trigger the route navigation then set 'evt.navigate' to false and call this function; Useful if you have async work to be done before the actual route navigation",
+ "desc": "Available ONLY if you are using route navigation ('to'/'replace' props); When you need to control the time at which the component should trigger the route navigation then call evt.preventDefault() synchronously and then call this function at your convenience; Useful if you have async work to be done before the actual route navigation or if you want to redirect somewhere else",
"params": {
- "returnError": {
- "type": "Boolean",
- "desc": "Return the router error, if any; Otherwise the returned Promise will always fulfill",
+ "opts": {
+ "type": "Object",
+ "desc": "Optional options",
+ "definition": {
+ "to": {
+ "type": [ "String", "Object" ],
+ "desc": "Equivalent to Vue Router <router-link> 'to' property; Specify it explicitly otherwise it will be set with same value as component's 'to' prop",
+ "examples": [
+ "/home/dashboard",
+ "{ name: 'my-route-name' }"
+ ]
+ },
+
+ "replace": {
+ "type": "Boolean",
+ "desc": "Equivalent to Vue Router <router-link> 'replace' property; Specify it explicitly otherwise it will be set with same value as component's 'replace' prop"
+ },
+
+ "returnRouterError": {
+ "type": "Boolean",
+ "desc": "Return the router error, if any; Otherwise the returned Promise will always fulfill"
+ }
+ },
"addedIn": "v2.8.5"
}
},
diff --git a/ui/src/components/tabs/QRouteTab.json b/ui/src/components/tabs/QRouteTab.json
index 56a41c9f9b5..2be37ccabe6 100644
--- a/ui/src/components/tabs/QRouteTab.json
+++ b/ui/src/components/tabs/QRouteTab.json
@@ -7,16 +7,42 @@
"events": {
"click": {
- "desc": "Emitted when component is clicked (activated)",
+ "desc": "Emitted when the component is clicked",
"params": {
"evt": {
"extends": "evt",
- "desc": "JS event object; If you want to cancel navigation set synchronously 'evt.navigate' to false"
+ "desc": "JS event object; If you want to cancel navigation then call evt.preventDefault() synchronously in your event handler"
},
"navigateFn": {
"type": "Function",
- "desc": "When you need to control the time at which the tab should trigger the route navigation then set 'evt.navigate' to false and call this function; Useful if you have async work to be done before the actual route navigation",
- "params": null,
+ "desc": "When you need to control the time at which the component should trigger the route navigation then call evt.preventDefault() synchronously and then call this function at your convenience; Useful if you have async work to be done before the actual route navigation or if you want to redirect somewhere else",
+ "params": {
+ "opts": {
+ "type": "Object",
+ "desc": "Optional options",
+ "definition": {
+ "to": {
+ "type": [ "String", "Object" ],
+ "desc": "Equivalent to Vue Router <router-link> 'to' property; Specify it explicitly otherwise it will be set with same value as component's 'to' prop",
+ "examples": [
+ "/home/dashboard",
+ "{ name: 'my-route-name' }"
+ ]
+ },
+
+ "replace": {
+ "type": "Boolean",
+ "desc": "Equivalent to Vue Router <router-link> 'replace' property; Specify it explicitly otherwise it will be set with same value as component's 'replace' prop"
+ },
+
+ "returnRouterError": {
+ "type": "Boolean",
+ "desc": "Return the router error, if any; Otherwise the returned Promise will always fulfill"
+ }
+ },
+ "addedIn": "v2.8.5"
+ }
+ },
"returns": {
"type": "Promise<any>",
"desc": "Returns the router's navigation promise",
diff --git a/ui/src/components/tabs/use-tab.js b/ui/src/components/tabs/use-tab.js
index a9b56d76f85..298f23b34f0 100644
--- a/ui/src/components/tabs/use-tab.js
+++ b/ui/src/components/tabs/use-tab.js
@@ -116,27 +116,37 @@ export default function (props, slots, emit, routeData) {
}
if (routeData.hasRouterLink.value === true) {
- const go = (to = props.to, replace = props.replace) => {
- // hinder native navigation
- stopAndPrevent(e)
-
+ const go = (opts = {}) => {
// if requiring to go to another route, then we
// let the QTabs route watcher do its job,
// otherwise directly select this
- let failed
- const reqId = to === props.to
+ let hardError
+ const reqId = opts.to === void 0 || opts.to === props.to
? ($tabs.avoidRouteWatcher = uid())
: null
- return proxy.$router[ replace === true ? 'replace' : 'push' ](to)
- .catch(() => { failed = true })
- .then(err => {
+ return routeData.navigateToRouterLink(e, { ...opts, returnRouterError: true })
+ .catch(err => { hardError = err })
+ .then(softError => {
if (reqId === $tabs.avoidRouteWatcher) {
$tabs.avoidRouteWatcher = false
- if (err === void 0 && failed !== true) {
+
+ // if we don't have any hard errors or any soft errors, except for
+ // when navigating to the same route (on all other soft errors,
+ // like when navigation was aborted in a nav guard, we don't activate this tab)
+ if (
+ hardError === void 0 && (
+ softError === void 0
+ || softError.message.startsWith('Avoided redundant navigation') === true
+ )
+ ) {
$tabs.updateModel({ name: props.name })
}
}
+
+ if (opts.returnRouterError === true) {
+ return hardError !== void 0 ? Promise.reject(hardError) : softError
+ }
})
}
diff --git a/ui/src/composables/private/use-router-link.js b/ui/src/composables/private/use-router-link.js
index fd1444c87f5..636097b0adf 100644
--- a/ui/src/composables/private/use-router-link.js
+++ b/ui/src/composables/private/use-router-link.js
@@ -235,41 +235,43 @@ export default function ({ fallbackTag, useDisableForRouterLinkProps = true } =
}
/**
- * @returns false | Promise<RouterLocation|RouterError> | Promise<RouterLocation|void>
+ * @returns Promise<RouterError | false | undefined>
*/
- function navigateToRouterLink (e, fromGoFn, returnRouterError) {
+ function navigateToRouterLink (
+ e,
+ { returnRouterError, to = props.to, replace = props.replace } = {}
+ ) {
if (props.disable === true) {
// ensure native navigation is prevented in all cases,
// like when useDisableForRouterLinkProps === false (QRouteTab)
e.preventDefault()
- return false
+ return Promise.resolve(false)
}
- // should match RouterLink from Vue Router
if (
// don't redirect with control keys
+ // should match RouterLink from Vue Router
e.metaKey || e.altKey || e.ctrlKey || e.shiftKey
- // don't redirect when preventDefault called
- // ...unless calling go() from @click(e, go)
- || (fromGoFn !== true && e.defaultPrevented === true)
-
// don't redirect on right click
|| (e.button !== void 0 && e.button !== 0)
// don't redirect if it should open in a new window
|| props.target === '_blank'
) {
- return false
+ return Promise.resolve(false)
}
+ // hinder the native navigation
e.preventDefault()
- const promise = proxy.$router[ props.replace === true ? 'replace' : 'push' ](props.to)
+ // then() can also return a "soft" router error (Vue Router behavior)
+ const promise = proxy.$router[ replace === true ? 'replace' : 'push' ](to)
return returnRouterError === true
? promise
- : promise.catch(() => {})
+ // else catching hard errors and also "soft" ones - then(err => ...)
+ : promise.then(() => {}).catch(() => {})
}
return {
|
938bfcce2c5bd8e5e09aea52d8410137de6a67d7
|
2020-11-21 20:16:10
|
Popescu Dan
|
feat(positioning): add horizontal start and end (computed from lang.rtl) (#7501)
| false
|
add horizontal start and end (computed from lang.rtl) (#7501)
|
feat
|
diff --git a/docs/src/components/page-parts/menu/MenuPositioning.vue b/docs/src/components/page-parts/menu/MenuPositioning.vue
index 999e7533e8d..dfa9cd79412 100644
--- a/docs/src/components/page-parts/menu/MenuPositioning.vue
+++ b/docs/src/components/page-parts/menu/MenuPositioning.vue
@@ -41,6 +41,8 @@
q-radio(dense, v-model="anchorOrigin.horizontal", val="left", label="Left")
q-radio(dense, v-model="anchorOrigin.horizontal", val="middle", label="Middle")
q-radio(dense, v-model="anchorOrigin.horizontal", val="right", label="Right")
+ q-radio(dense, v-model="anchorOrigin.horizontal", val="start", label="Start")
+ q-radio(dense, v-model="anchorOrigin.horizontal", val="end", label="End")
.column.items-center.col-6(v-if="!cover")
.text-weight-bold Self Origin
@@ -55,6 +57,8 @@
q-radio(dense, v-model="selfOrigin.horizontal", val="left", label="Left")
q-radio(dense, v-model="selfOrigin.horizontal", val="middle", label="Middle")
q-radio(dense, v-model="selfOrigin.horizontal", val="right", label="Right")
+ q-radio(dense, v-model="selfOrigin.horizontal", val="start", label="Start")
+ q-radio(dense, v-model="selfOrigin.horizontal", val="end", label="End")
q-separator
diff --git a/docs/src/components/page-parts/tooltip/TooltipPositioning.vue b/docs/src/components/page-parts/tooltip/TooltipPositioning.vue
index c356cf77c84..8d8463fd431 100644
--- a/docs/src/components/page-parts/tooltip/TooltipPositioning.vue
+++ b/docs/src/components/page-parts/tooltip/TooltipPositioning.vue
@@ -23,6 +23,8 @@
q-radio(dense, v-model="anchorOrigin.horizontal", val="left", label="Left")
q-radio(dense, v-model="anchorOrigin.horizontal", val="middle", label="Middle")
q-radio(dense, v-model="anchorOrigin.horizontal", val="right", label="Right")
+ q-radio(dense, v-model="anchorOrigin.horizontal", val="start", label="Start")
+ q-radio(dense, v-model="anchorOrigin.horizontal", val="end", label="End")
.column.items-center.col-6
.text-weight-bold Self Origin
@@ -37,6 +39,8 @@
q-radio(dense, v-model="selfOrigin.horizontal", val="left", label="Left")
q-radio(dense, v-model="selfOrigin.horizontal", val="middle", label="Middle")
q-radio(dense, v-model="selfOrigin.horizontal", val="right", label="Right")
+ q-radio(dense, v-model="selfOrigin.horizontal", val="start", label="Start")
+ q-radio(dense, v-model="selfOrigin.horizontal", val="end", label="End")
q-separator
diff --git a/docs/src/pages/vue-components/menu.md b/docs/src/pages/vue-components/menu.md
index d5b8917b30c..864548804a3 100644
--- a/docs/src/pages/vue-components/menu.md
+++ b/docs/src/pages/vue-components/menu.md
@@ -72,6 +72,8 @@ The example below shows how to create a re-usable menu that can be shared with d
The position of QMenu can be customized. It keeps account of the `anchor` and `self` optional props.
The final position of QMenu popup is calculated so that it will be displayed on the available screen real estate, switching to the right-side and/or top-side when necessary.
+For horizontal positioning you can use `start` and `end` when you want to automatically take into account if on RTL or non-RTL. `start` and `end` mean "left" for non-RTL and "right" for RTL.
+
<menu-positioning />
## QMenu API
diff --git a/docs/src/pages/vue-components/tooltip.md b/docs/src/pages/vue-components/tooltip.md
index d8661aad0cf..544a2c2ee92 100644
--- a/docs/src/pages/vue-components/tooltip.md
+++ b/docs/src/pages/vue-components/tooltip.md
@@ -42,6 +42,8 @@ The example below shows how to create a re-usable menu that can be shared with d
The position of QTooltip can be customized. It keeps account of the `anchor` and `self` optional props.
The final position of QTooltip popup is calculated so that it will be displayed on the available screen real estate, switching to the right-side and/or top-side when necessary.
+For horizontal positioning you can use `start` and `end` when you want to automatically take into account if on RTL or non-RTL. `start` and `end` mean "left" for non-RTL and "right" for RTL.
+
<tooltip-positioning />
## QTooltip API
diff --git a/ui/dev/src/pages/components/menu-align.vue b/ui/dev/src/pages/components/menu-align.vue
index a414ca6aae0..c35898bf70e 100644
--- a/ui/dev/src/pages/components/menu-align.vue
+++ b/ui/dev/src/pages/components/menu-align.vue
@@ -74,6 +74,14 @@ export default {
{
label: 'Right',
value: 'right'
+ },
+ {
+ label: 'Start (left on LTR / right on RTL)',
+ value: 'start'
+ },
+ {
+ label: 'End (right on LTR / left on RTL)',
+ value: 'end'
}
]
}
diff --git a/ui/dev/src/pages/components/menu.vue b/ui/dev/src/pages/components/menu.vue
index 3c216db91ed..502e59316f7 100644
--- a/ui/dev/src/pages/components/menu.vue
+++ b/ui/dev/src/pages/components/menu.vue
@@ -284,6 +284,8 @@
<q-radio v-model="anchorOrigin.horizontal" val="left" label="Left" />
<q-radio v-model="anchorOrigin.horizontal" val="middle" label="Middle" />
<q-radio v-model="anchorOrigin.horizontal" val="right" label="Right" />
+ <q-radio v-model="anchorOrigin.horizontal" val="start" label="Start" />
+ <q-radio v-model="anchorOrigin.horizontal" val="end" label="End" />
</div>
</div>
</div>
@@ -304,6 +306,8 @@
<q-radio v-model="selfOrigin.horizontal" val="left" label="Left" />
<q-radio v-model="selfOrigin.horizontal" val="middle" label="Middle" />
<q-radio v-model="selfOrigin.horizontal" val="right" label="Right" />
+ <q-radio v-model="selfOrigin.horizontal" val="start" label="Start" />
+ <q-radio v-model="selfOrigin.horizontal" val="end" label="End" />
</div>
</div>
</div>
diff --git a/ui/dev/src/pages/components/tooltip.vue b/ui/dev/src/pages/components/tooltip.vue
index 6a29e6e52b4..61d7d17df68 100644
--- a/ui/dev/src/pages/components/tooltip.vue
+++ b/ui/dev/src/pages/components/tooltip.vue
@@ -95,6 +95,8 @@
<q-radio v-model="anchorOrigin.horizontal" val="left" label="Left" />
<q-radio v-model="anchorOrigin.horizontal" val="middle" label="Middle" />
<q-radio v-model="anchorOrigin.horizontal" val="right" label="Right" />
+ <q-radio v-model="anchorOrigin.horizontal" val="start" label="Start" />
+ <q-radio v-model="anchorOrigin.horizontal" val="end" label="End" />
</div>
</div>
</div>
@@ -115,6 +117,8 @@
<q-radio v-model="selfOrigin.horizontal" val="left" label="Left" />
<q-radio v-model="selfOrigin.horizontal" val="middle" label="Middle" />
<q-radio v-model="selfOrigin.horizontal" val="right" label="Right" />
+ <q-radio v-model="selfOrigin.horizontal" val="start" label="Start" />
+ <q-radio v-model="selfOrigin.horizontal" val="end" label="End" />
</div>
</div>
</div>
diff --git a/ui/src/components/btn-dropdown/QBtnDropdown.js b/ui/src/components/btn-dropdown/QBtnDropdown.js
index ae2e8c8097c..b5c50f562b1 100644
--- a/ui/src/components/btn-dropdown/QBtnDropdown.js
+++ b/ui/src/components/btn-dropdown/QBtnDropdown.js
@@ -34,11 +34,11 @@ export default Vue.extend({
menuAnchor: {
type: String,
- default: 'bottom right'
+ default: 'bottom end'
},
menuSelf: {
type: String,
- default: 'top right'
+ default: 'top end'
},
menuOffset: Array,
diff --git a/ui/src/components/btn-dropdown/QBtnDropdown.json b/ui/src/components/btn-dropdown/QBtnDropdown.json
index 67ee5b625b5..e9ad3d1f4de 100644
--- a/ui/src/components/btn-dropdown/QBtnDropdown.json
+++ b/ui/src/components/btn-dropdown/QBtnDropdown.json
@@ -91,12 +91,12 @@
"type": "String",
"desc": "Two values setting the starting position or anchor point of the menu relative to its target",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom middle", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
- "default": "bottom right",
- "examples": [ "top left", "bottom right" ],
+ "default": "bottom end",
+ "examples": [ "top right", "bottom end" ],
"category": "position"
},
@@ -104,12 +104,12 @@
"type": "String",
"desc": "Two values setting the menu's own position relative to its target",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom middle", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
- "default": "top right",
- "examples": [ "top left", "bottom right" ],
+ "default": "top end",
+ "examples": [ "top right", "bottom end" ],
"category": "position"
},
diff --git a/ui/src/components/menu/QMenu.js b/ui/src/components/menu/QMenu.js
index 169be6fb56e..32a2e710254 100644
--- a/ui/src/components/menu/QMenu.js
+++ b/ui/src/components/menu/QMenu.js
@@ -78,22 +78,19 @@ export default Vue.extend({
},
computed: {
- horizSide () {
- return this.$q.lang.rtl === true ? 'right' : 'left'
- },
-
anchorOrigin () {
return parsePosition(
this.anchor || (
- this.cover === true ? `center middle` : `bottom ${this.horizSide}`
- )
+ this.cover === true ? 'center middle' : 'bottom start'
+ ),
+ this.$q.lang.rtl
)
},
selfOrigin () {
return this.cover === true
? this.anchorOrigin
- : parsePosition(this.self || `top ${this.horizSide}`)
+ : parsePosition(this.self || 'top start', this.$q.lang.rtl)
},
menuClass () {
@@ -171,7 +168,7 @@ export default Vue.extend({
if (this.unwatch === void 0) {
this.unwatch = this.$watch(
- () => this.$q.screen.width + '|' + this.$q.screen.height + '|' + this.self + '|' + this.anchor,
+ () => this.$q.screen.width + '|' + this.$q.screen.height + '|' + this.self + '|' + this.anchor + '|' + this.$q.lang.rtl,
this.updatePosition
)
}
diff --git a/ui/src/components/menu/QMenu.json b/ui/src/components/menu/QMenu.json
index 98418a8b8c3..7a222f18c9b 100644
--- a/ui/src/components/menu/QMenu.json
+++ b/ui/src/components/menu/QMenu.json
@@ -31,9 +31,9 @@
"type": "String",
"desc": "Two values setting the starting position or anchor point of the menu relative to its target",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom middle", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
"examples": [ "top left", "bottom right" ],
"category": "position"
@@ -43,9 +43,9 @@
"type": "String",
"desc": "Two values setting the menu's own position relative to its target",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom middle", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
"examples": [ "top left", "bottom right" ],
"category": "position"
diff --git a/ui/src/components/popup-edit/QPopupEdit.json b/ui/src/components/popup-edit/QPopupEdit.json
index 6894468befa..e8526e50eac 100644
--- a/ui/src/components/popup-edit/QPopupEdit.json
+++ b/ui/src/components/popup-edit/QPopupEdit.json
@@ -110,9 +110,9 @@
"type": "String",
"desc": "Two values setting the starting position or anchor point of the menu relative to its target",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom middle", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
"examples": [ "top left", "bottom right" ],
"category": "position"
@@ -122,9 +122,9 @@
"type": "String",
"desc": "Two values setting the menu's own position relative to its target",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom middle", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
"examples": [ "top left", "bottom right" ],
"category": "position"
diff --git a/ui/src/components/select/QSelect.json b/ui/src/components/select/QSelect.json
index aea88a1e212..bddcb6964c9 100644
--- a/ui/src/components/select/QSelect.json
+++ b/ui/src/components/select/QSelect.json
@@ -142,9 +142,9 @@
"type": "String",
"desc": "Two values setting the starting position or anchor point of the options list relative to the field (only in menu mode)",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom center", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
"examples": [ "top left", "bottom right" ],
"category": "position",
@@ -155,9 +155,9 @@
"type": "String",
"desc": "Two values setting the options list's own position relative to its target (only in menu mode)",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom center", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
"examples": [ "top left", "bottom right" ],
"category": "position",
diff --git a/ui/src/components/tooltip/QTooltip.js b/ui/src/components/tooltip/QTooltip.js
index 4de28a74e83..9db655b0e4c 100644
--- a/ui/src/components/tooltip/QTooltip.js
+++ b/ui/src/components/tooltip/QTooltip.js
@@ -69,11 +69,11 @@ export default Vue.extend({
computed: {
anchorOrigin () {
- return parsePosition(this.anchor)
+ return parsePosition(this.anchor, this.$q.lang.rtl)
},
selfOrigin () {
- return parsePosition(this.self)
+ return parsePosition(this.self, this.$q.lang.rtl)
},
hideOnRouteChange () {
@@ -92,6 +92,13 @@ export default Vue.extend({
this.__configureScrollTarget()
})
+ if (this.unwatch === void 0) {
+ this.unwatch = this.$watch(
+ () => this.$q.screen.width + '|' + this.$q.screen.height + '|' + this.self + '|' + this.anchor + '|' + this.$q.lang.rtl,
+ this.updatePosition
+ )
+ }
+
this.__setTimeout(() => {
this.$emit('show', evt)
}, 300)
@@ -112,6 +119,11 @@ export default Vue.extend({
this.observer = void 0
}
+ if (this.unwatch !== void 0) {
+ this.unwatch()
+ this.unwatch = void 0
+ }
+
this.__unconfigureScrollTarget()
cleanEvt(this, 'tooltipTemp')
},
diff --git a/ui/src/components/tooltip/QTooltip.json b/ui/src/components/tooltip/QTooltip.json
index 5c0a87eb65c..539bab5687c 100644
--- a/ui/src/components/tooltip/QTooltip.json
+++ b/ui/src/components/tooltip/QTooltip.json
@@ -34,10 +34,11 @@
"type": "String",
"desc": "Two values setting the starting position or anchor point of the Tooltip relative to its target",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom middle", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
+ "default": "bottom middle",
"examples": [ "top left", "bottom right" ],
"category": "position"
},
@@ -46,10 +47,11 @@
"type": "String",
"desc": "Two values setting the Tooltip's own position relative to its target",
"values": [
- "top left", "top middle", "top right",
- "center left", "center middle", "center right",
- "bottom left", "bottom middle", "bottom right"
+ "top left", "top middle", "top right", "top start", "top end",
+ "center left", "center middle", "center right", "center start", "center end",
+ "bottom left", "bottom middle", "bottom right", "bottom start", "bottom end"
],
+ "default": "top middle",
"examples": [ "top left", "bottom right" ],
"category": "position"
},
diff --git a/ui/src/utils/position-engine.js b/ui/src/utils/position-engine.js
index da15546f4d8..4a4027f68e2 100644
--- a/ui/src/utils/position-engine.js
+++ b/ui/src/utils/position-engine.js
@@ -8,12 +8,12 @@ export function validatePosition (pos) {
if (parts.length !== 2) {
return false
}
- if (!['top', 'center', 'bottom'].includes(parts[0])) {
+ if ([ 'top', 'center', 'bottom' ].includes(parts[0]) !== true) {
console.error('Anchor/Self position must start with one of top/center/bottom')
return false
}
- if (!['left', 'middle', 'right'].includes(parts[1])) {
- console.error('Anchor/Self position must end with one of left/middle/right')
+ if ([ 'left', 'middle', 'right', 'start', 'end' ].includes(parts[1]) !== true) {
+ console.error('Anchor/Self position must end with one of left/middle/right/start/end')
return false
}
return true
@@ -28,9 +28,24 @@ export function validateOffset (val) {
return true
}
-export function parsePosition (pos) {
+const horizontalPos = {
+ 'start#ltr': 'left',
+ 'start#rtl': 'right',
+ 'end#ltr': 'right',
+ 'end#rtl': 'left'
+}
+
+;[ 'left', 'middle', 'right' ].forEach(pos => {
+ horizontalPos[`${pos}#ltr`] = pos
+ horizontalPos[`${pos}#rtl`] = pos
+})
+
+export function parsePosition (pos, rtl) {
const parts = pos.split(' ')
- return { vertical: parts[0], horizontal: parts[1] }
+ return {
+ vertical: parts[0],
+ horizontal: horizontalPos[`${parts[1]}#${rtl === true ? 'rtl' : 'ltr'}`]
+ }
}
export function validateCover (val) {
|
f9eef0b6f9168e8d7713c2e82edd131d9c60bdf3
|
2018-03-14 03:20:56
|
Razvan Stoenescu
|
chore: Bump version
| false
|
Bump version
|
chore
|
diff --git a/package.json b/package.json
index bb63de78512..6b9a78782cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "quasar-framework",
- "version": "0.15.7",
+ "version": "0.15.8",
"description": "Build responsive websites, PWAs, hybrid mobile apps and Electron apps, all simultaneously using same codebase",
"files": [
"dist",
|
7da7c0079e15854c78b6200826a84c52a7f3cc8b
|
2023-05-18 13:16:45
|
Razvan Stoenescu
|
chore(ui): fix linting
| false
|
fix linting
|
chore
|
diff --git a/ui/.eslintrc.cjs b/ui/.eslintrc.cjs
index b9afc40733e..15f49573e28 100644
--- a/ui/.eslintrc.cjs
+++ b/ui/.eslintrc.cjs
@@ -2,7 +2,7 @@ module.exports = {
root: true,
parserOptions: {
- ecmaVersion: 'latest'
+ ecmaVersion: '2021'
},
env: {
diff --git a/ui/dev/src/pages/components/spinner.vue b/ui/dev/src/pages/components/spinner.vue
index 2812c712071..da71ca2a7e9 100644
--- a/ui/dev/src/pages/components/spinner.vue
+++ b/ui/dev/src/pages/components/spinner.vue
@@ -69,10 +69,10 @@ import {
export default {
components: {
- QSpinner, QSpinnerAudio, QSpinnerBall, QSpinnerBars, QSpinnerBox, QSpinnerClock, // eslint-disable-line
- QSpinnerComment, QSpinnerCube, QSpinnerDots, QSpinnerFacebook, QSpinnerGears, // eslint-disable-line
- QSpinnerGrid, QSpinnerHearts, QSpinnerHourglass, QSpinnerInfinity, QSpinnerIos, // eslint-disable-line
- QSpinnerOrbit, QSpinnerOval, QSpinnerPie, QSpinnerPuff, QSpinnerRadio, QSpinnerRings, // eslint-disable-line
+ QSpinner, QSpinnerAudio, QSpinnerBall, QSpinnerBars, QSpinnerBox, QSpinnerClock,
+ QSpinnerComment, QSpinnerCube, QSpinnerDots, QSpinnerFacebook, QSpinnerGears,
+ QSpinnerGrid, QSpinnerHearts, QSpinnerHourglass, QSpinnerInfinity, QSpinnerIos,
+ QSpinnerOrbit, QSpinnerOval, QSpinnerPie, QSpinnerPuff, QSpinnerRadio, QSpinnerRings,
QSpinnerTail
},
diff --git a/ui/src/components/editor/QEditor.js b/ui/src/components/editor/QEditor.js
index ccbacbd0e4a..66ea981e113 100644
--- a/ui/src/components/editor/QEditor.js
+++ b/ui/src/components/editor/QEditor.js
@@ -102,7 +102,7 @@ export default createComponent({
const editable = computed(() => !props.readonly && !props.disable)
let defaultFont, offsetBottom
- let lastEmit = props.modelValue // eslint-disable-line
+ let lastEmit = props.modelValue
if (__QUASAR_SSR_SERVER__ !== true) {
document.execCommand('defaultParagraphSeparator', false, props.paragraphTag)
diff --git a/ui/src/components/table/QTh.js b/ui/src/components/table/QTh.js
index 512ef02264a..b4409ec75a6 100644
--- a/ui/src/components/table/QTh.js
+++ b/ui/src/components/table/QTh.js
@@ -62,7 +62,7 @@ export default createComponent({
+ (props.autoWidth === true ? ' q-table--col-auto-width' : ''),
style: col.headerStyle,
onClick: evt => {
- col.sortable === true && props.props.sort(col) // eslint-disable-line
+ col.sortable === true && props.props.sort(col)
onClick(evt)
}
}
|
eee7f8f145efbd1fadc063b49c650b013a5f235c
|
2020-12-01 05:55:01
|
Jeff Galbraith
|
fix(editor): Icons are activating/deactivating synchronously when having multiple QEditors with :toolbar props (#8044) (#8127)
| false
|
Icons are activating/deactivating synchronously when having multiple QEditors with :toolbar props (#8044) (#8127)
|
fix
|
diff --git a/ui/src/components/editor/editor-caret.js b/ui/src/components/editor/editor-caret.js
index b00b5c50172..c2469854828 100644
--- a/ui/src/components/editor/editor-caret.js
+++ b/ui/src/components/editor/editor-caret.js
@@ -228,8 +228,11 @@ export class Caret {
case void 0:
return false
default:
- const state = document.queryCommandState(cmd)
- return param !== void 0 ? state === param : state
+ if (this.hasSelection) {
+ const state = document.queryCommandState(cmd)
+ return param !== void 0 ? state === param : state
+ }
+ return false
}
}
|
51d528c804c0a6544b958e8c8c7eb40fb7984e62
|
2023-06-27 17:33:12
|
Razvan Stoenescu
|
feat(app-webpack): improve quasar.config computeConfig management
| false
|
improve quasar.config computeConfig management
|
feat
|
diff --git a/app-vite/package.json b/app-vite/package.json
index 0d750096814..f3423f7e529 100644
--- a/app-vite/package.json
+++ b/app-vite/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/app-vite",
- "version": "2.0.0-alpha.6",
+ "version": "2.0.0-alpha.7",
"description": "Quasar Framework App CLI with Vite",
"bin": {
"quasar": "./bin/quasar.js"
diff --git a/app-webpack/lib/quasar-config-file.js b/app-webpack/lib/quasar-config-file.js
index 238efcf2775..4747f5f165e 100644
--- a/app-webpack/lib/quasar-config-file.js
+++ b/app-webpack/lib/quasar-config-file.js
@@ -218,9 +218,6 @@ module.exports.QuasarConfigFile = class QuasarConfigFile {
return
}
- // ensure we grab the latest version
- delete require.cache[ tempFile ]
-
if (result.errors.length !== 0) {
removeSync(tempFile)
@@ -230,7 +227,7 @@ module.exports.QuasarConfigFile = class QuasarConfigFile {
fatal(msg, 'FAIL')
}
- warn(msg + ' Please fix them then save the file again.\n')
+ warn(msg + ' Please fix them.\n')
return
}
@@ -247,7 +244,7 @@ module.exports.QuasarConfigFile = class QuasarConfigFile {
console.log()
console.error(e)
- const msg = 'Importing quasar.config file results in error. Please check the'
+ const msg = 'The quasar.config file has runtime errors. Please check the'
+ ` Node.js stack above against the temporarily created ${ basename(tempFile) } file and fix the original file.`
if (isFirst === true) {
@@ -263,22 +260,24 @@ module.exports.QuasarConfigFile = class QuasarConfigFile {
const { quasarConf, webpackConf } = await this.#computeConfig(quasarConfigFn, isFirst)
+ if (quasarConf === void 0) {
+ return
+ }
+
if (isFirst === true) {
isFirst = false
firstBuildIsDone({ quasarConf, webpackConf })
return
}
- if (quasarConf !== void 0) {
- // if triggering updates too fast, then remember
- // if any of them required the rebuild
- updateFn = updateFn === 'onBuildChange' || this.#webpackConfChanged === true
- ? 'onBuildChange'
- : 'onAppChange'
+ // if triggering updates too fast, then remember
+ // if any of them required the rebuild
+ updateFn = updateFn === 'onBuildChange' || this.#webpackConfChanged === true
+ ? 'onBuildChange'
+ : 'onAppChange'
- log('Scheduled to apply quasar.config changes in 1s')
- scheduleUpdate()
- }
+ log('Scheduled to apply quasar.config changes in 1s')
+ scheduleUpdate()
})
}
})
@@ -304,7 +303,7 @@ module.exports.QuasarConfigFile = class QuasarConfigFile {
}
warn(msg + ' Please fix it.\n')
- return
+ return {}
}
let userCfg
@@ -325,7 +324,7 @@ module.exports.QuasarConfigFile = class QuasarConfigFile {
}
warn(msg + ' Please fix the errors in the original file.\n')
- return
+ return {}
}
if (Object(userCfg) !== userCfg) {
@@ -338,7 +337,7 @@ module.exports.QuasarConfigFile = class QuasarConfigFile {
}
warn(msg + ' Please fix it.\n')
- return
+ return {}
}
removeSync(tempFile)
diff --git a/app-webpack/package.json b/app-webpack/package.json
index ba5ae547002..09f8c4eb5de 100644
--- a/app-webpack/package.json
+++ b/app-webpack/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/app-webpack",
- "version": "4.0.0-alpha.5",
+ "version": "4.0.0-alpha.6",
"description": "Quasar Framework App CLI with Webpack",
"bin": {
"quasar": "./bin/quasar"
|
7e2ca1d9fe2ad8844abce32389668c05187ff89b
|
2024-12-02 16:35:29
|
Razvan Stoenescu
|
feat(docs): one more update to the upgrade guides
| false
|
one more update to the upgrade guides
|
feat
|
diff --git a/docs/src/pages/quasar-cli-vite/supporting-ts.md b/docs/src/pages/quasar-cli-vite/supporting-ts.md
index 83cdf58a913..a4894e3e90b 100644
--- a/docs/src/pages/quasar-cli-vite/supporting-ts.md
+++ b/docs/src/pages/quasar-cli-vite/supporting-ts.md
@@ -48,138 +48,13 @@ If you forget to add the `tsconfig.json` file, the application will break at com
### Linting setup
-First add the needed dependencies:
-
-```tabs
-<<| bash Yarn |>>
-$ yarn add --dev eslint vite-plugin-checker vue-tsc@2 @typescript-eslint/parser @typescript-eslint/eslint-plugin
-# you might also want to install the `eslint-plugin-vue` package.
-<<| bash NPM |>>
-$ npm install --save-dev eslint vite-plugin-checker vue-tsc@2 @typescript-eslint/parser @typescript-eslint/eslint-plugin
-# you might also want to install the `eslint-plugin-vue` package.
-<<| bash PNPM |>>
-$ pnpm add -D eslint vite-plugin-checker vue-tsc@2 @typescript-eslint/parser @typescript-eslint/eslint-plugin
-# you might also want to install the `eslint-plugin-vue` package.
-<<| bash Bun |>>
-$ bun add --dev eslint vite-plugin-checker vue-tsc@2 @typescript-eslint/parser @typescript-eslint/eslint-plugin
-# you might also want to install the `eslint-plugin-vue` package.
-```
-
-Then update your ESLint configuration accordingly, like in the following example:
-
-```js /.eslintrc.cjs
-module.exports = {
- // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
- // This option interrupts the configuration hierarchy at this file
- // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
- root: true,
-
- // https://eslint.vuejs.org/user-guide/#how-to-use-a-custom-parser
- // Must use parserOptions instead of "parser" to allow vue-eslint-parser to keep working
- // `parser: 'vue-eslint-parser'` is already included with any 'plugin:vue/**' config and should be omitted
- parserOptions: {
- parser: require.resolve('@typescript-eslint/parser'),
- extraFileExtensions: [ '.vue' ]
- },
-
- env: {
- browser: true,
- es2021: true,
- node: true
- },
-
- // Rules order is important, please avoid shuffling them
- extends: [
- // Base ESLint recommended rules
- // 'eslint:recommended',
-
- // https://typescript-eslint.io/getting-started/legacy-eslint-setup
- // ESLint typescript rules
- 'plugin:@typescript-eslint/recommended',
-
- // Uncomment any of the lines below to choose desired strictness,
- // but leave only one uncommented!
- // See https://eslint.vuejs.org/rules/#available-rules
- 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
- // 'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
- // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
-
- // https://github.com/prettier/eslint-config-prettier#installation
- // usage with Prettier, provided by 'eslint-config-prettier'.
- 'prettier'
- ],
-
- plugins: [
- // required to apply rules which need type information
- '@typescript-eslint',
-
- // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
- // required to lint *.vue files
- 'vue'
-
- // https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
- // Prettier has not been included as plugin to avoid performance impact
- // add it as an extension for your IDE
-
- ],
-
- globals: {
- ga: 'readonly', // Google Analytics
- process: 'readonly',
- cordova: 'readonly',
- Capacitor: 'readonly',
- chrome: 'readonly', // BEX related
- browser: 'readonly' // BEX related
- },
-
- // add your custom rules here
- rules: {
-
- 'prefer-promise-reject-errors': 'off',
-
- quotes: ['warn', 'single', { avoidEscape: true }],
-
- // this rule, if on, would require explicit return type on the `render` function
- '@typescript-eslint/explicit-function-return-type': 'off',
-
- // in plain CommonJS modules, you can't use `import foo = require('foo')` to pass this rule, so it has to be disabled
- '@typescript-eslint/no-var-requires': 'off',
-
- '@typescript-eslint/consistent-type-imports': [
- 'error',
- { prefer: 'type-imports' },
- ],
-
- // The core 'no-unused-vars' rules (in the eslint:recommended ruleset)
- // does not work with type definitions
- 'no-unused-vars': 'off',
-
- // allow debugger during development only
- 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
- }
-}
-```
-
-If anything goes wrong, read the [typescript-eslint guide](https://typescript-eslint.io/getting-started/legacy-eslint-setup), on which this example is based.
-
-As a last step, update your `package.json > scripts > lint` script to also lint `.ts` files. Example:
-
-```diff /package.json
-{
- "scripts": {
-- "lint": "eslint --ext .js,.vue .",
-+ "lint": "eslint --ext .js,.ts,.vue .",
- }
-}
-```
+You might want to check the requirements for it [here](/quasar-cli-vite/linter).
### TypeScript Declaration Files
If you chose TypeScript support when scaffolding the project, the following declaration file was automatically scaffolded for you. If TypeScript support wasn't enabled during project creation, create it:
```ts /src/env.d.ts
-/* eslint-disable */
-
declare namespace NodeJS {
interface ProcessEnv {
NODE_ENV: string;
@@ -216,8 +91,6 @@ declare module 'pinia' {
If you are using [PWA mode](/quasar-cli-vite/developing-pwa/introduction), make the following modifications to your project, and create any files that do not exist:
```ts /src-pwa/pwa-env.d.ts
-/* eslint-disable */
-
declare namespace NodeJS {
interface ProcessEnv {
SERVICE_WORKER_FILE: string;
@@ -243,33 +116,11 @@ declare const self: ServiceWorkerGlobalScope &
}
```
-```js /src-pwa/.eslintrc.cjs
-const { resolve } = require('node:path');
-
-module.exports = {
- parserOptions: {
- project: resolve(__dirname, './tsconfig.json'),
- },
-
- overrides: [
- {
- files: ['custom-service-worker.ts'],
-
- env: {
- serviceworker: true,
- },
- },
- ],
-};
-```
-
#### Electron mode
If you are using [Electron mode](/quasar-cli-vite/developing-electron-apps/introduction), add the section below to your project.
```ts /src-electron/electron-env.d.ts
-/* eslint-disable */
-
declare namespace NodeJS {
interface ProcessEnv {
QUASAR_PUBLIC_FOLDER: string;
diff --git a/docs/src/pages/quasar-cli-vite/upgrade-guide.md b/docs/src/pages/quasar-cli-vite/upgrade-guide.md
index 082ebce36b8..6f4ca7d823b 100644
--- a/docs/src/pages/quasar-cli-vite/upgrade-guide.md
+++ b/docs/src/pages/quasar-cli-vite/upgrade-guide.md
@@ -168,10 +168,6 @@ Preparations:
```
<br>
- Rename `.eslintrc.js` to `.eslintrc.cjs`, if it doesn't already have the `.cjs` extension.
-
- <br>
-
* You might want to add the following to your `/.gitignore` file. The `/quasar.config.*.temporary.compiled*` entry refers to files that are left for inspection purposes when something fails with your `/quasar.config` file (and can be removed by the `quasar clean` command):
```bash [highlight=8,11] /.gitignore
@@ -209,32 +205,9 @@ Preparations:
*.njsproj
*.sln
```
-
<br>
- * If you have linting, please review your `/.eslintignore` file as well:
-
- ```bash [highlight=6-7] /.eslintignore
- /dist
- /src-capacitor
- /src-cordova
- /.quasar
- /node_modules
- .eslintrc.cjs
- /quasar.config.*.temporary.compiled*
- ```
- <br>
-
- Update `/quasar.config file > bex` section to satisfy the types, regardless if you use BEX or not. If you are using BEX, please see the [BEX section below](#bex-mode-changes) for more details.
-
- ```diff /quasar.config file
- bex: {
- - contentScripts: []
- + extraScripts: []
- }
- ```
-
- <br>
+* Make sure to update your `/quasar.config` file with the newest specs in order to satisfy the types. Check all following sections.
* If you've installed the `dotenv` package and are using it in your quasar.config file then uninstall it and use our CLIs native [dotenv support](#the-env-dotfiles-support).
@@ -353,7 +326,7 @@ Preparations:
If you are using ESLint, we recommend enabling `@typescript-eslint/consistent-type-imports` rules in your ESLint configuration. If you don't have linting set up, we recommend using `verbatimModuleSyntax` in your `tsconfig.json` file as an alternative (_unlike ESLint rules, it's not auto-fixable_). These changes will help you unify your imports regarding regular and type-only imports. Please read [typescript-eslint Blog - Consistent Type Imports and Exports: Why and How](https://typescript-eslint.io/blog/consistent-type-imports-and-exports-why-and-how) for more information about this and how to set it up. Here is an example:
- ```js /.eslintrc.cjs
+ ```js /eslint.config.js
rules: {
// ...
'@typescript-eslint/consistent-type-imports': [
@@ -457,86 +430,7 @@ Preparations:
### Linting (TS or JS)
-We dropped support for our internal linting (quasar.config file > eslint) in favor of the [vite-plugin-checker](https://vite-plugin-checker.netlify.app/) package. We will detail below the changes that you need to make based on if you use TS or not.
-
-#### TypeScript projects linting
-
-```tabs
-<<| bash Yarn |>>
-$ yarn add --dev vite-plugin-checker vue-tsc@2 typescript
-<<| bash NPM |>>
-$ npm install --save-dev vite-plugin-checker vue-tsc@2 typescript
-<<| bash PNPM |>>
-$ pnpm add -D vite-plugin-checker vue-tsc@2 typescript
-<<| bash Bun |>>
-$ bun add --dev vite-plugin-checker vue-tsc@2 typescript
-```
-
-```bash [highlight=6,7] /.eslintignore
-/dist
-/src-capacitor
-/src-cordova
-/.quasar
-/node_modules
-.eslintrc.cjs
-/quasar.config.*.temporary.compiled*
-```
-
-```diff /quasar.config file
-- eslint: {
-- // ...
-- },
-
- build: {
- vitePlugins: [
-+ ['vite-plugin-checker', {
-+ vueTsc: true,
-+ eslint: {
-+ lintCommand: 'eslint "./**/*.{js,ts,mjs,cjs,vue}"'
-+ }
-+ }, { server: false }]
- ]
- }
-```
-
-#### JavaScript projects linting
-
-```tabs
-<<| bash Yarn |>>
-$ yarn add --dev vite-plugin-checker
-<<| bash NPM |>>
-$ npm install --save-dev vite-plugin-checker
-<<| bash PNPM |>>
-$ pnpm add -D vite-plugin-checker
-<<| bash Bun |>>
-$ bun add --dev vite-plugin-checker
-```
-
-```bash [highlight=6,7] /.eslintignore
-/dist
-/src-capacitor
-/src-cordova
-/.quasar
-/node_modules
-.eslintrc.cjs
-/quasar.config.*.temporary.compiled*
-```
-
-```diff /quasar.config file
-- eslint: {
-- // ...
-- },
-
- build: {
- vitePlugins: [
-+ ['vite-plugin-checker', {
-+ eslint: {
-+ lintCommand: 'eslint "./**/*.{js,mjs,cjs,vue}"'
-+ }
-+ }, { server: false }]
- ]
- }
-```
+If you have linting, please review your setup by going to [Linter page](/quasar-cli-vite/linter). You will need to uninstall and install new dependencies.
### Capacitor / Cordova modes changes
diff --git a/docs/src/pages/quasar-cli-webpack/supporting-ts.md b/docs/src/pages/quasar-cli-webpack/supporting-ts.md
index 7d7e5f3f96d..806043d9cfb 100644
--- a/docs/src/pages/quasar-cli-webpack/supporting-ts.md
+++ b/docs/src/pages/quasar-cli-webpack/supporting-ts.md
@@ -49,130 +49,7 @@ If you forget to add the `tsconfig.json` file, the application will break at com
### Linting setup
-First add the needed dependencies:
-
-```tabs
-<<| bash Yarn |>>
-$ yarn add --dev eslint@8 @typescript-eslint/parser @typescript-eslint/eslint-plugin
-# you might also want to install the `eslint-plugin-vue` package.
-<<| bash NPM |>>
-$ npm install --save-dev eslint@8 @typescript-eslint/parser @typescript-eslint/eslint-plugin
-# you might also want to install the `eslint-plugin-vue` package.
-<<| bash PNPM |>>
-$ pnpm add -D eslint@8 @typescript-eslint/parser @typescript-eslint/eslint-plugin
-# you might also want to install the `eslint-plugin-vue` package.
-<<| bash Bun |>>
-$ bun add --dev eslint@8 @typescript-eslint/parser @typescript-eslint/eslint-plugin
-# you might also want to install the `eslint-plugin-vue` package.
-```
-
-Then update your ESLint configuration accordingly, like in the following example:
-
-```js /.eslintrc.cjs
-module.exports = {
- // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
- // This option interrupts the configuration hierarchy at this file
- // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
- root: true,
-
- // https://eslint.vuejs.org/user-guide/#how-to-use-a-custom-parser
- // Must use parserOptions instead of "parser" to allow vue-eslint-parser to keep working
- // `parser: 'vue-eslint-parser'` is already included with any 'plugin:vue/**' config and should be omitted
- parserOptions: {
- parser: require.resolve('@typescript-eslint/parser'),
- extraFileExtensions: [ '.vue' ]
- },
-
- env: {
- browser: true,
- es2021: true,
- node: true
- },
-
- // Rules order is important, please avoid shuffling them
- extends: [
- // Base ESLint recommended rules
- // 'eslint:recommended',
-
- // https://typescript-eslint.io/getting-started/legacy-eslint-setup
- // ESLint typescript rules
- 'plugin:@typescript-eslint/recommended',
-
- // Uncomment any of the lines below to choose desired strictness,
- // but leave only one uncommented!
- // See https://eslint.vuejs.org/rules/#available-rules
- 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
- // 'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
- // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
-
- // https://github.com/prettier/eslint-config-prettier#installation
- // usage with Prettier, provided by 'eslint-config-prettier'.
- 'prettier'
- ],
-
- plugins: [
- // required to apply rules which need type information
- '@typescript-eslint',
-
- // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
- // required to lint *.vue files
- 'vue'
-
- // https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
- // Prettier has not been included as plugin to avoid performance impact
- // add it as an extension for your IDE
-
- ],
-
- globals: {
- ga: 'readonly', // Google Analytics
- process: 'readonly',
- cordova: 'readonly',
- Capacitor: 'readonly',
- chrome: 'readonly', // BEX related
- browser: 'readonly' // BEX related
- },
-
- // add your custom rules here
- rules: {
-
- 'prefer-promise-reject-errors': 'off',
-
- quotes: ['warn', 'single', { avoidEscape: true }],
-
- // this rule, if on, would require explicit return type on the `render` function
- '@typescript-eslint/explicit-function-return-type': 'off',
-
- // in plain CommonJS modules, you can't use `import foo = require('foo')` to pass this rule, so it has to be disabled
- '@typescript-eslint/no-var-requires': 'off',
-
- '@typescript-eslint/consistent-type-imports': [
- 'error',
- { prefer: 'type-imports' },
- ],
-
- // The core 'no-unused-vars' rules (in the eslint:recommended ruleset)
- // does not work with type definitions
- 'no-unused-vars': 'off',
-
- // allow debugger during development only
- 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
- }
-}
-```
-
-If anything goes wrong, read the [typescript-eslint guide](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/README.md), on which this example is based.
-
-As a last step, update your `package.json > scripts > lint` script to also lint `.ts` files. Example:
-
-```diff /package.json
-{
- "scripts": {
-- "lint": "eslint --ext .js,.vue .",
-+ "lint": "eslint --ext .js,.ts,.vue .",
- }
-}
-```
+You might want to check the requirements for it [here](/quasar-cli-webpack/linter).
::: tip
TypeScript Linting is really slow due to type-checking overhead, we suggest you to disable Webpack lint extension into the `/quasar.config` file for dev builds.
@@ -183,8 +60,6 @@ TypeScript Linting is really slow due to type-checking overhead, we suggest you
If you chose TypeScript support when scaffolding the project, the following declaration file was automatically scaffolded for you. If TypeScript support wasn't enabled during project creation, create it:
```ts /src/env.d.ts
-/* eslint-disable */
-
declare namespace NodeJS {
interface ProcessEnv {
NODE_ENV: string;
@@ -221,8 +96,6 @@ declare module 'pinia' {
If you are using [PWA mode](/quasar-cli-webpack/developing-pwa/introduction), make the following modifications to your project, and create any files that do not exist:
```ts /src-pwa/pwa-env.d.ts
-/* eslint-disable */
-
declare namespace NodeJS {
interface ProcessEnv {
SERVICE_WORKER_FILE: string;
@@ -248,33 +121,11 @@ declare const self: ServiceWorkerGlobalScope &
}
```
-```js /src-pwa/.eslintrc.cjs
-const { resolve } = require('node:path');
-
-module.exports = {
- parserOptions: {
- project: resolve(__dirname, './tsconfig.json'),
- },
-
- overrides: [
- {
- files: ['custom-service-worker.ts'],
-
- env: {
- serviceworker: true,
- },
- },
- ],
-};
-```
-
#### Electron mode
If you are using [Electron mode](/quasar-cli-webpack/developing-electron-apps/introduction), add the section below to your project.
```ts /src-electron/electron-env.d.ts
-/* eslint-disable */
-
declare namespace NodeJS {
interface ProcessEnv {
QUASAR_PUBLIC_FOLDER: string;
diff --git a/docs/src/pages/quasar-cli-webpack/upgrade-guide.md b/docs/src/pages/quasar-cli-webpack/upgrade-guide.md
index f97702d63c9..47b90e1af63 100644
--- a/docs/src/pages/quasar-cli-webpack/upgrade-guide.md
+++ b/docs/src/pages/quasar-cli-webpack/upgrade-guide.md
@@ -195,6 +195,10 @@ Preparations:
```
<br>
+* Make sure to update your `/quasar.config` file with the newest specs in order to satisfy the types. Check all following sections.
+
+* If you have linting, please review your setup by going to [Linter page](/quasar-cli-webpack/linter). You will need to uninstall and install new dependencies.
+
* Convert your `/quasar.config.js` file to the ESM format (which is recommended, otherwise rename the file extension to `.cjs` and use CommonJs format). Also notice the wrappers import change, more on that later.
```diff /quasar.config.js file
- const { configure } = require('quasar/wrappers')
@@ -265,6 +269,7 @@ Preparations:
+ <!-- quasar:entry-point -->
</body>
```
+
<br>
* You might want to add the following to your `/.gitignore` file. These kind of files are left for inspection purposes when something fails with your `/quasar.config` file (and can be removed by the `quasar clean` command):
@@ -307,32 +312,6 @@ Preparations:
<br>
-* If you have linting, please review your `/.eslintignore` file as well:
-
- ```bash [highlight=6-8] /.eslintignore
- /dist
- /src-capacitor
- /src-cordova
- /.quasar
- /node_modules
- .eslintrc.cjs
- babel.config.cjs
- /quasar.config.*.temporary.compiled*
- ```
-
- <br>
-
- Update `/quasar.config file > bex` section to satisfy the types, regardless if you use BEX or not. If you are using BEX, please see the [BEX section below](#bex-mode-changes) for more details.
-
- ```diff /quasar.config file
- bex: {
- - contentScripts: []
- + extraScripts: []
- }
- ```
-
- <br>
-
* The types feature flag files will now be auto-generated in the `.quasar` folder. So, you must delete them:
```tabs
@@ -442,7 +421,7 @@ Preparations:
If you are using ESLint, we recommend enabling `@typescript-eslint/consistent-type-imports` rules in your ESLint configuration. If you don't have linting set up, we recommend using `verbatimModuleSyntax` in your `tsconfig.json` file as an alternative (_unlike ESLint rules, it's not auto-fixable_). These changes will help you unify your imports regarding regular and type-only imports. Please read [typescript-eslint Blog - Consistent Type Imports and Exports: Why and How](https://typescript-eslint.io/blog/consistent-type-imports-and-exports-why-and-how) for more information about this and how to set it up. Here is an example:
- ```js /.eslintrc.cjs
+ ```js /eslint.config.js
rules: {
// ...
'@typescript-eslint/consistent-type-imports': [
|
d8f0a6fc143e92d572b4f37a1cbd9e071c71825a
|
2024-04-25 16:37:25
|
Razvan Stoenescu
|
chore(app-vite): Bump version
| false
|
Bump version
|
chore
|
diff --git a/app-vite/package.json b/app-vite/package.json
index bfe93620a58..d1f1423dafe 100644
--- a/app-vite/package.json
+++ b/app-vite/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/app-vite",
- "version": "2.0.0-beta.8",
+ "version": "2.0.0-beta.9",
"description": "Quasar Framework App CLI with Vite",
"bin": {
"quasar": "./bin/quasar.js"
|
8cd7650e6e4c30fbe2818bfd2827c24bfd7ecdac
|
2023-11-29 19:41:33
|
Razvan Stoenescu
|
chore(ui): Bump version
| false
|
Bump version
|
chore
|
diff --git a/ui/package.json b/ui/package.json
index 1b55c17d336..0aa7eeb5f5b 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "quasar",
- "version": "2.14.0",
+ "version": "2.14.1",
"description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
"main": "dist/quasar.cjs.prod.js",
"module": "dist/quasar.esm.prod.js",
|
7b1f85eebae380b73946b15cef8be41473229724
|
2023-05-09 15:54:29
|
Yusuf Kandemir
|
chore: fix vite-ecosystem-ci:build script
| false
|
fix vite-ecosystem-ci:build script
|
chore
|
diff --git a/package.json b/package.json
index 93a62388dd7..5f3fb8dcc25 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,9 @@
"ui"
],
"scripts": {
- "vite-ecosystem-ci:build": "yarn workspace @quasar/vite-plugin build",
+ "vite-ecosystem-ci:build": "yarn workspace @quasar/vite-plugin build && yarn workspace quasar test:build",
"vite-ecosystem-ci:test": "yarn workspace @quasar/vite-plugin test",
- "vue-ecosystem-ci:build": "yarn workspace quasar test:build && yarn workspace @quasar/vite-plugin build",
+ "vue-ecosystem-ci:build": "yarn vite-ecosystem-ci:build",
"vue-ecosystem-ci:test": "yarn workspace quasar test:component:run && yarn workspace @quasar/vite-plugin test:e2e:ci"
}
}
|
63f54c90a3ef926f622f6510d62a59290b1f3215
|
2018-01-18 20:55:32
|
Razvan Stoenescu
|
fix: close #1445 Request: Enhance q-layout-drawer 'behaviour'?
| false
|
close #1445 Request: Enhance q-layout-drawer 'behaviour'?
|
fix
|
diff --git a/src/components/layout/QLayoutDrawer.js b/src/components/layout/QLayoutDrawer.js
index cbea31b0e98..54d0048a918 100644
--- a/src/components/layout/QLayoutDrawer.js
+++ b/src/components/layout/QLayoutDrawer.js
@@ -39,7 +39,9 @@ export default {
default: 'default'
},
contentStyle: Object,
- contentClass: [String, Object, Array]
+ contentClass: [String, Object, Array],
+ noSwipeOpen: Boolean,
+ noSwipeClose: Boolean
},
data () {
const
@@ -228,14 +230,16 @@ export default {
const child = []
if (this.mobileView) {
- child.push(h('div', {
- staticClass: `q-layout-drawer-opener fixed-${this.side}`,
- directives: [{
- name: 'touch-pan',
- modifiers: { horizontal: true },
- value: this.__openByTouch
- }]
- }))
+ if (!this.noSwipeOpen) {
+ child.push(h('div', {
+ staticClass: `q-layout-drawer-opener fixed-${this.side}`,
+ directives: [{
+ name: 'touch-pan',
+ modifiers: { horizontal: true },
+ value: this.__openByTouch
+ }]
+ }))
+ }
child.push(h('div', {
staticClass: 'fullscreen q-layout-backdrop',
'class': this.backdropClass,
@@ -256,7 +260,7 @@ export default {
style: this.computedStyle,
attrs: this.$attrs,
listeners: this.$listeners,
- directives: this.mobileView ? [{
+ directives: this.mobileView && !this.noSwipeClose ? [{
name: 'touch-pan',
modifiers: { horizontal: true },
value: this.__closeByTouch
|
836fbb938411d9380f05abd67f595e5c219c46dc
|
2019-02-14 00:59:58
|
Jeff Galbraith
|
feat(docs): QScrollArea updates (#3249)
| false
|
QScrollArea updates (#3249)
|
feat
|
diff --git a/docs/src/examples/QScrollArea/Basic.vue b/docs/src/examples/QScrollArea/Basic.vue
index 9a3d1463e28..3113e6e18c8 100644
--- a/docs/src/examples/QScrollArea/Basic.vue
+++ b/docs/src/examples/QScrollArea/Basic.vue
@@ -1,7 +1,7 @@
<template>
<div class="row q-ma-md">
<div class="col-12">
- <q-scroll-area style="height: 100px;">
+ <q-scroll-area style="height: 100px; max-width: 300px;">
<div v-for="n in 100" :key="n">
Lorem ipsum dolor sit amet, consectetur adipisicing
elit, sed do eiusmod tempor incididunt ut labore et
diff --git a/docs/src/examples/QScrollArea/Delay.vue b/docs/src/examples/QScrollArea/Delay.vue
index c16bdcf997a..278a1f4e1b5 100644
--- a/docs/src/examples/QScrollArea/Delay.vue
+++ b/docs/src/examples/QScrollArea/Delay.vue
@@ -3,7 +3,7 @@
<div class="col-12">
<q-scroll-area
:delay="200"
- style="height: 100px;"
+ style="height: 100px; max-width: 300px;"
>
<p>The bar will show in 200ms scrollbars become visible after mouse is hovering the container.</p>
<div v-for="n in 100" :key="n">
diff --git a/docs/src/examples/QScrollArea/ScrollPosition.vue b/docs/src/examples/QScrollArea/ScrollPosition.vue
index a7e9a48d8ac..fdf6c25fa4f 100644
--- a/docs/src/examples/QScrollArea/ScrollPosition.vue
+++ b/docs/src/examples/QScrollArea/ScrollPosition.vue
@@ -7,7 +7,7 @@
</div>
<div class="row q-ma-md">
<div class="col-12">
- <q-scroll-area ref="scrollArea" style="height: 150px;">
+ <q-scroll-area ref="scrollArea" style="height: 150px; max-width: 300px;">
<ol>
<li v-for="n in 1000" :key="n">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</li>
</ol>
diff --git a/docs/src/examples/QScrollArea/Styled.vue b/docs/src/examples/QScrollArea/Styled.vue
index e0fa056f65f..655335c4e86 100644
--- a/docs/src/examples/QScrollArea/Styled.vue
+++ b/docs/src/examples/QScrollArea/Styled.vue
@@ -5,7 +5,7 @@
:thumb-style="thumbStyle"
:content-style="contentStyle"
:content-active-style="contentActiveStyle"
- style="height: 100px;"
+ style="height: 100px; max-width: 300px;"
>
<div v-for="n in 100" :key="n">
Lorem ipsum dolor sit amet, consectetur adipisicing
diff --git a/docs/src/pages/vue-components/scroll-area.md b/docs/src/pages/vue-components/scroll-area.md
index ad7565d9c64..8f5f5fcabc1 100644
--- a/docs/src/pages/vue-components/scroll-area.md
+++ b/docs/src/pages/vue-components/scroll-area.md
@@ -1,9 +1,11 @@
---
title: Scroll Area
+related:
+ - /vue-components/list-and-list-items
+ - /vue-components/expansion-item
---
-Quasar offers a neat way of customizing the scrollbars with the help of QScrollArea component which can encapsulate your content. Think of it as a DOM element which has `overflow: auto`, but with your own custom styled scrollbar instead of browser's default one and a few nice features on top.
-<input type="hidden" data-fullpage-demo="scrolling/scroll-area">
+The QScrollArea component offers a neat way of customizing the scrollbars by encapsulating your content. Think of it as a DOM element which has `overflow: auto`, but with your own custom styled scrollbar instead of browser's default one and a few nice features on top.
This is especially useful for desktop as scrollbars are hidden on a mobile device. When on a mobile device, QScrollArea simply wraps the content in a `<div>` configured for default browser scrolling.
|
2120fe8604a115a268feb7904dfc5354187b694b
|
2024-09-03 17:37:26
|
Razvan Stoenescu
|
fix(ui): QList role computed prop -> lint issue & never return undefined (fix: #17439) (#17441)
| false
|
QList role computed prop -> lint issue & never return undefined (fix: #17439) (#17441)
|
fix
|
diff --git a/ui/src/components/item/QList.js b/ui/src/components/item/QList.js
index b6010f71ee9..65d7569f0b8 100644
--- a/ui/src/components/item/QList.js
+++ b/ui/src/components/item/QList.js
@@ -4,6 +4,8 @@ import { createComponent } from '../../utils/private.create/create.js'
import useDark, { useDarkProps } from '../../composables/private.use-dark/use-dark.js'
import { hSlot } from '../../utils/private.render/render.js'
+const roleAttrExceptions = [ 'ul', 'ol' ]
+
export default createComponent({
name: 'QList',
@@ -25,6 +27,10 @@ export default createComponent({
const vm = getCurrentInstance()
const isDark = useDark(props, vm.proxy.$q)
+ const role = computed(() => (
+ roleAttrExceptions.includes(props.tag) ? null : 'list')
+ )
+
const classes = computed(() =>
'q-list'
+ (props.bordered === true ? ' q-list--bordered' : '')
@@ -34,8 +40,6 @@ export default createComponent({
+ (props.padding === true ? ' q-list--padding' : '')
)
- const role = computed(() => props.tag === 'ul' || props.tag === 'ol' ? undefined : 'list')
-
return () => h(props.tag, { class: classes.value, role: role.value }, hSlot(slots.default))
}
})
|
cf472488edeca90defe280d99efde14704e7732b
|
2021-11-14 03:44:21
|
Razvan Stoenescu
|
fix(ui/split-attrs): update to newest vue specs #11297
| false
|
update to newest vue specs #11297
|
fix
|
diff --git a/ui/src/components/editor/QEditor.js b/ui/src/components/editor/QEditor.js
index 38769bbc109..8e3a0795bb7 100644
--- a/ui/src/components/editor/QEditor.js
+++ b/ui/src/components/editor/QEditor.js
@@ -80,12 +80,12 @@ export default createComponent({
],
setup (props, { slots, emit, attrs }) {
- const { proxy } = getCurrentInstance()
+ const { proxy, vnode } = getCurrentInstance()
const { $q } = proxy
const isDark = useDark(props, $q)
const { inFullscreen, toggleFullscreen } = useFullscreen()
- const splitAttrs = useSplitAttrs(attrs)
+ const splitAttrs = useSplitAttrs(attrs, vnode)
const rootRef = ref(null)
const contentRef = ref(null)
diff --git a/ui/src/composables/private/use-field.js b/ui/src/composables/private/use-field.js
index a0936cfbfea..cbeb196238c 100644
--- a/ui/src/composables/private/use-field.js
+++ b/ui/src/composables/private/use-field.js
@@ -75,7 +75,7 @@ export const useFieldProps = {
export const useFieldEmits = [ 'update:modelValue', 'clear', 'focus', 'blur', 'popup-show', 'popup-hide' ]
export function useFieldState () {
- const { props, attrs, proxy } = getCurrentInstance()
+ const { props, attrs, proxy, vnode } = getCurrentInstance()
const isDark = useDark(props, proxy.$q)
@@ -90,7 +90,7 @@ export function useFieldState () {
focused: ref(false),
hasPopupOpen: false,
- splitAttrs: useSplitAttrs(attrs),
+ splitAttrs: useSplitAttrs(attrs, vnode),
targetUid: ref(getTargetUid(props.for)),
rootRef: ref(null),
diff --git a/ui/src/composables/private/use-split-attrs.js b/ui/src/composables/private/use-split-attrs.js
index 6b030a4f5bc..196e412f623 100644
--- a/ui/src/composables/private/use-split-attrs.js
+++ b/ui/src/composables/private/use-split-attrs.js
@@ -2,7 +2,7 @@ import { ref, onBeforeUpdate } from 'vue'
const listenerRE = /^on[A-Z]/
-export default function (attrs) {
+export default function (attrs, vnode) {
const acc = {
listeners: ref({}),
attributes: ref({})
@@ -21,6 +21,12 @@ export default function (attrs) {
}
})
+ Object.keys(vnode.props).forEach(key => {
+ if (listenerRE.test(key) === true) {
+ listeners[ key ] = vnode.props[ key ]
+ }
+ })
+
acc.listeners.value = listeners
acc.attributes.value = attributes
}
|
afc66a40d05012f538c8daee428b4f24cbf1f37e
|
2017-08-07 18:50:42
|
Razvan Stoenescu
|
fix: Modal closes unexpectedly #755
| false
|
Modal closes unexpectedly #755
|
fix
|
diff --git a/src/components/modal/QModal.vue b/src/components/modal/QModal.vue
index ffff28f51a0..62fafae31a3 100644
--- a/src/components/modal/QModal.vue
+++ b/src/components/modal/QModal.vue
@@ -4,12 +4,14 @@
v-show="active"
class="modal fullscreen row"
:class="modalClasses"
- @click="click()"
+ @mousedown="__dismiss()"
+ @touchstart="__dismiss()"
>
<div
ref="content"
class="modal-content scroll"
- @click.stop
+ @mousedown.stop
+ @touchstart.stop
:style="modalCss"
:class="contentClasses"
>
@@ -231,7 +233,7 @@ export default {
this.open(done)
}
},
- click (onClick) {
+ __dismiss (onClick) {
if (this.noBackdropDismiss) {
return
}
|
549803cd61d9a4103632dcedcbbf6450bbf522c6
|
2018-06-12 21:39:20
|
Razvan Stoenescu
|
chore: Add SSR dev setup
| false
|
Add SSR dev setup
|
chore
|
diff --git a/.eslintrc.js b/.eslintrc.js
index 77dfd7bc61f..38f5ea51d3a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -49,6 +49,8 @@ module.exports = {
'import/no-unresolved': 0,
'import/no-extraneous-dependencies': 0,
+ 'prefer-promise-reject-errors': 0,
+
// allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
}
diff --git a/build/env.js b/build/env.js
index 2b487cb62ea..bb563c7fc4f 100644
--- a/build/env.js
+++ b/build/env.js
@@ -1,8 +1,7 @@
-const { resolve } = require('path')
const
theme = process.argv[2] || 'mat',
host = process.env.HOST || '0.0.0.0',
- port = process.env.PORT || 8080
+ port = process.env.PORT || (process.env.QUASAR_SSR ? 8554 : 8080)
module.exports = {
theme,
@@ -23,7 +22,7 @@ module.exports = {
noInfo: true,
disableHostCheck: true,
contentBase: [
- resolve(__dirname, '../dev')
+ require('path').resolve(__dirname, '../dev')
]
}
}
diff --git a/build/script.dev.js b/build/script.dev.spa.js
similarity index 73%
rename from build/script.dev.js
rename to build/script.dev.spa.js
index 613c35ccbcd..3bc1c84220b 100644
--- a/build/script.dev.js
+++ b/build/script.dev.spa.js
@@ -1,15 +1,12 @@
-if (!process.env.NODE_ENV) {
- process.env.NODE_ENV = 'development'
-}
+process.env.NODE_ENV = 'development'
const
webpack = require('webpack'),
- webpackDevServer = require('webpack-dev-server')
+ WebpackDevServer = require('webpack-dev-server')
const
env = require('./env'),
- opn = require('opn'),
- webpackConfig = require('./webpack.config')
+ webpackConfig = require('./webpack.spa')
console.log()
console.log(` ☕️ Preparing for Quasar v${env.quasarVersion}`)
@@ -31,9 +28,9 @@ compiler.hooks.done.tap('dev-server-done-compiling', compiler => {
this.__started = true
server.listen(env.port, env.host, () => {
- opn(env.uri)
+ require('opn')(env.uri)
})
})
// start building & launch server
-const server = new webpackDevServer(compiler, env.devServerConfig)
+const server = new WebpackDevServer(compiler, env.devServerConfig)
diff --git a/build/script.dev.ssr.js b/build/script.dev.ssr.js
new file mode 100644
index 00000000000..bd7ded7dd07
--- /dev/null
+++ b/build/script.dev.ssr.js
@@ -0,0 +1,205 @@
+process.env.NODE_ENV = 'development'
+process.env.QUASAR_SSR = true
+
+const
+ fs = require('fs'),
+ path = require('path'),
+ webpack = require('webpack'),
+ LRU = require('lru-cache'),
+ express = require('express'),
+ opn = require('opn'),
+ microcache = require('route-cache'),
+ { createBundleRenderer } = require('vue-server-renderer'),
+ MFS = require('memory-fs'),
+ clientConfig = require('./webpack.ssr.client'),
+ serverConfig = require('./webpack.ssr.server')
+
+const
+ env = require('./env'),
+ resolve = file => path.resolve(__dirname, '..', file),
+ useMicroCache = true,
+ serverInfo =
+ `express/${require('express/package.json').version} ` +
+ `vue-server-renderer/${require('vue-server-renderer/package.json').version}`,
+ app = express(),
+ templatePath = resolve('dev/ssr.index.html')
+
+console.log()
+console.log(` ☕️ Preparing for Quasar v${env.quasarVersion} on SSR`)
+console.log()
+console.log(` 🚀 Starting SSR dev server with ${env.theme.toUpperCase()} theme...`)
+console.log(` Will listen at ${env.uri}`)
+console.log(` Browser will open when build is ready.`)
+
+const readFile = (fs, file) => {
+ try {
+ return fs.readFileSync(path.join(clientConfig.output.path, file), 'utf-8')
+ }
+ catch (e) {}
+}
+
+function showBanner () {
+ console.log(`\n 🍺 Running SSR with Quasar v${env.quasarVersion} at ${env.uri}\n`)
+}
+
+function setupDevServer (app, templatePath, cb) {
+ let clientManifest, bundle, ready
+ let clientReady, serverReady
+ const
+ template = fs.readFileSync(templatePath, 'utf-8'),
+ clientPromise = new Promise((resolve, reject) => { clientReady = resolve }),
+ serverPromise = new Promise((resolve, reject) => { serverReady = resolve })
+
+ const readyPromise = new Promise((resolve, reject) => { ready = resolve })
+ const update = () => {
+ if (bundle && clientManifest) {
+ ready()
+ cb(bundle, {
+ template,
+ clientManifest
+ })
+ }
+ }
+
+ const clientCompiler = webpack(clientConfig)
+ const devMiddleware = require('webpack-dev-middleware')(
+ clientCompiler,
+ env.devServerConfig
+ )
+
+ app.use(devMiddleware)
+ app.use(
+ require('webpack-hot-middleware')(clientCompiler, { heartbeat: 5000 })
+ )
+
+ clientCompiler.hooks.done.tap(
+ 'client-dev-done-compiling',
+ ({ compilation: { errors, warnings } }) => {
+ errors.forEach(err => console.error(err))
+ warnings.forEach(err => console.warn(err))
+ if (errors.length) { return }
+
+ clientManifest = JSON.parse(readFile(
+ devMiddleware.fileSystem,
+ 'vue-ssr-client-manifest.json'
+ ))
+ update()
+
+ if (clientReady) {
+ clientReady()
+ clientReady = null
+ }
+ else {
+ showBanner()
+ }
+ })
+
+ const serverCompiler = webpack(serverConfig)
+ const mfs = new MFS()
+ serverCompiler.outputFileSystem = mfs
+ serverCompiler.watch({}, (err, stats) => {
+ if (err) { throw err }
+ stats = stats.toJson()
+ if (stats.errors.length) { return }
+
+ // read bundle generated by vue-ssr-webpack-plugin
+ bundle = JSON.parse(readFile(mfs, 'vue-ssr-server-bundle.json'))
+ update()
+
+ if (serverReady) {
+ serverReady()
+ serverReady = null
+ }
+ })
+
+ Promise.all([
+ clientPromise,
+ serverPromise
+ ]).then(() => {
+ app.listen(env.port, env.host, () => {
+ showBanner()
+ require('opn')(env.uri)
+ })
+ })
+
+ return readyPromise
+}
+
+function createRenderer (bundle, options) {
+ // https://github.com/vuejs/vue/blob/dev/packages/vue-server-renderer/README.md#why-use-bundlerenderer
+ return createBundleRenderer(bundle, Object.assign(options, {
+ // for component caching
+ cache: LRU({
+ max: 1000,
+ maxAge: 1000 * 60 * 15
+ }),
+ // recommended for performance
+ runInNewContext: false
+ }))
+}
+
+let renderer
+
+// In development: setup the dev server with watch and hot-reload,
+// and create a new renderer on bundle / index template update.
+const readyPromise = setupDevServer(
+ app,
+ templatePath,
+ (bundle, options) => {
+ renderer = createRenderer(bundle, options)
+ }
+)
+
+const serve = path => express.static(
+ resolve('dev/' + path),
+ { maxAge: 0 }
+)
+
+app.use('/statics', serve('statics'))
+
+// https://www.nginx.com/blog/benefits-of-microcaching-nginx/
+app.use(microcache.cacheSeconds(1, req => useMicroCache && req.originalUrl))
+
+function render (req, res) {
+ const s = Date.now()
+
+ res.setHeader('Content-Type', 'text/html')
+ res.setHeader('Server', serverInfo)
+
+ const handleError = err => {
+ if (err.url) {
+ res.redirect(err.url)
+ }
+ else if (err.code === 404) {
+ res.status(404).send('404 | Page Not Found')
+ }
+ else {
+ // Render Error Page or Redirect
+ res.status(500).send(`
+ <div>500 | Internal Server Error</div>
+ <div>error during render: ${req.url}</div>
+ <pre>${err.stack}</pre>
+ `)
+ console.error(`error during render: ${req.url}`)
+ console.error(err.stack)
+ }
+ }
+
+ const context = {
+ url: req.url,
+ req,
+ res
+ }
+
+ renderer.renderToString(context, (err, html) => {
+ if (err) {
+ return handleError(err)
+ }
+ res.send(html)
+ console.log(` ⚡️ ${Date.now() - s}ms for: ${req.url}`)
+ })
+}
+
+app.get('*', (req, res) => {
+ readyPromise.then(() => render(req, res))
+})
diff --git a/build/webpack.config.js b/build/webpack.config.js
deleted file mode 100644
index cd59fc60a4f..00000000000
--- a/build/webpack.config.js
+++ /dev/null
@@ -1,222 +0,0 @@
-const
- path = require('path'),
- webpack = require('webpack'),
- WebpackChain = require('webpack-chain'),
- VueLoaderPlugin = require('vue-loader/lib/plugin'),
- ProgressBarPlugin = require('progress-bar-webpack-plugin'),
- HtmlWebpackPlugin = require('html-webpack-plugin'),
- FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
-
-const
- env = require('./env'),
- projectRoot = path.resolve(__dirname, '../')
-
-function resolve (dir) {
- return path.join(__dirname, '..', dir)
-}
-
-const chain = new WebpackChain()
-
-chain.entry('app').add(resolve('dev/main.js'))
-chain.mode('development')
-chain.devtool('#cheap-module-eval-source-map')
-
-chain.resolve.extensions
- .merge([`.${env.theme}.js`, '.js', `.${env.theme}.vue`, '.vue'])
-
-chain.resolve.modules
- .merge([
- resolve('src'),
- 'node_modules'
- ])
-
-chain.resolve.alias
- .merge({
- quasar: resolve(`src/index.esm`),
- 'quasar-css': resolve(`src/css/${env.theme}.styl`),
- assets: resolve('dev/assets'),
- components: resolve('dev/components'),
- data: resolve('dev/data'),
- variables: resolve(`src/css/core.variables.styl`)
- })
-
-chain.module.rule('lint')
- .test(/\.(js|vue)$/)
- .enforce('pre')
- .exclude
- .add(/node_modules/)
- .end()
- .use('eslint-loader')
- .loader('eslint-loader')
-
-chain.module.rule('vue')
- .test(/\.vue$/)
- .use('vue-loader')
- .loader('vue-loader')
- .options({
- productionMode: false,
- compilerOptions: {
- preserveWhitespace: false
- },
- transformAssetUrls: {
- video: 'src',
- source: 'src',
- img: 'src',
- image: 'xlink:href'
- }
- })
-
-chain.module.rule('babel')
- .test(/\.js$/)
- .include
- .add(projectRoot)
- .end()
- .exclude
- .add(/node_modules/)
- .end()
- .use('babel-loader')
- .loader('babel-loader')
-
-chain.module.rule('images')
- .test(/\.(png|jpe?g|gif|svg)(\?.*)?$/)
- .use('url-loader')
- .loader('url-loader')
- .options({
- limit: 10000,
- name: 'img/[name].[hash:7].[ext]'
- })
-
-chain.module.rule('fonts')
- .test(/\.(woff2?|eot|ttf|otf)(\?.*)?$/)
- .use('url-loader')
- .loader('url-loader')
- .options({
- limit: 10000,
- name: 'fonts/[name].[hash:7].[ext]'
- })
-
-injectStyleRules(chain)
-
-chain.plugin('vue-loader')
- .use(VueLoaderPlugin)
-
-chain.plugin('define')
- .use(webpack.DefinePlugin, [{
- 'process.env': {
- NODE_ENV: '"development"',
- THEME: JSON.stringify(env.theme)
- }
- }])
-
-chain.plugin('progress-bar')
- .use(ProgressBarPlugin, [{
- format: ' [:bar] :percent (:msg)'
- }])
-
-chain.plugin('html-webpack')
- .use(HtmlWebpackPlugin, [{
- filename: 'index.html',
- template: 'dev/index.html',
- inject: true,
- cache: true
- }])
-
-chain.performance
- .hints(false)
- .maxAssetSize(1000000)
-
-chain.node
- .merge({
- // prevent webpack from injecting useless setImmediate polyfill because Vue
- // source contains it (although only uses it if it's native).
- setImmediate: false,
- // process is injected via DefinePlugin, although some 3rd party
- // libraries may require a mock to work properly (#934)
- process: 'mock',
- // prevent webpack from injecting mocks to Node native modules
- // that does not make sense for the client
- dgram: 'empty',
- fs: 'empty',
- net: 'empty',
- tls: 'empty',
- child_process: 'empty'
- })
-
-chain.optimization
- .noEmitOnErrors(true)
-
-chain.plugin('friendly-errors')
- .use(FriendlyErrorsPlugin, [{
- compilationSuccessInfo: {
- messages: [
- `Running with Quasar v${env.quasarVersion} at ${env.uri}\n`
- ],
- },
- clearConsole: true
- }])
-
-chain.optimization
- .namedModules(true) // HMR shows filenames in console on update
-
-chain.plugin('hot-module-replacement')
- .use(webpack.HotModuleReplacementPlugin)
-
-const webpackConfig = chain.toConfig()
-
-// tap entries for HMR
-require('webpack-dev-server').addDevServerEntrypoints(webpackConfig, env.devServerConfig)
-
-module.exports = webpackConfig
-
-function injectRule (chain, lang, test, loader, options) {
- const rule = chain.module.rule(lang).test(test)
-
- rule.use('vue-style-loader')
- .loader('vue-style-loader')
- .options({
- sourceMap: true
- })
-
- rule.use('css-loader')
- .loader('css-loader')
- .options({
- importLoaders: 2 + (loader ? 1 : 0),
- sourceMap: true
- })
-
- const postCssOpts = {
- sourceMap: true
- }
-
- if (env.rtl) {
- const rtlOptions = env.rtl === true
- ? {}
- : env.rtl
-
- postCssOpts.plugins = () => {
- return [
- require('postcss-rtl')(rtlOptions)
- ]
- }
- }
-
- rule.use('postcss-loader')
- .loader('postcss-loader')
- .options(postCssOpts)
-
- if (loader) {
- rule.use(loader)
- .loader(loader)
- .options(Object.assign(
- { sourceMap: true },
- options
- ))
- }
-}
-
-function injectStyleRules (chain, options) {
- injectRule(chain, 'css', /\.css$/)
- injectRule(chain, 'stylus', /\.styl(us)?$/, 'stylus-loader', {
- preferPathResolver: 'webpack'
- })
-}
diff --git a/build/webpack.inject.base.js b/build/webpack.inject.base.js
new file mode 100644
index 00000000000..1784ee340e6
--- /dev/null
+++ b/build/webpack.inject.base.js
@@ -0,0 +1,191 @@
+const
+ path = require('path'),
+ webpack = require('webpack'),
+ VueLoaderPlugin = require('vue-loader/lib/plugin'),
+ FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin'),
+ WebpackBar = require('webpackbar')
+
+const
+ env = require('./env'),
+ projectRoot = path.resolve(__dirname, '../')
+
+function resolve (dir) {
+ return path.join(__dirname, '..', dir)
+}
+
+module.exports = function (chain) {
+ chain.mode('development')
+ chain.devtool('#cheap-module-eval-source-map')
+
+ chain.resolve.extensions
+ .merge([`.${env.theme}.js`, '.js', `.${env.theme}.vue`, '.vue'])
+
+ chain.resolve.modules
+ .merge([
+ resolve('src'),
+ 'node_modules'
+ ])
+
+ chain.resolve.alias
+ .merge({
+ quasar: resolve(`src/index.esm`),
+ 'quasar-css': resolve(`src/css/${env.theme}.styl`),
+ assets: resolve('dev/assets'),
+ components: resolve('dev/components'),
+ data: resolve('dev/data'),
+ variables: resolve(`src/css/core.variables.styl`)
+ })
+
+ chain.module.rule('lint')
+ .test(/\.(js|vue)$/)
+ .enforce('pre')
+ .exclude
+ .add(/node_modules/)
+ .end()
+ .use('eslint-loader')
+ .loader('eslint-loader')
+
+ chain.module.rule('vue')
+ .test(/\.vue$/)
+ .use('vue-loader')
+ .loader('vue-loader')
+ .options({
+ productionMode: false,
+ compilerOptions: {
+ preserveWhitespace: false
+ },
+ transformAssetUrls: {
+ video: 'src',
+ source: 'src',
+ img: 'src',
+ image: 'xlink:href'
+ }
+ })
+
+ chain.module.rule('babel')
+ .test(/\.js$/)
+ .include
+ .add(projectRoot)
+ .end()
+ .exclude
+ .add(/node_modules/)
+ .end()
+ .use('babel-loader')
+ .loader('babel-loader')
+
+ chain.module.rule('images')
+ .test(/\.(png|jpe?g|gif|svg)(\?.*)?$/)
+ .use('url-loader')
+ .loader('url-loader')
+ .options({
+ limit: 10000,
+ name: 'img/[name].[hash:7].[ext]'
+ })
+
+ chain.module.rule('fonts')
+ .test(/\.(woff2?|eot|ttf|otf)(\?.*)?$/)
+ .use('url-loader')
+ .loader('url-loader')
+ .options({
+ limit: 10000,
+ name: 'fonts/[name].[hash:7].[ext]'
+ })
+
+ injectStyleRules(chain)
+
+ chain.plugin('vue-loader')
+ .use(VueLoaderPlugin)
+
+ chain.plugin('define')
+ .use(webpack.DefinePlugin, [{
+ 'process.env': {
+ NODE_ENV: '"development"',
+ THEME: JSON.stringify(env.theme)
+ }
+ }])
+
+ chain.performance
+ .hints(false)
+ .maxAssetSize(1000000)
+
+ chain.node
+ .merge({
+ // prevent webpack from injecting useless setImmediate polyfill because Vue
+ // source contains it (although only uses it if it's native).
+ setImmediate: false,
+ // process is injected via DefinePlugin, although some 3rd party
+ // libraries may require a mock to work properly (#934)
+ process: 'mock',
+ // prevent webpack from injecting mocks to Node native modules
+ // that does not make sense for the client
+ dgram: 'empty',
+ fs: 'empty',
+ net: 'empty',
+ tls: 'empty',
+ child_process: 'empty'
+ })
+
+ chain.optimization
+ .noEmitOnErrors(true)
+
+ chain.plugin('webpack-bar')
+ .use(WebpackBar)
+
+ chain.plugin('friendly-errors')
+ .use(FriendlyErrorsPlugin, [{
+ clearConsole: true
+ }])
+}
+
+function injectRule (chain, lang, test, loader, options) {
+ const rule = chain.module.rule(lang).test(test)
+
+ rule.use('vue-style-loader')
+ .loader('vue-style-loader')
+ .options({
+ sourceMap: true
+ })
+
+ rule.use('css-loader')
+ .loader('css-loader')
+ .options({
+ importLoaders: 2 + (loader ? 1 : 0),
+ sourceMap: true
+ })
+
+ const postCssOpts = {
+ sourceMap: true
+ }
+
+ if (env.rtl) {
+ const rtlOptions = env.rtl === true
+ ? {}
+ : env.rtl
+
+ postCssOpts.plugins = () => {
+ return [
+ require('postcss-rtl')(rtlOptions)
+ ]
+ }
+ }
+
+ rule.use('postcss-loader')
+ .loader('postcss-loader')
+ .options(postCssOpts)
+
+ if (loader) {
+ rule.use(loader)
+ .loader(loader)
+ .options(Object.assign(
+ { sourceMap: true },
+ options
+ ))
+ }
+}
+
+function injectStyleRules (chain, options) {
+ injectRule(chain, 'css', /\.css$/)
+ injectRule(chain, 'stylus', /\.styl(us)?$/, 'stylus-loader', {
+ preferPathResolver: 'webpack'
+ })
+}
diff --git a/build/webpack.spa.js b/build/webpack.spa.js
new file mode 100644
index 00000000000..d0dd59972aa
--- /dev/null
+++ b/build/webpack.spa.js
@@ -0,0 +1,55 @@
+const
+ path = require('path'),
+ webpack = require('webpack'),
+ WebpackChain = require('webpack-chain'),
+ HtmlWebpackPlugin = require('html-webpack-plugin')
+
+const env = require('./env')
+
+function resolve (dir) {
+ return path.join(__dirname, '..', dir)
+}
+
+const chain = new WebpackChain()
+
+// inject base
+require('./webpack.inject.base')(chain)
+
+chain.entry('app')
+ .add(resolve('dev/spa.app.js'))
+
+chain.plugin('html-webpack')
+ .use(HtmlWebpackPlugin, [{
+ filename: 'index.html',
+ template: 'dev/spa.index.html',
+ inject: true,
+ cache: true
+ }])
+
+chain.plugin('hot-module-replacement')
+ .use(webpack.HotModuleReplacementPlugin)
+
+chain.plugin('webpack-bar')
+ .init(Plugin => new Plugin({
+ name: 'spa'
+ }))
+
+chain.plugin('friendly-errors')
+ .init((Plugin, args) => new Plugin({
+ compilationSuccessInfo: {
+ messages: [
+ `Running SPA with Quasar v${env.quasarVersion} at ${env.uri}\n`
+ ]
+ },
+ clearConsole: true
+ }))
+
+chain.optimization
+ .namedModules(true) // HMR shows filenames in console on update
+
+const webpackConfig = chain.toConfig()
+
+// tap entries for HMR
+require('webpack-dev-server').addDevServerEntrypoints(webpackConfig, env.devServerConfig)
+
+module.exports = webpackConfig
diff --git a/build/webpack.ssr.client.js b/build/webpack.ssr.client.js
new file mode 100644
index 00000000000..9114de26ecf
--- /dev/null
+++ b/build/webpack.ssr.client.js
@@ -0,0 +1,47 @@
+const
+ path = require('path'),
+ webpack = require('webpack'),
+ env = require('./env'),
+ WebpackChain = require('webpack-chain'),
+ VueSSRClientPlugin = require('vue-server-renderer/client-plugin'),
+ WebpackBar = require('webpackbar'),
+ FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
+
+const
+ resolve = file => path.resolve(__dirname, '..', file),
+ chain = new WebpackChain()
+
+// inject base
+require('./webpack.inject.base')(chain)
+
+chain.entry('client')
+ .add('webpack-hot-middleware/client')
+ .add(resolve('dev/ssr.app.entry-client.js'))
+
+chain.output
+ .path(resolve('dev'))
+ .publicPath('/')
+ .filename('[name].js')
+
+chain.plugin('define')
+ .init((Plugin, args) => new Plugin({
+ 'process.env.VUE_ENV': '"client"',
+ ...args
+ }))
+
+// This plugins generates `vue-ssr-client-manifest.json`
+chain.plugin('vue-ssr-client')
+ .use(VueSSRClientPlugin)
+
+chain.plugin('hot-module-replacement')
+ .use(webpack.HotModuleReplacementPlugin)
+
+chain.plugin('webpack-bar')
+ .init(Plugin => new Plugin({
+ name: 'client'
+ }))
+
+chain.optimization
+ .namedModules(true) // HMR shows filenames in console on update
+
+module.exports = chain.toConfig()
diff --git a/build/webpack.ssr.server.js b/build/webpack.ssr.server.js
new file mode 100644
index 00000000000..ca5dac220f1
--- /dev/null
+++ b/build/webpack.ssr.server.js
@@ -0,0 +1,48 @@
+const
+ path = require('path'),
+ WebpackChain = require('webpack-chain'),
+ VueSSRServerPlugin = require('vue-server-renderer/server-plugin'),
+ nodeExternals = require('webpack-node-externals'),
+ WebpackBar = require('webpackbar')
+
+const
+ resolve = file => path.resolve(__dirname, '..', file),
+ chain = new WebpackChain()
+
+// inject base
+require('./webpack.inject.base')(chain)
+
+chain.target('node')
+
+chain.entry('server')
+ .add(resolve('dev/ssr.app.entry-server.js'))
+
+chain.output
+ .filename('server-bundle.js')
+ .libraryTarget('commonjs2')
+ .path(resolve('dev'))
+ .publicPath('/')
+
+// https://webpack.js.org/configuration/externals/#externals
+// https://github.com/liady/webpack-node-externals
+chain.externals(nodeExternals({
+ // do not externalize CSS files in case we need to import it from a dep
+ whitelist: /\.css$/
+}))
+
+chain.plugin('define')
+ .init((Plugin, args) => new Plugin({
+ 'process.env.VUE_ENV': '"server"',
+ ...args
+ }))
+
+chain.plugin('webpack-bar')
+ .init(Plugin => new Plugin({
+ name: 'server'
+ }))
+
+// This plugins generates `vue-ssr-client-manifest.json`
+chain.plugin('vue-ssr-server')
+ .use(VueSSRServerPlugin)
+
+module.exports = chain.toConfig()
diff --git a/dev/App.vue b/dev/App.vue
index 3fd27e60aee..10989dc897c 100644
--- a/dev/App.vue
+++ b/dev/App.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-app">
+ <div id="q-app">
<transition enter-active-class="animated fadeIn" leave-active-class="animated fadeOut" mode="out-in" :duration="300" @leave="resetScroll">
<router-view/>
</transition>
diff --git a/dev/components/components/chip.vue b/dev/components/components/chip.vue
index 5d3563e80d0..782ec3c818a 100644
--- a/dev/components/components/chip.vue
+++ b/dev/components/components/chip.vue
@@ -2,20 +2,20 @@
<div>
<div class="layout-padding">
<p class="caption">Basic Label Chips</p>
- <p>
+ <div>
<q-chip icon="alarm" color="primary">
q-chip
</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip icon="alarm" outline color="primary">
q-chip
</q-chip>
<q-chip icon-right="alarm" color="primary">
q-chip
</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip color="primary">q-chip</q-chip>
<q-chip color="secondary" class="shadow-1">10k</q-chip>
<q-chip small color="secondary" class="shadow-1">10k</q-chip>
@@ -35,8 +35,8 @@
q-chip
</q-chip>
<q-chip color="secondary" class="shadow-1">10k</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip square color="primary">q-chip</q-chip>
<q-chip square color="secondary" class="shadow-1">10k</q-chip>
<q-chip square small color="secondary" class="shadow-1">10k</q-chip>
@@ -56,9 +56,9 @@
q-chip
</q-chip>
<q-chip square color="secondary" class="shadow-1">10k</q-chip>
- </p>
+ </div>
- <p>
+ <div>
<q-chip dense square color="primary">q-chip</q-chip>
<q-chip dense square color="secondary" class="shadow-1">10k</q-chip>
<q-chip dense square small color="secondary" class="shadow-1">10k</q-chip>
@@ -78,10 +78,10 @@
q-chip
</q-chip>
<q-chip dense square color="secondary" class="shadow-1">10k</q-chip>
- </p>
+ </div>
<p class="caption">Floating Label Chips</p>
- <p>
+ <div>
<q-btn color="light" text-color="black" label="Inbox">
<q-chip floating color="primary">22</q-chip>
</q-btn>
@@ -101,7 +101,7 @@
<q-btn round dense color="dark" icon="announcement">
<q-chip floating color="red">1</q-chip>
</q-btn>
- </p>
+ </div>
<p class="caption">Advanced Label Chips</p>
<div class="group">
@@ -127,81 +127,81 @@
<q-chip avatar="/statics/boy-avatar.png" closable color="primary" @click="clickable">Jim</q-chip>
<p class="caption">Tag Label Chips</p>
- <p>
+ <div>
<q-chip tag icon-right="mail" color="light" class="text-black">New</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip tag closable color="red">Upcoming</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip tag square color="primary">Featured</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip dense tag icon-right="mail" color="light" class="text-black">New</q-chip>
<q-chip dense tag closable color="red">Upcoming</q-chip>
<q-chip dense tag square color="primary">Featured</q-chip>
- </p>
+ </div>
<p class="caption">Pointing Label Chips</p>
- <p>
+ <div>
<q-chip pointing="up" color="primary">1</q-chip>
<q-chip pointing="down" color="primary">2</q-chip>
<q-chip pointing="right" color="primary">3</q-chip>
<q-chip pointing="left" color="primary">4</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip pointing="up" color="primary">Pointing Up</q-chip>
<q-chip pointing="down" color="primary">Pointing Down</q-chip>
<q-chip pointing="right" color="primary">Pointing Right</q-chip>
<q-chip pointing="left" color="primary">Pointing Left</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip square pointing="up" color="primary">Pointing Up</q-chip>
<q-chip square pointing="down" color="primary">Pointing Down</q-chip>
<q-chip square pointing="right" color="primary">Pointing Right</q-chip>
<q-chip square pointing="left" color="primary">Pointing Left</q-chip>
- </p>
+ </div>
- <p>
+ <div>
<q-chip dense pointing="up" color="primary">Pointing Up</q-chip>
<q-chip dense pointing="down" color="primary">Pointing Down</q-chip>
<q-chip dense pointing="right" color="primary">Pointing Right</q-chip>
<q-chip dense pointing="left" color="primary">Pointing Left</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip dense square pointing="up" color="primary">Pointing Up</q-chip>
<q-chip dense square pointing="down" color="primary">Pointing Down</q-chip>
<q-chip dense square pointing="right" color="primary">Pointing Right</q-chip>
<q-chip dense square pointing="left" color="primary">Pointing Left</q-chip>
- </p>
+ </div>
<p class="caption">With Icons</p>
- <p>
+ <div>
<q-chip icon="mail" color="primary">
10
</q-chip>
<q-chip icon-right="mail" color="tertiary">
10
</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip dense icon="mail" color="primary">
10
</q-chip>
<q-chip dense icon-right="mail" color="tertiary">
10
</q-chip>
- </p>
+ </div>
<p class="caption">With Detail</p>
- <p>
+ <div>
<q-chip detail icon="mail">Detail</q-chip>
<q-chip detail square icon="mail">Detail</q-chip>
- </p>
- <p>
+ </div>
+ <div>
<q-chip dense detail icon="mail">Detail</q-chip>
<q-chip dense detail square icon="mail">Detail</q-chip>
- </p>
+ </div>
</div>
</div>
</template>
diff --git a/dev/components/new-layout/pages/a.vue b/dev/components/new-layout/pages/a.vue
index fdfce2a6dee..8ed17a1a8c5 100644
--- a/dev/components/new-layout/pages/a.vue
+++ b/dev/components/new-layout/pages/a.vue
@@ -14,7 +14,7 @@
<q-btn @click="$router.replace('/layout-quick/b')">Replace Go to B</q-btn>
<q-btn @click="$router.replace('/layout-quick/c')">Replace Go to C</q-btn>
- <div v-for="n in 50">
+ <div v-for="n in 50" :key="n">
{{ n }} Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</div>
diff --git a/dev/router.js b/dev/router.js
index 3187518f8fb..a8aeb26ad1e 100644
--- a/dev/router.js
+++ b/dev/router.js
@@ -56,9 +56,13 @@ pages.forEach(page => {
routes.push(component(page))
})
-routes.push({path: '*', component: load('error404')})
+if (!process.env.QUASAR_SSR) {
+ routes.push({path: '*', component: load('error404')})
+}
-export default new VueRouter({
- // mode: 'history',
- routes
-})
+export function createRouter () {
+ return new VueRouter({
+ mode: 'history',
+ routes
+ })
+}
diff --git a/dev/main.js b/dev/spa.app.js
similarity index 92%
rename from dev/main.js
rename to dev/spa.app.js
index f0b8122e4de..99cb9a4c086 100644
--- a/dev/main.js
+++ b/dev/spa.app.js
@@ -7,7 +7,7 @@ import Vue from 'vue'
import Quasar, * as Everything from 'quasar'
import App from './App'
-import router from './router'
+import { createRouter } from './router'
import 'quasar-css'
@@ -39,6 +39,6 @@ Vue.use(Quasar, {
/* eslint-disable no-new */
new Vue({
el: '#q-app',
- router,
+ router: createRouter(),
render: h => h(App)
})
diff --git a/dev/spa.index.html b/dev/spa.index.html
new file mode 100644
index 00000000000..981ad6f1b70
--- /dev/null
+++ b/dev/spa.index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en-us">
+ <head>
+ <meta charset="utf-8">
+ <meta name="format-detection" content="telephone=no">
+ <meta name="msapplication-tap-highlight" content="no">
+ <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
+
+ <base href="/">
+ <title>Quasar Development</title>
+ <link rel="icon" href="statics/quasar-logo.png" type="image/x-icon">
+ <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Material+Icons">
+ </head>
+ <body class="demo-site">
+ <div id="q-app"></div>
+ </body>
+</html>
diff --git a/dev/ssr.app.entry-client.js b/dev/ssr.app.entry-client.js
new file mode 100644
index 00000000000..5ef3d537a96
--- /dev/null
+++ b/dev/ssr.app.entry-client.js
@@ -0,0 +1,7 @@
+import { createApp } from './ssr.app'
+
+const { app, router } = createApp()
+
+router.onReady(() => {
+ app.$mount('#q-app')
+})
diff --git a/dev/ssr.app.entry-server.js b/dev/ssr.app.entry-server.js
new file mode 100644
index 00000000000..d2e7e923110
--- /dev/null
+++ b/dev/ssr.app.entry-server.js
@@ -0,0 +1,33 @@
+import { createApp } from './ssr.app'
+
+export default context => {
+ // since there could potentially be asynchronous route hooks or components,
+ // we will be returning a Promise so that the server can wait until
+ // everything is ready before rendering.
+
+ return new Promise((resolve, reject) => {
+ const { app, router } = createApp(context)
+
+ const { fullPath } = router.resolve(context.url).route
+
+ if (fullPath !== context.url) {
+ return reject({ url: fullPath })
+ }
+
+ // set server-side router's location
+ router.push(context.url)
+ console.log(context.url)
+
+ // wait until router has resolved possible async components and hooks
+ router.onReady(() => {
+ const matchedComponents = router.getMatchedComponents()
+ // no matched routes, reject with 404
+ if (!matchedComponents.length) {
+ return reject({ code: 404 })
+ }
+
+ // the Promise should resolve to the app instance so it can be rendered
+ resolve(app)
+ }, reject)
+ })
+}
diff --git a/dev/ssr.app.js b/dev/ssr.app.js
new file mode 100644
index 00000000000..e893480dff2
--- /dev/null
+++ b/dev/ssr.app.js
@@ -0,0 +1,66 @@
+import '../src/ie-compat/ie'
+import Vue from 'vue'
+import App from './App.vue'
+
+import { createRouter } from './router'
+
+// "Everything" bit is just a hack.
+// Don't use it in your apps.
+import Quasar, * as Everything from 'quasar'
+
+import 'quasar-css'
+
+/*
+if (process.env.THEME === 'mat') {
+ require('quasar-extras/roboto-font')
+}
+import 'quasar-extras/material-icons'
+import 'quasar-extras/ionicons'
+import 'quasar-extras/fontawesome'
+import 'quasar-extras/mdi'
+import 'quasar-extras/animate'
+*/
+
+// import iconSet from '../icons/fontawesome'
+
+// export a factory function for creating fresh app, router and store
+// instances
+export function createApp (ctx) {
+ const config = {}
+
+ if (ctx) {
+ config.ssr = {
+ req: ctx.req,
+ res: ctx.res
+ }
+ }
+
+ Vue.use(Quasar, {
+ components: Everything,
+ directives: Everything,
+ plugins: Everything,
+ config
+ // iconSet
+ })
+
+ const router = createRouter()
+
+ if (process.env.VUE_ENV === 'client') {
+ let reload = false
+ router.beforeEach((to, from, next) => {
+ if (reload) {
+ window.location.href = to.fullPath
+ return
+ }
+ reload = true
+ next()
+ })
+ }
+
+ const app = new Vue({
+ router,
+ ...App
+ })
+
+ return { app, router }
+}
diff --git a/dev/index.html b/dev/ssr.index.html
similarity index 57%
rename from dev/index.html
rename to dev/ssr.index.html
index f3c37fae8fe..5c448cf800a 100644
--- a/dev/index.html
+++ b/dev/ssr.index.html
@@ -1,21 +1,18 @@
<!DOCTYPE html>
-<html lang="en">
+<html lang="en-us">
<head>
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
+ <base href="/">
<title>Quasar Development</title>
<link rel="icon" href="statics/quasar-logo.png" type="image/x-icon">
- <!--
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
- <link rel="stylesheet" href="http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
- -->
+ <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Material+Icons">
</head>
<body class="demo-site">
- <div id="q-app"></div>
+ <!--vue-ssr-outlet-->
<!-- built files will be auto injected -->
</body>
</html>
diff --git a/package.json b/package.json
index 4fb1d8700b5..b2417b171a3 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
],
"scripts": {
"clean": "node build/script.clean.js",
- "dev": "node build/script.dev.js",
+ "dev": "node build/script.dev.spa.js",
+ "dev:ssr": "node build/script.dev.ssr.js",
"build": "node build/script.build.js",
"test:umd": "node build/script.test-umd.js",
"test": "eslint --ext .js,.vue src dev",
@@ -44,13 +45,13 @@
},
"homepage": "http://quasar-framework.org",
"devDependencies": {
- "@babel/core": "7.0.0-beta.48",
- "@babel/plugin-transform-runtime": "7.0.0-beta.48",
- "@babel/preset-env": "7.0.0-beta.48",
- "@babel/preset-stage-2": "7.0.0-beta.48",
- "@babel/runtime": "7.0.0-beta.48",
+ "@babel/core": "7.0.0-beta.49",
+ "@babel/plugin-transform-runtime": "7.0.0-beta.49",
+ "@babel/preset-env": "7.0.0-beta.49",
+ "@babel/preset-stage-2": "7.0.0-beta.49",
+ "@babel/runtime": "7.0.0-beta.49",
"ajv": "^6.2.1",
- "autoprefixer": "^8.1.0",
+ "autoprefixer": "^8.6.2",
"babel-eslint": "^8.2.2",
"babel-loader": "^8.0.0-beta.2",
"babel-preset-es2015-rollup": "^3.0.0",
@@ -69,18 +70,20 @@
"file-loader": "^1.1.11",
"friendly-errors-webpack-plugin": "^1.6.1",
"html-webpack-plugin": "^3.2.0",
+ "lru-cache": "^4.1.3",
+ "memory-fs": "^0.4.1",
"opn": "^5.3.0",
"parse5": "^2.2.3",
"postcss-loader": "^2.1.1",
- "postcss-rtl": "^1.2.3",
- "progress-bar-webpack-plugin": "^1.11.0",
- "quasar-extras": "^2.0.1",
+ "postcss-rtl": "^1.3.0",
+ "quasar-extras": "^2.0.3",
"rollup": "^0.59.3",
"rollup-plugin-buble": "^0.19.2",
"rollup-plugin-json": "^3.0.0",
"rollup-plugin-node-resolve": "^3.2.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-vue": "^3.0.0",
+ "route-cache": "^0.4.4",
"shelljs": "^0.8.1",
"stylint": "^1.5.9",
"stylus": "^0.54.5",
@@ -89,13 +92,19 @@
"uglify-es": "^3.3.9",
"url-loader": "^1.0.1",
"vue": "^2.5.16",
- "vue-loader": "^15.2.0",
+ "vue-loader": "^15.2.4",
"vue-router": "^3.0.1",
+ "vue-server-renderer": "^2.5.16",
"vue-style-loader": "^4.0.2",
"vue-template-compiler": "^2.5.16",
- "webpack": "^4.8.3",
+ "webpack": "^4.12.0",
"webpack-chain": "^4.8.0",
- "webpack-dev-server": "^3.1.4"
+ "webpack-dev-middleware": "^3.1.3",
+ "webpack-dev-server": "^3.1.4",
+ "webpack-hot-middleware": "^2.22.2",
+ "webpack-merge": "^4.1.2",
+ "webpack-node-externals": "^1.7.2",
+ "webpackbar": "^2.6.1"
},
"peerDependencies": {
"vue": "^2.5.0"
diff --git a/yarn.lock b/yarn.lock
index c956336bab7..39f2e5e1769 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,23 +8,23 @@
dependencies:
"@babel/highlight" "7.0.0-beta.44"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.48.tgz#ff1c11060a7c1206e0b81e95286cfc2ca3ac405f"
- dependencies:
- "@babel/highlight" "7.0.0-beta.48"
-
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.48.tgz#1f5977bcde2cac1de02bad8fb1506babe3ed4c36"
- dependencies:
- "@babel/code-frame" "7.0.0-beta.48"
- "@babel/generator" "7.0.0-beta.48"
- "@babel/helpers" "7.0.0-beta.48"
- "@babel/parser" "7.0.0-beta.48"
- "@babel/template" "7.0.0-beta.48"
- "@babel/traverse" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz#becd805482734440c9d137e46d77340e64d7f51b"
+ dependencies:
+ "@babel/highlight" "7.0.0-beta.49"
+
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.49.tgz#73de2081dd652489489f0cb4aa97829a1133314e"
+ dependencies:
+ "@babel/code-frame" "7.0.0-beta.49"
+ "@babel/generator" "7.0.0-beta.49"
+ "@babel/helpers" "7.0.0-beta.49"
+ "@babel/parser" "7.0.0-beta.49"
+ "@babel/template" "7.0.0-beta.49"
+ "@babel/traverse" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
convert-source-map "^1.1.0"
debug "^3.1.0"
json5 "^0.5.0"
@@ -44,51 +44,51 @@
source-map "^0.5.0"
trim-right "^1.0.1"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.48.tgz#53d1c359f66a25b8c1e82bc6642fe0a62d22d1ce"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.49.tgz#e9cffda913996accec793bbc25ab91bc19d0bf7a"
dependencies:
- "@babel/types" "7.0.0-beta.48"
+ "@babel/types" "7.0.0-beta.49"
jsesc "^2.5.1"
lodash "^4.17.5"
source-map "^0.5.0"
trim-right "^1.0.1"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.48.tgz#edd217fb0349ab36a5d79af04856071163513f47"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.49.tgz#7d9005d54fe7ad6cb876790251e75575419186e9"
dependencies:
- "@babel/types" "7.0.0-beta.48"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.48.tgz#bffc8d3f2b8c2f404c73b3bca54ab21279e7e8f7"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.49.tgz#c62dd5042b54a590d5e71e6020c46b91d6c6c875"
dependencies:
- "@babel/helper-explode-assignable-expression" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/helper-explode-assignable-expression" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.48.tgz#9abef93daf461ee2841a562be2b36df080af662b"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.49.tgz#4b5d41782a683d5dc6497834a32310a8d02a3af9"
dependencies:
- "@babel/helper-hoist-variables" "7.0.0-beta.48"
- "@babel/traverse" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/helper-hoist-variables" "7.0.0-beta.49"
+ "@babel/traverse" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.48.tgz#72fc6596d7218b12eebf5f0877f82fae148ee7fe"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.49.tgz#4ea067aa720937240df395cd073c24fcad9c2b3b"
dependencies:
- "@babel/helper-function-name" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/helper-function-name" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
lodash "^4.17.5"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.48.tgz#a9809a8cfbf615ff4dfcc967d038f053cc3dd1ee"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.49.tgz#2bfb95df7ec130735bf655e44a217a70d3b13e93"
dependencies:
- "@babel/traverse" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/traverse" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
"@babel/[email protected]":
version "7.0.0-beta.44"
@@ -98,13 +98,13 @@
"@babel/template" "7.0.0-beta.44"
"@babel/types" "7.0.0-beta.44"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.48.tgz#5ede30677b0f2ce323f09608894451e3a0849270"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.49.tgz#a25c1119b9f035278670126e0225c03041c8de32"
dependencies:
- "@babel/helper-get-function-arity" "7.0.0-beta.48"
- "@babel/template" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/helper-get-function-arity" "7.0.0-beta.49"
+ "@babel/template" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
"@babel/[email protected]":
version "7.0.0-beta.44"
@@ -112,83 +112,83 @@
dependencies:
"@babel/types" "7.0.0-beta.44"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.48.tgz#e1f95ca0f67cfc431621611a134b79a92a7d5200"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.49.tgz#cf5023f32d2ad92d087374939cec0951bcb51441"
dependencies:
- "@babel/types" "7.0.0-beta.48"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.48.tgz#9057ffe8a32e3666d1171116960be4b032f53845"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.49.tgz#d9740651c93bb4fa79c1b6bac634051fc4d03ff5"
dependencies:
- "@babel/types" "7.0.0-beta.48"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.48.tgz#19055af6a942463539f75ee4a5b81d583faa6bec"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.49.tgz#2f642b003d45155e0a9e7a4ad0e688d91bbc1583"
dependencies:
- "@babel/types" "7.0.0-beta.48"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.48.tgz#04016e1aa5c600eee42677eb649cc6f0497e8151"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.49.tgz#41d7d59891016c493432a46f7464446552890c75"
dependencies:
- "@babel/types" "7.0.0-beta.48"
+ "@babel/types" "7.0.0-beta.49"
lodash "^4.17.5"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.48.tgz#edc9728b3d4137f90c0e6dd079e9456fb6f007b2"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.49.tgz#fc660bda9d6497412e18776a71aed9a9e2e5f7ad"
dependencies:
- "@babel/helper-module-imports" "7.0.0-beta.48"
- "@babel/helper-simple-access" "7.0.0-beta.48"
- "@babel/helper-split-export-declaration" "7.0.0-beta.48"
- "@babel/template" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/helper-module-imports" "7.0.0-beta.49"
+ "@babel/helper-simple-access" "7.0.0-beta.49"
+ "@babel/helper-split-export-declaration" "7.0.0-beta.49"
+ "@babel/template" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
lodash "^4.17.5"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.48.tgz#793b7af6f44b449a208062334a75c6aa491b72c5"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.49.tgz#a98b43c3a6c54bef48f87b10dc4568dec0b41bf7"
dependencies:
- "@babel/types" "7.0.0-beta.48"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.48.tgz#bf310f89e91d146ac0f1369562164be45edba587"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.49.tgz#0e9fcbb834f878bb365d2a8ea90eee21ba3ccd23"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.48.tgz#cd11feed726194eca6158ecdfa41033ef49c3e1b"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.49.tgz#ff244f19c2a2f167ff4b3165a636b08fd641816b"
dependencies:
lodash "^4.17.5"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.48.tgz#f0fe43824908dd456fa726bcec100874731c9f68"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.49.tgz#b3fdaab412784d7e8657bacab286923efc9498b8"
dependencies:
- "@babel/helper-annotate-as-pure" "7.0.0-beta.48"
- "@babel/helper-wrap-function" "7.0.0-beta.48"
- "@babel/template" "7.0.0-beta.48"
- "@babel/traverse" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/helper-annotate-as-pure" "7.0.0-beta.49"
+ "@babel/helper-wrap-function" "7.0.0-beta.49"
+ "@babel/template" "7.0.0-beta.49"
+ "@babel/traverse" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.48.tgz#e84909342553c27d744f738dd3abd2a50316aafd"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.49.tgz#e7444c718057f6a0a3645caf8e78fb546ffb0d9f"
dependencies:
- "@babel/helper-member-expression-to-functions" "7.0.0-beta.48"
- "@babel/helper-optimise-call-expression" "7.0.0-beta.48"
- "@babel/traverse" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/helper-member-expression-to-functions" "7.0.0-beta.49"
+ "@babel/helper-optimise-call-expression" "7.0.0-beta.49"
+ "@babel/traverse" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.48.tgz#740e2c0055396ea2d31d0ab8cfc7c37d3e44584d"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.49.tgz#97a41e2789a9bf8a6c30536a258b79e7444c5d82"
dependencies:
- "@babel/template" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/template" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
lodash "^4.17.5"
"@babel/[email protected]":
@@ -197,28 +197,28 @@
dependencies:
"@babel/types" "7.0.0-beta.44"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.48.tgz#064da7c9011d9f17448376f5f1c5b593126f57db"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.49.tgz#40d78eda0968d011b1c52866e5746cfb23e57548"
dependencies:
- "@babel/types" "7.0.0-beta.48"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.48.tgz#bdb1d7ff2c4f18afec9efec7e33bb255e1668537"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.49.tgz#385591460b4d93ef96ee3819539c0cdc9bbd4758"
dependencies:
- "@babel/helper-function-name" "7.0.0-beta.48"
- "@babel/template" "7.0.0-beta.48"
- "@babel/traverse" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/helper-function-name" "7.0.0-beta.49"
+ "@babel/template" "7.0.0-beta.49"
+ "@babel/traverse" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.48.tgz#9c1f792b310e5ac98cac4c58debdc6100e14caf3"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.49.tgz#054d84032d4e94286a80586500068e41005a51d0"
dependencies:
- "@babel/template" "7.0.0-beta.48"
- "@babel/traverse" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/template" "7.0.0-beta.49"
+ "@babel/traverse" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
"@babel/[email protected]":
version "7.0.0-beta.44"
@@ -228,442 +228,442 @@
esutils "^2.0.2"
js-tokens "^3.0.0"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.48.tgz#2f225dc995899858f27858d9011fdb75f70bcf96"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.49.tgz#96bdc6b43e13482012ba6691b1018492d39622cc"
dependencies:
chalk "^2.0.0"
esutils "^2.0.2"
js-tokens "^3.0.0"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.48.tgz#f93895cbacee703c0ec98e5af3901c77edd9f1d7"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.49.tgz#944d0c5ba2812bb159edbd226743afd265179bdc"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.48.tgz#64e799e69ece345873d8ac7b6bff03125a1e2e4b"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.49.tgz#8761a5e2d8b5251e70df28f4d0aa64aa28a596b1"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-remap-async-to-generator" "7.0.0-beta.48"
- "@babel/plugin-syntax-async-generators" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-remap-async-to-generator" "7.0.0-beta.49"
+ "@babel/plugin-syntax-async-generators" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.0.0-beta.48.tgz#ca2d5b2e53d1563140f96c725dfdd78f7e12ab6a"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.0.0-beta.49.tgz#527e90af75d23fd5e3bae1a218dc0a6d9236b5f1"
dependencies:
- "@babel/helper-function-name" "7.0.0-beta.48"
- "@babel/helper-member-expression-to-functions" "7.0.0-beta.48"
- "@babel/helper-optimise-call-expression" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-replace-supers" "7.0.0-beta.48"
- "@babel/plugin-syntax-class-properties" "7.0.0-beta.48"
+ "@babel/helper-function-name" "7.0.0-beta.49"
+ "@babel/helper-member-expression-to-functions" "7.0.0-beta.49"
+ "@babel/helper-optimise-call-expression" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-replace-supers" "7.0.0-beta.49"
+ "@babel/plugin-syntax-class-properties" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.0.0-beta.48.tgz#36e7f4435c17627f3ef111c33c07b4667e9be584"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.0.0-beta.49.tgz#5760ab683174e60ad670dc9c5ef39f1d7d349c7b"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-syntax-decorators" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-syntax-decorators" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.0.0-beta.48.tgz#9c296fbd12b55cd1964369776407674f0747e1d1"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.0.0-beta.49.tgz#6f35b129102a6046d3c93d45f97d84ac97c7fe8a"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-syntax-export-namespace-from" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-syntax-export-namespace-from" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.0.0-beta.48.tgz#fc97c51487900fb803b35279fa417f2bbbc08ce0"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.0.0-beta.49.tgz#458997827cf69f8460bd3138d19b917c25eb9ec7"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-wrap-function" "7.0.0-beta.48"
- "@babel/plugin-syntax-function-sent" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-wrap-function" "7.0.0-beta.49"
+ "@babel/plugin-syntax-function-sent" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0-beta.48.tgz#04b25656595666a7b4be57b1b4eb8cc3825e1a08"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0-beta.49.tgz#e454b3d414d39719cea7a6ed6c261d870fab50b0"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-syntax-json-strings" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-syntax-json-strings" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.0.0-beta.48.tgz#79bf51a6d1c4140c175f6142c072eef1d9581c67"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.0.0-beta.49.tgz#d6aae71aebade70195d154a5d738360529b2f193"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-syntax-numeric-separator" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-syntax-numeric-separator" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.48.tgz#c86eb41ee3f83d6ebd4ac4a2da296d59500e32b6"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.49.tgz#6d0cd60f7a7bd7c444a371c4e9470bff02f5777c"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0-beta.48.tgz#6d43d35c353d9c2e83074d0693ae058be6f76649"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0-beta.49.tgz#1f53d36785101d5eb4b55d65686aa2b39fa21c4b"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.0.0-beta.48.tgz#1af2f6b99d402e57a803aa385d8358cacfc33e7e"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.0.0-beta.49.tgz#769e6e6f6418c702568cf39be9bdf183ab624199"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-syntax-throw-expressions" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-syntax-throw-expressions" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0-beta.48.tgz#e366a9b8a6ce317b43ff5f66eba4f218cb8458bd"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0-beta.49.tgz#0ef5fb9abda980cd1585ef4c8e8f680b63263c72"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-regex" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-regex" "7.0.0-beta.49"
regexpu-core "^4.1.4"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.48.tgz#8b21eb61806660fb9a2e80085eb211aeefa3323c"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.49.tgz#50ee943002aedc9ab3a8d12292bd35dd9edb1df8"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0-beta.48.tgz#a87a9f0a5975ba4cd174fc55e22413c71b714e33"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0-beta.49.tgz#6a14fa47ceaa32b53e14e6648326e52dab306904"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.0.0-beta.48.tgz#057b8fb353ef33749b1bd5d62541626a45ebb2fb"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.0.0-beta.49.tgz#1773e9089a4670868b2e9e2aa55045a13f8bd494"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.48.tgz#aba42e01d5a454703459c9b021570ef90551797e"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.49.tgz#f0af7ac6b53676a496093d4a6e2a2ec655c07b78"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.0.0-beta.48.tgz#4aca7ec9127e84c3fe171815105a4acd6f98515f"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.0.0-beta.49.tgz#e3efe5e85627d28ec83835a75cf9c27a954d7045"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.0.0-beta.48.tgz#a0dcf8fad9f08c2d39f02b5760f08e3cc5b3ba67"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.0.0-beta.49.tgz#ea917d910e773584c9a41a7fd3a1ff2e4994822a"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.0.0-beta.48.tgz#cbf0d011f61f3a0bdd603c65a3127c48b88ed946"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.0.0-beta.49.tgz#c7acc8a536658313f624f4f595cf09147ac8426c"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0-beta.48.tgz#acc29539738810a2149aab3843d898bfcbaa8c69"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0-beta.49.tgz#c92fe78b9ff2d92c58b3d18b9ceea9cbc04a519a"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.0.0-beta.48.tgz#af254d381c73e2e2ed7ab469859c8715db60a732"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.0.0-beta.49.tgz#00331bfcedbe0124eb53255e667fe58a2b329ca9"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.48.tgz#cfb13a90ef0e3b96d7461036db0b6bb699e83b82"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.49.tgz#4784b3880823ff12e742c26b41e9857f701d639e"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0-beta.48.tgz#1ad6a8d215954cf3d9bf57cb08bc11099626c371"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0-beta.49.tgz#3e1dd3d5daeb4270e4ee4863641d4faa06bbcd11"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.0.0-beta.48.tgz#01d26e40eecca9c39acb44456c8a9fa482126d23"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.0.0-beta.49.tgz#e1570095057940bfb5ea84b3edc5fb5737b3abe5"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.48.tgz#d2eed4bb9566fcc06bc5d1d5f86821d2648654aa"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.49.tgz#dd3845b63c683d187d5186ee0e882c4046c4f0e3"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.48.tgz#3b76d95c3128e8de1c336d39944a6845f3356d42"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.49.tgz#911a40eb93040186ceb693105ca76def7fe97d03"
dependencies:
- "@babel/helper-module-imports" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-remap-async-to-generator" "7.0.0-beta.48"
+ "@babel/helper-module-imports" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-remap-async-to-generator" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.48.tgz#224eb19673692f44a932c2fc9295b7219f372f5b"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.49.tgz#7aa9f46fdf873b7211aaa2eb0d37c4c371a1abd2"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.48.tgz#849f58dd9cb7c7544af5a7ce92751931d928fc18"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.49.tgz#dd5a9ddd986775c8b20cf5b61065afb3dd9eaac9"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
lodash "^4.17.5"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.48.tgz#5eb5e71bc660293abbb4b9751e3e02d88319e785"
- dependencies:
- "@babel/helper-annotate-as-pure" "7.0.0-beta.48"
- "@babel/helper-define-map" "7.0.0-beta.48"
- "@babel/helper-function-name" "7.0.0-beta.48"
- "@babel/helper-optimise-call-expression" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-replace-supers" "7.0.0-beta.48"
- "@babel/helper-split-export-declaration" "7.0.0-beta.48"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.49.tgz#5342471d2e6a3337332ea246b46c0bddf5fc544d"
+ dependencies:
+ "@babel/helper-annotate-as-pure" "7.0.0-beta.49"
+ "@babel/helper-define-map" "7.0.0-beta.49"
+ "@babel/helper-function-name" "7.0.0-beta.49"
+ "@babel/helper-optimise-call-expression" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-replace-supers" "7.0.0-beta.49"
+ "@babel/helper-split-export-declaration" "7.0.0-beta.49"
globals "^11.1.0"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.48.tgz#5f9e6eff46301cc5bf3d4f5fdaded63fbe94bb0c"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.49.tgz#b8259d174bf07ab4b56566562b46ee6520c3dfd2"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.48.tgz#a1cde57445a4fcac22f95ff8a25f6c6c29e7c4c9"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.49.tgz#4366392c9c82d1231056c1d0029438a60d362b82"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0-beta.48.tgz#90e9d7cc3c8a835c122fafb5f05396ce5b87c090"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0-beta.49.tgz#35ae2bc187bee752d0f7785d2704e52b87377369"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-regex" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-regex" "7.0.0-beta.49"
regexpu-core "^4.1.3"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.48.tgz#5499d8e525d7df7950df0a9b496cdf45de92d38e"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.49.tgz#fac244809ddecbf095e375558ccb716da1042316"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.48.tgz#b7cb8bd3ee3186d5b271be492d55847e220ba93b"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.49.tgz#457b2d09004794684aa6e1b04015080b80a08a14"
dependencies:
- "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.48.tgz#654e89c230a03132ce690dcf05d03a8fe3c1cae6"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.49.tgz#3ec72726bf1d89a0d4d511be7a9549066f57aade"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.48.tgz#0b7f49dbf4f8d1f37e42f2c4c8fb4d1fc1a85b14"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.49.tgz#af39f60e7aefce9b25eb4adcedd04d50866ce218"
dependencies:
- "@babel/helper-function-name" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-function-name" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.48.tgz#3d582d501f612782a6e70839264bd3af4454200f"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.49.tgz#07c838254d65e6867e86513eb0f22d5f26b0a56a"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.48.tgz#d95da7b86404df07aae92b7246bfa8adb7cef97e"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.49.tgz#16d07480954b0415ea70f1ec3edbd0597bd3ddfe"
dependencies:
- "@babel/helper-module-transforms" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-module-transforms" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-beta.48.tgz#779af879cff2eb3b5000d41b620ea7cd53200e61"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-beta.49.tgz#09fb345d5927c2ba3bd89e7cdb13a55067ed39a0"
dependencies:
- "@babel/helper-module-transforms" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-simple-access" "7.0.0-beta.48"
+ "@babel/helper-module-transforms" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-simple-access" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0-beta.48.tgz#7cb42cde7567aa4082da04326c7811542b2af8eb"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0-beta.49.tgz#68225a3ae1312771bc5a36f71ff10d02c1243d9f"
dependencies:
- "@babel/helper-hoist-variables" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-hoist-variables" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0-beta.48.tgz#00308c7cf7dd801873447d86f08804e258846a09"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0-beta.49.tgz#7048ca5a77189706f4b3e96e4b996eb30590dd63"
dependencies:
- "@babel/helper-module-transforms" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-module-transforms" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0-beta.48.tgz#cfd7303c1824006ac6112fac61044d564f1652b9"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0-beta.49.tgz#c2ffef1ebbaf724a9e58dde114e57e3e6864a5e7"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.48.tgz#a8cceaabb5dc5cd94a25d3280a55b4010b4ded10"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.49.tgz#b302f55702847343c10ff4fb8435cc3574755fe3"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-replace-supers" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-replace-supers" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.48.tgz#3da4ff25135b0c6bdfcfe39c059e0a237b8c2010"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.49.tgz#1cad71a2a33281e5efbb1a4623a964c073ce9a2d"
dependencies:
- "@babel/helper-call-delegate" "7.0.0-beta.48"
- "@babel/helper-get-function-arity" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-call-delegate" "7.0.0-beta.49"
+ "@babel/helper-get-function-arity" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.48.tgz#a5ca16f6f4876d75063ae4df471f2671a416ec11"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.49.tgz#d4ed7967033f4f5b49363c203503899b8357cae2"
dependencies:
regenerator-transform "^0.12.3"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.0.0-beta.48.tgz#166ceb0a96948507c851edbd9e9c5aa98f8ead71"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.0.0-beta.49.tgz#65a30ec0bc36f4249325dbc2438f97f563b41f1a"
dependencies:
- "@babel/helper-module-imports" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-module-imports" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.48.tgz#5cc1c14bbc4f5132e5bd1ecf7ff3e9adeb9dfe35"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.49.tgz#49f134dbde4f655834c21524e9e61a58d4e17900"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.48.tgz#f6c7a09d4e85a39adff5123cbc8fa3ae3019e60c"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.49.tgz#6abab05fc0cca829aaf9e2a85044b79763e681ca"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.48.tgz#02426d9248b6dd164188d5f63cff574e6b5728fa"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.49.tgz#08cc5b64cf6a5942a87bdd9b4a4818d4cba12df3"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-regex" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-regex" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.48.tgz#d686b7e8d98948673aec060a4103f05d755bce25"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.49.tgz#e609aed6b8fcc7e1ebccacf22138a647202940a2"
dependencies:
- "@babel/helper-annotate-as-pure" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-annotate-as-pure" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.48.tgz#8bbc1274f937adbe6d12285dc354df29e483ba71"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.49.tgz#365141ba355bf739eefd6c2bb9df1c3b7146e450"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.48.tgz#8749c52e86e36045965e0dd4387272b5f51cad1e"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.49.tgz#c375db5709757621523d41acb62a9abf0d4374b8"
dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/helper-regex" "7.0.0-beta.48"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/helper-regex" "7.0.0-beta.49"
regexpu-core "^4.1.3"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.0.0-beta.48.tgz#fd04eb367c3ff21e870b6f7cebd96414d4bf6df1"
- dependencies:
- "@babel/helper-module-imports" "7.0.0-beta.48"
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-proposal-async-generator-functions" "7.0.0-beta.48"
- "@babel/plugin-proposal-object-rest-spread" "7.0.0-beta.48"
- "@babel/plugin-proposal-optional-catch-binding" "7.0.0-beta.48"
- "@babel/plugin-proposal-unicode-property-regex" "7.0.0-beta.48"
- "@babel/plugin-syntax-async-generators" "7.0.0-beta.48"
- "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.48"
- "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.48"
- "@babel/plugin-transform-arrow-functions" "7.0.0-beta.48"
- "@babel/plugin-transform-async-to-generator" "7.0.0-beta.48"
- "@babel/plugin-transform-block-scoped-functions" "7.0.0-beta.48"
- "@babel/plugin-transform-block-scoping" "7.0.0-beta.48"
- "@babel/plugin-transform-classes" "7.0.0-beta.48"
- "@babel/plugin-transform-computed-properties" "7.0.0-beta.48"
- "@babel/plugin-transform-destructuring" "7.0.0-beta.48"
- "@babel/plugin-transform-dotall-regex" "7.0.0-beta.48"
- "@babel/plugin-transform-duplicate-keys" "7.0.0-beta.48"
- "@babel/plugin-transform-exponentiation-operator" "7.0.0-beta.48"
- "@babel/plugin-transform-for-of" "7.0.0-beta.48"
- "@babel/plugin-transform-function-name" "7.0.0-beta.48"
- "@babel/plugin-transform-literals" "7.0.0-beta.48"
- "@babel/plugin-transform-modules-amd" "7.0.0-beta.48"
- "@babel/plugin-transform-modules-commonjs" "7.0.0-beta.48"
- "@babel/plugin-transform-modules-systemjs" "7.0.0-beta.48"
- "@babel/plugin-transform-modules-umd" "7.0.0-beta.48"
- "@babel/plugin-transform-new-target" "7.0.0-beta.48"
- "@babel/plugin-transform-object-super" "7.0.0-beta.48"
- "@babel/plugin-transform-parameters" "7.0.0-beta.48"
- "@babel/plugin-transform-regenerator" "7.0.0-beta.48"
- "@babel/plugin-transform-shorthand-properties" "7.0.0-beta.48"
- "@babel/plugin-transform-spread" "7.0.0-beta.48"
- "@babel/plugin-transform-sticky-regex" "7.0.0-beta.48"
- "@babel/plugin-transform-template-literals" "7.0.0-beta.48"
- "@babel/plugin-transform-typeof-symbol" "7.0.0-beta.48"
- "@babel/plugin-transform-unicode-regex" "7.0.0-beta.48"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.0.0-beta.49.tgz#4a8a8b92139f51fa2f90fbf6f1fad7597532aebc"
+ dependencies:
+ "@babel/helper-module-imports" "7.0.0-beta.49"
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-proposal-async-generator-functions" "7.0.0-beta.49"
+ "@babel/plugin-proposal-object-rest-spread" "7.0.0-beta.49"
+ "@babel/plugin-proposal-optional-catch-binding" "7.0.0-beta.49"
+ "@babel/plugin-proposal-unicode-property-regex" "7.0.0-beta.49"
+ "@babel/plugin-syntax-async-generators" "7.0.0-beta.49"
+ "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.49"
+ "@babel/plugin-syntax-optional-catch-binding" "7.0.0-beta.49"
+ "@babel/plugin-transform-arrow-functions" "7.0.0-beta.49"
+ "@babel/plugin-transform-async-to-generator" "7.0.0-beta.49"
+ "@babel/plugin-transform-block-scoped-functions" "7.0.0-beta.49"
+ "@babel/plugin-transform-block-scoping" "7.0.0-beta.49"
+ "@babel/plugin-transform-classes" "7.0.0-beta.49"
+ "@babel/plugin-transform-computed-properties" "7.0.0-beta.49"
+ "@babel/plugin-transform-destructuring" "7.0.0-beta.49"
+ "@babel/plugin-transform-dotall-regex" "7.0.0-beta.49"
+ "@babel/plugin-transform-duplicate-keys" "7.0.0-beta.49"
+ "@babel/plugin-transform-exponentiation-operator" "7.0.0-beta.49"
+ "@babel/plugin-transform-for-of" "7.0.0-beta.49"
+ "@babel/plugin-transform-function-name" "7.0.0-beta.49"
+ "@babel/plugin-transform-literals" "7.0.0-beta.49"
+ "@babel/plugin-transform-modules-amd" "7.0.0-beta.49"
+ "@babel/plugin-transform-modules-commonjs" "7.0.0-beta.49"
+ "@babel/plugin-transform-modules-systemjs" "7.0.0-beta.49"
+ "@babel/plugin-transform-modules-umd" "7.0.0-beta.49"
+ "@babel/plugin-transform-new-target" "7.0.0-beta.49"
+ "@babel/plugin-transform-object-super" "7.0.0-beta.49"
+ "@babel/plugin-transform-parameters" "7.0.0-beta.49"
+ "@babel/plugin-transform-regenerator" "7.0.0-beta.49"
+ "@babel/plugin-transform-shorthand-properties" "7.0.0-beta.49"
+ "@babel/plugin-transform-spread" "7.0.0-beta.49"
+ "@babel/plugin-transform-sticky-regex" "7.0.0-beta.49"
+ "@babel/plugin-transform-template-literals" "7.0.0-beta.49"
+ "@babel/plugin-transform-typeof-symbol" "7.0.0-beta.49"
+ "@babel/plugin-transform-unicode-regex" "7.0.0-beta.49"
browserslist "^3.0.0"
invariant "^2.2.2"
semver "^5.3.0"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/preset-stage-2/-/preset-stage-2-7.0.0-beta.48.tgz#b6b1e781a4a86e861185c8f503f565289dd7dff4"
- dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-proposal-decorators" "7.0.0-beta.48"
- "@babel/plugin-proposal-export-namespace-from" "7.0.0-beta.48"
- "@babel/plugin-proposal-function-sent" "7.0.0-beta.48"
- "@babel/plugin-proposal-numeric-separator" "7.0.0-beta.48"
- "@babel/plugin-proposal-throw-expressions" "7.0.0-beta.48"
- "@babel/preset-stage-3" "7.0.0-beta.48"
-
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/preset-stage-3/-/preset-stage-3-7.0.0-beta.48.tgz#d9f515cf65ec9bcd7dbf5c9a65c13eb7cdc6cbbd"
- dependencies:
- "@babel/helper-plugin-utils" "7.0.0-beta.48"
- "@babel/plugin-proposal-async-generator-functions" "7.0.0-beta.48"
- "@babel/plugin-proposal-class-properties" "7.0.0-beta.48"
- "@babel/plugin-proposal-json-strings" "7.0.0-beta.48"
- "@babel/plugin-proposal-object-rest-spread" "7.0.0-beta.48"
- "@babel/plugin-proposal-optional-catch-binding" "7.0.0-beta.48"
- "@babel/plugin-proposal-unicode-property-regex" "7.0.0-beta.48"
- "@babel/plugin-syntax-dynamic-import" "7.0.0-beta.48"
- "@babel/plugin-syntax-import-meta" "7.0.0-beta.48"
-
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.48.tgz#e18c19964ef27e5d5a8f06e0c0b26294037d642e"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/preset-stage-2/-/preset-stage-2-7.0.0-beta.49.tgz#a23af7e8abdcca846295c2f8e4cf3383a3b180ed"
+ dependencies:
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-proposal-decorators" "7.0.0-beta.49"
+ "@babel/plugin-proposal-export-namespace-from" "7.0.0-beta.49"
+ "@babel/plugin-proposal-function-sent" "7.0.0-beta.49"
+ "@babel/plugin-proposal-numeric-separator" "7.0.0-beta.49"
+ "@babel/plugin-proposal-throw-expressions" "7.0.0-beta.49"
+ "@babel/preset-stage-3" "7.0.0-beta.49"
+
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/preset-stage-3/-/preset-stage-3-7.0.0-beta.49.tgz#3b012312b81d483db7a675d4acba8668fd46f5c3"
+ dependencies:
+ "@babel/helper-plugin-utils" "7.0.0-beta.49"
+ "@babel/plugin-proposal-async-generator-functions" "7.0.0-beta.49"
+ "@babel/plugin-proposal-class-properties" "7.0.0-beta.49"
+ "@babel/plugin-proposal-json-strings" "7.0.0-beta.49"
+ "@babel/plugin-proposal-object-rest-spread" "7.0.0-beta.49"
+ "@babel/plugin-proposal-optional-catch-binding" "7.0.0-beta.49"
+ "@babel/plugin-proposal-unicode-property-regex" "7.0.0-beta.49"
+ "@babel/plugin-syntax-dynamic-import" "7.0.0-beta.49"
+ "@babel/plugin-syntax-import-meta" "7.0.0-beta.49"
+
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.49.tgz#03b3bf07eb982072c8e851dd2ddd5110282e61bf"
dependencies:
core-js "^2.5.6"
regenerator-runtime "^0.11.1"
@@ -677,13 +677,13 @@
babylon "7.0.0-beta.44"
lodash "^4.2.0"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.48.tgz#1792741eeabdee09687d24dbfa47fc5437aebd66"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.49.tgz#e38abe8217cb9793f461a5306d7ad745d83e1d27"
dependencies:
- "@babel/code-frame" "7.0.0-beta.48"
- "@babel/parser" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/code-frame" "7.0.0-beta.49"
+ "@babel/parser" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
lodash "^4.17.5"
"@babel/[email protected]":
@@ -701,16 +701,16 @@
invariant "^2.2.0"
lodash "^4.2.0"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.48.tgz#e2f4dad48435ae500f8067d470216a355d947e74"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.49.tgz#4f2a73682a18334ed6625d100a8d27319f7c2d68"
dependencies:
- "@babel/code-frame" "7.0.0-beta.48"
- "@babel/generator" "7.0.0-beta.48"
- "@babel/helper-function-name" "7.0.0-beta.48"
- "@babel/helper-split-export-declaration" "7.0.0-beta.48"
- "@babel/parser" "7.0.0-beta.48"
- "@babel/types" "7.0.0-beta.48"
+ "@babel/code-frame" "7.0.0-beta.49"
+ "@babel/generator" "7.0.0-beta.49"
+ "@babel/helper-function-name" "7.0.0-beta.49"
+ "@babel/helper-split-export-declaration" "7.0.0-beta.49"
+ "@babel/parser" "7.0.0-beta.49"
+ "@babel/types" "7.0.0-beta.49"
debug "^3.1.0"
globals "^11.1.0"
invariant "^2.2.0"
@@ -724,21 +724,21 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"
-"@babel/[email protected]":
- version "7.0.0-beta.48"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.48.tgz#095872fa6f8a87846f5872a39a938f34d5dc55a3"
+"@babel/[email protected]":
+ version "7.0.0-beta.49"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.49.tgz#b7e3b1c3f4d4cfe11bdf8c89f1efd5e1617b87a6"
dependencies:
esutils "^2.0.2"
lodash "^4.17.5"
to-fast-properties "^2.0.0"
"@types/babel-types@*", "@types/babel-types@^7.0.0":
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.2.tgz#63dc3e5e7f6367e1819d2bba5213783cd926c5d5"
+ version "7.0.3"
+ resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.3.tgz#9dc5316090ad99cd2679051ab21a5676c90a2bcc"
"@types/babylon@^6.16.2":
- version "6.16.2"
- resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.2.tgz#062ce63b693d9af1c246f5aedf928bc9c30589c8"
+ version "6.16.3"
+ resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.3.tgz#c2937813a89fcb5e79a00062fc4a8b143e7237bb"
dependencies:
"@types/babel-types" "*"
@@ -747,8 +747,8 @@
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
"@types/node@*":
- version "10.1.3"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.3.tgz#5c16980936c4e3c83ce64e8ed71fb37bd7aea135"
+ version "10.3.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.2.tgz#3840ec6c12556fdda6e0e6d036df853101d732a4"
"@vue/component-compiler-utils@^1.2.1":
version "1.3.1"
@@ -764,131 +764,140 @@
source-map "^0.5.6"
vue-template-es2015-compiler "^1.6.0"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.8.tgz#f75ac7e7602b7833abd5d53951baae8a07ebb5df"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.12.tgz#a9acbcb3f25333c4edfa1fdf3186b1ccf64e6664"
dependencies:
- "@webassemblyjs/helper-module-context" "1.5.8"
- "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
- "@webassemblyjs/wast-parser" "1.5.8"
+ "@webassemblyjs/helper-module-context" "1.5.12"
+ "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+ "@webassemblyjs/wast-parser" "1.5.12"
debug "^3.1.0"
mamacro "^0.0.3"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.8.tgz#e0604d34fab0c910e16113720a5a3c01f558fa54"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz#0f36044ffe9652468ce7ae5a08716a4eeff9cd9c"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.8.tgz#f5570aff60090fae1b78a690a95d04cb021da9ca"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz#05466833ff2f9d8953a1a327746e1d112ea62aaf"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.8.tgz#b1405e819a2c537964682fb70551796ab9602632"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz#1f0de5aaabefef89aec314f7f970009cd159c73d"
dependencies:
debug "^3.1.0"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.8.tgz#6439de475720198a48fa8b4c38e41987798f73cc"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz#3cdc1953093760d1c0f0caf745ccd62bdb6627c7"
dependencies:
- "@webassemblyjs/wast-printer" "1.5.8"
+ "@webassemblyjs/wast-printer" "1.5.12"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.8.tgz#6169af3c9530cf9e89a8f3cf2970ed70e650ae4f"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz#6bc1442b037f8e30f2e57b987cee5c806dd15027"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.8.tgz#73d0de45cebb774d465b5a66fef061f834d6c23c"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz#b5588ca78b33b8a0da75f9ab8c769a3707baa861"
+ dependencies:
+ debug "^3.1.0"
+ mamacro "^0.0.3"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.8.tgz#60df17f72d12b07e1398756e6ebfe59c03ab2e1a"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz#d12a3859db882a448891a866a05d0be63785b616"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.8.tgz#cda7fdb6f3b7b0d215c8f92b7435d47726822f49"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz#ff9fe1507d368ad437e7969d25e8c1693dac1884"
dependencies:
- "@webassemblyjs/ast" "1.5.8"
- "@webassemblyjs/helper-buffer" "1.5.8"
- "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
- "@webassemblyjs/wasm-gen" "1.5.8"
+ "@webassemblyjs/ast" "1.5.12"
+ "@webassemblyjs/helper-buffer" "1.5.12"
+ "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+ "@webassemblyjs/wasm-gen" "1.5.12"
debug "^3.1.0"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.8.tgz#29383c7172e90121613d5614d532f22c19255c3b"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz#ee9574bc558888f13097ce3e7900dff234ea19a4"
dependencies:
ieee754 "^1.1.11"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.8.tgz#657c48ef2537ea2921e897a50157be700bf24eac"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.12.tgz#0308eec652765ee567d8a5fa108b4f0b25b458e1"
dependencies:
leb "^0.3.0"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.8.tgz#592d3678894eaa2ee7e7c2c6a13c2a697db1aa7e"
- dependencies:
- "@webassemblyjs/ast" "1.5.8"
- "@webassemblyjs/helper-buffer" "1.5.8"
- "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
- "@webassemblyjs/helper-wasm-section" "1.5.8"
- "@webassemblyjs/wasm-gen" "1.5.8"
- "@webassemblyjs/wasm-opt" "1.5.8"
- "@webassemblyjs/wasm-parser" "1.5.8"
- "@webassemblyjs/wast-printer" "1.5.8"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.5.12.tgz#d5916222ef314bf60d6806ed5ac045989bfd92ce"
+
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz#821c9358e644a166f2c910e5af1b46ce795a17aa"
+ dependencies:
+ "@webassemblyjs/ast" "1.5.12"
+ "@webassemblyjs/helper-buffer" "1.5.12"
+ "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+ "@webassemblyjs/helper-wasm-section" "1.5.12"
+ "@webassemblyjs/wasm-gen" "1.5.12"
+ "@webassemblyjs/wasm-opt" "1.5.12"
+ "@webassemblyjs/wasm-parser" "1.5.12"
+ "@webassemblyjs/wast-printer" "1.5.12"
debug "^3.1.0"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.8.tgz#e94e034a45227aaa7c481b25c1aa9a0a00ab9488"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz#0b7ccfdb93dab902cc0251014e2e18bae3139bcb"
dependencies:
- "@webassemblyjs/ast" "1.5.8"
- "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
- "@webassemblyjs/ieee754" "1.5.8"
- "@webassemblyjs/leb128" "1.5.8"
+ "@webassemblyjs/ast" "1.5.12"
+ "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+ "@webassemblyjs/ieee754" "1.5.12"
+ "@webassemblyjs/leb128" "1.5.12"
+ "@webassemblyjs/utf8" "1.5.12"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.8.tgz#a3a0d00d98dee0f3cf2ae41084eb62715a39242c"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz#bd758a8bc670f585ff1ae85f84095a9e0229cbc9"
dependencies:
- "@webassemblyjs/ast" "1.5.8"
- "@webassemblyjs/helper-buffer" "1.5.8"
- "@webassemblyjs/wasm-gen" "1.5.8"
- "@webassemblyjs/wasm-parser" "1.5.8"
+ "@webassemblyjs/ast" "1.5.12"
+ "@webassemblyjs/helper-buffer" "1.5.12"
+ "@webassemblyjs/wasm-gen" "1.5.12"
+ "@webassemblyjs/wasm-parser" "1.5.12"
debug "^3.1.0"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.8.tgz#a258a7fd15bd57597e4211d9068639807546555b"
- dependencies:
- "@webassemblyjs/ast" "1.5.8"
- "@webassemblyjs/helper-api-error" "1.5.8"
- "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
- "@webassemblyjs/leb128" "1.5.8"
- "@webassemblyjs/wasm-parser" "1.5.8"
-
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.8.tgz#85705659e15d19b89af38a8d6803d720bb0493cf"
- dependencies:
- "@webassemblyjs/ast" "1.5.8"
- "@webassemblyjs/floating-point-hex-parser" "1.5.8"
- "@webassemblyjs/helper-api-error" "1.5.8"
- "@webassemblyjs/helper-code-frame" "1.5.8"
- "@webassemblyjs/helper-fsm" "1.5.8"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz#7b10b4388ecf98bd7a22e702aa62ec2f46d0c75e"
+ dependencies:
+ "@webassemblyjs/ast" "1.5.12"
+ "@webassemblyjs/helper-api-error" "1.5.12"
+ "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
+ "@webassemblyjs/ieee754" "1.5.12"
+ "@webassemblyjs/leb128" "1.5.12"
+ "@webassemblyjs/utf8" "1.5.12"
+
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz#9cf5ae600ecae0640437b5d4de5dd6b6088d0d8b"
+ dependencies:
+ "@webassemblyjs/ast" "1.5.12"
+ "@webassemblyjs/floating-point-hex-parser" "1.5.12"
+ "@webassemblyjs/helper-api-error" "1.5.12"
+ "@webassemblyjs/helper-code-frame" "1.5.12"
+ "@webassemblyjs/helper-fsm" "1.5.12"
long "^3.2.0"
mamacro "^0.0.3"
-"@webassemblyjs/[email protected]":
- version "1.5.8"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.8.tgz#0f83aa67eddf377dd1d6205d4a4ac976db60e1f6"
+"@webassemblyjs/[email protected]":
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz#563ca4d01b22d21640b2463dc5e3d7f7d9dac520"
dependencies:
- "@webassemblyjs/ast" "1.5.8"
- "@webassemblyjs/wast-parser" "1.5.8"
+ "@webassemblyjs/ast" "1.5.12"
+ "@webassemblyjs/wast-parser" "1.5.12"
long "^3.2.0"
abbrev@1:
@@ -934,15 +943,15 @@ acorn@^4.0.4, acorn@~4.0.2:
version "4.0.13"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
-acorn@^5.0.0, acorn@^5.0.3, acorn@^5.4.1, acorn@^5.5.0:
- version "5.5.3"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
+acorn@^5.0.0, acorn@^5.0.3, acorn@^5.4.1, acorn@^5.5.0, acorn@^5.6.2:
+ version "5.6.2"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7"
ajv-keywords@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-ajv-keywords@^3.1.0:
+ajv-keywords@^3.0.0, ajv-keywords@^3.1.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
@@ -962,13 +971,13 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0"
-ajv@^6.1.0, ajv@^6.2.1:
- version "6.5.0"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.0.tgz#4c8affdf80887d8f132c9c52ab8a2dc4d0b7b24c"
+ajv@^6.0.1, ajv@^6.1.0, ajv@^6.2.1:
+ version "6.5.1"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.1.tgz#88ebc1263c7133937d108b80c5572e64e1d9322d"
dependencies:
fast-deep-equal "^2.0.1"
fast-json-stable-stringify "^2.0.0"
- json-schema-traverse "^0.3.0"
+ json-schema-traverse "^0.4.1"
uri-js "^4.2.1"
align-text@^0.1.1, align-text@^0.1.3:
@@ -1179,12 +1188,12 @@ autoprefixer@^6.3.1:
postcss "^5.2.16"
postcss-value-parser "^3.2.3"
-autoprefixer@^8.1.0:
- version "8.5.1"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.5.1.tgz#45b0271b0e634af66613d5a4f99d96f3dcd94474"
+autoprefixer@^8.6.2:
+ version "8.6.2"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.2.tgz#51d42ff13243820a582a53ecca20dedaeb7f2efd"
dependencies:
browserslist "^3.2.8"
- caniuse-lite "^1.0.30000846"
+ caniuse-lite "^1.0.30000851"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.22"
@@ -1788,8 +1797,8 @@ buble@^0.19.2:
vlq "^1.0.0"
buffer-from@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
buffer-indexof@^1.0.0:
version "1.1.1"
@@ -1905,12 +1914,12 @@ caniuse-api@^1.5.2:
lodash.uniq "^4.5.0"
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
- version "1.0.30000846"
- resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000846.tgz#d9c86f914738db4da098eeded997413c44561bd2"
+ version "1.0.30000852"
+ resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000852.tgz#c37a706048f8d81f87946a7c13f39ed636876659"
-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000846:
- version "1.0.30000846"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000846.tgz#2092911eecad71a89dae1faa62bcc202fde7f959"
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000851:
+ version "1.0.30000852"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000852.tgz#8b7510cec030cac7842e52beca2bf292af65f935"
caseless@~0.11.0:
version "0.11.0"
@@ -1945,7 +1954,7 @@ chalk@^0.4.0, chalk@~0.4.0:
has-color "~0.1.0"
strip-ansi "~0.1.0"
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
dependencies:
@@ -2000,9 +2009,15 @@ chownr@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-chrome-trace-event@^0.1.1:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz#d395af2d31c87b90a716c831fe326f69768ec084"
+chrome-trace-event@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+ dependencies:
+ tslib "^1.9.0"
+
+ci-info@^1.0.0:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
version "1.0.4"
@@ -2036,7 +2051,7 @@ [email protected], clean-css@^4.1.11:
dependencies:
source-map "0.5.x"
-cli-cursor@^2.1.0:
+cli-cursor@^2.0.0, cli-cursor@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
dependencies:
@@ -2108,12 +2123,16 @@ collection-visit@^1.0.0:
object-visit "^1.0.0"
color-convert@^1.3.0, color-convert@^1.9.0:
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147"
dependencies:
- color-name "^1.1.1"
+ color-name "1.1.1"
+
[email protected]:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
-color-name@^1.0.0, color-name@^1.1.1:
+color-name@^1.0.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
@@ -2181,10 +2200,10 @@ component-emitter@^1.2.1:
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
compressible@~2.0.13:
- version "2.0.13"
- resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"
+ version "2.0.14"
+ resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7"
dependencies:
- mime-db ">= 1.33.0 < 2"
+ mime-db ">= 1.34.0 < 2"
compression@^1.5.2:
version "1.7.2"
@@ -2239,6 +2258,15 @@ connect-history-api-fallback@^1.3.0, connect-history-api-fallback@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+consola@^1.2.0:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/consola/-/consola-1.4.1.tgz#4b1c6259c8db23f51e7cfb68cd383ec5ee298f0e"
+ dependencies:
+ chalk "^2.3.2"
+ figures "^2.0.0"
+ lodash "^4.17.5"
+ std-env "^1.1.0"
+
console-browserify@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
@@ -2308,8 +2336,8 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
core-js@^2.4.0, core-js@^2.5.6:
- version "2.5.6"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d"
+ version "2.5.7"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
[email protected], core-util-is@~1.0.0:
version "1.0.2"
@@ -2529,7 +2557,7 @@ de-indent@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
-debug@*, debug@^3.1.0:
+debug@*, [email protected], debug@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
dependencies:
@@ -2838,14 +2866,14 @@ error-ex@^1.2.0:
is-arrayish "^0.2.1"
error-stack-parser@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.1.tgz#a3202b8fb03114aa9b40a0e3669e48b2b65a010a"
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.2.tgz#4ae8dbaa2bf90a8b450707b9149dcabca135520d"
dependencies:
- stackframe "^1.0.3"
+ stackframe "^1.0.4"
es-abstract@^1.5.1, es-abstract@^1.7.0:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
+ version "1.12.0"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
dependencies:
es-to-primitive "^1.1.1"
function-bind "^1.1.1"
@@ -2862,8 +2890,8 @@ es-to-primitive@^1.1.1:
is-symbol "^1.0.1"
es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
- version "0.10.42"
- resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d"
+ version "0.10.45"
+ resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.45.tgz#0bfdf7b473da5919d5adf3bd25ceb754fccc3653"
dependencies:
es6-iterator "~2.0.3"
es6-symbol "~3.1.1"
@@ -3465,7 +3493,7 @@ fstream@^1.0.0, fstream@^1.0.2:
mkdirp ">=0.5 0"
rimraf "2"
-function-bind@^1.0.2, function-bind@^1.1.1:
+function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3623,11 +3651,11 @@ globby@^6.1.0:
pinkie-promise "^2.0.0"
globule@^1.0.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
dependencies:
glob "~7.1.1"
- lodash "~4.17.4"
+ lodash "~4.17.10"
minimatch "~3.0.2"
graceful-fs@^3.0.1:
@@ -3733,10 +3761,10 @@ has-values@^1.0.0:
kind-of "^4.0.0"
has@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
dependencies:
- function-bind "^1.0.2"
+ function-bind "^1.1.1"
hash-base@^3.0.0:
version "3.0.4"
@@ -3750,8 +3778,8 @@ hash-sum@^1.0.2:
resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
hash.js@^1.0.0, hash.js@^1.0.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.4.tgz#8b50e1f35d51bd01e5ed9ece4dbe3549ccfa0a3c"
dependencies:
inherits "^2.0.3"
minimalistic-assert "^1.0.0"
@@ -3930,8 +3958,8 @@ icss-utils@^2.1.0:
postcss "^6.0.1"
ieee754@^1.1.11, ieee754@^1.1.4:
- version "1.1.11"
- resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
+ version "1.1.12"
+ resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
iferr@^0.1.5:
version "0.1.5"
@@ -4086,6 +4114,12 @@ is-callable@^1.1.1, is-callable@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+is-ci@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+ dependencies:
+ ci-info "^1.0.0"
+
is-data-descriptor@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4225,6 +4259,10 @@ is-number@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+is-number@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/is-number/-/is-number-5.0.0.tgz#c393bc471e65de1a10a6abcb20efeb12d2b88166"
+
is-obj@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -4360,8 +4398,8 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
js-yaml@^3.1.0, js-yaml@^3.4.3, js-yaml@^3.9.1:
- version "3.11.0"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+ version "3.12.0"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
@@ -4400,6 +4438,10 @@ json-schema-traverse@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+json-schema-traverse@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+
[email protected]:
version "0.2.3"
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -4562,6 +4604,10 @@ locate-path@^2.0.0:
p-locate "^2.0.0"
path-exists "^3.0.0"
+lodash._reinterpolate@~3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+
lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
@@ -4597,11 +4643,24 @@ lodash.rest@^4.0.0:
version "4.0.5"
resolved "https://registry.yarnpkg.com/lodash.rest/-/lodash.rest-4.0.5.tgz#954ef75049262038c96d1fc98b28fdaf9f0772aa"
+lodash.template@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+ dependencies:
+ lodash._reinterpolate "~3.0.0"
+ lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+ dependencies:
+ lodash._reinterpolate "~3.0.0"
+
lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-lodash@^4.0.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.4:
+lodash@^4.0.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
@@ -4611,6 +4670,14 @@ log-symbols@^2.1.0:
dependencies:
chalk "^2.0.1"
+log-update@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
+ dependencies:
+ ansi-escapes "^3.0.0"
+ cli-cursor "^2.0.0"
+ wrap-ansi "^3.0.1"
+
loglevel@^1.4.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
@@ -4647,7 +4714,14 @@ lower-case@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2:
[email protected]:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.1.tgz#1343955edaf2e37d9b9e7ee7241e27c4b9fb72be"
+ dependencies:
+ pseudomap "^1.0.1"
+ yallist "^2.0.0"
+
+lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
dependencies:
@@ -4709,7 +4783,7 @@ mem@^1.1.0:
dependencies:
mimic-fn "^1.0.0"
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
dependencies:
@@ -4794,7 +4868,11 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
-"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
+"mime-db@>= 1.34.0 < 2":
+ version "1.34.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.34.0.tgz#452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a"
+
+mime-db@~1.33.0:
version "1.33.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
@@ -4946,6 +5024,10 @@ nanomatch@^1.2.9:
snapdragon "^0.8.1"
to-regex "^3.0.1"
+nanoseconds@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/nanoseconds/-/nanoseconds-1.0.1.tgz#596efc62110766be1ede671fedd861f5562318d3"
+
natives@^1.1.0:
version "1.1.4"
resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.4.tgz#2f0f224fc9a7dd53407c7667c84cf8dbe773de58"
@@ -4985,18 +5067,17 @@ [email protected]:
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
node-gyp@^3.3.1:
- version "3.6.2"
- resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
+ version "3.7.0"
+ resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.7.0.tgz#789478e8f6c45e277aa014f3e28f958f286f9203"
dependencies:
fstream "^1.0.0"
glob "^7.0.3"
graceful-fs "^4.1.2"
- minimatch "^3.0.2"
mkdirp "^0.5.0"
nopt "2 || 3"
npmlog "0 || 1 || 2 || 3 || 4"
osenv "0"
- request "2"
+ request ">=2.9.0 <2.82.0"
rimraf "2"
semver "~5.3.0"
tar "^2.0.0"
@@ -5188,7 +5269,7 @@ object-visit@^1.0.0:
dependencies:
isobject "^3.0.0"
-object.assign@^4.0.1, object.assign@^4.1.0:
+object.assign@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
dependencies:
@@ -5315,8 +5396,8 @@ p-finally@^1.0.0:
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
p-limit@^1.1.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
dependencies:
p-try "^1.0.0"
@@ -5762,11 +5843,11 @@ postcss-reduce-transforms@^1.0.3:
postcss "^5.0.8"
postcss-value-parser "^3.0.1"
-postcss-rtl@^1.2.3:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/postcss-rtl/-/postcss-rtl-1.2.3.tgz#69e7691d2b4f13ee70ce994d6ade90357889b48e"
+postcss-rtl@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/postcss-rtl/-/postcss-rtl-1.3.0.tgz#e2b2eb1526758525c10966059b3623005e817c27"
dependencies:
- rtlcss "^2.2.1"
+ rtlcss "^2.3.0"
postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2, postcss-selector-parser@^2.2.3:
version "2.2.3"
@@ -5876,8 +5957,8 @@ preserve@^0.2.0:
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@^1.13.0:
- version "1.13.2"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.2.tgz#412b87bc561cb11074d2877a33a38f78c2303cda"
+ version "1.13.5"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.5.tgz#7ae2076998c8edce79d63834e9b7b09fead6bfd0"
pretty-error@^2.0.2:
version "2.1.1"
@@ -5886,6 +5967,13 @@ pretty-error@^2.0.2:
renderkid "^2.0.1"
utila "~0.4"
+pretty-time@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.0.0.tgz#544784adecaa2cd7d045ff8a8f1d4791c8e06e23"
+ dependencies:
+ is-number "^5.0.0"
+ nanoseconds "^1.0.0"
+
private@^0.1.6:
version "0.1.8"
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -5898,18 +5986,6 @@ process@^0.11.10:
version "0.11.10"
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-progress-bar-webpack-plugin@^1.11.0:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.11.0.tgz#4f801288443c55ec029b20cbfdcbf3e1dc17f852"
- dependencies:
- chalk "^1.1.1"
- object.assign "^4.0.1"
- progress "^1.1.8"
-
-progress@^1.1.8:
- version "1.1.8"
- resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-
progress@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
@@ -5935,7 +6011,7 @@ prr@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-pseudomap@^1.0.2:
+pseudomap@^1.0.1, pseudomap@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -6089,9 +6165,9 @@ qs@~6.5.1:
version "6.5.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-quasar-extras@^2.0.1:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/quasar-extras/-/quasar-extras-2.0.2.tgz#a547bed58486700d449bcd86a5f5c40c4238eb8a"
+quasar-extras@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/quasar-extras/-/quasar-extras-2.0.3.tgz#eacb915c8eebccb9dc5f23c20afe5390502dfff3"
query-string@^4.1.0:
version "4.3.4"
@@ -6104,7 +6180,7 @@ querystring-es3@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
[email protected]:
[email protected], querystring@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
@@ -6242,13 +6318,13 @@ reduce-function-call@^1.0.1:
dependencies:
balanced-match "^0.4.2"
-regenerate-unicode-properties@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-6.0.0.tgz#0fc26f9d5142289df4e177dec58f303d2d097c16"
+regenerate-unicode-properties@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
dependencies:
- regenerate "^1.3.3"
+ regenerate "^1.4.0"
-regenerate@^1.2.1, regenerate@^1.3.3, regenerate@^1.4.0:
+regenerate@^1.2.1, regenerate@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -6265,8 +6341,8 @@ regenerator-transform@^0.10.0:
private "^0.1.6"
regenerator-transform@^0.12.3:
- version "0.12.3"
- resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.12.3.tgz#459adfb64f6a27164ab991b7873f45ab969eca8b"
+ version "0.12.4"
+ resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.12.4.tgz#aa9b6c59f4b97be080e972506c560b3bccbfcff0"
dependencies:
private "^0.1.6"
@@ -6304,15 +6380,15 @@ regexpu-core@^2.0.0:
regjsparser "^0.1.4"
regexpu-core@^4.1.3, regexpu-core@^4.1.4:
- version "4.1.5"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.1.5.tgz#57fdfe1148f8a7a069086228515130cf1820ddd0"
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
dependencies:
regenerate "^1.4.0"
- regenerate-unicode-properties "^6.0.0"
+ regenerate-unicode-properties "^7.0.0"
regjsgen "^0.4.0"
regjsparser "^0.3.0"
- unicode-match-property-ecmascript "^1.0.3"
- unicode-match-property-value-ecmascript "^1.0.1"
+ unicode-match-property-ecmascript "^1.0.4"
+ unicode-match-property-value-ecmascript "^1.0.2"
regjsgen@^0.2.0:
version "0.2.0"
@@ -6366,32 +6442,7 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"
-request@2, request@^2.36.0:
- version "2.87.0"
- resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
- dependencies:
- aws-sign2 "~0.7.0"
- aws4 "^1.6.0"
- caseless "~0.12.0"
- combined-stream "~1.0.5"
- extend "~3.0.1"
- forever-agent "~0.6.1"
- form-data "~2.3.1"
- har-validator "~5.0.3"
- http-signature "~1.2.0"
- is-typedarray "~1.0.0"
- isstream "~0.1.2"
- json-stringify-safe "~5.0.1"
- mime-types "~2.1.17"
- oauth-sign "~0.8.2"
- performance-now "^2.1.0"
- qs "~6.5.1"
- safe-buffer "^5.1.1"
- tough-cookie "~2.3.3"
- tunnel-agent "^0.6.0"
- uuid "^3.1.0"
-
[email protected]:
[email protected], "request@>=2.9.0 <2.82.0":
version "2.81.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
dependencies:
@@ -6418,6 +6469,31 @@ [email protected]:
tunnel-agent "^0.6.0"
uuid "^3.0.0"
+request@^2.36.0:
+ version "2.87.0"
+ resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+ dependencies:
+ aws-sign2 "~0.7.0"
+ aws4 "^1.6.0"
+ caseless "~0.12.0"
+ combined-stream "~1.0.5"
+ extend "~3.0.1"
+ forever-agent "~0.6.1"
+ form-data "~2.3.1"
+ har-validator "~5.0.3"
+ http-signature "~1.2.0"
+ is-typedarray "~1.0.0"
+ isstream "~0.1.2"
+ json-stringify-safe "~5.0.1"
+ mime-types "~2.1.17"
+ oauth-sign "~0.8.2"
+ performance-now "^2.1.0"
+ qs "~6.5.1"
+ safe-buffer "^5.1.1"
+ tough-cookie "~2.3.3"
+ tunnel-agent "^0.6.0"
+ uuid "^3.1.0"
+
request@~2.79.0:
version "2.79.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
@@ -6488,7 +6564,7 @@ resolve-url@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-resolve@^1.1.6, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.6.0:
+resolve@^1.1.6, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.6.0:
version "1.7.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
dependencies:
@@ -6598,9 +6674,16 @@ rollup@^0.59.3:
"@types/estree" "0.0.39"
"@types/node" "*"
-rtlcss@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-2.2.1.tgz#f8537e4155208166b05e189802131936fcefd29e"
+route-cache@^0.4.4:
+ version "0.4.4"
+ resolved "https://registry.yarnpkg.com/route-cache/-/route-cache-0.4.4.tgz#c7141fac4e44d1480dae1c1ba44458d91ad1a98a"
+ dependencies:
+ debug "3.1.0"
+ lru-cache "4.0.1"
+
+rtlcss@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-2.3.0.tgz#9fffed884f94717b75b3ccffc22ab6044f430c5a"
dependencies:
chalk "^2.3.0"
findup "^0.1.5"
@@ -6644,7 +6727,7 @@ safe-regex@^1.1.0:
dependencies:
ret "~0.1.10"
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -6719,7 +6802,7 @@ [email protected]:
range-parser "~1.2.0"
statuses "~1.4.0"
-serialize-javascript@^1.4.0:
+serialize-javascript@^1.3.0, serialize-javascript@^1.4.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
@@ -6902,6 +6985,10 @@ [email protected]:
dependencies:
amdefine ">=0.0.4"
[email protected]:
+ version "0.5.6"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
[email protected], source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
version "0.5.7"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -6972,13 +7059,14 @@ sprintf-js@~1.0.2:
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
sshpk@^1.7.0:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
+ version "1.14.2"
+ resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
dependencies:
asn1 "~0.2.3"
assert-plus "^1.0.0"
dashdash "^1.12.0"
getpass "^0.1.1"
+ safer-buffer "^2.0.2"
optionalDependencies:
bcrypt-pbkdf "^1.0.0"
ecc-jsbn "~0.1.1"
@@ -6991,7 +7079,7 @@ ssri@^5.2.4:
dependencies:
safe-buffer "^5.1.1"
-stackframe@^1.0.3:
+stackframe@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
@@ -7016,6 +7104,12 @@ statuses@~1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+std-env@^1.1.0, std-env@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/std-env/-/std-env-1.3.0.tgz#8ce754a401a61f1ac49c8eb55f2a8c0c63d54954"
+ dependencies:
+ is-ci "^1.1.0"
+
stdout-stream@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
@@ -7037,8 +7131,8 @@ stream-each@^1.1.0:
stream-shift "^1.0.0"
stream-http@^2.7.2:
- version "2.8.2"
- resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.2.tgz#4126e8c6b107004465918aa2fc35549e77402c87"
+ version "2.8.3"
+ resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
dependencies:
builtin-status-codes "^3.0.0"
inherits "^2.0.1"
@@ -7216,6 +7310,17 @@ [email protected]:
slice-ansi "1.0.0"
string-width "^2.1.1"
+table@^4.0.3:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
+ dependencies:
+ ajv "^6.0.1"
+ ajv-keywords "^3.0.0"
+ chalk "^2.1.0"
+ lodash "^4.17.4"
+ slice-ansi "1.0.0"
+ string-width "^2.1.1"
+
tapable@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
@@ -7333,6 +7438,10 @@ trim-right@^1.0.1:
dependencies:
glob "^6.0.4"
+tslib@^1.9.0:
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
+
[email protected]:
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -7369,8 +7478,8 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
typescript@^2.4.1:
- version "2.8.3"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
+ version "2.9.1"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
uglify-es@^3.3.4, uglify-es@^3.3.9:
version "3.3.9"
@@ -7380,8 +7489,8 @@ uglify-es@^3.3.4, uglify-es@^3.3.9:
source-map "~0.6.1"
[email protected]:
- version "3.3.27"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.27.tgz#eb8c3c9429969f86ff5b0a2422ffc78c3cea8cc0"
+ version "3.3.28"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.28.tgz#0efb9a13850e11303361c1051f64d2ec68d9be06"
dependencies:
commander "~2.15.0"
source-map "~0.6.1"
@@ -7420,24 +7529,24 @@ underscore@~1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
-unicode-canonical-property-names-ecmascript@^1.0.2:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.3.tgz#f6119f417467593c0086357c85546b6ad5abc583"
+unicode-canonical-property-names-ecmascript@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-unicode-match-property-ecmascript@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.3.tgz#db9b1cb4ffc67e0c5583780b1b59370e4cbe97b9"
+unicode-match-property-ecmascript@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
dependencies:
- unicode-canonical-property-names-ecmascript "^1.0.2"
- unicode-property-aliases-ecmascript "^1.0.3"
+ unicode-canonical-property-names-ecmascript "^1.0.4"
+ unicode-property-aliases-ecmascript "^1.0.4"
-unicode-match-property-value-ecmascript@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.1.tgz#fea059120a016f403afd3bf586162b4db03e0604"
+unicode-match-property-value-ecmascript@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
-unicode-property-aliases-ecmascript@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.3.tgz#ac3522583b9e630580f916635333e00c5ead690d"
+unicode-property-aliases-ecmascript@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
union-value@^1.0.0:
version "1.0.0"
@@ -7519,8 +7628,8 @@ url-loader@^1.0.1:
schema-utils "^0.4.3"
url-parse@^1.1.8, url-parse@~1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.0.tgz#6bfdaad60098c7fe06f623e42b22de62de0d3d75"
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.1.tgz#4dec9dad3dc8585f862fed461d2e19bbf623df30"
dependencies:
querystringify "^2.0.0"
requires-port "^1.0.0"
@@ -7559,12 +7668,18 @@ [email protected], util.promisify@^1.0.0:
define-properties "^1.1.2"
object.getownpropertydescriptors "^2.0.3"
[email protected], util@^0.10.3:
[email protected]:
version "0.10.3"
resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
dependencies:
inherits "2.0.1"
+util@^0.10.3:
+ version "0.10.4"
+ resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+ dependencies:
+ inherits "2.0.3"
+
utila@~0.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
@@ -7645,9 +7760,9 @@ vue-hot-reload-api@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926"
-vue-loader@^15.2.0:
- version "15.2.2"
- resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.2.tgz#d845fef2eca64e91042e66315119536e17f1538d"
+vue-loader@^15.2.4:
+ version "15.2.4"
+ resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.4.tgz#a7b923123d3cf87230a8ff54a1c16d31a6c5dbb4"
dependencies:
"@vue/component-compiler-utils" "^1.2.1"
hash-sum "^1.0.2"
@@ -7659,6 +7774,19 @@ vue-router@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.1.tgz#d9b05ad9c7420ba0f626d6500d693e60092cc1e9"
+vue-server-renderer@^2.5.16:
+ version "2.5.16"
+ resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.16.tgz#279ef8e37e502a0de3a9ae30758cc04a472eaac0"
+ dependencies:
+ chalk "^1.1.3"
+ hash-sum "^1.0.2"
+ he "^1.1.0"
+ lodash.template "^4.4.0"
+ lodash.uniq "^4.5.0"
+ resolve "^1.2.0"
+ serialize-javascript "^1.3.0"
+ source-map "0.5.6"
+
vue-style-loader@^4.0.2, vue-style-loader@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.0.tgz#7588bd778e2c9f8d87bfc3c5a4a039638da7a863"
@@ -7714,7 +7842,7 @@ webpack-chain@^4.8.0:
deepmerge "^1.5.2"
javascript-stringify "^1.6.0"
[email protected]:
[email protected], webpack-dev-middleware@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz#8b32aa43da9ae79368c1bf1183f2b6cf5e1f39ed"
dependencies:
@@ -7759,6 +7887,15 @@ webpack-dev-server@^3.1.4:
webpack-log "^1.1.2"
yargs "11.0.0"
+webpack-hot-middleware@^2.22.2:
+ version "2.22.2"
+ resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.22.2.tgz#623b77ce591fcd4e1fb99f18167781443e50afac"
+ dependencies:
+ ansi-html "0.0.7"
+ html-entities "^1.2.0"
+ querystring "^0.2.0"
+ strip-ansi "^3.0.0"
+
webpack-log@^1.0.1, webpack-log@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d"
@@ -7768,6 +7905,16 @@ webpack-log@^1.0.1, webpack-log@^1.1.2:
loglevelnext "^1.0.1"
uuid "^3.1.0"
+webpack-merge@^4.1.2:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.2.tgz#5d372dddd3e1e5f8874f5bf5a8e929db09feb216"
+ dependencies:
+ lodash "^4.17.5"
+
+webpack-node-externals@^1.7.2:
+ version "1.7.2"
+ resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz#6e1ee79ac67c070402ba700ef033a9b8d52ac4e3"
+
webpack-sources@^1.0.1, webpack-sources@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
@@ -7775,19 +7922,20 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
source-list-map "^2.0.0"
source-map "~0.6.1"
-webpack@^4.8.3:
- version "4.10.1"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.10.1.tgz#74909fb9c32941b5c34d22c1f8782c9a033a52e7"
+webpack@^4.12.0:
+ version "4.12.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.12.0.tgz#14758e035ae69747f68dd0edf3c5a572a82bdee9"
dependencies:
- "@webassemblyjs/ast" "1.5.8"
- "@webassemblyjs/wasm-edit" "1.5.8"
- "@webassemblyjs/wasm-opt" "1.5.8"
- "@webassemblyjs/wasm-parser" "1.5.8"
- acorn "^5.0.0"
+ "@webassemblyjs/ast" "1.5.12"
+ "@webassemblyjs/helper-module-context" "1.5.12"
+ "@webassemblyjs/wasm-edit" "1.5.12"
+ "@webassemblyjs/wasm-opt" "1.5.12"
+ "@webassemblyjs/wasm-parser" "1.5.12"
+ acorn "^5.6.2"
acorn-dynamic-import "^3.0.0"
ajv "^6.1.0"
ajv-keywords "^3.1.0"
- chrome-trace-event "^0.1.1"
+ chrome-trace-event "^1.0.0"
enhanced-resolve "^4.0.0"
eslint-scope "^3.7.1"
json-parse-better-errors "^1.0.2"
@@ -7804,6 +7952,21 @@ webpack@^4.8.3:
watchpack "^1.5.0"
webpack-sources "^1.0.1"
+webpackbar@^2.6.1:
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-2.6.1.tgz#d1aff0665c43635ff35672be2f2463d1176bdb6f"
+ dependencies:
+ chalk "^2.3.2"
+ consola "^1.2.0"
+ figures "^2.0.0"
+ loader-utils "^1.1.0"
+ lodash "^4.17.5"
+ log-update "^2.3.0"
+ pretty-time "^1.0.0"
+ schema-utils "^0.4.5"
+ std-env "^1.3.0"
+ table "^4.0.3"
+
websocket-driver@>=0.5.1:
version "0.7.0"
resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
@@ -7832,8 +7995,8 @@ which-module@^2.0.0:
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
which@1, which@^1.2.9:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
dependencies:
isexe "^2.0.0"
@@ -7883,6 +8046,13 @@ wrap-ansi@^2.0.0:
string-width "^1.0.1"
strip-ansi "^3.0.1"
+wrap-ansi@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
+ dependencies:
+ string-width "^2.1.1"
+ strip-ansi "^4.0.0"
+
wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -7911,7 +8081,7 @@ y18n@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-yallist@^2.1.2:
+yallist@^2.0.0, yallist@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
|
d73506a53afd329c924bb19078b13c522ddf2475
|
2019-11-01 16:25:39
|
Razvan Stoenescu
|
chore: Remove obsolete folders
| false
|
Remove obsolete folders
|
chore
|
diff --git a/docs/src/statics/dreamonkey.png b/docs/src/statics/dreamonkey.png
deleted file mode 100644
index c4b037ed85c..00000000000
Binary files a/docs/src/statics/dreamonkey.png and /dev/null differ
|
10f2e2d277c3071cfbe81f79f68a8f81291e03fc
|
2024-12-06 13:33:36
|
Razvan Stoenescu
|
fix(app-vite): quasar build --mode bex -T [chrome|firefox] build product does not contain www directory #17683
| false
|
quasar build --mode bex -T [chrome|firefox] build product does not contain www directory #17683
|
fix
|
diff --git a/app-vite/lib/modes/bex/bex-config.js b/app-vite/lib/modes/bex/bex-config.js
index b5e7c44db7a..818d26e7ba2 100644
--- a/app-vite/lib/modes/bex/bex-config.js
+++ b/app-vite/lib/modes/bex/bex-config.js
@@ -36,7 +36,10 @@ export const quasarBexConfig = {
}
})
- if (quasarConf.ctx.target.firefox) {
+ if (
+ quasarConf.ctx.prod === true
+ || quasarConf.ctx.target.firefox
+ ) {
cfg.build.outDir = join(quasarConf.build.distDir, 'www')
}
|
5eac6598165f6b458dc23f31ad36c0d30ccf7bbb
|
2020-02-11 21:51:09
|
Razvan Stoenescu
|
chore: Add vscode settings to avoid ESLint running wild
| false
|
Add vscode settings to avoid ESLint running wild
|
chore
|
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000000..0de52515c7c
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+ "eslint.workingDirectories": [
+ "./docs",
+ "./ui"
+ ]
+}
|
dbe8f65eff6ffbfcbb5b527b9b4ad38e17834318
|
2025-01-15 17:59:29
|
Razvan Stoenescu
|
fix(QTable): @row-context-menu not being called when QTable is in grid mode #17758
| false
|
@row-context-menu not being called when QTable is in grid mode #17758
|
fix
|
diff --git a/ui/src/components/table/QTable.js b/ui/src/components/table/QTable.js
index e6161cf0404..c7e3601ca4e 100644
--- a/ui/src/components/table/QTable.js
+++ b/ui/src/components/table/QTable.js
@@ -948,6 +948,7 @@ export default createComponent({
if (
props.onRowClick !== void 0
|| props.onRowDblclick !== void 0
+ || props.onRowContextmenu !== void 0
) {
data.class[ 0 ] += ' cursor-pointer'
@@ -962,6 +963,12 @@ export default createComponent({
emit('RowDblclick', evt, scope.row, scope.pageIndex)
}
}
+
+ if (props.onRowContextmenu !== void 0) {
+ data.onContextmenu = evt => {
+ emit('rowContextmenu', evt, scope.row, scope.pageIndex)
+ }
+ }
}
return h('div', {
|
a80675ef81a9c9ad2a9e40cabde06695f4c62b11
|
2018-08-22 23:06:41
|
Razvan Stoenescu
|
fix(QLayoutDrawer): Free up layout space when toggling side
| false
|
Free up layout space when toggling side
|
fix
|
diff --git a/dev/components/components/layout-container.vue b/dev/components/components/layout-container.vue
index 95c36829c48..c19f4458143 100644
--- a/dev/components/components/layout-container.vue
+++ b/dev/components/components/layout-container.vue
@@ -2,7 +2,7 @@
<div class="layout-padding">
<q-btn @click="modal = true" label="Open" />
- <q-layout view="LHh lpR fff" container style="height: 500px; width: 300px" class="q-mt-xl shadow-2">
+ <q-layout view="LHh lpR fff" container style="height: 500px; width: 900px" class="q-mt-xl shadow-2">
<q-layout-header reveal>
<q-toolbar>
<q-btn flat @click="drawer = !drawer" round dense icon="menu" />
@@ -18,7 +18,7 @@
</q-toolbar>
</q-layout-footer>
- <q-layout-drawer v-model="drawer" :width="200" :breakpoint="300">
+ <q-layout-drawer side="right" v-model="drawer" :width="200" :breakpoint="300">
<div v-for="n in 50" :key="n">Drawer</div>
</q-layout-drawer>
<q-page-container>
diff --git a/src/components/layout/QLayoutDrawer.js b/src/components/layout/QLayoutDrawer.js
index 355035e75c0..5417cf9b96d 100644
--- a/src/components/layout/QLayoutDrawer.js
+++ b/src/components/layout/QLayoutDrawer.js
@@ -88,6 +88,10 @@ export default {
this[this.largeScreenState ? 'show' : 'hide'](false)
}
},
+ side (_, oldSide) {
+ this.layout[oldSide].space = false
+ this.layout[oldSide].offset = 0
+ },
behavior (val) {
this.__updateLocal('belowBreakpoint', (
val === 'mobile' ||
|
7fa3499728c1b8a1f53668cbb35a8834c52f062b
|
2022-07-04 17:02:50
|
Razvan Stoenescu
|
chore(app-webpack): Bump version
| false
|
Bump version
|
chore
|
diff --git a/app-webpack/package.json b/app-webpack/package.json
index 6fb3e25869e..295e1e96eef 100644
--- a/app-webpack/package.json
+++ b/app-webpack/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/app-webpack",
- "version": "3.5.6",
+ "version": "3.5.7",
"description": "Quasar Framework App CLI with Webpack",
"bin": {
"quasar": "./bin/quasar"
|
4dfaeb20291ee1a7c1d1c70e3e0e4fa1bc2a46d1
|
2021-03-20 08:23:57
|
Razvan Stoenescu
|
feat(ui): one more tweak to iconSet
| false
|
one more tweak to iconSet
|
feat
|
diff --git a/ui/src/icon-set.js b/ui/src/icon-set.js
index d0333c3e78f..696f17782de 100644
--- a/ui/src/icon-set.js
+++ b/ui/src/icon-set.js
@@ -27,7 +27,7 @@ const Plugin = defineReactivePlugin({
if (__QUASAR_SSR_SERVER__) {
const initialSet = iconSet || materialIcons
- $q.iconMapFn = ssrContext.$q.config.iconMapFn || Plugin.iconMapFn || null
+ $q.iconMapFn = ssrContext.$q.config.iconMapFn || this.iconMapFn || null
$q.iconSet = {}
$q.iconSet.set = setObject => {
this.set(setObject, ssrContext)
@@ -37,14 +37,14 @@ const Plugin = defineReactivePlugin({
}
else {
if ($q.config.iconMapFn !== void 0) {
- Plugin.iconMapFn = $q.config.iconMapFn
+ this.iconMapFn = $q.config.iconMapFn
}
- $q.iconSet = Plugin.__icons
+ $q.iconSet = this.__icons
Object.defineProperty($q, 'iconMapFn', {
- get: () => Plugin.iconMapFn,
- set: val => { Plugin.iconMapFn = val }
+ get: () => this.iconMapFn,
+ set: val => { this.iconMapFn = val }
})
if (this.__installed === true) {
|
97e26518fcf619b0ba69135de4bdbc6794658ddd
|
2020-01-09 21:20:30
|
Razvan Stoenescu
|
feat(QVideo): consistency with QImg: "aspect" --rename--> "ratio" prop #6032 (#6041)
| false
|
consistency with QImg: "aspect" --rename--> "ratio" prop #6032 (#6041)
|
feat
|
diff --git a/ui/dev/components/components/video-embedding.vue b/ui/dev/components/components/video-embedding.vue
index 9dc6f56fd31..863c318bec4 100644
--- a/ui/dev/components/components/video-embedding.vue
+++ b/ui/dev/components/components/video-embedding.vue
@@ -13,7 +13,7 @@
</p>
<q-video
src="https://www.youtube.com/embed/k3_tw44QsZQ?rel=0"
- :aspect="16/9"
+ :ratio="16/9"
/>
<p class="caption">
@@ -21,7 +21,7 @@
</p>
<q-video
src="https://www.youtube.com/embed/k3_tw44QsZQ?rel=0"
- :aspect="4/3"
+ :ratio="4/3"
/>
<p class="caption">
diff --git a/ui/src/components/video/QVideo.js b/ui/src/components/video/QVideo.js
index 69e194cb8b9..281567c30a8 100644
--- a/ui/src/components/video/QVideo.js
+++ b/ui/src/components/video/QVideo.js
@@ -9,7 +9,7 @@ export default Vue.extend({
required: true
},
- aspect: Number
+ ratio: Number
},
computed: {
@@ -24,14 +24,14 @@ export default Vue.extend({
},
classes () {
- if (this.aspect !== void 0) {
+ if (this.ratio !== void 0) {
return 'q-video--responsive'
}
},
style () {
- if (this.aspect !== void 0) {
- return { paddingTop: (100 / this.aspect) + '%' }
+ if (this.ratio !== void 0) {
+ return { paddingTop: (100 / this.ratio) + '%' }
}
}
},
diff --git a/ui/src/components/video/QVideo.json b/ui/src/components/video/QVideo.json
index 7f794238ca0..21448aa04a8 100644
--- a/ui/src/components/video/QVideo.json
+++ b/ui/src/components/video/QVideo.json
@@ -18,12 +18,12 @@
"category": "model"
},
- "aspect": {
+ "ratio": {
"type": "Number",
"desc": "Aspect ratio for the iframe",
"examples": [
- ":aspect=\"4/3\"",
- ":aspect=\"16/9\""
+ ":ratio=\"4/3\"",
+ ":ratio=\"16/9\""
],
"category": "style",
"addedIn": "1.6.2"
diff --git a/ui/src/components/video/QVideo.sass b/ui/src/components/video/QVideo.sass
index 39fadc5e6d1..ae5f13d0836 100644
--- a/ui/src/components/video/QVideo.sass
+++ b/ui/src/components/video/QVideo.sass
@@ -1,13 +1,6 @@
-img
- &.responsive
- max-width: 100%
- height: auto
- &.avatar
- width: 50px
- height: 50px
- border-radius: 50%
- box-shadow: $shadow-1
- vertical-align: middle
+img.responsive
+ max-width: 100%
+ height: auto
.q-video
position: relative
diff --git a/ui/src/components/video/QVideo.styl b/ui/src/components/video/QVideo.styl
index 39fadc5e6d1..9416c3d6237 100644
--- a/ui/src/components/video/QVideo.styl
+++ b/ui/src/components/video/QVideo.styl
@@ -1,14 +1,3 @@
-img
- &.responsive
- max-width: 100%
- height: auto
- &.avatar
- width: 50px
- height: 50px
- border-radius: 50%
- box-shadow: $shadow-1
- vertical-align: middle
-
.q-video
position: relative
overflow: hidden
diff --git a/ui/src/css/core/helpers.sass b/ui/src/css/core/helpers.sass
index fbadd812b21..70aa5343a18 100644
--- a/ui/src/css/core/helpers.sass
+++ b/ui/src/css/core/helpers.sass
@@ -51,3 +51,7 @@ body.electron
-webkit-app-region: drag
.q-electron-drag .q-btn, .q-electron-drag--exception
-webkit-app-region: no-drag
+
+img.responsive
+ max-width: 100%
+ height: auto
diff --git a/ui/src/css/core/helpers.styl b/ui/src/css/core/helpers.styl
index fbadd812b21..70aa5343a18 100644
--- a/ui/src/css/core/helpers.styl
+++ b/ui/src/css/core/helpers.styl
@@ -51,3 +51,7 @@ body.electron
-webkit-app-region: drag
.q-electron-drag .q-btn, .q-electron-drag--exception
-webkit-app-region: no-drag
+
+img.responsive
+ max-width: 100%
+ height: auto
|
4776db054ff43bb20e507abf4052d6ab8b3df9d6
|
2023-04-29 18:33:14
|
Razvan Stoenescu
|
feat(app-vite/app-webpack): update scripts
| false
|
update scripts
|
feat
|
diff --git a/app-vite/package.json b/app-vite/package.json
index d9f30dfba5a..1d00dec97b9 100644
--- a/app-vite/package.json
+++ b/app-vite/package.json
@@ -43,7 +43,7 @@
"url": "https://donate.quasar.dev"
},
"scripts": {
- "lint": "eslint --ext .js ./ ./bin/quasar --fix --report-unused-disable-directives"
+ "lint": "eslint --ext .js ./ --fix --report-unused-disable-directives"
},
"dependencies": {
"@quasar/fastclick": "1.1.5",
diff --git a/app-webpack/package.json b/app-webpack/package.json
index 3c126ce463b..d1f5cf4c86f 100644
--- a/app-webpack/package.json
+++ b/app-webpack/package.json
@@ -15,7 +15,7 @@
"tsconfig-preset.json"
],
"scripts": {
- "lint": "eslint --ext .js ./ ./bin/quasar --fix --report-unused-disable-directives"
+ "lint": "eslint --ext .js ./ --fix --report-unused-disable-directives"
},
"keywords": [
"quasar",
|
0f1bdad35d6f73d54f089a731cdd63fb688b91c5
|
2023-01-06 19:14:40
|
Razvan Stoenescu
|
feat(docs): enhance forced dark mode examples
| false
|
enhance forced dark mode examples
|
feat
|
diff --git a/docs/src/examples/QBtnToggle/Dark.vue b/docs/src/examples/QBtnToggle/Dark.vue
deleted file mode 100644
index b0ef2324cb7..00000000000
--- a/docs/src/examples/QBtnToggle/Dark.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
- <div class="q-pa-md bg-grey-10 text-white">
- <q-btn-toggle
- v-model="model"
- push
- glossy
- toggle-color="primary"
- :options="[
- {label: 'Cake', value: 'cake'},
- {label: 'Ice cream', value: 'ice-cream'}
- ]"
- />
- </div>
-</template>
-
-<script>
-import { ref } from 'vue'
-
-export default {
- setup () {
- return {
- model: ref('cake')
- }
- }
-}
-</script>
diff --git a/docs/src/examples/QCheckbox/OnDarkBackground.vue b/docs/src/examples/QCheckbox/OnDarkBackground.vue
index e82f79f8d91..dba8994106e 100644
--- a/docs/src/examples/QCheckbox/OnDarkBackground.vue
+++ b/docs/src/examples/QCheckbox/OnDarkBackground.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<div class="q-gutter-sm">
<q-checkbox dark v-model="teal" label="Teal" color="teal" />
<q-checkbox dark v-model="orange" label="Orange" color="orange" />
diff --git a/docs/src/examples/QColor/Dark.vue b/docs/src/examples/QColor/Dark.vue
index 00303fd88bd..5acb1cd83c7 100644
--- a/docs/src/examples/QColor/Dark.vue
+++ b/docs/src/examples/QColor/Dark.vue
@@ -1,6 +1,6 @@
<template>
<div class="q-pa-md">
- <div class=" row items-start q-gutter-md">
+ <div class="row items-start q-gutter-md">
<q-color v-model="hex" dark class="my-picker" />
<q-color v-model="hexa" dark class="my-picker" />
<q-color v-model="rgb" dark class="my-picker" />
diff --git a/docs/src/examples/QDate/Dark.vue b/docs/src/examples/QDate/Dark.vue
index bb218b2675e..4f3ef394444 100644
--- a/docs/src/examples/QDate/Dark.vue
+++ b/docs/src/examples/QDate/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<div class="q-gutter-md">
<q-date
v-model="date"
diff --git a/docs/src/examples/QExpansionItem/Dark.vue b/docs/src/examples/QExpansionItem/Dark.vue
index f2b5788000d..dbe91075732 100644
--- a/docs/src/examples/QExpansionItem/Dark.vue
+++ b/docs/src/examples/QExpansionItem/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<q-list dark padding bordered class="rounded-borders" style="max-width: 328px">
<q-expansion-item
icon="perm_identity"
diff --git a/docs/src/examples/QField/Dark.vue b/docs/src/examples/QField/Dark.vue
index cfeb4f33221..ce193489294 100644
--- a/docs/src/examples/QField/Dark.vue
+++ b/docs/src/examples/QField/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<div class="q-gutter-y-md column" style="max-width: 300px">
<div>
<q-toggle v-model="readonly" label="Readonly" dark />
diff --git a/docs/src/examples/QInput/Dark.vue b/docs/src/examples/QInput/Dark.vue
index e506931e0b8..645acc3e4c9 100644
--- a/docs/src/examples/QInput/Dark.vue
+++ b/docs/src/examples/QInput/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<div class="q-gutter-y-md column" style="max-width: 300px">
<div>
<q-toggle v-model="readonly" label="Readonly" dark />
diff --git a/docs/src/examples/QItem/Dark.vue b/docs/src/examples/QItem/Dark.vue
index 5c2f43f4a37..37c99c2c83b 100644
--- a/docs/src/examples/QItem/Dark.vue
+++ b/docs/src/examples/QItem/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<q-list dark bordered separator style="max-width: 318px">
<q-item clickable v-ripple>
<q-item-section>Single line item</q-item-section>
diff --git a/docs/src/examples/QLinearProgress/OnDarkBackground.vue b/docs/src/examples/QLinearProgress/OnDarkBackground.vue
index bee83a31f5d..2aa698c4b84 100644
--- a/docs/src/examples/QLinearProgress/OnDarkBackground.vue
+++ b/docs/src/examples/QLinearProgress/OnDarkBackground.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<q-linear-progress dark size="10px" :value="progress1" color="warning" />
<q-linear-progress dark stripe rounded size="20px" :value="progress2" color="red" class="q-mt-sm" />
diff --git a/docs/src/examples/QOptionGroup/Dark.vue b/docs/src/examples/QOptionGroup/Dark.vue
index e1ef9289df8..97b4499738a 100644
--- a/docs/src/examples/QOptionGroup/Dark.vue
+++ b/docs/src/examples/QOptionGroup/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-lg bg-grey-10 text-white">
+ <div class="q-pa-lg bg-grey-9 text-white">
<q-option-group
v-model="group"
:options="options"
diff --git a/docs/src/examples/QRadio/OnDarkBackground.vue b/docs/src/examples/QRadio/OnDarkBackground.vue
index 224c9ac114e..97e1ebd9c66 100644
--- a/docs/src/examples/QRadio/OnDarkBackground.vue
+++ b/docs/src/examples/QRadio/OnDarkBackground.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<div class="q-gutter-sm">
<q-radio dark v-model="shape" val="line" label="Line" />
<q-radio dark v-model="shape" val="rectangle" label="Rectangle" />
diff --git a/docs/src/examples/QRange/Dark.vue b/docs/src/examples/QRange/Dark.vue
index ec3a68c9df8..2c2f037db4e 100644
--- a/docs/src/examples/QRange/Dark.vue
+++ b/docs/src/examples/QRange/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<q-badge color="secondary" class="q-mb-lg">
Model: {{ model.min }} to {{ model.max }} (0 to 50)
</q-badge>
diff --git a/docs/src/examples/QScrollArea/Dark.vue b/docs/src/examples/QScrollArea/Dark.vue
index c4630446e76..f1856765430 100644
--- a/docs/src/examples/QScrollArea/Dark.vue
+++ b/docs/src/examples/QScrollArea/Dark.vue
@@ -2,7 +2,7 @@
<div class="q-ma-md">
<q-scroll-area
dark
- class="bg-dark text-white rounded-borders"
+ class="bg-grey-9 text-white rounded-borders"
style="height: 200px; max-width: 300px;"
>
<div v-for="n in 100" :key="n" class="q-py-sm q-px-md">
diff --git a/docs/src/examples/QSlider/Dark.vue b/docs/src/examples/QSlider/Dark.vue
index 22db4700680..d97cc427522 100644
--- a/docs/src/examples/QSlider/Dark.vue
+++ b/docs/src/examples/QSlider/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<q-badge color="secondary">
Model: {{ value }} (-20 to 20, step 4)
</q-badge>
diff --git a/docs/src/examples/QSplitter/CustomizedSeparator.vue b/docs/src/examples/QSplitter/CustomizedSeparator.vue
index 10bd9f61c1c..453a966a404 100644
--- a/docs/src/examples/QSplitter/CustomizedSeparator.vue
+++ b/docs/src/examples/QSplitter/CustomizedSeparator.vue
@@ -1,5 +1,5 @@
<template>
- <div class="bg-grey-10 text-white">
+ <div class="bg-grey-9 text-white">
<q-splitter
v-model="splitterModel"
separator-class="bg-orange"
diff --git a/docs/src/examples/QStepper/Dark.vue b/docs/src/examples/QStepper/Dark.vue
index 34f927dcd90..da53ca78e0c 100644
--- a/docs/src/examples/QStepper/Dark.vue
+++ b/docs/src/examples/QStepper/Dark.vue
@@ -4,7 +4,7 @@
v-model="step"
ref="stepper"
dark
- class="bg-grey-10"
+ class="bg-grey-9"
active-color="deep-orange"
done-color="secondary"
animated
diff --git a/docs/src/examples/QTime/Dark.vue b/docs/src/examples/QTime/Dark.vue
index f9acb2d2ff7..65a1adc7d3a 100644
--- a/docs/src/examples/QTime/Dark.vue
+++ b/docs/src/examples/QTime/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<div class="q-gutter-md">
<q-time
v-model="time"
diff --git a/docs/src/examples/QTimeline/Basic.vue b/docs/src/examples/QTimeline/Basic.vue
index b2e61d5a0a1..7c31bdc2d38 100644
--- a/docs/src/examples/QTimeline/Basic.vue
+++ b/docs/src/examples/QTimeline/Basic.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-px-lg q-pb-md">
+ <div class="q-px-lg q-py-md">
<q-timeline color="secondary">
<q-timeline-entry heading>
Timeline heading
diff --git a/docs/src/examples/QTimeline/Dark.vue b/docs/src/examples/QTimeline/Dark.vue
index 08b1f293a4d..c176d2b8e7c 100644
--- a/docs/src/examples/QTimeline/Dark.vue
+++ b/docs/src/examples/QTimeline/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-px-lg q-pb-md bg-grey-10 text-white">
+ <div class="q-px-lg q-py-md bg-grey-9 text-white">
<q-timeline dark color="secondary">
<q-timeline-entry heading>Timeline heading</q-timeline-entry>
diff --git a/docs/src/examples/QTimeline/Layouts.vue b/docs/src/examples/QTimeline/Layouts.vue
index 0e8a4d4a7ec..9de580141f8 100644
--- a/docs/src/examples/QTimeline/Layouts.vue
+++ b/docs/src/examples/QTimeline/Layouts.vue
@@ -1,6 +1,6 @@
<template>
<div class="q-pa-lg">
- <div class="row q-gutter-md q-mb-sm">
+ <div class="row q-gutter-md q-mb-lg">
<q-option-group
type="radio"
dense
diff --git a/docs/src/examples/QTimeline/PropsOnly.vue b/docs/src/examples/QTimeline/PropsOnly.vue
index ce7fda1b195..caa9d48c2ed 100644
--- a/docs/src/examples/QTimeline/PropsOnly.vue
+++ b/docs/src/examples/QTimeline/PropsOnly.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-px-lg q-pb-md">
+ <div class="q-px-lg q-py-md">
<q-timeline color="secondary">
<q-timeline-entry heading body="Timeline heading" />
diff --git a/docs/src/examples/QTimeline/Responsive.vue b/docs/src/examples/QTimeline/Responsive.vue
index 89f295e7720..a0afd76f0b4 100644
--- a/docs/src/examples/QTimeline/Responsive.vue
+++ b/docs/src/examples/QTimeline/Responsive.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-px-lg q-pb-md">
+ <div class="q-px-lg q-py-md">
<q-timeline :layout="layout" color="secondary">
<q-timeline-entry heading>
Timeline heading
diff --git a/docs/src/examples/QTimeline/SlotsOnly.vue b/docs/src/examples/QTimeline/SlotsOnly.vue
index 945010a039b..19d5562a321 100644
--- a/docs/src/examples/QTimeline/SlotsOnly.vue
+++ b/docs/src/examples/QTimeline/SlotsOnly.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-px-lg q-pb-md">
+ <div class="q-px-lg q-py-md">
<q-timeline color="secondary">
<q-timeline-entry heading>
Timeline heading
diff --git a/docs/src/examples/QToggle/DarkBackground.vue b/docs/src/examples/QToggle/DarkBackground.vue
index b044af5ead0..4510da0342d 100644
--- a/docs/src/examples/QToggle/DarkBackground.vue
+++ b/docs/src/examples/QToggle/DarkBackground.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<q-toggle
color="blue"
dark
diff --git a/docs/src/examples/QTree/Dark.vue b/docs/src/examples/QTree/Dark.vue
index e07a8749ab5..1e1b655fdeb 100644
--- a/docs/src/examples/QTree/Dark.vue
+++ b/docs/src/examples/QTree/Dark.vue
@@ -1,5 +1,5 @@
<template>
- <div class="q-pa-md bg-grey-10 text-white">
+ <div class="q-pa-md bg-grey-9 text-white">
<q-tree
:nodes="simple"
node-key="label"
diff --git a/docs/src/pages/vue-components/checkbox.md b/docs/src/pages/vue-components/checkbox.md
index 81696cf1af8..6a5e8b0bfa1 100644
--- a/docs/src/pages/vue-components/checkbox.md
+++ b/docs/src/pages/vue-components/checkbox.md
@@ -45,7 +45,7 @@ In the second row in the example below, the property `keep-color` is being used
### Force dark mode
-<doc-example title="Force dark mode" file="OnDarkBackground" dark />
+<doc-example title="Force dark mode" file="OnDarkBackground" />
### Sizes
diff --git a/docs/src/pages/vue-components/date.md b/docs/src/pages/vue-components/date.md
index b36b248bd53..37ebdbe89de 100644
--- a/docs/src/pages/vue-components/date.md
+++ b/docs/src/pages/vue-components/date.md
@@ -125,7 +125,7 @@ If, for some reason, you need to use a custom ad-hoc locale rather than the curr
<doc-example title="Coloring" file="Color" overflow />
-<doc-example title="Force dark mode" file="Dark" overflow dark />
+<doc-example title="Force dark mode" file="Dark" overflow />
### Highlighting events
diff --git a/docs/src/pages/vue-components/expansion-item.md b/docs/src/pages/vue-components/expansion-item.md
index c251c45f0b3..5a208c82daf 100644
--- a/docs/src/pages/vue-components/expansion-item.md
+++ b/docs/src/pages/vue-components/expansion-item.md
@@ -29,7 +29,7 @@ They are basically [QItem](/vue-components/list-and-list-items) components wrapp
<doc-example title="Dense" file="Dense" />
-<doc-example title="Force dark mode" file="Dark" dark />
+<doc-example title="Force dark mode" file="Dark" />
### Options
diff --git a/docs/src/pages/vue-components/field.md b/docs/src/pages/vue-components/field.md
index 44b7ba948f7..06bd534d797 100644
--- a/docs/src/pages/vue-components/field.md
+++ b/docs/src/pages/vue-components/field.md
@@ -70,7 +70,7 @@ The `square` prop only makes sense along with Filled, Outlined and Standout desi
### Force dark mode
-<doc-example title="Force dark mode" file="Dark" dark />
+<doc-example title="Force dark mode" file="Dark" />
## Basic features
diff --git a/docs/src/pages/vue-components/input.md b/docs/src/pages/vue-components/input.md
index 2e15039e6ec..05da0b1e36f 100644
--- a/docs/src/pages/vue-components/input.md
+++ b/docs/src/pages/vue-components/input.md
@@ -56,7 +56,7 @@ The `square` prop only makes sense along with Filled, Outlined and Standout desi
### Force dark mode
-<doc-example title="Force dark mode" file="Dark" dark />
+<doc-example title="Force dark mode" file="Dark" />
## Basic features
diff --git a/docs/src/pages/vue-components/linear-progress.md b/docs/src/pages/vue-components/linear-progress.md
index 684d9d640dd..c68c6fb551a 100644
--- a/docs/src/pages/vue-components/linear-progress.md
+++ b/docs/src/pages/vue-components/linear-progress.md
@@ -41,7 +41,7 @@ For indeterminate state (above) or query state (below) you don't need to specify
<doc-example title="Stripe" file="Stripe" />
-<doc-example title="Force dark mode" file="OnDarkBackground" dark />
+<doc-example title="Force dark mode" file="OnDarkBackground" />
### Buffer
diff --git a/docs/src/pages/vue-components/list-and-list-items.md b/docs/src/pages/vue-components/list-and-list-items.md
index a5e751d4a24..da3715afa68 100644
--- a/docs/src/pages/vue-components/list-and-list-items.md
+++ b/docs/src/pages/vue-components/list-and-list-items.md
@@ -32,7 +32,7 @@ List Items have the following pre-built child components:
<doc-example title="Basic" file="Basic" />
-<doc-example title="Force dark mode" file="Dark" dark />
+<doc-example title="Force dark mode" file="Dark" />
<doc-example title="Dense" file="Dense" />
diff --git a/docs/src/pages/vue-components/option-group.md b/docs/src/pages/vue-components/option-group.md
index df62fad9845..9b8da96b8b9 100644
--- a/docs/src/pages/vue-components/option-group.md
+++ b/docs/src/pages/vue-components/option-group.md
@@ -64,7 +64,7 @@ The objects within the `options` array can hold any of the props found in QToggl
### Force dark mode
-<doc-example title="Force dark mode" file="Dark" dark />
+<doc-example title="Force dark mode" file="Dark" />
### Native form submit
diff --git a/docs/src/pages/vue-components/radio.md b/docs/src/pages/vue-components/radio.md
index c91ce4f7d1b..9bfb4973645 100644
--- a/docs/src/pages/vue-components/radio.md
+++ b/docs/src/pages/vue-components/radio.md
@@ -40,7 +40,7 @@ In the second row in the example below, the property `keep-color` is being used
### Force dark mode
-<doc-example title="Force dark mode" file="OnDarkBackground" dark />
+<doc-example title="Force dark mode" file="OnDarkBackground" />
### Disable
diff --git a/docs/src/pages/vue-components/range.md b/docs/src/pages/vue-components/range.md
index a96319a4876..48cf83c1893 100644
--- a/docs/src/pages/vue-components/range.md
+++ b/docs/src/pages/vue-components/range.md
@@ -107,7 +107,7 @@ Use the `drag-range` or `drag-only-range` props to allow the user to move the se
### Force dark mode
-<doc-example title="Force dark mode" file="Dark" dark />
+<doc-example title="Force dark mode" file="Dark" />
### Readonly and disable
diff --git a/docs/src/pages/vue-components/slider.md b/docs/src/pages/vue-components/slider.md
index 3bd6ea752d5..e40779195ff 100644
--- a/docs/src/pages/vue-components/slider.md
+++ b/docs/src/pages/vue-components/slider.md
@@ -95,7 +95,7 @@ In order to use the marker label slots (see below), you must enable them by usin
### Force dark mode
-<doc-example title="Force dark mode" file="Dark" dark />
+<doc-example title="Force dark mode" file="Dark" />
### Readonly and disable
diff --git a/docs/src/pages/vue-components/splitter.md b/docs/src/pages/vue-components/splitter.md
index 929c4260c6d..cb21f63db7b 100644
--- a/docs/src/pages/vue-components/splitter.md
+++ b/docs/src/pages/vue-components/splitter.md
@@ -56,7 +56,7 @@ If you use images as content for the separator slot, you might want to add `drag
### Dark design
-<doc-example title="On a dark background with customized separator" file="CustomizedSeparator" dark />
+<doc-example title="On a dark background with customized separator" file="CustomizedSeparator" />
### Embedded
diff --git a/docs/src/pages/vue-components/time.md b/docs/src/pages/vue-components/time.md
index cf8e27b1a94..566189ec2e4 100644
--- a/docs/src/pages/vue-components/time.md
+++ b/docs/src/pages/vue-components/time.md
@@ -77,7 +77,7 @@ If, for some reason, you need to use a custom ad-hoc locale rather than the curr
<doc-example title="Coloring" file="Color" overflow />
-<doc-example title="Force dark mode" file="Dark" overflow dark />
+<doc-example title="Force dark mode" file="Dark" overflow />
### Limiting options
diff --git a/docs/src/pages/vue-components/timeline.md b/docs/src/pages/vue-components/timeline.md
index 4c2eb8a3857..51c050438a3 100644
--- a/docs/src/pages/vue-components/timeline.md
+++ b/docs/src/pages/vue-components/timeline.md
@@ -37,7 +37,7 @@ Below is again the same example, but using only QTimelineEntry slots:
### Dark design
-<doc-example title="Force dark mode" file="Dark" dark scrollable />
+<doc-example title="Force dark mode" file="Dark" scrollable />
### Layouts and side selection
diff --git a/docs/src/pages/vue-components/toggle.md b/docs/src/pages/vue-components/toggle.md
index b4fd82e012a..fbdad79b780 100644
--- a/docs/src/pages/vue-components/toggle.md
+++ b/docs/src/pages/vue-components/toggle.md
@@ -69,7 +69,7 @@ If you have a number of toggles for a selection, use can use an Array as the mod
### Dark design
-<doc-example title="Force dark mode" file="DarkBackground" dark />
+<doc-example title="Force dark mode" file="DarkBackground" />
### Disable
diff --git a/docs/src/pages/vue-components/tree.md b/docs/src/pages/vue-components/tree.md
index 56414c209ef..8d5044d497f 100644
--- a/docs/src/pages/vue-components/tree.md
+++ b/docs/src/pages/vue-components/tree.md
@@ -25,7 +25,7 @@ Quasar Tree represents a highly configurable component that displays hierarchica
### Force dark mode
-<doc-example title="Force dark mode" file="Dark" dark />
+<doc-example title="Force dark mode" file="Dark" />
### Perf considerations <q-badge align="top" color="brand-primary" label="v2.9.2+" />
When using relatively large data, for performance we recommend using the `no-transition` Boolean prop which will account for a significant runtime speed improvement.
|
6352173be8e71bb2340e67f97f0df5dcda926d3f
|
2019-01-12 09:47:10
|
Razvan Stoenescu
|
feat(quasar): openURL helper support for cordova InAppBrowser plugin
| false
|
openURL helper support for cordova InAppBrowser plugin
|
feat
|
diff --git a/quasar/src/utils/open-url.js b/quasar/src/utils/open-url.js
index 9fba5605eed..3a1b18cf98b 100644
--- a/quasar/src/utils/open-url.js
+++ b/quasar/src/utils/open-url.js
@@ -1,13 +1,20 @@
import Platform from '../plugins/Platform.js'
export default (url, reject) => {
- if (Platform.is.cordova && navigator && navigator.app) {
- return navigator.app.loadUrl(url, {
- openExternal: true
- })
+ let open = window.open
+
+ if (Platform.is.cordova === true) {
+ if (cordova !== void 0 && cordova.InAppBrowser !== void 0 && cordova.InAppBrowser.open !== void 0) {
+ open = cordova.InAppBrowser.open
+ }
+ else if (navigator !== void 0 && navigator.app !== void 0) {
+ return navigator.app.loadUrl(url, {
+ openExternal: true
+ })
+ }
}
- let win = window.open(url, '_blank')
+ let win = open(url, '_blank')
if (win) {
win.focus()
|
11d772f660c0b5587deeef99690df9116a5a637d
|
2021-10-15 22:05:56
|
Paolo Caleffi
|
docs(testing): provide correct links for Qv2 AEs
| false
|
provide correct links for Qv2 AEs
|
docs
|
diff --git a/docs/src/pages/quasar-cli/testing-and-auditing.md b/docs/src/pages/quasar-cli/testing-and-auditing.md
index 055c52c6cce..3fdb5ef7f05 100644
--- a/docs/src/pages/quasar-cli/testing-and-auditing.md
+++ b/docs/src/pages/quasar-cli/testing-and-auditing.md
@@ -3,19 +3,20 @@ title: Testing & Auditing
desc: How to unit and end to end test a Quasar app and also how to audit for quality and security.
---
-Your Quasar projects have the ability to add unit and e2e testing harnesses, as well as an ever-growing suite of product quality auditing tools. This introduction will not go into details about how to write and use tests, for that please consult the specially prepared and maintained documentation at the [Testing repo at GitHub](https://github.com/quasarframework/quasar-testing). If you are a beginner, consider reading one of the books in the "Further Reading" section.
+Your Quasar projects have the ability to add unit and e2e testing harnesses. This introduction will not go into details about how to write and use tests, for that please consult the specially prepared and maintained documentation at the [Testing repo at GitHub](https://github.com/quasarframework/quasar-testing/tree/next). If you are a beginner, consider reading one of the books in the "Further Reading" section.
## High level overview
-You can install multiple pre-rigged testing harnesses to your existing 1.0+ Quasar application by running a simple command. This command will pull and install a node module (with dependencies) into your project's `package.json`, place necessary configuration files as appropriate and if you so choose, it will also add script commands that expose some of the functionality of the respective harness. You can add multiple harnesses and even use them for your continuous integration pipelines - as appropriate.
+You can install multiple pre-rigged testing harnesses to your existing Quasar application by running a simple command. This command will pull and install a node module (with dependencies) into your project's `package.json`, place necessary configuration files as appropriate and if you so choose, it will also add script commands that expose some of the functionality of the respective harness. You can add multiple harnesses and even use them for your continuous integration pipelines - as appropriate.
Testing is not in and of itself hard. The most complicated part is setting up the testing harness. The trick lies in knowing what to test. If you are new to testing, it is absolutely imperative that you familiarize yourself with some of the concepts and patterns. There are some links for further reading at the end of this document page.
## Testing documentation
-Testing has its own documentation website (https://testing.quasar.dev), so head there for full info.
+Some Qv2-compatible Testing AEs are currently in alpha or beta phase, existing documentation website (https://testing.quasar.dev) still refer to Qv1 AEs.
+You can find the updated documentation into `next` branch of quasar-testing repo.
-<q-btn color="brand-primary" label="testing.quasar.dev" icon-right="launch" no-caps type="a" href="https://testing.quasar.dev" target="_blank" />
+<q-btn color="brand-primary" label="Testing repo @next branch" icon-right="launch" no-caps type="a" href="https://github.com/quasarframework/quasar-testing/tree/next" target="_blank" />
## Installing
|
3b61e96bfbaf035b313b0d940b43629bd4a2d1a3
|
2021-10-14 16:25:08
|
Razvan Stoenescu
|
feat(TouchPan): small tweaks
| false
|
small tweaks
|
feat
|
diff --git a/ui/lang/index.json b/ui/lang/index.json
index d6f05c26611..b631912aa18 100644
--- a/ui/lang/index.json
+++ b/ui/lang/index.json
@@ -211,4 +211,4 @@
"isoName": "zh-TW",
"nativeName": "中文（繁體）"
}
-]
+]
\ No newline at end of file
diff --git a/ui/src/composables/private/use-anchor.js b/ui/src/composables/private/use-anchor.js
index ce7f6eb17fe..390ee33b15d 100644
--- a/ui/src/composables/private/use-anchor.js
+++ b/ui/src/composables/private/use-anchor.js
@@ -43,7 +43,7 @@ export default function ({
toggle (evt) {
proxy.toggle(evt)
- evt.__qAnchorHandled = true
+ evt.qAnchorHandled = true
},
toggleKey (evt) {
@@ -55,7 +55,7 @@ export default function ({
prevent(evt)
nextTick(() => {
proxy.show(evt)
- evt.__qAnchorHandled = true
+ evt.qAnchorHandled = true
})
},
@@ -81,7 +81,7 @@ export default function ({
touchTimer = setTimeout(() => {
proxy.show(evt)
- evt.__qAnchorHandled = true
+ evt.qAnchorHandled = true
}, 300)
},
diff --git a/ui/src/composables/private/use-model-toggle.js b/ui/src/composables/private/use-model-toggle.js
index 7e9070c07b8..3f5c730bbde 100644
--- a/ui/src/composables/private/use-model-toggle.js
+++ b/ui/src/composables/private/use-model-toggle.js
@@ -42,7 +42,7 @@ export default function ({
function show (evt) {
if (
props.disable === true
- || (evt !== void 0 && evt.__qAnchorHandled === true)
+ || (evt !== void 0 && evt.qAnchorHandled === true)
|| (canShow !== void 0 && canShow(evt) !== true)
) {
return
diff --git a/ui/src/directives/TouchPan.js b/ui/src/directives/TouchPan.js
index 22374aa15d1..649625a6f23 100644
--- a/ui/src/directives/TouchPan.js
+++ b/ui/src/directives/TouchPan.js
@@ -197,11 +197,14 @@ export default __QUASAR_SSR_SERVER__
evt.defaultPrevented === true && prevent(clone)
evt.cancelBubble === true && stop(clone)
- clone.qClonedBy = evt.qClonedBy === void 0
- ? [ ctx.uid ]
- : evt.qClonedBy.concat(ctx.uid)
- clone.qKeyEvent = evt.qKeyEvent
- clone.qClickOutside = evt.qClickOutside
+ Object.assign(clone, {
+ qClonedBy: evt.qClonedBy === void 0
+ ? [ ctx.uid ]
+ : evt.qClonedBy.concat(ctx.uid),
+ qKeyEvent: evt.qKeyEvent,
+ qClickOutside: evt.qClickOutside,
+ qAnchorHandled: evt.qAnchorHandled
+ })
ctx.initialEvent = {
target: evt.target,
|
56eb45dfac1161caa521ee4c4e2197789dcae970
|
2021-05-25 17:33:02
|
Razvan Stoenescu
|
feat(app): upgrade more deps
| false
|
upgrade more deps
|
feat
|
diff --git a/app/package.json b/app/package.json
index 5680cef8926..45688d82d64 100644
--- a/app/package.json
+++ b/app/package.json
@@ -59,12 +59,12 @@
"chalk": "4.1.1",
"chokidar": "3.5.1",
"ci-info": "3.1.1",
- "compression-webpack-plugin": "7.1.2",
- "copy-webpack-plugin": "8.1.1",
+ "compression-webpack-plugin": "8.0.0",
+ "copy-webpack-plugin": "9.0.0",
"cross-spawn": "7.0.3",
- "css-loader": "5.2.4",
- "css-minimizer-webpack-plugin": "2.0.0",
- "cssnano": "5.0.2",
+ "css-loader": "5.2.6",
+ "css-minimizer-webpack-plugin": "3.0.0",
+ "cssnano": "5.0.4",
"dot-prop": "6.0.1",
"elementtree": "0.1.7",
"error-stack-parser": "2.0.6",
@@ -76,7 +76,7 @@
"hash-sum": "2.0.0",
"html-minifier": "4.0.0",
"html-webpack-plugin": "5.3.1",
- "inquirer": "7.3.3",
+ "inquirer": "8.1.0",
"isbinaryfile": "4.0.8",
"launch-editor-middleware": "2.2.1",
"lodash.debounce": "4.0.8",
@@ -91,15 +91,15 @@
"open": "7.1.0",
"ouch": "2.0.0",
"postcss": "^8.2.10",
- "postcss-loader": "5.2.0",
- "postcss-rtlcss": "3.3.1",
+ "postcss-loader": "5.3.0",
+ "postcss-rtlcss": "3.3.4",
"pretty-error": "3.0.3",
"register-service-worker": "1.7.2",
"sass": "1.32.12",
- "sass-loader": "11.0.1",
+ "sass-loader": "11.1.1",
"semver": "7.3.5",
- "table": "6.7.0",
- "terser-webpack-plugin": "5.1.1",
+ "table": "6.7.1",
+ "terser-webpack-plugin": "5.1.2",
"ts-loader": "8.0.17",
"typescript": "4.2.2",
"url-loader": "4.1.1",
@@ -109,7 +109,7 @@
"vue-style-loader": "4.1.3",
"vuex": "4.0.1",
"webpack": "^5.35.0",
- "webpack-bundle-analyzer": "4.4.1",
+ "webpack-bundle-analyzer": "4.4.2",
"webpack-chain": "6.5.1",
"webpack-dev-server": "4.0.0-beta.3",
"webpack-merge": "5.7.3",
|
aaf5279b5643788307ef73d8858e43cceb107143
|
2017-06-13 13:08:35
|
Razvan Stoenescu
|
refactor: Adjust max-length input property
| false
|
Adjust max-length input property
|
refactor
|
diff --git a/src/components/chips-input/QChipsInput.vue b/src/components/chips-input/QChipsInput.vue
index a22e18fffe0..d02a17b5d0a 100644
--- a/src/components/chips-input/QChipsInput.vue
+++ b/src/components/chips-input/QChipsInput.vue
@@ -41,7 +41,7 @@
:name="name"
:placeholder="inputPlaceholder"
:disabled="disable"
- :maxlength="maxlength"
+ :max-length="maxLength"
@focus="__onFocus"
@blur="__onInputBlur"
diff --git a/src/components/field/QField.vue b/src/components/field/QField.vue
index 0eddf0c4ad8..9d56e5b98ee 100644
--- a/src/components/field/QField.vue
+++ b/src/components/field/QField.vue
@@ -53,7 +53,7 @@ export default {
type: Number,
default: 5,
validator (val) {
- return val >= 1 && val <= 12
+ return val >= 1 && val < 12
}
},
inset: {
diff --git a/src/components/input/QInput.vue b/src/components/input/QInput.vue
index 9d77aad3182..ef10321cf23 100644
--- a/src/components/input/QInput.vue
+++ b/src/components/input/QInput.vue
@@ -41,7 +41,7 @@
:name="name"
:placeholder="inputPlaceholder"
:disabled="disable"
- :maxlength="maxlength"
+ :maxlength="maxLength"
:rows="minRows"
:value="value"
@@ -65,7 +65,7 @@
:placeholder="inputPlaceholder"
:pattern="pattern"
:disabled="disable"
- :maxlength="maxlength"
+ :maxlength="maxLength"
:min="min"
:max="max"
diff --git a/src/components/input/input-mixin.js b/src/components/input/input-mixin.js
index a2071006e0e..512e561e220 100644
--- a/src/components/input/input-mixin.js
+++ b/src/components/input/input-mixin.js
@@ -2,7 +2,7 @@ export default {
props: {
autofocus: Boolean,
name: String,
- maxlength: Number,
+ maxLength: [Number, String],
maxHeight: Number,
placeholder: String,
loading: Boolean
diff --git a/src/components/search/QSearch.vue b/src/components/search/QSearch.vue
index 87c1700dacd..c39c1309490 100644
--- a/src/components/search/QSearch.vue
+++ b/src/components/search/QSearch.vue
@@ -15,7 +15,7 @@
:prefix="prefix"
:suffix="suffix"
:inverted="inverted"
- :maxlength="maxlength"
+ :max-length="maxLength"
:color="color"
:before="controlBefore"
|
ad355d3250477318b15079fa179532e0552f2e55
|
2019-11-20 14:46:50
|
Popescu Dan
|
fix(composition): Ignore key events related to composition #5613 (#5646)
| false
|
Ignore key events related to composition #5613 (#5646)
|
fix
|
diff --git a/ui/dev/components/form/input-composition.vue b/ui/dev/components/form/input-composition.vue
new file mode 100644
index 00000000000..ad4160f6f47
--- /dev/null
+++ b/ui/dev/components/form/input-composition.vue
@@ -0,0 +1,83 @@
+<template>
+ <div class="q-layout-padding">
+ <div
+ class="q-gutter-sm"
+ @keydown="evt => addLog(evt)"
+ @keypress="evt => addLog(evt)"
+ @keyup="evt => addLog(evt)"
+ >
+ <q-input
+ v-model="text"
+ outlined
+ label="Composition tests"
+ />
+ </div>
+
+ <q-btn label="Reset log" @click="resetLog" />
+ <div class="scroll" style="max-height: 80vh">
+ <div class="row no-wrap q-col-gutter-md" v-for="(row, index) in log" :key="index">
+ <div class="col-2">
+ {{ index }}. {{ row[0] }} * {{ row[1] }}
+ </div>
+ <div class="col-8 row q-gutter-x-sm">
+ <div v-for="(v, k) in row[2]" :key="k">
+ {{ k }}: {{ v }}
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ data () {
+ return {
+ text: '',
+ log: []
+ }
+ },
+
+ methods: {
+ addLog (evt) {
+ const evtDump = {
+ key: evt.key,
+ code: evt.code,
+ charCode: evt.charCode,
+ keyCode: evt.keyCode,
+ which: evt.which,
+
+ ctrlKey: evt.ctrlKey,
+ shiftKey: evt.shiftKey,
+ altKey: evt.altKey,
+ metaKey: evt.metaKey,
+ repeat: evt.repeat,
+ detail: evt.detail,
+ isTrusted: evt.isTrusted,
+ isComposing: evt.isComposing,
+ composed: evt.composed
+ }
+
+ const filtered = this.log.filter(r => r[0] === evt.type)
+
+ if (filtered.length > 0) {
+ const old = filtered[0]
+
+ if (JSON.stringify(old[2]) === JSON.stringify(evtDump)) {
+ old[1]++
+
+ this.log = [...this.log]
+
+ return
+ }
+ }
+
+ this.log.unshift([evt.type, 1, evtDump])
+ },
+
+ resetLog () {
+ this.log = []
+ }
+ }
+}
+</script>
diff --git a/ui/src/body.js b/ui/src/body.js
index c581d47d7ce..690c0b5c058 100644
--- a/ui/src/body.js
+++ b/ui/src/body.js
@@ -1,4 +1,5 @@
import { setBrand } from './utils/colors.js'
+import { onKeyDownComposition } from './utils/key-composition'
import { isSSR, fromSSR, client } from './plugins/Platform.js'
function getMobilePlatform (is) {
@@ -101,6 +102,8 @@ export default {
// needed for iOS button active state
document.body.addEventListener('touchstart', () => {})
}
+
+ window.addEventListener('keydown', onKeyDownComposition, true)
}
}
}
diff --git a/ui/src/components/btn/QBtn.js b/ui/src/components/btn/QBtn.js
index e4e16147916..11295adaf1b 100644
--- a/ui/src/components/btn/QBtn.js
+++ b/ui/src/components/btn/QBtn.js
@@ -6,8 +6,9 @@ import QSpinner from '../spinner/QSpinner.js'
import BtnMixin from '../../mixins/btn.js'
import slot from '../../utils/slot.js'
-import { stopAndPrevent, listenOpts } from '../../utils/event.js'
+import { stop, prevent, stopAndPrevent, listenOpts } from '../../utils/event.js'
import { getTouchTarget } from '../../utils/touch.js'
+import { testKeyCodes } from '../../utils/key-composition'
const { passiveCapture } = listenOpts
@@ -99,7 +100,7 @@ export default Vue.extend({
},
__onKeydown (e) {
- if ([13, 32].includes(e.keyCode) === true) {
+ if (testKeyCodes(e, [13, 32]) === true) {
stopAndPrevent(e)
if (keyboardTarget !== this.$el) {
@@ -142,11 +143,12 @@ export default Vue.extend({
__onPressEnd (e) {
if (e !== void 0 && e.type === 'keyup') {
- if (keyboardTarget === this.$el && [13, 32].includes(e.keyCode) === true) {
+ if (keyboardTarget === this.$el && testKeyCodes(e, [13, 32]) === true) {
// for click trigger
const evt = new MouseEvent('click', e)
evt.qKeyEvent = true
- e.defaultPrevented === true && evt.preventDefault()
+ e.defaultPrevented === true && prevent(evt)
+ e.cancelBubble === true && stop(evt)
this.$el.dispatchEvent(evt)
stopAndPrevent(e)
diff --git a/ui/src/components/dialog-plugin/DialogPlugin.js b/ui/src/components/dialog-plugin/DialogPlugin.js
index 2e834650de9..352539b869e 100644
--- a/ui/src/components/dialog-plugin/DialogPlugin.js
+++ b/ui/src/components/dialog-plugin/DialogPlugin.js
@@ -4,6 +4,7 @@ import QDialog from '../dialog/QDialog.js'
import QBtn from '../btn/QBtn.js'
import clone from '../../utils/clone.js'
+import { testKeyCodes } from '../../utils/key-composition'
import QCard from '../card/QCard.js'
import QCardSection from '../card/QCardSection.js'
@@ -120,7 +121,7 @@ export default Vue.extend({
input: v => { this.prompt.model = v },
keyup: evt => {
// if ENTER key
- if (this.prompt.type !== 'textarea' && evt.keyCode === 13) {
+ if (this.prompt.type !== 'textarea' && testKeyCodes(evt, 13) === true) {
this.onOk()
}
}
diff --git a/ui/src/components/editor/QEditor.js b/ui/src/components/editor/QEditor.js
index 98f7d160dd6..874513c99e4 100644
--- a/ui/src/components/editor/QEditor.js
+++ b/ui/src/components/editor/QEditor.js
@@ -9,6 +9,7 @@ import DarkMixin from '../../mixins/dark.js'
import { isSSR } from '../../plugins/Platform.js'
import { stopAndPrevent } from '../../utils/event.js'
import extend from '../../utils/extend.js'
+import { ignoreKey } from '../../utils/key-composition'
export default Vue.extend({
name: 'QEditor',
@@ -279,7 +280,7 @@ export default Vue.extend({
__onKeydown (e) {
this.$emit('keydown', e)
- if (!e.ctrlKey) {
+ if (e.ctrlKey !== true || ignoreKey(e) === true) {
this.refreshToolbar()
this.$q.platform.is.ie && this.$nextTick(this.__onInput)
return
diff --git a/ui/src/components/editor/editor-utils.js b/ui/src/components/editor/editor-utils.js
index 3a06bb44e7d..36b77e6abfb 100644
--- a/ui/src/components/editor/editor-utils.js
+++ b/ui/src/components/editor/editor-utils.js
@@ -9,6 +9,7 @@ import QItemSection from '../item/QItemSection.js'
import { prevent } from '../../utils/event.js'
import slot from '../../utils/slot.js'
+import { ignoreKey } from '../../utils/key-composition'
function run (e, btn, vm) {
if (btn.handler) {
@@ -256,6 +257,10 @@ export function getLinkEditor (h, vm) {
on: {
input: val => { link = val },
keydown: event => {
+ if (ignoreKey(event) === true) {
+ return
+ }
+
switch (event.keyCode) {
case 13: // ENTER key
prevent(event)
diff --git a/ui/src/components/item/QItem.js b/ui/src/components/item/QItem.js
index 679d9d687c8..afb0ce0a6db 100644
--- a/ui/src/components/item/QItem.js
+++ b/ui/src/components/item/QItem.js
@@ -3,7 +3,8 @@ import Vue from 'vue'
import DarkMixin from '../../mixins/dark.js'
import { RouterLinkMixin } from '../../mixins/router-link.js'
import { uniqueSlot } from '../../utils/slot.js'
-import { stopAndPrevent } from '../../utils/event.js'
+import { stop, prevent, stopAndPrevent } from '../../utils/event.js'
+import { testKeyCodes } from '../../utils/key-composition'
export default Vue.extend({
name: 'QItem',
@@ -89,7 +90,7 @@ export default Vue.extend({
},
__onKeyup (e) {
- if (e.keyCode === 13 && this.isClickable === true) {
+ if (this.isClickable === true && testKeyCodes(e, 13) === true) {
stopAndPrevent(e)
// for ripple
@@ -97,6 +98,8 @@ export default Vue.extend({
// for click trigger
const evt = new MouseEvent('click', e)
+ e.defaultPrevented === true && prevent(evt)
+ e.cancelBubble === true && stop(evt)
evt.qKeyEvent = true
this.$el.dispatchEvent(evt)
}
diff --git a/ui/src/components/pagination/QPagination.js b/ui/src/components/pagination/QPagination.js
index ad98454cf0f..1612ac2faaf 100644
--- a/ui/src/components/pagination/QPagination.js
+++ b/ui/src/components/pagination/QPagination.js
@@ -7,6 +7,7 @@ import DarkMixin from '../../mixins/dark.js'
import { stop } from '../../utils/event.js'
import { between } from '../../utils/format.js'
+import { testKeyCodes } from '../../utils/key-composition'
export default Vue.extend({
name: 'QPagination',
@@ -229,7 +230,7 @@ export default Vue.extend({
},
on: {
input: value => { this.newPage = value },
- keyup: e => { e.keyCode === 13 && this.__update() },
+ keyup: e => { testKeyCodes(e, 13) === true && this.__update() },
blur: () => { this.__update() }
}
}))
diff --git a/ui/src/components/popup-edit/QPopupEdit.js b/ui/src/components/popup-edit/QPopupEdit.js
index cee4d297f9c..e6defdd71b0 100644
--- a/ui/src/components/popup-edit/QPopupEdit.js
+++ b/ui/src/components/popup-edit/QPopupEdit.js
@@ -6,6 +6,7 @@ import QBtn from '../btn/QBtn.js'
import clone from '../../utils/clone.js'
import { isDeepEqual } from '../../utils/is.js'
import slot from '../../utils/slot.js'
+import { testKeyCodes } from '../../utils/key-composition'
export default Vue.extend({
name: 'QPopupEdit',
@@ -173,7 +174,7 @@ export default Vue.extend({
this.$emit('hide')
},
keyup: e => {
- e.keyCode === 13 && this.set()
+ testKeyCodes(e, 13) === true && this.set()
}
}
}, this.__getContent(h))
diff --git a/ui/src/components/select/QSelect.js b/ui/src/components/select/QSelect.js
index 90b677171d3..223f46d2037 100755
--- a/ui/src/components/select/QSelect.js
+++ b/ui/src/components/select/QSelect.js
@@ -14,6 +14,7 @@ import QDialog from '../dialog/QDialog.js'
import { isDeepEqual } from '../../utils/is.js'
import { stop, prevent, stopAndPrevent } from '../../utils/event.js'
import { normalizeToInterval } from '../../utils/format.js'
+import { ignoreKey, testKeyCodes } from '../../utils/key-composition'
import VirtualScroll from '../../mixins/virtual-scroll.js'
import CompositionMixin from '../../mixins/composition.js'
@@ -447,7 +448,7 @@ export default Vue.extend({
// if ESC and we have an opened menu
// then stop propagation (might be caught by a QDialog
// and so it will also close the QDialog, which is wrong)
- if (e.keyCode === 27 && this.menu === true) {
+ if (testKeyCodes(e, 27) === true && this.menu === true) {
stop(e)
// on ESC we need to close the dialog also
this.hidePopup()
@@ -462,6 +463,10 @@ export default Vue.extend({
__onTargetKeydown (e) {
this.$emit('keydown', e)
+ if (ignoreKey(e) === true) {
+ return
+ }
+
const tabShouldSelect = e.shiftKey !== true && this.multiple !== true && this.optionIndex > -1
// escape
diff --git a/ui/src/components/tabs/QTab.js b/ui/src/components/tabs/QTab.js
index acb2e0bc88c..4e3cb49f640 100644
--- a/ui/src/components/tabs/QTab.js
+++ b/ui/src/components/tabs/QTab.js
@@ -6,6 +6,7 @@ import RippleMixin from '../../mixins/ripple.js'
import { stop } from '../../utils/event.js'
import slot from '../../utils/slot.js'
+import { testKeyCodes } from '../../utils/key-composition'
export default Vue.extend({
name: 'QTab',
@@ -72,7 +73,7 @@ export default Vue.extend({
},
__onKeyup (e) {
- e.keyCode === 13 && this.__activate(e, true)
+ testKeyCodes(e, 13) === true && this.__activate(e, true)
},
__getContent (h) {
diff --git a/ui/src/components/tree/QTree.js b/ui/src/components/tree/QTree.js
index f5cd97b9a82..b6601767987 100644
--- a/ui/src/components/tree/QTree.js
+++ b/ui/src/components/tree/QTree.js
@@ -6,6 +6,7 @@ import QSlideTransition from '../slide-transition/QSlideTransition.js'
import QSpinner from '../spinner/QSpinner.js'
import DarkMixin from '../../mixins/dark.js'
import { stopAndPrevent } from '../../utils/event.js'
+import { ignoreKey } from '../../utils/key-composition'
export default Vue.extend({
name: 'QTree',
@@ -483,8 +484,10 @@ export default Vue.extend({
this.__onClick(node, meta, e)
},
keypress: e => {
- if (e.keyCode === 13) { this.__onClick(node, meta, e, true) }
- else if (e.keyCode === 32) { this.__onExpandClick(node, meta, e, true) }
+ if (ignoreKey(e) !== true) {
+ if (e.keyCode === 13) { this.__onClick(node, meta, e, true) }
+ else if (e.keyCode === 32) { this.__onExpandClick(node, meta, e, true) }
+ }
}
}
}, [
diff --git a/ui/src/directives/ClosePopup.js b/ui/src/directives/ClosePopup.js
index 66fa11d06b0..2efb12ede53 100644
--- a/ui/src/directives/ClosePopup.js
+++ b/ui/src/directives/ClosePopup.js
@@ -1,4 +1,5 @@
import { closePortals } from '../mixins/portal.js'
+import { testKeyCodes } from '../utils/key-composition'
/*
* depth
@@ -34,7 +35,7 @@ export default {
},
handlerKey (evt) {
- evt.keyCode === 13 && ctx.handler(evt)
+ testKeyCodes(evt, 13) === true && ctx.handler(evt)
}
}
diff --git a/ui/src/directives/GoBack.js b/ui/src/directives/GoBack.js
index a1cccd914ea..ed13c24e811 100644
--- a/ui/src/directives/GoBack.js
+++ b/ui/src/directives/GoBack.js
@@ -1,4 +1,5 @@
import { client } from '../plugins/Platform.js'
+import { testKeyCodes } from '../utils/key-composition'
export default {
name: 'go-back',
@@ -26,7 +27,7 @@ export default {
goBackKey (e) {
// ENTER
- e.keyCode === 13 && ctx.goBack()
+ testKeyCodes(e, 13) === true && ctx.goBack()
}
}
diff --git a/ui/src/directives/Ripple.js b/ui/src/directives/Ripple.js
index 8dd0104bd25..de03cea1410 100644
--- a/ui/src/directives/Ripple.js
+++ b/ui/src/directives/Ripple.js
@@ -1,5 +1,6 @@
import { css } from '../utils/dom.js'
import { position, stop, listenOpts } from '../utils/event.js'
+import { testKeyCodes } from '../utils/key-composition'
import { client } from '../plugins/Platform.js'
function showRipple (evt, el, ctx, forceCenter) {
@@ -93,7 +94,7 @@ export default {
},
keyup (evt) {
- if (ctx.enabled === true && ctx.modifiers.keyCodes.indexOf(evt.keyCode) > -1 && evt.qKeyEvent !== true) {
+ if (ctx.enabled === true && testKeyCodes(evt, ctx.modifiers.keyCodes) === true) {
showRipple(evt, el, ctx, true)
}
}
diff --git a/ui/src/directives/TouchRepeat.js b/ui/src/directives/TouchRepeat.js
index a28c8092f64..16f07adac35 100644
--- a/ui/src/directives/TouchRepeat.js
+++ b/ui/src/directives/TouchRepeat.js
@@ -2,6 +2,7 @@ import { client } from '../plugins/Platform.js'
import { addEvt, cleanEvt, getTouchTarget } from '../utils/touch.js'
import { position, leftClick, stopAndPrevent } from '../utils/event.js'
import { clearSelection } from '../utils/selection.js'
+import { testKeyCodes } from '../utils/key-composition'
const
keyCodes = {
@@ -74,7 +75,7 @@ export default {
},
keyboardStart (evt) {
- if (keyboard.includes(evt.keyCode)) {
+ if (testKeyCodes(evt, keyboard) === true) {
if (durations[0] === 0 || ctx.event !== void 0) {
stopAndPrevent(evt)
el.focus()
diff --git a/ui/src/mixins/anchor.js b/ui/src/mixins/anchor.js
index 0e82a5ee83b..c4e5b15e93d 100644
--- a/ui/src/mixins/anchor.js
+++ b/ui/src/mixins/anchor.js
@@ -1,6 +1,7 @@
import { clearSelection } from '../utils/selection.js'
import { prevent } from '../utils/event.js'
import { addEvt, cleanEvt, getTouchTarget } from '../utils/touch.js'
+import { testKeyCodes } from '../utils/key-composition'
export default {
props: {
@@ -61,7 +62,7 @@ export default {
},
__toggleKey (evt) {
- if (evt !== void 0 && evt.keyCode === 13 && evt.qKeyEvent !== true) {
+ if (testKeyCodes(evt, 13) === true) {
this.toggle(evt)
}
},
diff --git a/ui/src/mixins/mask.js b/ui/src/mixins/mask.js
index 7fd75f61b08..cc2b0e74e77 100644
--- a/ui/src/mixins/mask.js
+++ b/ui/src/mixins/mask.js
@@ -1,3 +1,5 @@
+import { ignoreKey } from '../utils/key-composition'
+
// leave NAMED_MASKS at top of file (code referenced from docs)
const NAMED_MASKS = {
date: '####/##/##',
@@ -405,6 +407,10 @@ export default {
},
__onMaskedKeydown (e) {
+ if (ignoreKey(e) === true) {
+ return
+ }
+
const
inp = this.$refs.input,
start = inp.selectionStart,
diff --git a/ui/src/utils/escape-key.js b/ui/src/utils/escape-key.js
index 66aa9b42998..389676fef51 100644
--- a/ui/src/utils/escape-key.js
+++ b/ui/src/utils/escape-key.js
@@ -1,13 +1,12 @@
+import { testKeyCodes } from './key-composition'
+
let handlers = []
export default {
__install () {
this.__installed = true
window.addEventListener('keyup', evt => {
- if (
- handlers.length !== 0 &&
- (evt.which === 27 || evt.keyCode === 27)
- ) {
+ if (handlers.length !== 0 && testKeyCodes(evt, 27) === true) {
handlers[handlers.length - 1].fn(evt)
}
})
diff --git a/ui/src/utils/key-composition.js b/ui/src/utils/key-composition.js
new file mode 100644
index 00000000000..dc069f482d1
--- /dev/null
+++ b/ui/src/utils/key-composition.js
@@ -0,0 +1,25 @@
+let lastKeyCompositionStatus = false
+
+export function onKeyDownComposition (evt) {
+ lastKeyCompositionStatus = evt.isComposing === true
+}
+
+export function ignoreKey (evt) {
+ return lastKeyCompositionStatus === true ||
+ evt !== Object(evt) ||
+ evt.isComposing === true ||
+ evt.qKeyEvent === true
+}
+
+export function testKeyCodes (evt, keyCodes) {
+ if (
+ lastKeyCompositionStatus === true ||
+ evt !== Object(evt) ||
+ evt.isComposing === true ||
+ evt.qKeyEvent === true
+ ) {
+ return false
+ }
+
+ return [].concat(keyCodes).indexOf(evt.keyCode) > -1
+}
|
843c5c7f98812ad78518375b44ac0cbfc69902c4
|
2017-06-20 22:28:54
|
Razvan Stoenescu
|
fix: QCard wrapping
| false
|
QCard wrapping
|
fix
|
diff --git a/src/components/card/QCard.js b/src/components/card/QCard.js
index cf1a8b858b6..e0d0988f29b 100644
--- a/src/components/card/QCard.js
+++ b/src/components/card/QCard.js
@@ -13,7 +13,7 @@ export default {
classes = data.staticClass,
prop = ctx.props
- let cls = ['q-card column']
+ let cls = ['q-card column no-wrap']
if (prop.square) {
cls.push('no-border-radius')
}
|
1733d916255f3ec58dab4cedf656eb461eb42a06
|
2020-09-28 19:07:15
|
Razvan Stoenescu
|
feat(vue3): QTree
| false
|
QTree
|
feat
|
diff --git a/ui/dev/src/pages/components/tree.vue b/ui/dev/src/pages/components/tree.vue
index 4f71a566011..5cdb298402f 100644
--- a/ui/dev/src/pages/components/tree.vue
+++ b/ui/dev/src/pages/components/tree.vue
@@ -43,10 +43,10 @@
:nodes="nodes"
node-key="key"
children-key="subnodes"
- :selected.sync="selected"
+ v-model:selected="selected"
:tick-strategy="tickStrategy"
- :ticked.sync="ticked"
- :expanded.sync="expanded"
+ v-model:ticked="ticked"
+ v-model:expanded="expanded"
:dark="dark"
:accordion="accordion"
:color="color"
diff --git a/ui/src/components/tree/QTree.js b/ui/src/components/tree/QTree.js
index 06ef45a7e79..646a045099c 100644
--- a/ui/src/components/tree/QTree.js
+++ b/ui/src/components/tree/QTree.js
@@ -1,4 +1,4 @@
-import { h, defineComponent } from 'vue'
+import { h, defineComponent, withDirectives, vShow } from 'vue'
import QIcon from '../icon/QIcon.js'
import QCheckbox from '../checkbox/QCheckbox.js'
@@ -69,6 +69,15 @@ export default defineComponent({
noResultsLabel: String
},
+ emits: [
+ 'update:expanded',
+ 'update:ticked',
+ 'update:selected',
+ 'lazy-load',
+ 'after-show',
+ 'after-hide'
+ ],
+
computed: {
classes () {
return `q-tree` +
@@ -90,16 +99,14 @@ export default defineComponent({
},
textColorClass () {
- if (this.textColor !== void 0) {
- return `text-${this.textColor}`
- }
+ return this.textColor !== void 0
+ ? ` text-${this.textColor}`
+ : ''
},
selectedColorClass () {
const color = this.selectedColor || this.color
- if (color) {
- return `text-${color}`
- }
+ return color ? ` text-${color}` : ''
},
meta () {
@@ -371,7 +378,7 @@ export default defineComponent({
}
if (emit === true) {
- this.$emit(`update:expanded`, target)
+ this.$emit('update:expanded', target)
}
else {
this.innerExpanded = target
@@ -401,7 +408,7 @@ export default defineComponent({
}
if (emit === true) {
- this.$emit(`update:ticked`, target)
+ this.$emit('update:ticked', target)
}
},
@@ -435,15 +442,16 @@ export default defineComponent({
__getNodeMedia (node) {
if (node.icon !== void 0) {
return h(QIcon, {
- staticClass: `q-tree__icon q-mr-sm`,
- props: { name: node.icon, color: node.iconColor }
+ class: `q-tree__icon q-mr-sm`,
+ name: node.icon,
+ color: node.iconColor
})
}
const src = node.img || node.avatar
if (src) {
return h('img', {
- staticClass: `q-tree__${node.img ? 'img' : 'avatar'} q-mr-sm`,
- attrs: { src }
+ class: `q-tree__${node.img ? 'img' : 'avatar'} q-mr-sm`,
+ src
})
}
},
@@ -470,7 +478,7 @@ export default defineComponent({
: null
if (body !== void 0) {
- body = h('div', { staticClass: 'q-tree__node-body relative-position' }, [
+ body = h('div', { class: 'q-tree__node-body relative-position' }, [
h('div', { class: this.textColorClass }, [
body(slotScope)
])
@@ -479,46 +487,44 @@ export default defineComponent({
return h('div', {
key,
- staticClass: 'q-tree__node relative-position',
- class: { 'q-tree__node--parent': isParent, 'q-tree__node--child': !isParent }
+ class: 'q-tree__node relative-position' +
+ ` q-tree__node--${isParent === true ? 'parent' : 'child'}`
}, [
h('div', {
- staticClass: 'q-tree__node-header relative-position row no-wrap items-center',
- class: {
- 'q-tree__node--link q-hoverable q-focusable': meta.link,
- 'q-tree__node--selected': meta.selected,
- 'q-tree__node--disabled': meta.disabled
+ class: 'q-tree__node-header relative-position row no-wrap items-center' +
+ (meta.link === true ? ' q-tree__node--link q-hoverable q-focusable' : '') +
+ (meta.selected === true ? ' q-tree__node--selected' : '') +
+ (meta.disabled === true ? ' q-tree__node--disabled' : ''),
+ tabindex: meta.link === true ? 0 : -1,
+ onClick: (e) => {
+ this.__onClick(node, meta, e)
},
- attrs: { tabindex: meta.link ? 0 : -1 },
- on: {
- click: (e) => {
- this.__onClick(node, meta, e)
- },
- keypress: e => {
- if (shouldIgnoreKey(e) !== true) {
- if (e.keyCode === 13) { this.__onClick(node, meta, e, true) }
- else if (e.keyCode === 32) { this.__onExpandClick(node, meta, e, true) }
- }
+ onKeypress: e => {
+ if (shouldIgnoreKey(e) !== true) {
+ if (e.keyCode === 13) { this.__onClick(node, meta, e, true) }
+ else if (e.keyCode === 32) { this.__onExpandClick(node, meta, e, true) }
}
}
}, [
- h('div', { staticClass: 'q-focus-helper', attrs: { tabindex: -1 }, ref: `blurTarget_${meta.key}` }),
+ h('div', {
+ class: 'q-focus-helper',
+ tabindex: -1,
+ ref: `blurTarget_${meta.key}`
+ }),
meta.lazy === 'loading'
? h(QSpinner, {
- staticClass: 'q-tree__spinner q-mr-xs',
- props: { color: this.computedControlColor }
+ class: 'q-tree__spinner q-mr-xs',
+ color: this.computedControlColor
})
: (
isParent === true
? h(QIcon, {
- staticClass: 'q-tree__arrow q-mr-xs',
- class: { 'q-tree__arrow--rotate': meta.expanded },
- props: { name: this.computedIcon },
- on: {
- click: e => {
- this.__onExpandClick(node, meta, e)
- }
+ class: 'q-tree__arrow q-mr-xs' +
+ (meta.expanded === true ? ' q-tree__arrow--rotate' : ''),
+ name: this.computedIcon,
+ onClick: e => {
+ this.__onExpandClick(node, meta, e)
}
})
: null
@@ -526,27 +532,23 @@ export default defineComponent({
meta.hasTicking === true && meta.noTick !== true
? h(QCheckbox, {
- staticClass: 'q-mr-xs',
- props: {
- value: meta.indeterminate === true ? null : meta.ticked,
- color: this.computedControlColor,
- dark: this.isDark,
- dense: true,
- keepColor: true,
- disable: meta.tickable !== true
- },
- on: {
- keydown: stopAndPrevent,
- input: v => {
- this.__onTickedClick(meta, v)
- }
+ class: 'q-mr-xs',
+ modelValue: meta.indeterminate === true ? null : meta.ticked,
+ color: this.computedControlColor,
+ dark: this.isDark,
+ dense: true,
+ keepColor: true,
+ disable: meta.tickable !== true,
+ onKeydown: stopAndPrevent,
+ 'onUpdate:modelValue': v => {
+ this.__onTickedClick(meta, v)
}
})
: null,
h('div', {
- 'staticClass': 'q-tree__node-header-content col row no-wrap items-center',
- class: meta.selected ? this.selectedColorClass : this.textColorClass
+ class: 'q-tree__node-header-content col row no-wrap items-center' +
+ (meta.selected === true ? this.selectedColorClass : this.textColorClass),
}, [
header
? header(slotScope)
@@ -559,24 +561,24 @@ export default defineComponent({
isParent === true
? h(QSlideTransition, {
- props: { duration: this.duration },
- on: cache(this, 'slide', {
- show: () => { this.$emit('after-show') },
- hide: () => { this.$emit('after-hide') }
+ duration: this.duration,
+ ...cache(this, 'slide', {
+ onShow: () => { this.$emit('after-show') },
+ onHide: () => { this.$emit('after-hide') }
})
- }, [
- h('div', {
- staticClass: 'q-tree__node-collapsible',
- class: this.textColorClass,
- directives: [{ name: 'show', value: meta.expanded }]
- }, [
- body,
-
+ }, () => [
+ withDirectives(
h('div', {
- staticClass: 'q-tree__children',
- class: { 'q-tree__node--disabled': meta.disabled }
- }, children)
- ])
+ class: 'q-tree__node-collapsible' + this.textColorClass
+ }, [
+ body,
+ h('div', {
+ class: 'q-tree__children' +
+ (meta.disabled === true ? ' q-tree__node--disabled' : '')
+ }, children)
+ ]),
+ [[ vShow, meta.expanded ]]
+ )
])
: body
])
|
2f7a5cfe46bc7499cb42db192d027bc21b5aad10
|
2020-12-23 17:34:28
|
Razvan Stoenescu
|
feat(QField/QInput/QFile): composition api; temporary breaks QSelect
| false
|
composition api; temporary breaks QSelect
|
feat
|
diff --git a/ui/src/components/drawer/QDrawer.js b/ui/src/components/drawer/QDrawer.js
index cf6b3164f7a..0d9fc81a9e6 100644
--- a/ui/src/components/drawer/QDrawer.js
+++ b/ui/src/components/drawer/QDrawer.js
@@ -79,7 +79,7 @@ export default defineComponent({
const { emitListeners } = useEmitListeners(vm)
const { registerTimeout } = useTimeout()
- const layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, () => {
console.error('QDrawer needs to be child of QLayout')
})
@@ -87,7 +87,7 @@ export default defineComponent({
const belowBreakpoint = ref(
props.behavior === 'mobile' ||
- (props.behavior !== 'desktop' && layout.totalWidth.value <= props.breakpoint)
+ (props.behavior !== 'desktop' && $layout.totalWidth.value <= props.breakpoint)
)
const isMini = computed(() =>
@@ -114,17 +114,17 @@ export default defineComponent({
function handleShow (evt, noEvent) {
addToHistory()
- evt !== false && layout.animate()
+ evt !== false && $layout.animate()
applyPosition(0)
if (belowBreakpoint.value === true) {
- const otherInstance = layout.instances[ otherSide.value ]
+ const otherInstance = $layout.instances[ otherSide.value ]
if (otherInstance !== void 0 && otherInstance.belowBreakpoint === true) {
otherInstance.hide(false)
}
applyBackdrop(1)
- layout.container !== true && preventBodyScroll(true)
+ $layout.container !== true && preventBodyScroll(true)
}
else {
applyBackdrop(0)
@@ -140,7 +140,7 @@ export default defineComponent({
function handleHide (evt, noEvent) {
removeFromHistory()
- evt !== false && layout.animate()
+ evt !== false && $layout.animate()
applyBackdrop(0)
applyPosition(stateDirection.value * size.value)
@@ -193,8 +193,8 @@ export default defineComponent({
const fixed = computed(() =>
props.overlay === true ||
props.miniToOverlay === true ||
- layout.view.indexOf(rightSide.value ? 'R' : 'L') > -1 ||
- ($q.platform.is.ios === true && layout.container === true)
+ $layout.view.indexOf(rightSide.value ? 'R' : 'L') > -1 ||
+ ($q.platform.is.ios === true && $layout.container === true)
)
const onLayout = computed(() =>
@@ -220,34 +220,34 @@ export default defineComponent({
const headerSlot = computed(() =>
rightSide.value === true
- ? layout.rows.value.top[ 2 ] === 'r'
- : layout.rows.value.top[ 0 ] === 'l'
+ ? $layout.rows.value.top[ 2 ] === 'r'
+ : $layout.rows.value.top[ 0 ] === 'l'
)
const footerSlot = computed(() =>
rightSide.value === true
- ? layout.rows.value.bottom[ 2 ] === 'r'
- : layout.rows.value.bottom[ 0 ] === 'l'
+ ? $layout.rows.value.bottom[ 2 ] === 'r'
+ : $layout.rows.value.bottom[ 0 ] === 'l'
)
const aboveStyle = computed(() => {
const css = {}
- if (layout.header.space === true && headerSlot.value === false) {
+ if ($layout.header.space === true && headerSlot.value === false) {
if (fixed.value === true) {
- css.top = `${layout.header.offset}px`
+ css.top = `${$layout.header.offset}px`
}
- else if (layout.header.space === true) {
- css.top = `${layout.header.size}px`
+ else if ($layout.header.space === true) {
+ css.top = `${$layout.header.size}px`
}
}
- if (layout.footer.space === true && footerSlot.value === false) {
+ if ($layout.footer.space === true && footerSlot.value === false) {
if (fixed.value === true) {
- css.bottom = `${layout.footer.offset}px`
+ css.bottom = `${$layout.footer.offset}px`
}
- else if (layout.footer.space === true) {
- css.bottom = `${layout.footer.size}px`
+ else if ($layout.footer.space === true) {
+ css.bottom = `${$layout.footer.size}px`
}
}
@@ -352,7 +352,7 @@ export default defineComponent({
}
})
- watch(layout.totalWidth, val => {
+ watch($layout.totalWidth, val => {
updateLocal(belowBreakpoint, (
props.behavior === 'mobile' ||
(props.behavior !== 'desktop' && val <= props.breakpoint)
@@ -360,25 +360,25 @@ export default defineComponent({
})
watch(() => props.side, (newSide, oldSide) => {
- if (layout.instances[ oldSide ] === instance) {
- layout.instances[ oldSide ] = void 0
- layout[ oldSide ].space = false
- layout[ oldSide ].offset = 0
+ if ($layout.instances[ oldSide ] === instance) {
+ $layout.instances[ oldSide ] = void 0
+ $layout[ oldSide ].space = false
+ $layout[ oldSide ].offset = 0
}
- layout.instances[ newSide ] = instance
- layout[ newSide ].size = size.value
- layout[ newSide ].space = onLayout.value
- layout[ newSide ].offset = offset.value
+ $layout.instances[ newSide ] = instance
+ $layout[ newSide ].size = size.value
+ $layout[ newSide ].space = onLayout.value
+ $layout[ newSide ].offset = offset.value
})
watch(() => props.behavior + props.breakpoint, updateBelowBreakpoint)
- watch(() => layout.container, val => {
+ watch(() => $layout.container, val => {
showing.value === true && preventBodyScroll(val !== true)
})
- watch(layout.scrollbarWidth, () => {
+ watch($layout.scrollbarWidth, () => {
applyPosition(showing.value === true ? 0 : void 0)
})
@@ -405,7 +405,7 @@ export default defineComponent({
watch(() => props.mini, () => {
if (props.modelValue === true) {
animateMini()
- layout.animate()
+ $layout.animate()
}
})
@@ -420,11 +420,11 @@ export default defineComponent({
}
else {
if (
- layout.container === true &&
+ $layout.container === true &&
rightSide.value === true &&
(belowBreakpoint.value === true || Math.abs(position) === size.value)
) {
- position += stateDirection.value * layout.scrollbarWidth.value
+ position += stateDirection.value * $layout.scrollbarWidth.value
}
flagContentPosition.value = position
@@ -434,7 +434,7 @@ export default defineComponent({
function updateBelowBreakpoint () {
updateLocal(belowBreakpoint, (
props.behavior === 'mobile' ||
- (props.behavior !== 'desktop' && layout.totalWidth.value <= props.breakpoint)
+ (props.behavior !== 'desktop' && $layout.totalWidth.value <= props.breakpoint)
))
}
@@ -445,7 +445,7 @@ export default defineComponent({
function setScrollable (v) {
const action = v === true
? 'remove'
- : (layout.container !== true ? 'add' : '')
+ : ($layout.container !== true ? 'add' : '')
action !== '' && document.body.classList[ action ]('q-body--drawer-toggle')
}
@@ -476,7 +476,7 @@ export default defineComponent({
show()
}
else {
- layout.animate()
+ $layout.animate()
applyBackdrop(0)
applyPosition(stateDirection.value * width)
}
@@ -517,7 +517,7 @@ export default defineComponent({
const opened = Math.abs(position) < Math.min(75, width)
if (opened === true) {
- layout.animate()
+ $layout.animate()
applyBackdrop(1)
applyPosition(0)
}
@@ -546,8 +546,8 @@ export default defineComponent({
// ensure state update is caught correctly by Vue diffing
// on all layout components, so nextTicking:
nextTick(() => {
- if (layout[ props.side ][ prop ] !== val) {
- layout[ props.side ][ prop ] = val
+ if ($layout[ props.side ][ prop ] !== val) {
+ $layout[ props.side ][ prop ] = val
}
})
}
@@ -562,7 +562,7 @@ export default defineComponent({
updateLayout('size', miniToOverlay === true ? props.miniWidth : size)
}
- layout.instances[ props.side ] = instance
+ $layout.instances[ props.side ] = instance
updateSizeOnLayout(props.miniToOverlay, size.value)
updateLayout('space', onLayout.value)
updateLayout('offset', offset.value)
@@ -587,14 +587,14 @@ export default defineComponent({
action(false, true)
}
- if (layout.totalWidth.value !== 0) {
+ if ($layout.totalWidth.value !== 0) {
// make sure that all computed properties
// have been updated before calling handleShow/handleHide()
nextTick(fn)
return
}
- layoutTotalWidthWatcher = watch(layout.totalWidth, () => {
+ layoutTotalWidthWatcher = watch($layout.totalWidth, () => {
layoutTotalWidthWatcher()
layoutTotalWidthWatcher = void 0
@@ -613,8 +613,8 @@ export default defineComponent({
showing.value === true && cleanup()
- if (layout.instances[ props.side ] === instance) {
- layout.instances[ props.side ] = void 0
+ if ($layout.instances[ props.side ] === instance) {
+ $layout.instances[ props.side ] = void 0
updateLayout('size', 0)
updateLayout('offset', 0)
updateLayout('space', false)
@@ -661,7 +661,7 @@ export default defineComponent({
h('div', {
...attrs,
class: [
- 'q-drawer__content fit ' + (layout.container === true ? 'overflow-auto' : 'scroll'),
+ 'q-drawer__content fit ' + ($layout.container === true ? 'overflow-auto' : 'scroll'),
attrs.class
]
}, isMini.value === true && slots.mini !== void 0
diff --git a/ui/src/components/field/QField.js b/ui/src/components/field/QField.js
index 40eeeb3090e..d525a3269b6 100644
--- a/ui/src/components/field/QField.js
+++ b/ui/src/components/field/QField.js
@@ -1,575 +1,42 @@
-import { h, defineComponent, Transition } from 'vue'
+import { defineComponent } from 'vue'
-import { isRuntimeSsrPreHydration } from '../../plugins/Platform.js'
-
-import QIcon from '../icon/QIcon.js'
-import QSpinner from '../spinner/QSpinner.js'
-
-import ValidateMixin from '../../mixins/validate.js'
-import DarkMixin from '../../mixins/dark.js'
-import SplitAttrsMixin from '../../mixins/split-attrs.js'
-
-import { hSlot } from '../../utils/render.js'
-import uid from '../../utils/uid.js'
-import { stop, prevent, stopAndPrevent } from '../../utils/event.js'
-
-function getTargetUid (val) {
- return val === void 0 ? `f_${uid()}` : val
-}
+import useQuasar from '../../composables/use-quasar.js'
+import useField, { useFieldState, useFieldProps, useFieldEmits } from '../../composables/private/use-field.js'
export default defineComponent({
name: 'QField',
- mixins: [ DarkMixin, ValidateMixin, SplitAttrsMixin ],
-
inheritAttrs: false,
- props: {
- label: String,
- stackLabel: Boolean,
- hint: String,
- hideHint: Boolean,
- prefix: String,
- suffix: String,
-
- labelColor: String,
- color: String,
- bgColor: String,
-
- filled: Boolean,
- outlined: Boolean,
- borderless: Boolean,
- standout: [ Boolean, String ],
-
- square: Boolean,
-
- loading: Boolean,
-
- labelSlot: Boolean,
-
- bottomSlots: Boolean,
- hideBottomSpace: Boolean,
-
- rounded: Boolean,
- dense: Boolean,
- itemAligned: Boolean,
-
- counter: Boolean,
-
- clearable: Boolean,
- clearIcon: String,
-
- disable: Boolean,
- readonly: Boolean,
-
- autofocus: Boolean,
-
- for: String,
-
- maxlength: [ Number, String ],
- maxValues: [ Number, String ] // used internally by QSelect
- },
-
- emits: [ 'update:modelValue', 'clear', 'focus', 'blur', 'popup-show', 'popup-hide' ],
-
- data () {
- return {
- focused: false,
- targetUid: getTargetUid(this.for),
-
- // used internally by validation for QInput
- // or menu handling for QSelect
- innerLoading: false
- }
- },
-
- watch: {
- for (val) {
- // don't transform targetUid into a computed
- // prop as it will break SSR
- this.targetUid = getTargetUid(val)
- }
- },
-
- computed: {
- // gets extended
- fieldClass () {},
-
- editable () {
- return this.disable !== true && this.readonly !== true
- },
-
- hasValue () {
- const value = this.field.getControl === void 0 ? this.modelValue : this.innerValue
-
- return value !== void 0 &&
- value !== null &&
- ('' + value).length > 0
- },
-
- computedCounter () {
- if (this.counter !== false) {
- const len = typeof this.modelValue === 'string' || typeof this.modelValue === 'number'
- ? ('' + this.modelValue).length
- : (Array.isArray(this.modelValue) === true ? this.modelValue.length : 0)
-
- const max = this.maxlength !== void 0
- ? this.maxlength
- : this.maxValues
-
- return len + (max !== void 0 ? ' / ' + max : '')
- }
- },
-
- floatingLabel () {
- return this.stackLabel === true ||
- this.focused === true ||
- (
- this.$data.inputValue !== void 0 && this.hideSelected === true
- ? this.inputValue.length > 0
- : this.hasValue === true
- ) ||
- (
- this.$props.hasOwnProperty('displayValue') === true &&
- this.displayValue !== void 0 &&
- this.displayValue !== null &&
- ('' + this.displayValue).length > 0
- )
- },
-
- shouldRenderBottom () {
- return this.bottomSlots === true ||
- this.hint !== void 0 ||
- this.hasRules === true ||
- this.counter === true ||
- this.error !== null
- },
-
- classes () {
- return `q-field row no-wrap items-start q-field--${this.styleType}` +
- (this.fieldClass !== void 0 ? ` ${this.fieldClass}` : '') +
- (this.rounded === true ? ' q-field--rounded' : '') +
- (this.square === true ? ' q-field--square' : '') +
- (this.floatingLabel === true ? ' q-field--float' : '') +
- (this.hasLabel === true ? ' q-field--labeled' : '') +
- (this.dense === true ? ' q-field--dense' : '') +
- (this.itemAligned === true ? ' q-field--item-aligned q-item-type' : '') +
- (this.isDark === true ? ' q-field--dark' : '') +
- (this.field.getControl === void 0 ? ' q-field--auto-height' : '') +
- (this.focused === true ? ' q-field--focused' : '') +
- (this.hasError === true ? ' q-field--error' : '') +
- (this.hasError === true || this.focused === true ? ' q-field--highlighted' : '') +
- (this.hideBottomSpace !== true && this.shouldRenderBottom === true ? ' q-field--with-bottom' : '') +
- (this.disable === true ? ' q-field--disabled' : (this.readonly === true ? ' q-field--readonly' : ''))
- },
-
- styleType () {
- if (this.filled === true) { return 'filled' }
- if (this.outlined === true) { return 'outlined' }
- if (this.borderless === true) { return 'borderless' }
- if (this.standout) { return 'standout' }
- return 'standard'
- },
-
- contentClass () {
- return 'q-field__control relative-position row no-wrap' +
- (this.bgColor !== void 0 ? ` bg-${this.bgColor}` : '') +
- (
- this.hasError === true
- ? ' text-negative'
- : (
- typeof this.standout === 'string' && this.standout.length > 0 && this.focused === true
- ? ` ${this.standout}`
- : (this.color !== void 0 ? ` text-${this.color}` : '')
- )
- )
- },
-
- hasLabel () {
- return this.labelSlot === true || this.label !== void 0
- },
-
- labelClass () {
- return 'q-field__label no-pointer-events absolute ellipsis' +
- (this.labelColor !== void 0 && this.hasError !== true ? ` text-${this.labelColor}` : '')
- },
-
- controlSlotScope () {
- return {
- id: this.targetUid,
- field: this.$el,
- editable: this.editable,
- focused: this.focused,
- floatingLabel: this.floatingLabel,
- modelValue: this.modelValue,
- emitValue: this.__emitValue
- }
- },
-
- attrs () {
- const attrs = {
- for: this.targetUid
- }
-
- if (this.disable === true) {
- attrs[ 'aria-disabled' ] = 'true'
- }
- else if (this.readonly === true) {
- attrs[ 'aria-readonly' ] = 'true'
- }
-
- return attrs
- }
- },
-
- methods: {
- focus () {
- if (this.showPopup !== void 0) {
- this.showPopup()
- return
- }
-
- this.__focus()
- },
-
- blur () {
- const el = document.activeElement
- // IE can have null document.activeElement
- if (el !== null && this.$el.contains(el)) {
- el.blur()
- }
- },
-
- __focus () {
- const el = document.activeElement
- let target = this.$refs.target
- // IE can have null document.activeElement
- if (target && (el === null || el.id !== this.targetUid)) {
- target.hasAttribute('tabindex') === true || (target = target.querySelector('[tabindex]'))
- target && target !== el && target.focus()
- }
- },
-
- __getContent () {
- const node = []
-
- this.$slots.prepend !== void 0 && node.push(
- h('div', {
- class: 'q-field__prepend q-field__marginal row no-wrap items-center',
- key: 'prepend',
- ...this.slotsEvents
- }, this.$slots.prepend())
- )
-
- node.push(
- h('div', {
- class: 'q-field__control-container col relative-position row no-wrap q-anchor--skip'
- }, this.__getControlContainer())
- )
-
- this.$slots.append !== void 0 && node.push(
- h('div', {
- class: 'q-field__append q-field__marginal row no-wrap items-center',
- key: 'append',
- ...this.slotsEvents
- }, this.$slots.append())
- )
-
- this.hasError === true && this.noErrorIcon === false && node.push(
- this.__getInnerAppendNode('error', [
- h(QIcon, { name: this.$q.iconSet.field.error, color: 'negative' })
- ])
- )
-
- if (this.loading === true || this.innerLoading === true) {
- node.push(
- this.__getInnerAppendNode(
- 'inner-loading-append',
- this.$slots.loading !== void 0
- ? this.$slots.loading()
- : [h(QSpinner, { color: this.color })]
- )
- )
- }
- else if (this.clearable === true && this.hasValue === true && this.editable === true) {
- node.push(
- this.__getInnerAppendNode('inner-clearable-append', [
- h(QIcon, {
- class: 'q-field__focusable-action',
- tag: 'button',
- name: this.clearIcon || this.$q.iconSet.field.clear,
- tabindex: 0,
- type: 'button',
- ...this.clearableEvents
- })
- ])
- )
- }
-
- this.field.getInnerAppend !== void 0 && node.push(
- this.__getInnerAppendNode('inner-append', this.field.getInnerAppend())
- )
-
- this.field.getControlChild !== void 0 && node.push(
- this.field.getControlChild()
- )
-
- return node
- },
-
- __getControlContainer () {
- const node = []
-
- this.prefix !== void 0 && this.prefix !== null && node.push(
- h('div', {
- class: 'q-field__prefix no-pointer-events row items-center'
- }, this.prefix)
- )
-
- if (this.field.getShadowControl !== void 0 && this.hasShadow === true) {
- node.push(
- this.field.getShadowControl()
- )
- }
-
- if (this.field.getControl !== void 0) {
- node.push(this.field.getControl())
- }
- // internal usage only:
- else if (this.$slots.rawControl !== void 0) {
- node.push(this.$slots.rawControl())
- }
- else if (this.$slots.control !== void 0) {
- node.push(
- h('div', {
- ref: 'target',
- class: 'q-field__native row',
- ...this.qAttrs,
- 'data-autofocus': this.autofocus
- }, this.$slots.control(this.controlSlotScope))
- )
- }
-
- this.hasLabel === true && node.push(
- h('div', {
- class: this.labelClass
- }, hSlot(this, 'label', this.label))
- )
-
- this.suffix !== void 0 && this.suffix !== null && node.push(
- h('div', {
- class: 'q-field__suffix no-pointer-events row items-center'
- }, this.suffix)
- )
-
- return node.concat(hSlot(this, 'default'))
- },
-
- __getBottom () {
- let msg, key
-
- if (this.hasError === true) {
- if (this.computedErrorMessage !== void 0) {
- msg = [h('div', this.computedErrorMessage)]
- key = this.computedErrorMessage
- }
- else {
- msg = hSlot(this, 'error')
- key = 'q--slot-error'
- }
- }
- else if (this.hideHint !== true || this.focused === true) {
- if (this.hint !== void 0) {
- msg = [h('div', this.hint)]
- key = this.hint
- }
- else {
- msg = hSlot(this, 'hint')
- key = 'q--slot-hint'
- }
- }
-
- const hasCounter = this.counter === true || this.$slots.counter !== void 0
-
- if (this.hideBottomSpace === true && hasCounter === false && msg === void 0) {
- return
- }
-
- const main = h('div', {
- key,
- class: 'q-field__messages col'
- }, msg)
-
- return h('div', {
- class: 'q-field__bottom row items-start q-field__bottom--' +
- (this.hideBottomSpace !== true ? 'animated' : 'stale')
- }, [
- this.hideBottomSpace === true
- ? main
- : h(Transition, { name: 'q-transition--field-message' }, () => main),
-
- hasCounter === true
- ? h('div', {
- class: 'q-field__counter'
- }, this.$slots.counter !== void 0 ? this.$slots.counter() : this.computedCounter)
- : null
- ])
- },
-
- __getInnerAppendNode (key, content) {
- return content === null
- ? null
- : h('div', {
- key,
- class: 'q-field__append q-field__marginal row no-wrap items-center q-anchor--skip'
- }, content)
- },
-
- __onControlPopupShow (e) {
- e !== void 0 && stop(e)
- this.$emit('popup-show', e)
- this.hasPopupOpen = true
- this.__onControlFocusin(e)
- },
-
- __onControlPopupHide (e) {
- e !== void 0 && stop(e)
- this.$emit('popup-hide', e)
- this.hasPopupOpen = false
- this.__onControlFocusout(e)
- },
-
- __onControlFocusin (e) {
- if (this.editable === true && this.focused === false) {
- this.focused = true
- this.$emit('focus', e)
- }
- },
-
- __onControlFocusout (e, then) {
- clearTimeout(this.focusoutTimer)
- this.focusoutTimer = setTimeout(() => {
- if (
- document.hasFocus() === true && (
- this.hasPopupOpen === true ||
- this.$refs === void 0 ||
- !this.$refs.control ||
- this.$refs.control.contains(document.activeElement) !== false
- )
- ) {
- return
- }
-
- if (this.focused === true) {
- this.focused = false
- this.$emit('blur', e)
- }
-
- then !== void 0 && then()
- })
- },
-
- __clearValue (e) {
- // prevent activating the field but keep focus on desktop
- stopAndPrevent(e)
-
- if (this.$q.platform.is.mobile !== true) {
- const el = this.$refs.target || this.$el
- el.focus()
- }
- else if (this.$el.contains(document.activeElement) === true) {
- document.activeElement.blur()
- }
-
- if (this.type === 'file') {
- // do not let focus be triggered
- // as it will make the native file dialog
- // appear for another selection
- this.$refs.input.value = null
- }
-
- this.$emit('update:modelValue', null)
- this.$emit('clear', this.modelValue)
-
- this.$nextTick(() => {
- this.resetValidation()
-
- if (this.lazyRules !== 'ondemand' && this.$q.platform.is.mobile !== true) {
- this.isDirty = false
- }
- })
- },
-
- __emitValue (value) {
- this.$emit('update:modelValue', value)
- }
- },
-
- render () {
- this.field.onPreRender !== void 0 && this.field.onPreRender()
- this.field.onPostRender !== void 0 && this.$nextTick(this.field.onPostRender)
-
- return h('label', {
- class: [
- this.classes,
- this.$attrs.class
- ],
- style: this.$attrs.style,
- ...this.attrs
- }, [
- this.$slots.before !== void 0
- ? h('div', {
- class: 'q-field__before q-field__marginal row no-wrap items-center',
- ...this.slotsEvents
- }, this.$slots.before())
- : null,
-
- h('div', {
- class: 'q-field__inner relative-position col self-stretch column justify-center'
- }, [
- h('div', {
- ref: 'control',
- class: this.contentClass,
- tabindex: -1,
- ...this.controlEvents
- }, this.__getContent()),
-
- this.shouldRenderBottom === true
- ? this.__getBottom()
- : null
- ]),
-
- this.$slots.after !== void 0
- ? h('div', {
- class: 'q-field__after q-field__marginal row no-wrap items-center',
- ...this.slotsEvents
- }, this.$slots.after())
- : null
- ])
- },
-
- created () {
- this.field = {}
-
- this.slotsEvents = { onClick: prevent }
- this.clearableEvents = { onClick: this.__clearValue }
- this.controlEvents = this.__getControlEvents !== void 0
- ? this.__getControlEvents()
- : {
- onFocusin: this.__onControlFocusin,
- onFocusout: this.__onControlFocusout
- }
- },
-
- mounted () {
- if (isRuntimeSsrPreHydration === true && this.for === void 0) {
- this.targetUid = getTargetUid()
- }
-
- this.autofocus === true && this.focus()
- },
-
- beforeUnmount () {
- clearTimeout(this.focusoutTimer)
+ props: useFieldProps,
+
+ emits: useFieldEmits,
+
+ setup (props, { slots, emit, attrs }) {
+ const $q = useQuasar()
+ const state = useFieldState(props, attrs)
+
+ // const hasValue = computed(() => {
+ // const value = state.getControl === void 0
+ // ? props.modelValue
+ // : state.innerValue.value
+
+ // return value !== void 0 &&
+ // value !== null &&
+ // ('' + value).length > 0
+ // })
+
+ // floatingLabel
+ // this.$data.inputValue !== void 0 && this.hideSelected === true
+ // ? this.inputValue.length > 0
+ // : hasValue.value === true
+ // ) ||
+ // (
+ // this.$props.hasOwnProperty('displayValue') === true &&
+ // this.displayValue !== void 0 &&
+ // this.displayValue !== null &&
+ // ('' + this.displayValue).length > 0
+ // )
+ return useField({ props, slots, emit, attrs, $q, state })
}
})
diff --git a/ui/src/components/field/QField.json b/ui/src/components/field/QField.json
index 25006c23f7c..a2c3523d244 100644
--- a/ui/src/components/field/QField.json
+++ b/ui/src/components/field/QField.json
@@ -1,5 +1,5 @@
{
- "mixins": [ "components/field/__QField" ],
+ "mixins": [ "composables/private/use-field" ],
"meta": {
"docsUrl": "https://v2.quasar.dev/vue-components/field"
diff --git a/ui/src/components/file/QFile.js b/ui/src/components/file/QFile.js
index d17eec35fbd..55e2c8f6765 100644
--- a/ui/src/components/file/QFile.js
+++ b/ui/src/components/file/QFile.js
@@ -1,19 +1,23 @@
-import { h, defineComponent } from 'vue'
+import { h, defineComponent, ref, computed, getCurrentInstance } from 'vue'
-import QField from '../field/QField.js'
import QChip from '../chip/QChip.js'
-import { FormFieldMixin } from '../../mixins/form.js'
-import FileMixin, { FileValueMixin } from '../../mixins/file.js'
+import useQuasar from '../../composables/use-quasar.js'
+import useField, { useFieldState, useFieldProps, useFieldEmits, fieldValueIsFilled } from '../../composables/private/use-field.js'
+import { useFormProps, useFormInputNameAttr } from '../../composables/private/use-form.js'
+import useFile, { useFileProps, useFileEmits } from '../../composables/private/use-file.js'
+import useFileFormDomProps from '../../composables/private/use-file-dom-props.js'
import { humanStorageSize } from '../../utils/format.js'
export default defineComponent({
name: 'QFile',
- mixins: [ QField, FileMixin, FormFieldMixin, FileValueMixin ],
-
props: {
+ ...useFieldProps,
+ ...useFormProps,
+ ...useFileProps,
+
/* SSR does not know about File & FileList */
modelValue: __QUASAR_SSR_SERVER__
? {}
@@ -34,126 +38,126 @@ export default defineComponent({
inputStyle: [ Array, String, Object ]
},
- data () {
- return {
- dnd: false
- }
- },
+ emits: [
+ ...useFieldEmits,
+ ...useFileEmits
+ ],
- computed: {
- // needed by QField mixin
- fieldClass () {
- return 'q-file q-field--auto-height'
- },
+ setup (props, { slots, emit, attrs }) {
+ const $q = useQuasar()
+ const state = useFieldState(props, attrs)
- innerValue () {
- return Object(this.modelValue) === this.modelValue
- ? ('length' in this.modelValue ? Array.from(this.modelValue) : [this.modelValue])
- : []
- },
+ const inputRef = ref(null)
+ const dnd = ref(false)
+ const nameProp = useFormInputNameAttr(props)
- selectedString () {
- return this.innerValue
- .map(file => file.name)
- .join(', ')
- },
+ const {
+ pickFiles,
+ addFiles,
+ onDragover,
+ processFiles,
+ getDndNode
+ } = useFile(props, emit, state.editable, dnd, getFileInput, addFilesToQueue)
- totalSize () {
- return humanStorageSize(
- this.innerValue.reduce((acc, file) => acc + file.size, 0)
- )
- },
+ const formDomProps = useFileFormDomProps(props)
- counterProps () {
- return {
- totalSize: this.totalSize,
- filesNumber: this.innerValue.length,
- maxFiles: this.maxFiles
- }
- },
-
- computedCounter () {
- if (this.counterLabel !== void 0) {
- return this.counterLabel(this.counterProps)
- }
-
- const max = this.maxFiles
- return `${this.innerValue.length}${max !== void 0 ? ' / ' + max : ''} (${this.totalSize})`
- },
+ const innerValue = computed(() =>
+ Object(props.modelValue) === props.modelValue
+ ? ('length' in props.modelValue ? Array.from(props.modelValue) : [props.modelValue])
+ : []
+ )
- inputAttrs () {
- return {
- tabindex: -1,
- type: 'file',
- title: '', // try to remove default tooltip,
- accept: this.accept,
- capture: this.capture,
- name: this.nameProp,
- ...this.$attrs,
- id: this.targetUid,
- disabled: this.editable !== true
- }
- },
+ const hasValue = computed(() => fieldValueIsFilled(innerValue.value))
- isAppending () {
- return this.multiple === true && this.append === true
- }
- },
+ const selectedString = computed(() =>
+ innerValue.value
+ .map(file => file.name)
+ .join(', ')
+ )
- methods: {
- removeAtIndex (index) {
- const files = this.innerValue.slice()
+ const totalSize = computed(() =>
+ humanStorageSize(
+ innerValue.value.reduce((acc, file) => acc + file.size, 0)
+ )
+ )
+
+ const counterProps = computed(() => ({
+ totalSize: totalSize.value,
+ filesNumber: innerValue.value.length,
+ maxFiles: props.maxFiles
+ }))
+
+ const inputAttrs = computed(() => ({
+ tabindex: -1,
+ type: 'file',
+ title: '', // try to remove default tooltip,
+ accept: props.accept,
+ capture: props.capture,
+ name: nameProp.value,
+ ...attrs,
+ id: state.targetUid.value,
+ disabled: state.editable.value !== true
+ }))
+
+ const isAppending = computed(() =>
+ props.multiple === true && props.append === true
+ )
+
+ function removeAtIndex (index) {
+ const files = innerValue.value.slice()
files.splice(index, 1)
- this.__emitValue(files)
- },
+ emitValue(files)
+ }
- removeFile (file) {
- const index = this.innerValue.findIndex(file)
+ function removeFile (file) {
+ const index = innerValue.value.findIndex(file)
if (index > -1) {
- this.removeAtIndex(index)
+ removeAtIndex(index)
}
- },
+ }
- __emitValue (files) {
- this.$emit('update:modelValue', this.multiple === true ? files : files[ 0 ])
- },
+ function emitValue (files) {
+ emit('update:modelValue', props.multiple === true ? files : files[ 0 ])
+ }
- __onKeyup (e) {
+ function onKeyup (e) {
// only on ENTER
- e.keyCode === 13 && this.pickFiles(e)
- },
+ e.keyCode === 13 && pickFiles(e)
+ }
- __getFileInput () {
- return this.$refs.input
- },
+ function getFileInput () {
+ return inputRef.value
+ }
- __addFiles (e, fileList) {
- const files = this.__processFiles(e, fileList, this.innerValue, this.isAppending)
+ function addFilesToQueue (e, fileList) {
+ const files = processFiles(e, fileList, innerValue.value, isAppending.value)
- files !== void 0 && this.__emitValue(
- this.isAppending === true
- ? this.innerValue.concat(files)
+ files !== void 0 && emitValue(
+ isAppending.value === true
+ ? innerValue.value.concat(files)
: files
)
- },
+ }
- __getSelection () {
- if (this.$slots.file !== void 0) {
- return this.innerValue.map((file, index) => this.$slots.file({ index, file, ref: this }))
+ function getSelection () {
+ if (slots.file !== void 0) {
+ return innerValue.value.map(
+ (file, index) => slots.file({ index, file, ref: this })
+ )
}
- if (this.$slots.selected !== void 0) {
- return this.$slots.selected({ files: this.innerValue, ref: this })
+ if (slots.selected !== void 0) {
+ return slots.selected({ files: innerValue.value, ref: this })
}
- if (this.useChips === true) {
- return this.innerValue.map((file, i) => h(QChip, {
+ if (props.useChips === true) {
+ return innerValue.value.map((file, i) => h(QChip, {
key: 'file-' + i,
- removable: this.editable,
+ removable: state.editable.value,
dense: true,
- textColor: this.color,
- tabindex: this.tabindex,
- onRemove: () => { this.removeAtIndex(i) }
+ textColor: props.color,
+ tabindex: props.tabindex,
+ onRemove: () => { removeAtIndex(i) }
}, () => h('span', {
class: 'ellipsis',
textContent: file.name
@@ -162,56 +166,76 @@ export default defineComponent({
return [
h('div', {
- class: this.inputClass,
- style: this.inputStyle,
- textContent: this.displayValue !== void 0
- ? this.displayValue
- : this.selectedString
+ class: props.inputClass,
+ style: props.inputStyle,
+ textContent: props.displayValue !== void 0
+ ? props.displayValue
+ : selectedString.value
})
]
- },
+ }
- __getInput () {
+ function getInput () {
const data = {
- ref: 'input',
+ ref: inputRef,
class: 'q-field__input fit absolute-full cursor-pointer',
- ...this.inputAttrs,
- ...this.formDomProps,
- onChange: this.__addFiles
+ ...inputAttrs.value,
+ ...formDomProps.value,
+ onChange: addFilesToQueue
}
- if (this.multiple === true) {
+ if (props.multiple === true) {
data.multiple = true
}
return h('input', data)
}
- },
- created () {
- Object.assign(this.field, {
- getControlChild: () => this.__getDnd('file'), // getDndNode
+ Object.assign(state, {
+ fieldClass: { value: 'q-file q-field--auto-height' },
+ emitValue,
+ hasValue,
+ inputRef,
+ innerValue,
+
+ floatingLabel: computed(() =>
+ hasValue.value === true ||
+ fieldValueIsFilled(props.displayValue)
+ ),
+
+ computedCounter: computed(() => {
+ if (props.counterLabel !== void 0) {
+ return props.counterLabel(counterProps.value)
+ }
+
+ const max = props.maxFiles
+ return `${innerValue.value.length}${max !== void 0 ? ' / ' + max : ''} (${totalSize.value})`
+ }),
+
+ getControlChild: () => getDndNode('file'),
getControl: () => {
const data = {
- ref: 'target',
+ ref: state.targetRef,
class: 'q-field__native row items-center cursor-pointer',
- tabindex: this.tabindex
+ tabindex: props.tabindex
}
- if (this.editable === true) {
- data.onDragover = this.__onDragOver
- data.onKeyup = this.__onKeyup
+ if (state.editable.value === true) {
+ Object.assign(data, { onDragover, onKeyup })
}
- return h('div', data, [this.__getInput()].concat(this.__getSelection()))
+ return h('div', data, [getInput()].concat(getSelection()))
}
})
- // necessary for QField's clearable
- // and FileValueMixin
- this.type = 'file'
- },
+ // expose public methods
+ const vm = getCurrentInstance()
+ Object.assign(vm.proxy, {
+ addFiles,
+ removeAtIndex,
+ removeFile
+ })
- // TODO vue3 - render() required for SSR explicitly even though declared in mixin
- render: QField.render
+ return useField({ props, slots, emit, attrs, $q, state })
+ }
})
diff --git a/ui/src/components/file/QFile.json b/ui/src/components/file/QFile.json
index 13ac7ac10ed..6f20b750441 100644
--- a/ui/src/components/file/QFile.json
+++ b/ui/src/components/file/QFile.json
@@ -1,5 +1,5 @@
{
- "mixins": [ "components/field/__QField", "composables/private/use-file", "composables/private/use-form" ],
+ "mixins": [ "composables/private/use-field", "composables/private/use-file", "composables/private/use-form" ],
"meta": {
"docsUrl": "https://v2.quasar.dev/vue-components/file"
diff --git a/ui/src/components/footer/QFooter.js b/ui/src/components/footer/QFooter.js
index 449541dd2b3..be2666b0baf 100644
--- a/ui/src/components/footer/QFooter.js
+++ b/ui/src/components/footer/QFooter.js
@@ -30,27 +30,27 @@ export default defineComponent({
setup (props, { slots, emit }) {
const $q = useQuasar()
- const layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, () => {
console.error('QFooter needs to be child of QLayout')
})
const size = ref(parseInt(props.heightHint, 10))
const revealed = ref(true)
const windowHeight = ref(
- isRuntimeSsrPreHydration === true || layout.container === true
+ isRuntimeSsrPreHydration === true || $layout.container === true
? 0
: window.innerHeight
)
const fixed = computed(() =>
props.reveal === true ||
- layout.view.indexOf('F') > -1 ||
- layout.container === true
+ $layout.view.indexOf('F') > -1 ||
+ $layout.container === true
)
const containerHeight = computed(() =>
- layout.container === true
- ? layout.containerHeight.value
+ $layout.container === true
+ ? $layout.containerHeight.value
: windowHeight.value
)
@@ -61,7 +61,7 @@ export default defineComponent({
if (fixed.value === true) {
return revealed.value === true ? size.value : 0
}
- const offset = layout.scroll.value.position + containerHeight.value + size.value - layout.height.value
+ const offset = $layout.scroll.value.position + containerHeight.value + size.value - $layout.height.value
return offset > 0 ? offset : 0
})
@@ -87,14 +87,14 @@ export default defineComponent({
const style = computed(() => {
const
- view = layout.rows.value.bottom,
+ view = $layout.rows.value.bottom,
css = {}
- if (view[ 0 ] === 'l' && layout.left.space === true) {
- css[ $q.lang.rtl === true ? 'right' : 'left' ] = `${layout.left.size}px`
+ if (view[ 0 ] === 'l' && $layout.left.space === true) {
+ css[ $q.lang.rtl === true ? 'right' : 'left' ] = `${$layout.left.size}px`
}
- if (view[ 2 ] === 'r' && layout.right.space === true) {
- css[ $q.lang.rtl === true ? 'left' : 'right' ] = `${layout.right.size}px`
+ if (view[ 2 ] === 'r' && $layout.right.space === true) {
+ css[ $q.lang.rtl === true ? 'left' : 'right' ] = `${$layout.right.size}px`
}
return css
@@ -104,8 +104,8 @@ export default defineComponent({
// ensure state update is caught correctly by Vue diffing
// on all layout components, so nextTicking:
nextTick(() => {
- if (layout.footer[ prop ] !== val) {
- layout.footer[ prop ] = val
+ if ($layout.footer[ prop ] !== val) {
+ $layout.footer[ prop ] = val
}
})
}
@@ -124,12 +124,12 @@ export default defineComponent({
function updateRevealed () {
if (props.reveal !== true) { return }
- const { direction, position, inflexionPosition } = layout.scroll.value
+ const { direction, position, inflexionPosition } = $layout.scroll.value
updateLocal(revealed, (
direction === 'up' ||
position - inflexionPosition < 100 ||
- layout.height.value - containerHeight.value - position - size.value < 300
+ $layout.height.value - containerHeight.value - position - size.value < 300
))
}
@@ -144,7 +144,7 @@ export default defineComponent({
watch(() => props.modelValue, val => {
updateLayout('space', val)
updateLocal(revealed, true)
- layout.animate()
+ $layout.animate()
})
watch(offset, val => {
@@ -156,26 +156,26 @@ export default defineComponent({
})
watch(revealed, val => {
- layout.animate()
+ $layout.animate()
emit('reveal', val)
})
- watch([ size, layout.scroll, layout.height ], updateRevealed)
+ watch([ size, $layout.scroll, $layout.height ], updateRevealed)
watch(() => $q.screen.height, val => {
- layout.container !== true && updateLocal(windowHeight, val)
+ $layout.container !== true && updateLocal(windowHeight, val)
})
const instance = {}
- layout.instances.footer = instance
+ $layout.instances.footer = instance
props.modelValue === true && updateLayout('size', size.value)
updateLayout('space', props.modelValue)
updateLayout('offset', offset.value)
onBeforeUnmount(() => {
- if (layout.instances.footer === instance) {
- layout.instances.footer = void 0
+ if ($layout.instances.footer === instance) {
+ $layout.instances.footer = void 0
updateLayout('size', 0)
updateLayout('offset', 0)
updateLayout('space', false)
diff --git a/ui/src/components/header/QHeader.js b/ui/src/components/header/QHeader.js
index 59c6ade507a..134c789c4fd 100644
--- a/ui/src/components/header/QHeader.js
+++ b/ui/src/components/header/QHeader.js
@@ -32,7 +32,7 @@ export default defineComponent({
setup (props, { slots, emit }) {
const $q = useQuasar()
- const layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, () => {
console.error('QHeader needs to be child of QLayout')
})
@@ -41,8 +41,8 @@ export default defineComponent({
const fixed = computed(() =>
props.reveal === true ||
- layout.view.indexOf('H') > -1 ||
- layout.container === true
+ $layout.view.indexOf('H') > -1 ||
+ $layout.container === true
)
const offset = computed(() => {
@@ -52,7 +52,7 @@ export default defineComponent({
if (fixed.value === true) {
return revealed.value === true ? size.value : 0
}
- const offset = size.value - layout.scroll.value.position
+ const offset = size.value - $layout.scroll.value.position
return offset > 0 ? offset : 0
})
@@ -74,14 +74,14 @@ export default defineComponent({
const style = computed(() => {
const
- view = layout.rows.value.top,
+ view = $layout.rows.value.top,
css = {}
- if (view[ 0 ] === 'l' && layout.left.space === true) {
- css[ $q.lang.rtl === true ? 'right' : 'left' ] = `${layout.left.size}px`
+ if (view[ 0 ] === 'l' && $layout.left.space === true) {
+ css[ $q.lang.rtl === true ? 'right' : 'left' ] = `${$layout.left.size}px`
}
- if (view[ 2 ] === 'r' && layout.right.space === true) {
- css[ $q.lang.rtl === true ? 'left' : 'right' ] = `${layout.right.size}px`
+ if (view[ 2 ] === 'r' && $layout.right.space === true) {
+ css[ $q.lang.rtl === true ? 'left' : 'right' ] = `${$layout.right.size}px`
}
return css
@@ -91,8 +91,8 @@ export default defineComponent({
// ensure state update is caught correctly by Vue diffing
// on all layout components, so nextTicking:
nextTick(() => {
- if (layout.header[ prop ] !== val) {
- layout.header[ prop ] = val
+ if ($layout.header[ prop ] !== val) {
+ $layout.header[ prop ] = val
}
})
}
@@ -119,7 +119,7 @@ export default defineComponent({
watch(() => props.modelValue, val => {
updateLayout('space', val)
updateLocal(revealed, true)
- layout.animate()
+ $layout.animate()
})
watch(offset, val => {
@@ -131,11 +131,11 @@ export default defineComponent({
})
watch(revealed, val => {
- layout.animate()
+ $layout.animate()
emit('reveal', val)
})
- watch(layout.scroll, scroll => {
+ watch($layout.scroll, scroll => {
props.reveal === true && updateLocal(revealed,
scroll.direction === 'up' ||
scroll.position <= props.revealOffset ||
@@ -145,14 +145,14 @@ export default defineComponent({
const instance = {}
- layout.instances.header = instance
+ $layout.instances.header = instance
props.modelValue === true && updateLayout('size', size.value)
updateLayout('space', props.modelValue)
updateLayout('offset', offset.value)
onBeforeUnmount(() => {
- if (layout.instances.header === instance) {
- layout.instances.header = void 0
+ if ($layout.instances.header === instance) {
+ $layout.instances.header = void 0
updateLayout('size', 0)
updateLayout('offset', 0)
updateLayout('space', false)
diff --git a/ui/src/components/input/QInput.js b/ui/src/components/input/QInput.js
index 319975a8e33..4c77f1c7182 100644
--- a/ui/src/components/input/QInput.js
+++ b/ui/src/components/input/QInput.js
@@ -1,11 +1,11 @@
-import { h, defineComponent } from 'vue'
+import { h, defineComponent, ref, computed, watch, onBeforeUnmount, onMounted, nextTick } from 'vue'
-import QField from '../field/QField.js'
-
-import { FormFieldMixin } from '../../mixins/form.js'
-import { FileValueMixin } from '../../mixins/file.js'
-import MaskMixin from '../../mixins/mask.js'
-import CompositionMixin from '../../mixins/composition.js'
+import useQuasar from '../../composables/use-quasar.js'
+import useField, { useFieldState, useFieldProps, useFieldEmits, fieldValueIsFilled } from '../../composables/private/use-field.js'
+import useMask, { useMaskProps } from './use-mask.js'
+import { useFormProps, useFormInputNameAttr } from '../../composables/private/use-form.js'
+import useFileFormDomProps from '../../composables/private/use-file-dom-props.js'
+import useKeyComposition from '../../composables/private/use-key-composition.js'
import { stop } from '../../utils/event.js'
@@ -14,15 +14,11 @@ export default defineComponent({
inheritAttrs: false,
- mixins: [
- QField,
- MaskMixin,
- CompositionMixin,
- FormFieldMixin,
- FileValueMixin
- ],
-
props: {
+ ...useFieldProps,
+ ...useMaskProps,
+ ...useFormProps,
+
modelValue: { required: false },
shadowText: String,
@@ -40,216 +36,223 @@ export default defineComponent({
inputStyle: [ Array, String, Object ]
},
- emits: [ 'paste', 'change' ],
+ emits: [
+ ...useFieldEmits,
+ 'paste', 'change'
+ ],
- watch: {
- modelValue (v) {
- if (this.hasMask === true) {
- if (this.stopValueWatcher === true) {
- this.stopValueWatcher = false
- return
- }
+ setup (props, { slots, emit, attrs }) {
+ const $q = useQuasar()
- this.__updateMaskValue(v)
- }
- else if (this.innerValue !== v) {
- this.innerValue = v
+ const temp = {}
+ let emitCachedValue = NaN, typedNumber, stopValueWatcher, emitTimer, emitValueFn
- if (
- this.type === 'number' &&
- this.temp.hasOwnProperty('value') === true
- ) {
- if (this.typedNumber === true) {
- this.typedNumber = false
- }
- else {
- delete this.temp.value
- }
- }
- }
+ const inputRef = ref(null)
+ const nameProp = useFormInputNameAttr(props)
- // textarea only
- this.autogrow === true && this.$nextTick(this.__adjustHeight)
- },
+ const {
+ innerValue,
+ hasMask,
+ moveCursorForPaste,
+ updateMaskValue,
+ onMaskedKeydown
+ } = useMask(props, emit, emitValue, inputRef)
- autogrow (autogrow) {
- // textarea only
- if (autogrow === true) {
- this.$nextTick(this.__adjustHeight)
- }
- // if it has a number of rows set respect it
- else if (this.$refs.input && this.$attrs.rows > 0) {
- this.$refs.input.style.height = 'auto'
- }
- },
+ const formDomProps = useFileFormDomProps(props, /* type guard */ true)
+ const hasValue = computed(() => fieldValueIsFilled(innerValue.value))
- dense () {
- this.autogrow === true && this.$nextTick(this.__adjustHeight)
- }
- },
+ const { onComposition } = useKeyComposition(onInput)
- data () {
- return { innerValue: this.__getInitialMaskedValue() }
- },
-
- computed: {
- isTextarea () {
- return this.type === 'textarea' || this.autogrow === true
- },
+ const state = useFieldState(props, attrs)
- fieldClass () {
- return `q-${this.isTextarea === true ? 'textarea' : 'input'}` +
- (this.autogrow === true ? ' q-textarea--autogrow' : '')
- },
-
- hasShadow () {
- return this.type !== 'file' &&
- typeof this.shadowText === 'string' &&
- this.shadowText.length > 0
- },
+ const isTextarea = computed(() =>
+ props.type === 'textarea' || props.autogrow === true
+ )
- onEvents () {
+ const onEvents = computed(() => {
const evt = {
- ...this.qListeners,
- onInput: this.__onInput,
- onPaste: this.__onPaste,
+ ...state.qListeners.value,
+ onInput,
+ onPaste,
// Safari < 10.2 & UIWebView doesn't fire compositionend when
// switching focus before confirming composition choice
// this also fixes the issue where some browsers e.g. iOS Chrome
// fires "change" instead of "input" on autocomplete.
- onChange: this.__onChange,
- onBlur: this.__onFinishEditing,
+ onChange,
+ onBlur: onFinishEditing,
onFocus: stop
}
- evt.onCompositionstart = evt.onCompositionupdate = evt.onCompositionend = this.__onComposition
+ evt.onCompositionstart = evt.onCompositionupdate = evt.onCompositionend = onComposition
- if (this.hasMask === true) {
- evt.onKeydown = this.__onMaskedKeydown
+ if (hasMask.value === true) {
+ evt.onKeydown = onMaskedKeydown
}
- if (this.autogrow === true) {
- evt.onAnimationend = this.__adjustHeight
+ if (props.autogrow === true) {
+ evt.onAnimationend = adjustHeight
}
return evt
- },
+ })
- inputAttrs () {
+ const inputAttrs = computed(() => {
const attrs = {
tabindex: 0,
- 'data-autofocus': this.autofocus,
- rows: this.type === 'textarea' ? 6 : void 0,
- 'aria-label': this.label,
- name: this.nameProp,
- ...this.qAttrs,
- id: this.targetUid,
- maxlength: this.maxlength,
- disabled: this.disable === true,
- readonly: this.readonly === true
+ 'data-autofocus': props.autofocus,
+ rows: props.type === 'textarea' ? 6 : void 0,
+ 'aria-label': props.label,
+ name: nameProp.value,
+ ...state.qAttrs.value,
+ id: state.targetUid.value,
+ maxlength: props.maxlength,
+ disabled: props.disable === true,
+ readonly: props.readonly === true
}
- if (this.isTextarea === false) {
- attrs.type = this.type
+ if (isTextarea.value === false) {
+ attrs.type = props.type
}
- if (this.autogrow === true) {
+ if (props.autogrow === true) {
attrs.rows = 1
}
return attrs
- }
- },
+ })
- methods: {
- focus () {
+ watch(() => props.modelValue, v => {
+ if (hasMask.value === true) {
+ if (stopValueWatcher === true) {
+ stopValueWatcher = false
+ return
+ }
+
+ updateMaskValue(v)
+ }
+ else if (innerValue.value !== v) {
+ innerValue.value = v
+
+ if (
+ props.type === 'number' &&
+ temp.hasOwnProperty('value') === true
+ ) {
+ if (typedNumber === true) {
+ typedNumber = false
+ }
+ else {
+ delete temp.value
+ }
+ }
+ }
+
+ // textarea only
+ props.autogrow === true && nextTick(adjustHeight)
+ })
+
+ watch(() => props.autogrow, val => {
+ // textarea only
+ if (val === true) {
+ nextTick(adjustHeight)
+ }
+ // if it has a number of rows set respect it
+ else if (inputRef.value !== null && attrs.rows > 0) {
+ inputRef.value.style.height = 'auto'
+ }
+ })
+
+ watch(() => props.dense, () => {
+ props.autogrow === true && nextTick(adjustHeight)
+ })
+
+ function focus () {
const el = document.activeElement
if (
- this.$refs.input &&
- this.$refs.input !== el &&
+ inputRef.value &&
+ inputRef.value !== el &&
// IE can have null document.activeElement
- (el === null || el.id !== this.targetUid)
+ (el === null || el.id !== state.targetUid.value)
) {
- this.$refs.input.focus()
+ inputRef.value.focus()
}
- },
+ }
- select () {
- this.$refs.input && this.$refs.input.select()
- },
+ function select () {
+ inputRef.value && inputRef.value.select()
+ }
- __onPaste (e) {
- if (this.hasMask === true && this.reverseFillMask !== true) {
+ function onPaste (e) {
+ if (hasMask.value === true && props.reverseFillMask !== true) {
const inp = e.target
- this.__moveCursorForPaste(inp, inp.selectionStart, inp.selectionEnd)
+ moveCursorForPaste(inp, inp.selectionStart, inp.selectionEnd)
}
- this.$emit('paste', e)
- },
+ emit('paste', e)
+ }
- __onInput (e) {
+ function onInput (e) {
if (e && e.target && e.target.composing === true) {
return
}
- if (this.type === 'file') {
- this.$emit('update:modelValue', e.target.files)
+ if (props.type === 'file') {
+ emit('update:modelValue', e.target.files)
return
}
const val = e.target.value
- if (this.hasMask === true) {
- this.__updateMaskValue(val, false, e.inputType)
+ if (hasMask.value === true) {
+ updateMaskValue(val, false, e.inputType)
}
else {
- this.__emitValue(val)
+ emitValue(val)
}
// we need to trigger it immediately too,
// to avoid "flickering"
- this.autogrow === true && this.__adjustHeight()
- },
+ props.autogrow === true && adjustHeight()
+ }
- __emitValue (val, stopWatcher) {
- this.emitValueFn = () => {
+ function emitValue (val, stopWatcher) {
+ emitValueFn = () => {
if (
- this.type !== 'number' &&
- this.temp.hasOwnProperty('value') === true
+ props.type !== 'number' &&
+ temp.hasOwnProperty('value') === true
) {
- delete this.temp.value
+ delete temp.value
}
- if (this.modelValue !== val && this.emitCachedValue !== val) {
- stopWatcher === true && (this.stopValueWatcher = true)
- this.$emit('update:modelValue', val)
+ if (props.modelValue !== val && emitCachedValue !== val) {
+ stopWatcher === true && (stopValueWatcher = true)
+ emit('update:modelValue', val)
- this.$nextTick(() => {
- this.emitCachedValue === val && (this.emitCachedValue = NaN)
+ nextTick(() => {
+ emitCachedValue === val && (emitCachedValue = NaN)
})
}
- this.emitValueFn = void 0
+ emitValueFn = void 0
}
- if (this.type === 'number') {
- this.typedNumber = true
- this.temp.value = val
+ if (props.type === 'number') {
+ typedNumber = true
+ temp.value = val
}
- if (this.debounce !== void 0) {
- clearTimeout(this.emitTimer)
- this.temp.value = val
- this.emitTimer = setTimeout(this.emitValueFn, this.debounce)
+ if (props.debounce !== void 0) {
+ clearTimeout(emitTimer)
+ temp.value = val
+ emitTimer = setTimeout(emitValueFn, props.debounce)
}
else {
- this.emitValueFn()
+ emitValueFn()
}
- },
+ }
// textarea only
- __adjustHeight () {
- const inp = this.$refs.input
+ function adjustHeight () {
+ const inp = inputRef.value
if (inp) {
const parentStyle = inp.parentNode.style
@@ -261,62 +264,90 @@ export default defineComponent({
inp.style.height = inp.scrollHeight + 'px'
parentStyle.marginBottom = ''
}
- },
+ }
- __onChange (e) {
- this.__onComposition(e)
+ function onChange (e) {
+ onComposition(e)
- clearTimeout(this.emitTimer)
- this.emitValueFn !== void 0 && this.emitValueFn()
+ clearTimeout(emitTimer)
+ emitValueFn !== void 0 && emitValueFn()
- this.$emit('change', e.target.value)
- },
+ emit('change', e.target.value)
+ }
- __onFinishEditing (e) {
+ function onFinishEditing (e) {
e !== void 0 && stop(e)
- clearTimeout(this.emitTimer)
- this.emitValueFn !== void 0 && this.emitValueFn()
+ clearTimeout(emitTimer)
+ emitValueFn !== void 0 && emitValueFn()
- this.typedNumber = false
- this.stopValueWatcher = false
- delete this.temp.value
+ typedNumber = false
+ stopValueWatcher = false
+ delete temp.value
// we need to use setTimeout instead of this.$nextTick
// to avoid a bug where focusout is not emitted for type date/time/week/...
- this.type !== 'file' && setTimeout(() => {
- if (this.$refs.input) {
- this.$refs.input.value = this.innerValue !== void 0 ? this.innerValue : ''
+ props.type !== 'file' && setTimeout(() => {
+ if (inputRef.value) {
+ inputRef.value.value = innerValue.value !== void 0 ? innerValue.value : ''
}
})
- },
+ }
- __getCurValue () {
- return this.temp.hasOwnProperty('value') === true
- ? this.temp.value
- : (this.innerValue !== void 0 ? this.innerValue : '')
+ function getCurValue () {
+ return temp.hasOwnProperty('value') === true
+ ? temp.value
+ : (innerValue.value !== void 0 ? innerValue.value : '')
}
- },
- created () {
- this.temp = {}
- this.emitCachedValue = NaN
+ onBeforeUnmount(() => {
+ onFinishEditing()
+ })
+
+ onMounted(() => {
+ // textarea only
+ props.autogrow === true && adjustHeight()
+ })
+
+ Object.assign(state, {
+ innerValue,
+
+ fieldClass: computed(() =>
+ `q-${isTextarea.value === true ? 'textarea' : 'input'}` +
+ (props.autogrow === true ? ' q-textarea--autogrow' : '')
+ ),
+
+ hasShadow: computed(() =>
+ props.type !== 'file' &&
+ typeof props.shadowText === 'string' &&
+ props.shadowText.length > 0
+ ),
+
+ inputRef,
+
+ emitValue,
+
+ hasValue,
+
+ floatingLabel: computed(() =>
+ hasValue.value === true ||
+ fieldValueIsFilled(props.displayValue)
+ ),
- Object.assign(this.field, {
getControl: () => {
- return h(this.isTextarea === true ? 'textarea' : 'input', {
- ref: 'input',
+ return h(isTextarea.value === true ? 'textarea' : 'input', {
+ ref: inputRef,
class: [
'q-field__native q-placeholder',
- this.inputClass
+ props.inputClass
],
- style: this.inputStyle,
- ...this.inputAttrs,
- ...this.onEvents,
+ style: props.inputStyle,
+ ...inputAttrs.value,
+ ...onEvents.value,
...(
- this.type !== 'file'
- ? { value: this.__getCurValue() }
- : this.formDomProps
+ props.type !== 'file'
+ ? { value: getCurValue() }
+ : formDomProps.value
)
})
},
@@ -324,24 +355,14 @@ export default defineComponent({
getShadowControl: () => {
return h('div', {
class: 'q-field__native q-field__shadow absolute-bottom no-pointer-events' +
- (this.isTextarea === true ? '' : ' text-no-wrap')
+ (isTextarea.value === true ? '' : ' text-no-wrap')
}, [
- h('span', { class: 'invisible' }, this.__getCurValue()),
- h('span', this.shadowText)
+ h('span', { class: 'invisible' }, getCurValue()),
+ h('span', props.shadowText)
])
}
})
- },
-
- mounted () {
- // textarea only
- this.autogrow === true && this.__adjustHeight()
- },
-
- beforeUnmount () {
- this.__onFinishEditing()
- },
- // TODO vue3 - render() required for SSR explicitly even though declared in mixin
- render: QField.render
+ return useField({ props, slots, emit, attrs, $q, state })
+ }
})
diff --git a/ui/src/components/input/QInput.json b/ui/src/components/input/QInput.json
index d6a98ead60d..a907d1dad88 100644
--- a/ui/src/components/input/QInput.json
+++ b/ui/src/components/input/QInput.json
@@ -1,5 +1,5 @@
{
- "mixins": [ "components/field/__QField", "mixins/mask", "composables/private/use-form" ],
+ "mixins": [ "composables/private/use-field", "components/input/use-mask", "composables/private/use-form" ],
"meta": {
"docsUrl": "https://v2.quasar.dev/vue-components/input"
diff --git a/ui/src/components/input/use-mask.js b/ui/src/components/input/use-mask.js
new file mode 100644
index 00000000000..cdc2b334547
--- /dev/null
+++ b/ui/src/components/input/use-mask.js
@@ -0,0 +1,530 @@
+import { ref, watch } from 'vue'
+
+import { shouldIgnoreKey } from '../../utils/key-composition.js'
+
+// leave NAMED_MASKS at top of file (code referenced from docs)
+const NAMED_MASKS = {
+ date: '####/##/##',
+ datetime: '####/##/## ##:##',
+ time: '##:##',
+ fulltime: '##:##:##',
+ phone: '(###) ### - ####',
+ card: '#### #### #### ####'
+}
+
+const TOKENS = {
+ '#': { pattern: '[\\d]', negate: '[^\\d]' },
+
+ S: { pattern: '[a-zA-Z]', negate: '[^a-zA-Z]' },
+ N: { pattern: '[0-9a-zA-Z]', negate: '[^0-9a-zA-Z]' },
+
+ A: { pattern: '[a-zA-Z]', negate: '[^a-zA-Z]', transform: v => v.toLocaleUpperCase() },
+ a: { pattern: '[a-zA-Z]', negate: '[^a-zA-Z]', transform: v => v.toLocaleLowerCase() },
+
+ X: { pattern: '[0-9a-zA-Z]', negate: '[^0-9a-zA-Z]', transform: v => v.toLocaleUpperCase() },
+ x: { pattern: '[0-9a-zA-Z]', negate: '[^0-9a-zA-Z]', transform: v => v.toLocaleLowerCase() }
+}
+
+const KEYS = Object.keys(TOKENS)
+KEYS.forEach(key => {
+ TOKENS[ key ].regex = new RegExp(TOKENS[ key ].pattern)
+})
+
+const
+ tokenRegexMask = new RegExp('\\\\([^.*+?^${}()|([\\]])|([.*+?^${}()|[\\]])|([' + KEYS.join('') + '])|(.)', 'g'),
+ escRegex = /[.*+?^${}()|[\]\\]/g
+
+const MARKER = String.fromCharCode(1)
+
+export const useMaskProps = {
+ mask: String,
+ reverseFillMask: Boolean,
+ fillMask: [ Boolean, String ],
+ unmaskedValue: Boolean
+}
+
+export default function (props, emit, emitValue, inputRef) {
+ let maskMarked, maskReplaced, computedMask, computedUnmask
+
+ const hasMask = ref(null)
+ const innerValue = ref(getInitialMaskedValue())
+
+ watch(() => props.type, updateMaskInternals)
+
+ watch(() => props.mask, v => {
+ if (v !== void 0) {
+ updateMaskValue(innerValue.value, true)
+ }
+ else {
+ const val = unmaskValue(innerValue.value)
+ updateMaskInternals()
+ props.modelValue !== val && emit('update:modelValue', val)
+ }
+ })
+
+ watch(() => props.fillMask + props.reverseFillMask, () => {
+ hasMask.value === true && updateMaskValue(innerValue.value, true)
+ })
+
+ watch(() => props.unmaskedValue, () => {
+ hasMask.value === true && updateMaskValue(innerValue.value)
+ })
+
+ function getInitialMaskedValue () {
+ updateMaskInternals()
+
+ if (hasMask.value === true) {
+ const masked = maskValue(unmaskValue(props.modelValue))
+
+ return props.fillMask !== false
+ ? fillWithMask(masked)
+ : masked
+ }
+
+ return props.modelValue
+ }
+
+ function getPaddedMaskMarked (size) {
+ if (size < maskMarked.length) {
+ return maskMarked.slice(-size)
+ }
+
+ let pad = '', localMaskMarked = maskMarked
+ const padPos = localMaskMarked.indexOf(MARKER)
+
+ if (padPos > -1) {
+ for (let i = size - localMaskMarked.length; i > 0; i--) {
+ pad += MARKER
+ }
+
+ localMaskMarked = localMaskMarked.slice(0, padPos) + pad + localMaskMarked.slice(padPos)
+ }
+
+ return localMaskMarked
+ }
+
+ function updateMaskInternals () {
+ hasMask.value = props.mask !== void 0 &&
+ props.mask.length > 0 &&
+ [ 'text', 'search', 'url', 'tel', 'password' ].includes(props.type)
+
+ if (hasMask.value === false) {
+ computedUnmask = void 0
+ maskMarked = ''
+ maskReplaced = ''
+ return
+ }
+
+ const
+ localComputedMask = NAMED_MASKS[ props.mask ] === void 0
+ ? props.mask
+ : NAMED_MASKS[ props.mask ],
+ fillChar = typeof props.fillMask === 'string' && props.fillMask.length > 0
+ ? props.fillMask.slice(0, 1)
+ : '_',
+ fillCharEscaped = fillChar.replace(escRegex, '\\$&'),
+ unmask = [],
+ extract = [],
+ mask = []
+
+ let
+ firstMatch = props.reverseFillMask === true,
+ unmaskChar = '',
+ negateChar = ''
+
+ localComputedMask.replace(tokenRegexMask, (_, char1, esc, token, char2) => {
+ if (token !== void 0) {
+ const c = TOKENS[ token ]
+ mask.push(c)
+ negateChar = c.negate
+ if (firstMatch === true) {
+ extract.push('(?:' + negateChar + '+)?(' + c.pattern + '+)?(?:' + negateChar + '+)?(' + c.pattern + '+)?')
+ firstMatch = false
+ }
+ extract.push('(?:' + negateChar + '+)?(' + c.pattern + ')?')
+ }
+ else if (esc !== void 0) {
+ unmaskChar = '\\' + (esc === '\\' ? '' : esc)
+ mask.push(esc)
+ unmask.push('([^' + unmaskChar + ']+)?' + unmaskChar + '?')
+ }
+ else {
+ const c = char1 !== void 0 ? char1 : char2
+ unmaskChar = c === '\\' ? '\\\\\\\\' : c.replace(escRegex, '\\\\$&')
+ mask.push(c)
+ unmask.push('([^' + unmaskChar + ']+)?' + unmaskChar + '?')
+ }
+ })
+
+ const
+ unmaskMatcher = new RegExp(
+ '^' +
+ unmask.join('') +
+ '(' + (unmaskChar === '' ? '.' : '[^' + unmaskChar + ']') + '+)?' +
+ '$'
+ ),
+ extractLast = extract.length - 1,
+ extractMatcher = extract.map((re, index) => {
+ if (index === 0 && props.reverseFillMask === true) {
+ return new RegExp('^' + fillCharEscaped + '*' + re)
+ }
+ else if (index === extractLast) {
+ return new RegExp(
+ '^' + re +
+ '(' + (negateChar === '' ? '.' : negateChar) + '+)?' +
+ (props.reverseFillMask === true ? '$' : fillCharEscaped + '*')
+ )
+ }
+
+ return new RegExp('^' + re)
+ })
+
+ computedMask = mask
+ computedUnmask = val => {
+ const unmaskMatch = unmaskMatcher.exec(val)
+ if (unmaskMatch !== null) {
+ val = unmaskMatch.slice(1).join('')
+ }
+
+ const
+ extractMatch = [],
+ extractMatcherLength = extractMatcher.length
+
+ for (let i = 0, str = val; i < extractMatcherLength; i++) {
+ const m = extractMatcher[ i ].exec(str)
+
+ if (m === null) {
+ break
+ }
+
+ str = str.slice(m.shift().length)
+ extractMatch.push(...m)
+ }
+ if (extractMatch.length > 0) {
+ return extractMatch.join('')
+ }
+
+ return val
+ }
+ maskMarked = mask.map(v => typeof v === 'string' ? v : MARKER).join('')
+ maskReplaced = maskMarked.split(MARKER).join(fillChar)
+ }
+
+ function updateMaskValue (rawVal, updateMaskInternalsFlag, inputType) {
+ const
+ inp = inputRef.value,
+ end = inp.selectionEnd,
+ endReverse = inp.value.length - end,
+ unmasked = unmaskValue(rawVal)
+
+ // Update here so unmask uses the original fillChar
+ updateMaskInternalsFlag === true && updateMaskInternals()
+
+ const
+ preMasked = maskValue(unmasked),
+ masked = props.fillMask !== false
+ ? fillWithMask(preMasked)
+ : preMasked,
+ changed = innerValue.value !== masked
+
+ // We want to avoid "flickering" so we set value immediately
+ inp.value !== masked && (inp.value = masked)
+
+ changed === true && (innerValue.value = masked)
+
+ document.activeElement === inp && nextTick(() => {
+ if (masked === maskReplaced) {
+ const cursor = props.reverseFillMask === true ? maskReplaced.length : 0
+ inp.setSelectionRange(cursor, cursor, 'forward')
+
+ return
+ }
+
+ if (inputType === 'insertFromPaste' && props.reverseFillMask !== true) {
+ const cursor = end - 1
+ moveCursor.right(inp, cursor, cursor)
+
+ return
+ }
+
+ if ([ 'deleteContentBackward', 'deleteContentForward' ].indexOf(inputType) > -1) {
+ const cursor = props.reverseFillMask === true
+ ? Math.max(0, masked.length - (masked === maskReplaced ? 0 : Math.min(preMasked.length, endReverse) + 1)) + 1
+ : end
+ inp.setSelectionRange(cursor, cursor, 'forward')
+
+ return
+ }
+
+ if (props.reverseFillMask === true) {
+ if (changed === true) {
+ const cursor = Math.max(0, masked.length - (masked === maskReplaced ? 0 : Math.min(preMasked.length, endReverse + 1)))
+ moveCursor.rightReverse(inp, cursor, cursor)
+ }
+ else {
+ const cursor = masked.length - endReverse
+ inp.setSelectionRange(cursor, cursor, 'backward')
+ }
+ }
+ else {
+ if (changed === true) {
+ const cursor = Math.max(0, maskMarked.indexOf(MARKER), Math.min(preMasked.length, end) - 1)
+ moveCursor.right(inp, cursor, cursor)
+ }
+ else {
+ const cursor = end - 1
+ moveCursor.right(inp, cursor, cursor)
+ }
+ }
+ })
+
+ const val = props.unmaskedValue === true
+ ? unmaskValue(masked)
+ : masked
+
+ props.modelValue !== val && emitValue(val, true)
+ }
+
+ function moveCursorForPaste (inp, start, end) {
+ const preMasked = maskValue(unmaskValue(inp.value))
+
+ start = Math.max(0, maskMarked.indexOf(MARKER), Math.min(preMasked.length, start))
+
+ inp.setSelectionRange(start, end, 'forward')
+ }
+
+ const moveCursor = {
+ left (inp, start, end, selection) {
+ const noMarkBefore = maskMarked.slice(start - 1).indexOf(MARKER) === -1
+ let i = Math.max(0, start - 1)
+
+ for (; i >= 0; i--) {
+ if (maskMarked[ i ] === MARKER) {
+ start = i
+ noMarkBefore === true && start++
+ break
+ }
+ }
+
+ if (
+ i < 0 &&
+ maskMarked[ start ] !== void 0 &&
+ maskMarked[ start ] !== MARKER
+ ) {
+ return moveCursor.right(inp, 0, 0)
+ }
+
+ start >= 0 && inp.setSelectionRange(
+ start,
+ selection === true ? end : start, 'backward'
+ )
+ },
+
+ right (inp, start, end, selection) {
+ const limit = inp.value.length
+ let i = Math.min(limit, end + 1)
+
+ for (; i <= limit; i++) {
+ if (maskMarked[ i ] === MARKER) {
+ end = i
+ break
+ }
+ else if (maskMarked[ i - 1 ] === MARKER) {
+ end = i
+ }
+ }
+
+ if (
+ i > limit &&
+ maskMarked[ end - 1 ] !== void 0 &&
+ maskMarked[ end - 1 ] !== MARKER
+ ) {
+ return moveCursor.left(inp, limit, limit)
+ }
+
+ inp.setSelectionRange(selection ? start : end, end, 'forward')
+ },
+
+ leftReverse (inp, start, end, selection) {
+ const
+ localMaskMarked = getPaddedMaskMarked(inp.value.length)
+ let i = Math.max(0, start - 1)
+
+ for (; i >= 0; i--) {
+ if (localMaskMarked[ i - 1 ] === MARKER) {
+ start = i
+ break
+ }
+ else if (localMaskMarked[ i ] === MARKER) {
+ start = i
+ if (i === 0) {
+ break
+ }
+ }
+ }
+
+ if (
+ i < 0 &&
+ localMaskMarked[ start ] !== void 0 &&
+ localMaskMarked[ start ] !== MARKER
+ ) {
+ return moveCursor.rightReverse(inp, 0, 0)
+ }
+
+ start >= 0 && inp.setSelectionRange(
+ start,
+ selection === true ? end : start, 'backward'
+ )
+ },
+
+ rightReverse (inp, start, end, selection) {
+ const
+ limit = inp.value.length,
+ localMaskMarked = getPaddedMaskMarked(limit),
+ noMarkBefore = localMaskMarked.slice(0, end + 1).indexOf(MARKER) === -1
+ let i = Math.min(limit, end + 1)
+
+ for (; i <= limit; i++) {
+ if (localMaskMarked[ i - 1 ] === MARKER) {
+ end = i
+ end > 0 && noMarkBefore === true && end--
+ break
+ }
+ }
+
+ if (
+ i > limit &&
+ localMaskMarked[ end - 1 ] !== void 0 &&
+ localMaskMarked[ end - 1 ] !== MARKER
+ ) {
+ return moveCursor.leftReverse(inp, limit, limit)
+ }
+
+ inp.setSelectionRange(selection === true ? start : end, end, 'forward')
+ }
+ }
+
+ function onMaskedKeydown (e) {
+ if (shouldIgnoreKey(e) === true) {
+ return
+ }
+
+ const
+ inp = inputRef.value,
+ start = inp.selectionStart,
+ end = inp.selectionEnd
+
+ if (e.keyCode === 37 || e.keyCode === 39) { // Left / Right
+ const fn = moveCursor[ (e.keyCode === 39 ? 'right' : 'left') + (props.reverseFillMask === true ? 'Reverse' : '') ]
+
+ e.preventDefault()
+ fn(inp, start, end, e.shiftKey)
+ }
+ else if (
+ e.keyCode === 8 && // Backspace
+ props.reverseFillMask !== true &&
+ start === end
+ ) {
+ moveCursor.left(inp, start, end, true)
+ }
+ else if (
+ e.keyCode === 46 && // Delete
+ props.reverseFillMask === true &&
+ start === end
+ ) {
+ moveCursor.rightReverse(inp, start, end, true)
+ }
+
+ emit('keydown', e)
+ }
+
+ function maskValue (val) {
+ if (val === void 0 || val === null || val === '') { return '' }
+
+ if (props.reverseFillMask === true) {
+ return maskValueReverse(val)
+ }
+
+ const mask = computedMask
+
+ let valIndex = 0, output = ''
+
+ for (let maskIndex = 0; maskIndex < mask.length; maskIndex++) {
+ const
+ valChar = val[ valIndex ],
+ maskDef = mask[ maskIndex ]
+
+ if (typeof maskDef === 'string') {
+ output += maskDef
+ valChar === maskDef && valIndex++
+ }
+ else if (valChar !== void 0 && maskDef.regex.test(valChar)) {
+ output += maskDef.transform !== void 0
+ ? maskDef.transform(valChar)
+ : valChar
+ valIndex++
+ }
+ else {
+ return output
+ }
+ }
+
+ return output
+ }
+
+ function maskValueReverse (val) {
+ const
+ mask = computedMask,
+ firstTokenIndex = maskMarked.indexOf(MARKER)
+
+ let valIndex = val.length - 1, output = ''
+
+ for (let maskIndex = mask.length - 1; maskIndex >= 0; maskIndex--) {
+ const maskDef = mask[ maskIndex ]
+
+ let valChar = val[ valIndex ]
+
+ if (typeof maskDef === 'string') {
+ output = maskDef + output
+ valChar === maskDef && valIndex--
+ }
+ else if (valChar !== void 0 && maskDef.regex.test(valChar)) {
+ do {
+ output = (maskDef.transform !== void 0 ? maskDef.transform(valChar) : valChar) + output
+ valIndex--
+ valChar = val[ valIndex ]
+ // eslint-disable-next-line no-unmodified-loop-condition
+ } while (firstTokenIndex === maskIndex && valChar !== void 0 && maskDef.regex.test(valChar))
+ }
+ else {
+ return output
+ }
+ }
+
+ return output
+ }
+
+ function unmaskValue (val) {
+ return typeof val !== 'string' || computedUnmask === void 0
+ ? (typeof val === 'number' ? computedUnmask('' + val) : val)
+ : computedUnmask(val)
+ }
+
+ function fillWithMask (val) {
+ if (maskReplaced.length - val.length <= 0) {
+ return val
+ }
+
+ return props.reverseFillMask === true && val.length > 0
+ ? maskReplaced.slice(0, -val.length) + val
+ : val + maskReplaced.slice(val.length)
+ }
+
+ return {
+ innerValue,
+ hasMask,
+ moveCursorForPaste,
+ updateMaskValue,
+ onMaskedKeydown
+ }
+}
diff --git a/ui/src/mixins/mask.json b/ui/src/components/input/use-mask.json
similarity index 100%
rename from ui/src/mixins/mask.json
rename to ui/src/components/input/use-mask.json
diff --git a/ui/src/components/page-scroller/QPageScroller.js b/ui/src/components/page-scroller/QPageScroller.js
index b210a16e8e7..96ab55b2b57 100644
--- a/ui/src/components/page-scroller/QPageScroller.js
+++ b/ui/src/components/page-scroller/QPageScroller.js
@@ -29,22 +29,22 @@ export default defineComponent({
emits: ['click'],
setup (props, { slots, emit }) {
- const { layout, getStickyContent } = usePageSticky(props)
+ const { $layout, getStickyContent } = usePageSticky(props)
const rootRef = ref(null)
let heightWatcher
function isVisible () {
return props.reverse === true
- ? props.height - layout.scroll.value.position > props.scrollOffset
- : layout.scroll.value.position > props.scrollOffset
+ ? props.height - $layout.scroll.value.position > props.scrollOffset
+ : $layout.scroll.value.position > props.scrollOffset
}
const showing = ref(isVisible())
- const height = computed(() => layout.container === true
- ? layout.containerHeight.value
- : layout.height.value
+ const height = computed(() => $layout.container === true
+ ? $layout.containerHeight.value
+ : $layout.height.value
)
function updateVisibility () {
@@ -65,7 +65,7 @@ export default defineComponent({
}
}
- watch(layout.scroll, updateVisibility)
+ watch($layout.scroll, updateVisibility)
watch(() => props.reverse, updateReverse)
function cleanup () {
@@ -76,13 +76,13 @@ export default defineComponent({
}
function onClick (e) {
- const target = layout.container === true
+ const target = $layout.container === true
? getScrollTarget(rootRef.value)
- : getScrollTarget(layout.rootRef.value)
+ : getScrollTarget($layout.rootRef.value)
setScrollPosition(
target,
- props.reverse === true ? layout.height.value : 0, props.duration
+ props.reverse === true ? $layout.height.value : 0, props.duration
)
emit('click', e)
diff --git a/ui/src/components/page-sticky/use-page-sticky.js b/ui/src/components/page-sticky/use-page-sticky.js
index 08dda6a3a83..56ecc671cdb 100644
--- a/ui/src/components/page-sticky/use-page-sticky.js
+++ b/ui/src/components/page-sticky/use-page-sticky.js
@@ -24,7 +24,7 @@ export const usePageStickyProps = {
export default function (props) {
const $q = useQuasar()
- const layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, () => {
console.error('QPageSticky needs to be child of QLayout')
})
@@ -41,10 +41,10 @@ export default function (props) {
}
})
- const top = computed(() => layout.header.offset)
- const right = computed(() => layout.right.offset)
- const bottom = computed(() => layout.footer.offset)
- const left = computed(() => layout.left.offset)
+ const top = computed(() => $layout.header.offset)
+ const right = computed(() => $layout.right.offset)
+ const bottom = computed(() => $layout.footer.offset)
+ const left = computed(() => $layout.left.offset)
const style = computed(() => {
let posX = 0, posY = 0
@@ -111,7 +111,7 @@ export default function (props) {
}
return {
- layout,
+ $layout,
getStickyContent
}
}
diff --git a/ui/src/components/page/QPage.js b/ui/src/components/page/QPage.js
index 35a27c9c737..832f6ee013a 100644
--- a/ui/src/components/page/QPage.js
+++ b/ui/src/components/page/QPage.js
@@ -16,27 +16,27 @@ export default defineComponent({
setup (props, { slots }) {
const $q = useQuasar()
- const layout = inject(layoutKey)
+ const $layout = inject(layoutKey)
inject(pageContainerKey, () => {
console.error('QPage needs to be child of QPageContainer')
})
const style = computed(() => {
const offset =
- (layout.header.space === true ? layout.header.size : 0) +
- (layout.footer.space === true ? layout.footer.size : 0)
+ ($layout.header.space === true ? $layout.header.size : 0) +
+ ($layout.footer.space === true ? $layout.footer.size : 0)
if (typeof props.styleFn === 'function') {
- const height = layout.container === true
- ? layout.containerHeight.value
+ const height = $layout.container === true
+ ? $layout.containerHeight.value
: $q.screen.height
return props.styleFn(offset, height)
}
return {
- minHeight: layout.container === true
- ? (layout.containerHeight.value - offset) + 'px'
+ minHeight: $layout.container === true
+ ? ($layout.containerHeight.value - offset) + 'px'
: (
$q.screen.height === 0
? `calc(100vh - ${offset}px)`
diff --git a/ui/src/components/page/QPageContainer.js b/ui/src/components/page/QPageContainer.js
index 7fd04c7451a..4f5ad25843f 100644
--- a/ui/src/components/page/QPageContainer.js
+++ b/ui/src/components/page/QPageContainer.js
@@ -11,7 +11,7 @@ export default defineComponent({
setup (props, { slots }) {
const $q = useQuasar()
- const layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, () => {
console.error('QPageContainer needs to be child of QLayout')
})
@@ -20,17 +20,17 @@ export default defineComponent({
const style = computed(() => {
const css = {}
- if (layout.header.space === true) {
- css.paddingTop = `${layout.header.size}px`
+ if ($layout.header.space === true) {
+ css.paddingTop = `${$layout.header.size}px`
}
- if (layout.right.space === true) {
- css[ `padding${$q.lang.rtl === true ? 'Left' : 'Right'}` ] = `${layout.right.size}px`
+ if ($layout.right.space === true) {
+ css[ `padding${$q.lang.rtl === true ? 'Left' : 'Right'}` ] = `${$layout.right.size}px`
}
- if (layout.footer.space === true) {
- css.paddingBottom = `${layout.footer.size}px`
+ if ($layout.footer.space === true) {
+ css.paddingBottom = `${$layout.footer.size}px`
}
- if (layout.left.space === true) {
- css[ `padding${$q.lang.rtl === true ? 'Right' : 'Left'}` ] = `${layout.left.size}px`
+ if ($layout.left.space === true) {
+ css[ `padding${$q.lang.rtl === true ? 'Right' : 'Left'}` ] = `${$layout.left.size}px`
}
return css
diff --git a/ui/src/components/select/QSelect.js b/ui/src/components/select/QSelect.js
index 66a81d0c38d..834d2387854 100755
--- a/ui/src/components/select/QSelect.js
+++ b/ui/src/components/select/QSelect.js
@@ -178,7 +178,7 @@ export default defineComponent({
: 0
},
- fieldClass () {
+ fieldClass () { // state.classes
return `q-select q-field--auto-height q-select--with${this.useInput !== true ? 'out' : ''}-input` +
` q-select--with${this.useChips !== true ? 'out' : ''}-chips` +
` q-select--${this.multiple === true ? 'multiple' : 'single'}`
@@ -422,7 +422,7 @@ export default defineComponent({
__removeAtIndexAndFocus (index) {
this.removeAtIndex(index)
- this.__focus()
+ localFocus()
},
add (opt, unique) {
@@ -486,7 +486,7 @@ export default defineComponent({
return
}
- (this.hasDialog !== true || this.dialogFieldFocused === true) && this.__focus()
+ (this.hasDialog !== true || this.dialogFieldFocused === true) && localFocus()
this.__selectInputText()
@@ -1002,7 +1002,7 @@ export default defineComponent({
this.focused !== true &&
(this.hasDialog !== true || this.dialogFieldFocused === true)
) {
- this.__focus()
+ localFocus()
}
if (this.emitListeners.onFilter === true) {
@@ -1311,11 +1311,11 @@ export default defineComponent({
this.__onControlFocusin(e)
this.dialog = true
this.$nextTick(() => {
- this.__focus()
+ localFocus()
})
}
else {
- this.__focus()
+ localFocus()
}
if (this.emitListeners.onFilter === true) {
diff --git a/ui/src/components/select/QSelect.json b/ui/src/components/select/QSelect.json
index b39aa17ac4d..b591765a6ad 100644
--- a/ui/src/components/select/QSelect.json
+++ b/ui/src/components/select/QSelect.json
@@ -1,5 +1,5 @@
{
- "mixins": [ "components/field/__QField", "components/virtual-scroll/use-virtual-scroll", "composables/private/use-form" ],
+ "mixins": [ "composables/private/use-field", "components/virtual-scroll/use-virtual-scroll", "composables/private/use-form" ],
"meta": {
"docsUrl": "https://v2.quasar.dev/vue-components/select"
diff --git a/ui/src/components/stepper/QStep.js b/ui/src/components/stepper/QStep.js
index e3196d25de9..f4696a6689f 100644
--- a/ui/src/components/stepper/QStep.js
+++ b/ui/src/components/stepper/QStep.js
@@ -50,18 +50,18 @@ export default defineComponent({
},
setup (props, { slots }) {
- const stepper = inject(stepperKey, () => {
+ const $stepper = inject(stepperKey, () => {
console.error('QStep needs to be child of QStepper')
})
const rootRef = ref(null)
- const isActive = computed(() => stepper.value.modelValue === props.name)
+ const isActive = computed(() => $stepper.value.modelValue === props.name)
watch(isActive, active => {
if (
active === true &&
- stepper.value.vertical === true
+ $stepper.value.vertical === true
) {
nextTick(() => {
if (rootRef.value !== void 0) {
@@ -72,8 +72,8 @@ export default defineComponent({
})
function getStepContent () {
- const vertical = stepper.value.vertical
- return vertical === true && stepper.value.keepAlive === true
+ const vertical = $stepper.value.vertical
+ return vertical === true && $stepper.value.keepAlive === true
? h(
KeepAlive,
isActive.value === true
@@ -90,15 +90,15 @@ export default defineComponent({
return () => h(
'div',
{ ref: rootRef, class: 'q-stepper__step' },
- stepper.value.vertical === true
+ $stepper.value.vertical === true
? [
h(StepHeader, {
- stepper: stepper.value,
+ stepper: $stepper.value,
step: props,
- goToPanel: stepper.value.goToPanel
+ goToPanel: $stepper.value.goToPanel
}),
- stepper.value.animated === true
+ $stepper.value.animated === true
? h(QSlideTransition, getStepContent)
: getStepContent()
]
diff --git a/ui/src/components/tabs/QRouteTab.js b/ui/src/components/tabs/QRouteTab.js
index e369c6349f9..06c0d82861a 100644
--- a/ui/src/components/tabs/QRouteTab.js
+++ b/ui/src/components/tabs/QRouteTab.js
@@ -19,10 +19,10 @@ export default defineComponent({
const { hasLink, linkTag, linkProps, linkRoute, navigateToLink, linkIsExactActive, linkIsActive } = useRouterLink(props, vm, attrs)
const exact = computed(() => props.exact)
- const { renderTab, tabs } = useTab(props, slots, emit, { exact, hasLink, navigateToLink, linkRoute, linkIsExactActive, linkIsActive })
+ const { renderTab, $tabs } = useTab(props, slots, emit, { exact, hasLink, navigateToLink, linkRoute, linkIsExactActive, linkIsActive })
watch(() => props.name + props.exact + (linkRoute.value || {}).href, () => {
- tabs.verifyRouteModel()
+ $tabs.verifyRouteModel()
})
return () => renderTab(linkTag.value, linkProps.value)
diff --git a/ui/src/components/tabs/use-tab.js b/ui/src/components/tabs/use-tab.js
index 066fff003a7..4db280e59c8 100644
--- a/ui/src/components/tabs/use-tab.js
+++ b/ui/src/components/tabs/use-tab.js
@@ -38,7 +38,7 @@ export const useTabProps = {
}
export default function (props, slots, emit, routerProps) {
- const tabs = inject(tabsKey, () => {
+ const $tabs = inject(tabsKey, () => {
console.error('QTab/QRouteTab component needs to be child of QTabs')
})
@@ -46,7 +46,7 @@ export default function (props, slots, emit, routerProps) {
const rootRef = ref(null)
const tabIndicatorRef = ref(null)
- const isActive = computed(() => tabs.currentModel.value === props.name)
+ const isActive = computed(() => $tabs.currentModel.value === props.name)
const classes = computed(() =>
'q-tab relative-position self-stretch flex flex-center text-center' +
@@ -54,19 +54,19 @@ export default function (props, slots, emit, routerProps) {
(
isActive.value === true
? (
- (tabs.tabProps.value.activeColor ? ` text-${tabs.tabProps.value.activeColor}` : '') +
- (tabs.tabProps.value.activeBgColor ? ` bg-${tabs.tabProps.value.activeBgColor}` : '')
+ ($tabs.tabProps.value.activeColor ? ` text-${$tabs.tabProps.value.activeColor}` : '') +
+ ($tabs.tabProps.value.activeBgColor ? ` bg-${$tabs.tabProps.value.activeBgColor}` : '')
)
: ''
) +
- (props.icon && props.label && tabs.tabProps.value.inlineLabel === false ? ' q-tab--full' : '') +
- (props.noCaps === true || tabs.tabProps.value.noCaps === true ? ' q-tab--no-caps' : '') +
+ (props.icon && props.label && $tabs.tabProps.value.inlineLabel === false ? ' q-tab--full' : '') +
+ (props.noCaps === true || $tabs.tabProps.value.noCaps === true ? ' q-tab--no-caps' : '') +
(props.disable === true ? ' disabled' : ' q-focusable q-hoverable cursor-pointer')
)
const innerClass = computed(() =>
'q-tab__content self-stretch flex-center relative-position q-anchor--skip non-selectable ' +
- (tabs.tabProps.value.inlineLabel === true ? 'row no-wrap q-tab__content--inline' : 'column') +
+ ($tabs.tabProps.value.inlineLabel === true ? 'row no-wrap q-tab__content--inline' : 'column') +
(props.contentClass !== void 0 ? ` ${props.contentClass}` : '')
)
@@ -95,7 +95,7 @@ export default function (props, slots, emit, routerProps) {
}
else {
emit('click', e)
- tabs.updateModel({ name: props.name, fromRoute: false })
+ $tabs.updateModel({ name: props.name, fromRoute: false })
}
}
}
@@ -107,13 +107,13 @@ export default function (props, slots, emit, routerProps) {
function getContent () {
const
- narrow = tabs.tabProps.value.narrowIndicator,
+ narrow = $tabs.tabProps.value.narrowIndicator,
content = [],
indicator = h('div', {
ref: tabIndicatorRef,
class: [
'q-tab__indicator',
- tabs.tabProps.value.indicatorClass
+ $tabs.tabProps.value.indicatorClass
]
})
@@ -163,13 +163,13 @@ export default function (props, slots, emit, routerProps) {
}
onBeforeUnmount(() => {
- tabs.unregisterTab(tabData)
- tabs.recalculateScroll()
+ $tabs.unregisterTab(tabData)
+ $tabs.recalculateScroll()
})
onMounted(() => {
- tabs.registerTab(tabData)
- tabs.recalculateScroll()
+ $tabs.registerTab(tabData)
+ $tabs.recalculateScroll()
})
function renderTab (tag, customData) {
@@ -195,5 +195,5 @@ export default function (props, slots, emit, routerProps) {
)
}
- return { renderTab, tabs }
+ return { renderTab, $tabs }
}
diff --git a/ui/src/components/timeline/QTimelineEntry.js b/ui/src/components/timeline/QTimelineEntry.js
index 6cf3d663470..32eee2d7bd6 100644
--- a/ui/src/components/timeline/QTimelineEntry.js
+++ b/ui/src/components/timeline/QTimelineEntry.js
@@ -31,7 +31,7 @@ export default defineComponent({
},
setup (props, { slots }) {
- const timeline = inject(timelineKey, () => {
+ const $timeline = inject(timelineKey, () => {
console.error('QTimelineEntry needs to be child of QTimeline')
})
@@ -41,11 +41,11 @@ export default defineComponent({
)
const dotClass = computed(() =>
- `q-timeline__dot text-${props.color || timeline.color}`
+ `q-timeline__dot text-${props.color || $timeline.color}`
)
const reverse = computed(() =>
- timeline.layout === 'comfortable' && timeline.side === 'left'
+ $timeline.layout === 'comfortable' && $timeline.side === 'left'
)
return () => {
diff --git a/ui/src/composables/private/use-field.js b/ui/src/composables/private/use-field.js
new file mode 100644
index 00000000000..0bdfbee85f3
--- /dev/null
+++ b/ui/src/composables/private/use-field.js
@@ -0,0 +1,607 @@
+import { h, ref, computed, watch, Transition, nextTick, onBeforeUnmount, onMounted, getCurrentInstance } from 'vue'
+
+import { isRuntimeSsrPreHydration } from '../../plugins/Platform.js'
+
+import QIcon from '../../components/icon/QIcon.js'
+import QSpinner from '../../components/spinner/QSpinner.js'
+
+import useDark, { useDarkProps } from '../../composables/private/use-dark.js'
+import useValidate, { useValidateProps } from './use-validate.js'
+import useAttrs from '../use-attrs.js'
+
+import { hSlot } from '../../utils/composition-render.js'
+import uid from '../../utils/uid.js'
+import { stop, prevent, stopAndPrevent } from '../../utils/event.js'
+
+function getTargetUid (val) {
+ return val === void 0 ? `f_${uid()}` : val
+}
+
+export function fieldValueIsFilled (val) {
+ return val !== void 0 &&
+ val !== null &&
+ ('' + val).length > 0
+}
+
+export const useFieldProps = {
+ ...useDarkProps,
+ ...useValidateProps,
+
+ label: String,
+ stackLabel: Boolean,
+ hint: String,
+ hideHint: Boolean,
+ prefix: String,
+ suffix: String,
+
+ labelColor: String,
+ color: String,
+ bgColor: String,
+
+ filled: Boolean,
+ outlined: Boolean,
+ borderless: Boolean,
+ standout: [ Boolean, String ],
+
+ square: Boolean,
+
+ loading: Boolean,
+
+ labelSlot: Boolean,
+
+ bottomSlots: Boolean,
+ hideBottomSpace: Boolean,
+
+ rounded: Boolean,
+ dense: Boolean,
+ itemAligned: Boolean,
+
+ counter: Boolean,
+
+ clearable: Boolean,
+ clearIcon: String,
+
+ disable: Boolean,
+ readonly: Boolean,
+
+ autofocus: Boolean,
+
+ for: String,
+
+ maxlength: [ Number, String ]
+}
+
+export const useFieldEmits = [ 'update:modelValue', 'clear', 'focus', 'blur', 'popup-show', 'popup-hide' ]
+
+export function useFieldState (props, attrs) {
+ const { qAttrs, qListeners } = useAttrs(attrs)
+
+ return {
+ editable: computed(() =>
+ props.disable !== true && props.readonly !== true
+ ),
+
+ qAttrs,
+ qListeners,
+ targetUid: ref(getTargetUid(props.for)),
+
+ targetRef: ref(null),
+ controlRef: ref(null)
+
+ /**
+ * user supplied additionals:
+
+ * innerValue - computed
+ * floatingLabel - computed
+ * inputRef - computed
+
+ * fieldClass - computed
+ * hasShadow - computed
+
+ * getControlEvents - fn
+ * getControl - fn
+ * getInnerAppend - fn
+ * getControlChild - fn
+ * getShadowControl - fn
+ * showPopup - fn
+ */
+ }
+}
+
+export default function ({
+ props,
+ emit,
+ slots,
+ attrs,
+ $q,
+ state
+}) {
+ const { isDark } = useDark(props, $q)
+
+ let focusoutTimer, hasPopupOpen
+
+ const rootRef = ref(null)
+ const focused = ref(false)
+
+ if (state.hasValue === void 0) {
+ state.hasValue = computed(() => fieldValueIsFilled(props.modelValue))
+ }
+
+ if (state.emitValue === void 0) {
+ state.emitValue = value => {
+ emit('update:modelValue', value)
+ }
+ }
+
+ if (state.computedCounter === void 0) {
+ state.computedCounter = computed(() => {
+ if (props.counter !== false) {
+ const len = typeof props.modelValue === 'string' || typeof props.modelValue === 'number'
+ ? ('' + props.modelValue).length
+ : (Array.isArray(props.modelValue) === true ? props.modelValue.length : 0)
+
+ const max = props.maxlength !== void 0
+ ? props.maxlength
+ : props.maxValues
+
+ return len + (max !== void 0 ? ' / ' + max : '')
+ }
+ })
+ }
+
+ // used internally by validation for QInput
+ // or menu handling for QSelect
+ const innerLoading = ref(false)
+
+ const controlEvents = state.getControlEvents !== void 0
+ ? state.getControlEvents()
+ : {
+ onFocusin: onControlFocusin,
+ onFocusout: onControlFocusout
+ }
+
+ const {
+ isDirtyModel,
+ hasRules,
+ hasError,
+ computedErrorMessage,
+ resetValidation
+ } = useValidate(props, focused, innerLoading)
+
+ const floatingLabel = state.floatingLabel !== void 0
+ ? computed(() => props.stackLabel === true || focused.value === true || state.floatingLabel.value === true)
+ : computed(() => props.stackLabel === true || focused.value === true)
+
+ const shouldRenderBottom = computed(() =>
+ props.bottomSlots === true ||
+ props.hint !== void 0 ||
+ hasRules.value === true ||
+ props.counter === true ||
+ props.error !== null
+ )
+
+ const styleType = computed(() => {
+ if (props.filled === true) { return 'filled' }
+ if (props.outlined === true) { return 'outlined' }
+ if (props.borderless === true) { return 'borderless' }
+ if (props.standout) { return 'standout' }
+ return 'standard'
+ })
+
+ const classes = computed(() =>
+ `q-field row no-wrap items-start q-field--${styleType.value}` +
+ (state.fieldClass !== void 0 ? ` ${state.fieldClass.value}` : '') +
+ (props.rounded === true ? ' q-field--rounded' : '') +
+ (props.square === true ? ' q-field--square' : '') +
+ (floatingLabel.value === true ? ' q-field--float' : '') +
+ (hasLabel.value === true ? ' q-field--labeled' : '') +
+ (props.dense === true ? ' q-field--dense' : '') +
+ (props.itemAligned === true ? ' q-field--item-aligned q-item-type' : '') +
+ (isDark.value === true ? ' q-field--dark' : '') +
+ (state.getControl === void 0 ? ' q-field--auto-height' : '') +
+ (focused.value === true ? ' q-field--focused' : '') +
+ (hasError.value === true ? ' q-field--error' : '') +
+ (hasError.value === true || focused.value === true ? ' q-field--highlighted' : '') +
+ (props.hideBottomSpace !== true && shouldRenderBottom.value === true ? ' q-field--with-bottom' : '') +
+ (props.disable === true ? ' q-field--disabled' : (props.readonly === true ? ' q-field--readonly' : ''))
+ )
+
+ const contentClass = computed(() =>
+ 'q-field__control relative-position row no-wrap' +
+ (props.bgColor !== void 0 ? ` bg-${props.bgColor}` : '') +
+ (
+ hasError.value === true
+ ? ' text-negative'
+ : (
+ typeof props.standout === 'string' && props.standout.length > 0 && focused.value === true
+ ? ` ${props.standout}`
+ : (props.color !== void 0 ? ` text-${props.color}` : '')
+ )
+ )
+ )
+
+ const hasLabel = computed(() =>
+ props.labelSlot === true || props.label !== void 0
+ )
+
+ const labelClass = computed(() =>
+ 'q-field__label no-pointer-events absolute ellipsis' +
+ (props.labelColor !== void 0 && hasError.value !== true ? ` text-${props.labelColor}` : '')
+ )
+
+ const controlSlotScope = computed(() => ({
+ id: state.targetUid.value,
+ field: rootRef,
+ editable: state.editable.value,
+ focused: focused.value,
+ floatingLabel: floatingLabel.value,
+ modelValue: props.modelValue,
+ emitValue: state.emitValue
+ }))
+
+ const attributes = computed(() => {
+ const acc = {
+ for: state.targetUid.value
+ }
+
+ if (props.disable === true) {
+ acc[ 'aria-disabled' ] = 'true'
+ }
+ else if (props.readonly === true) {
+ acc[ 'aria-readonly' ] = 'true'
+ }
+
+ return acc
+ })
+
+ watch(() => props.for, val => {
+ // don't transform targetUid into a computed
+ // prop as it will break SSR
+ state.targetUid.value = getTargetUid(val)
+ })
+
+ function focus () {
+ if (state.showPopup !== void 0) {
+ state.showPopup()
+ return
+ }
+
+ localFocus()
+ }
+
+ function blur () {
+ const el = document.activeElement
+ // IE can have null document.activeElement
+ if (el !== null && rootRef.value.contains(el)) {
+ el.blur()
+ }
+ }
+
+ function __onControlPopupShow (e) {
+ e !== void 0 && stop(e)
+ emit('popup-show', e)
+ hasPopupOpen = true
+ onControlFocusin(e)
+ }
+
+ function __onControlPopupHide (e) {
+ e !== void 0 && stop(e)
+ emit('popup-hide', e)
+ hasPopupOpen = false
+ onControlFocusout(e)
+ }
+
+ function onControlFocusin (e) {
+ if (state.editable.value === true && focused.value === false) {
+ focused.value = true
+ emit('focus', e)
+ }
+ }
+
+ function onControlFocusout (e, then) {
+ clearTimeout(focusoutTimer)
+ focusoutTimer = setTimeout(() => {
+ if (
+ document.hasFocus() === true && (
+ hasPopupOpen === true ||
+ (
+ state.controlRef !== void 0 &&
+ (
+ state.controlRef.value === null ||
+ state.controlRef.value.contains(document.activeElement) !== false
+ )
+ )
+ )
+ ) {
+ return
+ }
+
+ if (focused.value === true) {
+ focused.value = false
+ emit('blur', e)
+ }
+
+ then !== void 0 && then()
+ })
+ }
+
+ function clearValue (e) {
+ // prevent activating the field but keep focus on desktop
+ stopAndPrevent(e)
+
+ if ($q.platform.is.mobile !== true) {
+ const el = (state.targetRef !== void 0 && state.targetRef.value) || rootRef.value
+ el.focus()
+ }
+ else if (rootRef.value.contains(document.activeElement) === true) {
+ document.activeElement.blur()
+ }
+
+ if (props.type === 'file') {
+ // do not let focus be triggered
+ // as it will make the native file dialog
+ // appear for another selection
+ state.inputRef.value.value = null
+ }
+
+ emit('update:modelValue', null)
+ emit('clear', props.modelValue)
+
+ nextTick(() => {
+ resetValidation()
+
+ if (props.lazyRules !== 'ondemand' && $q.platform.is.mobile !== true) {
+ isDirtyModel.value = false
+ }
+ })
+ }
+
+ function localFocus () {
+ const el = document.activeElement
+ let target = state.targetRef !== void 0 && state.targetRef.value
+ // IE can have null document.activeElement
+ if (target && (el === null || el.id !== state.targetUid.value)) {
+ target.hasAttribute('tabindex') === true || (target = target.querySelector('[tabindex]'))
+ target && target !== el && target.focus()
+ }
+ }
+
+ function getContent () {
+ const node = []
+
+ slots.prepend !== void 0 && node.push(
+ h('div', {
+ class: 'q-field__prepend q-field__marginal row no-wrap items-center',
+ key: 'prepend',
+ onClick: prevent
+ }, slots.prepend())
+ )
+
+ node.push(
+ h('div', {
+ class: 'q-field__control-container col relative-position row no-wrap q-anchor--skip'
+ }, getControlContainer())
+ )
+
+ slots.append !== void 0 && node.push(
+ h('div', {
+ class: 'q-field__append q-field__marginal row no-wrap items-center',
+ key: 'append',
+ onClick: prevent
+ }, slots.append())
+ )
+
+ hasError.value === true && props.noErrorIcon === false && node.push(
+ getInnerAppendNode('error', [
+ h(QIcon, { name: $q.iconSet.field.error, color: 'negative' })
+ ])
+ )
+
+ if (props.loading === true || innerLoading.value === true) {
+ node.push(
+ getInnerAppendNode(
+ 'inner-loading-append',
+ slots.loading !== void 0
+ ? slots.loading()
+ : [h(QSpinner, { color: props.color })]
+ )
+ )
+ }
+ else if (props.clearable === true && state.hasValue.value === true && state.editable.value === true) {
+ node.push(
+ getInnerAppendNode('inner-clearable-append', [
+ h(QIcon, {
+ class: 'q-field__focusable-action',
+ tag: 'button',
+ name: props.clearIcon || $q.iconSet.field.clear,
+ tabindex: 0,
+ type: 'button',
+ onClick: clearValue
+ })
+ ])
+ )
+ }
+
+ state.getInnerAppend !== void 0 && node.push(
+ getInnerAppendNode('inner-append', state.getInnerAppend())
+ )
+
+ state.getControlChild !== void 0 && node.push(
+ state.getControlChild()
+ )
+
+ return node
+ }
+
+ function getControlContainer () {
+ const node = []
+
+ props.prefix !== void 0 && props.prefix !== null && node.push(
+ h('div', {
+ class: 'q-field__prefix no-pointer-events row items-center'
+ }, props.prefix)
+ )
+
+ if (state.getShadowControl !== void 0 && state.hasShadow.value === true) {
+ node.push(
+ state.getShadowControl()
+ )
+ }
+
+ if (state.getControl !== void 0) {
+ node.push(state.getControl())
+ }
+ // internal usage only:
+ else if (slots.rawControl !== void 0) {
+ node.push(slots.rawControl())
+ }
+ else if (slots.control !== void 0) {
+ node.push(
+ h('div', {
+ ref: state.targetRef,
+ class: 'q-field__native row',
+ ...state.qAttrs.value,
+ 'data-autofocus': props.autofocus
+ }, slots.control(controlSlotScope.value))
+ )
+ }
+
+ hasLabel.value === true && node.push(
+ h('div', {
+ class: labelClass.value
+ }, hSlot(slots.label, props.label))
+ )
+
+ props.suffix !== void 0 && props.suffix !== null && node.push(
+ h('div', {
+ class: 'q-field__suffix no-pointer-events row items-center'
+ }, props.suffix)
+ )
+
+ return node.concat(hSlot(slots.default))
+ }
+
+ function getBottom () {
+ let msg, key
+
+ if (hasError.value === true) {
+ if (computedErrorMessage.value !== void 0) {
+ msg = [h('div', computedErrorMessage.value)]
+ key = computedErrorMessage.value
+ }
+ else {
+ msg = hSlot(slots.error)
+ key = 'q--slot-error'
+ }
+ }
+ else if (props.hideHint !== true || focused.value === true) {
+ if (props.hint !== void 0) {
+ msg = [h('div', props.hint)]
+ key = props.hint
+ }
+ else {
+ msg = hSlot(slots.hint)
+ key = 'q--slot-hint'
+ }
+ }
+
+ const hasCounter = props.counter === true || slots.counter !== void 0
+
+ if (props.hideBottomSpace === true && hasCounter === false && msg === void 0) {
+ return
+ }
+
+ const main = h('div', {
+ key,
+ class: 'q-field__messages col'
+ }, msg)
+
+ return h('div', {
+ class: 'q-field__bottom row items-start q-field__bottom--' +
+ (props.hideBottomSpace !== true ? 'animated' : 'stale')
+ }, [
+ props.hideBottomSpace === true
+ ? main
+ : h(Transition, { name: 'q-transition--field-message' }, () => main),
+
+ hasCounter === true
+ ? h('div', {
+ class: 'q-field__counter'
+ }, slots.counter !== void 0 ? slots.counter() : state.computedCounter.value)
+ : null
+ ])
+ }
+
+ function getInnerAppendNode (key, content) {
+ return content === null
+ ? null
+ : h('div', {
+ key,
+ class: 'q-field__append q-field__marginal row no-wrap items-center q-anchor--skip'
+ }, content)
+ }
+
+ // expose public methods
+ const vm = getCurrentInstance()
+ Object.assign(vm.proxy, {
+ focus, blur
+ })
+
+ onMounted(() => {
+ if (isRuntimeSsrPreHydration === true && props.for === void 0) {
+ state.targetUid.value = getTargetUid()
+ }
+
+ props.autofocus === true && focus()
+ })
+
+ onBeforeUnmount(() => {
+ clearTimeout(focusoutTimer)
+ })
+
+ // return () => {
+ // field.onPreRender !== void 0 && field.onPreRender()
+ // field.onPostRender !== void 0 && nextTick(field.onPostRender)
+ // }
+
+ return function renderField () {
+ return h('label', {
+ ref: rootRef,
+ class: [
+ classes.value,
+ attrs.class
+ ],
+ style: attrs.style,
+ ...attributes.value
+ }, [
+ slots.before !== void 0
+ ? h('div', {
+ class: 'q-field__before q-field__marginal row no-wrap items-center',
+ onClick: prevent
+ }, slots.before())
+ : null,
+
+ h('div', {
+ class: 'q-field__inner relative-position col self-stretch column justify-center'
+ }, [
+ h('div', {
+ ref: state.controlRef,
+ class: contentClass.value,
+ tabindex: -1,
+ ...controlEvents
+ }, getContent()),
+
+ shouldRenderBottom.value === true
+ ? getBottom()
+ : null
+ ]),
+
+ slots.after !== void 0
+ ? h('div', {
+ class: 'q-field__after q-field__marginal row no-wrap items-center',
+ onClick: prevent
+ }, slots.after())
+ : null
+ ])
+ }
+}
diff --git a/ui/src/components/field/__QField.json b/ui/src/composables/private/use-field.json
similarity index 99%
rename from ui/src/components/field/__QField.json
rename to ui/src/composables/private/use-field.json
index 13d1f48ed39..ad9f5bc74c6 100644
--- a/ui/src/components/field/__QField.json
+++ b/ui/src/composables/private/use-field.json
@@ -1,5 +1,5 @@
{
- "mixins": [ "mixins/validate" ],
+ "mixins": [ "composables/private/use-validate" ],
"props": {
"label": {
diff --git a/ui/src/composables/private/use-file-dom-props.js b/ui/src/composables/private/use-file-dom-props.js
index 99f5b619a03..4b94462acb2 100644
--- a/ui/src/composables/private/use-file-dom-props.js
+++ b/ui/src/composables/private/use-file-dom-props.js
@@ -1,11 +1,7 @@
import { computed } from 'vue'
-export default function (props) {
- return computed(() => {
- if (props.type !== 'file') { // TODO vue3 - handle QInput separately
- return
- }
-
+export default function (props, typeGuard) {
+ function getFormDomProps () {
const model = props.modelValue
try {
@@ -34,5 +30,15 @@ export default function (props) {
files: void 0
}
}
- })
+ }
+
+ return typeGuard === true
+ ? computed(() => {
+ if (props.type !== 'file') {
+ return
+ }
+
+ return getFormDomProps()
+ })
+ : computed(getFormDomProps)
}
diff --git a/ui/src/composables/private/use-form.js b/ui/src/composables/private/use-form.js
index c70e66d2d66..5fcb5147852 100644
--- a/ui/src/composables/private/use-form.js
+++ b/ui/src/composables/private/use-form.js
@@ -23,3 +23,7 @@ export function useFormInject (formAttrs = {}, formDomProps = {}) {
)
}
}
+
+export function useFormInputNameAttr (props) {
+ return computed(() => props.name || props.for)
+}
diff --git a/ui/src/composables/private/use-key-composition.js b/ui/src/composables/private/use-key-composition.js
new file mode 100644
index 00000000000..52a662daefc
--- /dev/null
+++ b/ui/src/composables/private/use-key-composition.js
@@ -0,0 +1,30 @@
+const isJapanese = /[\u3000-\u303f\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf\u3400-\u4dbf]/
+const isChinese = /[\u4e00-\u9fff\u3400-\u4dbf\u{20000}-\u{2a6df}\u{2a700}-\u{2b73f}\u{2b740}-\u{2b81f}\u{2b820}-\u{2ceaf}\uf900-\ufaff\u3300-\u33ff\ufe30-\ufe4f\uf900-\ufaff\u{2f800}-\u{2fa1f}]/u
+const isKorean = /[\u3131-\u314e\u314f-\u3163\uac00-\ud7a3]/
+
+export default function (onInput) {
+ function onComposition (e) {
+ if (e.type === 'compositionend' || e.type === 'change') {
+ if (e.target.composing !== true) { return }
+ e.target.composing = false
+ onInput(e)
+ }
+ else if (e.type === 'compositionupdate') {
+ if (
+ typeof e.data === 'string' &&
+ isJapanese.test(e.data) === false &&
+ isChinese.test(e.data) === false &&
+ isKorean.test(e.data) === false
+ ) {
+ e.target.composing = false
+ }
+ }
+ else {
+ e.target.composing = true
+ }
+ }
+
+ return {
+ onComposition
+ }
+}
diff --git a/ui/src/composables/private/use-validate.js b/ui/src/composables/private/use-validate.js
new file mode 100644
index 00000000000..3a709e68642
--- /dev/null
+++ b/ui/src/composables/private/use-validate.js
@@ -0,0 +1,207 @@
+import { ref, computed, watch, onBeforeUnmount } from 'vue'
+
+import useFormChild from '../use-form-child.js'
+import { testPattern } from '../../utils/patterns.js'
+
+const lazyRulesValues = [ true, false, 'ondemand' ]
+
+export const useValidateProps = {
+ modelValue: {},
+
+ error: {
+ type: Boolean,
+ default: null
+ },
+ errorMessage: String,
+ noErrorIcon: Boolean,
+
+ rules: Array,
+ reactiveRules: Boolean,
+ lazyRules: {
+ type: [ Boolean, String ],
+ validator: v => lazyRulesValues.includes(v)
+ }
+}
+
+export default function (props, focused, innerLoading) {
+ const innerError = ref(false)
+ const innerErrorMessage = ref(null)
+ const isDirtyModel = ref(null)
+
+ useFormChild({ validate, canFail: true })
+
+ let validateIndex = 0, unwatchRules
+
+ const hasRules = computed(() =>
+ props.rules !== void 0 &&
+ props.rules !== null &&
+ props.rules.length > 0
+ )
+
+ const hasError = computed(() =>
+ props.error === true || innerError.value === true
+ )
+
+ const computedErrorMessage = computed(() =>
+ typeof props.errorMessage === 'string' && props.errorMessage.length > 0
+ ? props.errorMessage
+ : innerErrorMessage.value || ''
+ )
+
+ watch(() => props.modelValue, () => {
+ validateIfNeeded()
+ })
+
+ watch(() => props.reactiveRules, val => {
+ if (val === true) {
+ if (unwatchRules === void 0) {
+ unwatchRules = watch('rules', () => {
+ validateIfNeeded(true)
+ })
+ }
+ }
+ else if (unwatchRules !== void 0) {
+ unwatchRules()
+ unwatchRules = void 0
+ }
+ }, { immediate: true })
+
+ watch(focused, val => {
+ if (props.lazyRules !== 'ondemand') {
+ if (val === true) {
+ if (isDirtyModel.value === null) {
+ isDirtyModel.value = false
+ }
+ }
+ else if (isDirtyModel.value === false && hasRules.value === true) {
+ isDirtyModel.value = true
+ validate()
+ }
+ }
+ })
+
+ function resetValidation () {
+ validateIndex++
+ innerLoading.value = false
+ isDirtyModel.value = null
+ innerError.value = false
+ innerErrorMessage.value = null
+ }
+
+ /*
+ * Return value
+ * - true (validation succeeded)
+ * - false (validation failed)
+ * - Promise (pending async validation)
+ */
+ function validate (val = props.modelValue) {
+ if (hasRules.value !== true) {
+ return true
+ }
+
+ validateIndex++
+
+ if (innerLoading.value !== true && props.lazyRules !== true) {
+ isDirtyModel.value = true
+ }
+
+ const update = (err, msg) => {
+ if (innerError.value !== err) {
+ innerError.value = err
+ }
+
+ const m = msg || void 0
+
+ if (innerErrorMessage.value !== m) {
+ innerErrorMessage.value = m
+ }
+
+ if (innerLoading.value !== false) {
+ innerLoading.value = false
+ }
+ }
+
+ const promises = []
+
+ for (let i = 0; i < props.rules.length; i++) {
+ const rule = props.rules[ i ]
+ let res
+
+ if (typeof rule === 'function') {
+ res = rule(val)
+ }
+ else if (typeof rule === 'string' && testPattern[ rule ] !== void 0) {
+ res = testPattern[ rule ](val)
+ }
+
+ if (res === false || typeof res === 'string') {
+ update(true, res)
+ return false
+ }
+ else if (res !== true && res !== void 0) {
+ promises.push(res)
+ }
+ }
+
+ if (promises.length === 0) {
+ update(false)
+ return true
+ }
+
+ if (innerLoading.value !== true) {
+ innerLoading.value = true
+ }
+
+ const index = validateIndex
+
+ return Promise.all(promises).then(
+ res => {
+ if (index !== validateIndex) {
+ return true
+ }
+
+ if (res === void 0 || Array.isArray(res) === false || res.length === 0) {
+ update(false)
+ return true
+ }
+
+ const msg = res.find(r => r === false || typeof r === 'string')
+ update(msg !== void 0, msg)
+ return msg === void 0
+ },
+ e => {
+ if (index === validateIndex) {
+ console.error(e)
+ update(true)
+ return false
+ }
+
+ return true
+ }
+ )
+ }
+
+ function validateIfNeeded (changedRules) {
+ if (
+ hasRules.value === true &&
+ props.lazyRules !== 'ondemand' &&
+ (isDirtyModel.value === true || (props.lazyRules !== true && changedRules !== true))
+ ) {
+ validate()
+ }
+ }
+
+ onBeforeUnmount(() => {
+ unwatchRules !== void 0 && unwatchRules()
+ })
+
+ return {
+ isDirtyModel,
+ hasRules,
+ hasError,
+ computedErrorMessage,
+
+ validate,
+ resetValidation
+ }
+}
diff --git a/ui/src/mixins/validate.json b/ui/src/composables/private/use-validate.json
similarity index 100%
rename from ui/src/mixins/validate.json
rename to ui/src/composables/private/use-validate.json
diff --git a/ui/src/composables/use-attrs.js b/ui/src/composables/use-attrs.js
index 56df3a2e0b5..03e7b627bd6 100644
--- a/ui/src/composables/use-attrs.js
+++ b/ui/src/composables/use-attrs.js
@@ -11,7 +11,7 @@ export default function (attrs) {
Object.keys(attrs).forEach(key => {
if (nonAttrsRE.test(key) === false) {
- acc[ key ] = this.$attrs[ key ]
+ acc[ key ] = attrs[ key ]
}
})
@@ -23,7 +23,7 @@ export default function (attrs) {
Object.keys(attrs).forEach(key => {
if (listenerRE.test(key) === true) {
- acc[ key ] = this.$attrs[ key ]
+ acc[ key ] = attrs[ key ]
}
})
diff --git a/ui/src/composables/use-form-child.js b/ui/src/composables/use-form-child.js
index cf7e5a21904..5301caeadbf 100644
--- a/ui/src/composables/use-form-child.js
+++ b/ui/src/composables/use-form-child.js
@@ -2,10 +2,10 @@ import { inject, onBeforeUnmount, getCurrentInstance } from 'vue'
import { formKey } from '../utils/symbols.js'
-export default function ({ validate }) {
- const $form = inject(formKey)
+export default function ({ validate, canFail }) {
+ const $form = inject(formKey, false)
- if ($form !== void 0) {
+ if ($form !== false) {
const vm = getCurrentInstance()
// export public method (so it can be used in QForm)
@@ -19,7 +19,7 @@ export default function ({ validate }) {
$form.unbindComponent(vm.proxy)
})
}
- else {
+ else if (canFail !== true) {
console.error('Parent QForm not found on useForm()!')
}
}
diff --git a/ui/src/mixins/composition.js b/ui/src/mixins/composition.js
index e5fcad9b28d..39cc92d0399 100644
--- a/ui/src/mixins/composition.js
+++ b/ui/src/mixins/composition.js
@@ -1,3 +1,5 @@
+/* ----Will be replaced by composables/private/use-key-composition.js --- */
+
const isJapanese = /[\u3000-\u303f\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf\u3400-\u4dbf]/
const isChinese = /[\u4e00-\u9fff\u3400-\u4dbf\u{20000}-\u{2a6df}\u{2a700}-\u{2b73f}\u{2b740}-\u{2b81f}\u{2b820}-\u{2ceaf}\uf900-\ufaff\u3300-\u33ff\ufe30-\ufe4f\uf900-\ufaff\u{2f800}-\u{2fa1f}]/u
const isKorean = /[\u3131-\u314e\u314f-\u3163\uac00-\ud7a3]/
diff --git a/ui/src/mixins/file.js b/ui/src/mixins/file.js
deleted file mode 100644
index 5715f39e64d..00000000000
--- a/ui/src/mixins/file.js
+++ /dev/null
@@ -1,231 +0,0 @@
-// this file will eventually be removed
-// and superseeded by use-file.js / use-file-value.js
-// after all components use composition api
-
-import { h } from 'vue'
-
-import { stopAndPrevent } from '../utils/event.js'
-
-function filterFiles (files, rejectedFiles, failedPropValidation, filterFn) {
- const acceptedFiles = []
-
- files.forEach(file => {
- if (filterFn(file) === true) {
- acceptedFiles.push(file)
- }
- else {
- rejectedFiles.push({ failedPropValidation, file })
- }
- })
-
- return acceptedFiles
-}
-
-function stopAndPreventDrag (e) {
- e && e.dataTransfer && (e.dataTransfer.dropEffect = 'copy')
- stopAndPrevent(e)
-}
-
-export default {
- props: {
- multiple: Boolean,
- accept: String,
- capture: String,
- maxFileSize: [ Number, String ],
- maxTotalSize: [ Number, String ],
- maxFiles: [ Number, String ],
- filter: Function
- },
-
- emits: ['rejected'],
-
- computed: {
- extensions () {
- if (this.accept !== void 0) {
- return this.accept.split(',').map(ext => {
- ext = ext.trim()
- if (ext === '*') { // support "*"
- return '*/'
- }
- else if (ext.endsWith('/*')) { // support "image/*" or "*/*"
- ext = ext.slice(0, ext.length - 1)
- }
- return ext.toUpperCase()
- })
- }
- },
-
- maxFilesNumber () {
- return parseInt(this.maxFiles, 10)
- },
-
- maxTotalSizeNumber () {
- return parseInt(this.maxTotalSize, 10)
- }
- },
-
- methods: {
- pickFiles (e) {
- if (this.editable) {
- const input = this.__getFileInput()
- input && input.click(e)
- }
- },
-
- addFiles (files) {
- if (this.editable && files) {
- this.__addFiles(null, files)
- }
- },
-
- __processFiles (e, filesToProcess, currentFileList, append) {
- let files = Array.from(filesToProcess || e.target.files)
- const rejectedFiles = []
-
- const done = () => {
- if (rejectedFiles.length > 0) {
- this.$emit('rejected', rejectedFiles)
- }
- }
-
- // filter file types
- if (this.accept !== void 0 && this.extensions.indexOf('*/') === -1) {
- files = filterFiles(files, rejectedFiles, 'accept', file => {
- return this.extensions.some(ext => (
- file.type.toUpperCase().startsWith(ext) ||
- file.name.toUpperCase().endsWith(ext)
- ))
- })
-
- if (files.length === 0) { return done() }
- }
-
- // filter max file size
- if (this.maxFileSize !== void 0) {
- const maxFileSize = parseInt(this.maxFileSize, 10)
- files = filterFiles(files, rejectedFiles, 'max-file-size', file => {
- return file.size <= maxFileSize
- })
-
- if (files.length === 0) { return done() }
- }
-
- // Cordova/iOS allows selecting multiple files even when the
- // multiple attribute is not specified. We also normalize drag'n'dropped
- // files here:
- if (this.multiple !== true) {
- files = [files[ 0 ]]
- }
-
- if (this.maxTotalSize !== void 0) {
- let size = append === true
- ? currentFileList.reduce((total, file) => total + file.size, 0)
- : 0
-
- files = filterFiles(files, rejectedFiles, 'max-total-size', file => {
- size += file.size
- return size <= this.maxTotalSizeNumber
- })
-
- if (files.length === 0) { return done() }
- }
-
- // do we have custom filter function?
- if (typeof this.filter === 'function') {
- const filteredFiles = this.filter(files)
- files = filterFiles(files, rejectedFiles, 'filter', file => {
- return filteredFiles.includes(file)
- })
- }
-
- if (this.maxFiles !== void 0) {
- let filesNumber = append === true
- ? currentFileList.length
- : 0
-
- files = filterFiles(files, rejectedFiles, 'max-files', () => {
- filesNumber++
- return filesNumber <= this.maxFilesNumber
- })
-
- if (files.length === 0) { return done() }
- }
-
- done()
-
- if (files.length > 0) {
- return files
- }
- },
-
- __onDragOver (e) {
- stopAndPreventDrag(e)
- this.dnd !== true && (this.dnd = true)
- },
-
- __onDragLeave (e) {
- stopAndPrevent(e)
- this.dnd = false
- },
-
- __onDrop (e) {
- stopAndPreventDrag(e)
- const files = e.dataTransfer.files
-
- if (files.length > 0) {
- this.__addFiles(null, files)
- }
-
- this.dnd = false
- },
-
- __getDnd (type) {
- if (this.dnd === true) {
- return h('div', {
- class: `q-${type}__dnd absolute-full`,
- onDragenter: stopAndPreventDrag,
- onDragover: stopAndPreventDrag,
- onDragleave: this.__onDragLeave,
- onDrop: this.__onDrop
- })
- }
- }
- }
-}
-
-export const FileValueMixin = {
- computed: {
- formDomProps () {
- if (this.type !== 'file') {
- return
- }
-
- try {
- const dt = 'DataTransfer' in window
- ? new DataTransfer()
- : ('ClipboardEvent' in window
- ? new ClipboardEvent('').clipboardData
- : void 0
- )
-
- if (Object(this.modelValue) === this.modelValue) {
- ('length' in this.modelValue
- ? Array.from(this.modelValue)
- : [this.modelValue]
- ).forEach(file => {
- dt.items.add(file)
- })
- }
-
- return {
- files: dt.files
- }
- }
- catch (e) {
- return {
- files: void 0
- }
- }
- }
- }
-}
diff --git a/ui/src/mixins/mask.js b/ui/src/mixins/mask.js
deleted file mode 100644
index dcc7c0d87ec..00000000000
--- a/ui/src/mixins/mask.js
+++ /dev/null
@@ -1,526 +0,0 @@
-import { shouldIgnoreKey } from '../utils/key-composition.js'
-
-// leave NAMED_MASKS at top of file (code referenced from docs)
-const NAMED_MASKS = {
- date: '####/##/##',
- datetime: '####/##/## ##:##',
- time: '##:##',
- fulltime: '##:##:##',
- phone: '(###) ### - ####',
- card: '#### #### #### ####'
-}
-
-const TOKENS = {
- '#': { pattern: '[\\d]', negate: '[^\\d]' },
-
- S: { pattern: '[a-zA-Z]', negate: '[^a-zA-Z]' },
- N: { pattern: '[0-9a-zA-Z]', negate: '[^0-9a-zA-Z]' },
-
- A: { pattern: '[a-zA-Z]', negate: '[^a-zA-Z]', transform: v => v.toLocaleUpperCase() },
- a: { pattern: '[a-zA-Z]', negate: '[^a-zA-Z]', transform: v => v.toLocaleLowerCase() },
-
- X: { pattern: '[0-9a-zA-Z]', negate: '[^0-9a-zA-Z]', transform: v => v.toLocaleUpperCase() },
- x: { pattern: '[0-9a-zA-Z]', negate: '[^0-9a-zA-Z]', transform: v => v.toLocaleLowerCase() }
-}
-
-const KEYS = Object.keys(TOKENS)
-KEYS.forEach(key => {
- TOKENS[ key ].regex = new RegExp(TOKENS[ key ].pattern)
-})
-
-const
- tokenRegexMask = new RegExp('\\\\([^.*+?^${}()|([\\]])|([.*+?^${}()|[\\]])|([' + KEYS.join('') + '])|(.)', 'g'),
- escRegex = /[.*+?^${}()|[\]\\]/g
-
-const MARKER = String.fromCharCode(1)
-
-export default {
- props: {
- mask: String,
- reverseFillMask: Boolean,
- fillMask: [ Boolean, String ],
- unmaskedValue: Boolean
- },
-
- watch: {
- type () {
- this.__updateMaskInternals()
- },
-
- mask (v) {
- if (v !== void 0) {
- this.__updateMaskValue(this.innerValue, true)
- }
- else {
- const val = this.__unmask(this.innerValue)
- this.__updateMaskInternals()
- this.modelValue !== val && this.$emit('update:modelValue', val)
- }
- },
-
- fillMask () {
- this.hasMask === true && this.__updateMaskValue(this.innerValue, true)
- },
-
- reverseFillMask () {
- this.hasMask === true && this.__updateMaskValue(this.innerValue, true)
- },
-
- unmaskedValue () {
- this.hasMask === true && this.__updateMaskValue(this.innerValue)
- }
- },
-
- methods: {
- __getInitialMaskedValue () {
- this.__updateMaskInternals()
-
- if (this.hasMask === true) {
- const masked = this.__mask(this.__unmask(this.modelValue))
-
- return this.fillMask !== false
- ? this.__fillWithMask(masked)
- : masked
- }
-
- return this.modelValue
- },
-
- __getPaddedMaskMarked (size) {
- if (size < this.maskMarked.length) {
- return this.maskMarked.slice(-size)
- }
-
- let
- maskMarked = this.maskMarked,
- pad = ''
- const
- padPos = maskMarked.indexOf(MARKER)
-
- if (padPos > -1) {
- for (let i = size - maskMarked.length; i > 0; i--) {
- pad += MARKER
- }
-
- maskMarked = maskMarked.slice(0, padPos) + pad + maskMarked.slice(padPos)
- }
-
- return maskMarked
- },
-
- __updateMaskInternals () {
- this.hasMask = this.mask !== void 0 &&
- this.mask.length > 0 &&
- [ 'text', 'search', 'url', 'tel', 'password' ].includes(this.type)
-
- if (this.hasMask === false) {
- this.computedUnmask = void 0
- this.maskMarked = ''
- this.maskReplaced = ''
- return
- }
-
- const
- computedMask = NAMED_MASKS[ this.mask ] === void 0
- ? this.mask
- : NAMED_MASKS[ this.mask ],
- fillChar = typeof this.fillMask === 'string' && this.fillMask.length > 0
- ? this.fillMask.slice(0, 1)
- : '_',
- fillCharEscaped = fillChar.replace(escRegex, '\\$&'),
- unmask = [],
- extract = [],
- mask = []
-
- let
- firstMatch = this.reverseFillMask === true,
- unmaskChar = '',
- negateChar = ''
-
- computedMask.replace(tokenRegexMask, (_, char1, esc, token, char2) => {
- if (token !== void 0) {
- const c = TOKENS[ token ]
- mask.push(c)
- negateChar = c.negate
- if (firstMatch === true) {
- extract.push('(?:' + negateChar + '+)?(' + c.pattern + '+)?(?:' + negateChar + '+)?(' + c.pattern + '+)?')
- firstMatch = false
- }
- extract.push('(?:' + negateChar + '+)?(' + c.pattern + ')?')
- }
- else if (esc !== void 0) {
- unmaskChar = '\\' + (esc === '\\' ? '' : esc)
- mask.push(esc)
- unmask.push('([^' + unmaskChar + ']+)?' + unmaskChar + '?')
- }
- else {
- const c = char1 !== void 0 ? char1 : char2
- unmaskChar = c === '\\' ? '\\\\\\\\' : c.replace(escRegex, '\\\\$&')
- mask.push(c)
- unmask.push('([^' + unmaskChar + ']+)?' + unmaskChar + '?')
- }
- })
-
- const
- unmaskMatcher = new RegExp(
- '^' +
- unmask.join('') +
- '(' + (unmaskChar === '' ? '.' : '[^' + unmaskChar + ']') + '+)?' +
- '$'
- ),
- extractLast = extract.length - 1,
- extractMatcher = extract.map((re, index) => {
- if (index === 0 && this.reverseFillMask === true) {
- return new RegExp('^' + fillCharEscaped + '*' + re)
- }
- else if (index === extractLast) {
- return new RegExp(
- '^' + re +
- '(' + (negateChar === '' ? '.' : negateChar) + '+)?' +
- (this.reverseFillMask === true ? '$' : fillCharEscaped + '*')
- )
- }
-
- return new RegExp('^' + re)
- })
-
- this.computedMask = mask
- this.computedUnmask = val => {
- const unmaskMatch = unmaskMatcher.exec(val)
- if (unmaskMatch !== null) {
- val = unmaskMatch.slice(1).join('')
- }
-
- const
- extractMatch = [],
- extractMatcherLength = extractMatcher.length
-
- for (let i = 0, str = val; i < extractMatcherLength; i++) {
- const m = extractMatcher[ i ].exec(str)
-
- if (m === null) {
- break
- }
-
- str = str.slice(m.shift().length)
- extractMatch.push(...m)
- }
- if (extractMatch.length > 0) {
- return extractMatch.join('')
- }
-
- return val
- }
- this.maskMarked = mask.map(v => typeof v === 'string' ? v : MARKER).join('')
- this.maskReplaced = this.maskMarked.split(MARKER).join(fillChar)
- },
-
- __updateMaskValue (rawVal, updateMaskInternals, inputType) {
- const
- inp = this.$refs.input,
- end = inp.selectionEnd,
- endReverse = inp.value.length - end,
- unmasked = this.__unmask(rawVal)
-
- // Update here so unmask uses the original fillChar
- updateMaskInternals === true && this.__updateMaskInternals()
-
- const
- preMasked = this.__mask(unmasked),
- masked = this.fillMask !== false
- ? this.__fillWithMask(preMasked)
- : preMasked,
- changed = this.innerValue !== masked
-
- // We want to avoid "flickering" so we set value immediately
- inp.value !== masked && (inp.value = masked)
-
- changed === true && (this.innerValue = masked)
-
- document.activeElement === inp && this.$nextTick(() => {
- if (masked === this.maskReplaced) {
- const cursor = this.reverseFillMask === true ? this.maskReplaced.length : 0
- inp.setSelectionRange(cursor, cursor, 'forward')
-
- return
- }
-
- if (inputType === 'insertFromPaste' && this.reverseFillMask !== true) {
- const cursor = end - 1
- this.__moveCursorRight(inp, cursor, cursor)
-
- return
- }
-
- if ([ 'deleteContentBackward', 'deleteContentForward' ].indexOf(inputType) > -1) {
- const cursor = this.reverseFillMask === true
- ? Math.max(0, masked.length - (masked === this.maskReplaced ? 0 : Math.min(preMasked.length, endReverse) + 1)) + 1
- : end
- inp.setSelectionRange(cursor, cursor, 'forward')
-
- return
- }
-
- if (this.reverseFillMask === true) {
- if (changed === true) {
- const cursor = Math.max(0, masked.length - (masked === this.maskReplaced ? 0 : Math.min(preMasked.length, endReverse + 1)))
- this.__moveCursorRightReverse(inp, cursor, cursor)
- }
- else {
- const cursor = masked.length - endReverse
- inp.setSelectionRange(cursor, cursor, 'backward')
- }
- }
- else {
- if (changed === true) {
- const cursor = Math.max(0, this.maskMarked.indexOf(MARKER), Math.min(preMasked.length, end) - 1)
- this.__moveCursorRight(inp, cursor, cursor)
- }
- else {
- const cursor = end - 1
- this.__moveCursorRight(inp, cursor, cursor)
- }
- }
- })
-
- const val = this.unmaskedValue === true
- ? this.__unmask(masked)
- : masked
-
- this.modelValue !== val && this.__emitValue(val, true)
- },
-
- __moveCursorForPaste (inp, start, end) {
- const preMasked = this.__mask(this.__unmask(inp.value))
-
- start = Math.max(0, this.maskMarked.indexOf(MARKER), Math.min(preMasked.length, start))
-
- inp.setSelectionRange(start, end, 'forward')
- },
-
- __moveCursorLeft (inp, start, end, selection) {
- const noMarkBefore = this.maskMarked.slice(start - 1).indexOf(MARKER) === -1
- let i = Math.max(0, start - 1)
-
- for (; i >= 0; i--) {
- if (this.maskMarked[ i ] === MARKER) {
- start = i
- noMarkBefore === true && start++
- break
- }
- }
-
- if (
- i < 0 &&
- this.maskMarked[ start ] !== void 0 &&
- this.maskMarked[ start ] !== MARKER
- ) {
- return this.__moveCursorRight(inp, 0, 0)
- }
-
- start >= 0 && inp.setSelectionRange(
- start,
- selection === true ? end : start, 'backward'
- )
- },
-
- __moveCursorRight (inp, start, end, selection) {
- const limit = inp.value.length
- let i = Math.min(limit, end + 1)
-
- for (; i <= limit; i++) {
- if (this.maskMarked[ i ] === MARKER) {
- end = i
- break
- }
- else if (this.maskMarked[ i - 1 ] === MARKER) {
- end = i
- }
- }
-
- if (
- i > limit &&
- this.maskMarked[ end - 1 ] !== void 0 &&
- this.maskMarked[ end - 1 ] !== MARKER
- ) {
- return this.__moveCursorLeft(inp, limit, limit)
- }
-
- inp.setSelectionRange(selection ? start : end, end, 'forward')
- },
-
- __moveCursorLeftReverse (inp, start, end, selection) {
- const
- maskMarked = this.__getPaddedMaskMarked(inp.value.length)
- let i = Math.max(0, start - 1)
-
- for (; i >= 0; i--) {
- if (maskMarked[ i - 1 ] === MARKER) {
- start = i
- break
- }
- else if (maskMarked[ i ] === MARKER) {
- start = i
- if (i === 0) {
- break
- }
- }
- }
-
- if (
- i < 0 &&
- maskMarked[ start ] !== void 0 &&
- maskMarked[ start ] !== MARKER
- ) {
- return this.__moveCursorRightReverse(inp, 0, 0)
- }
-
- start >= 0 && inp.setSelectionRange(
- start,
- selection === true ? end : start, 'backward'
- )
- },
-
- __moveCursorRightReverse (inp, start, end, selection) {
- const
- limit = inp.value.length,
- maskMarked = this.__getPaddedMaskMarked(limit),
- noMarkBefore = maskMarked.slice(0, end + 1).indexOf(MARKER) === -1
- let i = Math.min(limit, end + 1)
-
- for (; i <= limit; i++) {
- if (maskMarked[ i - 1 ] === MARKER) {
- end = i
- end > 0 && noMarkBefore === true && end--
- break
- }
- }
-
- if (
- i > limit &&
- maskMarked[ end - 1 ] !== void 0 &&
- maskMarked[ end - 1 ] !== MARKER
- ) {
- return this.__moveCursorLeftReverse(inp, limit, limit)
- }
-
- inp.setSelectionRange(selection === true ? start : end, end, 'forward')
- },
-
- __onMaskedKeydown (e) {
- if (shouldIgnoreKey(e) === true) {
- return
- }
-
- const
- inp = this.$refs.input,
- start = inp.selectionStart,
- end = inp.selectionEnd
-
- if (e.keyCode === 37 || e.keyCode === 39) { // Left / Right
- const fn = this[ '__moveCursor' + (e.keyCode === 39 ? 'Right' : 'Left') + (this.reverseFillMask === true ? 'Reverse' : '') ]
-
- e.preventDefault()
- fn(inp, start, end, e.shiftKey)
- }
- else if (
- e.keyCode === 8 && // Backspace
- this.reverseFillMask !== true &&
- start === end
- ) {
- this.__moveCursorLeft(inp, start, end, true)
- }
- else if (
- e.keyCode === 46 && // Delete
- this.reverseFillMask === true &&
- start === end
- ) {
- this.__moveCursorRightReverse(inp, start, end, true)
- }
-
- this.$emit('keydown', e)
- },
-
- __mask (val) {
- if (val === void 0 || val === null || val === '') { return '' }
-
- if (this.reverseFillMask === true) {
- return this.__maskReverse(val)
- }
-
- const mask = this.computedMask
-
- let valIndex = 0, output = ''
-
- for (let maskIndex = 0; maskIndex < mask.length; maskIndex++) {
- const
- valChar = val[ valIndex ],
- maskDef = mask[ maskIndex ]
-
- if (typeof maskDef === 'string') {
- output += maskDef
- valChar === maskDef && valIndex++
- }
- else if (valChar !== void 0 && maskDef.regex.test(valChar)) {
- output += maskDef.transform !== void 0
- ? maskDef.transform(valChar)
- : valChar
- valIndex++
- }
- else {
- return output
- }
- }
-
- return output
- },
-
- __maskReverse (val) {
- const
- mask = this.computedMask,
- firstTokenIndex = this.maskMarked.indexOf(MARKER)
-
- let valIndex = val.length - 1, output = ''
-
- for (let maskIndex = mask.length - 1; maskIndex >= 0; maskIndex--) {
- const maskDef = mask[ maskIndex ]
-
- let valChar = val[ valIndex ]
-
- if (typeof maskDef === 'string') {
- output = maskDef + output
- valChar === maskDef && valIndex--
- }
- else if (valChar !== void 0 && maskDef.regex.test(valChar)) {
- do {
- output = (maskDef.transform !== void 0 ? maskDef.transform(valChar) : valChar) + output
- valIndex--
- valChar = val[ valIndex ]
- // eslint-disable-next-line no-unmodified-loop-condition
- } while (firstTokenIndex === maskIndex && valChar !== void 0 && maskDef.regex.test(valChar))
- }
- else {
- return output
- }
- }
-
- return output
- },
-
- __unmask (val) {
- return typeof val !== 'string' || this.computedUnmask === void 0
- ? (typeof val === 'number' ? this.computedUnmask('' + val) : val)
- : this.computedUnmask(val)
- },
-
- __fillWithMask (val) {
- if (this.maskReplaced.length - val.length <= 0) {
- return val
- }
-
- return this.reverseFillMask === true && val.length > 0
- ? this.maskReplaced.slice(0, -val.length) + val
- : val + this.maskReplaced.slice(val.length)
- }
- }
-}
diff --git a/ui/src/mixins/validate.js b/ui/src/mixins/validate.js
deleted file mode 100644
index e082b69f477..00000000000
--- a/ui/src/mixins/validate.js
+++ /dev/null
@@ -1,210 +0,0 @@
-import QFormChildBase from '../components/form/QFormChildBase.js'
-import { testPattern } from '../utils/patterns.js'
-
-const lazyRulesValues = [ true, false, 'ondemand' ]
-
-export default {
- mixins: [QFormChildBase],
-
- props: {
- modelValue: {},
-
- error: {
- type: Boolean,
- default: null
- },
- errorMessage: String,
- noErrorIcon: Boolean,
-
- rules: Array,
- reactiveRules: Boolean,
- lazyRules: {
- type: [ Boolean, String ],
- validator: v => lazyRulesValues.includes(v)
- }
- },
-
- data () {
- return {
- isDirty: null,
- innerError: false,
- innerErrorMessage: void 0
- }
- },
-
- watch: {
- modelValue () {
- this.__validateIfNeeded()
- },
-
- reactiveRules: {
- handler (val) {
- if (val === true) {
- if (this.unwatchRules === void 0) {
- this.unwatchRules = this.$watch('rules', () => {
- this.__validateIfNeeded(true)
- })
- }
- }
- else if (this.unwatchRules !== void 0) {
- this.unwatchRules()
- this.unwatchRules = void 0
- }
- },
- immediate: true
- },
-
- focused (focused) {
- if (this.lazyRules !== 'ondemand') {
- if (focused === true) {
- if (this.isDirty === null) {
- this.isDirty = false
- }
- }
- else if (this.isDirty === false && this.hasRules === true) {
- this.isDirty = true
- this.validate()
- }
- }
- }
- },
-
- computed: {
- hasRules () {
- return this.rules !== void 0 &&
- this.rules !== null &&
- this.rules.length > 0
- },
-
- hasError () {
- return this.error === true || this.innerError === true
- },
-
- computedErrorMessage () {
- return typeof this.errorMessage === 'string' && this.errorMessage.length > 0
- ? this.errorMessage
- : this.innerErrorMessage
- }
- },
-
- methods: {
- resetValidation () {
- this.validateIndex++
- this.innerLoading = false
- this.isDirty = null
- this.innerError = false
- this.innerErrorMessage = void 0
- },
-
- /*
- * Return value
- * - true (validation succeeded)
- * - false (validation failed)
- * - Promise (pending async validation)
- */
- validate (val = this.modelValue) {
- if (this.hasRules !== true) {
- return true
- }
-
- this.validateIndex++
-
- if (this.innerLoading !== true && this.lazyRules !== true) {
- this.isDirty = true
- }
-
- const update = (err, msg) => {
- if (this.innerError !== err) {
- this.innerError = err
- }
-
- const m = msg || void 0
-
- if (this.innerErrorMessage !== m) {
- this.innerErrorMessage = m
- }
-
- if (this.innerLoading !== false) {
- this.innerLoading = false
- }
- }
-
- const promises = []
-
- for (let i = 0; i < this.rules.length; i++) {
- const rule = this.rules[ i ]
- let res
-
- if (typeof rule === 'function') {
- res = rule(val)
- }
- else if (typeof rule === 'string' && testPattern[ rule ] !== void 0) {
- res = testPattern[ rule ](val)
- }
-
- if (res === false || typeof res === 'string') {
- update(true, res)
- return false
- }
- else if (res !== true && res !== void 0) {
- promises.push(res)
- }
- }
-
- if (promises.length === 0) {
- update(false)
- return true
- }
-
- if (this.innerLoading !== true) {
- this.innerLoading = true
- }
-
- const index = this.validateIndex
-
- return Promise.all(promises).then(
- res => {
- if (index !== this.validateIndex) {
- return true
- }
-
- if (res === void 0 || Array.isArray(res) === false || res.length === 0) {
- update(false)
- return true
- }
-
- const msg = res.find(r => r === false || typeof r === 'string')
- update(msg !== void 0, msg)
- return msg === void 0
- },
- e => {
- if (index === this.validateIndex) {
- console.error(e)
- update(true)
- return false
- }
-
- return true
- }
- )
- },
-
- __validateIfNeeded (changedRules) {
- if (
- this.hasRules === true &&
- this.lazyRules !== 'ondemand' &&
- (this.isDirty === true || (this.lazyRules !== true && changedRules !== true))
- ) {
- this.validate()
- }
- }
- },
-
- mounted () {
- this.validateIndex = 0
- },
-
- beforeUnmount () {
- this.unwatchRules !== void 0 && this.unwatchRules()
- }
-}
|
3ed7502492811bb33080f4a0985478c9327bd2c1
|
2021-02-27 07:58:16
|
Razvan Stoenescu
|
feat(docs): update the PWA pages with the latest new features
| false
|
update the PWA pages with the latest new features
|
feat
|
diff --git a/docs/src/assets/menu.js b/docs/src/assets/menu.js
index 84bc38ea32d..906f19c6c95 100644
--- a/docs/src/assets/menu.js
+++ b/docs/src/assets/menu.js
@@ -321,6 +321,11 @@ const cli = [
{
name: 'Handling Service Worker',
path: 'handling-service-worker'
+ },
+ {
+ name: 'PWA with Typescript',
+ badge: 'new',
+ path: 'pwa-with-typescript'
}
]
},
@@ -462,6 +467,11 @@ const cli = [
name: 'Frameless Electron Window',
path: 'frameless-electron-window'
},
+ {
+ name: 'Electron with Typescript',
+ badge: 'new',
+ path: 'electron-with-typescript'
+ },
{
name: 'Electron Security Concerns',
path: 'electron-security-concerns'
diff --git a/docs/src/pages/quasar-cli/developing-electron-apps/configuring-electron.md b/docs/src/pages/quasar-cli/developing-electron-apps/configuring-electron.md
index 35533eb9bf1..0cb70e74494 100644
--- a/docs/src/pages/quasar-cli/developing-electron-apps/configuring-electron.md
+++ b/docs/src/pages/quasar-cli/developing-electron-apps/configuring-electron.md
@@ -60,6 +60,10 @@ electron: {
chainWebpackMain (chain) {
// chain is a webpack-chain instance
// of the Webpack configuration
+
+ // example:
+ // chain.plugin('eslint-webpack-plugin')
+ // .use(ESLintPlugin, [{ extensions: [ 'js' ] }])
},
// optional; webpack config Object for
@@ -74,6 +78,10 @@ electron: {
chainWebpackPreload (chain) {
// chain is a webpack-chain instance
// of the Webpack configuration
+
+ // example:
+ // chain.plugin('eslint-webpack-plugin')
+ // .use(ESLintPlugin, [{ extensions: [ 'js' ] }])
}
}
```
diff --git a/docs/src/pages/quasar-cli/developing-electron-apps/electron-with-typescript.md b/docs/src/pages/quasar-cli/developing-electron-apps/electron-with-typescript.md
new file mode 100644
index 00000000000..37df4069285
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-electron-apps/electron-with-typescript.md
@@ -0,0 +1,12 @@
+---
+title: Electron with Typescript
+desc: How to use Typescript with Electron in Quasar
+---
+
+In order to support Electron with Typescript, you will need to:
+
+1. Make sure that you are using `@quasar/app` v3.0.0-beta.8+
+2. Edit quasar.conf.js > supportTS. Set it to `true` or use the Object form.
+3. Rename the extension for your files in /src-electron from `.js` to `.ts` and make the necessary TS code changes.
+
+More info: [Supporting TS](/quasar-cli/supporting-ts)
diff --git a/docs/src/pages/quasar-cli/developing-pwa/configuring-pwa.md b/docs/src/pages/quasar-cli/developing-pwa/configuring-pwa.md
index 870fc7f8467..a892a98e85c 100644
--- a/docs/src/pages/quasar-cli/developing-pwa/configuring-pwa.md
+++ b/docs/src/pages/quasar-cli/developing-pwa/configuring-pwa.md
@@ -7,22 +7,23 @@ related:
## Service Worker
Adding PWA mode to a Quasar project means a new folder will be created: `/src-pwa`, which contains PWA specific files:
+
```bash
.
└── src-pwa/
- ├── register-service-worker.js # App-code *managing* service worker
- └── custom-service-worker.js # Optional custom service worker
- # file (InjectManifest mode ONLY)
+ ├── register-service-worker.js # (or .ts) App-code *managing* service worker
+ └── custom-service-worker.js # (or .ts) Optional custom service worker file
+ # (InjectManifest mode ONLY)
```
You can freely edit these files. Notice a few things:
-1. `register-service-worker.js` is automatically imported into your app (like any other /src file). It registers the service worker (created by Workbox or your custom one, depending on workbox plugin mode -- quasar.conf.js > pwa > workboxPluginMode) and you can listen for Service Worker's events. You can use ES6 code.
-2. `custom-service-worker.js` will be your service worker file ONLY if workbox plugin mode is set to "InjectManifest" (quasar.conf.js > pwa > workboxPluginMode: 'InjectManifest'). Otherwise, Workbox will create a service-worker file for you.
+1. `register-service-worker.[js|ts]` is automatically imported into your app (like any other /src file). It registers the service worker (created by Workbox or your custom one, depending on workbox plugin mode -- quasar.conf.js > pwa > workboxPluginMode) and you can listen for Service Worker's events. You can use ES6 code.
+2. `custom-service-worker.[js|ts]` will be your service worker file ONLY if workbox plugin mode is set to "InjectManifest" (quasar.conf.js > pwa > workboxPluginMode: 'InjectManifest'). Otherwise, Workbox will create a service-worker file for you.
3. It makes sense to run [Lighthouse](https://developers.google.com/web/tools/lighthouse/) tests on production builds only.
::: tip
-Read more on `register-service-worker.js` and how to interact with the Service Worker on [Handling Service Worker](/quasar-cli/developing-pwa/handling-service-worker) documentation page.
+Read more on `register-service-worker.[js|ts]` and how to interact with the Service Worker on [Handling Service Worker](/quasar-cli/developing-pwa/handling-service-worker) documentation page.
:::
## Quasar.conf.js
@@ -83,6 +84,26 @@ pwa: {
// it's Boolean false by default
}
]
+ },
+
+ // optional; webpack config Object for
+ // the custom service worker ONLY (/src-pwa/custom-service-worker.[js|ts])
+ // if using workbox in InjectManifest mode
+ extendWebpackCustomSW (cfg) {
+ // directly change props of cfg;
+ // no need to return anything
+ },
+
+ // optional; EQUIVALENT to extendWebpackCustomSW() but uses webpack-chain;
+ // for the custom service worker ONLY (/src-pwa/custom-service-worker.[js|ts])
+ // if using workbox in InjectManifest mode
+ chainWebpackCustomSW (chain) {
+ // chain is a webpack-chain instance
+ // of the Webpack configuration
+
+ // example:
+ // chain.plugin('eslint-webpack-plugin')
+ // .use(ESLintPlugin, [{ extensions: [ 'js' ] }])
}
}
```
@@ -141,10 +162,19 @@ When NOT to use InjectManifest:
* You want the easiest path to adding a service worker to your site.
::: tip TIPS
-* If you want to use this mode, you will have to write the service worker (/src-pwa/custom-service-worker.js) file by yourself.
+* If you want to use this mode, you will have to write the service worker (`/src-pwa/custom-service-worker.[js|ts]`) file by yourself.
* Please check the available workboxOptions for this mode on [Workbox website](https://developers.google.com/web/tools/workbox/modules/workbox-webpack-plugin#full_injectmanifest_config).
:::
+The following snippet is the default code for a custom service worker (`/src-pwa/custom-service-worker.[js|ts]`):
+
+```js
+import { precacheAndRoute } from 'workbox-precaching'
+
+// Use with precache injection
+precacheAndRoute(self.__WB_MANIFEST)
+```
+
## Configuring Manifest File
The Manifest file is generated by Quasar CLI with a default configuration for it. You can however tweak this configuration from `/quasar.conf.js`.
@@ -199,7 +229,7 @@ Note that you don't need to edit your index.html file (generated from `/src/inde
::::
::: tip
-(@quasar/app v2.1.10+) If your PWA is behind basic auth or requires an Authorization header, set quasar.conf.js > pwa > useCredentials to true to include `crossorigin="use-credentials"` on the manifest.json meta tag.
+If your PWA is behind basic auth or requires an Authorization header, set quasar.conf.js > pwa > useCredentials to true to include `crossorigin="use-credentials"` on the manifest.json meta tag.
::::
## PWA Checklist
diff --git a/docs/src/pages/quasar-cli/developing-pwa/preparation.md b/docs/src/pages/quasar-cli/developing-pwa/preparation.md
index fccc02cd58c..4f8c7302931 100644
--- a/docs/src/pages/quasar-cli/developing-pwa/preparation.md
+++ b/docs/src/pages/quasar-cli/developing-pwa/preparation.md
@@ -4,6 +4,7 @@ desc: How to add PWA mode with Quasar CLI.
related:
- /quasar-cli/quasar-conf-js
---
+
We'll be using Quasar CLI to develop and build a PWA. The difference between building a SPA, Mobile App, Electron App, PWA or SSR is simply determined by the "mode" parameter in "quasar dev" and "quasar build" commands.
In order to build a PWA, we first need to add the PWA mode to our Quasar project:
@@ -25,7 +26,12 @@ A new folder will appear in your project folder (which is explained in detail on
```bash
.
└── src-pwa/
- ├── register-service-worker.js # App-code *managing* service worker
- └── custom-service-worker.js # Optional custom service worker
- # file (InjectManifest mode oNLY)
+ ├── register-service-worker.js # (or .ts) App-code *managing* service worker
+ └── custom-service-worker.js # (or .ts) Optional custom service worker file
+ # (InjectManifest mode ONLY)
```
+
+Both files are going to be detailed in the next pages, but the high overview is:
+
+* The `register-service-worker.[js|ts]` file is part of the UI code and communicates with the service worker.
+* When using InjectManifest, you can write your own custom service worker (`custom-service-worker.[js|ts]`).
diff --git a/docs/src/pages/quasar-cli/developing-pwa/pwa-with-typescript.md b/docs/src/pages/quasar-cli/developing-pwa/pwa-with-typescript.md
new file mode 100644
index 00000000000..8a21a0cd63e
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-pwa/pwa-with-typescript.md
@@ -0,0 +1,12 @@
+---
+title: PWA with Typescript
+desc: How to use Typescript with Quasar PWA
+---
+
+In order to support PWA with Typescript, you will need to:
+
+1. Make sure that you are using `@quasar/app` v3.0.0-beta.8+
+2. Edit quasar.conf.js > supportTS. Set it to `true` or use the Object form.
+3. Rename the extension for your files in /src-pwa from `.js` to `.ts` and make the necessary TS code changes.
+
+More info: [Supporting TS](/quasar-cli/supporting-ts)
|
a67c92d77263c18860931a837df3eb6ad40cced6
|
2021-03-16 21:37:05
|
troy351
|
feat(ts): add shim-lang.d.ts for typescript (#8624)
| false
|
add shim-lang.d.ts for typescript (#8624)
|
feat
|
diff --git a/ui/build/build.types.js b/ui/build/build.types.js
index dbb7066f7f9..fbe6af8a0c1 100644
--- a/ui/build/build.types.js
+++ b/ui/build/build.types.js
@@ -402,6 +402,7 @@ function writeIndexDTS (apis) {
// which by defaults would be ignored because inside node_modules
// and not directly referenced by any file
writeLine(contents, 'import \'./shim-icon-set\'')
+ writeLine(contents, 'import \'./shim-lang\'')
writeFile(resolvePath('index.d.ts'), contents.join(''))
}
diff --git a/ui/types/shim-lang.d.ts b/ui/types/shim-lang.d.ts
new file mode 100644
index 00000000000..2dacbdea344
--- /dev/null
+++ b/ui/types/shim-lang.d.ts
@@ -0,0 +1,7 @@
+declare module "quasar/lang/*" {
+ // We know "quasar" will exists at runtime, we can safely ignore the TS error
+ // @ts-ignore
+ import { QuasarLanguage } from "quasar";
+ const lang: QuasarLanguage;
+ export default lang;
+}
|
725a819bbe1e925f1efc57648101b292044347a1
|
2020-02-08 08:41:01
|
Razvan Stoenescu
|
chore(ui/dev): update fab-extended demo page
| false
|
update fab-extended demo page
|
chore
|
diff --git a/ui/dev/src/pages/components/fab-extended.vue b/ui/dev/src/pages/components/fab-extended.vue
index 14a0a7a7de3..5a68ef337ae 100644
--- a/ui/dev/src/pages/components/fab-extended.vue
+++ b/ui/dev/src/pages/components/fab-extended.vue
@@ -3,7 +3,7 @@
<q-header elevated>
<q-toolbar class="q-gutter-md justify-around">
<q-select dark color="yellow" borderless square v-model="fabDirection" :options="fabDirections" label="FAB open direction" style="min-width: 150px" />
- <q-select dark color="yellow" borderless square v-model="fabAnchor" :options="fabAnchors" label="FAB anchor" style="min-width: 150px" />
+ <q-select dark color="yellow" borderless square v-model="fabVerticalAlign" :options="fabVerticalAligns" label="FAB v-align" style="min-width: 150px" />
<q-select dark color="yellow" borderless square v-model="fabLabelPosition" :options="fabLabelPositions" label="Label position" style="min-width: 150px" />
<q-toggle dark color="yellow" v-model="fabExternalLabel" label="External label" />
<q-toggle dark color="yellow" v-model="fabSquare" label="Square" />
@@ -23,9 +23,9 @@
<q-fab
:direction="fabDirection"
color="primary"
- :label="`Actions aligned ${fabAnchor}`"
+ :label="`Actions aligned ${fabVerticalAlign}`"
:label-position="fabLabelPosition"
- :actions-vertical-align="fabAnchor"
+ :actions-vertical-align="fabVerticalAlign"
:square="fabSquare"
:external-label="fabExternalLabel"
:hide-label="hideLabel"
@@ -139,7 +139,7 @@ export default {
data () {
return {
fabDirection: 'up',
- fabAnchor: 'center',
+ fabVerticalAlign: 'center',
fabExtended: true,
fabExternalLabel: true,
fabLabelPosition: 'right',
@@ -148,7 +148,7 @@ export default {
withLabelClass: false,
fabDirections: [ 'right', 'left', 'up', 'down' ],
- fabAnchors: [ 'center', 'left', 'right' ],
+ fabVerticalAligns: [ 'center', 'left', 'right' ],
fabLabelPositions: [ 'right', 'left', 'top', 'bottom' ]
}
},
@@ -164,14 +164,14 @@ export default {
if (this.fabDirection === 'up') {
return {
position: 'bottom',
- offset: [ this.fabAnchor === 'center' ? 0 : 18, 18 ]
+ offset: [ this.fabVerticalAlign === 'center' ? 0 : 18, 18 ]
}
}
if (this.fabDirection === 'down') {
return {
position: 'top',
- offset: [ this.fabAnchor === 'center' ? 0 : 18, 18 ]
+ offset: [ this.fabVerticalAlign === 'center' ? 0 : 18, 18 ]
}
}
|
af1dbab7c1b02c7d97af1e2169a32d7d38df3893
|
2023-06-13 14:45:50
|
Leon Klute
|
feat(create-quasar): added $api to ts interface, to enable ts recognition of this.$api as an AxiosInstance (discussion #15924) (#15925)
| false
|
added $api to ts interface, to enable ts recognition of this.$api as an AxiosInstance (discussion #15924) (#15925)
|
feat
|
diff --git a/create-quasar/templates/app/quasar-v2/ts-vite/axios/src/boot/axios.ts b/create-quasar/templates/app/quasar-v2/ts-vite/axios/src/boot/axios.ts
index 408a99dcca7..05a99449ea9 100644
--- a/create-quasar/templates/app/quasar-v2/ts-vite/axios/src/boot/axios.ts
+++ b/create-quasar/templates/app/quasar-v2/ts-vite/axios/src/boot/axios.ts
@@ -4,6 +4,7 @@ import axios, { AxiosInstance } from 'axios';
declare module '@vue/runtime-core' {
interface ComponentCustomProperties {
$axios: AxiosInstance;
+ $api: AxiosInstance;
}
}
diff --git a/create-quasar/templates/app/quasar-v2/ts-webpack/axios/src/boot/axios.ts b/create-quasar/templates/app/quasar-v2/ts-webpack/axios/src/boot/axios.ts
index 408a99dcca7..05a99449ea9 100644
--- a/create-quasar/templates/app/quasar-v2/ts-webpack/axios/src/boot/axios.ts
+++ b/create-quasar/templates/app/quasar-v2/ts-webpack/axios/src/boot/axios.ts
@@ -4,6 +4,7 @@ import axios, { AxiosInstance } from 'axios';
declare module '@vue/runtime-core' {
interface ComponentCustomProperties {
$axios: AxiosInstance;
+ $api: AxiosInstance;
}
}
|
55d2a6f1e742d1dab4f9728f59363294da9c514e
|
2019-07-03 18:44:25
|
Razvan Stoenescu
|
chore: Bump version
| false
|
Bump version
|
chore
|
diff --git a/ui/package.json b/ui/package.json
index bde6c347fea..7a88838d793 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "quasar",
- "version": "1.0.0",
+ "version": "1.0.1",
"description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
"module": "src/index.esm.js",
"typings": "dist/types/index.d.ts",
|
8a4a5eae72fbae8810f0253521831c25cba845cf
|
2024-04-24 18:05:42
|
Razvan Stoenescu
|
chore(ci): update pr tests
| false
|
update pr tests
|
chore
|
diff --git a/.github/workflows/tests-on-pr-report.yml b/.github/workflows/tests-on-pr-report.yml
index c58c98607bf..c18f145228a 100644
--- a/.github/workflows/tests-on-pr-report.yml
+++ b/.github/workflows/tests-on-pr-report.yml
@@ -70,5 +70,5 @@ jobs:
commit: ${{ github.event.workflow_run.head_sha }}
event_file: event-data/event.json
event_name: ${{ github.event.workflow_run.event }}
- files: 'test-results/*.json'
+ files: 'test-results/*.xml'
check_name: 'UI Tests Results'
diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml
index 9859461afb0..4abddeae1e0 100644
--- a/.github/workflows/tests-on-pr.yml
+++ b/.github/workflows/tests-on-pr.yml
@@ -104,7 +104,7 @@ jobs:
path: vite-plugin/dist
- name: Run tests
- run: pnpm test:workflow
+ run: pnpm test
# Upload required artifacts to be used in tests-on-pr-report.yml
diff --git a/ui/package.json b/ui/package.json
index 33508e983ed..042d4e657cf 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -26,7 +26,6 @@
"lint": "eslint --ext .js,.cjs,.mjs,.vue ./ --fix --report-unused-disable-directives",
"format:types": "prettier --write \"types/**/*.{d.ts,ts,json}\"",
"test": "pnpm --filter quasar-ui-test test",
- "test:workflow": "pnpm --filter quasar-ui-test test:workflow",
"test:watch": "pnpm --filter quasar-ui-test test:watch",
"test:watch:ui": "pnpm --filter quasar-ui-test test:watch:ui",
"test:specs": "node ./testing/specs/script.js",
diff --git a/ui/testing/package.json b/ui/testing/package.json
index 8cc4650b963..8727393b417 100644
--- a/ui/testing/package.json
+++ b/ui/testing/package.json
@@ -4,7 +4,6 @@
"private": true,
"scripts": {
"test": "vitest run",
- "test:workflow": "vitest run --reporter=json --outputFile=./test-results/vitest.json",
"test:watch": "vitest watch",
"test:watch:ui": "vitest watch --ui",
"coverage": "vitest run --coverage"
diff --git a/ui/testing/vitest.config.js b/ui/testing/vitest.config.js
index 4de12230e38..825d11c34dd 100644
--- a/ui/testing/vitest.config.js
+++ b/ui/testing/vitest.config.js
@@ -9,6 +9,17 @@ const resolve = _path => join(rootFolder, _path)
import { quasar, transformAssetUrls } from '@quasar/vite-plugin'
+function getReporterConfig () {
+ if (process.env.GITHUB_ACTIONS) {
+ return {
+ outputFile: 'test-results/report.xml',
+ reporters: 'junit'
+ }
+ }
+
+ return {}
+}
+
export default defineConfig(() => {
return {
plugins: [
@@ -31,6 +42,7 @@ export default defineConfig(() => {
},
test: {
+ ...getReporterConfig(),
globals: true,
environment: 'jsdom',
environmentOptions: {
|
baa3e798b882d275ae72430534e102de7c92bfe9
|
2021-12-13 20:44:15
|
MT
|
feat(ts): Improve useDialogPluginComponent types (#11651)
| false
|
Improve useDialogPluginComponent types (#11651)
|
feat
|
diff --git a/ui/types/composables.d.ts b/ui/types/composables.d.ts
index 493c7f0731b..010c657ff61 100644
--- a/ui/types/composables.d.ts
+++ b/ui/types/composables.d.ts
@@ -6,15 +6,15 @@ import { Ref } from "vue";
import { QVueGlobals } from "./globals";
interface useDialogPluginComponent {
- (): {
+ <T = any>(): {
dialogRef: Ref<QDialog | undefined>;
onDialogHide: () => void;
- onDialogOK: (payload?: any) => void;
+ onDialogOK: (payload?: T) => void;
onDialogCancel: () => void;
};
emits: ['ok', 'hide'];
emitsObject: {
- ok: () => true;
+ ok: (payload?: any) => true;
hide: () => true;
}
}
|
fce95413ab7f520e149e033f5bc91132233f05f7
|
2017-10-04 14:08:17
|
Razvan Stoenescu
|
feat: Enhance QEditor
| false
|
Enhance QEditor
|
feat
|
diff --git a/src/components/editor/QEditor.js b/src/components/editor/QEditor.js
index 7468f5505bd..7142dddd1b9 100644
--- a/src/components/editor/QEditor.js
+++ b/src/components/editor/QEditor.js
@@ -1,5 +1,5 @@
import { getEventKey } from '../../utils/event'
-import { getToolbar, getFonts } from './editor-utils'
+import { getToolbar, getFonts, getContentObject } from './editor-utils'
import { buttons } from './editor-definitions'
import { Caret } from './editor-caret'
import extend from '../../utils/extend'
@@ -179,6 +179,9 @@ export default {
},
focus () {
this.$refs.content.focus()
+ },
+ getContentObject () {
+ return getContentObject(this.$refs.content).children
}
},
created () {
diff --git a/src/components/editor/editor-utils.js b/src/components/editor/editor-utils.js
index 002051cb8bf..41e691a0838 100644
--- a/src/components/editor/editor-utils.js
+++ b/src/components/editor/editor-utils.js
@@ -194,3 +194,58 @@ export function getFonts (defaultFont, fonts = {}) {
return def
}
+
+const camelizeRE = /(?:^|[-])(\w)/g
+function camelize (str) {
+ return str.replace(
+ camelizeRE,
+ (_, c) => c ? c.toUpperCase() : ''
+ )
+}
+
+function getStyleObject (el) {
+ const output = {}
+
+ el.style.cssText.split(';').forEach(rule => {
+ if (rule) {
+ const parts = rule.split(':')
+ output[ camelize(parts[0].trim()) ] = parts[1].trim()
+ }
+ })
+
+ return output
+}
+
+export function getContentObject (el) {
+ if (el.nodeType === Node.TEXT_NODE) {
+ return {
+ nodeType: Node.TEXT_NODE,
+ text: el.textContent
+ }
+ }
+
+ const node = {
+ nodeType: el.nodeType,
+ tagName: el.tagName,
+ attributes: {}
+ }
+
+ Array.from(el.attributes, ({name, value}) => {
+ if (name === 'style') {
+ node.style = getStyleObject(el)
+ }
+ else {
+ node.attributes[name] = value
+ }
+ })
+
+ const children = Array.from(el.childNodes, getContentObject)
+ if (children.length === 1 && children[0].nodeType === Node.TEXT_NODE) {
+ node.text = children[0].text
+ }
+ else {
+ node.children = children
+ }
+
+ return node
+}
|
a8a510fabe97398e7322bcd86e39d92ecc8a8b89
|
2023-01-04 23:11:31
|
Razvan Stoenescu
|
feat(docs): remove doc-link letter spacing
| false
|
remove doc-link letter spacing
|
feat
|
diff --git a/docs/src/components/DocLink.vue b/docs/src/components/DocLink.vue
index 6a117fd34ce..fdb6dfeb69c 100644
--- a/docs/src/components/DocLink.vue
+++ b/docs/src/components/DocLink.vue
@@ -35,7 +35,6 @@ const internal = computed(() => props.to.charAt(0) === '/')
border-bottom: 1px dotted currentColor
outline: 0
transition: opacity .2s
- letter-spacing: $letter-spacing
&:hover
opacity: .8
|
7f7cd60a442dc00d9eb0383a2abb0ed09e18f437
|
2018-04-17 18:04:50
|
William Pain
|
fix(QUploader): Set `uploading` to false when abort upload (#1944)
| false
|
Set `uploading` to false when abort upload (#1944)
|
fix
|
diff --git a/src/components/uploader/QUploader.vue b/src/components/uploader/QUploader.vue
index f1daf91bb49..6a7cef9bc2e 100644
--- a/src/components/uploader/QUploader.vue
+++ b/src/components/uploader/QUploader.vue
@@ -507,6 +507,7 @@ export default {
},
abort () {
this.xhrs.forEach(xhr => { xhr.abort() })
+ this.uploading = false
},
reset () {
this.abort()
|
cc39db03a624e6e86c6e2fb83eb32ea1063832d7
|
2019-10-03 15:14:41
|
Popescu Dan
|
fix(QAjaxBar): don't auto-increment on start with speed 0 (#5215)
| false
|
don't auto-increment on start with speed 0 (#5215)
|
fix
|
diff --git a/ui/dev/components/components/ajax-bar.vue b/ui/dev/components/components/ajax-bar.vue
index 3796e7e6056..9c2dbba6c73 100644
--- a/ui/dev/components/components/ajax-bar.vue
+++ b/ui/dev/components/components/ajax-bar.vue
@@ -6,10 +6,22 @@
</p>
<q-card style="margin-top: 25px">
- <q-card-section class="bg-primary text-center">
+ <q-card-section class="bg-primary text-center row q-gutter-sm">
<q-btn push color="orange" @click="trigger()">
Trigger Event
</q-btn>
+
+ <q-btn push color="green" @click="manualStart()" :disable="manualStarted">
+ Start manual
+ </q-btn>
+
+ <q-btn push color="blue" @click="manualIncrement()" :disable="manualStarted !== true">
+ Random manual increment
+ </q-btn>
+
+ <q-btn push color="red" @click="manualStop()" :disable="manualStarted !== true">
+ Stop manual
+ </q-btn>
</q-card-section>
<p class="caption text-center">
@@ -55,6 +67,8 @@ export default {
reverse: false,
size: 20,
+ manualStarted: false,
+
timeouts: []
}
},
@@ -72,6 +86,20 @@ export default {
this.$refs.bar.stop()
}
}, Math.random() * 3000 + 1000)
+ },
+
+ manualStart () {
+ this.$refs.bar.start(0)
+ this.manualStarted = true
+ },
+
+ manualIncrement () {
+ this.$refs.bar.increment(Math.random() * 20)
+ },
+
+ manualStop () {
+ this.$refs.bar.stop()
+ this.manualStarted = false
}
}
}
diff --git a/ui/src/components/ajax-bar/QAjaxBar.js b/ui/src/components/ajax-bar/QAjaxBar.js
index 1ab029f7d5e..bc768117f5c 100644
--- a/ui/src/components/ajax-bar/QAjaxBar.js
+++ b/ui/src/components/ajax-bar/QAjaxBar.js
@@ -153,14 +153,15 @@ export default Vue.extend({
clearTimeout(this.timer)
this.$emit('start')
+ this.progress = 0
+
if (this.onScreen) { return }
- this.progress = 0
this.onScreen = true
this.animate = false
this.timer = setTimeout(() => {
this.animate = true
- this.__work(speed)
+ speed > 0 && this.__work(speed)
}, 100)
},
@@ -202,7 +203,7 @@ export default Vue.extend({
},
mounted () {
- if (!this.skipHijack) {
+ if (this.skipHijack !== true) {
this.hijacked = true
highjackAjax(this.start, this.stop)
}
diff --git a/ui/src/components/ajax-bar/QAjaxBar.json b/ui/src/components/ajax-bar/QAjaxBar.json
index cbc8ebe6faf..c96e7659487 100644
--- a/ui/src/components/ajax-bar/QAjaxBar.json
+++ b/ui/src/components/ajax-bar/QAjaxBar.json
@@ -47,8 +47,8 @@
"params": {
"speed": {
"type": "Number",
- "desc": "Delay (in milliseconds) between bar progress increments",
- "examples": [ 400 ]
+ "desc": "Delay (in milliseconds) between bar progress increments; Use a value of 0 to disable auto-increment",
+ "examples": [ 400, 0 ]
}
}
},
@@ -58,8 +58,8 @@
"params": {
"amount": {
"type": "Number",
- "desc": "Amount (0.0 < x < 1.0) to increment with",
- "examples": [ 0.1 ]
+ "desc": "Amount (0 < x <= 100) to increment with",
+ "examples": [ 1 ]
}
}
},
|
bfefeaafcd87734945f296b21841a54687f68b88
|
2021-12-01 17:55:25
|
Razvan Stoenescu
|
feat(docs): update quasar.conf > devServer according to breaking changes in webpack-dev-server 4.5+
| false
|
update quasar.conf > devServer according to breaking changes in webpack-dev-server 4.5+
|
feat
|
diff --git a/docs/src/pages/quasar-cli/developing-pwa/handling-service-worker.md b/docs/src/pages/quasar-cli/developing-pwa/handling-service-worker.md
index 109b855a34a..8968e855657 100644
--- a/docs/src/pages/quasar-cli/developing-pwa/handling-service-worker.md
+++ b/docs/src/pages/quasar-cli/developing-pwa/handling-service-worker.md
@@ -68,10 +68,10 @@ devServer: {
options: {
// Use ABSOLUTE paths or path.join(__dirname, 'root/relative/path')
- cacert: '/path/to/ca.pem',
- pfx: '/path/to/server.pfx',
- key: '/path/to/server.key',
- cert: '/path/to/server.crt',
+ key: "/path/to/server.key",
+ pfx: "/path/to/server.pfx",
+ cert: "/path/to/server.crt",
+ ca: "/path/to/ca.pem",
passphrase: 'webpack-dev-server' // do you need it?
}
}
diff --git a/docs/src/pages/quasar-cli/quasar-conf-js.md b/docs/src/pages/quasar-cli/quasar-conf-js.md
index 8041b605542..f056906281d 100644
--- a/docs/src/pages/quasar-cli/quasar-conf-js.md
+++ b/docs/src/pages/quasar-cli/quasar-conf-js.md
@@ -250,10 +250,10 @@ devServer: {
options: {
// Use ABSOLUTE paths or path.join(__dirname, 'root/relative/path')
- cacert: '/path/to/ca.pem',
- pfx: '/path/to/server.pfx',
- key: '/path/to/server.key',
- cert: '/path/to/server.crt',
+ key: "/path/to/server.key",
+ pfx: "/path/to/server.pfx",
+ cert: "/path/to/server.crt",
+ ca: "/path/to/ca.pem",
passphrase: 'webpack-dev-server' // do you need it?
}
}
|
9998e9f4b2e31e5ede706e8d3c53e6fb74e473c3
|
2021-05-21 22:43:35
|
Razvan Stoenescu
|
feat(Morph): avoid directly importing from vue/runtime-dom
| false
|
avoid directly importing from vue/runtime-dom
|
feat
|
diff --git a/ui/src/directives/Morph.ssr.js b/ui/src/directives/Morph.ssr.js
index cecce7df423..96d32b8d10e 100644
--- a/ui/src/directives/Morph.ssr.js
+++ b/ui/src/directives/Morph.ssr.js
@@ -1,4 +1,21 @@
-import { createObjectProperty } from '@vue/compiler-dom'
+// import { createObjectProperty } from '@vue/compiler-dom'
+
+// export default (dir) => {
+// const name = dir.arg
+// ? '\'' + dir.arg.content.split(':')[ 0 ] + '\''
+// : false
+
+// return {
+// props: [
+// createObjectProperty(
+// 'class',
+// `${ dir.exp.content } && ${dir.exp.content}.model === ${ name } ? '' : 'q-morph--invisible'`
+// )
+// ]
+// }
+// }
+
+// temporarily avoid importing from @vue/compiler-dom
export default (dir) => {
const name = dir.arg
@@ -7,10 +24,22 @@ export default (dir) => {
return {
props: [
- createObjectProperty(
- 'class',
- `${ dir.exp.content } === ${ name } ? '' : 'q-morph--invisible'`
- )
+ {
+ type: 16,
+ loc: {
+ source: '',
+ start: { line: 1, column: 1, offset: 0 },
+ end: { line: 1, column: 1, offset: 0 }
+ },
+ key: {
+ type: 4,
+ loc: { source: '', start: { line: 1, column: 1, offset: 0 }, end: { line: 1, column: 1, offset: 0 } },
+ content: 'class',
+ isStatic: true,
+ constType: 3
+ },
+ value: `${ dir.exp.content } && ${ dir.exp.content }.model === ${ name } ? '' : 'q-morph--invisible'`
+ }
]
}
}
|
ae66503ced0e17b35c098bc807292f40c9e061fb
|
2024-05-04 01:02:06
|
Razvan Stoenescu
|
chore(QDialog): simplify "position" validator declaration
| false
|
simplify "position" validator declaration
|
chore
|
diff --git a/ui/src/components/dialog/QDialog.js b/ui/src/components/dialog/QDialog.js
index 8224566c3f5..5823d3717df 100644
--- a/ui/src/components/dialog/QDialog.js
+++ b/ui/src/components/dialog/QDialog.js
@@ -69,7 +69,7 @@ export default createComponent({
position: {
type: String,
default: 'standard',
- validator: val => (val === 'standard' || [ 'top', 'bottom', 'left', 'right' ].includes(val))
+ validator: val => [ 'standard', 'top', 'bottom', 'left', 'right' ].includes(val)
}
},
|
a6e7d4e2204214a2b5224d19219925189e0cf6ad
|
2020-05-01 18:54:19
|
Razvan Stoenescu
|
chore(app): Bump version
| false
|
Bump version
|
chore
|
diff --git a/app/package.json b/app/package.json
index 5f01d2e90b3..0a473b238b9 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/app",
- "version": "1.8.1",
+ "version": "1.8.2",
"description": "Quasar Framework local CLI",
"bin": {
"quasar": "./bin/quasar"
|
ec2ca6c46c700e688b3ea9ce506a444ac1c60d3a
|
2019-07-11 17:59:31
|
Razvan Stoenescu
|
chore(ui): update deps
| false
|
update deps
|
chore
|
diff --git a/babel-preset-app/yarn.lock b/babel-preset-app/yarn.lock
index 5c24b3c4e27..accae518518 100644
--- a/babel-preset-app/yarn.lock
+++ b/babel-preset-app/yarn.lock
@@ -29,17 +29,6 @@
semver "^5.4.1"
source-map "^0.5.0"
-"@babel/generator@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
- integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
- dependencies:
- "@babel/types" "^7.4.4"
- jsesc "^2.5.1"
- lodash "^4.17.11"
- source-map "^0.5.0"
- trim-right "^1.0.1"
-
"@babel/generator@^7.5.0":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.0.tgz#f20e4b7a91750ee8b63656073d843d2a736dca4a"
@@ -75,19 +64,7 @@
"@babel/traverse" "^7.4.4"
"@babel/types" "^7.4.4"
-"@babel/helper-create-class-features-plugin@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz#fc3d690af6554cc9efc607364a82d48f58736dba"
- integrity sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==
- dependencies:
- "@babel/helper-function-name" "^7.1.0"
- "@babel/helper-member-expression-to-functions" "^7.0.0"
- "@babel/helper-optimise-call-expression" "^7.0.0"
- "@babel/helper-plugin-utils" "^7.0.0"
- "@babel/helper-replace-supers" "^7.4.4"
- "@babel/helper-split-export-declaration" "^7.4.4"
-
-"@babel/helper-create-class-features-plugin@^7.5.0":
+"@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.5.0":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.0.tgz#02edb97f512d44ba23b3227f1bf2ed43454edac5"
integrity sha512-EAoMc3hE5vE5LNhMqDOwB1usHvmRjCDAnH8CD4PVkX9/Yr3W/tcz8xE8QvdZxfsFBDICwZnF2UTHIqslRpvxmA==
@@ -240,20 +217,15 @@
"@babel/types" "^7.5.0"
"@babel/highlight@^7.0.0":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
- integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
+ integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
dependencies:
chalk "^2.0.0"
esutils "^2.0.2"
js-tokens "^4.0.0"
-"@babel/parser@^7.4.4", "@babel/parser@^7.4.5":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872"
- integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==
-
-"@babel/parser@^7.5.0":
+"@babel/parser@^7.4.4", "@babel/parser@^7.5.0":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.0.tgz#3e0713dff89ad6ae37faec3b29dcfc5c979770b7"
integrity sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==
@@ -779,22 +751,7 @@
"@babel/parser" "^7.4.4"
"@babel/types" "^7.4.4"
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216"
- integrity sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==
- dependencies:
- "@babel/code-frame" "^7.0.0"
- "@babel/generator" "^7.4.4"
- "@babel/helper-function-name" "^7.1.0"
- "@babel/helper-split-export-declaration" "^7.4.4"
- "@babel/parser" "^7.4.5"
- "@babel/types" "^7.4.4"
- debug "^4.1.0"
- globals "^11.1.0"
- lodash "^4.17.11"
-
-"@babel/traverse@^7.5.0":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.0":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.0.tgz#4216d6586854ef5c3c4592dab56ec7eb78485485"
integrity sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==
@@ -809,16 +766,7 @@
globals "^11.1.0"
lodash "^4.17.11"
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
- integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
- dependencies:
- esutils "^2.0.2"
- lodash "^4.17.11"
- to-fast-properties "^2.0.0"
-
-"@babel/types@^7.5.0":
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.4", "@babel/types@^7.5.0":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.0.tgz#e47d43840c2e7f9105bc4d3a2c371b4d0c7832ab"
integrity sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==
@@ -910,19 +858,19 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"
-browserslist@^4.6.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.0.tgz#5274028c26f4d933d5b1323307c1d1da5084c9ff"
- integrity sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==
+browserslist@^4.6.0, browserslist@^4.6.2:
+ version "4.6.4"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.4.tgz#fd0638b3f8867fec2c604ed0ed9300379f8ec7c2"
+ integrity sha512-ErJT8qGfRt/VWHSr1HeqZzz50DvxHtr1fVL1m5wf20aGrG8e1ce8fpZ2EjZEfs09DDZYSvtRaDlMpWslBf8Low==
dependencies:
- caniuse-lite "^1.0.30000967"
- electron-to-chromium "^1.3.133"
- node-releases "^1.1.19"
+ caniuse-lite "^1.0.30000981"
+ electron-to-chromium "^1.3.188"
+ node-releases "^1.1.25"
-caniuse-lite@^1.0.30000967:
- version "1.0.30000971"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
- integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
+caniuse-lite@^1.0.30000981:
+ version "1.0.30000983"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz#ab3c70061ca2a3467182a10ac75109b199b647f8"
+ integrity sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==
chalk@^2.0.0:
version "2.4.2"
@@ -963,23 +911,23 @@ convert-source-map@^1.1.0:
safe-buffer "~5.1.1"
core-js-compat@^3.1.1:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.2.tgz#c29ab9722517094b98622175e2218c3b7398176d"
- integrity sha512-X0Ch5f6itrHxhg5HSJucX6nNLNAGr+jq+biBh6nPGc3YAWz2a8p/ZIZY8cUkDzSRNG54omAuu3hoEF8qZbu/6Q==
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz#e4d0c40fbd01e65b1d457980fe4112d4358a7408"
+ integrity sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==
dependencies:
- browserslist "^4.6.0"
- core-js-pure "3.1.2"
- semver "^6.0.0"
+ browserslist "^4.6.2"
+ core-js-pure "3.1.4"
+ semver "^6.1.1"
[email protected], core-js-pure@^3.0.0:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.2.tgz#62fc435f35b7374b9b782013cdcb2f97e9f6dffa"
- integrity sha512-5ckIdBF26B3ldK9PM177y2ZcATP2oweam9RskHSoqfZCrJ2As6wVg8zJ1zTriFsZf6clj/N1ThDFRGaomMsh9w==
[email protected], core-js-pure@^3.0.0:
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769"
+ integrity sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==
core-js@^2.4.0, core-js@^2.6.5:
- version "2.6.8"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.8.tgz#dc3a1e633a04267944e0cb850d3880f340248139"
- integrity sha512-RWlREFU74TEkdXzyl1bka66O3kYp8jeTXrvJZDzVVMH8AiHUSOFpL1yfhQJ+wHocAm1m+4971W1PPzfLuCv1vg==
+ version "2.6.9"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
+ integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
debug@^4.1.0:
version "4.1.1"
@@ -995,10 +943,10 @@ define-properties@^1.1.2:
dependencies:
object-keys "^1.0.12"
-electron-to-chromium@^1.3.133:
- version "1.3.137"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz#ba7c88024984c038a5c5c434529aabcea7b42944"
- integrity sha512-kGi32g42a8vS/WnYE7ELJyejRT7hbr3UeOOu0WeuYuQ29gCpg9Lrf6RdcTQVXSt/v0bjCfnlb/EWOOsiKpTmkw==
+electron-to-chromium@^1.3.188:
+ version "1.3.189"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.189.tgz#aa84055eb36d364a68852ad2d25e1315a1d06196"
+ integrity sha512-C26Kv6/rLNmGDaPR5HORMtTQat9aWBBKjQk9aFtN1Bk6cQBSw8cYdsel/mcrQlNlMMjt1sAKsTYqf77+sK2uTw==
emojis-list@^2.0.0:
version "2.1.0"
@@ -1092,9 +1040,9 @@ inflight@^1.0.4:
wrappy "1"
inherits@2:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
- integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
invariant@^2.2.2:
version "2.2.4"
@@ -1214,9 +1162,9 @@ lodash.snakecase@^4.1.1:
integrity sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=
lodash@^4.17.11, lodash@^4.17.4:
- version "4.17.11"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
- integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+ version "4.17.14"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
+ integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
loose-envify@^1.0.0:
version "1.4.0"
@@ -1258,14 +1206,14 @@ mkdirp@^0.5.1:
minimist "0.0.8"
ms@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
- integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+ integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-node-releases@^1.1.19:
- version "1.1.21"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.21.tgz#46c86f9adaceae4d63c75d3c2f2e6eee618e55f3"
- integrity sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q==
+node-releases@^1.1.25:
+ version "1.1.25"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz#0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3"
+ integrity sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==
dependencies:
semver "^5.3.0"
@@ -1398,9 +1346,9 @@ regenerator-transform@^0.14.0:
private "^0.1.6"
regexp-tree@^0.1.6:
- version "0.1.10"
- resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.10.tgz#d837816a039c7af8a8d64d7a7c3cf6a1d93450bc"
- integrity sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==
+ version "0.1.11"
+ resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz#c9c7f00fcf722e0a56c7390983a7a63dd6c272f3"
+ integrity sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==
regexpu-core@^4.5.4:
version "4.5.4"
@@ -1432,9 +1380,9 @@ reselect@^3.0.1:
integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
resolve@^1.3.2, resolve@^1.4.0, resolve@^1.8.1:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232"
- integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+ integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
dependencies:
path-parse "^1.0.6"
@@ -1448,10 +1396,10 @@ semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
-semver@^6.0.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca"
- integrity sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==
+semver@^6.1.1:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
+ integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
source-map@^0.5.0:
version "0.5.7"
diff --git a/ui/package.json b/ui/package.json
index cc9cf5a95be..100d6b56cd8 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -50,14 +50,14 @@
},
"homepage": "https://quasar.dev",
"devDependencies": {
- "@babel/core": "^7.4.5",
- "@quasar/babel-preset-app": "^1.1.3",
+ "@babel/core": "^7.5.4",
+ "@quasar/babel-preset-app": "^1.1.4",
"@quasar/extras": "^1.1.4",
- "autoprefixer": "^9.5.0",
+ "autoprefixer": "^9.6.1",
"babel-eslint": "^10.0.2",
"babel-loader": "^8.0.6",
"babel-preset-es2015-rollup": "^3.0.0",
- "chokidar": "^3.0.0",
+ "chokidar": "^3.0.2",
"css-loader": "^3.0.0",
"cssnano": "^4.1.10",
"eslint": "^5.15.3",
@@ -79,8 +79,8 @@
"postcss-loader": "^3.0.0",
"postcss-rtl": "^1.3.3",
"rimraf": "^2.6.3",
- "rollup": "^1.16.3",
- "rollup-plugin-buble": "^0.19.6",
+ "rollup": "^1.16.7",
+ "rollup-plugin-buble": "^0.19.8",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^5.2.0",
"style-resources-loader": "^1.2.1",
@@ -90,11 +90,11 @@
"url-loader": "^2.0.1",
"vue": "^2.6.10",
"vue-loader": "^15.7.0",
- "vue-router": "^3.0.2",
+ "vue-router": "^3.0.7",
"vue-server-renderer": "^2.6.10",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.10",
- "webpack": "^4.35.2",
+ "webpack": "^4.35.3",
"webpack-chain": "^6.0.0",
"webpack-dev-middleware": "^3.7.0",
"webpack-dev-server": "^3.7.2",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 75213b5aea0..d0e1f2a187f 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -9,18 +9,18 @@
dependencies:
"@babel/highlight" "^7.0.0"
-"@babel/[email protected]", "@babel/core@^7.4.5":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a"
- integrity sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==
+"@babel/core@^7.4.5", "@babel/core@^7.5.4":
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.4.tgz#4c32df7ad5a58e9ea27ad025c11276324e0b4ddd"
+ integrity sha512-+DaeBEpYq6b2+ZmHx3tHspC+ZRflrvLqwfv8E3hNr5LVQoyBnL8RPKSBCg+rK2W2My9PWlujBiqd0ZPsR9Q6zQ==
dependencies:
"@babel/code-frame" "^7.0.0"
- "@babel/generator" "^7.4.4"
- "@babel/helpers" "^7.4.4"
- "@babel/parser" "^7.4.5"
+ "@babel/generator" "^7.5.0"
+ "@babel/helpers" "^7.5.4"
+ "@babel/parser" "^7.5.0"
"@babel/template" "^7.4.4"
- "@babel/traverse" "^7.4.5"
- "@babel/types" "^7.4.4"
+ "@babel/traverse" "^7.5.0"
+ "@babel/types" "^7.5.0"
convert-source-map "^1.1.0"
debug "^4.1.0"
json5 "^2.1.0"
@@ -29,12 +29,12 @@
semver "^5.4.1"
source-map "^0.5.0"
-"@babel/generator@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
- integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
+"@babel/generator@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.0.tgz#f20e4b7a91750ee8b63656073d843d2a736dca4a"
+ integrity sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==
dependencies:
- "@babel/types" "^7.4.4"
+ "@babel/types" "^7.5.0"
jsesc "^2.5.1"
lodash "^4.17.11"
source-map "^0.5.0"
@@ -64,10 +64,10 @@
"@babel/traverse" "^7.4.4"
"@babel/types" "^7.4.4"
-"@babel/helper-create-class-features-plugin@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz#fc3d690af6554cc9efc607364a82d48f58736dba"
- integrity sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==
+"@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.0.tgz#02edb97f512d44ba23b3227f1bf2ed43454edac5"
+ integrity sha512-EAoMc3hE5vE5LNhMqDOwB1usHvmRjCDAnH8CD4PVkX9/Yr3W/tcz8xE8QvdZxfsFBDICwZnF2UTHIqslRpvxmA==
dependencies:
"@babel/helper-function-name" "^7.1.0"
"@babel/helper-member-expression-to-functions" "^7.0.0"
@@ -207,28 +207,28 @@
"@babel/traverse" "^7.1.0"
"@babel/types" "^7.2.0"
-"@babel/helpers@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5"
- integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==
+"@babel/helpers@^7.5.4":
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.4.tgz#2f00608aa10d460bde0ccf665d6dcf8477357cf0"
+ integrity sha512-6LJ6xwUEJP51w0sIgKyfvFMJvIb9mWAfohJp0+m6eHJigkFdcH8duZ1sfhn0ltJRzwUIT/yqqhdSfRpCpL7oow==
dependencies:
"@babel/template" "^7.4.4"
- "@babel/traverse" "^7.4.4"
- "@babel/types" "^7.4.4"
+ "@babel/traverse" "^7.5.0"
+ "@babel/types" "^7.5.0"
"@babel/highlight@^7.0.0":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
- integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
+ integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
dependencies:
chalk "^2.0.0"
esutils "^2.0.2"
js-tokens "^4.0.0"
-"@babel/parser@^7.0.0", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872"
- integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==
+"@babel/parser@^7.0.0", "@babel/parser@^7.4.4", "@babel/parser@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.0.tgz#3e0713dff89ad6ae37faec3b29dcfc5c979770b7"
+ integrity sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==
"@babel/plugin-proposal-async-generator-functions@^7.2.0":
version "7.2.0"
@@ -239,15 +239,15 @@
"@babel/helper-remap-async-to-generator" "^7.1.0"
"@babel/plugin-syntax-async-generators" "^7.2.0"
-"@babel/[email protected]":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz#93a6486eed86d53452ab9bab35e368e9461198ce"
- integrity sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==
+"@babel/plugin-proposal-class-properties@^7.4.4":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.0.tgz#5bc6a0537d286fcb4fd4e89975adbca334987007"
+ integrity sha512-9L/JfPCT+kShiiTTzcnBJ8cOwdKVmlC1RcCf9F0F9tERVrM4iWtWnXtjWCRqNm2la2BxO1MPArWNsU9zsSJWSQ==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.4.4"
+ "@babel/helper-create-class-features-plugin" "^7.5.0"
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/[email protected]":
+"@babel/plugin-proposal-decorators@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"
integrity sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==
@@ -256,24 +256,32 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-decorators" "^7.2.0"
-"@babel/[email protected]":
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.2.0.tgz#308fd4d04ff257fc3e4be090550840eeabad5dd9"
- integrity sha512-DZUxbHYxQ5fUFIkMEnh75ogEdBLPfL+mQUqrO2hNY2LGm+tqFnxE924+mhAcCOh/8za8AaZsWHbq6bBoS3TAzA==
+"@babel/plugin-proposal-dynamic-import@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506"
+ integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+
+"@babel/plugin-proposal-export-namespace-from@^7.2.0":
+ version "7.5.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz#ccd5ed05b06d700688ff1db01a9dd27155e0d2a0"
+ integrity sha512-TKUdOL07anjZEbR1iSxb5WFh810KyObdd29XLFLGo1IDsSuGrjH3ouWSbAxHNmrVKzr9X71UYl2dQ7oGGcRp0g==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-export-namespace-from" "^7.2.0"
-"@babel/[email protected]":
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.2.0.tgz#f707d78551f49162e152d477fba32357341915d1"
- integrity sha512-qQBDKRSCu1wGJi3jbngs18vrujVQA4F+OkSuIQYRhE6y19jcPzeEIGOc683mCQXDUR3BQCz8JyCupIwv+IRFmA==
+"@babel/plugin-proposal-function-sent@^7.2.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz#39233aa801145e7d8072077cdb2d25f781c1ffd7"
+ integrity sha512-JXdfiQpKoC6UgQliZkp3NX7K3MVec1o1nfTWiCCIORE5ag/QZXhL0aSD8/Y2K+hIHonSTxuJF9rh9zsB6hBi2A==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-wrap-function" "^7.2.0"
"@babel/plugin-syntax-function-sent" "^7.2.0"
-"@babel/[email protected]", "@babel/plugin-proposal-json-strings@^7.2.0":
+"@babel/plugin-proposal-json-strings@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
@@ -281,7 +289,7 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-json-strings" "^7.2.0"
-"@babel/[email protected]":
+"@babel/plugin-proposal-numeric-separator@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz#646854daf4cd22fd6733f6076013a936310443ac"
integrity sha512-DohMOGDrZiMKS7LthjUZNNcWl8TAf5BZDwZAH4wpm55FuJTHgfqPGdibg7rZDmont/8Yg0zA03IgT6XLeP+4sg==
@@ -289,10 +297,10 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-numeric-separator" "^7.2.0"
-"@babel/plugin-proposal-object-rest-spread@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz#1ef173fcf24b3e2df92a678f027673b55e7e3005"
- integrity sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==
+"@babel/plugin-proposal-object-rest-spread@^7.5.4":
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.4.tgz#250de35d867ce8260a31b1fdac6c4fc1baa99331"
+ integrity sha512-KCx0z3y7y8ipZUMAEEJOyNi11lMb/FOPUjjB113tfowgw0c16EGYos7worCKBcUAh2oG+OBnoUhsnTSoLpV9uA==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -305,7 +313,7 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-"@babel/[email protected]":
+"@babel/plugin-proposal-throw-expressions@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz#2d9e452d370f139000e51db65d0a85dc60c64739"
integrity sha512-adsydM8DQF4i5DLNO4ySAU5VtHTPewOtNBV3u7F4lNMPADFF9bWQ+iDtUUe8+033cYCUz+bFlQdXQJmJOwoLpw==
@@ -336,7 +344,7 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/[email protected]":
+"@babel/plugin-syntax-dynamic-import@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
@@ -357,7 +365,7 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/[email protected]":
+"@babel/plugin-syntax-import-meta@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.2.0.tgz#2333ef4b875553a3bcd1e93f8ebc09f5b9213a40"
integrity sha512-Hq6kFSZD7+PHkmBN8bCpHR6J8QEoCuEV/B38AIQscYjgMZkGlXB7cHNFzP5jR4RCh5545yP1ujHdmO7hAgKtBA==
@@ -406,10 +414,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/plugin-transform-async-to-generator@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz#a3f1d01f2f21cadab20b33a82133116f14fb5894"
- integrity sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==
+"@babel/plugin-transform-async-to-generator@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e"
+ integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
"@babel/helper-plugin-utils" "^7.0.0"
@@ -451,10 +459,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/plugin-transform-destructuring@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz#9d964717829cc9e4b601fc82a26a71a4d8faf20f"
- integrity sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==
+"@babel/plugin-transform-destructuring@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a"
+ integrity sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
@@ -467,10 +475,10 @@
"@babel/helper-regex" "^7.4.4"
regexpu-core "^4.5.4"
-"@babel/plugin-transform-duplicate-keys@^7.2.0":
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz#d952c4930f312a4dbfff18f0b2914e60c35530b3"
- integrity sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==
+"@babel/plugin-transform-duplicate-keys@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
+ integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
@@ -511,30 +519,33 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/plugin-transform-modules-amd@^7.2.0":
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
- integrity sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==
+"@babel/plugin-transform-modules-amd@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
+ integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==
dependencies:
"@babel/helper-module-transforms" "^7.1.0"
"@babel/helper-plugin-utils" "^7.0.0"
+ babel-plugin-dynamic-import-node "^2.3.0"
-"@babel/plugin-transform-modules-commonjs@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz#0bef4713d30f1d78c2e59b3d6db40e60192cac1e"
- integrity sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==
+"@babel/plugin-transform-modules-commonjs@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74"
+ integrity sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==
dependencies:
"@babel/helper-module-transforms" "^7.4.4"
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-simple-access" "^7.1.0"
+ babel-plugin-dynamic-import-node "^2.3.0"
-"@babel/plugin-transform-modules-systemjs@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz#dc83c5665b07d6c2a7b224c00ac63659ea36a405"
- integrity sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==
+"@babel/plugin-transform-modules-systemjs@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249"
+ integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==
dependencies:
"@babel/helper-hoist-variables" "^7.4.4"
"@babel/helper-plugin-utils" "^7.0.0"
+ babel-plugin-dynamic-import-node "^2.3.0"
"@babel/plugin-transform-modules-umd@^7.2.0":
version "7.2.0"
@@ -596,10 +607,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
-"@babel/[email protected]":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz#a50f5d16e9c3a4ac18a1a9f9803c107c380bce08"
- integrity sha512-aMVojEjPszvau3NRg+TIH14ynZLvPewH4xhlCW1w6A3rkxTS1m4uwzRclYR9oS+rl/dr+kT+pzbfHuAWP/lc7Q==
+"@babel/plugin-transform-runtime@^7.4.4":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.0.tgz#45242c2c9281158c5f06d25beebac63e498a284e"
+ integrity sha512-LmPIZOAgTLl+86gR9KjLXex6P/lRz1fWEjTz6V6QZMmKie51ja3tvzdwORqhHc4RWR8TcZ5pClpRWs0mlaA2ng==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
"@babel/helper-plugin-utils" "^7.0.0"
@@ -652,39 +663,41 @@
"@babel/helper-regex" "^7.4.4"
regexpu-core "^4.5.4"
-"@babel/[email protected]":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58"
- integrity sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==
+"@babel/preset-env@^7.4.5":
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.4.tgz#64bc15041a3cbb0798930319917e70fcca57713d"
+ integrity sha512-hFnFnouyRNiH1rL8YkX1ANCNAUVC8Djwdqfev8i1415tnAG+7hlA5zhZ0Q/3Q5gkop4HioIPbCEWAalqcbxRoQ==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-proposal-async-generator-functions" "^7.2.0"
+ "@babel/plugin-proposal-dynamic-import" "^7.5.0"
"@babel/plugin-proposal-json-strings" "^7.2.0"
- "@babel/plugin-proposal-object-rest-spread" "^7.4.4"
+ "@babel/plugin-proposal-object-rest-spread" "^7.5.4"
"@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
"@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
"@babel/plugin-syntax-async-generators" "^7.2.0"
+ "@babel/plugin-syntax-dynamic-import" "^7.2.0"
"@babel/plugin-syntax-json-strings" "^7.2.0"
"@babel/plugin-syntax-object-rest-spread" "^7.2.0"
"@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
"@babel/plugin-transform-arrow-functions" "^7.2.0"
- "@babel/plugin-transform-async-to-generator" "^7.4.4"
+ "@babel/plugin-transform-async-to-generator" "^7.5.0"
"@babel/plugin-transform-block-scoped-functions" "^7.2.0"
"@babel/plugin-transform-block-scoping" "^7.4.4"
"@babel/plugin-transform-classes" "^7.4.4"
"@babel/plugin-transform-computed-properties" "^7.2.0"
- "@babel/plugin-transform-destructuring" "^7.4.4"
+ "@babel/plugin-transform-destructuring" "^7.5.0"
"@babel/plugin-transform-dotall-regex" "^7.4.4"
- "@babel/plugin-transform-duplicate-keys" "^7.2.0"
+ "@babel/plugin-transform-duplicate-keys" "^7.5.0"
"@babel/plugin-transform-exponentiation-operator" "^7.2.0"
"@babel/plugin-transform-for-of" "^7.4.4"
"@babel/plugin-transform-function-name" "^7.4.4"
"@babel/plugin-transform-literals" "^7.2.0"
"@babel/plugin-transform-member-expression-literals" "^7.2.0"
- "@babel/plugin-transform-modules-amd" "^7.2.0"
- "@babel/plugin-transform-modules-commonjs" "^7.4.4"
- "@babel/plugin-transform-modules-systemjs" "^7.4.4"
+ "@babel/plugin-transform-modules-amd" "^7.5.0"
+ "@babel/plugin-transform-modules-commonjs" "^7.5.0"
+ "@babel/plugin-transform-modules-systemjs" "^7.5.0"
"@babel/plugin-transform-modules-umd" "^7.2.0"
"@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5"
"@babel/plugin-transform-new-target" "^7.4.4"
@@ -699,33 +712,33 @@
"@babel/plugin-transform-template-literals" "^7.4.4"
"@babel/plugin-transform-typeof-symbol" "^7.2.0"
"@babel/plugin-transform-unicode-regex" "^7.4.4"
- "@babel/types" "^7.4.4"
+ "@babel/types" "^7.5.0"
browserslist "^4.6.0"
core-js-compat "^3.1.1"
invariant "^2.2.2"
js-levenshtein "^1.1.3"
semver "^5.5.0"
-"@babel/[email protected]":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.4.5.tgz#3d892f0560df21bafb384dd7727e33853e95d3c9"
- integrity sha512-5yLuwzvIDecKwYMzJtiarky4Fb5643H3Ao5jwX0HrMR5oM5mn2iHH9wSZonxwNK0oAjAFUQAiOd4jT7/9Y2jMQ==
+"@babel/runtime-corejs2@^7.4.5":
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.5.4.tgz#7111dbb344acce1f7dd601786cff40d516b27a96"
+ integrity sha512-sHv74OzyZ18d6tjHU0HmlVES3+l+lydkOMTiKsJSTGWcTBpIMfXLEgduahlJrQjknW9RCQAqLIEdLOHjBmq/hg==
dependencies:
core-js "^2.6.5"
regenerator-runtime "^0.13.2"
-"@babel/[email protected]":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.4.5.tgz#7df89702351c5fdc34b5555544fcf11b4ea7051c"
- integrity sha512-yxHpUObdpx4zbuLJOHIZkw43E4NbWGsGH+85kRUj+VEcdtjlqI0vDcAja9mwOHqD7/4vCZp69q6eztz/sFDibQ==
+"@babel/runtime-corejs3@^7.4.5":
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.5.4.tgz#88dab70e4915c8e8c7212b01ebd73e57159190cf"
+ integrity sha512-zTLh6E+I7jk03bW4pBahDLW04XF+ZWhzBS+7CKtz/C5OG2/PKHJDxSmI8oDEznVDhmKskh6RblHluTjMWY/P7Q==
dependencies:
core-js-pure "^3.0.0"
regenerator-runtime "^0.13.2"
-"@babel/[email protected]":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
- integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
+"@babel/runtime@^7.4.5":
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.4.tgz#cb7d1ad7c6d65676e66b47186577930465b5271b"
+ integrity sha512-Na84uwyImZZc3FKf4aUF1tysApzwf3p2yuFBIyBfbzT5glzKTdvYI4KVW4kcgjrzoGUjC7w3YyCHcJKaRxsr2Q==
dependencies:
regenerator-runtime "^0.13.2"
@@ -738,54 +751,54 @@
"@babel/parser" "^7.4.4"
"@babel/types" "^7.4.4"
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5":
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216"
- integrity sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.0.tgz#4216d6586854ef5c3c4592dab56ec7eb78485485"
+ integrity sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==
dependencies:
"@babel/code-frame" "^7.0.0"
- "@babel/generator" "^7.4.4"
+ "@babel/generator" "^7.5.0"
"@babel/helper-function-name" "^7.1.0"
"@babel/helper-split-export-declaration" "^7.4.4"
- "@babel/parser" "^7.4.5"
- "@babel/types" "^7.4.4"
+ "@babel/parser" "^7.5.0"
+ "@babel/types" "^7.5.0"
debug "^4.1.0"
globals "^11.1.0"
lodash "^4.17.11"
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
- integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.4", "@babel/types@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.0.tgz#e47d43840c2e7f9105bc4d3a2c371b4d0c7832ab"
+ integrity sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==
dependencies:
esutils "^2.0.2"
lodash "^4.17.11"
to-fast-properties "^2.0.0"
-"@quasar/babel-preset-app@^1.1.3":
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/@quasar/babel-preset-app/-/babel-preset-app-1.1.3.tgz#9e09bd47f960bc0cc77b6edde8dd8918453d225f"
- integrity sha512-5yCNk+qsvej8f+9xwlvxKmjUHP0SIhIy1tQS6/iRaGyg93ZHHUE35fUieJx1WDPHnXEe8Hvak8JkXjue/z1gdw==
- dependencies:
- "@babel/core" "7.4.5"
- "@babel/plugin-proposal-class-properties" "7.4.4"
- "@babel/plugin-proposal-decorators" "7.4.4"
- "@babel/plugin-proposal-export-namespace-from" "7.2.0"
- "@babel/plugin-proposal-function-sent" "7.2.0"
- "@babel/plugin-proposal-json-strings" "7.2.0"
- "@babel/plugin-proposal-numeric-separator" "7.2.0"
- "@babel/plugin-proposal-throw-expressions" "7.2.0"
- "@babel/plugin-syntax-dynamic-import" "7.2.0"
- "@babel/plugin-syntax-import-meta" "7.2.0"
- "@babel/plugin-transform-runtime" "7.4.4"
- "@babel/preset-env" "7.4.5"
- "@babel/runtime" "7.4.5"
- "@babel/runtime-corejs2" "7.4.5"
- "@babel/runtime-corejs3" "7.4.5"
- babel-loader "8.0.6"
- babel-plugin-dynamic-import-node "2.3.0"
- babel-plugin-module-resolver "3.2.0"
- babel-plugin-transform-imports "1.5.1"
+"@quasar/babel-preset-app@^1.1.4":
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/@quasar/babel-preset-app/-/babel-preset-app-1.1.4.tgz#19d7cb091a639462434290aa54c967a573c308c7"
+ integrity sha512-miOimt4BdOAR6SNona43OWXboyyKVsspq3iAkddUlecio6Am7ZU9HGJe39kUqfTG1HMJAfNTXbd5sv0aMS7eqg==
+ dependencies:
+ "@babel/core" "^7.4.5"
+ "@babel/plugin-proposal-class-properties" "^7.4.4"
+ "@babel/plugin-proposal-decorators" "^7.4.4"
+ "@babel/plugin-proposal-export-namespace-from" "^7.2.0"
+ "@babel/plugin-proposal-function-sent" "^7.2.0"
+ "@babel/plugin-proposal-json-strings" "^7.2.0"
+ "@babel/plugin-proposal-numeric-separator" "^7.2.0"
+ "@babel/plugin-proposal-throw-expressions" "^7.2.0"
+ "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+ "@babel/plugin-syntax-import-meta" "^7.2.0"
+ "@babel/plugin-transform-runtime" "^7.4.4"
+ "@babel/preset-env" "^7.4.5"
+ "@babel/runtime" "^7.4.5"
+ "@babel/runtime-corejs2" "^7.4.5"
+ "@babel/runtime-corejs3" "^7.4.5"
+ babel-loader "^8.0.6"
+ babel-plugin-dynamic-import-node "^2.3.0"
+ babel-plugin-module-resolver "^3.2.0"
+ babel-plugin-transform-imports "^1.5.1"
"@quasar/extras@^1.1.4":
version "1.1.4"
@@ -816,15 +829,10 @@
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-"@types/node@*":
- version "12.0.7"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
- integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
-
-"@types/node@^12.0.8":
- version "12.0.8"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.8.tgz#551466be11b2adc3f3d47156758f610bd9f6b1d8"
- integrity sha512-b8bbUOTwzIY3V5vDTY1fIJ+ePKDUBqt2hC2woVGotdQQhG/2Sh62HOKHrT7ab+VerXAcPyAiTEipPu/FsreUtg==
+"@types/node@*", "@types/node@^12.0.10":
+ version "12.6.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.2.tgz#a5ccec6abb6060d5f20d256fb03ed743e9774999"
+ integrity sha512-gojym4tX0FWeV2gsW4Xmzo5wxGjXGm550oVUII7f7G5o4BV6c7DBdiG1RRQd+y1bvqRyYtPfMK85UM95vsapqQ==
"@types/q@^1.5.1":
version "1.5.2"
@@ -1032,10 +1040,10 @@ acorn-jsx@^5.0.0, acorn-jsx@^5.0.1:
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
-acorn@^6.0.2, acorn@^6.0.5, acorn@^6.0.7, acorn@^6.1.1:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
- integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+acorn@^6.0.2, acorn@^6.0.7, acorn@^6.1.1, acorn@^6.2.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3"
+ integrity sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==
ajv-errors@^1.0.0:
version "1.0.1"
@@ -1043,14 +1051,14 @@ ajv-errors@^1.0.0:
integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
ajv-keywords@^3.1.0:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
- integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
+ integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
ajv@^6.1.0, ajv@^6.9.1:
- version "6.10.0"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
- integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+ version "6.10.1"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.1.tgz#ebf8d3af22552df9dd049bfbe50cc2390e823593"
+ integrity sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==
dependencies:
fast-deep-equal "^2.0.1"
fast-json-stable-stringify "^2.0.0"
@@ -1118,9 +1126,9 @@ anymatch@^2.0.0:
normalize-path "^2.1.1"
anymatch@^3.0.1:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.2.tgz#ddb3a8495d44875423af7b919aace11e91732a41"
- integrity sha512-rUe9SxpRQlVg4EM8It7JMNWWYHAirTPpbTuvaSKybb5IejNgWB3PGBBX9rrPKDx2pM/p3Wh+7+ASaWRyyAbxmQ==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.3.tgz#2fb624fe0e84bccab00afee3d0006ed310f22f09"
+ integrity sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==
dependencies:
normalize-path "^3.0.0"
picomatch "^2.0.4"
@@ -1222,7 +1230,7 @@ astral-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-async-each@^1.0.1, async-each@^1.0.3:
+async-each@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
@@ -1237,18 +1245,18 @@ atob@^2.1.1:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-autoprefixer@^9.5.0:
- version "9.6.0"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.0.tgz#0111c6bde2ad20c6f17995a33fad7cf6854b4c87"
- integrity sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==
+autoprefixer@^9.6.1:
+ version "9.6.1"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
+ integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
dependencies:
- browserslist "^4.6.1"
- caniuse-lite "^1.0.30000971"
+ browserslist "^4.6.3"
+ caniuse-lite "^1.0.30000980"
chalk "^2.4.2"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
- postcss "^7.0.16"
- postcss-value-parser "^3.3.1"
+ postcss "^7.0.17"
+ postcss-value-parser "^4.0.0"
babel-code-frame@^6.26.0:
version "6.26.0"
@@ -1347,7 +1355,7 @@ babel-helper-replace-supers@^6.24.1:
babel-traverse "^6.24.1"
babel-types "^6.24.1"
[email protected], babel-loader@^8.0.6:
+babel-loader@^8.0.6:
version "8.0.6"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
@@ -1371,7 +1379,7 @@ babel-plugin-check-es2015-constants@^6.22.0:
dependencies:
babel-runtime "^6.22.0"
[email protected]:
+babel-plugin-dynamic-import-node@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
@@ -1385,7 +1393,7 @@ babel-plugin-external-helpers@^6.18.0:
dependencies:
babel-runtime "^6.22.0"
[email protected]:
+babel-plugin-module-resolver@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
@@ -1586,7 +1594,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.24.1:
babel-runtime "^6.22.0"
regexpu-core "^2.0.0"
[email protected]:
+babel-plugin-transform-imports@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-imports/-/babel-plugin-transform-imports-1.5.1.tgz#b3756696aea907719d0d63b0e67c88fba963adb0"
integrity sha512-Jkb0tjqye8kjOD7GdcKJTGB3dC9fruQhwRFZCeYS0sZO2otyjG6SohKR8nZiSm/OvhY+Ny2ktzVE59XKgIqskA==
@@ -1749,7 +1757,7 @@ binary-extensions@^2.0.0:
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
-bluebird@^3.1.1, bluebird@^3.5.3:
+bluebird@^3.1.1, bluebird@^3.5.5:
version "3.5.5"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
@@ -1887,27 +1895,27 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.1:
- version "4.6.2"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.2.tgz#574c665950915c2ac73a4594b8537a9eba26203f"
- integrity sha512-2neU/V0giQy9h3XMPwLhEY3+Ao0uHSwHvU8Q1Ea6AgLVL1sXbX3dzPrJ8NWe5Hi4PoTkCYXOtVR9rfRLI0J/8Q==
+browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.2, browserslist@^4.6.3:
+ version "4.6.4"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.4.tgz#fd0638b3f8867fec2c604ed0ed9300379f8ec7c2"
+ integrity sha512-ErJT8qGfRt/VWHSr1HeqZzz50DvxHtr1fVL1m5wf20aGrG8e1ce8fpZ2EjZEfs09DDZYSvtRaDlMpWslBf8Low==
dependencies:
- caniuse-lite "^1.0.30000974"
- electron-to-chromium "^1.3.150"
- node-releases "^1.1.23"
+ caniuse-lite "^1.0.30000981"
+ electron-to-chromium "^1.3.188"
+ node-releases "^1.1.25"
-buble@^0.19.6:
- version "0.19.7"
- resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.7.tgz#1dfd080ab688101aad5388d3304bc82601a244fd"
- integrity sha512-YLgWxX/l+NnfotydBlxqCMPR4FREE4ubuHphALz0FxQ7u2hp3BzxTKQ4nKpapOaRJfEm1gukC68KnT2OymRK0g==
+buble@^0.19.8:
+ version "0.19.8"
+ resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.8.tgz#d642f0081afab66dccd897d7b6360d94030b9d3d"
+ integrity sha512-IoGZzrUTY5fKXVkgGHw3QeXFMUNBFv+9l8a4QJKG1JhG3nCMHTdEX1DCOg8568E2Q9qvAQIiSokv6Jsgx8p2cA==
dependencies:
acorn "^6.1.1"
acorn-dynamic-import "^4.0.0"
acorn-jsx "^5.0.1"
chalk "^2.4.2"
- magic-string "^0.25.2"
+ magic-string "^0.25.3"
minimist "^1.2.0"
- os-homedir "^1.0.1"
+ os-homedir "^2.0.0"
regexpu-core "^4.5.4"
buffer-from@^1.0.0:
@@ -1955,21 +1963,21 @@ [email protected]:
integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
cacache@^11.3.2:
- version "11.3.2"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
- integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
+ version "11.3.3"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"
+ integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==
dependencies:
- bluebird "^3.5.3"
+ bluebird "^3.5.5"
chownr "^1.1.1"
figgy-pudding "^3.5.1"
- glob "^7.1.3"
+ glob "^7.1.4"
graceful-fs "^4.1.15"
lru-cache "^5.1.1"
mississippi "^3.0.0"
mkdirp "^0.5.1"
move-concurrently "^1.0.1"
promise-inflight "^1.0.1"
- rimraf "^2.6.2"
+ rimraf "^2.6.3"
ssri "^6.0.1"
unique-filename "^1.1.1"
y18n "^4.0.0"
@@ -2036,10 +2044,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000971, caniuse-lite@^1.0.30000974:
- version "1.0.30000974"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
- integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981:
+ version "1.0.30000983"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz#ab3c70061ca2a3467182a10ac75109b199b647f8"
+ integrity sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==
chalk@^1.1.3:
version "1.1.3"
@@ -2085,26 +2093,25 @@ chokidar@^2.0.2, chokidar@^2.1.6:
optionalDependencies:
fsevents "^1.2.7"
-chokidar@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.1.tgz#98fe9aa476c55d9aea7841d6325ffdb30e95b40c"
- integrity sha512-2ww34sJWehnbpV0Q4k4V5Hh7juo7po6z7LUWkcIQnSGN1lHOL8GGtLtfwabKvLFQw/hbSUQ0u6V7OgGYgBzlkQ==
+chokidar@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz#0d1cd6d04eb2df0327446188cd13736a3367d681"
+ integrity sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==
dependencies:
anymatch "^3.0.1"
- async-each "^1.0.3"
braces "^3.0.2"
glob-parent "^5.0.0"
is-binary-path "^2.1.0"
is-glob "^4.0.1"
normalize-path "^3.0.0"
- readdirp "^3.0.2"
+ readdirp "^3.1.1"
optionalDependencies:
fsevents "^2.0.6"
chownr@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
- integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
+ integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
chrome-trace-event@^1.0.0:
version "1.0.2"
@@ -2229,7 +2236,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-commander@^2.19.0:
+commander@^2.20.0:
version "2.20.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@@ -2375,18 +2382,18 @@ copy-descriptor@^0.1.0:
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
core-js-compat@^3.1.1:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.3.tgz#0cc3ba4c7f62928c2837e1cffbe8dc78b4f1ae14"
- integrity sha512-EP018pVhgwsKHz3YoN1hTq49aRe+h017Kjz0NQz3nXV0cCRMvH3fLQl+vEPGr4r4J5sk4sU3tUC7U1aqTCeJeA==
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz#e4d0c40fbd01e65b1d457980fe4112d4358a7408"
+ integrity sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==
dependencies:
- browserslist "^4.6.0"
- core-js-pure "3.1.3"
- semver "^6.1.0"
+ browserslist "^4.6.2"
+ core-js-pure "3.1.4"
+ semver "^6.1.1"
[email protected], core-js-pure@^3.0.0:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.3.tgz#4c90752d5b9471f641514f3728f51c1e0783d0b5"
- integrity sha512-k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA==
[email protected], core-js-pure@^3.0.0:
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769"
+ integrity sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==
core-js@^2.4.0, core-js@^2.6.5:
version "2.6.9"
@@ -2398,16 +2405,6 @@ core-util-is@~1.0.0:
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-cosmiconfig@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
- integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
- dependencies:
- is-directory "^0.3.1"
- js-yaml "^3.9.0"
- parse-json "^4.0.0"
- require-from-string "^2.0.1"
-
cosmiconfig@^5.0.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
@@ -2917,15 +2914,15 @@ [email protected]:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-electron-to-chromium@^1.3.150:
- version "1.3.152"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.152.tgz#8f1c08e101d58fe2ef72655481bbf8c83f9450fa"
- integrity sha512-Ah10cGMWIXYD8aUTH2Y7lGRhaOFQLyWuxvXmCPCZCbUIGJ4swnNmT6P4aA8RTgUmNw9kmcDL6SoU8TZC4YuZGg==
+electron-to-chromium@^1.3.188:
+ version "1.3.189"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.189.tgz#aa84055eb36d364a68852ad2d25e1315a1d06196"
+ integrity sha512-C26Kv6/rLNmGDaPR5HORMtTQat9aWBBKjQk9aFtN1Bk6cQBSw8cYdsel/mcrQlNlMMjt1sAKsTYqf77+sK2uTw==
elliptic@^6.0.0:
- version "6.4.1"
- resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
- integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
+ version "6.5.0"
+ resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.0.tgz#2b8ed4c891b7de3200e14412a5b8248c7af505ca"
+ integrity sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==
dependencies:
bn.js "^4.4.0"
brorand "^1.0.1"
@@ -3049,9 +3046,9 @@ eslint-import-resolver-node@^0.3.2:
resolve "^1.5.0"
eslint-loader@^2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.1.2.tgz#453542a1230d6ffac90e4e7cb9cadba9d851be68"
- integrity sha512-rA9XiXEOilLYPOIInvVH5S/hYfyTPyxag6DZhoQOduM+3TkghAEQ3VcFO8VnX4J4qg/UIBzp72aOf/xvYmpmsg==
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337"
+ integrity sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==
dependencies:
loader-fs-cache "^1.0.0"
loader-utils "^1.0.2"
@@ -3076,9 +3073,9 @@ eslint-plugin-es@^1.4.0:
regexpp "^2.0.1"
eslint-plugin-import@^2.13.0:
- version "2.17.3"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz#00548b4434c18faebaba04b24ae6198f280de189"
- integrity sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q==
+ version "2.18.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.0.tgz#7a5ba8d32622fb35eb9c8db195c2090bd18a3678"
+ integrity sha512-PZpAEC4gj/6DEMMoU2Df01C5c50r7zdGIN52Yfi7CvvWaYssG7Jt5R9nFG5gmqodxNOz9vQS87xk6Izdtpdrig==
dependencies:
array-includes "^3.0.3"
contains-path "^0.1.0"
@@ -3105,9 +3102,9 @@ eslint-plugin-node@^9.1.0:
semver "^6.1.0"
eslint-plugin-promise@^4.0.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.1.1.tgz#1e08cb68b5b2cd8839f8d5864c796f56d82746db"
- integrity sha512-faAHw7uzlNPy7b45J1guyjazw28M+7gJokKUjC5JSFoYfUEyy6Gw/i7YQvmv2Yk00sUjWcmzXQLpU1Ki/C2IZQ==
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
+ integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
eslint-plugin-standard@^4.0.0:
version "4.0.0"
@@ -3115,9 +3112,9 @@ eslint-plugin-standard@^4.0.0:
integrity sha512-OwxJkR6TQiYMmt1EsNRMe5qG3GsbjlcOhbGUBY4LtavF9DsLaTcoR+j2Tdjqi23oUwKNUqX7qcn5fPStafMdlA==
eslint-plugin-vue@^5.2.1:
- version "5.2.2"
- resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.2.tgz#86601823b7721b70bc92d54f1728cfc03b36283c"
- integrity sha512-CtGWH7IB0DA6BZOwcV9w9q3Ri6Yuo8qMjx05SmOGJ6X6E0Yo3y9E/gQ5tuNxg2dEt30tRnBoFTbvtmW9iEoyHA==
+ version "5.2.3"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz#3ee7597d823b5478804b2feba9863b1b74273961"
+ integrity sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw==
dependencies:
vue-eslint-parser "^5.0.0"
@@ -3354,9 +3351,9 @@ extend@^3.0.0:
integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
external-editor@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
- integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+ integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
dependencies:
chardet "^0.7.0"
iconv-lite "^0.4.24"
@@ -3399,9 +3396,9 @@ faye-websocket@^0.10.0:
websocket-driver ">=0.5.1"
faye-websocket@~0.11.1:
- version "0.11.1"
- resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
- integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
+ version "0.11.3"
+ resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
+ integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
dependencies:
websocket-driver ">=0.5.1"
@@ -3528,9 +3525,9 @@ flat-cache@^2.0.1:
write "1.0.3"
flatted@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
- integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
+ integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
flush-write-stream@^1.0.0:
version "1.1.1"
@@ -3689,7 +3686,7 @@ [email protected]:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.0.3, glob@^7.1.2, glob@^7.1.3:
+glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
version "7.1.4"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
@@ -3723,9 +3720,9 @@ globby@^6.1.0:
pinkie-promise "^2.0.0"
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
- version "4.1.15"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
- integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
+ integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
handle-thing@^2.0.0:
version "2.0.0"
@@ -3910,7 +3907,7 @@ http-deceiver@^1.2.7:
resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
[email protected], http-errors@~1.7.2:
[email protected]:
version "1.7.2"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
@@ -3931,10 +3928,21 @@ http-errors@~1.6.2:
setprototypeof "1.1.0"
statuses ">= 1.4.0 < 2"
-http-parser-js@>=0.4.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
- integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
+http-errors@~1.7.2:
+ version "1.7.3"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+ integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+ dependencies:
+ depd "~1.1.2"
+ inherits "2.0.4"
+ setprototypeof "1.1.1"
+ statuses ">= 1.5.0 < 2"
+ toidentifier "1.0.0"
+
+"http-parser-js@>=0.4.0 <0.4.11":
+ version "0.4.10"
+ resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+ integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
http-proxy-middleware@^0.19.1:
version "0.19.1"
@@ -4017,9 +4025,9 @@ import-fresh@^2.0.0:
resolve-from "^3.0.0"
import-fresh@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
- integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118"
+ integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==
dependencies:
parent-module "^1.0.0"
resolve-from "^4.0.0"
@@ -4049,11 +4057,6 @@ indexes-of@^1.0.1:
resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
[email protected]:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
- integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -4062,25 +4065,30 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
-inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
- integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
[email protected]:
version "2.0.1"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
[email protected]:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+ integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
ini@~1.3.0:
version "1.3.5"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
inquirer@^6.2.2:
- version "6.3.1"
- resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
- integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
+ version "6.5.0"
+ resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"
+ integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==
dependencies:
ansi-escapes "^3.2.0"
chalk "^2.4.2"
@@ -4088,7 +4096,7 @@ inquirer@^6.2.2:
cli-width "^2.0.0"
external-editor "^3.0.3"
figures "^2.0.0"
- lodash "^4.17.11"
+ lodash "^4.17.12"
mute-stream "0.0.7"
run-async "^2.2.0"
rxjs "^6.4.0"
@@ -4323,9 +4331,9 @@ is-obj@^1.0.0:
integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
is-path-cwd@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.1.0.tgz#2e0c7e463ff5b7a0eb60852d851a6809347a124c"
- integrity sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+ integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
is-path-in-cwd@^2.0.0:
version "2.1.0"
@@ -4341,7 +4349,7 @@ is-path-inside@^2.1.0:
dependencies:
path-is-inside "^1.0.2"
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -4443,7 +4451,7 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0:
+js-yaml@^3.13.0, js-yaml@^3.13.1:
version "3.13.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -4662,10 +4670,10 @@ lodash.uniq@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
- version "4.17.11"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
- integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
+ version "4.17.14"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
+ integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
loglevel@^1.6.3:
version "1.6.3"
@@ -4699,10 +4707,10 @@ lru-cache@^5.1.1:
dependencies:
yallist "^3.0.2"
-magic-string@^0.25.2:
- version "0.25.2"
- resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
- integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+magic-string@^0.25.3:
+ version "0.25.3"
+ resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9"
+ integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==
dependencies:
sourcemap-codec "^1.4.4"
@@ -4909,9 +4917,9 @@ mississippi@^3.0.0:
through2 "^2.0.0"
mixin-deep@^1.2.0:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
- integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+ integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
dependencies:
for-in "^1.0.2"
is-extendable "^1.0.1"
@@ -5032,9 +5040,9 @@ [email protected]:
integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
node-libs-browser@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
- integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+ integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
dependencies:
assert "^1.1.1"
browserify-zlib "^0.2.0"
@@ -5046,7 +5054,7 @@ node-libs-browser@^2.0.0:
events "^3.0.0"
https-browserify "^1.0.0"
os-browserify "^0.3.0"
- path-browserify "0.0.0"
+ path-browserify "0.0.1"
process "^0.11.10"
punycode "^1.2.4"
querystring-es3 "^0.2.0"
@@ -5058,7 +5066,7 @@ node-libs-browser@^2.0.0:
tty-browserify "0.0.0"
url "^0.11.0"
util "^0.11.0"
- vm-browserify "0.0.4"
+ vm-browserify "^1.0.1"
node-pre-gyp@^0.12.0:
version "0.12.0"
@@ -5076,10 +5084,10 @@ node-pre-gyp@^0.12.0:
semver "^5.3.0"
tar "^4"
-node-releases@^1.1.23:
- version "1.1.23"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
- integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
+node-releases@^1.1.25:
+ version "1.1.25"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz#0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3"
+ integrity sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==
dependencies:
semver "^5.3.0"
@@ -5129,9 +5137,9 @@ npm-bundled@^1.0.1:
integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
npm-packlist@^1.1.6:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
- integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
+ version "1.4.4"
+ resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz#866224233850ac534b63d1a6e76050092b5d2f44"
+ integrity sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==
dependencies:
ignore-walk "^3.0.1"
npm-bundled "^1.0.1"
@@ -5305,11 +5313,16 @@ os-browserify@^0.3.0:
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+os-homedir@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-2.0.0.tgz#a0c76bb001a8392a503cbd46e7e650b3423a923c"
+ integrity sha512-saRNz0DSC5C/I++gFIaJTXoFJMRwiP5zHar5vV3xQ2TkgEw6hDCcU5F272JjUylpiVgBrZNQHnfjkLabTfb92Q==
+
os-locale@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -5462,10 +5475,10 @@ pascalcase@^0.1.1:
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
[email protected]:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
- integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
[email protected]:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+ integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
path-dirname@^1.0.0:
version "1.0.2"
@@ -5654,11 +5667,11 @@ postcss-discard-overridden@^4.0.1:
postcss "^7.0.0"
postcss-load-config@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
- integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003"
+ integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==
dependencies:
- cosmiconfig "^4.0.0"
+ cosmiconfig "^5.0.0"
import-cwd "^2.0.0"
postcss-loader@^3.0.0:
@@ -5981,9 +5994,9 @@ private@^0.1.6:
integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
process-nextick-args@~2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
- integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
process@^0.11.10:
version "0.11.10"
@@ -6183,10 +6196,10 @@ readdirp@^2.2.1:
micromatch "^3.1.10"
readable-stream "^2.0.2"
-readdirp@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.0.2.tgz#cba63348e9e42fc1bd334b1d2ef895b6a043cbd6"
- integrity sha512-LbyJYv48eywrhOlScq16H/VkCiGKGPC2TpOdZCJ7QXnYEjn3NN/Oblh8QEU3vqfSRBB7OGvh5x45NKiVeNujIQ==
+readdirp@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz#b158123ac343c8b0f31d65680269cc0fc1025db1"
+ integrity sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==
dependencies:
picomatch "^2.0.4"
@@ -6237,9 +6250,9 @@ regex-not@^1.0.0, regex-not@^1.0.2:
safe-regex "^1.1.0"
regexp-tree@^0.1.6:
- version "0.1.10"
- resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.10.tgz#d837816a039c7af8a8d64d7a7c3cf6a1d93450bc"
- integrity sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==
+ version "0.1.11"
+ resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz#c9c7f00fcf722e0a56c7390983a7a63dd6c272f3"
+ integrity sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==
regexpp@^2.0.1:
version "2.0.1"
@@ -6327,11 +6340,6 @@ require-directory@^2.1.1:
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-require-from-string@^2.0.1:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
- integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
require-main-filename@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -6409,7 +6417,7 @@ rgba-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
[email protected], rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
[email protected], rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
version "2.6.3"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -6424,12 +6432,12 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"
-rollup-plugin-buble@^0.19.6:
- version "0.19.6"
- resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.6.tgz#55ee0995d8870d536f01f4277c3eef4276e8747e"
- integrity sha512-El5Fut4/wEO17ZN/n9BZvqd7DXXB2WbJr/DKvr89LXChC/cHllE0XwiUDeAalrTkgr0WrnyLDTCQvEv+cGywWQ==
+rollup-plugin-buble@^0.19.8:
+ version "0.19.8"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.8.tgz#f9232e2bb62a7573d04f9705c1bd6f02c2a02c6a"
+ integrity sha512-8J4zPk2DQdk3rxeZvxgzhHh/rm5nJkjwgcsUYisCQg1QbT5yagW+hehYEW7ZNns/NVbDCTv4JQ7h4fC8qKGOKw==
dependencies:
- buble "^0.19.6"
+ buble "^0.19.8"
rollup-pluginutils "^2.3.3"
rollup-plugin-json@^4.0.0:
@@ -6457,13 +6465,13 @@ rollup-pluginutils@^2.3.3, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.8.1:
dependencies:
estree-walker "^0.6.1"
-rollup@^1.16.3:
- version "1.16.3"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.16.3.tgz#9b8bcf31523efc83447a9624bd2fe6ca58caa1e7"
- integrity sha512-iXINUUEk2NTZXE3GcUtLQt2cvfQsAUXBQ8AFsDK8tg7Wp5bwTKdZXPdzB2IJQwHpdUNfsIgYMAfajurh7SVTnA==
+rollup@^1.16.7:
+ version "1.16.7"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.16.7.tgz#4b539ca22465df39f6c963d2001d95f6527e97e1"
+ integrity sha512-P3GVcbVSLLjHWFLKGerYRe3Q/yggRXmTZFx/4WZf4wzGwO6hAg5jyMAFMQKc0dts8rFID4BQngfoz6yQbI7iMQ==
dependencies:
"@types/estree" "0.0.39"
- "@types/node" "^12.0.8"
+ "@types/node" "^12.0.10"
acorn "^6.1.1"
rtlcss@^2.4.0:
@@ -6498,11 +6506,16 @@ rxjs@^6.4.0:
dependencies:
tslib "^1.9.0"
[email protected], safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
[email protected], safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+ integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
safe-regex@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -6552,9 +6565,9 @@ selfsigned@^1.10.4:
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
semver@^6.1.0, semver@^6.1.1:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
- integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
+ integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
[email protected]:
version "0.17.1"
@@ -6608,20 +6621,10 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-set-value@^0.4.3:
- version "0.4.3"
- resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
- integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
- dependencies:
- extend-shallow "^2.0.1"
- is-extendable "^0.1.1"
- is-plain-object "^2.0.1"
- to-object-path "^0.3.0"
-
-set-value@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
- integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^2.0.0, set-value@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+ integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
dependencies:
extend-shallow "^2.0.1"
is-extendable "^0.1.1"
@@ -6750,7 +6753,7 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0"
urix "^0.1.0"
-source-map-support@~0.5.10:
+source-map-support@~0.5.12:
version "0.5.12"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
@@ -6786,9 +6789,9 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
sourcemap-codec@^1.4.4:
- version "1.4.4"
- resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
- integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
+ version "1.4.6"
+ resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz#e30a74f0402bad09807640d39e971090a08ce1e9"
+ integrity sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==
spdx-correct@^3.0.0:
version "3.1.0"
@@ -6812,9 +6815,9 @@ spdx-expression-parse@^3.0.0:
spdx-license-ids "^3.0.0"
spdx-license-ids@^3.0.0:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
- integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
+ integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
spdy-transport@^3.0.0:
version "3.0.0"
@@ -7070,9 +7073,9 @@ svgo@^1.0.0:
util.promisify "~1.0.0"
table@^5.2.3:
- version "5.4.0"
- resolved "https://registry.yarnpkg.com/table/-/table-5.4.0.tgz#d772a3216e68829920a41a32c18eda286c95d780"
- integrity sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==
+ version "5.4.1"
+ resolved "https://registry.yarnpkg.com/table/-/table-5.4.1.tgz#0691ae2ebe8259858efb63e550b6d5f9300171e8"
+ integrity sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==
dependencies:
ajv "^6.9.1"
lodash "^4.17.11"
@@ -7114,13 +7117,13 @@ terser-webpack-plugin@^1.1.0:
worker-farm "^1.7.0"
terser@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374"
- integrity sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.1.2.tgz#b2656c8a506f7ce805a3f300a2ff48db022fa391"
+ integrity sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==
dependencies:
- commander "^2.19.0"
+ commander "^2.20.0"
source-map "~0.6.1"
- source-map-support "~0.5.10"
+ source-map-support "~0.5.12"
text-table@^0.2.0:
version "0.2.0"
@@ -7227,9 +7230,9 @@ trim-right@^1.0.1:
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
tslib@^1.9.0:
- version "1.9.3"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
- integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+ integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
[email protected]:
version "0.0.0"
@@ -7296,14 +7299,14 @@ unicode-property-aliases-ecmascript@^1.0.4:
integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
union-value@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
- integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+ integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
dependencies:
arr-union "^3.1.0"
get-value "^2.0.6"
is-extendable "^0.1.1"
- set-value "^0.4.3"
+ set-value "^2.0.1"
uniq@^1.0.1:
version "1.0.1"
@@ -7323,9 +7326,9 @@ unique-filename@^1.1.1:
unique-slug "^2.0.0"
unique-slug@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
- integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+ integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
dependencies:
imurmurhash "^0.1.4"
@@ -7459,12 +7462,10 @@ vendors@^1.0.0:
resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz#a6467781abd366217c050f8202e7e50cc9eef8c0"
integrity sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==
[email protected]:
- version "0.0.4"
- resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
- integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
- dependencies:
- indexof "0.0.1"
+vm-browserify@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
+ integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
vue-eslint-parser@^5.0.0:
version "5.0.0"
@@ -7494,10 +7495,10 @@ vue-loader@^15.7.0:
vue-hot-reload-api "^2.3.0"
vue-style-loader "^4.1.0"
-vue-router@^3.0.2:
- version "3.0.6"
- resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.6.tgz#2e4f0f9cbb0b96d0205ab2690cfe588935136ac3"
- integrity sha512-Ox0ciFLswtSGRTHYhGvx2L44sVbTPNS+uD2kRISuo8B39Y79rOo0Kw0hzupTmiVtftQYCZl87mwldhh2L9Aquw==
+vue-router@^3.0.7:
+ version "3.0.7"
+ resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.7.tgz#b36ca107b4acb8ff5bc4ff824584059c23fcb87b"
+ integrity sha512-utJ+QR3YlIC/6x6xq17UMXeAfxEvXA0VKD3PiSio7hBOZNusA1jXcbxZxVEfJunLp48oonjTepY8ORoIlRx/EQ==
vue-server-renderer@^2.6.10:
version "2.6.10"
@@ -7648,17 +7649,16 @@ webpack-sources@^1.3.0:
source-list-map "^2.0.0"
source-map "~0.6.1"
-webpack@^4.35.2:
- version "4.35.2"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.2.tgz#5c8b8a66602cbbd6ec65c6e6747914a61c1449b1"
- integrity sha512-TZAmorNymV4q66gAM/h90cEjG+N3627Q2MnkSgKlX/z3DlNVKUtqy57lz1WmZU2+FUZwzM+qm7cGaO95PyrX5A==
+webpack@^4.35.3:
+ version "4.35.3"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.3.tgz#66bc35ef215a7b75e8790f84d560013ffecf0ca3"
+ integrity sha512-xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA==
dependencies:
"@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/helper-module-context" "1.8.5"
"@webassemblyjs/wasm-edit" "1.8.5"
"@webassemblyjs/wasm-parser" "1.8.5"
- acorn "^6.0.5"
- acorn-dynamic-import "^4.0.0"
+ acorn "^6.2.0"
ajv "^6.1.0"
ajv-keywords "^3.1.0"
chrome-trace-event "^1.0.0"
@@ -7679,11 +7679,12 @@ webpack@^4.35.2:
webpack-sources "^1.3.0"
websocket-driver@>=0.5.1:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
- integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
+ integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
dependencies:
- http-parser-js ">=0.4.0"
+ http-parser-js ">=0.4.0 <0.4.11"
+ safe-buffer ">=5.1.0"
websocket-extensions ">=0.1.1"
websocket-extensions@>=0.1.1:
@@ -7748,9 +7749,9 @@ [email protected]:
mkdirp "^0.5.1"
xtend@^4.0.0, xtend@~4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
- integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+ integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
version "4.0.0"
|
a3b829715e49964a346d2f01a46f78509759c1ea
|
2019-08-15 02:10:40
|
Razvan Stoenescu
|
fix(QSelect/QInput): remove pesky scrollIntoView which essentially breaks anything on Cordova, especially for iOS
| false
|
remove pesky scrollIntoView which essentially breaks anything on Cordova, especially for iOS
|
fix
|
diff --git a/ui/src/components/input/QInput.js b/ui/src/components/input/QInput.js
index 994c35b8386..37ecf7e9c2b 100644
--- a/ui/src/components/input/QInput.js
+++ b/ui/src/components/input/QInput.js
@@ -191,7 +191,8 @@ export default Vue.extend({
change: this.__onChange,
compositionstart: this.__onCompositionStart,
compositionend: this.__onCompositionEnd,
- blur: stop
+ blur: stop,
+ focus: stop
}
if (this.$q.platform.is.android === true) {
@@ -202,18 +203,6 @@ export default Vue.extend({
on.keydown = this.__onMaskedKeydown
}
- if (this.editable === true && this.$q.platform.is.mobile === true) {
- on.focus = e => {
- stop(e)
- setTimeout(() => {
- this.$el !== void 0 && this.$el.scrollIntoView(true)
- }, 300)
- }
- }
- else {
- on.focus = stop
- }
-
const attrs = {
tabindex: 0,
autofocus: this.autofocus,
diff --git a/ui/src/components/select/QSelect.js b/ui/src/components/select/QSelect.js
index d76efc5d62d..0ae996379dc 100755
--- a/ui/src/components/select/QSelect.js
+++ b/ui/src/components/select/QSelect.js
@@ -698,13 +698,6 @@ export default Vue.extend({
if (this.hasDialog === true) {
on.click = stop
}
- else if (this.useInput === true && this.$q.platform.is.mobile === true) {
- on.focus = () => {
- setTimeout(() => {
- this.$el !== void 0 && this.$el.scrollIntoView(true)
- }, 300)
- }
- }
return h('input', {
ref: 'target',
|
1efecfa34650b9bc1a31a7a42b2bd9d0bff6997a
|
2016-06-18 02:20:02
|
Razvan Stoenescu
|
feat: Pull to Refresh - currently in beta
| false
|
Pull to Refresh - currently in beta
|
feat
|
diff --git a/preview/src/pages/chat/view.chat.html b/preview/src/pages/chat/view.chat.html
index 05cbe483a96..d6ec6d2163d 100644
--- a/preview/src/pages/chat/view.chat.html
+++ b/preview/src/pages/chat/view.chat.html
@@ -130,4 +130,17 @@
</p>
</div>
</div>
+ <div class="chat-other">
+ <div class="chat-user">
+ <img src="pages/chat/assets/linux-avatar.png">
+ </div>
+ <div class="chat-date">
+ Typing...
+ </div>
+ <div class="chat-message">
+ <p>
+ <spinner name="dots" color="#fff" :size="30"></spinner>
+ </p>
+ </div>
+ </div>
</div>
diff --git a/preview/src/pages/pull-to-refresh/config.pull-to-refresh.yml b/preview/src/pages/pull-to-refresh/config.pull-to-refresh.yml
new file mode 100644
index 00000000000..6fc27a32184
--- /dev/null
+++ b/preview/src/pages/pull-to-refresh/config.pull-to-refresh.yml
@@ -0,0 +1,5 @@
+label: 'Pull to Refresh'
+icon: 'pages'
+layout: 'main'
+navigation:
+ group: 'widget'
diff --git a/preview/src/pages/pull-to-refresh/script.pull-to-refresh.js b/preview/src/pages/pull-to-refresh/script.pull-to-refresh.js
new file mode 100644
index 00000000000..d479d5f6b1c
--- /dev/null
+++ b/preview/src/pages/pull-to-refresh/script.pull-to-refresh.js
@@ -0,0 +1,20 @@
+'use strict';
+
+var html = require('raw!./view.pull-to-refresh.html');
+
+var loremipsum = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.';
+
+module.exports = {
+ template: html,
+ data: {
+ items: [{}, {}, {}, {}, {}, {}]
+ },
+ methods: {
+ refresher: function(done) {
+ setTimeout(function() {
+ done();
+ this.items.unshift({});
+ }.bind(this), 3000);
+ }
+ }
+};
diff --git a/preview/src/pages/pull-to-refresh/view.pull-to-refresh.html b/preview/src/pages/pull-to-refresh/view.pull-to-refresh.html
new file mode 100644
index 00000000000..c08ed835152
--- /dev/null
+++ b/preview/src/pages/pull-to-refresh/view.pull-to-refresh.html
@@ -0,0 +1,22 @@
+
+<div style="height: 400px; overflow: auto; border: 1px solid black;">
+ <pull-to-refresh :handler="refresher">
+ <p v-for="item in items" class="caption highlight-and-fade">
+ <span class="badge bg-secondary text-white shadow-1">
+ {{ items.length - $index }}
+ </span>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+ </p>
+ </pull-to-refresh>
+</div>
+
+<br><br>
+
+<pull-to-refresh :handler="refresher" style="border: 1px solid black;">
+ <p v-for="item in items" class="caption highlight-and-fade">
+ <span class="badge bg-secondary text-white shadow-1">
+ {{ items.length - $index }}
+ </span>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+ </p>
+</pull-to-refresh>
diff --git a/src/lib/core-css/visibility.styl b/src/lib/core-css/visibility.styl
index 9787807ba94..d1047dbe44b 100644
--- a/src/lib/core-css/visibility.styl
+++ b/src/lib/core-css/visibility.styl
@@ -27,6 +27,17 @@ body
.z-absolute
z-index $z-absolute
+
+@keyframes quasar-highlight
+ 0%
+ background $lime-6
+ 100%
+ background transparent
+
+.highlight-and-fade
+ animation quasar-highlight 2s
+
+
for type in desktop mobile cordova ios mat touch no-touch within-iframe
body:not(.{type}) .{type}-only
display none !important
diff --git a/src/lib/core/app/assets/render-assets.js b/src/lib/core/app/assets/render-assets.js
index 5982f49d655..304ab57e185 100644
--- a/src/lib/core/app/assets/render-assets.js
+++ b/src/lib/core/app/assets/render-assets.js
@@ -104,6 +104,9 @@ module.exports.page = function(vue, context, done) {
if (context.parameterized) {
quasar.page.___quasarTemporary___ = quasar.current.page;
}
+ else if (!quasar.page[id]) {
+ quasar.page[id] = quasar.current.page;
+ }
quasar.current.page.vm = new Vue(injectVue(vue, el + '> .quasar-page', done));
quasar.current.page.pageContainer = $(quasar.current.page.vm.$el);
diff --git a/src/lib/core/global-progress/global-progress.js b/src/lib/core/global-progress/global-progress.js
index 238272a9e0d..73462d6035f 100644
--- a/src/lib/core/global-progress/global-progress.js
+++ b/src/lib/core/global-progress/global-progress.js
@@ -25,7 +25,6 @@ function showProgress(options) {
body.addClass('dimmed');
body.append(node);
- console.log(quasar.runs.on.ios ? 'ios' : 'tail');
vm = new Vue({
el: node[0],
data: {
@@ -34,7 +33,7 @@ function showProgress(options) {
});
timeout = null;
- }, options.delay || 300);
+ }, options.delay || 500);
appIsInProgress = true;
quasar.events.trigger('app:global-progress', true);
diff --git a/src/lib/core/initialize/initialize.js b/src/lib/core/initialize/initialize.js
index 505b9e12b78..7f3f3a7fc92 100644
--- a/src/lib/core/initialize/initialize.js
+++ b/src/lib/core/initialize/initialize.js
@@ -30,27 +30,25 @@ function forceTheme(theme) {
$('head').append('<link data-theme rel="stylesheet" href="css/app.' + theme + '.css">');
}
-$(function() {
- var
- body = $('body'),
- list = []
- ;
+var
+ body = $('body'),
+ list = []
+ ;
- forceTheme(body.hasClass('ios') || quasar.runs.on.ios ? 'ios' : 'mat');
+forceTheme(body.hasClass('ios') || quasar.runs.on.ios ? 'ios' : 'mat');
- list.push(quasar.runs.on.desktop ? 'desktop' : 'mobile');
- list.push(quasar.runs.with.touch ? 'touch' : 'no-touch');
+list.push(quasar.runs.on.desktop ? 'desktop' : 'mobile');
+list.push(quasar.runs.with.touch ? 'touch' : 'no-touch');
- if (quasar.runs.within.iframe) {
- list.push('within-iframe');
- }
+if (quasar.runs.within.iframe) {
+ list.push('within-iframe');
+}
- if (quasar.runs.on.cordova) {
- list.push('cordova');
- }
+if (quasar.runs.on.cordova) {
+ list.push('cordova');
+}
- body.addClass(list.join(' '));
-});
+body.addClass(list.join(' '));
/*
* Inject Globals
diff --git a/src/lib/web-components/pull-to-refresh/pull-to-refresh.html b/src/lib/web-components/pull-to-refresh/pull-to-refresh.html
new file mode 100644
index 00000000000..b84d259a4fa
--- /dev/null
+++ b/src/lib/web-components/pull-to-refresh/pull-to-refresh.html
@@ -0,0 +1,25 @@
+<div class="pull-to-refresh" v-el:container>
+ <div
+ class="pull-to-refresh-container"
+ :style="{transform: 'translateY(' + pullPosition + 'px)'}"
+ v-touch:pan-y="pull"
+ >
+ <div
+ class="pull-to-refresh-message row items-end justify-center"
+ >
+ <span v-show="state !== 'refreshing'">
+ <i :class="{'rotate-180': state === 'pulled'}">expand_more</i>
+ <span v-show="state === 'pull'">
+ Pull Down
+ </span>
+ <span v-show="state === 'pulled'">
+ Release
+ </span>
+ </span>
+ <span v-else>
+ <spinner :name="spinner" color="#777" :size="45"></spinner>
+ </span>
+ </div>
+ <slot></slot>
+ </div>
+</div>
diff --git a/src/lib/web-components/pull-to-refresh/pull-to-refresh.js b/src/lib/web-components/pull-to-refresh/pull-to-refresh.js
new file mode 100644
index 00000000000..e7727bb02f3
--- /dev/null
+++ b/src/lib/web-components/pull-to-refresh/pull-to-refresh.js
@@ -0,0 +1,132 @@
+'use strict';
+
+var template = require('raw!./pull-to-refresh.html');
+
+Vue.component('pull-to-refresh', {
+ template: template,
+ props: {
+ handler: {
+ type: Function,
+ required: true
+ },
+ distance: {
+ type: Number,
+ default: 35
+ }
+ },
+ data: function() {
+ var height = 65;
+
+ return {
+ state: 'pull',
+ pullPosition: - height,
+ height: height,
+ animating: false,
+ pulling: false,
+ scrolling: false
+ };
+ },
+ methods: {
+ pull: function(hammer) {
+ if (this.scrolling) {
+ if (hammer.isFinal) {
+ this.scrolling = false;
+ }
+ return;
+ }
+ if (this.animating) {
+ return;
+ }
+
+ if (!this.pulling) {
+ if (this.state === 'refreshing') {
+ return;
+ }
+ if (this.pullPosition === - this.height && hammer.direction === Hammer.DIRECTION_UP) {
+ return;
+ }
+
+ var
+ containerTop = this.scrollContainer.offset().top,
+ thisContainerTop = this.container.offset().top
+ ;
+
+ if (containerTop > thisContainerTop) {
+ this.scrolling = true;
+ return;
+ }
+
+ this.originalScrollOverflow = this.scrollContainer.css('overflow');
+ this.scrollContainer.css('overflow', 'hidden');
+ }
+
+ this.pulling = true;
+ this.pullPosition = - this.height + Math.max(0, Math.pow(hammer.deltaY, 0.85));
+
+ if (this.pullPosition > this.distance) {
+ if (hammer.isFinal) {
+ this.state = 'refreshing';
+ this.pulling = false;
+ this.scrollContainer.css('overflow', this.originalScrollOverflow);
+ this.animateTo(0);
+ this.trigger();
+ }
+ else {
+ this.state = 'pulled';
+ }
+ }
+ else {
+ this.state = 'pull';
+ if (hammer.isFinal) {
+ this.pulling = false;
+ this.scrollContainer.css('overflow', this.originalScrollOverflow);
+ this.animateTo(- this.height);
+ }
+ }
+ },
+ animateTo: function(target, done, previousCall) {
+ var self = this;
+
+ if (!previousCall && this.animationId) {
+ cancelAnimationFrame(this.animating);
+ }
+
+ this.pullPosition -= (this.pullPosition - target) / 7;
+
+ if (this.pullPosition - target > 1) {
+ this.animating = requestAnimationFrame(function() {
+ self.animateTo(target, done, true);
+ });
+ }
+ else {
+ this.animating = requestAnimationFrame(function() {
+ self.pullPosition = target;
+ self.animating = false;
+ done && done();
+ });
+ }
+ },
+ trigger: function() {
+ var self = this;
+
+ this.handler(function() {
+ self.animateTo(- self.height, function() {
+ self.state = 'pull';
+ });
+ });
+ }
+ },
+ ready: function() {
+ quasar.events.once('app:page:ready', function() {
+ this.container = $(this.$els.container);
+
+ var scrollContainer = this.container.parent();
+
+ if (scrollContainer.hasClass('quasar-page')) {
+ scrollContainer = scrollContainer.parent();
+ }
+
+ this.scrollContainer = scrollContainer;
+ }.bind(this));
+ }
+});
diff --git a/src/lib/web-components/pull-to-refresh/pull-to-refresh.styl b/src/lib/web-components/pull-to-refresh/pull-to-refresh.styl
new file mode 100644
index 00000000000..c3c4df48465
--- /dev/null
+++ b/src/lib/web-components/pull-to-refresh/pull-to-refresh.styl
@@ -0,0 +1,15 @@
+.pull-to-refresh
+ overflow hidden
+ position relative
+
+.pull-to-refresh-container
+ touch-action pan-x pan-y !important
+
+.pull-to-refresh-message
+ height 65px
+ color $faded
+ font-size 1rem
+ padding 10px 0
+ i
+ font-size 2rem
+ transition all .3s
|
40cfc0e4ef4d5bd9bd4ae840df555413a9f7c367
|
2024-11-04 20:55:19
|
Yusuf Kandemir
|
refactor(app-vite): convert comments in bex-bridge source to JSDocs
| false
|
convert comments in bex-bridge source to JSDocs
|
refactor
|
diff --git a/app-vite/templates/entry/bex-bridge.js b/app-vite/templates/entry/bex-bridge.js
index 7a60ba9a87e..92d16da95bf 100644
--- a/app-vite/templates/entry/bex-bridge.js
+++ b/app-vite/templates/entry/bex-bridge.js
@@ -6,34 +6,50 @@
const portNameRE = /^background$|^app$|^content@/
+/**
+ * @param {number} max
+ * @returns {number}
+ */
function getRandomId (max) {
return Math.floor(Math.random() * max)
}
+/**
+ * @typedef Message
+ * @property {string} from
+ * @property {string} to
+ * @property {string} event
+ * @property {any} payload
+ */
+
export class BexBridge {
- /**
- * Public properties
- */
- portName = null // string
- isConnected = false // boolean
- listeners = {} // { type: "on" | "once", callback: Message => void }
- portMap = {} // { [portName]: chrome.runtime.Port }
- portList = [] // [ portName, ... ]
- messageMap = {} // { [id]: { portName, resolve, reject } }
- chunkMap = {} // { [id]: { portName, number, messageType, messageProps, payload: [] } }
+ // Public properties
+ /** @type {string} */
+ portName = null
+ /** @type {boolean} */
+ isConnected = false
+ /** @type {{ type: 'on' | 'once', callback: (message: Message) => void }[]} */
+ listeners = {}
+ /** @type {{ [portName: string]: chrome.runtime.Port }} */
+ portMap = {}
+ /** @type {string[]} */
+ portList = []
+ /** @type {{ [id: string]: { portName: string, resolve: (payload: any) => void, reject: (err: any) => void } }} */
+ messageMap = {}
+ /** @type {{ [id: string]: { portName: string, number: number, messageType: string, messageProps: any, payload: any[] } }} */
+ chunkMap = {}
+
+ // Private properties
+ /** @type {'background' | 'content' | 'app'} */
+ #type
+ /** @type {boolean} */
+ #debug = false
+ /** @type {string} */
+ #banner
/**
- * Private properties
+ * @param {{ type: 'background' | 'content' | 'app', name?: string, debug?: boolean }} options
*/
- #type = null
- #debug = false
- #banner = null
-
- // param: {
- // type: "background" | "content" | "app"
- // name?: string (used & required for content scripts only)
- // debug?: boolean
- // }
constructor ({ type, name = '', debug }) {
this.portName = type
this.#type = type
@@ -103,12 +119,14 @@ export class BexBridge {
})
this.log(`Opened connection with ${ port.name }.`)
- this.#updatePortList({ added: port.name})
+ this.#updatePortList({ added: port.name })
})
}
}
- // () => Promise<void>
+ /**
+ * @returns {Promise<void>}
+ */
connectToBackground () {
if (this.#type === 'background') {
return Promise.reject('The background script itself does not need to connect')
@@ -166,7 +184,9 @@ export class BexBridge {
})
}
- // () => Promise<void>
+ /**
+ * @returns {Promise<void>}
+ */
disconnectFromBackground () {
if (this.#type === 'background') {
return Promise.reject('Background script does not need to disconnect')
@@ -182,8 +202,10 @@ export class BexBridge {
return Promise.resolve()
}
- // event: string
- // callback: (message: { from: string, to: string, payload?: any }) => void
+ /**
+ * @param {string} event
+ * @param {(message: Message) => void} callback
+ */
on (event, callback) {
if (!event) {
this.warn('Tried add listener but no event specified.')
@@ -200,8 +222,10 @@ export class BexBridge {
this.log(`Added a listener for event: "${ event }".`)
}
- // event: string
- // callback: (message: { from: string, to: string, payload?: any }) => void
+ /**
+ * @param {string} event
+ * @param {(message: Message) => void} callback
+ */
once (event, callback) {
if (!event) {
this.warn('Tried add listener but no event specified.')
@@ -218,8 +242,10 @@ export class BexBridge {
this.log(`Added a one-time listener for event: "${ event }".`)
}
- // event: string
- // callback: (message: { from: string, to: string, payload?: any }) => void
+ /**
+ * @param {string} event
+ * @param {(message: Message) => void} callback
+ */
off (event, callback) {
if (!event) {
this.warn('Tried to remove listeners but no event specified.')
@@ -263,13 +289,10 @@ export class BexBridge {
}
}
- // ({
- // event: string,
- // to?: "background" | "app" | "content@<name>-<xxxxx>",
- // payload?: any (if it's Array then it will be split into chunks)
- // }) => Promise<any | void>
- //
- // Returns a Promise that resolves with the response payload
+ /**
+ * @param {{ event: string, to: string, payload: any } | undefined} param
+ * @returns {Promise<any>} response payload
+ */
send ({ event, to, payload } = {}) {
if (this.isConnected === false) {
return Promise.reject(
@@ -326,12 +349,13 @@ export class BexBridge {
}))
}
- // value: boolean
+ /**
+ * @param {boolean} value
+ */
setDebug (value) {
this.#debug = value === true
}
- // ({ str: string, ...str?: string, debugObject?: any | void }) => void
log (...args) {
if (this.#debug !== true || args.length === 0) return
@@ -348,7 +372,6 @@ export class BexBridge {
}
}
- // ({ str: string, ...str?: string, debugObject?: any | void }) => void
warn (...args) {
if (args.length === 0) return
@@ -366,7 +389,9 @@ export class BexBridge {
}
}
- // reason: ({ added?: string } | { removed?: string })
+ /**
+ * @param {{ added?: string } | { removed?: string }} reason
+ */
#updatePortList (reason) {
this.portList = Object.keys(this.portMap)
const list = [ 'background', ...this.portList ]
@@ -388,7 +413,9 @@ export class BexBridge {
}
}
- // message: { from: string, to: string, event: string, payload: any | undefined }
+ /**
+ * @param {Message} message
+ */
async #triggerMessageEvent (message) {
const list = this.listeners[ message.event ]
@@ -429,7 +456,9 @@ export class BexBridge {
return responsePayload
}
- // portName: string
+ /**
+ * @param {string} portName
+ */
#cleanupPort (portName) {
for (const id in this.chunkMap) {
const packet = this.chunkMap[ id ]
@@ -615,11 +644,9 @@ export class BexBridge {
return Promise.resolve()
}
- // id?: number,
- // to: string,
- // payload: any,
- // messageType: "event-send" | "event-response",
- // messageProps: any
+ /**
+ * @param {{ id?: number, to: string, payload: any, messageType: "event-send" | "event-response", messageProps: any }} param
+ */
#sendMessage ({
id = getRandomId(1_000_000),
to,
|
b62bb847ad0ef999a0b3d0aeb8007ba5c2da12f6
|
2020-02-06 19:36:30
|
Razvan Stoenescu
|
feat(QColor): Add support for native forms
| false
|
Add support for native forms
|
feat
|
diff --git a/ui/dev/src/pages/form/form-native.vue b/ui/dev/src/pages/form/form-native.vue
index b3fe53c7e6a..afb8aa429c1 100644
--- a/ui/dev/src/pages/form/form-native.vue
+++ b/ui/dev/src/pages/form/form-native.vue
@@ -64,8 +64,9 @@
</div>
<div class="q-my-lg">
- <q-date name="date" v-model="date" :disable="disable" :dark="dark" />
- <q-time name="time" v-model="time" :disable="disable" :dark="dark" />
+ <q-date name="date" v-model="date" :disable="disable" :dark="dark" />
+ <q-time name="time" v-model="time" :disable="disable" :dark="dark" />
+ <q-color name="color" v-model="color" :disable="disable" :dark="dark" />
</div>
</q-card-section>
@@ -106,6 +107,7 @@ export default {
date: null,
time: null,
+ color: 'rgb(2,2,2)',
option: 'opt1',
diff --git a/ui/src/components/color/QColor.js b/ui/src/components/color/QColor.js
index bd10972c01f..6e3e3a11410 100644
--- a/ui/src/components/color/QColor.js
+++ b/ui/src/components/color/QColor.js
@@ -4,7 +4,9 @@ import { testPattern } from '../../utils/patterns.js'
import throttle from '../../utils/throttle.js'
import { cache } from '../../utils/vm.js'
import { hexToRgb, rgbToHex, rgbToString, stringToRgb, rgbToHsv, hsvToRgb, luminosity } from '../../utils/colors.js'
+
import DarkMixin from '../../mixins/dark.js'
+import FormMixin from '../../mixins/form.js'
import TouchPan from '../../directives/TouchPan.js'
@@ -32,7 +34,7 @@ const palette = [
export default Vue.extend({
name: 'QColor',
- mixins: [ DarkMixin ],
+ mixins: [ DarkMixin, FormMixin ],
directives: {
TouchPan
@@ -126,6 +128,14 @@ export default Vue.extend({
: this.isHex
},
+ formAttrs () {
+ return {
+ type: 'hidden',
+ name: this.name,
+ value: this.model[this.isOutputHex === true ? 'hex' : 'rgb' ]
+ }
+ },
+
hasAlpha () {
if (this.forceAlpha !== null) {
return this.forceAlpha
@@ -191,6 +201,12 @@ export default Vue.extend({
render (h) {
const child = [ this.__getContent(h) ]
+ this.name !== void 0 && this.disable !== true && this.__injectFormInput(
+ h,
+ child,
+ 'push'
+ )
+
this.noHeader !== true && child.unshift(
this.__getHeader(h)
)
|
6d621b708bc171dbe326937acad11162a9b32a24
|
2022-06-30 00:30:24
|
Jeff
|
chore(extras): bump version => v1.14.2
| false
|
bump version => v1.14.2
|
chore
|
diff --git a/extras/package.json b/extras/package.json
index 91b13a822a9..b2e1116afb4 100644
--- a/extras/package.json
+++ b/extras/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/extras",
- "version": "1.14.1",
+ "version": "1.14.2",
"description": "Quasar Framework fonts, icons and animations",
"scripts": {
"build": "node build/index.js"
|
0d0562e8037071fe47fb493c904cedd4d8954010
|
2024-11-02 20:42:25
|
Razvan Stoenescu
|
feat(docs): small tweak to app-vite upgrade guide on bex
| false
|
small tweak to app-vite upgrade guide on bex
|
feat
|
diff --git a/docs/src/pages/quasar-cli-vite/upgrade-guide.md b/docs/src/pages/quasar-cli-vite/upgrade-guide.md
index 42118aa14d2..d1f8fe63196 100644
--- a/docs/src/pages/quasar-cli-vite/upgrade-guide.md
+++ b/docs/src/pages/quasar-cli-vite/upgrade-guide.md
@@ -901,7 +901,11 @@ bridge.on('@quasar:ports', ({ portList, added, removed }) => {
// Current bridge port name (can be 'background', 'app', or 'content@<name>-<xxxxx>')
console.log(bridge.portName)
+```
+
+If you encounter problems with sending messages between the BEX parts, you could enable the debug mode for the bridges that interest you. In doing so, the communication will also be outputted to the browser console:
+```js Bridge debug mode
// Dynamically set debug mode
bridge.setDebug(true) // boolean
|
533505734788a2bc7925630d1a25a0617a1e9b50
|
2017-11-03 20:16:40
|
Razvan Stoenescu
|
feat: Page transition effects on dev for demo purposes
| false
|
Page transition effects on dev for demo purposes
|
feat
|
diff --git a/dev/App.vue b/dev/App.vue
index 1e623d1ad9e..cbe325f982d 100644
--- a/dev/App.vue
+++ b/dev/App.vue
@@ -1,6 +1,8 @@
<template>
<q-app>
- <router-view></router-view>
+ <q-transition enter="fadeIn" leave="fadeOut" mode="out-in" :duration="300" @leave="resetScroll">
+ <router-view></router-view>
+ </q-transition>
<q-ajax-bar ref="bar" />
</q-app>
</template>
@@ -9,6 +11,13 @@
export default {
mounted () {
window.bar = this.$refs.bar
+ },
+ methods: {
+ resetScroll (el, done) {
+ document.documentElement.scrollTop = 0
+ document.body.scrollTop = 0
+ done()
+ }
}
}
</script>
diff --git a/src/components/layout/QPage.js b/src/components/layout/QPage.js
index f9e152a5d50..1b14873a97a 100644
--- a/src/components/layout/QPage.js
+++ b/src/components/layout/QPage.js
@@ -1,16 +1,12 @@
export default {
name: 'q-page',
inject: {
- layout: {
- default () {
- console.error('QPage needs to be child of QLayout')
- }
- },
pageContainer: {
default () {
console.error('QPage needs to be child of QPageContainer')
}
- }
+ },
+ layout: {}
},
props: {
padding: Boolean
|
36f313857238b986fda988f5827aefabab6d278d
|
2019-07-08 19:07:54
|
Razvan Stoenescu
|
feat(Platform): Improve mobile platform detection
| false
|
Improve mobile platform detection
|
feat
|
diff --git a/ui/src/plugins/Platform.js b/ui/src/plugins/Platform.js
index bf77270f231..f51a03180a3 100644
--- a/ui/src/plugins/Platform.js
+++ b/ui/src/plugins/Platform.js
@@ -12,10 +12,11 @@ function getMatch (userAgent, platformMatch) {
const match = /(edge|edga|edgios)\/([\w.]+)/.exec(userAgent) ||
/(opr)[\/]([\w.]+)/.exec(userAgent) ||
/(vivaldi)[\/]([\w.]+)/.exec(userAgent) ||
- /(chrome)[\/]([\w.]+)/.exec(userAgent) ||
+ /(chrome|crios)[\/]([\w.]+)/.exec(userAgent) ||
/(iemobile)[\/]([\w.]+)/.exec(userAgent) ||
/(version)(applewebkit)[\/]([\w.]+).*(safari)[\/]([\w.]+)/.exec(userAgent) ||
/(webkit)[\/]([\w.]+).*(version)[\/]([\w.]+).*(safari)[\/]([\w.]+)/.exec(userAgent) ||
+ /(firefox|fxios)[\/]([\w.]+)/.exec(userAgent) ||
/(webkit)[\/]([\w.]+)/.exec(userAgent) ||
/(opera)(?:.*version|)[\/]([\w.]+)/.exec(userAgent) ||
/(msie) ([\w.]+)/.exec(userAgent) ||
@@ -87,6 +88,15 @@ function getPlatform (userAgent) {
if (browser.edga || browser.edgios) {
browser.edge = true
+ matched.browser = 'edge'
+ }
+ else if (browser.crios) {
+ browser.chrome = true
+ matched.browser = 'chrome'
+ }
+ else if (browser.fxios) {
+ browser.firefox = true
+ matched.browser = 'firefox'
}
}
// If it's not mobile we should consider it's desktop platform, meaning it runs a desktop browser
@@ -128,12 +138,6 @@ function getPlatform (userAgent) {
browser.ie = true
}
- // Edge is officially known as Microsoft Edge, so rewrite the key to match
- if (browser.edge) {
- matched.browser = 'edge'
- browser.edge = true
- }
-
// Blackberry browsers are marked as Safari on BlackBerry
if (browser.safari && browser.blackberry || browser.bb) {
matched.browser = 'blackberry'
|
cbc828fd6117781ba7130c7b2893ddfc335b9c0b
|
2020-04-03 17:37:17
|
Razvan Stoenescu
|
chore(app): Bump version
| false
|
Bump version
|
chore
|
diff --git a/app/package.json b/app/package.json
index a689c7c67b6..63234dbd39b 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "@quasar/app",
- "version": "1.6.0",
+ "version": "1.6.1",
"description": "Quasar Framework local CLI",
"bin": {
"quasar": "./bin/quasar"
|
3c76cfa684a040ae6708742f14d82caa87b6797d
|
2018-10-05 04:58:13
|
Razvan Stoenescu
|
feat: Tabs small design enhancement to meet Material guidelines min-width
| false
|
Tabs small design enhancement to meet Material guidelines min-width
|
feat
|
diff --git a/src/components/layout/QDrawer.js b/src/components/layout/QDrawer.js
index 3ec93dee559..e23a39eae8b 100644
--- a/src/components/layout/QDrawer.js
+++ b/src/components/layout/QDrawer.js
@@ -532,7 +532,7 @@ export default Vue.extend({
}, child.concat([
h('aside', {
ref: 'content',
- staticClass: `q-drawer q-layout__section--animate`,
+ staticClass: `q-drawer q-layout__section q-layout__section--animate`,
'class': this.classes,
style: this.style,
attrs: this.$attrs,
diff --git a/src/components/layout/QFooter.js b/src/components/layout/QFooter.js
index db0a31af00f..4c171c87d08 100644
--- a/src/components/layout/QFooter.js
+++ b/src/components/layout/QFooter.js
@@ -118,7 +118,7 @@ export default Vue.extend({
render (h) {
return h('footer', {
- staticClass: 'q-footer q-layout__section--marginal q-layout__section--animate',
+ staticClass: 'q-footer q-layout__section q-layout__section--marginal q-layout__section--animate',
'class': this.classes,
style: this.style
}, [
diff --git a/src/components/layout/QHeader.js b/src/components/layout/QHeader.js
index 4fc445ccadf..4a4114dbeb4 100644
--- a/src/components/layout/QHeader.js
+++ b/src/components/layout/QHeader.js
@@ -111,7 +111,7 @@ export default Vue.extend({
render (h) {
return h('header', {
- staticClass: 'q-header q-layout__section--marginal q-layout__section--animate',
+ staticClass: 'q-header q-layout__section q-layout__section--marginal q-layout__section--animate',
'class': this.classes,
style: this.style
}, [
diff --git a/src/components/layout/QPageContainer.js b/src/components/layout/QPageContainer.js
index 7b22a501478..916655b8afc 100644
--- a/src/components/layout/QPageContainer.js
+++ b/src/components/layout/QPageContainer.js
@@ -38,7 +38,7 @@ export default Vue.extend({
render (h) {
return h('div', {
- staticClass: 'q-page-container q-layout__section--animate',
+ staticClass: 'q-page-container q-layout__section q-layout__section--animate',
style: this.style
}, this.$slots.default)
}
diff --git a/src/components/layout/layout.styl b/src/components/layout/layout.styl
index 354fe5634a9..ccf4cba3ee3 100644
--- a/src/components/layout/layout.styl
+++ b/src/components/layout/layout.styl
@@ -68,6 +68,7 @@ $layout-transition = all .12s ease-in
position relative
.q-layout__section
+
&--elevated
box-shadow $layout-aside-shadow
&--bordered
diff --git a/src/components/tabs/tabs.styl b/src/components/tabs/tabs.styl
index 031e983ba1b..d1a94a47656 100644
--- a/src/components/tabs/tabs.styl
+++ b/src/components/tabs/tabs.styl
@@ -17,6 +17,7 @@
&__content
height inherit
+ min-width 40px
&--inline
.q-tab__icon + .q-tab__label
@@ -105,3 +106,8 @@ body.mobile
.q-tab-panel
padding 16px
+
+@media (min-width $breakpoint-lg-min)
+ .q-header, .q-footer
+ .q-tab__content
+ min-width 128px
|
4691db529a1b4055b2c198888f6c9eb6f1fdf484
|
2019-05-03 16:18:40
|
Razvan Stoenescu
|
refactor(quasar): rename to more appropriate name: /quasar -> /ui
| false
|
rename to more appropriate name: /quasar -> /ui
|
refactor
|
diff --git a/quasar/.bithoundrc b/ui/.bithoundrc
similarity index 100%
rename from quasar/.bithoundrc
rename to ui/.bithoundrc
diff --git a/quasar/.codeclimate.yml b/ui/.codeclimate.yml
similarity index 100%
rename from quasar/.codeclimate.yml
rename to ui/.codeclimate.yml
diff --git a/quasar/.editorconfig b/ui/.editorconfig
similarity index 100%
rename from quasar/.editorconfig
rename to ui/.editorconfig
diff --git a/quasar/.eslintrc.js b/ui/.eslintrc.js
similarity index 100%
rename from quasar/.eslintrc.js
rename to ui/.eslintrc.js
diff --git a/quasar/.gitignore b/ui/.gitignore
similarity index 100%
rename from quasar/.gitignore
rename to ui/.gitignore
diff --git a/quasar/.postcssrc.js b/ui/.postcssrc.js
similarity index 100%
rename from quasar/.postcssrc.js
rename to ui/.postcssrc.js
diff --git a/quasar/.stylintrc b/ui/.stylintrc
similarity index 100%
rename from quasar/.stylintrc
rename to ui/.stylintrc
diff --git a/quasar/LICENSE b/ui/LICENSE
similarity index 100%
rename from quasar/LICENSE
rename to ui/LICENSE
diff --git a/quasar/README.md b/ui/README.md
similarity index 100%
rename from quasar/README.md
rename to ui/README.md
diff --git a/quasar/babel.config.js b/ui/babel.config.js
similarity index 100%
rename from quasar/babel.config.js
rename to ui/babel.config.js
diff --git a/quasar/backers.md b/ui/backers.md
similarity index 100%
rename from quasar/backers.md
rename to ui/backers.md
diff --git a/quasar/build/build.api.js b/ui/build/build.api.js
similarity index 100%
rename from quasar/build/build.api.js
rename to ui/build/build.api.js
diff --git a/quasar/build/build.conf.js b/ui/build/build.conf.js
similarity index 100%
rename from quasar/build/build.conf.js
rename to ui/build/build.conf.js
diff --git a/quasar/build/build.lang-index.js b/ui/build/build.lang-index.js
similarity index 100%
rename from quasar/build/build.lang-index.js
rename to ui/build/build.lang-index.js
diff --git a/quasar/build/build.transforms.js b/ui/build/build.transforms.js
similarity index 100%
rename from quasar/build/build.transforms.js
rename to ui/build/build.transforms.js
diff --git a/quasar/build/build.types.js b/ui/build/build.types.js
similarity index 100%
rename from quasar/build/build.types.js
rename to ui/build/build.types.js
diff --git a/quasar/build/build.utils.js b/ui/build/build.utils.js
similarity index 100%
rename from quasar/build/build.utils.js
rename to ui/build/build.utils.js
diff --git a/quasar/build/build.vetur.js b/ui/build/build.vetur.js
similarity index 100%
rename from quasar/build/build.vetur.js
rename to ui/build/build.vetur.js
diff --git a/quasar/build/env.js b/ui/build/env.js
similarity index 100%
rename from quasar/build/env.js
rename to ui/build/env.js
diff --git a/quasar/build/script.build.javascript.js b/ui/build/script.build.javascript.js
similarity index 100%
rename from quasar/build/script.build.javascript.js
rename to ui/build/script.build.javascript.js
diff --git a/quasar/build/script.build.js b/ui/build/script.build.js
similarity index 100%
rename from quasar/build/script.build.js
rename to ui/build/script.build.js
diff --git a/quasar/build/script.build.stylus.js b/ui/build/script.build.stylus.js
similarity index 100%
rename from quasar/build/script.build.stylus.js
rename to ui/build/script.build.stylus.js
diff --git a/quasar/build/script.clean.js b/ui/build/script.clean.js
similarity index 100%
rename from quasar/build/script.clean.js
rename to ui/build/script.clean.js
diff --git a/quasar/build/script.dev.spa.js b/ui/build/script.dev.spa.js
similarity index 100%
rename from quasar/build/script.dev.spa.js
rename to ui/build/script.dev.spa.js
diff --git a/quasar/build/script.dev.ssr.js b/ui/build/script.dev.ssr.js
similarity index 100%
rename from quasar/build/script.dev.ssr.js
rename to ui/build/script.dev.ssr.js
diff --git a/quasar/build/script.test-umd.js b/ui/build/script.test-umd.js
similarity index 100%
rename from quasar/build/script.test-umd.js
rename to ui/build/script.test-umd.js
diff --git a/quasar/build/webpack.inject.base.js b/ui/build/webpack.inject.base.js
similarity index 100%
rename from quasar/build/webpack.inject.base.js
rename to ui/build/webpack.inject.base.js
diff --git a/quasar/build/webpack.spa.js b/ui/build/webpack.spa.js
similarity index 100%
rename from quasar/build/webpack.spa.js
rename to ui/build/webpack.spa.js
diff --git a/quasar/build/webpack.ssr.client.js b/ui/build/webpack.ssr.client.js
similarity index 100%
rename from quasar/build/webpack.ssr.client.js
rename to ui/build/webpack.ssr.client.js
diff --git a/quasar/build/webpack.ssr.server.js b/ui/build/webpack.ssr.server.js
similarity index 100%
rename from quasar/build/webpack.ssr.server.js
rename to ui/build/webpack.ssr.server.js
diff --git a/quasar/circle.yml b/ui/circle.yml
similarity index 100%
rename from quasar/circle.yml
rename to ui/circle.yml
diff --git a/quasar/dev-umd/index.umd.html b/ui/dev-umd/index.umd.html
similarity index 100%
rename from quasar/dev-umd/index.umd.html
rename to ui/dev-umd/index.umd.html
diff --git a/quasar/dev/App.vue b/ui/dev/App.vue
similarity index 100%
rename from quasar/dev/App.vue
rename to ui/dev/App.vue
diff --git a/quasar/dev/app.entry-client.js b/ui/dev/app.entry-client.js
similarity index 100%
rename from quasar/dev/app.entry-client.js
rename to ui/dev/app.entry-client.js
diff --git a/quasar/dev/app.entry-server.js b/ui/dev/app.entry-server.js
similarity index 100%
rename from quasar/dev/app.entry-server.js
rename to ui/dev/app.entry-server.js
diff --git a/quasar/dev/app.js b/ui/dev/app.js
similarity index 100%
rename from quasar/dev/app.js
rename to ui/dev/app.js
diff --git a/quasar/dev/app.styl b/ui/dev/app.styl
similarity index 100%
rename from quasar/dev/app.styl
rename to ui/dev/app.styl
diff --git a/quasar/dev/assets/avatar.png b/ui/dev/assets/avatar.png
similarity index 100%
rename from quasar/dev/assets/avatar.png
rename to ui/dev/assets/avatar.png
diff --git a/quasar/dev/assets/boy-avatar.png b/ui/dev/assets/boy-avatar.png
similarity index 100%
rename from quasar/dev/assets/boy-avatar.png
rename to ui/dev/assets/boy-avatar.png
diff --git a/quasar/dev/assets/donuts.png b/ui/dev/assets/donuts.png
similarity index 100%
rename from quasar/dev/assets/donuts.png
rename to ui/dev/assets/donuts.png
diff --git a/quasar/dev/assets/grid-data.json b/ui/dev/assets/grid-data.json
similarity index 100%
rename from quasar/dev/assets/grid-data.json
rename to ui/dev/assets/grid-data.json
diff --git a/quasar/dev/assets/guy-avatar.png b/ui/dev/assets/guy-avatar.png
similarity index 100%
rename from quasar/dev/assets/guy-avatar.png
rename to ui/dev/assets/guy-avatar.png
diff --git a/quasar/dev/assets/linux-avatar.png b/ui/dev/assets/linux-avatar.png
similarity index 100%
rename from quasar/dev/assets/linux-avatar.png
rename to ui/dev/assets/linux-avatar.png
diff --git a/quasar/dev/assets/map.png b/ui/dev/assets/map.png
similarity index 100%
rename from quasar/dev/assets/map.png
rename to ui/dev/assets/map.png
diff --git a/quasar/dev/assets/mountains.jpg b/ui/dev/assets/mountains.jpg
similarity index 100%
rename from quasar/dev/assets/mountains.jpg
rename to ui/dev/assets/mountains.jpg
diff --git a/quasar/dev/assets/parallax1.jpg b/ui/dev/assets/parallax1.jpg
similarity index 100%
rename from quasar/dev/assets/parallax1.jpg
rename to ui/dev/assets/parallax1.jpg
diff --git a/quasar/dev/assets/parallax2.jpg b/ui/dev/assets/parallax2.jpg
similarity index 100%
rename from quasar/dev/assets/parallax2.jpg
rename to ui/dev/assets/parallax2.jpg
diff --git a/quasar/dev/assets/quasar.jpg b/ui/dev/assets/quasar.jpg
similarity index 100%
rename from quasar/dev/assets/quasar.jpg
rename to ui/dev/assets/quasar.jpg
diff --git a/quasar/dev/assets/sad.svg b/ui/dev/assets/sad.svg
similarity index 100%
rename from quasar/dev/assets/sad.svg
rename to ui/dev/assets/sad.svg
diff --git a/quasar/dev/components/components/ajax-bar.vue b/ui/dev/components/components/ajax-bar.vue
similarity index 100%
rename from quasar/dev/components/components/ajax-bar.vue
rename to ui/dev/components/components/ajax-bar.vue
diff --git a/quasar/dev/components/components/avatar.vue b/ui/dev/components/components/avatar.vue
similarity index 100%
rename from quasar/dev/components/components/avatar.vue
rename to ui/dev/components/components/avatar.vue
diff --git a/quasar/dev/components/components/badge.vue b/ui/dev/components/components/badge.vue
similarity index 100%
rename from quasar/dev/components/components/badge.vue
rename to ui/dev/components/components/badge.vue
diff --git a/quasar/dev/components/components/banner.vue b/ui/dev/components/components/banner.vue
similarity index 100%
rename from quasar/dev/components/components/banner.vue
rename to ui/dev/components/components/banner.vue
diff --git a/quasar/dev/components/components/bar.vue b/ui/dev/components/components/bar.vue
similarity index 100%
rename from quasar/dev/components/components/bar.vue
rename to ui/dev/components/components/bar.vue
diff --git a/quasar/dev/components/components/breadcrumbs.vue b/ui/dev/components/components/breadcrumbs.vue
similarity index 100%
rename from quasar/dev/components/components/breadcrumbs.vue
rename to ui/dev/components/components/breadcrumbs.vue
diff --git a/quasar/dev/components/components/button-dropdown.vue b/ui/dev/components/components/button-dropdown.vue
similarity index 100%
rename from quasar/dev/components/components/button-dropdown.vue
rename to ui/dev/components/components/button-dropdown.vue
diff --git a/quasar/dev/components/components/button-functional.vue b/ui/dev/components/components/button-functional.vue
similarity index 100%
rename from quasar/dev/components/components/button-functional.vue
rename to ui/dev/components/components/button-functional.vue
diff --git a/quasar/dev/components/components/button-group.vue b/ui/dev/components/components/button-group.vue
similarity index 100%
rename from quasar/dev/components/components/button-group.vue
rename to ui/dev/components/components/button-group.vue
diff --git a/quasar/dev/components/components/button-toggle.vue b/ui/dev/components/components/button-toggle.vue
similarity index 100%
rename from quasar/dev/components/components/button-toggle.vue
rename to ui/dev/components/components/button-toggle.vue
diff --git a/quasar/dev/components/components/button.vue b/ui/dev/components/components/button.vue
similarity index 100%
rename from quasar/dev/components/components/button.vue
rename to ui/dev/components/components/button.vue
diff --git a/quasar/dev/components/components/card.vue b/ui/dev/components/components/card.vue
similarity index 100%
rename from quasar/dev/components/components/card.vue
rename to ui/dev/components/components/card.vue
diff --git a/quasar/dev/components/components/carousel.vue b/ui/dev/components/components/carousel.vue
similarity index 100%
rename from quasar/dev/components/components/carousel.vue
rename to ui/dev/components/components/carousel.vue
diff --git a/quasar/dev/components/components/chat.vue b/ui/dev/components/components/chat.vue
similarity index 100%
rename from quasar/dev/components/components/chat.vue
rename to ui/dev/components/components/chat.vue
diff --git a/quasar/dev/components/components/chip.vue b/ui/dev/components/components/chip.vue
similarity index 100%
rename from quasar/dev/components/components/chip.vue
rename to ui/dev/components/components/chip.vue
diff --git a/quasar/dev/components/components/circular-progress.vue b/ui/dev/components/components/circular-progress.vue
similarity index 100%
rename from quasar/dev/components/components/circular-progress.vue
rename to ui/dev/components/components/circular-progress.vue
diff --git a/quasar/dev/components/components/data-table-part1.vue b/ui/dev/components/components/data-table-part1.vue
similarity index 100%
rename from quasar/dev/components/components/data-table-part1.vue
rename to ui/dev/components/components/data-table-part1.vue
diff --git a/quasar/dev/components/components/data-table-part2.vue b/ui/dev/components/components/data-table-part2.vue
similarity index 100%
rename from quasar/dev/components/components/data-table-part2.vue
rename to ui/dev/components/components/data-table-part2.vue
diff --git a/quasar/dev/components/components/fab.vue b/ui/dev/components/components/fab.vue
similarity index 100%
rename from quasar/dev/components/components/fab.vue
rename to ui/dev/components/components/fab.vue
diff --git a/quasar/dev/components/components/focus-tests.vue b/ui/dev/components/components/focus-tests.vue
similarity index 100%
rename from quasar/dev/components/components/focus-tests.vue
rename to ui/dev/components/components/focus-tests.vue
diff --git a/quasar/dev/components/components/icon.vue b/ui/dev/components/components/icon.vue
similarity index 100%
rename from quasar/dev/components/components/icon.vue
rename to ui/dev/components/components/icon.vue
diff --git a/quasar/dev/components/components/img.vue b/ui/dev/components/components/img.vue
similarity index 100%
rename from quasar/dev/components/components/img.vue
rename to ui/dev/components/components/img.vue
diff --git a/quasar/dev/components/components/infinite-scroll.vue b/ui/dev/components/components/infinite-scroll.vue
similarity index 100%
rename from quasar/dev/components/components/infinite-scroll.vue
rename to ui/dev/components/components/infinite-scroll.vue
diff --git a/quasar/dev/components/components/layout-container.vue b/ui/dev/components/components/layout-container.vue
similarity index 100%
rename from quasar/dev/components/components/layout-container.vue
rename to ui/dev/components/components/layout-container.vue
diff --git a/quasar/dev/components/components/linear-progress.vue b/ui/dev/components/components/linear-progress.vue
similarity index 100%
rename from quasar/dev/components/components/linear-progress.vue
rename to ui/dev/components/components/linear-progress.vue
diff --git a/quasar/dev/components/components/list-expansion-item.vue b/ui/dev/components/components/list-expansion-item.vue
similarity index 100%
rename from quasar/dev/components/components/list-expansion-item.vue
rename to ui/dev/components/components/list-expansion-item.vue
diff --git a/quasar/dev/components/components/list-item.vue b/ui/dev/components/components/list-item.vue
similarity index 100%
rename from quasar/dev/components/components/list-item.vue
rename to ui/dev/components/components/list-item.vue
diff --git a/quasar/dev/components/components/list-slide-item.vue b/ui/dev/components/components/list-slide-item.vue
similarity index 100%
rename from quasar/dev/components/components/list-slide-item.vue
rename to ui/dev/components/components/list-slide-item.vue
diff --git a/quasar/dev/components/components/menu-test.vue b/ui/dev/components/components/menu-test.vue
similarity index 100%
rename from quasar/dev/components/components/menu-test.vue
rename to ui/dev/components/components/menu-test.vue
diff --git a/quasar/dev/components/components/menu.vue b/ui/dev/components/components/menu.vue
similarity index 100%
rename from quasar/dev/components/components/menu.vue
rename to ui/dev/components/components/menu.vue
diff --git a/quasar/dev/components/components/no-ssr.vue b/ui/dev/components/components/no-ssr.vue
similarity index 100%
rename from quasar/dev/components/components/no-ssr.vue
rename to ui/dev/components/components/no-ssr.vue
diff --git a/quasar/dev/components/components/pagination.vue b/ui/dev/components/components/pagination.vue
similarity index 100%
rename from quasar/dev/components/components/pagination.vue
rename to ui/dev/components/components/pagination.vue
diff --git a/quasar/dev/components/components/parallax.vue b/ui/dev/components/components/parallax.vue
similarity index 100%
rename from quasar/dev/components/components/parallax.vue
rename to ui/dev/components/components/parallax.vue
diff --git a/quasar/dev/components/components/popup-proxy.vue b/ui/dev/components/components/popup-proxy.vue
similarity index 100%
rename from quasar/dev/components/components/popup-proxy.vue
rename to ui/dev/components/components/popup-proxy.vue
diff --git a/quasar/dev/components/components/pull-to-refresh-part1.vue b/ui/dev/components/components/pull-to-refresh-part1.vue
similarity index 100%
rename from quasar/dev/components/components/pull-to-refresh-part1.vue
rename to ui/dev/components/components/pull-to-refresh-part1.vue
diff --git a/quasar/dev/components/components/pull-to-refresh-part2.vue b/ui/dev/components/components/pull-to-refresh-part2.vue
similarity index 100%
rename from quasar/dev/components/components/pull-to-refresh-part2.vue
rename to ui/dev/components/components/pull-to-refresh-part2.vue
diff --git a/quasar/dev/components/components/scroll-area.vue b/ui/dev/components/components/scroll-area.vue
similarity index 100%
rename from quasar/dev/components/components/scroll-area.vue
rename to ui/dev/components/components/scroll-area.vue
diff --git a/quasar/dev/components/components/scroll-fire.vue b/ui/dev/components/components/scroll-fire.vue
similarity index 100%
rename from quasar/dev/components/components/scroll-fire.vue
rename to ui/dev/components/components/scroll-fire.vue
diff --git a/quasar/dev/components/components/spinner.vue b/ui/dev/components/components/spinner.vue
similarity index 100%
rename from quasar/dev/components/components/spinner.vue
rename to ui/dev/components/components/spinner.vue
diff --git a/quasar/dev/components/components/splitter.vue b/ui/dev/components/components/splitter.vue
similarity index 100%
rename from quasar/dev/components/components/splitter.vue
rename to ui/dev/components/components/splitter.vue
diff --git a/quasar/dev/components/components/stepper.vue b/ui/dev/components/components/stepper.vue
similarity index 100%
rename from quasar/dev/components/components/stepper.vue
rename to ui/dev/components/components/stepper.vue
diff --git a/quasar/dev/components/components/tabs.vue b/ui/dev/components/components/tabs.vue
similarity index 100%
rename from quasar/dev/components/components/tabs.vue
rename to ui/dev/components/components/tabs.vue
diff --git a/quasar/dev/components/components/timeline.vue b/ui/dev/components/components/timeline.vue
similarity index 100%
rename from quasar/dev/components/components/timeline.vue
rename to ui/dev/components/components/timeline.vue
diff --git a/quasar/dev/components/components/toolbar.vue b/ui/dev/components/components/toolbar.vue
similarity index 100%
rename from quasar/dev/components/components/toolbar.vue
rename to ui/dev/components/components/toolbar.vue
diff --git a/quasar/dev/components/components/tooltip.vue b/ui/dev/components/components/tooltip.vue
similarity index 100%
rename from quasar/dev/components/components/tooltip.vue
rename to ui/dev/components/components/tooltip.vue
diff --git a/quasar/dev/components/components/transition-animatecss.vue b/ui/dev/components/components/transition-animatecss.vue
similarity index 100%
rename from quasar/dev/components/components/transition-animatecss.vue
rename to ui/dev/components/components/transition-animatecss.vue
diff --git a/quasar/dev/components/components/tree.vue b/ui/dev/components/components/tree.vue
similarity index 100%
rename from quasar/dev/components/components/tree.vue
rename to ui/dev/components/components/tree.vue
diff --git a/quasar/dev/components/components/video-embedding.vue b/ui/dev/components/components/video-embedding.vue
similarity index 100%
rename from quasar/dev/components/components/video-embedding.vue
rename to ui/dev/components/components/video-embedding.vue
diff --git a/quasar/dev/components/css/colors.vue b/ui/dev/components/css/colors.vue
similarity index 100%
rename from quasar/dev/components/css/colors.vue
rename to ui/dev/components/css/colors.vue
diff --git a/quasar/dev/components/css/flex-addon.vue b/ui/dev/components/css/flex-addon.vue
similarity index 100%
rename from quasar/dev/components/css/flex-addon.vue
rename to ui/dev/components/css/flex-addon.vue
diff --git a/quasar/dev/components/css/flex-columns.vue b/ui/dev/components/css/flex-columns.vue
similarity index 100%
rename from quasar/dev/components/css/flex-columns.vue
rename to ui/dev/components/css/flex-columns.vue
diff --git a/quasar/dev/components/css/flex-gutter.vue b/ui/dev/components/css/flex-gutter.vue
similarity index 100%
rename from quasar/dev/components/css/flex-gutter.vue
rename to ui/dev/components/css/flex-gutter.vue
diff --git a/quasar/dev/components/css/flex-rows.vue b/ui/dev/components/css/flex-rows.vue
similarity index 100%
rename from quasar/dev/components/css/flex-rows.vue
rename to ui/dev/components/css/flex-rows.vue
diff --git a/quasar/dev/components/css/flex-test.vue b/ui/dev/components/css/flex-test.vue
similarity index 100%
rename from quasar/dev/components/css/flex-test.vue
rename to ui/dev/components/css/flex-test.vue
diff --git a/quasar/dev/components/css/material-ripples.vue b/ui/dev/components/css/material-ripples.vue
similarity index 100%
rename from quasar/dev/components/css/material-ripples.vue
rename to ui/dev/components/css/material-ripples.vue
diff --git a/quasar/dev/components/css/shadows.vue b/ui/dev/components/css/shadows.vue
similarity index 100%
rename from quasar/dev/components/css/shadows.vue
rename to ui/dev/components/css/shadows.vue
diff --git a/quasar/dev/components/css/size-addon.vue b/ui/dev/components/css/size-addon.vue
similarity index 100%
rename from quasar/dev/components/css/size-addon.vue
rename to ui/dev/components/css/size-addon.vue
diff --git a/quasar/dev/components/css/typography.vue b/ui/dev/components/css/typography.vue
similarity index 100%
rename from quasar/dev/components/css/typography.vue
rename to ui/dev/components/css/typography.vue
diff --git a/quasar/dev/components/form/checkbox-radio-toggle-test.vue b/ui/dev/components/form/checkbox-radio-toggle-test.vue
similarity index 100%
rename from quasar/dev/components/form/checkbox-radio-toggle-test.vue
rename to ui/dev/components/form/checkbox-radio-toggle-test.vue
diff --git a/quasar/dev/components/form/checkbox.vue b/ui/dev/components/form/checkbox.vue
similarity index 100%
rename from quasar/dev/components/form/checkbox.vue
rename to ui/dev/components/form/checkbox.vue
diff --git a/quasar/dev/components/form/color-picker.vue b/ui/dev/components/form/color-picker.vue
similarity index 100%
rename from quasar/dev/components/form/color-picker.vue
rename to ui/dev/components/form/color-picker.vue
diff --git a/quasar/dev/components/form/date.vue b/ui/dev/components/form/date.vue
similarity index 100%
rename from quasar/dev/components/form/date.vue
rename to ui/dev/components/form/date.vue
diff --git a/quasar/dev/components/form/editor.vue b/ui/dev/components/form/editor.vue
similarity index 100%
rename from quasar/dev/components/form/editor.vue
rename to ui/dev/components/form/editor.vue
diff --git a/quasar/dev/components/form/field.vue b/ui/dev/components/form/field.vue
similarity index 100%
rename from quasar/dev/components/form/field.vue
rename to ui/dev/components/form/field.vue
diff --git a/quasar/dev/components/form/form.vue b/ui/dev/components/form/form.vue
similarity index 100%
rename from quasar/dev/components/form/form.vue
rename to ui/dev/components/form/form.vue
diff --git a/quasar/dev/components/form/input-and-qselect-test.vue b/ui/dev/components/form/input-and-qselect-test.vue
similarity index 100%
rename from quasar/dev/components/form/input-and-qselect-test.vue
rename to ui/dev/components/form/input-and-qselect-test.vue
diff --git a/quasar/dev/components/form/input-debounce-test.vue b/ui/dev/components/form/input-debounce-test.vue
similarity index 100%
rename from quasar/dev/components/form/input-debounce-test.vue
rename to ui/dev/components/form/input-debounce-test.vue
diff --git a/quasar/dev/components/form/input-mask.vue b/ui/dev/components/form/input-mask.vue
similarity index 100%
rename from quasar/dev/components/form/input-mask.vue
rename to ui/dev/components/form/input-mask.vue
diff --git a/quasar/dev/components/form/input-validate.vue b/ui/dev/components/form/input-validate.vue
similarity index 100%
rename from quasar/dev/components/form/input-validate.vue
rename to ui/dev/components/form/input-validate.vue
diff --git a/quasar/dev/components/form/input.vue b/ui/dev/components/form/input.vue
similarity index 100%
rename from quasar/dev/components/form/input.vue
rename to ui/dev/components/form/input.vue
diff --git a/quasar/dev/components/form/knob.vue b/ui/dev/components/form/knob.vue
similarity index 100%
rename from quasar/dev/components/form/knob.vue
rename to ui/dev/components/form/knob.vue
diff --git a/quasar/dev/components/form/radio.vue b/ui/dev/components/form/radio.vue
similarity index 100%
rename from quasar/dev/components/form/radio.vue
rename to ui/dev/components/form/radio.vue
diff --git a/quasar/dev/components/form/range.vue b/ui/dev/components/form/range.vue
similarity index 100%
rename from quasar/dev/components/form/range.vue
rename to ui/dev/components/form/range.vue
diff --git a/quasar/dev/components/form/rating.vue b/ui/dev/components/form/rating.vue
similarity index 100%
rename from quasar/dev/components/form/rating.vue
rename to ui/dev/components/form/rating.vue
diff --git a/quasar/dev/components/form/select-part-1.vue b/ui/dev/components/form/select-part-1.vue
similarity index 100%
rename from quasar/dev/components/form/select-part-1.vue
rename to ui/dev/components/form/select-part-1.vue
diff --git a/quasar/dev/components/form/select-part-2.vue b/ui/dev/components/form/select-part-2.vue
similarity index 100%
rename from quasar/dev/components/form/select-part-2.vue
rename to ui/dev/components/form/select-part-2.vue
diff --git a/quasar/dev/components/form/slider.vue b/ui/dev/components/form/slider.vue
similarity index 100%
rename from quasar/dev/components/form/slider.vue
rename to ui/dev/components/form/slider.vue
diff --git a/quasar/dev/components/form/time.vue b/ui/dev/components/form/time.vue
similarity index 100%
rename from quasar/dev/components/form/time.vue
rename to ui/dev/components/form/time.vue
diff --git a/quasar/dev/components/form/toggle.vue b/ui/dev/components/form/toggle.vue
similarity index 100%
rename from quasar/dev/components/form/toggle.vue
rename to ui/dev/components/form/toggle.vue
diff --git a/quasar/dev/components/form/uploader.vue b/ui/dev/components/form/uploader.vue
similarity index 100%
rename from quasar/dev/components/form/uploader.vue
rename to ui/dev/components/form/uploader.vue
diff --git a/quasar/dev/components/global/bottom-sheet.vue b/ui/dev/components/global/bottom-sheet.vue
similarity index 100%
rename from quasar/dev/components/global/bottom-sheet.vue
rename to ui/dev/components/global/bottom-sheet.vue
diff --git a/quasar/dev/components/global/dialog-component.js b/ui/dev/components/global/dialog-component.js
similarity index 100%
rename from quasar/dev/components/global/dialog-component.js
rename to ui/dev/components/global/dialog-component.js
diff --git a/quasar/dev/components/global/dialog-plugin.vue b/ui/dev/components/global/dialog-plugin.vue
similarity index 100%
rename from quasar/dev/components/global/dialog-plugin.vue
rename to ui/dev/components/global/dialog-plugin.vue
diff --git a/quasar/dev/components/global/dialog.vue b/ui/dev/components/global/dialog.vue
similarity index 100%
rename from quasar/dev/components/global/dialog.vue
rename to ui/dev/components/global/dialog.vue
diff --git a/quasar/dev/components/global/inner-loading.vue b/ui/dev/components/global/inner-loading.vue
similarity index 100%
rename from quasar/dev/components/global/inner-loading.vue
rename to ui/dev/components/global/inner-loading.vue
diff --git a/quasar/dev/components/global/loading.vue b/ui/dev/components/global/loading.vue
similarity index 100%
rename from quasar/dev/components/global/loading.vue
rename to ui/dev/components/global/loading.vue
diff --git a/quasar/dev/components/global/notify.vue b/ui/dev/components/global/notify.vue
similarity index 100%
rename from quasar/dev/components/global/notify.vue
rename to ui/dev/components/global/notify.vue
diff --git a/quasar/dev/components/index.vue b/ui/dev/components/index.vue
similarity index 100%
rename from quasar/dev/components/index.vue
rename to ui/dev/components/index.vue
diff --git a/quasar/dev/components/layout/layout.vue b/ui/dev/components/layout/layout.vue
similarity index 100%
rename from quasar/dev/components/layout/layout.vue
rename to ui/dev/components/layout/layout.vue
diff --git a/quasar/dev/components/layout/pages/a.vue b/ui/dev/components/layout/pages/a.vue
similarity index 100%
rename from quasar/dev/components/layout/pages/a.vue
rename to ui/dev/components/layout/pages/a.vue
diff --git a/quasar/dev/components/layout/pages/b.vue b/ui/dev/components/layout/pages/b.vue
similarity index 100%
rename from quasar/dev/components/layout/pages/b.vue
rename to ui/dev/components/layout/pages/b.vue
diff --git a/quasar/dev/components/layout/pages/c.vue b/ui/dev/components/layout/pages/c.vue
similarity index 100%
rename from quasar/dev/components/layout/pages/c.vue
rename to ui/dev/components/layout/pages/c.vue
diff --git a/quasar/dev/components/layout/pages/default.vue b/ui/dev/components/layout/pages/default.vue
similarity index 100%
rename from quasar/dev/components/layout/pages/default.vue
rename to ui/dev/components/layout/pages/default.vue
diff --git a/quasar/dev/components/meta/layout_1.vue b/ui/dev/components/meta/layout_1.vue
similarity index 100%
rename from quasar/dev/components/meta/layout_1.vue
rename to ui/dev/components/meta/layout_1.vue
diff --git a/quasar/dev/components/meta/layout_2.vue b/ui/dev/components/meta/layout_2.vue
similarity index 100%
rename from quasar/dev/components/meta/layout_2.vue
rename to ui/dev/components/meta/layout_2.vue
diff --git a/quasar/dev/components/meta/pages/first.vue b/ui/dev/components/meta/pages/first.vue
similarity index 100%
rename from quasar/dev/components/meta/pages/first.vue
rename to ui/dev/components/meta/pages/first.vue
diff --git a/quasar/dev/components/meta/pages/second.vue b/ui/dev/components/meta/pages/second.vue
similarity index 100%
rename from quasar/dev/components/meta/pages/second.vue
rename to ui/dev/components/meta/pages/second.vue
diff --git a/quasar/dev/components/meta/pages/third.vue b/ui/dev/components/meta/pages/third.vue
similarity index 100%
rename from quasar/dev/components/meta/pages/third.vue
rename to ui/dev/components/meta/pages/third.vue
diff --git a/quasar/dev/components/other/app-fullscreen.vue b/ui/dev/components/other/app-fullscreen.vue
similarity index 100%
rename from quasar/dev/components/other/app-fullscreen.vue
rename to ui/dev/components/other/app-fullscreen.vue
diff --git a/quasar/dev/components/other/app-visibility.vue b/ui/dev/components/other/app-visibility.vue
similarity index 100%
rename from quasar/dev/components/other/app-visibility.vue
rename to ui/dev/components/other/app-visibility.vue
diff --git a/quasar/dev/components/other/close-menu.vue b/ui/dev/components/other/close-menu.vue
similarity index 100%
rename from quasar/dev/components/other/close-menu.vue
rename to ui/dev/components/other/close-menu.vue
diff --git a/quasar/dev/components/other/cookies.vue b/ui/dev/components/other/cookies.vue
similarity index 100%
rename from quasar/dev/components/other/cookies.vue
rename to ui/dev/components/other/cookies.vue
diff --git a/quasar/dev/components/other/platform-detection.vue b/ui/dev/components/other/platform-detection.vue
similarity index 100%
rename from quasar/dev/components/other/platform-detection.vue
rename to ui/dev/components/other/platform-detection.vue
diff --git a/quasar/dev/components/other/screen-plugin.vue b/ui/dev/components/other/screen-plugin.vue
similarity index 100%
rename from quasar/dev/components/other/screen-plugin.vue
rename to ui/dev/components/other/screen-plugin.vue
diff --git a/quasar/dev/components/other/slide-transition.vue b/ui/dev/components/other/slide-transition.vue
similarity index 100%
rename from quasar/dev/components/other/slide-transition.vue
rename to ui/dev/components/other/slide-transition.vue
diff --git a/quasar/dev/components/other/transitions.vue b/ui/dev/components/other/transitions.vue
similarity index 100%
rename from quasar/dev/components/other/transitions.vue
rename to ui/dev/components/other/transitions.vue
diff --git a/quasar/dev/components/other/web-storage.vue b/ui/dev/components/other/web-storage.vue
similarity index 100%
rename from quasar/dev/components/other/web-storage.vue
rename to ui/dev/components/other/web-storage.vue
diff --git a/quasar/dev/components/touch-directives/touch-hold.vue b/ui/dev/components/touch-directives/touch-hold.vue
similarity index 100%
rename from quasar/dev/components/touch-directives/touch-hold.vue
rename to ui/dev/components/touch-directives/touch-hold.vue
diff --git a/quasar/dev/components/touch-directives/touch-pan.vue b/ui/dev/components/touch-directives/touch-pan.vue
similarity index 100%
rename from quasar/dev/components/touch-directives/touch-pan.vue
rename to ui/dev/components/touch-directives/touch-pan.vue
diff --git a/quasar/dev/components/touch-directives/touch-repeat.vue b/ui/dev/components/touch-directives/touch-repeat.vue
similarity index 100%
rename from quasar/dev/components/touch-directives/touch-repeat.vue
rename to ui/dev/components/touch-directives/touch-repeat.vue
diff --git a/quasar/dev/components/touch-directives/touch-style.styl b/ui/dev/components/touch-directives/touch-style.styl
similarity index 100%
rename from quasar/dev/components/touch-directives/touch-style.styl
rename to ui/dev/components/touch-directives/touch-style.styl
diff --git a/quasar/dev/components/touch-directives/touch-swipe.vue b/ui/dev/components/touch-directives/touch-swipe.vue
similarity index 100%
rename from quasar/dev/components/touch-directives/touch-swipe.vue
rename to ui/dev/components/touch-directives/touch-swipe.vue
diff --git a/quasar/dev/components/web-tests/a.vue b/ui/dev/components/web-tests/a.vue
similarity index 100%
rename from quasar/dev/components/web-tests/a.vue
rename to ui/dev/components/web-tests/a.vue
diff --git a/quasar/dev/components/web-tests/b.vue b/ui/dev/components/web-tests/b.vue
similarity index 100%
rename from quasar/dev/components/web-tests/b.vue
rename to ui/dev/components/web-tests/b.vue
diff --git a/quasar/dev/components/web-tests/breakpoints.vue b/ui/dev/components/web-tests/breakpoints.vue
similarity index 100%
rename from quasar/dev/components/web-tests/breakpoints.vue
rename to ui/dev/components/web-tests/breakpoints.vue
diff --git a/quasar/dev/components/web-tests/c.vue b/ui/dev/components/web-tests/c.vue
similarity index 100%
rename from quasar/dev/components/web-tests/c.vue
rename to ui/dev/components/web-tests/c.vue
diff --git a/quasar/dev/components/web-tests/fast-table-test.vue b/ui/dev/components/web-tests/fast-table-test.vue
similarity index 100%
rename from quasar/dev/components/web-tests/fast-table-test.vue
rename to ui/dev/components/web-tests/fast-table-test.vue
diff --git a/quasar/dev/components/web-tests/fast-test.vue b/ui/dev/components/web-tests/fast-test.vue
similarity index 100%
rename from quasar/dev/components/web-tests/fast-test.vue
rename to ui/dev/components/web-tests/fast-test.vue
diff --git a/quasar/dev/components/web-tests/hover.vue b/ui/dev/components/web-tests/hover.vue
similarity index 100%
rename from quasar/dev/components/web-tests/hover.vue
rename to ui/dev/components/web-tests/hover.vue
diff --git a/quasar/dev/components/web-tests/layout.vue b/ui/dev/components/web-tests/layout.vue
similarity index 100%
rename from quasar/dev/components/web-tests/layout.vue
rename to ui/dev/components/web-tests/layout.vue
diff --git a/quasar/dev/components/web-tests/portal-inject-test.vue b/ui/dev/components/web-tests/portal-inject-test.vue
similarity index 100%
rename from quasar/dev/components/web-tests/portal-inject-test.vue
rename to ui/dev/components/web-tests/portal-inject-test.vue
diff --git a/quasar/dev/data/autocomplete.json b/ui/dev/data/autocomplete.json
similarity index 100%
rename from quasar/dev/data/autocomplete.json
rename to ui/dev/data/autocomplete.json
diff --git a/quasar/dev/data/table.json b/ui/dev/data/table.json
similarity index 100%
rename from quasar/dev/data/table.json
rename to ui/dev/data/table.json
diff --git a/quasar/dev/pages.js b/ui/dev/pages.js
similarity index 100%
rename from quasar/dev/pages.js
rename to ui/dev/pages.js
diff --git a/quasar/dev/router.js b/ui/dev/router.js
similarity index 100%
rename from quasar/dev/router.js
rename to ui/dev/router.js
diff --git a/quasar/dev/spa.index.html b/ui/dev/spa.index.html
similarity index 100%
rename from quasar/dev/spa.index.html
rename to ui/dev/spa.index.html
diff --git a/quasar/dev/ssr.index.html b/ui/dev/ssr.index.html
similarity index 100%
rename from quasar/dev/ssr.index.html
rename to ui/dev/ssr.index.html
diff --git a/quasar/dev/upload-server/.gitignore b/ui/dev/upload-server/.gitignore
similarity index 100%
rename from quasar/dev/upload-server/.gitignore
rename to ui/dev/upload-server/.gitignore
diff --git a/quasar/dev/upload-server/README.md b/ui/dev/upload-server/README.md
similarity index 100%
rename from quasar/dev/upload-server/README.md
rename to ui/dev/upload-server/README.md
diff --git a/quasar/dev/upload-server/package.json b/ui/dev/upload-server/package.json
similarity index 100%
rename from quasar/dev/upload-server/package.json
rename to ui/dev/upload-server/package.json
diff --git a/quasar/dev/upload-server/server.js b/ui/dev/upload-server/server.js
similarity index 100%
rename from quasar/dev/upload-server/server.js
rename to ui/dev/upload-server/server.js
diff --git a/quasar/dev/upload-server/yarn.lock b/ui/dev/upload-server/yarn.lock
similarity index 100%
rename from quasar/dev/upload-server/yarn.lock
rename to ui/dev/upload-server/yarn.lock
diff --git a/quasar/icon-set/eva-icons.js b/ui/icon-set/eva-icons.js
similarity index 100%
rename from quasar/icon-set/eva-icons.js
rename to ui/icon-set/eva-icons.js
diff --git a/quasar/icon-set/fontawesome-v5-pro.js b/ui/icon-set/fontawesome-v5-pro.js
similarity index 100%
rename from quasar/icon-set/fontawesome-v5-pro.js
rename to ui/icon-set/fontawesome-v5-pro.js
diff --git a/quasar/icon-set/fontawesome-v5.js b/ui/icon-set/fontawesome-v5.js
similarity index 100%
rename from quasar/icon-set/fontawesome-v5.js
rename to ui/icon-set/fontawesome-v5.js
diff --git a/quasar/icon-set/ionicons-v4.js b/ui/icon-set/ionicons-v4.js
similarity index 100%
rename from quasar/icon-set/ionicons-v4.js
rename to ui/icon-set/ionicons-v4.js
diff --git a/quasar/icon-set/material-icons.js b/ui/icon-set/material-icons.js
similarity index 100%
rename from quasar/icon-set/material-icons.js
rename to ui/icon-set/material-icons.js
diff --git a/quasar/icon-set/mdi-v3.js b/ui/icon-set/mdi-v3.js
similarity index 100%
rename from quasar/icon-set/mdi-v3.js
rename to ui/icon-set/mdi-v3.js
diff --git a/quasar/icon-set/themify.js b/ui/icon-set/themify.js
similarity index 100%
rename from quasar/icon-set/themify.js
rename to ui/icon-set/themify.js
diff --git a/quasar/jsconfig.json b/ui/jsconfig.json
similarity index 100%
rename from quasar/jsconfig.json
rename to ui/jsconfig.json
diff --git a/quasar/lang/ar.js b/ui/lang/ar.js
similarity index 100%
rename from quasar/lang/ar.js
rename to ui/lang/ar.js
diff --git a/quasar/lang/bg.js b/ui/lang/bg.js
similarity index 100%
rename from quasar/lang/bg.js
rename to ui/lang/bg.js
diff --git a/quasar/lang/ca.js b/ui/lang/ca.js
similarity index 100%
rename from quasar/lang/ca.js
rename to ui/lang/ca.js
diff --git a/quasar/lang/cs.js b/ui/lang/cs.js
similarity index 100%
rename from quasar/lang/cs.js
rename to ui/lang/cs.js
diff --git a/quasar/lang/da.js b/ui/lang/da.js
similarity index 100%
rename from quasar/lang/da.js
rename to ui/lang/da.js
diff --git a/quasar/lang/de.js b/ui/lang/de.js
similarity index 100%
rename from quasar/lang/de.js
rename to ui/lang/de.js
diff --git a/quasar/lang/el.js b/ui/lang/el.js
similarity index 100%
rename from quasar/lang/el.js
rename to ui/lang/el.js
diff --git a/quasar/lang/en-gb.js b/ui/lang/en-gb.js
similarity index 100%
rename from quasar/lang/en-gb.js
rename to ui/lang/en-gb.js
diff --git a/quasar/lang/en-us.js b/ui/lang/en-us.js
similarity index 100%
rename from quasar/lang/en-us.js
rename to ui/lang/en-us.js
diff --git a/quasar/lang/eo.js b/ui/lang/eo.js
similarity index 100%
rename from quasar/lang/eo.js
rename to ui/lang/eo.js
diff --git a/quasar/lang/es.js b/ui/lang/es.js
similarity index 100%
rename from quasar/lang/es.js
rename to ui/lang/es.js
diff --git a/quasar/lang/fa-ir.js b/ui/lang/fa-ir.js
similarity index 100%
rename from quasar/lang/fa-ir.js
rename to ui/lang/fa-ir.js
diff --git a/quasar/lang/fi.js b/ui/lang/fi.js
similarity index 100%
rename from quasar/lang/fi.js
rename to ui/lang/fi.js
diff --git a/quasar/lang/fr.js b/ui/lang/fr.js
similarity index 100%
rename from quasar/lang/fr.js
rename to ui/lang/fr.js
diff --git a/quasar/lang/gn.js b/ui/lang/gn.js
similarity index 100%
rename from quasar/lang/gn.js
rename to ui/lang/gn.js
diff --git a/quasar/lang/he.js b/ui/lang/he.js
similarity index 100%
rename from quasar/lang/he.js
rename to ui/lang/he.js
diff --git a/quasar/lang/hr.js b/ui/lang/hr.js
similarity index 100%
rename from quasar/lang/hr.js
rename to ui/lang/hr.js
diff --git a/quasar/lang/hu.js b/ui/lang/hu.js
similarity index 100%
rename from quasar/lang/hu.js
rename to ui/lang/hu.js
diff --git a/quasar/lang/id.js b/ui/lang/id.js
similarity index 100%
rename from quasar/lang/id.js
rename to ui/lang/id.js
diff --git a/quasar/lang/index.json b/ui/lang/index.json
similarity index 100%
rename from quasar/lang/index.json
rename to ui/lang/index.json
diff --git a/quasar/lang/it.js b/ui/lang/it.js
similarity index 100%
rename from quasar/lang/it.js
rename to ui/lang/it.js
diff --git a/quasar/lang/ja.js b/ui/lang/ja.js
similarity index 100%
rename from quasar/lang/ja.js
rename to ui/lang/ja.js
diff --git a/quasar/lang/km.js b/ui/lang/km.js
similarity index 100%
rename from quasar/lang/km.js
rename to ui/lang/km.js
diff --git a/quasar/lang/ko-kr.js b/ui/lang/ko-kr.js
similarity index 100%
rename from quasar/lang/ko-kr.js
rename to ui/lang/ko-kr.js
diff --git a/quasar/lang/lu.js b/ui/lang/lu.js
similarity index 100%
rename from quasar/lang/lu.js
rename to ui/lang/lu.js
diff --git a/quasar/lang/lv.js b/ui/lang/lv.js
similarity index 100%
rename from quasar/lang/lv.js
rename to ui/lang/lv.js
diff --git a/quasar/lang/ml.js b/ui/lang/ml.js
similarity index 100%
rename from quasar/lang/ml.js
rename to ui/lang/ml.js
diff --git a/quasar/lang/ms.js b/ui/lang/ms.js
similarity index 100%
rename from quasar/lang/ms.js
rename to ui/lang/ms.js
diff --git a/quasar/lang/nb-no.js b/ui/lang/nb-no.js
similarity index 100%
rename from quasar/lang/nb-no.js
rename to ui/lang/nb-no.js
diff --git a/quasar/lang/nl.js b/ui/lang/nl.js
similarity index 100%
rename from quasar/lang/nl.js
rename to ui/lang/nl.js
diff --git a/quasar/lang/pl.js b/ui/lang/pl.js
similarity index 100%
rename from quasar/lang/pl.js
rename to ui/lang/pl.js
diff --git a/quasar/lang/pt-br.js b/ui/lang/pt-br.js
similarity index 100%
rename from quasar/lang/pt-br.js
rename to ui/lang/pt-br.js
diff --git a/quasar/lang/pt.js b/ui/lang/pt.js
similarity index 100%
rename from quasar/lang/pt.js
rename to ui/lang/pt.js
diff --git a/quasar/lang/ro.js b/ui/lang/ro.js
similarity index 100%
rename from quasar/lang/ro.js
rename to ui/lang/ro.js
diff --git a/quasar/lang/ru.js b/ui/lang/ru.js
similarity index 100%
rename from quasar/lang/ru.js
rename to ui/lang/ru.js
diff --git a/quasar/lang/sk.js b/ui/lang/sk.js
similarity index 100%
rename from quasar/lang/sk.js
rename to ui/lang/sk.js
diff --git a/quasar/lang/sl.js b/ui/lang/sl.js
similarity index 100%
rename from quasar/lang/sl.js
rename to ui/lang/sl.js
diff --git a/quasar/lang/sr.js b/ui/lang/sr.js
similarity index 100%
rename from quasar/lang/sr.js
rename to ui/lang/sr.js
diff --git a/quasar/lang/sv.js b/ui/lang/sv.js
similarity index 100%
rename from quasar/lang/sv.js
rename to ui/lang/sv.js
diff --git a/quasar/lang/th.js b/ui/lang/th.js
similarity index 100%
rename from quasar/lang/th.js
rename to ui/lang/th.js
diff --git a/quasar/lang/tr.js b/ui/lang/tr.js
similarity index 100%
rename from quasar/lang/tr.js
rename to ui/lang/tr.js
diff --git a/quasar/lang/uk.js b/ui/lang/uk.js
similarity index 100%
rename from quasar/lang/uk.js
rename to ui/lang/uk.js
diff --git a/quasar/lang/vi.js b/ui/lang/vi.js
similarity index 100%
rename from quasar/lang/vi.js
rename to ui/lang/vi.js
diff --git a/quasar/lang/zh-hans.js b/ui/lang/zh-hans.js
similarity index 100%
rename from quasar/lang/zh-hans.js
rename to ui/lang/zh-hans.js
diff --git a/quasar/lang/zh-hant.js b/ui/lang/zh-hant.js
similarity index 100%
rename from quasar/lang/zh-hant.js
rename to ui/lang/zh-hant.js
diff --git a/quasar/package.json b/ui/package.json
similarity index 100%
rename from quasar/package.json
rename to ui/package.json
diff --git a/quasar/src/api-file-example.json b/ui/src/api-file-example.json
similarity index 100%
rename from quasar/src/api-file-example.json
rename to ui/src/api-file-example.json
diff --git a/quasar/src/api.extends.json b/ui/src/api.extends.json
similarity index 100%
rename from quasar/src/api.extends.json
rename to ui/src/api.extends.json
diff --git a/quasar/src/body.js b/ui/src/body.js
similarity index 100%
rename from quasar/src/body.js
rename to ui/src/body.js
diff --git a/quasar/src/components.js b/ui/src/components.js
similarity index 100%
rename from quasar/src/components.js
rename to ui/src/components.js
diff --git a/quasar/src/components/ajax-bar/QAjaxBar.js b/ui/src/components/ajax-bar/QAjaxBar.js
similarity index 100%
rename from quasar/src/components/ajax-bar/QAjaxBar.js
rename to ui/src/components/ajax-bar/QAjaxBar.js
diff --git a/quasar/src/components/ajax-bar/QAjaxBar.json b/ui/src/components/ajax-bar/QAjaxBar.json
similarity index 100%
rename from quasar/src/components/ajax-bar/QAjaxBar.json
rename to ui/src/components/ajax-bar/QAjaxBar.json
diff --git a/quasar/src/components/ajax-bar/ajax-bar.styl b/ui/src/components/ajax-bar/ajax-bar.styl
similarity index 100%
rename from quasar/src/components/ajax-bar/ajax-bar.styl
rename to ui/src/components/ajax-bar/ajax-bar.styl
diff --git a/quasar/src/components/ajax-bar/index.js b/ui/src/components/ajax-bar/index.js
similarity index 100%
rename from quasar/src/components/ajax-bar/index.js
rename to ui/src/components/ajax-bar/index.js
diff --git a/quasar/src/components/avatar/QAvatar.js b/ui/src/components/avatar/QAvatar.js
similarity index 100%
rename from quasar/src/components/avatar/QAvatar.js
rename to ui/src/components/avatar/QAvatar.js
diff --git a/quasar/src/components/avatar/QAvatar.json b/ui/src/components/avatar/QAvatar.json
similarity index 100%
rename from quasar/src/components/avatar/QAvatar.json
rename to ui/src/components/avatar/QAvatar.json
diff --git a/quasar/src/components/avatar/avatar.styl b/ui/src/components/avatar/avatar.styl
similarity index 100%
rename from quasar/src/components/avatar/avatar.styl
rename to ui/src/components/avatar/avatar.styl
diff --git a/quasar/src/components/avatar/index.js b/ui/src/components/avatar/index.js
similarity index 100%
rename from quasar/src/components/avatar/index.js
rename to ui/src/components/avatar/index.js
diff --git a/quasar/src/components/badge/QBadge.js b/ui/src/components/badge/QBadge.js
similarity index 100%
rename from quasar/src/components/badge/QBadge.js
rename to ui/src/components/badge/QBadge.js
diff --git a/quasar/src/components/badge/QBadge.json b/ui/src/components/badge/QBadge.json
similarity index 100%
rename from quasar/src/components/badge/QBadge.json
rename to ui/src/components/badge/QBadge.json
diff --git a/quasar/src/components/badge/badge.styl b/ui/src/components/badge/badge.styl
similarity index 100%
rename from quasar/src/components/badge/badge.styl
rename to ui/src/components/badge/badge.styl
diff --git a/quasar/src/components/badge/index.js b/ui/src/components/badge/index.js
similarity index 100%
rename from quasar/src/components/badge/index.js
rename to ui/src/components/badge/index.js
diff --git a/quasar/src/components/banner/QBanner.js b/ui/src/components/banner/QBanner.js
similarity index 100%
rename from quasar/src/components/banner/QBanner.js
rename to ui/src/components/banner/QBanner.js
diff --git a/quasar/src/components/banner/QBanner.json b/ui/src/components/banner/QBanner.json
similarity index 100%
rename from quasar/src/components/banner/QBanner.json
rename to ui/src/components/banner/QBanner.json
diff --git a/quasar/src/components/banner/banner.styl b/ui/src/components/banner/banner.styl
similarity index 100%
rename from quasar/src/components/banner/banner.styl
rename to ui/src/components/banner/banner.styl
diff --git a/quasar/src/components/banner/index.js b/ui/src/components/banner/index.js
similarity index 100%
rename from quasar/src/components/banner/index.js
rename to ui/src/components/banner/index.js
diff --git a/quasar/src/components/bar/QBar.js b/ui/src/components/bar/QBar.js
similarity index 100%
rename from quasar/src/components/bar/QBar.js
rename to ui/src/components/bar/QBar.js
diff --git a/quasar/src/components/bar/QBar.json b/ui/src/components/bar/QBar.json
similarity index 100%
rename from quasar/src/components/bar/QBar.json
rename to ui/src/components/bar/QBar.json
diff --git a/quasar/src/components/bar/bar.styl b/ui/src/components/bar/bar.styl
similarity index 100%
rename from quasar/src/components/bar/bar.styl
rename to ui/src/components/bar/bar.styl
diff --git a/quasar/src/components/bar/index.js b/ui/src/components/bar/index.js
similarity index 100%
rename from quasar/src/components/bar/index.js
rename to ui/src/components/bar/index.js
diff --git a/quasar/src/components/breadcrumbs/QBreadcrumbs.js b/ui/src/components/breadcrumbs/QBreadcrumbs.js
similarity index 100%
rename from quasar/src/components/breadcrumbs/QBreadcrumbs.js
rename to ui/src/components/breadcrumbs/QBreadcrumbs.js
diff --git a/quasar/src/components/breadcrumbs/QBreadcrumbs.json b/ui/src/components/breadcrumbs/QBreadcrumbs.json
similarity index 100%
rename from quasar/src/components/breadcrumbs/QBreadcrumbs.json
rename to ui/src/components/breadcrumbs/QBreadcrumbs.json
diff --git a/quasar/src/components/breadcrumbs/QBreadcrumbsEl.js b/ui/src/components/breadcrumbs/QBreadcrumbsEl.js
similarity index 100%
rename from quasar/src/components/breadcrumbs/QBreadcrumbsEl.js
rename to ui/src/components/breadcrumbs/QBreadcrumbsEl.js
diff --git a/quasar/src/components/breadcrumbs/QBreadcrumbsEl.json b/ui/src/components/breadcrumbs/QBreadcrumbsEl.json
similarity index 100%
rename from quasar/src/components/breadcrumbs/QBreadcrumbsEl.json
rename to ui/src/components/breadcrumbs/QBreadcrumbsEl.json
diff --git a/quasar/src/components/breadcrumbs/breadcrumbs.styl b/ui/src/components/breadcrumbs/breadcrumbs.styl
similarity index 100%
rename from quasar/src/components/breadcrumbs/breadcrumbs.styl
rename to ui/src/components/breadcrumbs/breadcrumbs.styl
diff --git a/quasar/src/components/breadcrumbs/index.js b/ui/src/components/breadcrumbs/index.js
similarity index 100%
rename from quasar/src/components/breadcrumbs/index.js
rename to ui/src/components/breadcrumbs/index.js
diff --git a/quasar/src/components/btn/QBtn.js b/ui/src/components/btn/QBtn.js
similarity index 100%
rename from quasar/src/components/btn/QBtn.js
rename to ui/src/components/btn/QBtn.js
diff --git a/quasar/src/components/btn/QBtn.json b/ui/src/components/btn/QBtn.json
similarity index 100%
rename from quasar/src/components/btn/QBtn.json
rename to ui/src/components/btn/QBtn.json
diff --git a/quasar/src/components/btn/QBtnDropdown.js b/ui/src/components/btn/QBtnDropdown.js
similarity index 100%
rename from quasar/src/components/btn/QBtnDropdown.js
rename to ui/src/components/btn/QBtnDropdown.js
diff --git a/quasar/src/components/btn/QBtnDropdown.json b/ui/src/components/btn/QBtnDropdown.json
similarity index 100%
rename from quasar/src/components/btn/QBtnDropdown.json
rename to ui/src/components/btn/QBtnDropdown.json
diff --git a/quasar/src/components/btn/QBtnGroup.js b/ui/src/components/btn/QBtnGroup.js
similarity index 100%
rename from quasar/src/components/btn/QBtnGroup.js
rename to ui/src/components/btn/QBtnGroup.js
diff --git a/quasar/src/components/btn/QBtnGroup.json b/ui/src/components/btn/QBtnGroup.json
similarity index 100%
rename from quasar/src/components/btn/QBtnGroup.json
rename to ui/src/components/btn/QBtnGroup.json
diff --git a/quasar/src/components/btn/QBtnToggle.js b/ui/src/components/btn/QBtnToggle.js
similarity index 100%
rename from quasar/src/components/btn/QBtnToggle.js
rename to ui/src/components/btn/QBtnToggle.js
diff --git a/quasar/src/components/btn/QBtnToggle.json b/ui/src/components/btn/QBtnToggle.json
similarity index 100%
rename from quasar/src/components/btn/QBtnToggle.json
rename to ui/src/components/btn/QBtnToggle.json
diff --git a/quasar/src/components/btn/__btn-mixin.json b/ui/src/components/btn/__btn-mixin.json
similarity index 100%
rename from quasar/src/components/btn/__btn-mixin.json
rename to ui/src/components/btn/__btn-mixin.json
diff --git a/quasar/src/components/btn/btn-default.styl b/ui/src/components/btn/btn-default.styl
similarity index 100%
rename from quasar/src/components/btn/btn-default.styl
rename to ui/src/components/btn/btn-default.styl
diff --git a/quasar/src/components/btn/btn-dropdown.styl b/ui/src/components/btn/btn-dropdown.styl
similarity index 100%
rename from quasar/src/components/btn/btn-dropdown.styl
rename to ui/src/components/btn/btn-dropdown.styl
diff --git a/quasar/src/components/btn/btn-group.styl b/ui/src/components/btn/btn-group.styl
similarity index 100%
rename from quasar/src/components/btn/btn-group.styl
rename to ui/src/components/btn/btn-group.styl
diff --git a/quasar/src/components/btn/btn-mixin.js b/ui/src/components/btn/btn-mixin.js
similarity index 100%
rename from quasar/src/components/btn/btn-mixin.js
rename to ui/src/components/btn/btn-mixin.js
diff --git a/quasar/src/components/btn/index.js b/ui/src/components/btn/index.js
similarity index 100%
rename from quasar/src/components/btn/index.js
rename to ui/src/components/btn/index.js
diff --git a/quasar/src/components/card/QCard.js b/ui/src/components/card/QCard.js
similarity index 100%
rename from quasar/src/components/card/QCard.js
rename to ui/src/components/card/QCard.js
diff --git a/quasar/src/components/card/QCard.json b/ui/src/components/card/QCard.json
similarity index 100%
rename from quasar/src/components/card/QCard.json
rename to ui/src/components/card/QCard.json
diff --git a/quasar/src/components/card/QCardActions.js b/ui/src/components/card/QCardActions.js
similarity index 100%
rename from quasar/src/components/card/QCardActions.js
rename to ui/src/components/card/QCardActions.js
diff --git a/quasar/src/components/card/QCardActions.json b/ui/src/components/card/QCardActions.json
similarity index 100%
rename from quasar/src/components/card/QCardActions.json
rename to ui/src/components/card/QCardActions.json
diff --git a/quasar/src/components/card/QCardSection.js b/ui/src/components/card/QCardSection.js
similarity index 100%
rename from quasar/src/components/card/QCardSection.js
rename to ui/src/components/card/QCardSection.js
diff --git a/quasar/src/components/card/QCardSection.json b/ui/src/components/card/QCardSection.json
similarity index 100%
rename from quasar/src/components/card/QCardSection.json
rename to ui/src/components/card/QCardSection.json
diff --git a/quasar/src/components/card/card.styl b/ui/src/components/card/card.styl
similarity index 100%
rename from quasar/src/components/card/card.styl
rename to ui/src/components/card/card.styl
diff --git a/quasar/src/components/card/index.js b/ui/src/components/card/index.js
similarity index 100%
rename from quasar/src/components/card/index.js
rename to ui/src/components/card/index.js
diff --git a/quasar/src/components/carousel/QCarousel.js b/ui/src/components/carousel/QCarousel.js
similarity index 100%
rename from quasar/src/components/carousel/QCarousel.js
rename to ui/src/components/carousel/QCarousel.js
diff --git a/quasar/src/components/carousel/QCarousel.json b/ui/src/components/carousel/QCarousel.json
similarity index 100%
rename from quasar/src/components/carousel/QCarousel.json
rename to ui/src/components/carousel/QCarousel.json
diff --git a/quasar/src/components/carousel/QCarouselControl.js b/ui/src/components/carousel/QCarouselControl.js
similarity index 100%
rename from quasar/src/components/carousel/QCarouselControl.js
rename to ui/src/components/carousel/QCarouselControl.js
diff --git a/quasar/src/components/carousel/QCarouselControl.json b/ui/src/components/carousel/QCarouselControl.json
similarity index 100%
rename from quasar/src/components/carousel/QCarouselControl.json
rename to ui/src/components/carousel/QCarouselControl.json
diff --git a/quasar/src/components/carousel/QCarouselSlide.js b/ui/src/components/carousel/QCarouselSlide.js
similarity index 100%
rename from quasar/src/components/carousel/QCarouselSlide.js
rename to ui/src/components/carousel/QCarouselSlide.js
diff --git a/quasar/src/components/carousel/QCarouselSlide.json b/ui/src/components/carousel/QCarouselSlide.json
similarity index 100%
rename from quasar/src/components/carousel/QCarouselSlide.json
rename to ui/src/components/carousel/QCarouselSlide.json
diff --git a/quasar/src/components/carousel/carousel.styl b/ui/src/components/carousel/carousel.styl
similarity index 100%
rename from quasar/src/components/carousel/carousel.styl
rename to ui/src/components/carousel/carousel.styl
diff --git a/quasar/src/components/carousel/index.js b/ui/src/components/carousel/index.js
similarity index 100%
rename from quasar/src/components/carousel/index.js
rename to ui/src/components/carousel/index.js
diff --git a/quasar/src/components/chat/QChatMessage.js b/ui/src/components/chat/QChatMessage.js
similarity index 100%
rename from quasar/src/components/chat/QChatMessage.js
rename to ui/src/components/chat/QChatMessage.js
diff --git a/quasar/src/components/chat/QChatMessage.json b/ui/src/components/chat/QChatMessage.json
similarity index 100%
rename from quasar/src/components/chat/QChatMessage.json
rename to ui/src/components/chat/QChatMessage.json
diff --git a/quasar/src/components/chat/chat.styl b/ui/src/components/chat/chat.styl
similarity index 100%
rename from quasar/src/components/chat/chat.styl
rename to ui/src/components/chat/chat.styl
diff --git a/quasar/src/components/chat/index.js b/ui/src/components/chat/index.js
similarity index 100%
rename from quasar/src/components/chat/index.js
rename to ui/src/components/chat/index.js
diff --git a/quasar/src/components/checkbox/QCheckbox.js b/ui/src/components/checkbox/QCheckbox.js
similarity index 100%
rename from quasar/src/components/checkbox/QCheckbox.js
rename to ui/src/components/checkbox/QCheckbox.js
diff --git a/quasar/src/components/checkbox/QCheckbox.json b/ui/src/components/checkbox/QCheckbox.json
similarity index 100%
rename from quasar/src/components/checkbox/QCheckbox.json
rename to ui/src/components/checkbox/QCheckbox.json
diff --git a/quasar/src/components/checkbox/checkbox.styl b/ui/src/components/checkbox/checkbox.styl
similarity index 100%
rename from quasar/src/components/checkbox/checkbox.styl
rename to ui/src/components/checkbox/checkbox.styl
diff --git a/quasar/src/components/checkbox/index.js b/ui/src/components/checkbox/index.js
similarity index 100%
rename from quasar/src/components/checkbox/index.js
rename to ui/src/components/checkbox/index.js
diff --git a/quasar/src/components/chip/QChip.js b/ui/src/components/chip/QChip.js
similarity index 100%
rename from quasar/src/components/chip/QChip.js
rename to ui/src/components/chip/QChip.js
diff --git a/quasar/src/components/chip/QChip.json b/ui/src/components/chip/QChip.json
similarity index 100%
rename from quasar/src/components/chip/QChip.json
rename to ui/src/components/chip/QChip.json
diff --git a/quasar/src/components/chip/chip.styl b/ui/src/components/chip/chip.styl
similarity index 100%
rename from quasar/src/components/chip/chip.styl
rename to ui/src/components/chip/chip.styl
diff --git a/quasar/src/components/chip/index.js b/ui/src/components/chip/index.js
similarity index 100%
rename from quasar/src/components/chip/index.js
rename to ui/src/components/chip/index.js
diff --git a/quasar/src/components/circular-progress/QCircularProgress.js b/ui/src/components/circular-progress/QCircularProgress.js
similarity index 100%
rename from quasar/src/components/circular-progress/QCircularProgress.js
rename to ui/src/components/circular-progress/QCircularProgress.js
diff --git a/quasar/src/components/circular-progress/QCircularProgress.json b/ui/src/components/circular-progress/QCircularProgress.json
similarity index 100%
rename from quasar/src/components/circular-progress/QCircularProgress.json
rename to ui/src/components/circular-progress/QCircularProgress.json
diff --git a/quasar/src/components/circular-progress/circular-progress.styl b/ui/src/components/circular-progress/circular-progress.styl
similarity index 100%
rename from quasar/src/components/circular-progress/circular-progress.styl
rename to ui/src/components/circular-progress/circular-progress.styl
diff --git a/quasar/src/components/circular-progress/index.js b/ui/src/components/circular-progress/index.js
similarity index 100%
rename from quasar/src/components/circular-progress/index.js
rename to ui/src/components/circular-progress/index.js
diff --git a/quasar/src/components/color/QColor.js b/ui/src/components/color/QColor.js
similarity index 100%
rename from quasar/src/components/color/QColor.js
rename to ui/src/components/color/QColor.js
diff --git a/quasar/src/components/color/QColor.json b/ui/src/components/color/QColor.json
similarity index 100%
rename from quasar/src/components/color/QColor.json
rename to ui/src/components/color/QColor.json
diff --git a/quasar/src/components/color/color.styl b/ui/src/components/color/color.styl
similarity index 100%
rename from quasar/src/components/color/color.styl
rename to ui/src/components/color/color.styl
diff --git a/quasar/src/components/color/index.js b/ui/src/components/color/index.js
similarity index 100%
rename from quasar/src/components/color/index.js
rename to ui/src/components/color/index.js
diff --git a/quasar/src/components/datetime/QDate.js b/ui/src/components/datetime/QDate.js
similarity index 100%
rename from quasar/src/components/datetime/QDate.js
rename to ui/src/components/datetime/QDate.js
diff --git a/quasar/src/components/datetime/QDate.json b/ui/src/components/datetime/QDate.json
similarity index 100%
rename from quasar/src/components/datetime/QDate.json
rename to ui/src/components/datetime/QDate.json
diff --git a/quasar/src/components/datetime/QTime.js b/ui/src/components/datetime/QTime.js
similarity index 100%
rename from quasar/src/components/datetime/QTime.js
rename to ui/src/components/datetime/QTime.js
diff --git a/quasar/src/components/datetime/QTime.json b/ui/src/components/datetime/QTime.json
similarity index 100%
rename from quasar/src/components/datetime/QTime.json
rename to ui/src/components/datetime/QTime.json
diff --git a/quasar/src/components/datetime/date.styl b/ui/src/components/datetime/date.styl
similarity index 100%
rename from quasar/src/components/datetime/date.styl
rename to ui/src/components/datetime/date.styl
diff --git a/quasar/src/components/datetime/datetime-mixin.js b/ui/src/components/datetime/datetime-mixin.js
similarity index 100%
rename from quasar/src/components/datetime/datetime-mixin.js
rename to ui/src/components/datetime/datetime-mixin.js
diff --git a/quasar/src/components/datetime/datetime-mixin.json b/ui/src/components/datetime/datetime-mixin.json
similarity index 100%
rename from quasar/src/components/datetime/datetime-mixin.json
rename to ui/src/components/datetime/datetime-mixin.json
diff --git a/quasar/src/components/datetime/index.js b/ui/src/components/datetime/index.js
similarity index 100%
rename from quasar/src/components/datetime/index.js
rename to ui/src/components/datetime/index.js
diff --git a/quasar/src/components/datetime/persian.js b/ui/src/components/datetime/persian.js
similarity index 100%
rename from quasar/src/components/datetime/persian.js
rename to ui/src/components/datetime/persian.js
diff --git a/quasar/src/components/datetime/time.styl b/ui/src/components/datetime/time.styl
similarity index 100%
rename from quasar/src/components/datetime/time.styl
rename to ui/src/components/datetime/time.styl
diff --git a/quasar/src/components/dialog-bottom-sheet/BottomSheet.js b/ui/src/components/dialog-bottom-sheet/BottomSheet.js
similarity index 100%
rename from quasar/src/components/dialog-bottom-sheet/BottomSheet.js
rename to ui/src/components/dialog-bottom-sheet/BottomSheet.js
diff --git a/quasar/src/components/dialog-bottom-sheet/bottom-sheet.styl b/ui/src/components/dialog-bottom-sheet/bottom-sheet.styl
similarity index 100%
rename from quasar/src/components/dialog-bottom-sheet/bottom-sheet.styl
rename to ui/src/components/dialog-bottom-sheet/bottom-sheet.styl
diff --git a/quasar/src/components/dialog-plugin/DialogPlugin.js b/ui/src/components/dialog-plugin/DialogPlugin.js
similarity index 100%
rename from quasar/src/components/dialog-plugin/DialogPlugin.js
rename to ui/src/components/dialog-plugin/DialogPlugin.js
diff --git a/quasar/src/components/dialog-plugin/dialog-plugin.styl b/ui/src/components/dialog-plugin/dialog-plugin.styl
similarity index 100%
rename from quasar/src/components/dialog-plugin/dialog-plugin.styl
rename to ui/src/components/dialog-plugin/dialog-plugin.styl
diff --git a/quasar/src/components/dialog/QDialog.js b/ui/src/components/dialog/QDialog.js
similarity index 100%
rename from quasar/src/components/dialog/QDialog.js
rename to ui/src/components/dialog/QDialog.js
diff --git a/quasar/src/components/dialog/QDialog.json b/ui/src/components/dialog/QDialog.json
similarity index 100%
rename from quasar/src/components/dialog/QDialog.json
rename to ui/src/components/dialog/QDialog.json
diff --git a/quasar/src/components/dialog/dialog.styl b/ui/src/components/dialog/dialog.styl
similarity index 100%
rename from quasar/src/components/dialog/dialog.styl
rename to ui/src/components/dialog/dialog.styl
diff --git a/quasar/src/components/dialog/index.js b/ui/src/components/dialog/index.js
similarity index 100%
rename from quasar/src/components/dialog/index.js
rename to ui/src/components/dialog/index.js
diff --git a/quasar/src/components/editor/QEditor.js b/ui/src/components/editor/QEditor.js
similarity index 100%
rename from quasar/src/components/editor/QEditor.js
rename to ui/src/components/editor/QEditor.js
diff --git a/quasar/src/components/editor/QEditor.json b/ui/src/components/editor/QEditor.json
similarity index 100%
rename from quasar/src/components/editor/QEditor.json
rename to ui/src/components/editor/QEditor.json
diff --git a/quasar/src/components/editor/editor-caret.js b/ui/src/components/editor/editor-caret.js
similarity index 100%
rename from quasar/src/components/editor/editor-caret.js
rename to ui/src/components/editor/editor-caret.js
diff --git a/quasar/src/components/editor/editor-utils.js b/ui/src/components/editor/editor-utils.js
similarity index 100%
rename from quasar/src/components/editor/editor-utils.js
rename to ui/src/components/editor/editor-utils.js
diff --git a/quasar/src/components/editor/editor.styl b/ui/src/components/editor/editor.styl
similarity index 100%
rename from quasar/src/components/editor/editor.styl
rename to ui/src/components/editor/editor.styl
diff --git a/quasar/src/components/editor/index.js b/ui/src/components/editor/index.js
similarity index 100%
rename from quasar/src/components/editor/index.js
rename to ui/src/components/editor/index.js
diff --git a/quasar/src/components/fab/QFab.js b/ui/src/components/fab/QFab.js
similarity index 100%
rename from quasar/src/components/fab/QFab.js
rename to ui/src/components/fab/QFab.js
diff --git a/quasar/src/components/fab/QFab.json b/ui/src/components/fab/QFab.json
similarity index 100%
rename from quasar/src/components/fab/QFab.json
rename to ui/src/components/fab/QFab.json
diff --git a/quasar/src/components/fab/QFabAction.js b/ui/src/components/fab/QFabAction.js
similarity index 100%
rename from quasar/src/components/fab/QFabAction.js
rename to ui/src/components/fab/QFabAction.js
diff --git a/quasar/src/components/fab/QFabAction.json b/ui/src/components/fab/QFabAction.json
similarity index 100%
rename from quasar/src/components/fab/QFabAction.json
rename to ui/src/components/fab/QFabAction.json
diff --git a/quasar/src/components/fab/fab-mixin.js b/ui/src/components/fab/fab-mixin.js
similarity index 100%
rename from quasar/src/components/fab/fab-mixin.js
rename to ui/src/components/fab/fab-mixin.js
diff --git a/quasar/src/components/fab/fab.styl b/ui/src/components/fab/fab.styl
similarity index 100%
rename from quasar/src/components/fab/fab.styl
rename to ui/src/components/fab/fab.styl
diff --git a/quasar/src/components/fab/index.js b/ui/src/components/fab/index.js
similarity index 100%
rename from quasar/src/components/fab/index.js
rename to ui/src/components/fab/index.js
diff --git a/quasar/src/components/field/QField.js b/ui/src/components/field/QField.js
similarity index 100%
rename from quasar/src/components/field/QField.js
rename to ui/src/components/field/QField.js
diff --git a/quasar/src/components/field/QField.json b/ui/src/components/field/QField.json
similarity index 100%
rename from quasar/src/components/field/QField.json
rename to ui/src/components/field/QField.json
diff --git a/quasar/src/components/field/__QField.json b/ui/src/components/field/__QField.json
similarity index 100%
rename from quasar/src/components/field/__QField.json
rename to ui/src/components/field/__QField.json
diff --git a/quasar/src/components/field/field.styl b/ui/src/components/field/field.styl
similarity index 100%
rename from quasar/src/components/field/field.styl
rename to ui/src/components/field/field.styl
diff --git a/quasar/src/components/field/index.js b/ui/src/components/field/index.js
similarity index 100%
rename from quasar/src/components/field/index.js
rename to ui/src/components/field/index.js
diff --git a/quasar/src/components/form/QForm.js b/ui/src/components/form/QForm.js
similarity index 100%
rename from quasar/src/components/form/QForm.js
rename to ui/src/components/form/QForm.js
diff --git a/quasar/src/components/form/QForm.json b/ui/src/components/form/QForm.json
similarity index 100%
rename from quasar/src/components/form/QForm.json
rename to ui/src/components/form/QForm.json
diff --git a/quasar/src/components/form/form.styl b/ui/src/components/form/form.styl
similarity index 100%
rename from quasar/src/components/form/form.styl
rename to ui/src/components/form/form.styl
diff --git a/quasar/src/components/form/index.js b/ui/src/components/form/index.js
similarity index 100%
rename from quasar/src/components/form/index.js
rename to ui/src/components/form/index.js
diff --git a/quasar/src/components/icon/QIcon.js b/ui/src/components/icon/QIcon.js
similarity index 100%
rename from quasar/src/components/icon/QIcon.js
rename to ui/src/components/icon/QIcon.js
diff --git a/quasar/src/components/icon/QIcon.json b/ui/src/components/icon/QIcon.json
similarity index 100%
rename from quasar/src/components/icon/QIcon.json
rename to ui/src/components/icon/QIcon.json
diff --git a/quasar/src/components/icon/index.js b/ui/src/components/icon/index.js
similarity index 100%
rename from quasar/src/components/icon/index.js
rename to ui/src/components/icon/index.js
diff --git a/quasar/src/components/img/QImg.js b/ui/src/components/img/QImg.js
similarity index 100%
rename from quasar/src/components/img/QImg.js
rename to ui/src/components/img/QImg.js
diff --git a/quasar/src/components/img/QImg.json b/ui/src/components/img/QImg.json
similarity index 100%
rename from quasar/src/components/img/QImg.json
rename to ui/src/components/img/QImg.json
diff --git a/quasar/src/components/img/img.styl b/ui/src/components/img/img.styl
similarity index 100%
rename from quasar/src/components/img/img.styl
rename to ui/src/components/img/img.styl
diff --git a/quasar/src/components/img/index.js b/ui/src/components/img/index.js
similarity index 100%
rename from quasar/src/components/img/index.js
rename to ui/src/components/img/index.js
diff --git a/quasar/src/components/infinite-scroll/QInfiniteScroll.js b/ui/src/components/infinite-scroll/QInfiniteScroll.js
similarity index 100%
rename from quasar/src/components/infinite-scroll/QInfiniteScroll.js
rename to ui/src/components/infinite-scroll/QInfiniteScroll.js
diff --git a/quasar/src/components/infinite-scroll/QInfiniteScroll.json b/ui/src/components/infinite-scroll/QInfiniteScroll.json
similarity index 100%
rename from quasar/src/components/infinite-scroll/QInfiniteScroll.json
rename to ui/src/components/infinite-scroll/QInfiniteScroll.json
diff --git a/quasar/src/components/infinite-scroll/index.js b/ui/src/components/infinite-scroll/index.js
similarity index 100%
rename from quasar/src/components/infinite-scroll/index.js
rename to ui/src/components/infinite-scroll/index.js
diff --git a/quasar/src/components/inner-loading/QInnerLoading.js b/ui/src/components/inner-loading/QInnerLoading.js
similarity index 100%
rename from quasar/src/components/inner-loading/QInnerLoading.js
rename to ui/src/components/inner-loading/QInnerLoading.js
diff --git a/quasar/src/components/inner-loading/QInnerLoading.json b/ui/src/components/inner-loading/QInnerLoading.json
similarity index 100%
rename from quasar/src/components/inner-loading/QInnerLoading.json
rename to ui/src/components/inner-loading/QInnerLoading.json
diff --git a/quasar/src/components/inner-loading/index.js b/ui/src/components/inner-loading/index.js
similarity index 100%
rename from quasar/src/components/inner-loading/index.js
rename to ui/src/components/inner-loading/index.js
diff --git a/quasar/src/components/inner-loading/inner-loading.styl b/ui/src/components/inner-loading/inner-loading.styl
similarity index 100%
rename from quasar/src/components/inner-loading/inner-loading.styl
rename to ui/src/components/inner-loading/inner-loading.styl
diff --git a/quasar/src/components/input/QInput.js b/ui/src/components/input/QInput.js
similarity index 100%
rename from quasar/src/components/input/QInput.js
rename to ui/src/components/input/QInput.js
diff --git a/quasar/src/components/input/QInput.json b/ui/src/components/input/QInput.json
similarity index 100%
rename from quasar/src/components/input/QInput.json
rename to ui/src/components/input/QInput.json
diff --git a/quasar/src/components/input/index.js b/ui/src/components/input/index.js
similarity index 100%
rename from quasar/src/components/input/index.js
rename to ui/src/components/input/index.js
diff --git a/quasar/src/components/input/input.styl b/ui/src/components/input/input.styl
similarity index 100%
rename from quasar/src/components/input/input.styl
rename to ui/src/components/input/input.styl
diff --git a/quasar/src/components/knob/QKnob.js b/ui/src/components/knob/QKnob.js
similarity index 100%
rename from quasar/src/components/knob/QKnob.js
rename to ui/src/components/knob/QKnob.js
diff --git a/quasar/src/components/knob/QKnob.json b/ui/src/components/knob/QKnob.json
similarity index 100%
rename from quasar/src/components/knob/QKnob.json
rename to ui/src/components/knob/QKnob.json
diff --git a/quasar/src/components/knob/index.js b/ui/src/components/knob/index.js
similarity index 100%
rename from quasar/src/components/knob/index.js
rename to ui/src/components/knob/index.js
diff --git a/quasar/src/components/knob/knob.styl b/ui/src/components/knob/knob.styl
similarity index 100%
rename from quasar/src/components/knob/knob.styl
rename to ui/src/components/knob/knob.styl
diff --git a/quasar/src/components/layout/QDrawer.js b/ui/src/components/layout/QDrawer.js
similarity index 100%
rename from quasar/src/components/layout/QDrawer.js
rename to ui/src/components/layout/QDrawer.js
diff --git a/quasar/src/components/layout/QDrawer.json b/ui/src/components/layout/QDrawer.json
similarity index 100%
rename from quasar/src/components/layout/QDrawer.json
rename to ui/src/components/layout/QDrawer.json
diff --git a/quasar/src/components/layout/QFooter.js b/ui/src/components/layout/QFooter.js
similarity index 100%
rename from quasar/src/components/layout/QFooter.js
rename to ui/src/components/layout/QFooter.js
diff --git a/quasar/src/components/layout/QFooter.json b/ui/src/components/layout/QFooter.json
similarity index 100%
rename from quasar/src/components/layout/QFooter.json
rename to ui/src/components/layout/QFooter.json
diff --git a/quasar/src/components/layout/QHeader.js b/ui/src/components/layout/QHeader.js
similarity index 100%
rename from quasar/src/components/layout/QHeader.js
rename to ui/src/components/layout/QHeader.js
diff --git a/quasar/src/components/layout/QHeader.json b/ui/src/components/layout/QHeader.json
similarity index 100%
rename from quasar/src/components/layout/QHeader.json
rename to ui/src/components/layout/QHeader.json
diff --git a/quasar/src/components/layout/QLayout.js b/ui/src/components/layout/QLayout.js
similarity index 100%
rename from quasar/src/components/layout/QLayout.js
rename to ui/src/components/layout/QLayout.js
diff --git a/quasar/src/components/layout/QLayout.json b/ui/src/components/layout/QLayout.json
similarity index 100%
rename from quasar/src/components/layout/QLayout.json
rename to ui/src/components/layout/QLayout.json
diff --git a/quasar/src/components/layout/QPage.js b/ui/src/components/layout/QPage.js
similarity index 100%
rename from quasar/src/components/layout/QPage.js
rename to ui/src/components/layout/QPage.js
diff --git a/quasar/src/components/layout/QPage.json b/ui/src/components/layout/QPage.json
similarity index 100%
rename from quasar/src/components/layout/QPage.json
rename to ui/src/components/layout/QPage.json
diff --git a/quasar/src/components/layout/QPageContainer.js b/ui/src/components/layout/QPageContainer.js
similarity index 100%
rename from quasar/src/components/layout/QPageContainer.js
rename to ui/src/components/layout/QPageContainer.js
diff --git a/quasar/src/components/layout/QPageContainer.json b/ui/src/components/layout/QPageContainer.json
similarity index 100%
rename from quasar/src/components/layout/QPageContainer.json
rename to ui/src/components/layout/QPageContainer.json
diff --git a/quasar/src/components/layout/QPageSticky.js b/ui/src/components/layout/QPageSticky.js
similarity index 100%
rename from quasar/src/components/layout/QPageSticky.js
rename to ui/src/components/layout/QPageSticky.js
diff --git a/quasar/src/components/layout/QPageSticky.json b/ui/src/components/layout/QPageSticky.json
similarity index 100%
rename from quasar/src/components/layout/QPageSticky.json
rename to ui/src/components/layout/QPageSticky.json
diff --git a/quasar/src/components/layout/index.js b/ui/src/components/layout/index.js
similarity index 100%
rename from quasar/src/components/layout/index.js
rename to ui/src/components/layout/index.js
diff --git a/quasar/src/components/layout/layout.styl b/ui/src/components/layout/layout.styl
similarity index 100%
rename from quasar/src/components/layout/layout.styl
rename to ui/src/components/layout/layout.styl
diff --git a/quasar/src/components/linear-progress/QLinearProgress.js b/ui/src/components/linear-progress/QLinearProgress.js
similarity index 100%
rename from quasar/src/components/linear-progress/QLinearProgress.js
rename to ui/src/components/linear-progress/QLinearProgress.js
diff --git a/quasar/src/components/linear-progress/QLinearProgress.json b/ui/src/components/linear-progress/QLinearProgress.json
similarity index 100%
rename from quasar/src/components/linear-progress/QLinearProgress.json
rename to ui/src/components/linear-progress/QLinearProgress.json
diff --git a/quasar/src/components/linear-progress/index.js b/ui/src/components/linear-progress/index.js
similarity index 100%
rename from quasar/src/components/linear-progress/index.js
rename to ui/src/components/linear-progress/index.js
diff --git a/quasar/src/components/linear-progress/linear-progress.styl b/ui/src/components/linear-progress/linear-progress.styl
similarity index 100%
rename from quasar/src/components/linear-progress/linear-progress.styl
rename to ui/src/components/linear-progress/linear-progress.styl
diff --git a/quasar/src/components/list/QExpansionItem.js b/ui/src/components/list/QExpansionItem.js
similarity index 100%
rename from quasar/src/components/list/QExpansionItem.js
rename to ui/src/components/list/QExpansionItem.js
diff --git a/quasar/src/components/list/QExpansionItem.json b/ui/src/components/list/QExpansionItem.json
similarity index 100%
rename from quasar/src/components/list/QExpansionItem.json
rename to ui/src/components/list/QExpansionItem.json
diff --git a/quasar/src/components/list/QItem.js b/ui/src/components/list/QItem.js
similarity index 100%
rename from quasar/src/components/list/QItem.js
rename to ui/src/components/list/QItem.js
diff --git a/quasar/src/components/list/QItem.json b/ui/src/components/list/QItem.json
similarity index 100%
rename from quasar/src/components/list/QItem.json
rename to ui/src/components/list/QItem.json
diff --git a/quasar/src/components/list/QItemLabel.js b/ui/src/components/list/QItemLabel.js
similarity index 100%
rename from quasar/src/components/list/QItemLabel.js
rename to ui/src/components/list/QItemLabel.js
diff --git a/quasar/src/components/list/QItemLabel.json b/ui/src/components/list/QItemLabel.json
similarity index 100%
rename from quasar/src/components/list/QItemLabel.json
rename to ui/src/components/list/QItemLabel.json
diff --git a/quasar/src/components/list/QItemSection.js b/ui/src/components/list/QItemSection.js
similarity index 100%
rename from quasar/src/components/list/QItemSection.js
rename to ui/src/components/list/QItemSection.js
diff --git a/quasar/src/components/list/QItemSection.json b/ui/src/components/list/QItemSection.json
similarity index 100%
rename from quasar/src/components/list/QItemSection.json
rename to ui/src/components/list/QItemSection.json
diff --git a/quasar/src/components/list/QList.js b/ui/src/components/list/QList.js
similarity index 100%
rename from quasar/src/components/list/QList.js
rename to ui/src/components/list/QList.js
diff --git a/quasar/src/components/list/QList.json b/ui/src/components/list/QList.json
similarity index 100%
rename from quasar/src/components/list/QList.json
rename to ui/src/components/list/QList.json
diff --git a/quasar/src/components/list/QSlideItem.js b/ui/src/components/list/QSlideItem.js
similarity index 100%
rename from quasar/src/components/list/QSlideItem.js
rename to ui/src/components/list/QSlideItem.js
diff --git a/quasar/src/components/list/QSlideItem.json b/ui/src/components/list/QSlideItem.json
similarity index 100%
rename from quasar/src/components/list/QSlideItem.json
rename to ui/src/components/list/QSlideItem.json
diff --git a/quasar/src/components/list/expansion-item.styl b/ui/src/components/list/expansion-item.styl
similarity index 100%
rename from quasar/src/components/list/expansion-item.styl
rename to ui/src/components/list/expansion-item.styl
diff --git a/quasar/src/components/list/index.js b/ui/src/components/list/index.js
similarity index 100%
rename from quasar/src/components/list/index.js
rename to ui/src/components/list/index.js
diff --git a/quasar/src/components/list/list.styl b/ui/src/components/list/list.styl
similarity index 100%
rename from quasar/src/components/list/list.styl
rename to ui/src/components/list/list.styl
diff --git a/quasar/src/components/list/slide-item.styl b/ui/src/components/list/slide-item.styl
similarity index 100%
rename from quasar/src/components/list/slide-item.styl
rename to ui/src/components/list/slide-item.styl
diff --git a/quasar/src/components/menu/ClickOutside.js b/ui/src/components/menu/ClickOutside.js
similarity index 100%
rename from quasar/src/components/menu/ClickOutside.js
rename to ui/src/components/menu/ClickOutside.js
diff --git a/quasar/src/components/menu/QMenu.js b/ui/src/components/menu/QMenu.js
similarity index 100%
rename from quasar/src/components/menu/QMenu.js
rename to ui/src/components/menu/QMenu.js
diff --git a/quasar/src/components/menu/QMenu.json b/ui/src/components/menu/QMenu.json
similarity index 100%
rename from quasar/src/components/menu/QMenu.json
rename to ui/src/components/menu/QMenu.json
diff --git a/quasar/src/components/menu/index.js b/ui/src/components/menu/index.js
similarity index 100%
rename from quasar/src/components/menu/index.js
rename to ui/src/components/menu/index.js
diff --git a/quasar/src/components/menu/menu-tree.js b/ui/src/components/menu/menu-tree.js
similarity index 100%
rename from quasar/src/components/menu/menu-tree.js
rename to ui/src/components/menu/menu-tree.js
diff --git a/quasar/src/components/menu/menu.styl b/ui/src/components/menu/menu.styl
similarity index 100%
rename from quasar/src/components/menu/menu.styl
rename to ui/src/components/menu/menu.styl
diff --git a/quasar/src/components/no-ssr/QNoSsr.js b/ui/src/components/no-ssr/QNoSsr.js
similarity index 100%
rename from quasar/src/components/no-ssr/QNoSsr.js
rename to ui/src/components/no-ssr/QNoSsr.js
diff --git a/quasar/src/components/no-ssr/QNoSsr.json b/ui/src/components/no-ssr/QNoSsr.json
similarity index 100%
rename from quasar/src/components/no-ssr/QNoSsr.json
rename to ui/src/components/no-ssr/QNoSsr.json
diff --git a/quasar/src/components/no-ssr/index.js b/ui/src/components/no-ssr/index.js
similarity index 100%
rename from quasar/src/components/no-ssr/index.js
rename to ui/src/components/no-ssr/index.js
diff --git a/quasar/src/components/observer/QResizeObserver.js b/ui/src/components/observer/QResizeObserver.js
similarity index 100%
rename from quasar/src/components/observer/QResizeObserver.js
rename to ui/src/components/observer/QResizeObserver.js
diff --git a/quasar/src/components/observer/QResizeObserver.json b/ui/src/components/observer/QResizeObserver.json
similarity index 100%
rename from quasar/src/components/observer/QResizeObserver.json
rename to ui/src/components/observer/QResizeObserver.json
diff --git a/quasar/src/components/observer/QScrollObserver.js b/ui/src/components/observer/QScrollObserver.js
similarity index 100%
rename from quasar/src/components/observer/QScrollObserver.js
rename to ui/src/components/observer/QScrollObserver.js
diff --git a/quasar/src/components/observer/QScrollObserver.json b/ui/src/components/observer/QScrollObserver.json
similarity index 100%
rename from quasar/src/components/observer/QScrollObserver.json
rename to ui/src/components/observer/QScrollObserver.json
diff --git a/quasar/src/components/observer/index.js b/ui/src/components/observer/index.js
similarity index 100%
rename from quasar/src/components/observer/index.js
rename to ui/src/components/observer/index.js
diff --git a/quasar/src/components/option-group/QOptionGroup.js b/ui/src/components/option-group/QOptionGroup.js
similarity index 100%
rename from quasar/src/components/option-group/QOptionGroup.js
rename to ui/src/components/option-group/QOptionGroup.js
diff --git a/quasar/src/components/option-group/QOptionGroup.json b/ui/src/components/option-group/QOptionGroup.json
similarity index 100%
rename from quasar/src/components/option-group/QOptionGroup.json
rename to ui/src/components/option-group/QOptionGroup.json
diff --git a/quasar/src/components/option-group/index.js b/ui/src/components/option-group/index.js
similarity index 100%
rename from quasar/src/components/option-group/index.js
rename to ui/src/components/option-group/index.js
diff --git a/quasar/src/components/option-group/option-group.styl b/ui/src/components/option-group/option-group.styl
similarity index 100%
rename from quasar/src/components/option-group/option-group.styl
rename to ui/src/components/option-group/option-group.styl
diff --git a/quasar/src/components/page-scroller/QPageScroller.js b/ui/src/components/page-scroller/QPageScroller.js
similarity index 100%
rename from quasar/src/components/page-scroller/QPageScroller.js
rename to ui/src/components/page-scroller/QPageScroller.js
diff --git a/quasar/src/components/page-scroller/QPageScroller.json b/ui/src/components/page-scroller/QPageScroller.json
similarity index 100%
rename from quasar/src/components/page-scroller/QPageScroller.json
rename to ui/src/components/page-scroller/QPageScroller.json
diff --git a/quasar/src/components/page-scroller/index.js b/ui/src/components/page-scroller/index.js
similarity index 100%
rename from quasar/src/components/page-scroller/index.js
rename to ui/src/components/page-scroller/index.js
diff --git a/quasar/src/components/pagination/QPagination.js b/ui/src/components/pagination/QPagination.js
similarity index 100%
rename from quasar/src/components/pagination/QPagination.js
rename to ui/src/components/pagination/QPagination.js
diff --git a/quasar/src/components/pagination/QPagination.json b/ui/src/components/pagination/QPagination.json
similarity index 100%
rename from quasar/src/components/pagination/QPagination.json
rename to ui/src/components/pagination/QPagination.json
diff --git a/quasar/src/components/pagination/index.js b/ui/src/components/pagination/index.js
similarity index 100%
rename from quasar/src/components/pagination/index.js
rename to ui/src/components/pagination/index.js
diff --git a/quasar/src/components/pagination/pagination.styl b/ui/src/components/pagination/pagination.styl
similarity index 100%
rename from quasar/src/components/pagination/pagination.styl
rename to ui/src/components/pagination/pagination.styl
diff --git a/quasar/src/components/parallax/QParallax.js b/ui/src/components/parallax/QParallax.js
similarity index 100%
rename from quasar/src/components/parallax/QParallax.js
rename to ui/src/components/parallax/QParallax.js
diff --git a/quasar/src/components/parallax/QParallax.json b/ui/src/components/parallax/QParallax.json
similarity index 100%
rename from quasar/src/components/parallax/QParallax.json
rename to ui/src/components/parallax/QParallax.json
diff --git a/quasar/src/components/parallax/index.js b/ui/src/components/parallax/index.js
similarity index 100%
rename from quasar/src/components/parallax/index.js
rename to ui/src/components/parallax/index.js
diff --git a/quasar/src/components/parallax/parallax.styl b/ui/src/components/parallax/parallax.styl
similarity index 100%
rename from quasar/src/components/parallax/parallax.styl
rename to ui/src/components/parallax/parallax.styl
diff --git a/quasar/src/components/popup-edit/QPopupEdit.js b/ui/src/components/popup-edit/QPopupEdit.js
similarity index 100%
rename from quasar/src/components/popup-edit/QPopupEdit.js
rename to ui/src/components/popup-edit/QPopupEdit.js
diff --git a/quasar/src/components/popup-edit/QPopupEdit.json b/ui/src/components/popup-edit/QPopupEdit.json
similarity index 100%
rename from quasar/src/components/popup-edit/QPopupEdit.json
rename to ui/src/components/popup-edit/QPopupEdit.json
diff --git a/quasar/src/components/popup-edit/index.js b/ui/src/components/popup-edit/index.js
similarity index 100%
rename from quasar/src/components/popup-edit/index.js
rename to ui/src/components/popup-edit/index.js
diff --git a/quasar/src/components/popup-edit/popup-edit.styl b/ui/src/components/popup-edit/popup-edit.styl
similarity index 100%
rename from quasar/src/components/popup-edit/popup-edit.styl
rename to ui/src/components/popup-edit/popup-edit.styl
diff --git a/quasar/src/components/popup-proxy/QPopupProxy.js b/ui/src/components/popup-proxy/QPopupProxy.js
similarity index 100%
rename from quasar/src/components/popup-proxy/QPopupProxy.js
rename to ui/src/components/popup-proxy/QPopupProxy.js
diff --git a/quasar/src/components/popup-proxy/QPopupProxy.json b/ui/src/components/popup-proxy/QPopupProxy.json
similarity index 100%
rename from quasar/src/components/popup-proxy/QPopupProxy.json
rename to ui/src/components/popup-proxy/QPopupProxy.json
diff --git a/quasar/src/components/popup-proxy/index.js b/ui/src/components/popup-proxy/index.js
similarity index 100%
rename from quasar/src/components/popup-proxy/index.js
rename to ui/src/components/popup-proxy/index.js
diff --git a/quasar/src/components/pull-to-refresh/QPullToRefresh.js b/ui/src/components/pull-to-refresh/QPullToRefresh.js
similarity index 100%
rename from quasar/src/components/pull-to-refresh/QPullToRefresh.js
rename to ui/src/components/pull-to-refresh/QPullToRefresh.js
diff --git a/quasar/src/components/pull-to-refresh/QPullToRefresh.json b/ui/src/components/pull-to-refresh/QPullToRefresh.json
similarity index 100%
rename from quasar/src/components/pull-to-refresh/QPullToRefresh.json
rename to ui/src/components/pull-to-refresh/QPullToRefresh.json
diff --git a/quasar/src/components/pull-to-refresh/index.js b/ui/src/components/pull-to-refresh/index.js
similarity index 100%
rename from quasar/src/components/pull-to-refresh/index.js
rename to ui/src/components/pull-to-refresh/index.js
diff --git a/quasar/src/components/pull-to-refresh/pull-to-refresh.styl b/ui/src/components/pull-to-refresh/pull-to-refresh.styl
similarity index 100%
rename from quasar/src/components/pull-to-refresh/pull-to-refresh.styl
rename to ui/src/components/pull-to-refresh/pull-to-refresh.styl
diff --git a/quasar/src/components/radio/QRadio.js b/ui/src/components/radio/QRadio.js
similarity index 100%
rename from quasar/src/components/radio/QRadio.js
rename to ui/src/components/radio/QRadio.js
diff --git a/quasar/src/components/radio/QRadio.json b/ui/src/components/radio/QRadio.json
similarity index 100%
rename from quasar/src/components/radio/QRadio.json
rename to ui/src/components/radio/QRadio.json
diff --git a/quasar/src/components/radio/index.js b/ui/src/components/radio/index.js
similarity index 100%
rename from quasar/src/components/radio/index.js
rename to ui/src/components/radio/index.js
diff --git a/quasar/src/components/radio/radio.styl b/ui/src/components/radio/radio.styl
similarity index 100%
rename from quasar/src/components/radio/radio.styl
rename to ui/src/components/radio/radio.styl
diff --git a/quasar/src/components/range/QRange.js b/ui/src/components/range/QRange.js
similarity index 100%
rename from quasar/src/components/range/QRange.js
rename to ui/src/components/range/QRange.js
diff --git a/quasar/src/components/range/QRange.json b/ui/src/components/range/QRange.json
similarity index 100%
rename from quasar/src/components/range/QRange.json
rename to ui/src/components/range/QRange.json
diff --git a/quasar/src/components/range/index.js b/ui/src/components/range/index.js
similarity index 100%
rename from quasar/src/components/range/index.js
rename to ui/src/components/range/index.js
diff --git a/quasar/src/components/rating/QRating.js b/ui/src/components/rating/QRating.js
similarity index 100%
rename from quasar/src/components/rating/QRating.js
rename to ui/src/components/rating/QRating.js
diff --git a/quasar/src/components/rating/QRating.json b/ui/src/components/rating/QRating.json
similarity index 100%
rename from quasar/src/components/rating/QRating.json
rename to ui/src/components/rating/QRating.json
diff --git a/quasar/src/components/rating/index.js b/ui/src/components/rating/index.js
similarity index 100%
rename from quasar/src/components/rating/index.js
rename to ui/src/components/rating/index.js
diff --git a/quasar/src/components/rating/rating.styl b/ui/src/components/rating/rating.styl
similarity index 100%
rename from quasar/src/components/rating/rating.styl
rename to ui/src/components/rating/rating.styl
diff --git a/quasar/src/components/scroll-area/QScrollArea.js b/ui/src/components/scroll-area/QScrollArea.js
similarity index 100%
rename from quasar/src/components/scroll-area/QScrollArea.js
rename to ui/src/components/scroll-area/QScrollArea.js
diff --git a/quasar/src/components/scroll-area/QScrollArea.json b/ui/src/components/scroll-area/QScrollArea.json
similarity index 100%
rename from quasar/src/components/scroll-area/QScrollArea.json
rename to ui/src/components/scroll-area/QScrollArea.json
diff --git a/quasar/src/components/scroll-area/index.js b/ui/src/components/scroll-area/index.js
similarity index 100%
rename from quasar/src/components/scroll-area/index.js
rename to ui/src/components/scroll-area/index.js
diff --git a/quasar/src/components/scroll-area/scroll-area.styl b/ui/src/components/scroll-area/scroll-area.styl
similarity index 100%
rename from quasar/src/components/scroll-area/scroll-area.styl
rename to ui/src/components/scroll-area/scroll-area.styl
diff --git a/quasar/src/components/select/QSelect.js b/ui/src/components/select/QSelect.js
similarity index 100%
rename from quasar/src/components/select/QSelect.js
rename to ui/src/components/select/QSelect.js
diff --git a/quasar/src/components/select/QSelect.json b/ui/src/components/select/QSelect.json
similarity index 100%
rename from quasar/src/components/select/QSelect.json
rename to ui/src/components/select/QSelect.json
diff --git a/quasar/src/components/select/index.js b/ui/src/components/select/index.js
similarity index 100%
rename from quasar/src/components/select/index.js
rename to ui/src/components/select/index.js
diff --git a/quasar/src/components/select/select.styl b/ui/src/components/select/select.styl
similarity index 100%
rename from quasar/src/components/select/select.styl
rename to ui/src/components/select/select.styl
diff --git a/quasar/src/components/separator/QSeparator.js b/ui/src/components/separator/QSeparator.js
similarity index 100%
rename from quasar/src/components/separator/QSeparator.js
rename to ui/src/components/separator/QSeparator.js
diff --git a/quasar/src/components/separator/QSeparator.json b/ui/src/components/separator/QSeparator.json
similarity index 100%
rename from quasar/src/components/separator/QSeparator.json
rename to ui/src/components/separator/QSeparator.json
diff --git a/quasar/src/components/separator/index.js b/ui/src/components/separator/index.js
similarity index 100%
rename from quasar/src/components/separator/index.js
rename to ui/src/components/separator/index.js
diff --git a/quasar/src/components/separator/separator.styl b/ui/src/components/separator/separator.styl
similarity index 100%
rename from quasar/src/components/separator/separator.styl
rename to ui/src/components/separator/separator.styl
diff --git a/quasar/src/components/slide-transition/QSlideTransition.js b/ui/src/components/slide-transition/QSlideTransition.js
similarity index 100%
rename from quasar/src/components/slide-transition/QSlideTransition.js
rename to ui/src/components/slide-transition/QSlideTransition.js
diff --git a/quasar/src/components/slide-transition/QSlideTransition.json b/ui/src/components/slide-transition/QSlideTransition.json
similarity index 100%
rename from quasar/src/components/slide-transition/QSlideTransition.json
rename to ui/src/components/slide-transition/QSlideTransition.json
diff --git a/quasar/src/components/slide-transition/index.js b/ui/src/components/slide-transition/index.js
similarity index 100%
rename from quasar/src/components/slide-transition/index.js
rename to ui/src/components/slide-transition/index.js
diff --git a/quasar/src/components/slider/QSlider.js b/ui/src/components/slider/QSlider.js
similarity index 100%
rename from quasar/src/components/slider/QSlider.js
rename to ui/src/components/slider/QSlider.js
diff --git a/quasar/src/components/slider/QSlider.json b/ui/src/components/slider/QSlider.json
similarity index 100%
rename from quasar/src/components/slider/QSlider.json
rename to ui/src/components/slider/QSlider.json
diff --git a/quasar/src/components/slider/index.js b/ui/src/components/slider/index.js
similarity index 100%
rename from quasar/src/components/slider/index.js
rename to ui/src/components/slider/index.js
diff --git a/quasar/src/components/slider/slider-utils.js b/ui/src/components/slider/slider-utils.js
similarity index 100%
rename from quasar/src/components/slider/slider-utils.js
rename to ui/src/components/slider/slider-utils.js
diff --git a/quasar/src/components/slider/slider.styl b/ui/src/components/slider/slider.styl
similarity index 100%
rename from quasar/src/components/slider/slider.styl
rename to ui/src/components/slider/slider.styl
diff --git a/quasar/src/components/space/QSpace.js b/ui/src/components/space/QSpace.js
similarity index 100%
rename from quasar/src/components/space/QSpace.js
rename to ui/src/components/space/QSpace.js
diff --git a/quasar/src/components/space/QSpace.json b/ui/src/components/space/QSpace.json
similarity index 100%
rename from quasar/src/components/space/QSpace.json
rename to ui/src/components/space/QSpace.json
diff --git a/quasar/src/components/space/index.js b/ui/src/components/space/index.js
similarity index 100%
rename from quasar/src/components/space/index.js
rename to ui/src/components/space/index.js
diff --git a/quasar/src/components/space/space.styl b/ui/src/components/space/space.styl
similarity index 100%
rename from quasar/src/components/space/space.styl
rename to ui/src/components/space/space.styl
diff --git a/quasar/src/components/spinner/QSpinner.js b/ui/src/components/spinner/QSpinner.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinner.js
rename to ui/src/components/spinner/QSpinner.js
diff --git a/quasar/src/components/spinner/QSpinner.json b/ui/src/components/spinner/QSpinner.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinner.json
rename to ui/src/components/spinner/QSpinner.json
diff --git a/quasar/src/components/spinner/QSpinnerAudio.js b/ui/src/components/spinner/QSpinnerAudio.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerAudio.js
rename to ui/src/components/spinner/QSpinnerAudio.js
diff --git a/quasar/src/components/spinner/QSpinnerAudio.json b/ui/src/components/spinner/QSpinnerAudio.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerAudio.json
rename to ui/src/components/spinner/QSpinnerAudio.json
diff --git a/quasar/src/components/spinner/QSpinnerBall.js b/ui/src/components/spinner/QSpinnerBall.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerBall.js
rename to ui/src/components/spinner/QSpinnerBall.js
diff --git a/quasar/src/components/spinner/QSpinnerBall.json b/ui/src/components/spinner/QSpinnerBall.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerBall.json
rename to ui/src/components/spinner/QSpinnerBall.json
diff --git a/quasar/src/components/spinner/QSpinnerBars.js b/ui/src/components/spinner/QSpinnerBars.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerBars.js
rename to ui/src/components/spinner/QSpinnerBars.js
diff --git a/quasar/src/components/spinner/QSpinnerBars.json b/ui/src/components/spinner/QSpinnerBars.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerBars.json
rename to ui/src/components/spinner/QSpinnerBars.json
diff --git a/quasar/src/components/spinner/QSpinnerComment.js b/ui/src/components/spinner/QSpinnerComment.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerComment.js
rename to ui/src/components/spinner/QSpinnerComment.js
diff --git a/quasar/src/components/spinner/QSpinnerComment.json b/ui/src/components/spinner/QSpinnerComment.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerComment.json
rename to ui/src/components/spinner/QSpinnerComment.json
diff --git a/quasar/src/components/spinner/QSpinnerCube.js b/ui/src/components/spinner/QSpinnerCube.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerCube.js
rename to ui/src/components/spinner/QSpinnerCube.js
diff --git a/quasar/src/components/spinner/QSpinnerCube.json b/ui/src/components/spinner/QSpinnerCube.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerCube.json
rename to ui/src/components/spinner/QSpinnerCube.json
diff --git a/quasar/src/components/spinner/QSpinnerDots.js b/ui/src/components/spinner/QSpinnerDots.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerDots.js
rename to ui/src/components/spinner/QSpinnerDots.js
diff --git a/quasar/src/components/spinner/QSpinnerDots.json b/ui/src/components/spinner/QSpinnerDots.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerDots.json
rename to ui/src/components/spinner/QSpinnerDots.json
diff --git a/quasar/src/components/spinner/QSpinnerFacebook.js b/ui/src/components/spinner/QSpinnerFacebook.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerFacebook.js
rename to ui/src/components/spinner/QSpinnerFacebook.js
diff --git a/quasar/src/components/spinner/QSpinnerFacebook.json b/ui/src/components/spinner/QSpinnerFacebook.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerFacebook.json
rename to ui/src/components/spinner/QSpinnerFacebook.json
diff --git a/quasar/src/components/spinner/QSpinnerGears.js b/ui/src/components/spinner/QSpinnerGears.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerGears.js
rename to ui/src/components/spinner/QSpinnerGears.js
diff --git a/quasar/src/components/spinner/QSpinnerGears.json b/ui/src/components/spinner/QSpinnerGears.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerGears.json
rename to ui/src/components/spinner/QSpinnerGears.json
diff --git a/quasar/src/components/spinner/QSpinnerGrid.js b/ui/src/components/spinner/QSpinnerGrid.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerGrid.js
rename to ui/src/components/spinner/QSpinnerGrid.js
diff --git a/quasar/src/components/spinner/QSpinnerGrid.json b/ui/src/components/spinner/QSpinnerGrid.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerGrid.json
rename to ui/src/components/spinner/QSpinnerGrid.json
diff --git a/quasar/src/components/spinner/QSpinnerHearts.js b/ui/src/components/spinner/QSpinnerHearts.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerHearts.js
rename to ui/src/components/spinner/QSpinnerHearts.js
diff --git a/quasar/src/components/spinner/QSpinnerHearts.json b/ui/src/components/spinner/QSpinnerHearts.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerHearts.json
rename to ui/src/components/spinner/QSpinnerHearts.json
diff --git a/quasar/src/components/spinner/QSpinnerHourglass.js b/ui/src/components/spinner/QSpinnerHourglass.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerHourglass.js
rename to ui/src/components/spinner/QSpinnerHourglass.js
diff --git a/quasar/src/components/spinner/QSpinnerHourglass.json b/ui/src/components/spinner/QSpinnerHourglass.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerHourglass.json
rename to ui/src/components/spinner/QSpinnerHourglass.json
diff --git a/quasar/src/components/spinner/QSpinnerInfinity.js b/ui/src/components/spinner/QSpinnerInfinity.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerInfinity.js
rename to ui/src/components/spinner/QSpinnerInfinity.js
diff --git a/quasar/src/components/spinner/QSpinnerInfinity.json b/ui/src/components/spinner/QSpinnerInfinity.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerInfinity.json
rename to ui/src/components/spinner/QSpinnerInfinity.json
diff --git a/quasar/src/components/spinner/QSpinnerIos.js b/ui/src/components/spinner/QSpinnerIos.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerIos.js
rename to ui/src/components/spinner/QSpinnerIos.js
diff --git a/quasar/src/components/spinner/QSpinnerIos.json b/ui/src/components/spinner/QSpinnerIos.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerIos.json
rename to ui/src/components/spinner/QSpinnerIos.json
diff --git a/quasar/src/components/spinner/QSpinnerOval.js b/ui/src/components/spinner/QSpinnerOval.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerOval.js
rename to ui/src/components/spinner/QSpinnerOval.js
diff --git a/quasar/src/components/spinner/QSpinnerOval.json b/ui/src/components/spinner/QSpinnerOval.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerOval.json
rename to ui/src/components/spinner/QSpinnerOval.json
diff --git a/quasar/src/components/spinner/QSpinnerPie.js b/ui/src/components/spinner/QSpinnerPie.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerPie.js
rename to ui/src/components/spinner/QSpinnerPie.js
diff --git a/quasar/src/components/spinner/QSpinnerPie.json b/ui/src/components/spinner/QSpinnerPie.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerPie.json
rename to ui/src/components/spinner/QSpinnerPie.json
diff --git a/quasar/src/components/spinner/QSpinnerPuff.js b/ui/src/components/spinner/QSpinnerPuff.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerPuff.js
rename to ui/src/components/spinner/QSpinnerPuff.js
diff --git a/quasar/src/components/spinner/QSpinnerPuff.json b/ui/src/components/spinner/QSpinnerPuff.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerPuff.json
rename to ui/src/components/spinner/QSpinnerPuff.json
diff --git a/quasar/src/components/spinner/QSpinnerRadio.js b/ui/src/components/spinner/QSpinnerRadio.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerRadio.js
rename to ui/src/components/spinner/QSpinnerRadio.js
diff --git a/quasar/src/components/spinner/QSpinnerRadio.json b/ui/src/components/spinner/QSpinnerRadio.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerRadio.json
rename to ui/src/components/spinner/QSpinnerRadio.json
diff --git a/quasar/src/components/spinner/QSpinnerRings.js b/ui/src/components/spinner/QSpinnerRings.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerRings.js
rename to ui/src/components/spinner/QSpinnerRings.js
diff --git a/quasar/src/components/spinner/QSpinnerRings.json b/ui/src/components/spinner/QSpinnerRings.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerRings.json
rename to ui/src/components/spinner/QSpinnerRings.json
diff --git a/quasar/src/components/spinner/QSpinnerTail.js b/ui/src/components/spinner/QSpinnerTail.js
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerTail.js
rename to ui/src/components/spinner/QSpinnerTail.js
diff --git a/quasar/src/components/spinner/QSpinnerTail.json b/ui/src/components/spinner/QSpinnerTail.json
similarity index 100%
rename from quasar/src/components/spinner/QSpinnerTail.json
rename to ui/src/components/spinner/QSpinnerTail.json
diff --git a/quasar/src/components/spinner/__spinner-mixin.json b/ui/src/components/spinner/__spinner-mixin.json
similarity index 100%
rename from quasar/src/components/spinner/__spinner-mixin.json
rename to ui/src/components/spinner/__spinner-mixin.json
diff --git a/quasar/src/components/spinner/index.js b/ui/src/components/spinner/index.js
similarity index 100%
rename from quasar/src/components/spinner/index.js
rename to ui/src/components/spinner/index.js
diff --git a/quasar/src/components/spinner/spinner-mixin.js b/ui/src/components/spinner/spinner-mixin.js
similarity index 100%
rename from quasar/src/components/spinner/spinner-mixin.js
rename to ui/src/components/spinner/spinner-mixin.js
diff --git a/quasar/src/components/spinner/spinner.styl b/ui/src/components/spinner/spinner.styl
similarity index 100%
rename from quasar/src/components/spinner/spinner.styl
rename to ui/src/components/spinner/spinner.styl
diff --git a/quasar/src/components/splitter/QSplitter.js b/ui/src/components/splitter/QSplitter.js
similarity index 100%
rename from quasar/src/components/splitter/QSplitter.js
rename to ui/src/components/splitter/QSplitter.js
diff --git a/quasar/src/components/splitter/QSplitter.json b/ui/src/components/splitter/QSplitter.json
similarity index 100%
rename from quasar/src/components/splitter/QSplitter.json
rename to ui/src/components/splitter/QSplitter.json
diff --git a/quasar/src/components/splitter/index.js b/ui/src/components/splitter/index.js
similarity index 100%
rename from quasar/src/components/splitter/index.js
rename to ui/src/components/splitter/index.js
diff --git a/quasar/src/components/splitter/splitter.styl b/ui/src/components/splitter/splitter.styl
similarity index 100%
rename from quasar/src/components/splitter/splitter.styl
rename to ui/src/components/splitter/splitter.styl
diff --git a/quasar/src/components/stepper/QStep.js b/ui/src/components/stepper/QStep.js
similarity index 100%
rename from quasar/src/components/stepper/QStep.js
rename to ui/src/components/stepper/QStep.js
diff --git a/quasar/src/components/stepper/QStep.json b/ui/src/components/stepper/QStep.json
similarity index 100%
rename from quasar/src/components/stepper/QStep.json
rename to ui/src/components/stepper/QStep.json
diff --git a/quasar/src/components/stepper/QStepper.js b/ui/src/components/stepper/QStepper.js
similarity index 100%
rename from quasar/src/components/stepper/QStepper.js
rename to ui/src/components/stepper/QStepper.js
diff --git a/quasar/src/components/stepper/QStepper.json b/ui/src/components/stepper/QStepper.json
similarity index 100%
rename from quasar/src/components/stepper/QStepper.json
rename to ui/src/components/stepper/QStepper.json
diff --git a/quasar/src/components/stepper/QStepperNavigation.js b/ui/src/components/stepper/QStepperNavigation.js
similarity index 100%
rename from quasar/src/components/stepper/QStepperNavigation.js
rename to ui/src/components/stepper/QStepperNavigation.js
diff --git a/quasar/src/components/stepper/QStepperNavigation.json b/ui/src/components/stepper/QStepperNavigation.json
similarity index 100%
rename from quasar/src/components/stepper/QStepperNavigation.json
rename to ui/src/components/stepper/QStepperNavigation.json
diff --git a/quasar/src/components/stepper/StepHeader.js b/ui/src/components/stepper/StepHeader.js
similarity index 100%
rename from quasar/src/components/stepper/StepHeader.js
rename to ui/src/components/stepper/StepHeader.js
diff --git a/quasar/src/components/stepper/index.js b/ui/src/components/stepper/index.js
similarity index 100%
rename from quasar/src/components/stepper/index.js
rename to ui/src/components/stepper/index.js
diff --git a/quasar/src/components/stepper/stepper.styl b/ui/src/components/stepper/stepper.styl
similarity index 100%
rename from quasar/src/components/stepper/stepper.styl
rename to ui/src/components/stepper/stepper.styl
diff --git a/quasar/src/components/tab-panels/QTabPanel.js b/ui/src/components/tab-panels/QTabPanel.js
similarity index 100%
rename from quasar/src/components/tab-panels/QTabPanel.js
rename to ui/src/components/tab-panels/QTabPanel.js
diff --git a/quasar/src/components/tab-panels/QTabPanel.json b/ui/src/components/tab-panels/QTabPanel.json
similarity index 100%
rename from quasar/src/components/tab-panels/QTabPanel.json
rename to ui/src/components/tab-panels/QTabPanel.json
diff --git a/quasar/src/components/tab-panels/QTabPanels.js b/ui/src/components/tab-panels/QTabPanels.js
similarity index 100%
rename from quasar/src/components/tab-panels/QTabPanels.js
rename to ui/src/components/tab-panels/QTabPanels.js
diff --git a/quasar/src/components/tab-panels/QTabPanels.json b/ui/src/components/tab-panels/QTabPanels.json
similarity index 100%
rename from quasar/src/components/tab-panels/QTabPanels.json
rename to ui/src/components/tab-panels/QTabPanels.json
diff --git a/quasar/src/components/tab-panels/index.js b/ui/src/components/tab-panels/index.js
similarity index 100%
rename from quasar/src/components/tab-panels/index.js
rename to ui/src/components/tab-panels/index.js
diff --git a/quasar/src/components/tab-panels/tab-panels.styl b/ui/src/components/tab-panels/tab-panels.styl
similarity index 100%
rename from quasar/src/components/tab-panels/tab-panels.styl
rename to ui/src/components/tab-panels/tab-panels.styl
diff --git a/quasar/src/components/table/QMarkupTable.js b/ui/src/components/table/QMarkupTable.js
similarity index 100%
rename from quasar/src/components/table/QMarkupTable.js
rename to ui/src/components/table/QMarkupTable.js
diff --git a/quasar/src/components/table/QMarkupTable.json b/ui/src/components/table/QMarkupTable.json
similarity index 100%
rename from quasar/src/components/table/QMarkupTable.json
rename to ui/src/components/table/QMarkupTable.json
diff --git a/quasar/src/components/table/QTable.js b/ui/src/components/table/QTable.js
similarity index 100%
rename from quasar/src/components/table/QTable.js
rename to ui/src/components/table/QTable.js
diff --git a/quasar/src/components/table/QTable.json b/ui/src/components/table/QTable.json
similarity index 100%
rename from quasar/src/components/table/QTable.json
rename to ui/src/components/table/QTable.json
diff --git a/quasar/src/components/table/QTd.js b/ui/src/components/table/QTd.js
similarity index 100%
rename from quasar/src/components/table/QTd.js
rename to ui/src/components/table/QTd.js
diff --git a/quasar/src/components/table/QTd.json b/ui/src/components/table/QTd.json
similarity index 100%
rename from quasar/src/components/table/QTd.json
rename to ui/src/components/table/QTd.json
diff --git a/quasar/src/components/table/QTh.js b/ui/src/components/table/QTh.js
similarity index 100%
rename from quasar/src/components/table/QTh.js
rename to ui/src/components/table/QTh.js
diff --git a/quasar/src/components/table/QTh.json b/ui/src/components/table/QTh.json
similarity index 100%
rename from quasar/src/components/table/QTh.json
rename to ui/src/components/table/QTh.json
diff --git a/quasar/src/components/table/QTr.js b/ui/src/components/table/QTr.js
similarity index 100%
rename from quasar/src/components/table/QTr.js
rename to ui/src/components/table/QTr.js
diff --git a/quasar/src/components/table/QTr.json b/ui/src/components/table/QTr.json
similarity index 100%
rename from quasar/src/components/table/QTr.json
rename to ui/src/components/table/QTr.json
diff --git a/quasar/src/components/table/index.js b/ui/src/components/table/index.js
similarity index 100%
rename from quasar/src/components/table/index.js
rename to ui/src/components/table/index.js
diff --git a/quasar/src/components/table/table-body.js b/ui/src/components/table/table-body.js
similarity index 100%
rename from quasar/src/components/table/table-body.js
rename to ui/src/components/table/table-body.js
diff --git a/quasar/src/components/table/table-bottom.js b/ui/src/components/table/table-bottom.js
similarity index 100%
rename from quasar/src/components/table/table-bottom.js
rename to ui/src/components/table/table-bottom.js
diff --git a/quasar/src/components/table/table-column-selection.js b/ui/src/components/table/table-column-selection.js
similarity index 100%
rename from quasar/src/components/table/table-column-selection.js
rename to ui/src/components/table/table-column-selection.js
diff --git a/quasar/src/components/table/table-filter.js b/ui/src/components/table/table-filter.js
similarity index 100%
rename from quasar/src/components/table/table-filter.js
rename to ui/src/components/table/table-filter.js
diff --git a/quasar/src/components/table/table-header.js b/ui/src/components/table/table-header.js
similarity index 100%
rename from quasar/src/components/table/table-header.js
rename to ui/src/components/table/table-header.js
diff --git a/quasar/src/components/table/table-pagination.js b/ui/src/components/table/table-pagination.js
similarity index 100%
rename from quasar/src/components/table/table-pagination.js
rename to ui/src/components/table/table-pagination.js
diff --git a/quasar/src/components/table/table-row-selection.js b/ui/src/components/table/table-row-selection.js
similarity index 100%
rename from quasar/src/components/table/table-row-selection.js
rename to ui/src/components/table/table-row-selection.js
diff --git a/quasar/src/components/table/table-sort.js b/ui/src/components/table/table-sort.js
similarity index 100%
rename from quasar/src/components/table/table-sort.js
rename to ui/src/components/table/table-sort.js
diff --git a/quasar/src/components/table/table-top.js b/ui/src/components/table/table-top.js
similarity index 100%
rename from quasar/src/components/table/table-top.js
rename to ui/src/components/table/table-top.js
diff --git a/quasar/src/components/table/table.styl b/ui/src/components/table/table.styl
similarity index 100%
rename from quasar/src/components/table/table.styl
rename to ui/src/components/table/table.styl
diff --git a/quasar/src/components/tabs/QRouteTab.js b/ui/src/components/tabs/QRouteTab.js
similarity index 100%
rename from quasar/src/components/tabs/QRouteTab.js
rename to ui/src/components/tabs/QRouteTab.js
diff --git a/quasar/src/components/tabs/QRouteTab.json b/ui/src/components/tabs/QRouteTab.json
similarity index 100%
rename from quasar/src/components/tabs/QRouteTab.json
rename to ui/src/components/tabs/QRouteTab.json
diff --git a/quasar/src/components/tabs/QTab.js b/ui/src/components/tabs/QTab.js
similarity index 100%
rename from quasar/src/components/tabs/QTab.js
rename to ui/src/components/tabs/QTab.js
diff --git a/quasar/src/components/tabs/QTab.json b/ui/src/components/tabs/QTab.json
similarity index 100%
rename from quasar/src/components/tabs/QTab.json
rename to ui/src/components/tabs/QTab.json
diff --git a/quasar/src/components/tabs/QTabs.js b/ui/src/components/tabs/QTabs.js
similarity index 100%
rename from quasar/src/components/tabs/QTabs.js
rename to ui/src/components/tabs/QTabs.js
diff --git a/quasar/src/components/tabs/QTabs.json b/ui/src/components/tabs/QTabs.json
similarity index 100%
rename from quasar/src/components/tabs/QTabs.json
rename to ui/src/components/tabs/QTabs.json
diff --git a/quasar/src/components/tabs/index.js b/ui/src/components/tabs/index.js
similarity index 100%
rename from quasar/src/components/tabs/index.js
rename to ui/src/components/tabs/index.js
diff --git a/quasar/src/components/tabs/tabs.styl b/ui/src/components/tabs/tabs.styl
similarity index 100%
rename from quasar/src/components/tabs/tabs.styl
rename to ui/src/components/tabs/tabs.styl
diff --git a/quasar/src/components/timeline/QTimeline.js b/ui/src/components/timeline/QTimeline.js
similarity index 100%
rename from quasar/src/components/timeline/QTimeline.js
rename to ui/src/components/timeline/QTimeline.js
diff --git a/quasar/src/components/timeline/QTimeline.json b/ui/src/components/timeline/QTimeline.json
similarity index 100%
rename from quasar/src/components/timeline/QTimeline.json
rename to ui/src/components/timeline/QTimeline.json
diff --git a/quasar/src/components/timeline/QTimelineEntry.js b/ui/src/components/timeline/QTimelineEntry.js
similarity index 100%
rename from quasar/src/components/timeline/QTimelineEntry.js
rename to ui/src/components/timeline/QTimelineEntry.js
diff --git a/quasar/src/components/timeline/QTimelineEntry.json b/ui/src/components/timeline/QTimelineEntry.json
similarity index 100%
rename from quasar/src/components/timeline/QTimelineEntry.json
rename to ui/src/components/timeline/QTimelineEntry.json
diff --git a/quasar/src/components/timeline/index.js b/ui/src/components/timeline/index.js
similarity index 100%
rename from quasar/src/components/timeline/index.js
rename to ui/src/components/timeline/index.js
diff --git a/quasar/src/components/timeline/timeline.styl b/ui/src/components/timeline/timeline.styl
similarity index 100%
rename from quasar/src/components/timeline/timeline.styl
rename to ui/src/components/timeline/timeline.styl
diff --git a/quasar/src/components/toggle/QToggle.js b/ui/src/components/toggle/QToggle.js
similarity index 100%
rename from quasar/src/components/toggle/QToggle.js
rename to ui/src/components/toggle/QToggle.js
diff --git a/quasar/src/components/toggle/QToggle.json b/ui/src/components/toggle/QToggle.json
similarity index 100%
rename from quasar/src/components/toggle/QToggle.json
rename to ui/src/components/toggle/QToggle.json
diff --git a/quasar/src/components/toggle/index.js b/ui/src/components/toggle/index.js
similarity index 100%
rename from quasar/src/components/toggle/index.js
rename to ui/src/components/toggle/index.js
diff --git a/quasar/src/components/toggle/toggle.styl b/ui/src/components/toggle/toggle.styl
similarity index 100%
rename from quasar/src/components/toggle/toggle.styl
rename to ui/src/components/toggle/toggle.styl
diff --git a/quasar/src/components/toolbar/QToolbar.js b/ui/src/components/toolbar/QToolbar.js
similarity index 100%
rename from quasar/src/components/toolbar/QToolbar.js
rename to ui/src/components/toolbar/QToolbar.js
diff --git a/quasar/src/components/toolbar/QToolbar.json b/ui/src/components/toolbar/QToolbar.json
similarity index 100%
rename from quasar/src/components/toolbar/QToolbar.json
rename to ui/src/components/toolbar/QToolbar.json
diff --git a/quasar/src/components/toolbar/QToolbarTitle.js b/ui/src/components/toolbar/QToolbarTitle.js
similarity index 100%
rename from quasar/src/components/toolbar/QToolbarTitle.js
rename to ui/src/components/toolbar/QToolbarTitle.js
diff --git a/quasar/src/components/toolbar/QToolbarTitle.json b/ui/src/components/toolbar/QToolbarTitle.json
similarity index 100%
rename from quasar/src/components/toolbar/QToolbarTitle.json
rename to ui/src/components/toolbar/QToolbarTitle.json
diff --git a/quasar/src/components/toolbar/index.js b/ui/src/components/toolbar/index.js
similarity index 100%
rename from quasar/src/components/toolbar/index.js
rename to ui/src/components/toolbar/index.js
diff --git a/quasar/src/components/toolbar/toolbar.styl b/ui/src/components/toolbar/toolbar.styl
similarity index 100%
rename from quasar/src/components/toolbar/toolbar.styl
rename to ui/src/components/toolbar/toolbar.styl
diff --git a/quasar/src/components/tooltip/QTooltip.js b/ui/src/components/tooltip/QTooltip.js
similarity index 100%
rename from quasar/src/components/tooltip/QTooltip.js
rename to ui/src/components/tooltip/QTooltip.js
diff --git a/quasar/src/components/tooltip/QTooltip.json b/ui/src/components/tooltip/QTooltip.json
similarity index 100%
rename from quasar/src/components/tooltip/QTooltip.json
rename to ui/src/components/tooltip/QTooltip.json
diff --git a/quasar/src/components/tooltip/index.js b/ui/src/components/tooltip/index.js
similarity index 100%
rename from quasar/src/components/tooltip/index.js
rename to ui/src/components/tooltip/index.js
diff --git a/quasar/src/components/tooltip/tooltip.styl b/ui/src/components/tooltip/tooltip.styl
similarity index 100%
rename from quasar/src/components/tooltip/tooltip.styl
rename to ui/src/components/tooltip/tooltip.styl
diff --git a/quasar/src/components/tree/QTree.js b/ui/src/components/tree/QTree.js
similarity index 100%
rename from quasar/src/components/tree/QTree.js
rename to ui/src/components/tree/QTree.js
diff --git a/quasar/src/components/tree/QTree.json b/ui/src/components/tree/QTree.json
similarity index 100%
rename from quasar/src/components/tree/QTree.json
rename to ui/src/components/tree/QTree.json
diff --git a/quasar/src/components/tree/index.js b/ui/src/components/tree/index.js
similarity index 100%
rename from quasar/src/components/tree/index.js
rename to ui/src/components/tree/index.js
diff --git a/quasar/src/components/tree/tree.styl b/ui/src/components/tree/tree.styl
similarity index 100%
rename from quasar/src/components/tree/tree.styl
rename to ui/src/components/tree/tree.styl
diff --git a/quasar/src/components/uploader/QUploader.js b/ui/src/components/uploader/QUploader.js
similarity index 100%
rename from quasar/src/components/uploader/QUploader.js
rename to ui/src/components/uploader/QUploader.js
diff --git a/quasar/src/components/uploader/QUploader.json b/ui/src/components/uploader/QUploader.json
similarity index 100%
rename from quasar/src/components/uploader/QUploader.json
rename to ui/src/components/uploader/QUploader.json
diff --git a/quasar/src/components/uploader/QUploaderBase.js b/ui/src/components/uploader/QUploaderBase.js
similarity index 100%
rename from quasar/src/components/uploader/QUploaderBase.js
rename to ui/src/components/uploader/QUploaderBase.js
diff --git a/quasar/src/components/uploader/index.js b/ui/src/components/uploader/index.js
similarity index 100%
rename from quasar/src/components/uploader/index.js
rename to ui/src/components/uploader/index.js
diff --git a/quasar/src/components/uploader/uploader-xhr-mixin.js b/ui/src/components/uploader/uploader-xhr-mixin.js
similarity index 100%
rename from quasar/src/components/uploader/uploader-xhr-mixin.js
rename to ui/src/components/uploader/uploader-xhr-mixin.js
diff --git a/quasar/src/components/uploader/uploader.styl b/ui/src/components/uploader/uploader.styl
similarity index 100%
rename from quasar/src/components/uploader/uploader.styl
rename to ui/src/components/uploader/uploader.styl
diff --git a/quasar/src/components/video/QVideo.js b/ui/src/components/video/QVideo.js
similarity index 100%
rename from quasar/src/components/video/QVideo.js
rename to ui/src/components/video/QVideo.js
diff --git a/quasar/src/components/video/QVideo.json b/ui/src/components/video/QVideo.json
similarity index 100%
rename from quasar/src/components/video/QVideo.json
rename to ui/src/components/video/QVideo.json
diff --git a/quasar/src/components/video/index.js b/ui/src/components/video/index.js
similarity index 100%
rename from quasar/src/components/video/index.js
rename to ui/src/components/video/index.js
diff --git a/quasar/src/components/video/video.styl b/ui/src/components/video/video.styl
similarity index 100%
rename from quasar/src/components/video/video.styl
rename to ui/src/components/video/video.styl
diff --git a/quasar/src/css/core/animations.styl b/ui/src/css/core/animations.styl
similarity index 100%
rename from quasar/src/css/core/animations.styl
rename to ui/src/css/core/animations.styl
diff --git a/quasar/src/css/core/colors.styl b/ui/src/css/core/colors.styl
similarity index 100%
rename from quasar/src/css/core/colors.styl
rename to ui/src/css/core/colors.styl
diff --git a/quasar/src/css/core/elevation.styl b/ui/src/css/core/elevation.styl
similarity index 100%
rename from quasar/src/css/core/elevation.styl
rename to ui/src/css/core/elevation.styl
diff --git a/quasar/src/css/core/flex.styl b/ui/src/css/core/flex.styl
similarity index 100%
rename from quasar/src/css/core/flex.styl
rename to ui/src/css/core/flex.styl
diff --git a/quasar/src/css/core/helpers.styl b/ui/src/css/core/helpers.styl
similarity index 100%
rename from quasar/src/css/core/helpers.styl
rename to ui/src/css/core/helpers.styl
diff --git a/quasar/src/css/core/mouse.styl b/ui/src/css/core/mouse.styl
similarity index 100%
rename from quasar/src/css/core/mouse.styl
rename to ui/src/css/core/mouse.styl
diff --git a/quasar/src/css/core/orientation.styl b/ui/src/css/core/orientation.styl
similarity index 100%
rename from quasar/src/css/core/orientation.styl
rename to ui/src/css/core/orientation.styl
diff --git a/quasar/src/css/core/positioning.styl b/ui/src/css/core/positioning.styl
similarity index 100%
rename from quasar/src/css/core/positioning.styl
rename to ui/src/css/core/positioning.styl
diff --git a/quasar/src/css/core/size.styl b/ui/src/css/core/size.styl
similarity index 100%
rename from quasar/src/css/core/size.styl
rename to ui/src/css/core/size.styl
diff --git a/quasar/src/css/core/touch.styl b/ui/src/css/core/touch.styl
similarity index 100%
rename from quasar/src/css/core/touch.styl
rename to ui/src/css/core/touch.styl
diff --git a/quasar/src/css/core/transitions.styl b/ui/src/css/core/transitions.styl
similarity index 100%
rename from quasar/src/css/core/transitions.styl
rename to ui/src/css/core/transitions.styl
diff --git a/quasar/src/css/core/typography.styl b/ui/src/css/core/typography.styl
similarity index 100%
rename from quasar/src/css/core/typography.styl
rename to ui/src/css/core/typography.styl
diff --git a/quasar/src/css/core/visibility.styl b/ui/src/css/core/visibility.styl
similarity index 100%
rename from quasar/src/css/core/visibility.styl
rename to ui/src/css/core/visibility.styl
diff --git a/quasar/src/css/critical.styl b/ui/src/css/critical.styl
similarity index 100%
rename from quasar/src/css/critical.styl
rename to ui/src/css/critical.styl
diff --git a/quasar/src/css/flex-addon.styl b/ui/src/css/flex-addon.styl
similarity index 100%
rename from quasar/src/css/flex-addon.styl
rename to ui/src/css/flex-addon.styl
diff --git a/quasar/src/css/index.styl b/ui/src/css/index.styl
similarity index 100%
rename from quasar/src/css/index.styl
rename to ui/src/css/index.styl
diff --git a/quasar/src/css/normalize.styl b/ui/src/css/normalize.styl
similarity index 100%
rename from quasar/src/css/normalize.styl
rename to ui/src/css/normalize.styl
diff --git a/quasar/src/css/variables.styl b/ui/src/css/variables.styl
similarity index 100%
rename from quasar/src/css/variables.styl
rename to ui/src/css/variables.styl
diff --git a/quasar/src/directives.js b/ui/src/directives.js
similarity index 100%
rename from quasar/src/directives.js
rename to ui/src/directives.js
diff --git a/quasar/src/directives/CloseDialog.js b/ui/src/directives/CloseDialog.js
similarity index 100%
rename from quasar/src/directives/CloseDialog.js
rename to ui/src/directives/CloseDialog.js
diff --git a/quasar/src/directives/CloseDialog.json b/ui/src/directives/CloseDialog.json
similarity index 100%
rename from quasar/src/directives/CloseDialog.json
rename to ui/src/directives/CloseDialog.json
diff --git a/quasar/src/directives/CloseMenu.js b/ui/src/directives/CloseMenu.js
similarity index 100%
rename from quasar/src/directives/CloseMenu.js
rename to ui/src/directives/CloseMenu.js
diff --git a/quasar/src/directives/CloseMenu.json b/ui/src/directives/CloseMenu.json
similarity index 100%
rename from quasar/src/directives/CloseMenu.json
rename to ui/src/directives/CloseMenu.json
diff --git a/quasar/src/directives/ClosePopup.js b/ui/src/directives/ClosePopup.js
similarity index 100%
rename from quasar/src/directives/ClosePopup.js
rename to ui/src/directives/ClosePopup.js
diff --git a/quasar/src/directives/ClosePopup.json b/ui/src/directives/ClosePopup.json
similarity index 100%
rename from quasar/src/directives/ClosePopup.json
rename to ui/src/directives/ClosePopup.json
diff --git a/quasar/src/directives/GoBack.js b/ui/src/directives/GoBack.js
similarity index 100%
rename from quasar/src/directives/GoBack.js
rename to ui/src/directives/GoBack.js
diff --git a/quasar/src/directives/GoBack.json b/ui/src/directives/GoBack.json
similarity index 100%
rename from quasar/src/directives/GoBack.json
rename to ui/src/directives/GoBack.json
diff --git a/quasar/src/directives/Ripple.js b/ui/src/directives/Ripple.js
similarity index 100%
rename from quasar/src/directives/Ripple.js
rename to ui/src/directives/Ripple.js
diff --git a/quasar/src/directives/Ripple.json b/ui/src/directives/Ripple.json
similarity index 100%
rename from quasar/src/directives/Ripple.json
rename to ui/src/directives/Ripple.json
diff --git a/quasar/src/directives/Scroll.js b/ui/src/directives/Scroll.js
similarity index 100%
rename from quasar/src/directives/Scroll.js
rename to ui/src/directives/Scroll.js
diff --git a/quasar/src/directives/Scroll.json b/ui/src/directives/Scroll.json
similarity index 100%
rename from quasar/src/directives/Scroll.json
rename to ui/src/directives/Scroll.json
diff --git a/quasar/src/directives/ScrollFire.js b/ui/src/directives/ScrollFire.js
similarity index 100%
rename from quasar/src/directives/ScrollFire.js
rename to ui/src/directives/ScrollFire.js
diff --git a/quasar/src/directives/ScrollFire.json b/ui/src/directives/ScrollFire.json
similarity index 100%
rename from quasar/src/directives/ScrollFire.json
rename to ui/src/directives/ScrollFire.json
diff --git a/quasar/src/directives/TouchHold.js b/ui/src/directives/TouchHold.js
similarity index 100%
rename from quasar/src/directives/TouchHold.js
rename to ui/src/directives/TouchHold.js
diff --git a/quasar/src/directives/TouchHold.json b/ui/src/directives/TouchHold.json
similarity index 100%
rename from quasar/src/directives/TouchHold.json
rename to ui/src/directives/TouchHold.json
diff --git a/quasar/src/directives/TouchPan.js b/ui/src/directives/TouchPan.js
similarity index 100%
rename from quasar/src/directives/TouchPan.js
rename to ui/src/directives/TouchPan.js
diff --git a/quasar/src/directives/TouchPan.json b/ui/src/directives/TouchPan.json
similarity index 100%
rename from quasar/src/directives/TouchPan.json
rename to ui/src/directives/TouchPan.json
diff --git a/quasar/src/directives/TouchRepeat.js b/ui/src/directives/TouchRepeat.js
similarity index 100%
rename from quasar/src/directives/TouchRepeat.js
rename to ui/src/directives/TouchRepeat.js
diff --git a/quasar/src/directives/TouchRepeat.json b/ui/src/directives/TouchRepeat.json
similarity index 100%
rename from quasar/src/directives/TouchRepeat.json
rename to ui/src/directives/TouchRepeat.json
diff --git a/quasar/src/directives/TouchSwipe.js b/ui/src/directives/TouchSwipe.js
similarity index 100%
rename from quasar/src/directives/TouchSwipe.js
rename to ui/src/directives/TouchSwipe.js
diff --git a/quasar/src/directives/TouchSwipe.json b/ui/src/directives/TouchSwipe.json
similarity index 100%
rename from quasar/src/directives/TouchSwipe.json
rename to ui/src/directives/TouchSwipe.json
diff --git a/quasar/src/directives/ripple.styl b/ui/src/directives/ripple.styl
similarity index 100%
rename from quasar/src/directives/ripple.styl
rename to ui/src/directives/ripple.styl
diff --git a/quasar/src/history.js b/ui/src/history.js
similarity index 100%
rename from quasar/src/history.js
rename to ui/src/history.js
diff --git a/quasar/src/icon-set.js b/ui/src/icon-set.js
similarity index 100%
rename from quasar/src/icon-set.js
rename to ui/src/icon-set.js
diff --git a/quasar/src/ie-compat/ie.js b/ui/src/ie-compat/ie.js
similarity index 100%
rename from quasar/src/ie-compat/ie.js
rename to ui/src/ie-compat/ie.js
diff --git a/quasar/src/ie-compat/ie.styl b/ui/src/ie-compat/ie.styl
similarity index 100%
rename from quasar/src/ie-compat/ie.styl
rename to ui/src/ie-compat/ie.styl
diff --git a/quasar/src/index.common.js b/ui/src/index.common.js
similarity index 100%
rename from quasar/src/index.common.js
rename to ui/src/index.common.js
diff --git a/quasar/src/index.esm.js b/ui/src/index.esm.js
similarity index 100%
rename from quasar/src/index.esm.js
rename to ui/src/index.esm.js
diff --git a/quasar/src/index.umd.js b/ui/src/index.umd.js
similarity index 100%
rename from quasar/src/index.umd.js
rename to ui/src/index.umd.js
diff --git a/quasar/src/install.js b/ui/src/install.js
similarity index 100%
rename from quasar/src/install.js
rename to ui/src/install.js
diff --git a/quasar/src/lang.js b/ui/src/lang.js
similarity index 100%
rename from quasar/src/lang.js
rename to ui/src/lang.js
diff --git a/quasar/src/mixins/align.js b/ui/src/mixins/align.js
similarity index 100%
rename from quasar/src/mixins/align.js
rename to ui/src/mixins/align.js
diff --git a/quasar/src/mixins/anchor.js b/ui/src/mixins/anchor.js
similarity index 100%
rename from quasar/src/mixins/anchor.js
rename to ui/src/mixins/anchor.js
diff --git a/quasar/src/mixins/anchor.json b/ui/src/mixins/anchor.json
similarity index 100%
rename from quasar/src/mixins/anchor.json
rename to ui/src/mixins/anchor.json
diff --git a/quasar/src/mixins/can-render.js b/ui/src/mixins/can-render.js
similarity index 100%
rename from quasar/src/mixins/can-render.js
rename to ui/src/mixins/can-render.js
diff --git a/quasar/src/mixins/checkbox.js b/ui/src/mixins/checkbox.js
similarity index 100%
rename from quasar/src/mixins/checkbox.js
rename to ui/src/mixins/checkbox.js
diff --git a/quasar/src/mixins/checkbox.json b/ui/src/mixins/checkbox.json
similarity index 100%
rename from quasar/src/mixins/checkbox.json
rename to ui/src/mixins/checkbox.json
diff --git a/quasar/src/mixins/fullscreen.js b/ui/src/mixins/fullscreen.js
similarity index 100%
rename from quasar/src/mixins/fullscreen.js
rename to ui/src/mixins/fullscreen.js
diff --git a/quasar/src/mixins/fullscreen.json b/ui/src/mixins/fullscreen.json
similarity index 100%
rename from quasar/src/mixins/fullscreen.json
rename to ui/src/mixins/fullscreen.json
diff --git a/quasar/src/mixins/mask.js b/ui/src/mixins/mask.js
similarity index 100%
rename from quasar/src/mixins/mask.js
rename to ui/src/mixins/mask.js
diff --git a/quasar/src/mixins/mask.json b/ui/src/mixins/mask.json
similarity index 100%
rename from quasar/src/mixins/mask.json
rename to ui/src/mixins/mask.json
diff --git a/quasar/src/mixins/model-toggle.js b/ui/src/mixins/model-toggle.js
similarity index 100%
rename from quasar/src/mixins/model-toggle.js
rename to ui/src/mixins/model-toggle.js
diff --git a/quasar/src/mixins/model-toggle.json b/ui/src/mixins/model-toggle.json
similarity index 100%
rename from quasar/src/mixins/model-toggle.json
rename to ui/src/mixins/model-toggle.json
diff --git a/quasar/src/mixins/panel-child.json b/ui/src/mixins/panel-child.json
similarity index 100%
rename from quasar/src/mixins/panel-child.json
rename to ui/src/mixins/panel-child.json
diff --git a/quasar/src/mixins/panel-parent.json b/ui/src/mixins/panel-parent.json
similarity index 100%
rename from quasar/src/mixins/panel-parent.json
rename to ui/src/mixins/panel-parent.json
diff --git a/quasar/src/mixins/panel.js b/ui/src/mixins/panel.js
similarity index 100%
rename from quasar/src/mixins/panel.js
rename to ui/src/mixins/panel.js
diff --git a/quasar/src/mixins/panel.styl b/ui/src/mixins/panel.styl
similarity index 100%
rename from quasar/src/mixins/panel.styl
rename to ui/src/mixins/panel.styl
diff --git a/quasar/src/mixins/portal.js b/ui/src/mixins/portal.js
similarity index 100%
rename from quasar/src/mixins/portal.js
rename to ui/src/mixins/portal.js
diff --git a/quasar/src/mixins/portal.json b/ui/src/mixins/portal.json
similarity index 100%
rename from quasar/src/mixins/portal.json
rename to ui/src/mixins/portal.json
diff --git a/quasar/src/mixins/prevent-scroll.js b/ui/src/mixins/prevent-scroll.js
similarity index 100%
rename from quasar/src/mixins/prevent-scroll.js
rename to ui/src/mixins/prevent-scroll.js
diff --git a/quasar/src/mixins/ripple.js b/ui/src/mixins/ripple.js
similarity index 100%
rename from quasar/src/mixins/ripple.js
rename to ui/src/mixins/ripple.js
diff --git a/quasar/src/mixins/ripple.json b/ui/src/mixins/ripple.json
similarity index 100%
rename from quasar/src/mixins/ripple.json
rename to ui/src/mixins/ripple.json
diff --git a/quasar/src/mixins/router-link.js b/ui/src/mixins/router-link.js
similarity index 100%
rename from quasar/src/mixins/router-link.js
rename to ui/src/mixins/router-link.js
diff --git a/quasar/src/mixins/router-link.json b/ui/src/mixins/router-link.json
similarity index 100%
rename from quasar/src/mixins/router-link.json
rename to ui/src/mixins/router-link.json
diff --git a/quasar/src/mixins/transition.js b/ui/src/mixins/transition.js
similarity index 100%
rename from quasar/src/mixins/transition.js
rename to ui/src/mixins/transition.js
diff --git a/quasar/src/mixins/validate.js b/ui/src/mixins/validate.js
similarity index 100%
rename from quasar/src/mixins/validate.js
rename to ui/src/mixins/validate.js
diff --git a/quasar/src/mixins/validate.json b/ui/src/mixins/validate.json
similarity index 100%
rename from quasar/src/mixins/validate.json
rename to ui/src/mixins/validate.json
diff --git a/quasar/src/plugins.js b/ui/src/plugins.js
similarity index 100%
rename from quasar/src/plugins.js
rename to ui/src/plugins.js
diff --git a/quasar/src/plugins/AddressbarColor.js b/ui/src/plugins/AddressbarColor.js
similarity index 100%
rename from quasar/src/plugins/AddressbarColor.js
rename to ui/src/plugins/AddressbarColor.js
diff --git a/quasar/src/plugins/AddressbarColor.json b/ui/src/plugins/AddressbarColor.json
similarity index 100%
rename from quasar/src/plugins/AddressbarColor.json
rename to ui/src/plugins/AddressbarColor.json
diff --git a/quasar/src/plugins/AppFullscreen.js b/ui/src/plugins/AppFullscreen.js
similarity index 100%
rename from quasar/src/plugins/AppFullscreen.js
rename to ui/src/plugins/AppFullscreen.js
diff --git a/quasar/src/plugins/AppFullscreen.json b/ui/src/plugins/AppFullscreen.json
similarity index 100%
rename from quasar/src/plugins/AppFullscreen.json
rename to ui/src/plugins/AppFullscreen.json
diff --git a/quasar/src/plugins/AppVisibility.js b/ui/src/plugins/AppVisibility.js
similarity index 100%
rename from quasar/src/plugins/AppVisibility.js
rename to ui/src/plugins/AppVisibility.js
diff --git a/quasar/src/plugins/AppVisibility.json b/ui/src/plugins/AppVisibility.json
similarity index 100%
rename from quasar/src/plugins/AppVisibility.json
rename to ui/src/plugins/AppVisibility.json
diff --git a/quasar/src/plugins/BottomSheet.js b/ui/src/plugins/BottomSheet.js
similarity index 100%
rename from quasar/src/plugins/BottomSheet.js
rename to ui/src/plugins/BottomSheet.js
diff --git a/quasar/src/plugins/BottomSheet.json b/ui/src/plugins/BottomSheet.json
similarity index 100%
rename from quasar/src/plugins/BottomSheet.json
rename to ui/src/plugins/BottomSheet.json
diff --git a/quasar/src/plugins/Cookies.js b/ui/src/plugins/Cookies.js
similarity index 100%
rename from quasar/src/plugins/Cookies.js
rename to ui/src/plugins/Cookies.js
diff --git a/quasar/src/plugins/Cookies.json b/ui/src/plugins/Cookies.json
similarity index 100%
rename from quasar/src/plugins/Cookies.json
rename to ui/src/plugins/Cookies.json
diff --git a/quasar/src/plugins/Dialog.js b/ui/src/plugins/Dialog.js
similarity index 100%
rename from quasar/src/plugins/Dialog.js
rename to ui/src/plugins/Dialog.js
diff --git a/quasar/src/plugins/Dialog.json b/ui/src/plugins/Dialog.json
similarity index 100%
rename from quasar/src/plugins/Dialog.json
rename to ui/src/plugins/Dialog.json
diff --git a/quasar/src/plugins/Loading.js b/ui/src/plugins/Loading.js
similarity index 100%
rename from quasar/src/plugins/Loading.js
rename to ui/src/plugins/Loading.js
diff --git a/quasar/src/plugins/Loading.json b/ui/src/plugins/Loading.json
similarity index 100%
rename from quasar/src/plugins/Loading.json
rename to ui/src/plugins/Loading.json
diff --git a/quasar/src/plugins/LoadingBar.js b/ui/src/plugins/LoadingBar.js
similarity index 100%
rename from quasar/src/plugins/LoadingBar.js
rename to ui/src/plugins/LoadingBar.js
diff --git a/quasar/src/plugins/LoadingBar.json b/ui/src/plugins/LoadingBar.json
similarity index 100%
rename from quasar/src/plugins/LoadingBar.json
rename to ui/src/plugins/LoadingBar.json
diff --git a/quasar/src/plugins/LocalStorage.js b/ui/src/plugins/LocalStorage.js
similarity index 100%
rename from quasar/src/plugins/LocalStorage.js
rename to ui/src/plugins/LocalStorage.js
diff --git a/quasar/src/plugins/LocalStorage.json b/ui/src/plugins/LocalStorage.json
similarity index 100%
rename from quasar/src/plugins/LocalStorage.json
rename to ui/src/plugins/LocalStorage.json
diff --git a/quasar/src/plugins/Meta.js b/ui/src/plugins/Meta.js
similarity index 100%
rename from quasar/src/plugins/Meta.js
rename to ui/src/plugins/Meta.js
diff --git a/quasar/src/plugins/Meta.json b/ui/src/plugins/Meta.json
similarity index 100%
rename from quasar/src/plugins/Meta.json
rename to ui/src/plugins/Meta.json
diff --git a/quasar/src/plugins/Notify.js b/ui/src/plugins/Notify.js
similarity index 100%
rename from quasar/src/plugins/Notify.js
rename to ui/src/plugins/Notify.js
diff --git a/quasar/src/plugins/Notify.json b/ui/src/plugins/Notify.json
similarity index 100%
rename from quasar/src/plugins/Notify.json
rename to ui/src/plugins/Notify.json
diff --git a/quasar/src/plugins/Platform.js b/ui/src/plugins/Platform.js
similarity index 100%
rename from quasar/src/plugins/Platform.js
rename to ui/src/plugins/Platform.js
diff --git a/quasar/src/plugins/Platform.json b/ui/src/plugins/Platform.json
similarity index 100%
rename from quasar/src/plugins/Platform.json
rename to ui/src/plugins/Platform.json
diff --git a/quasar/src/plugins/Screen.js b/ui/src/plugins/Screen.js
similarity index 100%
rename from quasar/src/plugins/Screen.js
rename to ui/src/plugins/Screen.js
diff --git a/quasar/src/plugins/Screen.json b/ui/src/plugins/Screen.json
similarity index 100%
rename from quasar/src/plugins/Screen.json
rename to ui/src/plugins/Screen.json
diff --git a/quasar/src/plugins/SessionStorage.js b/ui/src/plugins/SessionStorage.js
similarity index 100%
rename from quasar/src/plugins/SessionStorage.js
rename to ui/src/plugins/SessionStorage.js
diff --git a/quasar/src/plugins/SessionStorage.json b/ui/src/plugins/SessionStorage.json
similarity index 100%
rename from quasar/src/plugins/SessionStorage.json
rename to ui/src/plugins/SessionStorage.json
diff --git a/quasar/src/plugins/loading.styl b/ui/src/plugins/loading.styl
similarity index 100%
rename from quasar/src/plugins/loading.styl
rename to ui/src/plugins/loading.styl
diff --git a/quasar/src/plugins/notify.styl b/ui/src/plugins/notify.styl
similarity index 100%
rename from quasar/src/plugins/notify.styl
rename to ui/src/plugins/notify.styl
diff --git a/quasar/src/polyfills.js b/ui/src/polyfills.js
similarity index 100%
rename from quasar/src/polyfills.js
rename to ui/src/polyfills.js
diff --git a/quasar/src/ssr-update.js b/ui/src/ssr-update.js
similarity index 100%
rename from quasar/src/ssr-update.js
rename to ui/src/ssr-update.js
diff --git a/quasar/src/utils.js b/ui/src/utils.js
similarity index 100%
rename from quasar/src/utils.js
rename to ui/src/utils.js
diff --git a/quasar/src/utils/clone.js b/ui/src/utils/clone.js
similarity index 100%
rename from quasar/src/utils/clone.js
rename to ui/src/utils/clone.js
diff --git a/quasar/src/utils/colors.js b/ui/src/utils/colors.js
similarity index 100%
rename from quasar/src/utils/colors.js
rename to ui/src/utils/colors.js
diff --git a/quasar/src/utils/date.js b/ui/src/utils/date.js
similarity index 100%
rename from quasar/src/utils/date.js
rename to ui/src/utils/date.js
diff --git a/quasar/src/utils/debounce.js b/ui/src/utils/debounce.js
similarity index 100%
rename from quasar/src/utils/debounce.js
rename to ui/src/utils/debounce.js
diff --git a/quasar/src/utils/dom.js b/ui/src/utils/dom.js
similarity index 100%
rename from quasar/src/utils/dom.js
rename to ui/src/utils/dom.js
diff --git a/quasar/src/utils/escape-key.js b/ui/src/utils/escape-key.js
similarity index 100%
rename from quasar/src/utils/escape-key.js
rename to ui/src/utils/escape-key.js
diff --git a/quasar/src/utils/event.js b/ui/src/utils/event.js
similarity index 100%
rename from quasar/src/utils/event.js
rename to ui/src/utils/event.js
diff --git a/quasar/src/utils/extend.js b/ui/src/utils/extend.js
similarity index 100%
rename from quasar/src/utils/extend.js
rename to ui/src/utils/extend.js
diff --git a/quasar/src/utils/format.js b/ui/src/utils/format.js
similarity index 100%
rename from quasar/src/utils/format.js
rename to ui/src/utils/format.js
diff --git a/quasar/src/utils/frame-debounce.js b/ui/src/utils/frame-debounce.js
similarity index 100%
rename from quasar/src/utils/frame-debounce.js
rename to ui/src/utils/frame-debounce.js
diff --git a/quasar/src/utils/global-dialog.js b/ui/src/utils/global-dialog.js
similarity index 100%
rename from quasar/src/utils/global-dialog.js
rename to ui/src/utils/global-dialog.js
diff --git a/quasar/src/utils/global-dialog.json b/ui/src/utils/global-dialog.json
similarity index 100%
rename from quasar/src/utils/global-dialog.json
rename to ui/src/utils/global-dialog.json
diff --git a/quasar/src/utils/is.js b/ui/src/utils/is.js
similarity index 100%
rename from quasar/src/utils/is.js
rename to ui/src/utils/is.js
diff --git a/quasar/src/utils/open-url.js b/ui/src/utils/open-url.js
similarity index 100%
rename from quasar/src/utils/open-url.js
rename to ui/src/utils/open-url.js
diff --git a/quasar/src/utils/patterns.js b/ui/src/utils/patterns.js
similarity index 100%
rename from quasar/src/utils/patterns.js
rename to ui/src/utils/patterns.js
diff --git a/quasar/src/utils/position-engine.js b/ui/src/utils/position-engine.js
similarity index 100%
rename from quasar/src/utils/position-engine.js
rename to ui/src/utils/position-engine.js
diff --git a/quasar/src/utils/router.js b/ui/src/utils/router.js
similarity index 100%
rename from quasar/src/utils/router.js
rename to ui/src/utils/router.js
diff --git a/quasar/src/utils/scroll.js b/ui/src/utils/scroll.js
similarity index 100%
rename from quasar/src/utils/scroll.js
rename to ui/src/utils/scroll.js
diff --git a/quasar/src/utils/selection.js b/ui/src/utils/selection.js
similarity index 100%
rename from quasar/src/utils/selection.js
rename to ui/src/utils/selection.js
diff --git a/quasar/src/utils/slot.js b/ui/src/utils/slot.js
similarity index 100%
rename from quasar/src/utils/slot.js
rename to ui/src/utils/slot.js
diff --git a/quasar/src/utils/sort.js b/ui/src/utils/sort.js
similarity index 100%
rename from quasar/src/utils/sort.js
rename to ui/src/utils/sort.js
diff --git a/quasar/src/utils/throttle.js b/ui/src/utils/throttle.js
similarity index 100%
rename from quasar/src/utils/throttle.js
rename to ui/src/utils/throttle.js
diff --git a/quasar/src/utils/touch-observer.js b/ui/src/utils/touch-observer.js
similarity index 100%
rename from quasar/src/utils/touch-observer.js
rename to ui/src/utils/touch-observer.js
diff --git a/quasar/src/utils/uid.js b/ui/src/utils/uid.js
similarity index 100%
rename from quasar/src/utils/uid.js
rename to ui/src/utils/uid.js
diff --git a/quasar/src/utils/vm.js b/ui/src/utils/vm.js
similarity index 100%
rename from quasar/src/utils/vm.js
rename to ui/src/utils/vm.js
diff --git a/quasar/src/utils/web-storage.js b/ui/src/utils/web-storage.js
similarity index 100%
rename from quasar/src/utils/web-storage.js
rename to ui/src/utils/web-storage.js
diff --git a/quasar/src/utils/web-storage.json b/ui/src/utils/web-storage.json
similarity index 100%
rename from quasar/src/utils/web-storage.json
rename to ui/src/utils/web-storage.json
diff --git a/quasar/src/vue-plugin.js b/ui/src/vue-plugin.js
similarity index 100%
rename from quasar/src/vue-plugin.js
rename to ui/src/vue-plugin.js
diff --git a/quasar/types/tsconfig.json b/ui/types/tsconfig.json
similarity index 100%
rename from quasar/types/tsconfig.json
rename to ui/types/tsconfig.json
diff --git a/quasar/types/typings.json b/ui/types/typings.json
similarity index 100%
rename from quasar/types/typings.json
rename to ui/types/typings.json
diff --git a/quasar/types/utils.d.ts b/ui/types/utils.d.ts
similarity index 100%
rename from quasar/types/utils.d.ts
rename to ui/types/utils.d.ts
diff --git a/quasar/types/utils/colors.d.ts b/ui/types/utils/colors.d.ts
similarity index 100%
rename from quasar/types/utils/colors.d.ts
rename to ui/types/utils/colors.d.ts
diff --git a/quasar/types/utils/date.d.ts b/ui/types/utils/date.d.ts
similarity index 100%
rename from quasar/types/utils/date.d.ts
rename to ui/types/utils/date.d.ts
diff --git a/quasar/types/utils/dom.d.ts b/ui/types/utils/dom.d.ts
similarity index 100%
rename from quasar/types/utils/dom.d.ts
rename to ui/types/utils/dom.d.ts
diff --git a/quasar/types/utils/event.d.ts b/ui/types/utils/event.d.ts
similarity index 100%
rename from quasar/types/utils/event.d.ts
rename to ui/types/utils/event.d.ts
diff --git a/quasar/types/utils/format.d.ts b/ui/types/utils/format.d.ts
similarity index 100%
rename from quasar/types/utils/format.d.ts
rename to ui/types/utils/format.d.ts
diff --git a/quasar/types/utils/scroll.d.ts b/ui/types/utils/scroll.d.ts
similarity index 100%
rename from quasar/types/utils/scroll.d.ts
rename to ui/types/utils/scroll.d.ts
diff --git a/quasar/types/vue.d.ts b/ui/types/vue.d.ts
similarity index 100%
rename from quasar/types/vue.d.ts
rename to ui/types/vue.d.ts
diff --git a/quasar/yarn.lock b/ui/yarn.lock
similarity index 100%
rename from quasar/yarn.lock
rename to ui/yarn.lock
|
501958d69de23a254c5601c3126aa151146563ce
|
2021-06-16 19:58:36
|
Razvan Stoenescu
|
feat(docs): Update floating-action-button.md #9696
| false
|
Update floating-action-button.md #9696
|
feat
|
diff --git a/docs/src/pages/vue-components/floating-action-button.md b/docs/src/pages/vue-components/floating-action-button.md
index 774c90c89a3..7ef1c02568c 100644
--- a/docs/src/pages/vue-components/floating-action-button.md
+++ b/docs/src/pages/vue-components/floating-action-button.md
@@ -20,7 +20,7 @@ Note that you don’t need a QLayout to use FABs.
There are two types of FABs: expandable (has sub-actions) and non-expandable.
:::tip
-For an exhausting list of options, please read the API cards (at the bottom of this page).
+For an exhausting list of options, please read the API cards (at the top of this page).
:::
### Non-Expandable
|
fe97b34510b862db90b15f0a8e293e5052e1c3e2
|
2018-05-17 15:06:07
|
Razvan Stoenescu
|
chore: Update backers
| false
|
Update backers
|
chore
|
diff --git a/backers.md b/backers.md
index 7caa049ebd1..20158626e33 100644
--- a/backers.md
+++ b/backers.md
@@ -108,6 +108,7 @@ You can join them in supporting Quasar development by [pledging on Patreon](http
- Tanner Faulkner
- Luca Borghini
- Christian Kyony
+- Talles Dantas
- Ken ($5)
- Oliver ($5)
|
54bf3372e30d50d4372a1aa6309826bd0c3ce117
|
2018-02-01 02:41:54
|
Razvan Stoenescu
|
chore: Update backers
| false
|
Update backers
|
chore
|
diff --git a/backers.md b/backers.md
index 4653308453c..4598279db1a 100644
--- a/backers.md
+++ b/backers.md
@@ -2,7 +2,7 @@ Quasar Framework is an MIT licensed open source project and completely free to u
## Platinum sponsor:
-[](http://truelogic.com)
+[](http://truelogic.com)
# Backers
@@ -10,23 +10,23 @@ You can join them in supporting Quasar development by [pledging on Patreon](http
### $500
-It could be you or your company!
+<a href="http://campuscloudservices.com/" target="_blank"><img src="https://cdn.rawgit.com/rstoenescu/quasar-backers-logo/a579cb37/campus-cloud-services.png" width="350px"></a>
---
### $250
-<a href="https://www.jugglestreet.com.au/" target="_blank"><img src="https://web.jugglestreet.com/images/header-logo-banner.png" width="200px"></a>
+<a href="https://www.jugglestreet.com.au/" target="_blank"><img src="https://cdn.rawgit.com/rstoenescu/quasar-backers-logo/a579cb37/juggle-street.png" width="200px"></a>
---
### $100+
-<a href="http://comcomservices.com/" target="_blank"><img src="http://comcomservices.com/wp-content/uploads/2016/03/Final-ComComLogo.png" width="200px"></a>
+<a href="http://comcomservices.com/" target="_blank"><img src="https://cdn.rawgit.com/rstoenescu/quasar-backers-logo/a579cb37/com-com-services.png" width="200px"></a>
- Adrien M
-<a href="http://www.kalisio.com/" target="_blank"><img src="https://raw.githubusercontent.com/kalisio/kdk/master/images/kalisio-banner-250x96.png" width="200px"></a>
+<a href="http://www.kalisio.com/" target="_blank"><img src="https://cdn.rawgit.com/rstoenescu/quasar-backers-logo/a579cb37/kalisio.png" width="200px"></a>
---
|
f2826c0dc26e37b563575d816e637ecf330f42f5
|
2022-06-22 04:52:24
|
Razvan Stoenescu
|
chore(QScrollArea): refactor latest changes #13738 (#13748)
| false
|
refactor latest changes #13738 (#13748)
|
chore
|
diff --git a/ui/src/components/scroll-area/QScrollArea.js b/ui/src/components/scroll-area/QScrollArea.js
index 1e4278eca0a..ad2b9373ca0 100644
--- a/ui/src/components/scroll-area/QScrollArea.js
+++ b/ui/src/components/scroll-area/QScrollArea.js
@@ -13,14 +13,6 @@ import { setVerticalScrollPosition, setHorizontalScrollPosition } from '../../ut
import { hMergeSlot } from '../../utils/private/render.js'
import debounce from '../../utils/debounce.js'
-const getMinThumbSize = size => {
- if (size >= 250) {
- return 50
- }
-
- return Math.ceil(size / 5)
-}
-
const axisList = [ 'vertical', 'horizontal' ]
const dirProps = {
vertical: { offset: 'offsetY', scroll: 'scrollTop', dir: 'down', dist: 'y' },
@@ -32,6 +24,8 @@ const panOpts = {
mouseAllDir: true
}
+const getMinThumbSize = size => (size >= 250 ? 50 : Math.ceil(size / 5))
+
export default createComponent({
name: 'QScrollArea',
|
866f3f385135529e8a6a0abc41cc6043ab448a3a
|
2019-02-12 15:05:59
|
Razvan Stoenescu
|
fix(quasar): "en-uk" language pack should be "en-gb" #3226
| false
|
"en-uk" language pack should be "en-gb" #3226
|
fix
|
diff --git a/quasar/lang/en-uk.js b/quasar/lang/en-gb.js
similarity index 99%
rename from quasar/lang/en-uk.js
rename to quasar/lang/en-gb.js
index 01c94e1c716..ebea17fac42 100644
--- a/quasar/lang/en-uk.js
+++ b/quasar/lang/en-gb.js
@@ -1,5 +1,5 @@
export default {
- isoName: 'en-uk',
+ isoName: 'en-gb',
nativeName: 'English (UK)',
label: {
clear: 'Clear',
|
71bb8543db8ad449af2a3a53237f09d4d225fa7b
|
2024-11-20 23:38:54
|
Yusuf Kandemir
|
docs(app-vite): improve upgrade steps regarding postcss/eslint configuration
| false
|
improve upgrade steps regarding postcss/eslint configuration
|
docs
|
diff --git a/docs/src/pages/quasar-cli-vite/upgrade-guide.md b/docs/src/pages/quasar-cli-vite/upgrade-guide.md
index c5871cfa38c..768cfe6156a 100644
--- a/docs/src/pages/quasar-cli-vite/upgrade-guide.md
+++ b/docs/src/pages/quasar-cli-vite/upgrade-guide.md
@@ -138,7 +138,9 @@ Preparations:
```
<br>
- Remember to convert to ESM the `postcss.config.js` file should you use it. Also, rename `.eslintrc.js` to `.eslintrc.cjs` (with no change to its content).
+ Rename `postcss.config.js` to `postcss.config.mjs` and convert it to ESM, if it's not already in ESM format.
+ Rename `.eslintrc.js` to `.eslintrc.cjs`, if it's not already have the `.cjs` extension.
+
<br>
* You might want to add the following to your `/.gitignore` file. The `/quasar.config.*.temporary.compiled*` entry refers to files that are left for inspection purposes when something fails with your `/quasar.config` file (and can be removed by the `quasar clean` command):
@@ -181,6 +183,18 @@ Preparations:
<br>
+ * If you have linting, please review your `/.eslintignore` file as well:
+
+ ```bash [highlight=6-7] /.eslintignore
+ /dist
+ /src-capacitor
+ /src-cordova
+ /.quasar
+ /node_modules
+ .eslintrc.cjs
+ /quasar.config.*.temporary.compiled*
+ ```
+
Update `/quasar.config file > bex` section to satisfy the types, regardless if you use BEX or not. If you are using BEX, please see the [BEX section below](#bex-mode-changes) for more details.
```diff /quasar.config file
|
20ec0aaedf0a8241f5f6604b83a69f089efd6762
|
2020-05-30 06:12:15
|
Razvan Stoenescu
|
fix(icongenie): icon list for electron
| false
|
icon list for electron
|
fix
|
diff --git a/icongenie/lib/modes/electron.js b/icongenie/lib/modes/electron.js
index 971f5dcbc7b..d5494546141 100644
--- a/icongenie/lib/modes/electron.js
+++ b/icongenie/lib/modes/electron.js
@@ -16,7 +16,7 @@ module.exports = [
{
// linux
generator: 'png',
- name: 'icon.png',
+ name: 'linux-512x512.png',
folder: 'src-electron/icons',
sizes: [ 512 ]
}
|
f45ba43124c5416cfad377f70f0fe1fbc084b291
|
2019-12-06 21:36:45
|
webnoob
|
feat(bex): Add documentation for bex mode #76 (#5812)
| false
|
Add documentation for bex mode #76 (#5812)
|
feat
|
diff --git a/docs/src/assets/menu.js b/docs/src/assets/menu.js
index 1aff33aabf1..42a038a7028 100644
--- a/docs/src/assets/menu.js
+++ b/docs/src/assets/menu.js
@@ -416,6 +416,50 @@ const cli = [
}
]
},
+ {
+ name: 'Developing Browser Extensions',
+ path: 'developing-browser-extensions',
+ children: [
+ {
+ name: 'Introduction',
+ path: 'introduction'
+ },
+ {
+ name: 'Preparation',
+ path: 'preparation'
+ },
+ {
+ name: 'Configuring BEX',
+ path: 'configuring-bex'
+ },
+ {
+ name: 'Types',
+ path: 'types'
+ },
+ {
+ name: 'Communication / Events',
+ path: 'communication',
+ children: [
+ {
+ name: 'Introduction',
+ path: 'introduction'
+ },
+ {
+ name: 'Background Hooks',
+ path: 'background-hooks'
+ },
+ {
+ name: 'Content Hooks',
+ path: 'content-hooks'
+ },
+ {
+ name: 'DOM Hooks',
+ path: 'dom-hooks'
+ }
+ ]
+ }
+ ]
+ },
{
name: 'Ajax Requests',
path: 'ajax-requests'
diff --git a/docs/src/pages/quasar-cli/developing-browser-extensions/communication/background-hooks.md b/docs/src/pages/quasar-cli/developing-browser-extensions/communication/background-hooks.md
new file mode 100644
index 00000000000..af3de027534
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-browser-extensions/communication/background-hooks.md
@@ -0,0 +1,60 @@
+---
+title: Background Hooks
+desc: How to communicate using your background script with other parts of your BEX.
+---
+
+`src-bex/js/background-hooks.js` is essentially a standard [background script](https://developer.chrome.com/extensions/background_pages) and you are
+welcome to use it as such. Background scripts can communicate with **all** Web Pages, Dev Tools, Options and Popups running
+under your BEX.
+
+The added benefit of this file is this function:
+
+```js
+export default function attachBackgroundHooks (bridge, activeConnections) {
+}
+```
+
+This function is called automatically via the Quasar BEX build chain and injects a bridge which is shared between all
+parts of the BEX meaning you can communicate with any part of your BEX.
+
+The `bridge` param is the bridge to use for communication. The `activeConnections` param provides an array of all the
+BEX connections registered via the bridge i.e All the Web Page, Options, Popup and Dev Tools BEX's used by the same Quasar
+App.
+
+For example, let's say we want to listen for a new tab being opened in the web browser and then react to it in our Quasar
+App. First, we'd need to listen for the new tab being opened and emit a new event to tell the Quasar App this has happened:
+
+```js
+chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
+ bridge.send('bex.tab.opened', { url: tab.url })
+})
+```
+
+Then in our Quasar App, we'd listen for this in one of our component lifecycle hooks, like so:
+
+```js
+export default {
+ methods: {
+ // Our function which receives the URL sent by the background script.
+ doOnTabOpened (url) {
+ console.log('New Browser Tab Openend: ', url)
+ }
+ },
+
+ created () {
+ // Add our listener
+ this.$q.bex.on('bex.tab.opened', this.doOnTabOpened)
+ },
+
+ beforeDestroy () {
+ // Don't forget to clean it up
+ this.$q.bex.off('bex.tab.opened', this.doOnTabOpened)
+ }
+}
+```
+
+There are wide variety of events available to the chrome background script - Google is your friend if you're trying to
+do something in this area.
+
+What if you want to modify the underlying web page content in some way? That's where we'd use `content-hooks.js`. Let's
+look at that in the next section.
diff --git a/docs/src/pages/quasar-cli/developing-browser-extensions/communication/content-hooks.md b/docs/src/pages/quasar-cli/developing-browser-extensions/communication/content-hooks.md
new file mode 100644
index 00000000000..f5edbddb6c1
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-browser-extensions/communication/content-hooks.md
@@ -0,0 +1,68 @@
+---
+title: Content Hooks
+desc: How to communicate using your content script with your Quasar App and Background Script.
+---
+
+`src-bex/js/content-hooks.js` is essentially a standard [content script](https://developer.chrome.com/extensions/content_scripts) and you are
+welcome to use it as such. Content scripts are able to access the DOM of the underlying webpage and thus you are able to
+manipulate the content of said page.
+
+The added benefit of this file is this function:
+
+```js
+export default function attachContentHooks (bridge) {
+}
+```
+
+This function is called automatically via the Quasar BEX build chain and injects a bridge which is shared between your
+Quasar App instance and the background script of the BEX.
+
+For example, let's say we want to react to a button being pressed on our Quasar App and highlight some text on the underlying
+web page, this would be done via the content scripts like so:
+
+Quasar App
+```js
+methods: {
+ myButtonClickHandler () {
+ this.$q.bex.send('highlight.content.event', { someData: 'someValue '}).then(r => {
+ console.log('Text has been highlighted')
+ })
+ }
+}
+```
+
+`src-bex/css/content-css.css`
+```css
+.bex-highlight {
+ background-color: red;
+}
+```
+
+`src-bex/js/content-hooks.js`
+```js
+export default function attachContentHooks (bridge) {
+ bridge.on('highlight.content.event', event => {
+ // Find a .some-class element and add our highlight CSS class.
+ const el = document.querySelector('.some-class')
+ if (el !== void 0) {
+ el.addClass('bex-highlight')
+ }
+
+ // Not required but resolve our promise.
+ bridge.send(event.responseKey)
+ }
+}
+```
+
+Content scripts live in an [isolated world](https://developer.chrome.com/extensions/content_scripts#isolated_world),
+allowing a content script to makes changes to its JavaScript environment without conflicting with the page or additional
+content scripts.
+
+Isolated worlds do not allow for content scripts, the extension, and the web page to access any variables or functions
+created by the others. This also gives content scripts the ability to enable functionality that should not be accessible
+to the web page.
+
+This is where `dom-hooks` come in.
+
+
+
diff --git a/docs/src/pages/quasar-cli/developing-browser-extensions/communication/dom-hooks.md b/docs/src/pages/quasar-cli/developing-browser-extensions/communication/dom-hooks.md
new file mode 100644
index 00000000000..14fd5137385
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-browser-extensions/communication/dom-hooks.md
@@ -0,0 +1,84 @@
+---
+title: DOM Hooks
+desc: How to communicate to the underlying web page using from .
+---
+
+`src-bex/js/dom-hooks.js` is a javascript file that is injected into the underlying web page automatically by Quasar but
+as with all the other hook files has access to the bridge via:
+
+```js
+export default function attachDomHooks (bridge) {
+}
+```
+
+If you ever find yourself needing to inject a JS file into your underlying web page, you can use dom hooks instead as it
+means you can maintain that chain of communication in the BEX.
+
+For example, lets say you wanted to write a BEX that detects whether or not a Quasar app is running on a page, the only
+way to do this is by running some javascript in the context of the web page.
+
+`detect-quasar.js`
+```js
+function initQuasar (bridge, quasarInstance) {
+ bridge.send('quasar.detect', {
+ version: quasarInstance.version,
+ dark: {
+ isActive: quasarInstance.dark ? quasarInstance.dark.isActive : void 0
+ },
+ umd: quasarInstance.umd,
+ iconSet: {
+ name: quasarInstance.iconSet.name,
+ __installed: quasarInstance.iconSet.__installed
+ },
+ lang: {
+ rtl: quasarInstance.lang.rtl
+ }
+ })
+ window.__QUASAR_DEVTOOLS__ = {
+ Quasar: quasarInstance
+ }
+}
+
+export default function detectQuasar (bridge) {
+ if (window.Quasar) { // UMD
+ initQuasar(bridge, {
+ version: window.Quasar.version,
+ dark: window.Quasar.Dark,
+ ...window.Quasar,
+ umd: true
+ })
+ } else { // CLI
+ setTimeout(() => {
+ const all = document.querySelectorAll('*')
+ let el
+ for (let i = 0; i < all.length; i++) {
+ if (all[i].__vue__) {
+ el = all[i]
+ break
+ }
+ }
+
+ if (el) {
+ let Vue = Object.getPrototypeOf(el.__vue__).constructor
+ while (Vue.super) {
+ Vue = Vue.super
+ }
+ if (Vue.prototype.$q) {
+ initQuasar(bridge, Vue.prototype.$q)
+ }
+ }
+ }, 100)
+ }
+}
+```
+
+`dom-hooks.js`
+```js
+import detectQuasar from './dom/detect-quasar'
+export default function attachDomHooks (bridge) {
+ detectQuasar(bridge)
+}
+```
+
+The bridge above will notify all listeners in the BEX that Quasar has been found and along with that send the insatnce
+information.
diff --git a/docs/src/pages/quasar-cli/developing-browser-extensions/communication/introduction.md b/docs/src/pages/quasar-cli/developing-browser-extensions/communication/introduction.md
new file mode 100644
index 00000000000..b81b73c5412
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-browser-extensions/communication/introduction.md
@@ -0,0 +1,75 @@
+---
+title: BEX Communication
+desc: How to communicate between different parts of your BEX.
+---
+Allowing a Quasar App to communicate with the various parts of the BEX is essential. Quasar closes this gap using a `bridge`.
+
+There are 4 areas in a BEX which will need a communication layer:
+
+1. The Quasar App itself - this is true for all types of BEX i.e Popup, Options Page, Dev Tools or Web Page
+2. Background Script
+3. Content Script
+4. The web page the BEX is running on
+
+## Communication Rules
+
+There is a fundamental rule to understand with the communication bridge in Quasar.
+
+**Not all BEX types have a content script** - Only BEX which run in the context of a web page will have a content script. This
+is how browser extensions in general work. This means if you're adding a listener for an event on a content script and trying
+to trigger it from a Quasar BEX running as Dev Tools, Options Page or Popup - **it won't work**.
+
+If you want to allow your Dev Tools, Popup or Options Page BEX to communicate with a web page, you will need to use the
+background script as a proxy. You would do this by:
+
+1. Adding a listener on the background script which in turn emits another event.
+2. Add a listener to your Quasar App running in the Web Page context which listens for the event the background script is
+raising
+2. Emitting the event to your background script from your Dev Tools, Popup or Options Page.
+
+Once you get your head around this concept, there are no limits to how the BEX can communicate with each part.
+
+## The Bridge
+
+The bridge is a promise based event system which is shared between all parts of the BEX and as such allows you to listen
+for events in your Quasar App, emit them from other parts or vice versa. This is what gives Quasar BEX mode it's power.
+
+To access the bridge from within your Quasar App you can use `this.$q.bex`. In other areas, the bridge is made available
+via the `bridge` parameter in the respective hook files.
+
+Let's see how it works.
+
+### Trigger an event and wait for the response
+```js
+bridge.send('some.event', { someKey: 'aValue' }).then(response => {
+ console.log('Some response from the other side')
+})
+```
+
+### Listen for an event and sending a response
+```js
+bridge.on('some.event', event => {
+ console.log('Event Receieved, responding ...')
+ bridge.send(event.responseKey)
+})
+```
+
+### Clean up your listeners
+```js
+bridge.off('some.event', this.someFunction)
+```
+
+Wait, what's `bridge.send(event.responseKey)`?
+
+The Quasar bridge does some work behind the scenes to convert the normal event based communication into promises and
+as such, in order for the promise to resolve, we need to send a *new* event which is captured and promisified.
+
+:::warning
+If you omit `bridge.send(event.responseKey)` the promise on `.send()` will not resolve.
+:::
+
+:::tip
+The bridge also does some work to split large data which is too big to be transmitted in one go due to the browser
+extension 60mb data transfer limit. In order for this to happen, the payload much be an array.
+:::
+
diff --git a/docs/src/pages/quasar-cli/developing-browser-extensions/configuring-bex.md b/docs/src/pages/quasar-cli/developing-browser-extensions/configuring-bex.md
new file mode 100644
index 00000000000..3ea92126a6d
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-browser-extensions/configuring-bex.md
@@ -0,0 +1,69 @@
+---
+title: Configuring BEX
+desc: How to manage your Browser Extensions with Quasar CLI.
+---
+
+Before we can configure anything, we need to understand how the BEX is structured. A BEX can be one (or more) of the following:
+
+1. Runs in it's own tab in the browser
+2. Runs in the [Developer Tools](https://developer.chrome.com/extensions/devtools) window.
+3. Runs in a [Popup](https://developer.chrome.com/extensions/user_interface#popup) window.
+4. Runs as [Options](https://developer.chrome.com/extensions/options) window.
+5. Runs in the context of a web page (injected into a website)
+
+You do not need a new Quasar App per BEX type above as a single Quasar Application can run in **all** of the instances
+above. You can find out more about these in the [types section](/developing-browser-extensions/types).
+
+## Manifest.json
+
+The most important config file for your BEX is `/src-bex/manifest.json`. It is recommended that you
+[read up on this file](https://developer.chrome.com/extensions/manifest) before starting your project.
+
+When you create your Quasar BEX, the manifest file is already configured to add the basic properties you will need
+in order to run your BEX. This includes default background scripts, content scripts and a css file which is injected in
+the context of the web page the BEX is running on.
+
+**Note**: The manifest.json is modified on build so as to auto inject required javascript files.
+
+## Background And Content Scripts
+
+Behind every BEX is a [content script](https://developer.chrome.com/extensions/content_scripts) and a
+[background script](https://developer.chrome.com/extensions/background_pages). It's a good idea to understand what each
+of these are before writing your first BEX.
+
+In summary:
+
+* **Background Script** - runs in the context of the BEX itself and can listen to all available browser extension events.
+There will only ever be one instance of each background script *per BEX*.
+* **Content Script** - runs in the context of the web page. There will be a new content script instance per tab running the
+extension.
+
+:::tip
+Given content scripts run in the web page context, this means that only BEX's that interact with a web page can use
+content scripts. Popups, Options and Devtools **will not** have a *content script* running behind them. They will all however
+have a *background script*.
+:::
+
+## Icons
+
+::: tip
+We highly recommend using our official [Icon Genie](https://github.com/quasarframework/app-extension-icon-genie/) app extension,
+because it consumes a source icon and automatically clones, scales, minifies and places the icons in the appropriate
+directories for you. When you change this source file (or some of the extension's settings) the icons will be automatically
+rebuilt on the next dev or build command.
+:::
+
+## CSS
+
+Any styles you want to be made available to your web page (not your Quasar App) should be included in
+`src-bex/css/content-css.css` as this file ia automatically injected into the `manifest.json` file.
+
+:::warning
+This must be native CSS as it's not preprocessed via SASS / Stylus.
+:::
+
+## Hook Files
+
+In a Quasar BEX, you are provided with `background-hook.js`, `content-hook.js` and `dom-hook.js`. These files are designed
+to give you access to a bridge which closes the gap in communication with each layer of a BEX. We will explore them in
+more detail in the [next section](/developing-browser-extensions/communication).
diff --git a/docs/src/pages/quasar-cli/developing-browser-extensions/introduction.md b/docs/src/pages/quasar-cli/developing-browser-extensions/introduction.md
new file mode 100644
index 00000000000..cb512aabcdb
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-browser-extensions/introduction.md
@@ -0,0 +1,20 @@
+---
+title: What is a Browser Extension
+desc: Introduction on what a Browser Extension (BEX) is.
+---
+
+A Browser Extension (BEX) is an application that runs in the browsers context and is used to customise the web browser in some way.
+
+They are built on web technologies such as HTML, JavaScript, and CSS and will aim to fulfill a single purpose. A single BEX
+can be built in any way the user deems fit but must contribute towards fulfilling that single purpose.
+
+Here a few things a BEX can do:
+
+* Override page content
+* Add to / alter the browser's interface
+* Intercept page requests
+* Be a full featured app that runs in the browser.
+* Interact with and alter the development tools of the browser.
+
+We've all used Browser Extensions in some capacity, Quasar BEX allows you to do anything a browser extension allows but with the simplicity Quasar offers in all other modes.
+
diff --git a/docs/src/pages/quasar-cli/developing-browser-extensions/preparation.md b/docs/src/pages/quasar-cli/developing-browser-extensions/preparation.md
new file mode 100644
index 00000000000..0d6d413029e
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-browser-extensions/preparation.md
@@ -0,0 +1,51 @@
+---
+title: BEX Preparation
+desc: How to manage BEX mode into a Quasar app.
+---
+
+We'll be using Quasar CLI to develop and build a BEX. The difference between building a SPA, Mobile App, Electron App,
+BEX or SSR is simply determined by the "mode" parameter in "quasar dev" and "quasar build" commands.
+
+## 1. Add Quasar BEX Mode
+In order to build a BEX, we first need to add the BEX mode to our Quasar project:
+```bash
+$ quasar mode add bex
+```
+
+If you want to jump right in and start developing, you can skip the "quasar mode" command and issue:
+```bash
+$ quasar dev -m bex
+```
+This will add BEX mode automatically, if it is missing adding a `src-bex` folder to your project.
+
+:::tip
+The `src-bex` folder is just a standard browser extension folder so you are free to use it as you would any other browser
+extension project folder. Please refer to supported Browser Extension documentation to learn more.
+
+* [Mozilla FireFox Browser Extension Documentation](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions)
+* [Google Chrome Browser Extension Documentation](https://developer.chrome.com/extensions)
+:::
+
+## 2. Understand The Anatomy Of `src-bex`
+
+The new folder has the following structure:
+```bash
+.
+└── src-bex/
+ ├── css # CSS to use in the Browser Context
+ | ├── content-css.css # CSS file which is auto injected into the consuming webpage via the manifest.json
+ ├── icons/ # Icons of your app for all platforms
+ | ├── icon16x16.png # Icon file at 16px x 16px
+ | ├── icon48x48.png # Icon file at 48px x 48px
+ | └── icon128x128.png # Icon file at 128px x 128px
+ ├── js/ # Javascript files used within the context of the BEX.
+ | ├── background.js # Standard background script BEX file - auto injected via manifest.json
+ | ├── background-hooks.js # Background script with a hook into the BEX communication layer
+ | ├── content-hooks.js # Content script script with a hook into the BEX communication layer
+ | ├── content-script.js # Standard content script BEX file - auto injected via manifest.json
+ | └── dom-hooks.png # JS file which is injected into the DOM with a hook into the BEX communication layer
+ └── www/ # Compiled BEX source - compiled from /src (Quasar app)
+ └── manifest.json # Main thread code for production
+```
+
+The next section will discuss these in more detail.
diff --git a/docs/src/pages/quasar-cli/developing-browser-extensions/types.md b/docs/src/pages/quasar-cli/developing-browser-extensions/types.md
new file mode 100644
index 00000000000..400b29759bc
--- /dev/null
+++ b/docs/src/pages/quasar-cli/developing-browser-extensions/types.md
@@ -0,0 +1,163 @@
+---
+title: Types of BEX
+desc: How to configure each type of BEX.
+---
+
+As already discussed, Quasar can handle the various places where a browser extension can live, namely New Tab, Web Page, Dev Tools
+Options or Popup. You don't need a separate Quasar App for each of these. You can do some handy work with the router.
+
+## New Tab
+
+This is the default way in which a BEX will run. It is accessed by clicking on the BEX icon in your browser. The Quasar
+App will run in that new (blank) tab.
+
+## Dev Tools, Options and Popup
+
+These all follow the same pattern, set up a route and configure the `manifest.json` file to look at that route when
+it's trying to show either one of the types. For instance:
+
+`routes.js`
+```js
+const routes = [
+ { path: '/options', component: () => import('pages/OptionsPage.vue') },
+ { path: '/popup', component: () => import('pages/PopupPage.vue') },
+ { path: '/devtools', component: () => import('pages/DevToolsPage.vue') }
+]
+```
+
+You could configure your `manifest.json` file with the following so the options page is loaded from that route:
+
+```json
+{
+ "name": "My extension",
+ ...
+ "options_page": "www/index.html#/options", // Options Page
+ ...
+ "browser_action": {
+ "default_popup": "www/index.html#/popup" // Popup Page
+ },
+ ...
+ "devtools_page": "www/index.html#/devtools", // Dev Tools
+}
+```
+
+## Web Page
+
+This is where the real power comes in. With a little ingenuity we can inject our Quasar application into a web page and
+and use it as an overlay making it seem like our Quasar App is part of the page experience.
+
+Here's a brief rundown of how you could achieve this:
+
+`src-bex/js/content-script.js`
+
+The idea here is to create an IFrame and add our Quasar app into it, then inject that into the page.
+
+Given our Quasar App might need to take the full height of the window (and thus stop any interaction with the underlying page)
+we have an event to handle setting the height of the IFrame. By default the IFrame height is just high enough to allow
+for the Quasar toolbar to show (and in turn allowing interaction with the rest of the page).
+
+We can call this event from our Quasar App any time we know we're opening the drawer and thus changing the height of the
+IFrame to allow the whole draw to be visible.
+
+```js
+const
+ iFrame = document.createElement('iframe'),
+ defaultFrameHeight = '62px'
+
+/**
+ * Set the height of our iFrame housing our BEX
+ * @param height
+ */
+const setIFrameHeight = height => {
+ iFrame.height = height
+}
+
+/**
+ * Reset the iFrame to it's default height e.g The height of the top bar.
+ */
+const resetIFrameHeight = () => {
+ setIFrameHeight(defaultFrameHeight)
+}
+
+/**
+ * Content hooks which listen for messages from the BEX in the iFrame
+ * @param bridge
+ */
+export default function attachContentHooks (bridge) {
+ /**
+ * When the drawer is toggled set the iFrame height to take the whole page.
+ * Reset when the drawer is closed.
+ */
+ bridge.on('wb.drawer.toggle', event => {
+ const payload = event.data
+ if (payload.open) {
+ setIFrameHeight('100%')
+ } else {
+ resetIFrameHeight()
+ }
+ bridge.send(event.eventResponseKey)
+ })
+}
+
+/**
+ * The code below will get everything going. Initialise the iFrame with defaults and add it to the page.
+ * @type {string}
+ */
+iFrame.id = 'bex-app-iframe'
+iFrame.width = '100%'
+resetIFrameHeight()
+
+// Assign some styling so it looks seamless
+Object.assign(iFrame.style, {
+ position: 'fixed',
+ top: '0',
+ right: '0',
+ bottom: '0',
+ left: '0',
+ border: '0',
+ zIndex: '9999999', // Make sure it's on top
+ overflow: 'visible'
+})
+
+;(function () {
+ // When the page loads, insert our browser extension app.
+ iFrame.src = chrome.runtime.getURL(`www/index.html`)
+ document.body.prepend(iFrame)
+})()
+```
+
+`src-bex/css/content-css.js`
+
+Add a margin to the top of our document so our Quasar toolbar doesn't overlap the actual page content.
+
+```css
+.target-some-header-class {
+ margin-top: 62px;
+}
+```
+
+`Quasar App`
+
+Then in our Quasar app, we have a function that toggles the drawer and sends an event to the content script telling it to
+resize the IFrame thus allowing our whole app to be visible:
+
+```html
+<q-drawer :value="drawerIsOpen" @input="drawerToggled">Some Content</q-drawer>
+```
+
+```js
+methods: {
+ drawerToggled ()
+ {
+ this.$q.bex.send('wb.drawer.toggle', {
+ open: this.drawerIsOpen // So it knows to make it bigger / smaller
+ }).then(r => {
+ // Only set this once the promise has resolved so we can see the entire slide animation.
+ this.drawerIsOpen = !this.drawerIsOpen
+ })
+ }
+}
+```
+
+Now you have a Quasar App running in a web page. You can now trigger other events from the Quasar App that the content
+script can listen to and interact with the underlying page.
|
df3ba94bf9b24fcb8e5264e42c603f6c38a0ce06
|
2020-12-11 23:06:03
|
Razvan Stoenescu
|
chore(checkbox): remove unused computed prop
| false
|
remove unused computed prop
|
chore
|
diff --git a/ui/src/components/checkbox/use-checkbox.js b/ui/src/components/checkbox/use-checkbox.js
index 0ebd5207d10..c8680345dd1 100644
--- a/ui/src/components/checkbox/use-checkbox.js
+++ b/ui/src/components/checkbox/use-checkbox.js
@@ -32,7 +32,6 @@ export const useCheckboxProps = {
label: String,
leftLabel: Boolean,
- fontSize: String,
color: String,
keepColor: Boolean,
@@ -82,12 +81,6 @@ export default function (props, slots, emit, type, getInner) {
props.disable === true ? -1 : props.tabindex || 0
)
- const labelStyle = computed(() =>
- props.fontSize !== void 0
- ? { fontSize: props.fontSize }
- : {}
- )
-
const classes = computed(() =>
`q-${type} cursor-pointer no-outline row inline no-wrap items-center` +
(props.disable === true ? ' disabled' : '') +
@@ -226,8 +219,7 @@ export default function (props, slots, emit, type, getInner) {
label !== void 0 && child.push(
h('div', {
- class: `q-${type}__label q-anchor--skip`,
- style: labelStyle.value
+ class: `q-${type}__label q-anchor--skip`
}, label)
)
|
75e3cb832b29a42770096c7edd69ed65a40bd1d8
|
2019-02-16 22:45:09
|
Popescu Dan
|
fix(quasar): VTouch... - fix touch events not ending when target is lost, tweaks (#3281)
| false
|
VTouch... - fix touch events not ending when target is lost, tweaks (#3281)
|
fix
|
diff --git a/quasar/dev/components/components/button-functional.vue b/quasar/dev/components/components/button-functional.vue
index b35f2dd80e0..9d9e19fdc6b 100644
--- a/quasar/dev/components/components/button-functional.vue
+++ b/quasar/dev/components/components/button-functional.vue
@@ -41,11 +41,11 @@
</div>
<div class="row flex-center q-my-md">
- <q-btn round class="on-left" icon="remove" v-touch-repeat:0:600.enter.space="() => { testN -= 1 }" />
- <q-btn push round class="on-left" icon="remove" v-touch-repeat.enter.space="() => { testN -= 1 }" />
+ <q-btn round class="on-left" icon="remove" v-touch-repeat:0:600.mouse.enter.space="() => { testN -= 1 }" />
+ <q-btn push round class="on-left" icon="remove" v-touch-repeat.mouse.enter.space="() => { testN -= 1 }" />
<q-input type="number" v-model="testN" align="right" />
- <q-btn push round class="on-right" icon="add" v-touch-repeat.enter.space="() => { testN += 1 }" />
- <q-btn round class="on-right" icon="add" v-touch-repeat:0:600.enter.space="() => { testN += 1 }" />
+ <q-btn push round class="on-right" icon="add" v-touch-repeat.mouse.enter.space="() => { testN += 1 }" />
+ <q-btn round class="on-right" icon="add" v-touch-repeat:0:600.mouse.enter.space="() => { testN += 1 }" />
</div>
<form @submit.prevent="submit" @reset.prevent="reset" class="shadow-2 q-pa-md q-my-sm row items-center">
diff --git a/quasar/dev/components/touch-directives/touch-hold.vue b/quasar/dev/components/touch-directives/touch-hold.vue
index a9089ea107d..f65238496fc 100644
--- a/quasar/dev/components/touch-directives/touch-hold.vue
+++ b/quasar/dev/components/touch-directives/touch-hold.vue
@@ -12,12 +12,12 @@
<div
v-touch-hold.mouse="handleHold"
@click="onClick"
- class="custom-area row flex-center non-selectable"
+ class="custom-area row flex-center"
>
<div v-if="info" class="custom-info">
<pre>{{ info }}</pre>
</div>
- <div v-else class="text-center">
+ <div v-else class="text-center q-pa-xl custom-area-placeholder">
Click/touch and hold for at least 600ms.
</div>
</div>
@@ -26,12 +26,12 @@
<div
v-touch-hold:3000.mouse="holdExtended"
@click="onClick"
- class="custom-area row flex-center non-selectable"
+ class="custom-area row flex-center"
>
<div v-if="infoExtended" class="custom-info">
<pre>{{ infoExtended }}</pre>
</div>
- <div v-else>Click/touch and hold for 3 seconds</div>
+ <div v-else class="q-pa-xl custom-area-placeholder">Click/touch and hold for 3 seconds</div>
</div>
</div>
</div>
@@ -61,8 +61,8 @@ export default {
console.log(evt)
},
- onClick () {
- console.log('click')
+ onClick (ev) {
+ console.log('click', ev.type, ev)
}
}
}
diff --git a/quasar/dev/components/touch-directives/touch-pan.vue b/quasar/dev/components/touch-directives/touch-pan.vue
index 58bb6415bf6..20cedc2b688 100644
--- a/quasar/dev/components/touch-directives/touch-pan.vue
+++ b/quasar/dev/components/touch-directives/touch-pan.vue
@@ -17,7 +17,7 @@
<div v-if="info" class="custom-info">
<pre>{{ info }}</pre>
</div>
- <div v-else class="text-center">
+ <div v-else class="text-center q-pa-xl custom-area-placeholder">
<q-icon name="arrow_upward" />
<div class="row items-center">
<q-icon name="arrow_back" />
@@ -52,7 +52,7 @@
<div v-if="infoHorizontal" class="custom-info">
<pre>{{ infoHorizontal }}</pre>
</div>
- <div v-else class="row items-center">
+ <div v-else class="row items-center q-pa-xl custom-area-placeholder">
<q-icon name="arrow_back" />
<div>Pan to left or right only</div>
<q-icon name="arrow_forward" />
@@ -75,7 +75,7 @@
<div v-if="infoVertical" class="custom-info">
<pre>{{ infoVertical }}</pre>
</div>
- <div v-else class="text-center">
+ <div v-else class="text-center q-pa-xl custom-area-placeholder">
<q-icon name="arrow_upward" />
<div>
Pan to up or down only
diff --git a/quasar/dev/components/touch-directives/touch-repeat.vue b/quasar/dev/components/touch-directives/touch-repeat.vue
index fbe1ee06d2b..3d3b0fec4c8 100644
--- a/quasar/dev/components/touch-directives/touch-repeat.vue
+++ b/quasar/dev/components/touch-directives/touch-repeat.vue
@@ -18,7 +18,7 @@
<div v-if="info1" class="custom-info">
<pre>{{ info1 }}</pre>
</div>
- <div v-else class="text-center">
+ <div v-else class="text-center q-pa-xl custom-area-placeholder">
Click/touch and hold.
</div>
</div>
@@ -32,19 +32,19 @@
<div v-if="info2" class="custom-info">
<pre>{{ info2 }}</pre>
</div>
- <div v-else>Click/touch or press SPACE/ENTER/H and hold</div>
+ <div v-else class="q-pa-xl custom-area-placeholder">Click/touch or press SPACE/ENTER/H and hold</div>
</div>
<p class="caption">Configured to also react to <kbd>ENTER</kbd> and <kbd>h</kbd>, with 200:300* (ms) repeat pattern:</p>
<div
v-touch-repeat:200:300.mouse.enter.72.104="handleHold3"
- class="non-selectable custom-area row flex-center"
+ class="custom-area row flex-center"
tabindex="0"
>
<div v-if="info3" class="custom-info">
<pre>{{ info3 }}</pre>
</div>
- <div v-else>Click/touch or press ENTER/H and hold</div>
+ <div v-else class="q-pa-xl custom-area-placeholder">Click/touch or press ENTER/H and hold</div>
</div>
<div style="height: 500px">
diff --git a/quasar/dev/components/touch-directives/touch-style.styl b/quasar/dev/components/touch-directives/touch-style.styl
index 365b7e8c3b2..7bd42eb6b07 100644
--- a/quasar/dev/components/touch-directives/touch-style.styl
+++ b/quasar/dev/components/touch-directives/touch-style.styl
@@ -15,6 +15,19 @@
outline 1px solid $grey
outline-offset 3px
+ &-placeholder
+ position relative
+
+ &:after
+ content ''
+ position absolute
+ top 0
+ bottom 0
+ left 0
+ right 0
+ pointer-events none
+ background-color rgba(150, 150, 150, .3)
+
.custom-info pre
width 250px
diff --git a/quasar/dev/components/touch-directives/touch-swipe.vue b/quasar/dev/components/touch-directives/touch-swipe.vue
index 15319451734..1e90e736054 100644
--- a/quasar/dev/components/touch-directives/touch-swipe.vue
+++ b/quasar/dev/components/touch-directives/touch-swipe.vue
@@ -14,7 +14,7 @@
<div v-if="info" class="custom-info">
<pre>{{ info }}</pre>
</div>
- <div v-else class="text-center">
+ <div v-else class="text-center q-pa-xl custom-area-placeholder">
<q-icon name="arrow_upward" />
<div class="row items-center">
<q-icon name="arrow_back" />
@@ -39,7 +39,7 @@
<div v-if="infoRight" class="custom-info">
<pre>{{ infoRight }}</pre>
</div>
- <div v-else>
+ <div v-else class="q-pa-xl custom-area-placeholder">
Swipe to right only
<q-icon name="arrow_forward" />
</div>
@@ -54,7 +54,7 @@
<div v-if="infoCustom" class="custom-info">
<pre>{{ infoCustom }}</pre>
</div>
- <div v-else class="text-center">
+ <div v-else class="text-center q-pa-xl custom-area-placeholder">
<q-icon name="arrow_upward" />
<div class="row items-center">
<div>Swipe up or right</div>
diff --git a/quasar/src/directives/TouchHold.js b/quasar/src/directives/TouchHold.js
index de048e07558..50f6715bd6f 100644
--- a/quasar/src/directives/TouchHold.js
+++ b/quasar/src/directives/TouchHold.js
@@ -17,33 +17,43 @@ export default {
bind (el, binding) {
const mouse = binding.modifiers.mouse === true
- let ctx = {
+ const ctx = {
mouseStart (evt) {
if (leftClick(evt)) {
- document.addEventListener('mousemove', ctx.mouseMove)
- document.addEventListener('mouseup', ctx.mouseMove)
- ctx.start(evt)
+ document.addEventListener('mousemove', ctx.mouseEnd, true)
+ document.addEventListener('click', ctx.mouseEnd, true)
+ ctx.start(evt, true)
}
},
- mouseMove (evt) {
- document.removeEventListener('mousemove', ctx.mouseMove)
- document.removeEventListener('mouseup', ctx.mouseMove)
- ctx.move(evt)
+ mouseEnd (evt) {
+ document.removeEventListener('mousemove', ctx.mouseEnd, true)
+ document.removeEventListener('click', ctx.mouseEnd, true)
+ ctx.end(evt)
},
- start (evt) {
+ start (evt, mouseEvent) {
+ if (ctx.touchTargetObserver !== void 0) {
+ ctx.touchTargetObserver.disconnect()
+ ctx.touchTargetObserver = void 0
+ }
+ const target = evt.target
+ ctx.touchTargetObserver = new MutationObserver(() => {
+ if (el.contains(target) === false) {
+ ctx[mouseEvent === true ? 'mouseEnd' : 'end'](evt)
+ }
+ })
+ ctx.touchTargetObserver.observe(el, { childList: true, subtree: true })
+
const startTime = new Date().getTime()
+ document.body.classList.add('non-selectable')
+ clearSelection()
+
ctx.triggered = false
ctx.timer = setTimeout(() => {
- clearSelection()
-
- if (mouse) {
- document.removeEventListener('mousemove', ctx.mouseMove)
- document.removeEventListener('mouseup', ctx.mouseMove)
- }
+ ctx.triggered = true
ctx.handler({
evt,
@@ -53,7 +63,14 @@ export default {
}, ctx.duration)
},
- move (evt) {
+ end (evt) {
+ if (ctx.touchTargetObserver !== void 0) {
+ ctx.touchTargetObserver.disconnect()
+ ctx.touchTargetObserver = void 0
+ }
+
+ document.body.classList.remove('non-selectable')
+
if (ctx.triggered === true) {
stopAndPrevent(evt)
}
@@ -70,28 +87,41 @@ export default {
el.__qtouchhold = ctx
updateBinding(el, binding)
- if (mouse) {
+ if (mouse === true) {
el.addEventListener('mousedown', ctx.mouseStart)
}
el.addEventListener('touchstart', ctx.start)
- el.addEventListener('touchmove', ctx.move)
- el.addEventListener('touchend', ctx.move)
+ el.addEventListener('touchmove', ctx.end)
+ el.addEventListener('touchcancel', ctx.end)
+ el.addEventListener('touchend', ctx.end)
},
update (el, binding) {
updateBinding(el, binding)
},
- unbind (el) {
+ unbind (el, binding) {
let ctx = el.__qtouchhold_old || el.__qtouchhold
if (ctx !== void 0) {
+ if (ctx.touchTargetObserver !== void 0) {
+ ctx.touchTargetObserver.disconnect()
+ ctx.touchTargetObserver = void 0
+ }
+
clearTimeout(ctx.timer)
+
+ document.body.classList.remove('non-selectable')
+
+ if (binding.modifiers.mouse === true) {
+ el.removeEventListener('mousedown', ctx.mouseStart)
+ document.removeEventListener('mousemove', ctx.mouseEnd, true)
+ document.removeEventListener('click', ctx.mouseEnd, true)
+ }
el.removeEventListener('touchstart', ctx.start)
- el.removeEventListener('touchend', ctx.move)
- el.removeEventListener('touchmove', ctx.move)
- el.removeEventListener('mousedown', ctx.mouseStart)
- document.removeEventListener('mousemove', ctx.mouseMove)
- document.removeEventListener('mouseup', ctx.mouseMove)
+ el.removeEventListener('touchmove', ctx.end)
+ el.removeEventListener('touchcancel', ctx.end)
+ el.removeEventListener('touchend', ctx.end)
+
delete el[el.__qtouchhold_old ? '__qtouchhold_old' : '__qtouchhold']
}
}
diff --git a/quasar/src/directives/TouchPan.js b/quasar/src/directives/TouchPan.js
index bab0973e842..19415c9c353 100644
--- a/quasar/src/directives/TouchPan.js
+++ b/quasar/src/directives/TouchPan.js
@@ -1,4 +1,4 @@
-import { position, leftClick, listenOpts } from '../utils/event.js'
+import { position, leftClick, listenOpts, stopAndPrevent } from '../utils/event.js'
import { clearSelection } from '../utils/selection.js'
function getDirection (mod) {
@@ -81,13 +81,15 @@ export default {
bind (el, binding) {
const
mouse = binding.modifiers.mouse === true,
- mouseEvtOpts = binding.modifiers.mouseMightPrevent || binding.modifiers.mousePrevent ? null : listenOpts.passive,
- evtOpts = binding.modifiers.mightPrevent || binding.modifiers.prevent ? null : listenOpts.passive
+ mouseEvtPassive = binding.modifiers.mouseMightPrevent !== true && binding.modifiers.mousePrevent !== true,
+ mouseEvtOpts = listenOpts.passive === void 0 ? true : { passive: mouseEvtPassive, capture: true },
+ touchEvtPassive = binding.modifiers.mightPrevent !== true && binding.modifiers.prevent !== true,
+ touchEvtOpts = touchEvtPassive ? listenOpts.passive : null
function handleEvent (evt, mouseEvent) {
if (mouse && mouseEvent) {
binding.modifiers.mouseStop && evt.stopPropagation()
- binding.modifiers.mousePrevent && evt.preventDefault()
+ binding.modifiers.mousePrevent && stopAndPrevent(evt)
}
else {
binding.modifiers.stop && evt.stopPropagation()
@@ -95,25 +97,37 @@ export default {
}
}
- let ctx = {
+ const ctx = {
handler: binding.value,
direction: getDirection(binding.modifiers),
mouseStart (evt) {
if (leftClick(evt)) {
document.addEventListener('mousemove', ctx.move, mouseEvtOpts)
- document.addEventListener('mouseup', ctx.mouseEnd, mouseEvtOpts)
+ document.addEventListener('click', ctx.mouseEnd, mouseEvtOpts)
ctx.start(evt, true)
}
},
mouseEnd (evt) {
document.removeEventListener('mousemove', ctx.move, mouseEvtOpts)
- document.removeEventListener('mouseup', ctx.mouseEnd, mouseEvtOpts)
+ document.removeEventListener('click', ctx.mouseEnd, mouseEvtOpts)
ctx.end(evt, true)
},
start (evt, mouseEvent) {
+ if (ctx.targetObserver !== void 0) {
+ ctx.targetObserver.disconnect()
+ ctx.targetObserver = void 0
+ }
+ const target = evt.target
+ ctx.targetObserver = new MutationObserver(() => {
+ if (el.contains(target) === false) {
+ ctx[mouseEvent === true ? 'mouseEnd' : 'end'](evt)
+ }
+ })
+ ctx.targetObserver.observe(el, { childList: true, subtree: true })
+
const pos = position(evt)
ctx.event = {
@@ -124,6 +138,7 @@ export default {
detected: false,
abort: false,
isFirst: true,
+ isFinal: false,
lastX: pos.left,
lastY: pos.top
}
@@ -166,9 +181,6 @@ export default {
}
if (ctx.event.abort !== true) {
- document.documentElement.style.cursor = 'grabbing'
- document.body.classList.add('no-pointer-events')
- document.body.classList.add('non-selectable')
clearSelection()
}
@@ -176,11 +188,12 @@ export default {
},
end (evt, mouseEvent) {
- document.documentElement.style.cursor = ''
- document.body.classList.remove('no-pointer-events')
- document.body.classList.remove('non-selectable')
+ if (ctx.targetObserver !== void 0) {
+ ctx.targetObserver.disconnect()
+ ctx.targetObserver = void 0
+ }
- if (ctx.event.abort || !ctx.event.detected || ctx.event.isFirst) {
+ if (ctx.event.abort === true || ctx.event.detected !== true || ctx.event.isFirst === true) {
return
}
@@ -195,12 +208,13 @@ export default {
el.__qtouchpan = ctx
- if (mouse) {
+ if (mouse === true) {
el.addEventListener('mousedown', ctx.mouseStart, mouseEvtOpts)
}
- el.addEventListener('touchstart', ctx.start, evtOpts)
- el.addEventListener('touchmove', ctx.move, evtOpts)
- el.addEventListener('touchend', ctx.end, evtOpts)
+ el.addEventListener('touchstart', ctx.start, touchEvtOpts)
+ el.addEventListener('touchmove', ctx.move, touchEvtOpts)
+ el.addEventListener('touchcancel', ctx.end, touchEvtOpts)
+ el.addEventListener('touchend', ctx.end, touchEvtOpts)
},
update (el, { oldValue, value, modifiers }) {
@@ -221,21 +235,27 @@ export default {
unbind (el, binding) {
let ctx = el.__qtouchpan_old || el.__qtouchpan
if (ctx !== void 0) {
- const evtOpts = binding.modifiers.mightPrevent || binding.modifiers.prevent
- ? null
- : listenOpts.passive
-
- el.removeEventListener(
- 'mousedown',
- ctx.mouseStart,
- binding.modifiers.mouseMightPrevent || binding.modifiers.mousePrevent
- ? null
- : listenOpts.passive
- )
-
- el.removeEventListener('touchstart', ctx.start, evtOpts)
- el.removeEventListener('touchmove', ctx.move, evtOpts)
- el.removeEventListener('touchend', ctx.end, evtOpts)
+ if (ctx.targetObserver !== void 0) {
+ ctx.targetObserver.disconnect()
+ ctx.targetObserver = void 0
+ }
+
+ const
+ mouse = binding.modifiers.mouse === true,
+ mouseEvtPassive = binding.modifiers.mouseMightPrevent !== true && binding.modifiers.mousePrevent !== true,
+ mouseEvtOpts = listenOpts.passive === void 0 ? true : { passive: mouseEvtPassive, capture: true },
+ touchEvtPassive = binding.modifiers.mightPrevent !== true && binding.modifiers.prevent !== true,
+ touchEvtOpts = touchEvtPassive ? listenOpts.passive : null
+
+ if (mouse === true) {
+ el.removeEventListener('mousedown', ctx.mouseStart, mouseEvtOpts)
+ document.removeEventListener('mousemove', ctx.move, mouseEvtOpts)
+ document.removeEventListener('click', ctx.mouseEnd, mouseEvtOpts)
+ }
+ el.removeEventListener('touchstart', ctx.start, touchEvtOpts)
+ el.removeEventListener('touchmove', ctx.move, touchEvtOpts)
+ el.removeEventListener('touchcancel', ctx.end, touchEvtOpts)
+ el.removeEventListener('touchend', ctx.end, touchEvtOpts)
delete el[el.__qtouchpan_old ? '__qtouchpan_old' : '__qtouchpan']
}
diff --git a/quasar/src/directives/TouchRepeat.js b/quasar/src/directives/TouchRepeat.js
index b88c2af10ad..2d2b6fee920 100644
--- a/quasar/src/directives/TouchRepeat.js
+++ b/quasar/src/directives/TouchRepeat.js
@@ -20,6 +20,7 @@ export default {
bind (el, binding) {
const
+ mouse = binding.modifiers.mouse === true,
keyboard = Object.keys(binding.modifiers).reduce((acc, key) => {
if (keyRegex.test(key)) {
const keyCode = parseInt(key, 10)
@@ -36,42 +37,64 @@ export default {
const durationsLast = durations.length - 1
let ctx = {
+ keyboard,
handler: binding.value,
mouseStart (evt) {
if (leftClick(evt)) {
- document.addEventListener('mousemove', ctx.mouseAbort, true)
- document.addEventListener('click', ctx.mouseAbort, true)
- ctx.start(evt)
+ document.addEventListener('mousemove', ctx.mouseEnd, true)
+ document.addEventListener('click', ctx.mouseEnd, true)
+ ctx.start(evt, true)
}
},
- mouseAbort (evt) {
- document.removeEventListener('mousemove', ctx.mouseAbort, true)
- document.removeEventListener('click', ctx.mouseAbort, true)
- ctx.abort(evt)
+ mouseEnd (evt) {
+ document.removeEventListener('mousemove', ctx.mouseEnd, true)
+ document.removeEventListener('click', ctx.mouseEnd, true)
+ ctx.end(evt)
},
keyboardStart (evt) {
- if (ctx.event !== void 0) {
- stopAndPrevent(evt)
- return
- }
-
if (keyboard.includes(evt.keyCode)) {
- document.addEventListener('keyup', ctx.keyboardAbort, true)
- ctx.start(evt, true)
+ document.addEventListener('keyup', ctx.keyboardEnd, true)
+ ctx.start(evt, false, true)
}
},
- keyboardAbort (evt) {
- document.removeEventListener('keyup', ctx.keyboardAbort, true)
- ctx.abort(evt)
+ keyboardEnd (evt) {
+ document.removeEventListener('keyup', ctx.keyboardEnd, true)
+ ctx.end(evt)
},
- start (evt, keyboard) {
+ start (evt, mouseEvent, keyboardEvent) {
+ if (ctx.touchTargetObserver !== void 0) {
+ ctx.touchTargetObserver.disconnect()
+ ctx.touchTargetObserver = void 0
+ }
+ const target = evt.target
+ ctx.touchTargetObserver = new MutationObserver(() => {
+ if (el.contains(target) === false) {
+ if (keyboardEvent) {
+ ctx.keyboardEnd(evt)
+ }
+ else if (mouseEvent) {
+ ctx.mouseEnd(evt)
+ }
+ else {
+ ctx.end(evt)
+ }
+ }
+ })
+ ctx.touchTargetObserver.observe(el, { childList: true, subtree: true })
+
+ if (ctx.event !== void 0) {
+ stopAndPrevent(evt)
+ return
+ }
+
ctx.event = {
- keyboard: keyboard === true,
+ mouse: mouseEvent === true,
+ keyboard: keyboardEvent === true,
startTime: new Date().getTime(),
repeatCount: 0
}
@@ -80,9 +103,8 @@ export default {
if (ctx.event && ctx.event.repeatCount === 0) {
ctx.event.evt = evt
ctx.event.position = position(evt)
- document.documentElement.style.cursor = 'pointer'
- clearSelection()
document.body.classList.add('non-selectable')
+ clearSelection()
}
ctx.event.duration = new Date().getTime() - ctx.event.startTime
@@ -106,12 +128,14 @@ export default {
}
},
- abort (evt) {
- if (ctx.event && ctx.event.repeatCount > 0) {
- stopAndPrevent(evt)
- document.documentElement.style.cursor = ''
+ end (evt) {
+ if (ctx.touchTargetObserver !== void 0) {
+ ctx.touchTargetObserver.disconnect()
+ ctx.touchTargetObserver = void 0
+ }
+
+ if (ctx.event !== void 0 && ctx.event.repeatCount > 0) {
document.body.classList.remove('non-selectable')
- clearSelection()
}
clearTimeout(ctx.timer)
@@ -126,15 +150,16 @@ export default {
el.__qtouchrepeat = ctx
- if (binding.modifiers.mouse === true) {
+ if (mouse === true) {
el.addEventListener('mousedown', ctx.mouseStart)
}
if (keyboard.length > 0) {
el.addEventListener('keydown', ctx.keyboardStart)
}
el.addEventListener('touchstart', ctx.start)
- el.addEventListener('touchmove', ctx.abort)
- el.addEventListener('touchend', ctx.abort)
+ el.addEventListener('touchmove', ctx.end)
+ el.addEventListener('touchcancel', ctx.end)
+ el.addEventListener('touchend', ctx.end)
},
update (el, binding) {
@@ -143,21 +168,41 @@ export default {
}
},
- unbind (el) {
+ unbind (el, binding) {
let ctx = el.__qtouchrepeat_old || el.__qtouchrepeat
if (ctx !== void 0) {
- if (ctx.event !== void 0) {
- clearTimeout(ctx.timer)
+ if (ctx.touchTargetObserver !== void 0) {
+ ctx.touchTargetObserver.disconnect()
+ ctx.touchTargetObserver = void 0
+ }
+
+ clearTimeout(ctx.timer)
+
+ if (ctx.event !== void 0 && ctx.event.repeatCount > 0) {
document.body.classList.remove('non-selectable')
}
+
+ ctx.timer = void 0
+ ctx.event = void 0
+
+ if (ctx.event !== void 0 && ctx.event.repeatCount > 0) {
+ document.body.classList.remove('non-selectable')
+ }
+
+ if (binding.modifiers.mouse === true) {
+ el.removeEventListener('mousedown', ctx.mouseStart)
+ document.removeEventListener('mousemove', ctx.mouseEnd, true)
+ document.removeEventListener('click', ctx.mouseEnd, true)
+ }
+ if (ctx.keyboard.length > 0) {
+ el.removeEventListener('keydown', ctx.keyboardStart)
+ document.removeEventListener('keyup', ctx.keyboardEnd, true)
+ }
el.removeEventListener('touchstart', ctx.start)
- el.removeEventListener('touchend', ctx.abort)
- el.removeEventListener('touchmove', ctx.abort)
- el.removeEventListener('mousedown', ctx.mouseStart)
- el.removeEventListener('keydown', ctx.keyboardStart)
- document.removeEventListener('mousemove', ctx.mouseAbort, true)
- document.removeEventListener('click', ctx.mouseAbort, true)
- document.removeEventListener('keyup', ctx.keyboardAbort, true)
+ el.removeEventListener('touchmove', ctx.end)
+ el.removeEventListener('touchcancel', ctx.end)
+ el.removeEventListener('touchend', ctx.end)
+
delete el[el.__qtouchrepeat_old ? '__qtouchrepeat_old' : '__qtouchrepeat']
}
}
diff --git a/quasar/src/directives/TouchSwipe.js b/quasar/src/directives/TouchSwipe.js
index a304b04c149..b14061a3175 100644
--- a/quasar/src/directives/TouchSwipe.js
+++ b/quasar/src/directives/TouchSwipe.js
@@ -63,19 +63,31 @@ export default {
mouseStart (evt) {
if (leftClick(evt)) {
- document.addEventListener('mousemove', ctx.move)
- document.addEventListener('mouseup', ctx.mouseEnd)
- ctx.start(evt)
+ document.addEventListener('mousemove', ctx.move, true)
+ document.addEventListener('click', ctx.mouseEnd, true)
+ ctx.start(evt, true)
}
},
mouseEnd (evt) {
- document.removeEventListener('mousemove', ctx.move)
- document.removeEventListener('mouseup', ctx.mouseEnd)
+ document.removeEventListener('mousemove', ctx.move, true)
+ document.removeEventListener('click', ctx.mouseEnd, true)
ctx.end(evt)
},
- start (evt) {
+ start (evt, mouseEvent) {
+ if (ctx.touchTargetObserver !== void 0) {
+ ctx.touchTargetObserver.disconnect()
+ ctx.touchTargetObserver = void 0
+ }
+ const target = evt.target
+ ctx.touchTargetObserver = new MutationObserver(() => {
+ if (el.contains(target) === false) {
+ ctx[mouseEvent === true ? 'mouseEnd' : 'end'](evt)
+ }
+ })
+ ctx.touchTargetObserver.observe(el, { childList: true, subtree: true })
+
const pos = position(evt)
ctx.event = {
@@ -184,8 +196,7 @@ export default {
if (ctx.event.dir !== false) {
stopAndPrevent(evt)
- document.body.classList.add('no-pointer-events')
- document.body.classList.add('non-selectable')
+
clearSelection()
ctx.handler({
@@ -204,10 +215,13 @@ export default {
},
end (evt) {
+ if (ctx.touchTargetObserver !== void 0) {
+ ctx.touchTargetObserver.disconnect()
+ ctx.touchTargetObserver = void 0
+ }
+
if (ctx.event.abort === false && ctx.event.dir !== false) {
stopAndPrevent(evt)
- document.body.classList.remove('no-pointer-events')
- document.body.classList.remove('non-selectable')
}
}
}
@@ -218,12 +232,13 @@ export default {
el.__qtouchswipe = ctx
- if (mouse) {
+ if (mouse === true) {
el.addEventListener('mousedown', ctx.mouseStart)
}
el.addEventListener('touchstart', ctx.start)
el.addEventListener('touchmove', ctx.move)
+ el.addEventListener('touchcancel', ctx.end)
el.addEventListener('touchend', ctx.end)
},
@@ -233,13 +248,24 @@ export default {
}
},
- unbind (el) {
+ unbind (el, binding) {
const ctx = el.__qtouchswipe_old || el.__qtouchswipe
if (ctx !== void 0) {
- el.removeEventListener('mousedown', ctx.mouseStart)
+ if (ctx.touchTargetObserver !== void 0) {
+ ctx.touchTargetObserver.disconnect()
+ ctx.touchTargetObserver = void 0
+ }
+
+ if (binding.modifiers.mouse === true) {
+ el.removeEventListener('mousedown', ctx.mouseStart)
+ document.removeEventListener('mousemove', ctx.move, true)
+ document.removeEventListener('click', ctx.mouseEnd, true)
+ }
el.removeEventListener('touchstart', ctx.start)
el.removeEventListener('touchmove', ctx.move)
+ el.removeEventListener('touchcancel', ctx.end)
el.removeEventListener('touchend', ctx.end)
+
delete el[el.__qtouchswipe_old ? '__qtouchswipe_old' : '__qtouchswipe']
}
}
diff --git a/quasar/src/utils/selection.js b/quasar/src/utils/selection.js
index 5ddb6d9f7d8..2a292f5a237 100644
--- a/quasar/src/utils/selection.js
+++ b/quasar/src/utils/selection.js
@@ -1,3 +1,5 @@
+import Platform from '../plugins/Platform.js'
+
export function clearSelection () {
if (window.getSelection !== void 0) {
const selection = window.getSelection()
@@ -6,7 +8,7 @@ export function clearSelection () {
}
else if (selection.removeAllRanges !== void 0) {
selection.removeAllRanges()
- selection.addRange(document.createRange())
+ Platform.is.mobile !== true && selection.addRange(document.createRange())
}
}
else if (document.selection !== void 0) {
|
edbb0ea2092e9dabf68ea2657496c4338d584eac
|
2019-12-10 23:46:21
|
Razvan Stoenescu
|
chore(ui): Bump version
| false
|
Bump version
|
chore
|
diff --git a/docs/yarn.lock b/docs/yarn.lock
index b41065d6780..7bbc4b4b661 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -846,9 +846,9 @@
integrity sha1-FPzHEqUwA475vhzmlSMVqDn0Zqg=
"@quasar/app@^1.0.0":
- version "1.3.4"
- resolved "https://registry.yarnpkg.com/@quasar/app/-/app-1.3.4.tgz#4901295b1170ddf93f05855c57c9370fad5424a5"
- integrity sha512-sCyXOSVvTN7RuV03jxM3ruBeZoRqKwfysxmZPEeTAkU2i06+s4nju6rjB8mqSxzzPM7VKVUXUiLmOmlcZyru4Q==
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/@quasar/app/-/app-1.3.6.tgz#ff70a85567184c795e2e3d5bb149c9c4c69ef7e3"
+ integrity sha512-xrn6PJg1tkI9/Y4DWTZgnEtVLyWJY8hCyJvk14HN4tv9S6EfmLK+DV0GY7FkhX2KfpIWO5nDblmxoGl44BhVNw==
dependencies:
"@quasar/babel-preset-app" "1.1.7"
"@quasar/fastclick" "1.1.4"
@@ -898,7 +898,7 @@
strip-ansi "6.0.0"
stylus "0.54.7"
stylus-loader "3.0.2"
- terser-webpack-plugin "2.2.1"
+ terser-webpack-plugin "2.2.2"
url-loader "3.0.0"
vue "2.6.10"
vue-loader "15.7.2"
@@ -987,9 +987,9 @@
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
"@types/node@*":
- version "12.12.14"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
- integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
+ version "12.12.16"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.16.tgz#3ebcbd7bf978fa4c5120fee8be57083271a8b3ac"
+ integrity sha512-vRuMyoOr5yfNf8QWxXegOjeyjpWJxFePzHzmBOIzDIzo+rSqF94RW0PkS6y4T2+VjAWLXHWrfbIJY3E3aS7lUw==
"@types/q@^1.5.1":
version "1.5.2"
@@ -1454,6 +1454,15 @@ array-unique@^0.3.2:
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+array.prototype.flat@^1.2.1:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.2.tgz#8f3c71d245ba349b6b64b4078f76f5576f1fd723"
+ integrity sha512-VXjh7lAL4KXKF2hY4FnEW9eRW6IhdvFW1sN/JwLbmECbCgACCnBHNyP3lFiYuttr0jxRN9Bsc5+G27dMseSWqQ==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.15.0"
+ function-bind "^1.1.1"
+
asap@~2.0.3:
version "2.0.6"
resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
@@ -1865,7 +1874,7 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.8.0:
+browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.8.0, browserslist@^4.8.2:
version "4.8.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==
@@ -2534,22 +2543,22 @@ [email protected]:
webpack-log "^2.0.0"
core-js-compat@^3.4.7:
- version "3.4.7"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.7.tgz#39f8080b1d92a524d6d90505c42b9c5c1eb90611"
- integrity sha512-57+mgz/P/xsGdjwQYkwtBZR3LuISaxD1dEwVDtbk8xJMqAmwqaxLOvnNT7kdJ7jYE/NjNptyzXi+IQFMi/2fCw==
+ version "3.4.8"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.8.tgz#f72e6a4ed76437ea710928f44615f926a81607d5"
+ integrity sha512-l3WTmnXHV2Sfu5VuD7EHE2w7y+K68+kULKt5RJg8ZJk3YhHF1qLD4O8v8AmNq+8vbOwnPFFDvds25/AoEvMqlQ==
dependencies:
- browserslist "^4.8.0"
+ browserslist "^4.8.2"
semver "^6.3.0"
core-js-pure@^3.0.0:
- version "3.4.7"
- resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.4.7.tgz#c998e1892da9949200c7452cbd33c0df95be9f54"
- integrity sha512-Am3uRS8WCdTFA3lP7LtKR0PxgqYzjAMGKXaZKSNSC/8sqU0Wfq8R/YzoRs2rqtOVEunfgH+0q3O0BKOg0AvjPw==
+ version "3.4.8"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.4.8.tgz#a4415834383784e81974cd34321daf36a6d2366e"
+ integrity sha512-K9iPNbLDZ0Epojwd8J3lhodmrLHYvxb07H3DaFme1ne4TIlFq/ufiyPC40rc3OX6NCaVa0zaSu+VV6BVDR2wiA==
core-js@^2.4.0, core-js@^2.6.5:
- version "2.6.10"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
- integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
+ version "2.6.11"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+ integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
[email protected], core-util-is@~1.0.0:
version "1.0.2"
@@ -3279,7 +3288,7 @@ error-stack-parser@^2.0.0:
dependencies:
stackframe "^1.1.0"
-es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
+es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
version "1.16.3"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161"
integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw==
@@ -3343,7 +3352,7 @@ eslint-loader@^2.1.1:
object-hash "^1.1.4"
rimraf "^2.6.1"
-eslint-module-utils@^2.4.0:
+eslint-module-utils@^2.4.1:
version "2.5.0"
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.0.tgz#cdf0b40d623032274ccd2abd7e64c4e524d6e19c"
integrity sha512-kCo8pZaNz2dsAW7nCUjuVoI11EBXXpIzfNxmaoLhXoRDOnqXLC4iSGVRdZPhOitfbdEfMEfKOiENaK6wDPZEGw==
@@ -3360,21 +3369,22 @@ eslint-plugin-es@^1.3.1:
regexpp "^2.0.1"
eslint-plugin-import@^2.14.0:
- version "2.18.2"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6"
- integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==
+ version "2.19.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz#5654e10b7839d064dd0d46cd1b88ec2133a11448"
+ integrity sha512-x68131aKoCZlCae7rDXKSAQmbT5DQuManyXo2sK6fJJ0aK5CWAkv6A6HJZGgqC8IhjQxYPgo6/IY4Oz8AFsbBw==
dependencies:
array-includes "^3.0.3"
+ array.prototype.flat "^1.2.1"
contains-path "^0.1.0"
debug "^2.6.9"
doctrine "1.5.0"
eslint-import-resolver-node "^0.3.2"
- eslint-module-utils "^2.4.0"
+ eslint-module-utils "^2.4.1"
has "^1.0.3"
minimatch "^3.0.4"
object.values "^1.1.0"
read-pkg-up "^2.0.0"
- resolve "^1.11.0"
+ resolve "^1.12.0"
eslint-plugin-node@^8.0.0:
version "8.0.1"
@@ -3814,7 +3824,7 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
make-dir "^2.0.0"
pkg-dir "^3.0.0"
-find-cache-dir@^3.0.0:
+find-cache-dir@^3.0.0, find-cache-dir@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.1.0.tgz#9935894999debef4cf9f677fdf646d002c4cdecb"
integrity sha512-zw+EFiNBNPgI2NTrKkDd1xd7q0cs6wr/iWnr/oUkI0yF9K9GqQ+riIt4aiyFaaqpaWbxPrJXHI+QvmNUQbX+0Q==
@@ -4055,9 +4065,9 @@ get-caller-file@^1.0.1:
integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
get-own-enumerable-property-symbols@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.1.tgz#6f7764f88ea11e0b514bd9bd860a132259992ca4"
- integrity sha512-09/VS4iek66Dh2bctjRkowueRJbY1JDGR1L/zRxO1Qk8Uxs6PnqaNSqalpizPT+CDjre3hnEsuzvhgomz9qYrA==
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
+ integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
get-stdin@^4.0.1:
version "4.0.1"
@@ -6132,14 +6142,21 @@ normalize-url@^3.0.0:
integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
npm-bundled@^1.0.1:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.0.tgz#2e8fdb7e69eff2df963937b696243316537c284b"
- integrity sha512-ez6dcKBFNo4FvlMqscBEFUum6M2FTLW5grqm3DyBKB5XOyKVCeeWvAuoZtbmW/5Cv8EM2bQUOA6ufxa/TKVN0g==
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+ integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+ dependencies:
+ npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+ integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
npm-packlist@^1.1.6:
- version "1.4.6"
- resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz#53ba3ed11f8523079f1457376dd379ee4ea42ff4"
- integrity sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==
+ version "1.4.7"
+ resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848"
+ integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==
dependencies:
ignore-walk "^3.0.1"
npm-bundled "^1.0.1"
@@ -7351,9 +7368,9 @@ qs@~6.5.2:
integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
quasar@^1.0.0:
- version "1.5.7"
- resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.5.7.tgz#b21ae7858513a75175435bb889e24c570bf4bf9c"
- integrity sha512-b/0LDYS5SleQUCb92yxLGrakpv5Bssl61mmxYqABootOU1rSytFjupkC2+hB+KBtWvjgGhjpty+Kir8/0X78zA==
+ version "1.5.8"
+ resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.5.8.tgz#c0d5ffcde8ee7b1fd1bbe96965d0928be54ab099"
+ integrity sha512-wgkVqpG3zcdBfuyPa57GiBQYzEYD95Y7yNZGXhxSMupvlwtG/l5+IFGaTI9kfp9f38rzCBjrsJsp/m9Cqxe2ig==
query-string@^4.1.0:
version "4.3.4"
@@ -7702,7 +7719,7 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
version "1.13.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
@@ -7878,7 +7895,7 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0"
ajv-keywords "^3.1.0"
-schema-utils@^2.1.0, schema-utils@^2.5.0, schema-utils@^2.6.0:
+schema-utils@^2.1.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f"
integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==
@@ -7964,9 +7981,9 @@ serialize-javascript@^1.3.0, serialize-javascript@^1.4.0:
integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
serialize-javascript@^2.1.0, serialize-javascript@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.1.tgz#952907a04a3e3a75af7f73d92d15e233862048b2"
- integrity sha512-MPLPRpD4FNqWq9tTIjYG5LesFouDhdyH0EPY3gVK4DRD5+g4aDqdNSzLIwceulo3Yj+PL1bPh6laE5+H6LTcrQ==
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+ integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
serve-index@^1.9.1:
version "1.9.1"
@@ -8625,18 +8642,18 @@ tar@^4:
safe-buffer "^5.1.2"
yallist "^3.0.3"
[email protected]:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.1.tgz#5569e6c7d8be79e5e43d6da23acc3b6ba77d22bd"
- integrity sha512-jwdauV5Al7zopR6OAYvIIRcxXCSvLjZjr7uZE8l2tIWb/ryrGN48sJftqGf5k9z09tWhajx53ldp0XPI080YnA==
[email protected]:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.2.tgz#2a6e00237125564a455ad69b22e08ee59420473a"
+ integrity sha512-/CHMNswPMAwuD2kd++qys8UmBRmsshPSzHw4BlDwurPtK9YjeK93OV89YWkJulHk972cs07K/7Z92V6PNjWF8A==
dependencies:
cacache "^13.0.1"
- find-cache-dir "^3.0.0"
+ find-cache-dir "^3.1.0"
jest-worker "^24.9.0"
- schema-utils "^2.5.0"
- serialize-javascript "^2.1.0"
+ schema-utils "^2.6.1"
+ serialize-javascript "^2.1.1"
source-map "^0.6.1"
- terser "^4.3.9"
+ terser "^4.4.2"
webpack-sources "^1.4.3"
terser-webpack-plugin@^1.4.1:
@@ -8654,7 +8671,7 @@ terser-webpack-plugin@^1.4.1:
webpack-sources "^1.4.0"
worker-farm "^1.7.0"
-terser@^4.1.2, terser@^4.3.9:
+terser@^4.1.2, terser@^4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8"
integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ==
@@ -8878,9 +8895,9 @@ uglify-js@^2.6.1:
uglify-to-browserify "~1.0.0"
uglify-js@^3.5.1:
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.1.tgz#35c7de17971a4aa7689cd2eae0a5b39bb838c0c5"
- integrity sha512-pnOF7jY82wdIhATVn87uUY/FHU+MDUdPLkmGFvGoclQmeu229eTkbG5gjGGBi3R7UuYYSEeYXY/TTY5j2aym2g==
+ version "3.7.2"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9"
+ integrity sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==
dependencies:
commander "~2.20.3"
source-map "~0.6.1"
diff --git a/ui/package.json b/ui/package.json
index 84ae4f57e40..c314b14e0a8 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "quasar",
- "version": "1.5.7",
+ "version": "1.5.8",
"description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
"module": "src/index.esm.js",
"typings": "dist/types/index.d.ts",
|
c9df96cc2c4019f17547fefea58b4b5d11570710
|
2020-02-24 16:49:44
|
Razvan Stoenescu
|
feat(docs): small tweak to QPagination page
| false
|
small tweak to QPagination page
|
feat
|
diff --git a/docs/src/pages/vue-components/pagination.md b/docs/src/pages/vue-components/pagination.md
index 177f78335c9..28b8dd2074f 100644
--- a/docs/src/pages/vue-components/pagination.md
+++ b/docs/src/pages/vue-components/pagination.md
@@ -10,23 +10,35 @@ There are two modes in which QPagination operates: with buttons only or with an
<doc-installation components="QPagination" />
## Usage
+
+### Standard
+
<doc-example title="Standard" file="QPagination/Standard" />
+### Custom icons <q-badge align="top" label="v1.9.4+" />
+
+<doc-example title="With icon replacement" file="QPagination/Icons" />
+
+### With input
+
<doc-example title="With input" file="QPagination/Input" />
<doc-example title="With input color" file="QPagination/InputColor" />
+### Max pages shown
+
<doc-example title="Maximum pages shown" file="QPagination/MaxPages" />
<doc-example title="Removing ellipses" file="QPagination/Ellipses" />
+### Handling boundary
+
<doc-example title="With boundary numbers" file="QPagination/BoundaryNumbers" />
<doc-example title="With boundary links" file="QPagination/BoundaryLinks" />
<doc-example title="With direction links" file="QPagination/DirectionLinks" />
-<doc-example title="With icon replacement" file="QPagination/Icons" />
-
## QPagination API
+
<doc-api file="QPagination" />
|
a01d8132272a6470940c813d6eeb47da216f1574
|
2022-10-13 15:49:36
|
Razvan Stoenescu
|
fix(ui): correctly handle required & missing inject() values
| false
|
correctly handle required & missing inject() values
|
fix
|
diff --git a/ui/src/components/drawer/QDrawer.js b/ui/src/components/drawer/QDrawer.js
index 8c2825b1638..d841ff2fb58 100644
--- a/ui/src/components/drawer/QDrawer.js
+++ b/ui/src/components/drawer/QDrawer.js
@@ -11,7 +11,7 @@ import TouchPan from '../../directives/TouchPan.js'
import { createComponent } from '../../utils/private/create.js'
import { between } from '../../utils/format.js'
import { hSlot, hDir } from '../../utils/private/render.js'
-import { layoutKey } from '../../utils/private/symbols.js'
+import { layoutKey, emptyRenderFn } from '../../utils/private/symbols.js'
const duration = 150
@@ -77,9 +77,11 @@ export default createComponent({
const { preventBodyScroll } = usePreventScroll()
const { registerTimeout, removeTimeout } = useTimeout()
- const $layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, emptyRenderFn)
+ if ($layout === emptyRenderFn) {
console.error('QDrawer needs to be child of QLayout')
- })
+ return emptyRenderFn
+ }
let lastDesktopState, timerMini, layoutTotalWidthWatcher
diff --git a/ui/src/components/footer/QFooter.js b/ui/src/components/footer/QFooter.js
index b3477eb2277..127d3f140de 100644
--- a/ui/src/components/footer/QFooter.js
+++ b/ui/src/components/footer/QFooter.js
@@ -6,7 +6,7 @@ import QResizeObserver from '../resize-observer/QResizeObserver.js'
import { createComponent } from '../../utils/private/create.js'
import { hMergeSlot } from '../../utils/private/render.js'
-import { layoutKey } from '../../utils/private/symbols.js'
+import { layoutKey, emptyRenderFn } from '../../utils/private/symbols.js'
export default createComponent({
name: 'QFooter',
@@ -31,9 +31,11 @@ export default createComponent({
setup (props, { slots, emit }) {
const { proxy: { $q } } = getCurrentInstance()
- const $layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, emptyRenderFn)
+ if ($layout === emptyRenderFn) {
console.error('QFooter needs to be child of QLayout')
- })
+ return emptyRenderFn
+ }
const size = ref(parseInt(props.heightHint, 10))
const revealed = ref(true)
diff --git a/ui/src/components/header/QHeader.js b/ui/src/components/header/QHeader.js
index 5fd9dea590d..354f2ef0020 100644
--- a/ui/src/components/header/QHeader.js
+++ b/ui/src/components/header/QHeader.js
@@ -4,7 +4,7 @@ import QResizeObserver from '../resize-observer/QResizeObserver.js'
import { createComponent } from '../../utils/private/create.js'
import { hUniqueSlot } from '../../utils/private/render.js'
-import { layoutKey } from '../../utils/private/symbols.js'
+import { layoutKey, emptyRenderFn } from '../../utils/private/symbols.js'
export default createComponent({
name: 'QHeader',
@@ -33,9 +33,11 @@ export default createComponent({
setup (props, { slots, emit }) {
const { proxy: { $q } } = getCurrentInstance()
- const $layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, emptyRenderFn)
+ if ($layout === emptyRenderFn) {
console.error('QHeader needs to be child of QLayout')
- })
+ return emptyRenderFn
+ }
const size = ref(parseInt(props.heightHint, 10))
const revealed = ref(true)
diff --git a/ui/src/components/page-sticky/use-page-sticky.js b/ui/src/components/page-sticky/use-page-sticky.js
index ca4243056ae..1cc25818284 100644
--- a/ui/src/components/page-sticky/use-page-sticky.js
+++ b/ui/src/components/page-sticky/use-page-sticky.js
@@ -1,7 +1,7 @@
import { h, computed, inject, getCurrentInstance } from 'vue'
import { hSlot } from '../../utils/private/render.js'
-import { layoutKey } from '../../utils/private/symbols.js'
+import { layoutKey, emptyRenderFn } from '../../utils/private/symbols.js'
export const usePageStickyProps = {
position: {
@@ -23,9 +23,11 @@ export const usePageStickyProps = {
export default function () {
const { props, proxy: { $q } } = getCurrentInstance()
- const $layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, emptyRenderFn)
+ if ($layout === emptyRenderFn) {
console.error('QPageSticky needs to be child of QLayout')
- })
+ return emptyRenderFn
+ }
const attach = computed(() => {
const pos = props.position
diff --git a/ui/src/components/page/QPage.js b/ui/src/components/page/QPage.js
index 085a8480f1c..27c67a84a26 100644
--- a/ui/src/components/page/QPage.js
+++ b/ui/src/components/page/QPage.js
@@ -2,7 +2,7 @@ import { h, computed, inject, getCurrentInstance } from 'vue'
import { createComponent } from '../../utils/private/create.js'
import { hSlot } from '../../utils/private/render.js'
-import { pageContainerKey, layoutKey } from '../../utils/private/symbols.js'
+import { pageContainerKey, layoutKey, emptyRenderFn } from '../../utils/private/symbols.js'
export default createComponent({
name: 'QPage',
@@ -15,10 +15,17 @@ export default createComponent({
setup (props, { slots }) {
const { proxy: { $q } } = getCurrentInstance()
- const $layout = inject(layoutKey)
- inject(pageContainerKey, () => {
+ const $layout = inject(layoutKey, emptyRenderFn)
+ if ($layout === emptyRenderFn) {
+ console.error('QPage needs to be a deep child of QLayout')
+ return emptyRenderFn
+ }
+
+ const $pageContainer = inject(pageContainerKey, emptyRenderFn)
+ if ($pageContainer === emptyRenderFn) {
console.error('QPage needs to be child of QPageContainer')
- })
+ return emptyRenderFn
+ }
const style = computed(() => {
const offset
diff --git a/ui/src/components/page/QPageContainer.js b/ui/src/components/page/QPageContainer.js
index 93e20de8b42..14755b2d228 100644
--- a/ui/src/components/page/QPageContainer.js
+++ b/ui/src/components/page/QPageContainer.js
@@ -2,7 +2,7 @@ import { h, computed, provide, inject, getCurrentInstance } from 'vue'
import { createComponent } from '../../utils/private/create.js'
import { hSlot } from '../../utils/private/render.js'
-import { pageContainerKey, layoutKey } from '../../utils/private/symbols.js'
+import { pageContainerKey, layoutKey, emptyRenderFn } from '../../utils/private/symbols.js'
export default createComponent({
name: 'QPageContainer',
@@ -10,9 +10,11 @@ export default createComponent({
setup (_, { slots }) {
const { proxy: { $q } } = getCurrentInstance()
- const $layout = inject(layoutKey, () => {
+ const $layout = inject(layoutKey, emptyRenderFn)
+ if ($layout === emptyRenderFn) {
console.error('QPageContainer needs to be child of QLayout')
- })
+ return emptyRenderFn
+ }
provide(pageContainerKey, true)
diff --git a/ui/src/components/stepper/QStep.js b/ui/src/components/stepper/QStep.js
index 62d793c055d..1ac1b00ea53 100644
--- a/ui/src/components/stepper/QStep.js
+++ b/ui/src/components/stepper/QStep.js
@@ -7,7 +7,7 @@ import { usePanelChildProps } from '../../composables/private/use-panel.js'
import useCache from '../../composables/private/use-cache.js'
import { createComponent } from '../../utils/private/create.js'
-import { stepperKey } from '../../utils/private/symbols.js'
+import { stepperKey, emptyRenderFn } from '../../utils/private/symbols.js'
import { hSlot } from '../../utils/private/render.js'
function getStepWrapper (slots) {
@@ -61,9 +61,11 @@ export default createComponent({
setup (props, { slots, emit }) {
const { proxy: { $q } } = getCurrentInstance()
- const $stepper = inject(stepperKey, () => {
- console.error('QStep needs to be child of QStepper')
- })
+ const $stepper = inject(stepperKey, emptyRenderFn)
+ if ($stepper === emptyRenderFn) {
+ console.error('QStep needs to be a child of QStepper')
+ return emptyRenderFn
+ }
const { getCacheWithFn } = useCache()
diff --git a/ui/src/components/tabs/use-tab.js b/ui/src/components/tabs/use-tab.js
index 95ea4e3e839..e04039686c3 100644
--- a/ui/src/components/tabs/use-tab.js
+++ b/ui/src/components/tabs/use-tab.js
@@ -6,7 +6,7 @@ import Ripple from '../../directives/Ripple.js'
import { hMergeSlot } from '../../utils/private/render.js'
import { isKeyCode, shouldIgnoreKey } from '../../utils/private/key-composition.js'
-import { tabsKey } from '../../utils/private/symbols.js'
+import { tabsKey, emptyRenderFn } from '../../utils/private/symbols.js'
import { stopAndPrevent } from '../../utils/event.js'
import uid from '../../utils/uid.js'
import { isDeepEqual } from '../../utils/is.js'
@@ -41,9 +41,11 @@ export const useTabProps = {
}
export default function (props, slots, emit, routeData) {
- const $tabs = inject(tabsKey, () => {
+ const $tabs = inject(tabsKey, emptyRenderFn)
+ if ($tabs === emptyRenderFn) {
console.error('QTab/QRouteTab component needs to be child of QTabs')
- })
+ return emptyRenderFn
+ }
const { proxy } = getCurrentInstance()
diff --git a/ui/src/components/timeline/QTimelineEntry.js b/ui/src/components/timeline/QTimelineEntry.js
index a3834d17c26..743d6667b7a 100644
--- a/ui/src/components/timeline/QTimelineEntry.js
+++ b/ui/src/components/timeline/QTimelineEntry.js
@@ -4,7 +4,7 @@ import QIcon from '../icon/QIcon.js'
import { createComponent } from '../../utils/private/create.js'
import { hSlot, hUniqueSlot } from '../../utils/private/render.js'
-import { timelineKey } from '../../utils/private/symbols.js'
+import { timelineKey, emptyRenderFn } from '../../utils/private/symbols.js'
export default createComponent({
name: 'QTimelineEntry',
@@ -32,9 +32,11 @@ export default createComponent({
},
setup (props, { slots }) {
- const $timeline = inject(timelineKey, () => {
+ const $timeline = inject(timelineKey, emptyRenderFn)
+ if ($timeline === emptyRenderFn) {
console.error('QTimelineEntry needs to be child of QTimeline')
- })
+ return emptyRenderFn
+ }
const classes = computed(() =>
`q-timeline__entry q-timeline__entry--${ props.side }`
diff --git a/ui/src/components/uploader/QUploaderAddTrigger.js b/ui/src/components/uploader/QUploaderAddTrigger.js
index da9d37a9dca..c80f29eb88d 100644
--- a/ui/src/components/uploader/QUploaderAddTrigger.js
+++ b/ui/src/components/uploader/QUploaderAddTrigger.js
@@ -1,14 +1,18 @@
import { inject } from 'vue'
import { createComponent } from '../../utils/private/create.js'
-import { uploaderKey } from '../../utils/private/symbols.js'
+import { uploaderKey, emptyRenderFn } from '../../utils/private/symbols.js'
export default createComponent({
name: 'QUploaderAddTrigger',
setup () {
- return inject(uploaderKey, () => {
+ const $trigger = inject(uploaderKey, emptyRenderFn)
+
+ if ($trigger === emptyRenderFn) {
console.error('QUploaderAddTrigger needs to be child of QUploader')
- })
+ }
+
+ return $trigger
}
})
diff --git a/ui/src/utils/private/symbols.js b/ui/src/utils/private/symbols.js
index 6cacbf1f82b..0e905e1bd61 100644
--- a/ui/src/utils/private/symbols.js
+++ b/ui/src/utils/private/symbols.js
@@ -7,3 +7,5 @@ export const fabKey = '_q_f_'
export const formKey = '_q_fo_'
export const tabsKey = '_q_tabs_'
export const uploaderKey = '_q_u_'
+
+export const emptyRenderFn = () => {}
|
62d6ee4db11318edf1909ced1768641057aa19a2
|
2019-04-12 19:24:40
|
Razvan Stoenescu
|
chore: Update backers
| false
|
Update backers
|
chore
|
diff --git a/backers.md b/backers.md
index ebf989dd58c..f18d7e39fb9 100644
--- a/backers.md
+++ b/backers.md
@@ -245,6 +245,7 @@ You can join them in supporting Quasar development by [pledging on Patreon](http
- Felipe Santiago ($5)
- Hugo Ramses Moreno Ramos (5$)
- Louis Ameline ($5)
+- Peter Dzurcanin ($5)
- Joe L Wroten ($1)
- Yasuhiro Kawagoe ($1)
- Shawn Taylor ($1)
|
9d1ceaaeefe6ef8c6bf0bfef88a723ff910391cd
|
2022-05-02 15:56:56
|
Jenuel Oras Ganawed
|
fix(docs): external link in - Update dos-and-donts.md (#13294)
| false
|
external link in - Update dos-and-donts.md (#13294)
|
fix
|
diff --git a/docs/src/pages/security/dos-and-donts.md b/docs/src/pages/security/dos-and-donts.md
index 148add8b5c8..0851a532ba7 100644
--- a/docs/src/pages/security/dos-and-donts.md
+++ b/docs/src/pages/security/dos-and-donts.md
@@ -12,7 +12,7 @@ We have collected some best practices for those of you new to the security theat
### User Input and the Dangers of v-html
-The `v-html` directive is a wonderful way to programmatically render markup, but even the Vue docs come with [this warning](https://vuejs.org/api/directives.html#v-html):
+The `v-html` directive is a wonderful way to programmatically render markup, but even the Vue docs come with [this warning](https://vuejs.org/api/built-in-directives.html#v-html):
> "Dynamically rendering arbitrary HTML on your website can be very dangerous because it can easily lead to XSS vulnerabilities. Only use HTML interpolation on trusted content and never on user-provided content."
If you don't know what that means, take a quick look at what OWASP has to say about [XSS (aka cross-site scripting)](https://owasp.org/www-community/attacks/xss/).
|
13dd2a1c0b140e781022f78e5a0fb1e7264343a8
|
2018-11-10 00:55:55
|
Razvan Stoenescu
|
feat: More QTime work
| false
|
More QTime work
|
feat
|
diff --git a/dev/components/form/time.vue b/dev/components/form/time.vue
index 709ce6f6b0a..462bcf05d38 100644
--- a/dev/components/form/time.vue
+++ b/dev/components/form/time.vue
@@ -81,9 +81,7 @@
<q-time
v-model="timeLimit"
v-bind="props"
- :hour-options="hourOptionsFn"
- :minute-options="minuteOptionsFn"
- :second-options="secondOptionsFn"
+ :options="optionsFn"
:style="style"
/>
</div>
@@ -146,16 +144,11 @@ export default {
return date[9] % 2 === 0 ? 'teal' : 'orange'
},
- hourOptionsFn (hr) {
- return hr % 2 === 0
- },
-
- minuteOptionsFn (min) {
- return min > 25 && min < 58
- },
-
- secondOptionsFn (sec) {
- return sec % 10 === 0
+ optionsFn (hr, min, sec) {
+ if (hr % 2 !== 0) { return false }
+ if (min !== null && (min <= 25 || min >= 58)) { return false }
+ if (sec !== null && sec % 10 !== 0) { return false }
+ return true
}
}
}
diff --git a/src/components/datetime/QTime.js b/src/components/datetime/QTime.js
index 0b51ed78b2e..77711e34ac5 100644
--- a/src/components/datetime/QTime.js
+++ b/src/components/datetime/QTime.js
@@ -27,18 +27,25 @@ export default Vue.extend({
default: null
},
- hourOptions: [Array, Function],
- minuteOptions: [Array, Function],
- secondOptions: [Array, Function],
+ options: Function,
+ hourOptions: Array,
+ minuteOptions: Array,
+ secondOptions: Array,
withSeconds: Boolean,
- nowBtn: Boolean,
- autoSwitchView: Boolean
+ nowBtn: Boolean
},
data () {
return {
- view: 'Hour'
+ view: 'Hour',
+ numberModel: this.__getNumberModel(this.value)
+ }
+ },
+
+ watch: {
+ value (v) {
+ this.numberModel = this.__getNumberModel(v)
}
},
@@ -52,27 +59,27 @@ export default Vue.extend({
}
},
- numberModel () {
- const val = this.value.split(':')
- return {
- hour: parseInt(val[0], 10),
- minute: parseInt(val[1], 10),
- second: parseInt(val[2], 10) || 0
- }
- },
-
stringModel () {
const time = this.numberModel
+
return {
- hour: this.computedFormat24h === true
- ? this.__pad(time.hour)
+ hour: time.hour === null
+ ? '--'
: (
- this.isAM === true
- ? (time.hour === 0 ? 12 : time.hour)
- : (time.hour > 12 ? time.hour - 12 : time.hour)
+ this.computedFormat24h === true
+ ? this.__pad(time.hour)
+ : (
+ this.isAM === true
+ ? (time.hour === 0 ? 12 : time.hour)
+ : (time.hour > 12 ? time.hour - 12 : time.hour)
+ )
),
- minute: this.__pad(time.minute),
- second: this.__pad(time.second)
+ minute: time.minute === null
+ ? '--'
+ : this.__pad(time.minute),
+ second: time.second === null
+ ? '--'
+ : this.__pad(time.second)
}
},
@@ -98,27 +105,52 @@ export default Vue.extend({
return { transform }
},
+ minLink () {
+ return this.numberModel.hour !== null
+ },
+
+ secLink () {
+ return this.minLink && this.numberModel.minute !== null
+ },
+
isAM () {
- return this.numberModel.hour < 12
+ return this.numberModel.hour === null || this.numberModel.hour < 12
},
hourInSelection () {
- return this.__getSelection(this.hourOptions)
+ return this.hourOptions !== void 0
+ ? val => this.hourOptions.includes(val)
+ : (
+ this.options !== void 0
+ ? val => this.options(val, null, null)
+ : void 0
+ )
},
minuteInSelection () {
- return this.__getSelection(this.minuteOptions)
+ return this.minuteOptions !== void 0
+ ? val => this.minuteOptions.includes(val)
+ : (
+ this.options !== void 0
+ ? val => this.options(this.numberModel.hour, val, null)
+ : void 0
+ )
},
secondInSelection () {
- return this.__getSelection(this.secondOptions)
+ return this.secondOptions !== void 0
+ ? val => this.secondOptions.includes(val)
+ : (
+ this.options !== void 0
+ ? val => this.options(this.numberModel.hour, this.numberModel.minute, val)
+ : void 0
+ )
},
positions () {
- let start, end, offset = 0, step = 1, opt, inSel
+ let start, end, offset = 0, step = 1, inSel
if (this.view === 'Hour') {
- opt = this.hourOptions
inSel = this.hourInSelection
if (this.computedFormat24h === true) {
@@ -140,11 +172,9 @@ export default Vue.extend({
step = 5
if (this.view === 'Minute') {
- opt = this.minuteOptions
inSel = this.minuteInSelection
}
else {
- opt = this.secondOptions
inSel = this.secondInSelection
}
}
@@ -154,7 +184,7 @@ export default Vue.extend({
for (let val = start, index = start; val <= end; val += step, index++) {
const
actualVal = val + offset,
- disable = opt !== void 0 && inSel(actualVal) === false,
+ disable = inSel !== void 0 && inSel(actualVal) === false,
label = this.view === 'Hour' && val === 0
? (this.format24h === true ? '00' : '12')
: val
@@ -185,13 +215,11 @@ export default Vue.extend({
this.__updateClock(event.evt)
this.dragging = false
- if (this.autoSwitchView === true) {
- if (this.view === 'Hour') {
- this.view = 'Minute'
- }
- else if (this.withSeconds && this.view === 'Minute') {
- this.view = 'Second'
- }
+ if (this.view === 'Hour') {
+ this.view = 'Minute'
+ }
+ else if (this.withSeconds && this.view === 'Minute') {
+ this.view = 'Second'
}
}
else {
@@ -242,7 +270,7 @@ export default Vue.extend({
hour = 0
}
- if (this.hourOptions !== void 0 && this.hourInSelection(hour) !== true) {
+ if (this.hourInSelection !== void 0 && this.hourInSelection(hour) !== true) {
return
}
@@ -255,10 +283,11 @@ export default Vue.extend({
val = 0
}
- if (
- (this.view === 'Minute' && this.minuteOptions !== void 0 && this.minuteInSelection(val) !== true) ||
- (this.view === 'Second' && this.secondOptions !== void 0 && this.secondInSelection(val) !== true)
- ) {
+ const opt = this.view === 'Minute'
+ ? this.minuteInSelection
+ : this.secondInSelection
+
+ if (opt !== void 0 && opt(val) !== true) {
return
}
@@ -278,29 +307,40 @@ export default Vue.extend({
}
}, [ this.stringModel.hour ]),
h('div', [ ':' ]),
- h('div', {
- staticClass: 'q-time__link',
- 'class': this.view === 'Minute' ? 'q-time__link--active' : false,
- attrs: { tabindex: this.computedTabindex },
- on: {
- click: () => { this.view = 'Minute' },
- keyup: e => { e.keyCode === 13 && (this.view = 'Minute') }
- }
- }, [ this.stringModel.minute ])
+ h(
+ 'div',
+ this.minLink === true
+ ? {
+ staticClass: 'q-time__link',
+ 'class': this.view === 'Minute' ? 'q-time__link--active' : false,
+ attrs: { tabindex: this.computedTabindex },
+ on: {
+ click: () => { this.view = 'Minute' },
+ keyup: e => { e.keyCode === 13 && (this.view = 'Minute') }
+ }
+ }
+ : null,
+ [ this.stringModel.minute ]
+ )
]
if (this.withSeconds === true) {
label.push(
h('div', [ ':' ]),
- h('div', {
- staticClass: 'q-time__link',
- 'class': this.view === 'Second' ? 'q-time__link--active' : false,
- attrs: { tabindex: this.computedTabindex },
- on: {
- click: () => { this.view = 'Second' },
- keyup: e => { e.keyCode === 13 && (this.view = 'Second') }
- }
- }, [ this.stringModel.second ])
+ h(
+ 'div',
+ this.secLink === true
+ ? {
+ staticClass: 'q-time__link',
+ 'class': this.view === 'Second' ? 'q-time__link--active' : false,
+ attrs: { tabindex: this.computedTabindex },
+ on: {
+ click: () => { this.view = 'Second' },
+ keyup: e => { e.keyCode === 13 && (this.view = 'Second') }
+ }
+ } : null,
+ [ this.stringModel.second ]
+ )
)
}
@@ -340,7 +380,8 @@ export default Vue.extend({
__getClock (h) {
const
- current = this.numberModel[this.view.toLowerCase()],
+ view = this.view.toLowerCase(),
+ current = this.numberModel[view],
f24 = this.view === 'Hour' && this.computedFormat24h === true
? ' fmt24'
: ''
@@ -368,10 +409,12 @@ export default Vue.extend({
}]
}, [
h('div', { staticClass: 'q-time__clock-circle fit' }, [
- h('div', {
- staticClass: 'q-time__clock-pointer',
- style: this.pointerStyle
- }),
+ this.numberModel[view] !== null
+ ? h('div', {
+ staticClass: 'q-time__clock-pointer',
+ style: this.pointerStyle
+ })
+ : null,
this.positions.map(pos => h('div', {
staticClass: `q-time__clock-position row flex-center${f24} q-time__clock-pos-${pos.index}`,
@@ -402,18 +445,37 @@ export default Vue.extend({
])
},
- __getSelection (which) {
- return typeof which === 'function'
- ? which
- : val => which.includes(val)
+ __getNumberModel (v) {
+ if (v === void 0 || v === null) {
+ return {
+ hour: null,
+ minute: null,
+ second: null
+ }
+ }
+
+ const val = v.split(':')
+ return {
+ hour: parseInt(val[0], 10),
+ minute: parseInt(val[1], 10),
+ second: parseInt(val[2], 10) || 0
+ }
},
__setHour (hour) {
- this.numberModel.hour !== hour && this.__updateValue({ hour })
+ if (this.numberModel.hour !== hour) {
+ this.numberModel.hour = hour
+ this.numberModel.minute = null
+ this.numberModel.second = null
+ }
},
__setMinute (minute) {
- this.numberModel.minute !== minute && this.__updateValue({ minute })
+ if (this.numberModel.minute !== minute) {
+ this.numberModel.minute = minute
+ this.numberModel.second = null
+ this.withSeconds !== true && this.__updateValue({ minute })
+ }
},
__setSecond (second) {
diff --git a/src/components/datetime/date.styl b/src/components/datetime/date.styl
index 12039571187..224d9fca92d 100644
--- a/src/components/datetime/date.styl
+++ b/src/components/datetime/date.styl
@@ -82,8 +82,8 @@
bottom 2px
left 50%
height 5px
- width 5px
- border-radius 50%
+ width 10px
+ border-radius 5px
background $secondary
transform translate3d(-50%, 0, 0)
diff --git a/src/components/datetime/time.styl b/src/components/datetime/time.styl
index da8e1da0556..f14e7b50707 100644
--- a/src/components/datetime/time.styl
+++ b/src/components/datetime/time.styl
@@ -9,10 +9,10 @@
color white
background $primary
padding 16px
+ font-weight 300
&__header-label
font-size 28px
- font-weight 300
line-height 1
letter-spacing -0.00833em
@@ -28,6 +28,7 @@
&__header-ampm
font-size 16px
+ letter-spacing 0.1em
&__content
padding 16px
@@ -131,6 +132,16 @@
background $primary
color white
+ &__event
+ position absolute
+ bottom 2px
+ left 50%
+ height 5px
+ width 10px
+ border-radius 5px
+ background $secondary
+ transform translate3d(-50%, 0, 0)
+
&.disabled, &--readonly
.q-time__header-ampm, .q-time__content
pointer-events none
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.