hash,date,author,commit_message,is_merge,masked_commit_message,type,git_diff 824d286d935d49cffd23a4082757b7cdfb75ab42,2021-06-27 19:49:08,Jeff Galbraith,chore(extras): update deps,False,update deps,chore,"diff --git a/extras/package.json b/extras/package.json index ed66e87ae67..a50e616fa9a 100644 --- a/extras/package.json +++ b/extras/package.json @@ -32,14 +32,14 @@ ""@mdi/svg"": ""5.9.55"", ""animate.css"": ""4.1.1"", ""bootstrap-icons"": ""https://github.com/twbs/icons"", - ""cross-fetch"": ""^3.0.6"", + ""cross-fetch"": ""^3.1.4"", ""cross-spawn"": ""7.0.3"", ""eva-icons"": ""1.1.3"", - ""fs-extra"": ""9.1.0"", - ""glob"": ""7.1.6"", + ""fs-extra"": ""10.0.0"", + ""glob"": ""7.1.7"", ""ionicons"": ""5.5.1"", ""line-awesome"": ""1.3.0"", ""themify-icons"": ""https://github.com/lykmapipo/themify-icons"", - ""xmldom"": ""0.4.0"" + ""xmldom"": ""0.6.0"" } }" 3c17507750a2e66bcd2efdccabd1f21ce6a328c7,2022-02-28 22:27:05,Razvan Stoenescu,feat(app-vite): config tweaks,False,config tweaks,feat,"diff --git a/app-vite/lib/config-tools.js b/app-vite/lib/config-tools.js index 770ca849d56..a435ab0c6cd 100644 --- a/app-vite/lib/config-tools.js +++ b/app-vite/lib/config-tools.js @@ -122,7 +122,8 @@ function createViteConfig (quasarConf, quasarRunMode) { 'css', 'json', 'optimizeDeps', - 'assetsInclude' + 'assetsInclude', + 'worker' ]) inject(viteConf.build, build, [ @@ -156,7 +157,7 @@ function createViteConfig (quasarConf, quasarRunMode) { viteConf.plugins.push( require('rollup-plugin-visualizer').visualizer({ open: true, - filename: `stats-${ quasarRunMode }.html`, + filename: `.quasar/stats-${ quasarRunMode }.html`, ...(Object(analyze) === analyze ? analyze : {}) }) ) @@ -194,7 +195,7 @@ function extendEsbuildConfig (esbuildConf, quasarConfTarget, threadName) { // example: quasarConf.ssr.extendSSRWebserverConf if (typeof quasarConfTarget[method] === 'function') { - quasarConf.build.extendViteConfig(esbuildConf) + quasarConfTarget[method](esbuildConf) } const promise = extensionRunner.runHook(method, async hook => { diff --git a/app-vite/lib/quasar-config-file.js b/app-vite/lib/quasar-config-file.js index 359d37c6c5b..c64e0ca973b 100644 --- a/app-vite/lib/quasar-config-file.js +++ b/app-vite/lib/quasar-config-file.js @@ -245,7 +245,8 @@ class QuasarConfFile { rollupOptions: {}, commonjsOptions: {}, dynamicImportVarsOptions: {}, - optimizeDeps: {} + optimizeDeps: {}, + worker: {} }, ssr: {" a52ad79d7f1eb2e881194742bd2366cf0000fa23,2016-03-05 23:27:12,Razvan Stoenescu,feat: Right-side drawer; Developer can use both drawer types simultaneously,False,Right-side drawer; Developer can use both drawer types simultaneously,feat,"diff --git a/preview/quasar.build.yml b/preview/quasar.build.yml index 47341ff4ada..101e6f6c675 100644 --- a/preview/quasar.build.yml +++ b/preview/quasar.build.yml @@ -4,4 +4,4 @@ deps: preview: {} responsive: {} test: {} -forceTheme: 'ios' +forceTheme: 'mat' diff --git a/preview/src/layouts/main/layout.main.html b/preview/src/layouts/main/layout.main.html index 77a635c57c1..5dcc453e1cb 100644 --- a/preview/src/layouts/main/layout.main.html +++ b/preview/src/layouts/main/layout.main.html @@ -1,16 +1,14 @@
- menu + menu

Title

- alarm more_vert -
-
-

Fooooter

+ menu
+
Left Side
@@ -27,4 +25,19 @@ + +
Right Side
+ + + + + + + + + +
+ + + diff --git a/src/lib/core/initialize/initialize.js b/src/lib/core/initialize/initialize.js index 5f3d9b7e8cf..c6737462e12 100644 --- a/src/lib/core/initialize/initialize.js +++ b/src/lib/core/initialize/initialize.js @@ -12,24 +12,23 @@ FastClick.attach(document.body); */ require('../environment/environment'); -$(function() { - if ($('body').hasClass('ios')) { - quasar.runs.on.ios = true; - } - - var theme = quasar.runs.on.ios ? 'ios' : 'mat'; - - $('head').append(''); -}); - function forceTheme(theme) { if (theme === 'ios') { quasar.runs.on.ios = true; + quasar.runs.on.android = false; } $('head link[data-theme]').remove(); $('head').append(''); } +$(function() { + var body = $('body'); + + forceTheme(body.hasClass('ios') || quasar.runs.on.ios ? 'ios' : 'mat'); + body.addClass(quasar.runs.on.desktop ? 'desktop' : 'mobile'); + body.addClass(quasar.runs.with.touch ? 'touch' : 'no-touch'); +}); + /* * Inject Globals */ diff --git a/src/lib/web-components/drawer/drawer.html b/src/lib/web-components/drawer/drawer.html index 1398b835112..8fa7dcd8395 100644 --- a/src/lib/web-components/drawer/drawer.html +++ b/src/lib/web-components/drawer/drawer.html @@ -1,10 +1,10 @@ diff --git a/dev/main.js b/dev/main.js index a96f1c2d33f..98d4c7ba563 100644 --- a/dev/main.js +++ b/dev/main.js @@ -1,15 +1,14 @@ import Vue from 'vue' import Quasar from 'quasar' -import moment from 'moment' - import router from './router' import App from './App' +import moment from 'moment' +moment.locale('de') + Quasar.theme.set(__THEME) Vue.use(Quasar) // Install Quasar Framework -moment.locale('de') - Quasar.start(() => { /* eslint-disable no-new */ new Vue({ diff --git a/src/vue-components/datetime/Datetime.vue b/src/vue-components/datetime/Datetime.vue index c2d351bdfb0..01487247494 100644 --- a/src/vue-components/datetime/Datetime.vue +++ b/src/vue-components/datetime/Datetime.vue @@ -7,7 +7,7 @@
- +
@@ -33,7 +33,7 @@ :position-classes=""position"" :content-css=""css"" > - +
@@ -73,6 +73,14 @@ export default { type: String, required: true }, + min: { + type: [String, Boolean], + default: false + }, + max: { + type: [String, Boolean], + default: false + }, format: String, clearLabel: { type: String, diff --git a/src/vue-components/datetime/InlineDatetimeIOS.vue b/src/vue-components/datetime/InlineDatetimeIOS.vue index a26494e039b..3afc6767483 100644 --- a/src/vue-components/datetime/InlineDatetimeIOS.vue +++ b/src/vue-components/datetime/InlineDatetimeIOS.vue @@ -1,7 +1,6 @@ - - @@ -41,8 +39,6 @@ export default { password: '', isPwd: true, - number: null, - email: '', search: '', tel: '', diff --git a/docs/src/pages/vue-components/input.md b/docs/src/pages/vue-components/input.md index 917542ecbdd..85b80bb45c7 100644 --- a/docs/src/pages/vue-components/input.md +++ b/docs/src/pages/vue-components/input.md @@ -77,6 +77,12 @@ Support and behavior is the subject entirely of the browser rendering the page a Some input types (like `date` or `time`) always render some controls, so you if you're using a `label` then you might want to set it along with `stack-label`, otherwise the label will overlap native browser controls. ::: +#### Input of number type + +You'll be using `v-model.number` (notice the `number` modifier) along with `type=""number""` prop: + + + #### Input of file type ::: warning" 55a428f430c309342be0ade17b56dbb809788337,2021-06-02 20:45:49,Razvan Stoenescu,fix(QTabs): protect updateContainer() against being executed too early,False,protect updateContainer() against being executed too early,fix,"diff --git a/ui/src/components/tabs/QTabs.js b/ui/src/components/tabs/QTabs.js index 7d6abe334c4..ec7d043ffdb 100644 --- a/ui/src/components/tabs/QTabs.js +++ b/ui/src/components/tabs/QTabs.js @@ -180,6 +180,11 @@ export default defineComponent({ } function updateContainer (domSize) { + // it can be called faster than component being initialized + // so we need to protect against that case + // (one example of such case is the docs release notes page) + if (domProps.value === void 0) { return } + const size = domSize[ domProps.value.container ], scrollSize = Math.min(" 1c1eb6541d32f7fc5bbea62bacf810223a764cc7,2021-06-19 17:16:41,Razvan Stoenescu,feat(QImg): New prop -> initial-ratio (when not using 'ratio' but still wanting an aspect ratio before img loads) #9716,False,New prop -> initial-ratio (when not using 'ratio' but still wanting an aspect ratio before img loads) #9716,feat,"diff --git a/ui/src/components/img/QImg.js b/ui/src/components/img/QImg.js index a862d6555ee..edf26c51394 100644 --- a/ui/src/components/img/QImg.js +++ b/ui/src/components/img/QImg.js @@ -8,6 +8,7 @@ import { isRuntimeSsrPreHydration } from '../../plugins/Platform.js' const crossoriginValues = [ 'anonymous', 'use-credentials' ] const loadingValues = [ 'eager', 'lazy' ] const fitValues = [ 'cover', 'fill', 'contain', 'none', 'scale-down' ] +const defaultRatio = 16 / 9 export default defineComponent({ name: 'QImg', @@ -33,6 +34,10 @@ export default defineComponent({ }, width: String, height: String, + initialRatio: { + type: [ Number, String ], + default: defaultRatio + }, placeholderSrc: String, @@ -60,7 +65,7 @@ export default defineComponent({ emits: [ 'load', 'error' ], setup (props, { slots, attrs, emit }) { - const naturalRatio = ref(0.5) + const naturalRatio = ref(props.initialRatio) const ratioStyle = useRatio(props, naturalRatio) let loadTimer diff --git a/ui/src/components/img/QImg.json b/ui/src/components/img/QImg.json index b1069a0486a..ece01fccd3c 100644 --- a/ui/src/components/img/QImg.json +++ b/ui/src/components/img/QImg.json @@ -62,6 +62,17 @@ ""category"": ""style"" }, + ""initial-ratio"": { + ""type"": [ ""String"", ""Number"" ], + ""desc"": ""Use it when not specifying 'ratio' but still wanting an initial aspect ratio"", + ""default"": ""16/9"", + ""examples"": [ + ""(Number format) :initial-ratio=\""16/9\"""", + ""(String format) initial-ratio=\""1\"""" + ], + ""category"": ""style"" + }, + ""width"": { ""type"": ""String"", ""desc"": ""Forces image width; Must also include the unit (px or %)""," 27604c7152b417085b01e61c837d1face74833bc,2023-05-09 20:15:31,Razvan Stoenescu,chore: tweak linting,False,tweak linting,chore,"diff --git a/app-vite/.eslintrc.js b/app-vite/.eslintrc.js index 021efbf9783..c5a58ac4a78 100644 --- a/app-vite/.eslintrc.js +++ b/app-vite/.eslintrc.js @@ -3,7 +3,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2022, + ecmaVersion: 2023, sourceType: 'module' }, diff --git a/app-vite/lib/modes/capacitor/capacitor-installation.js b/app-vite/lib/modes/capacitor/capacitor-installation.js index 69c632ce7a3..ed5835d02bd 100644 --- a/app-vite/lib/modes/capacitor/capacitor-installation.js +++ b/app-vite/lib/modes/capacitor/capacitor-installation.js @@ -124,7 +124,7 @@ function addPlatform (target) { if (capVersion >= 3) { nodePackager.installPackage( - `@capacitor/${target}@^${capVersion}.0.0`, + `@capacitor/${ target }@^${ capVersion }.0.0`, { displayName: 'Capacitor platform', cwd: appPaths.capacitorDir } ) } diff --git a/app-vite/lib/modes/capacitor/config-file.js b/app-vite/lib/modes/capacitor/config-file.js index 5ad9523fc22..cd0c636be71 100644 --- a/app-vite/lib/modes/capacitor/config-file.js +++ b/app-vite/lib/modes/capacitor/config-file.js @@ -299,24 +299,25 @@ class CapacitorConfigFile { super.onCreate(savedInstanceState); } }` - ); + ) mainActivity = mainActivity.replace('import com.getcapacitor.BridgeActivity;', `import android.os.Bundle; -import com.getcapacitor.BridgeActivity;`); +import com.getcapacitor.BridgeActivity;`) } if (!/EnableHttpsSelfSigned\.enable/.test(mainActivity)) { mainActivity = mainActivity.replace( /super\.onCreate\(.*\);/ms, - match => `${match} - ${sslString}` + match => `${ match } + ${ sslString }` ) } - } else { + } + else { if (!/EnableHttpsSelfSigned\.enable/.test(mainActivity)) { mainActivity = mainActivity.replace( /this\.init\(.*}}\);/ms, - match => `${match} - ${sslString} + match => `${ match } + ${ sslString } ` ) } diff --git a/app-webpack/.eslintrc.js b/app-webpack/.eslintrc.js index 021efbf9783..c5a58ac4a78 100644 --- a/app-webpack/.eslintrc.js +++ b/app-webpack/.eslintrc.js @@ -3,7 +3,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2022, + ecmaVersion: 2023, sourceType: 'module' }, diff --git a/app-webpack/bin/quasar b/app-webpack/bin/quasar index 33c89580cc0..f200128f7e9 100755 --- a/app-webpack/bin/quasar +++ b/app-webpack/bin/quasar @@ -55,7 +55,7 @@ if (cmd) { cmd = 'help' } else if (cmd.indexOf('-') === 0) { - warn(`Command must come before the options`) + warn('Command must come before the options') cmd = 'help' } else { diff --git a/app-webpack/lib/capacitor/capacitor-config.js b/app-webpack/lib/capacitor/capacitor-config.js index 66488e934de..5534e9661c1 100644 --- a/app-webpack/lib/capacitor/capacitor-config.js +++ b/app-webpack/lib/capacitor/capacitor-config.js @@ -297,24 +297,25 @@ class CapacitorConfig { super.onCreate(savedInstanceState); } }` - ); + ) mainActivity = mainActivity.replace('import com.getcapacitor.BridgeActivity;', `import android.os.Bundle; -import com.getcapacitor.BridgeActivity;`); +import com.getcapacitor.BridgeActivity;`) } if (!/EnableHttpsSelfSigned\.enable/.test(mainActivity)) { mainActivity = mainActivity.replace( /super\.onCreate\(.*\);/ms, - match => `${match} - ${sslString}` + match => `${ match } + ${ sslString }` ) } - } else { + } + else { if (!/EnableHttpsSelfSigned\.enable/.test(mainActivity)) { mainActivity = mainActivity.replace( /this\.init\(.*}}\);/ms, - match => `${match} - ${sslString} + match => `${ match } + ${ sslString } ` ) } diff --git a/app-webpack/lib/mode/mode-capacitor.js b/app-webpack/lib/mode/mode-capacitor.js index d0ffe01a344..137af43bf3c 100644 --- a/app-webpack/lib/mode/mode-capacitor.js +++ b/app-webpack/lib/mode/mode-capacitor.js @@ -109,7 +109,7 @@ class Mode { if (capVersion >= 3) { nodePackager.installPackage( - `@capacitor/${target}@^${capVersion}.0.0`, + `@capacitor/${ target }@^${ capVersion }.0.0`, { displayName: 'Capacitor platform', cwd: appPaths.capacitorDir } ) } diff --git a/cli/.eslintrc.cjs b/cli/.eslintrc.cjs index 23447eda8f0..ed19d5d01dc 100644 --- a/cli/.eslintrc.cjs +++ b/cli/.eslintrc.cjs @@ -3,7 +3,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2022, + ecmaVersion: 2023, sourceType: 'module' }, diff --git a/cli/package.json b/cli/package.json index 44882b359fa..46c9dad0ffc 100644 --- a/cli/package.json +++ b/cli/package.json @@ -7,7 +7,7 @@ ""quasar"": ""./bin/quasar.js"" }, ""scripts"": { - ""lint"": ""eslint --ext .js ./ --fix"" + ""lint"": ""eslint --ext .js ./ --fix --report-unused-disable-directives"" }, ""files"": [ ""assets"", diff --git a/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintrc.cjs b/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintrc.cjs index aefdf030393..1f635933fd1 100644 --- a/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintrc.cjs +++ b/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintrc.cjs @@ -5,7 +5,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2023, // Allows for the parsing of modern ECMAScript features }, env: { diff --git a/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintrc.cjs b/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintrc.cjs index f4e1f770824..7e4a554b5fd 100644 --- a/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintrc.cjs +++ b/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintrc.cjs @@ -6,7 +6,7 @@ module.exports = { parserOptions: { parser: '@babel/eslint-parser', - ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2023, // Allows for the parsing of modern ECMAScript features sourceType: 'module' // Allows for the use of imports }, diff --git a/docs/.eslintrc.js b/docs/.eslintrc.js index d7db6a5ad6c..57f6c14df16 100644 --- a/docs/.eslintrc.js +++ b/docs/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2023, // Allows for the parsing of modern ECMAScript features }, env: { diff --git a/docs/package.json b/docs/package.json index d0bc38ffd09..72f5d46a412 100644 --- a/docs/package.json +++ b/docs/package.json @@ -10,7 +10,7 @@ ""dev:ssr"": ""quasar dev -m ssr"", ""build"": ""node build/search.js && cp node_modules/quasar/dist/api/* public/quasar-api/ && quasar build -m ssr && mkdir -p dist/quasar.dev/client/examples/ && cp -R src/examples/* dist/quasar.dev/client/examples/"", ""relnotes"": ""node build/release-notes/index.js"", - ""lint"": ""eslint --ext .js,.vue ./ --fix"", + ""lint"": ""eslint --ext .js,.vue ./ --fix --report-unused-disable-directives"", ""test"": ""echo \""No test specified\"" && exit 0"" }, ""dependencies"": { diff --git a/docs/src/pages/quasar-cli-webpack/supporting-ts.md b/docs/src/pages/quasar-cli-webpack/supporting-ts.md index 10c0ab6087b..7239895afdc 100644 --- a/docs/src/pages/quasar-cli-webpack/supporting-ts.md +++ b/docs/src/pages/quasar-cli-webpack/supporting-ts.md @@ -99,7 +99,7 @@ module.exports = { parser: '@typescript-eslint/parser', project: resolve(__dirname, './tsconfig.json'), tsconfigRootDir: __dirname, - ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2023, // Allows for the parsing of modern ECMAScript features sourceType: 'module', // Allows for the use of imports }, diff --git a/icongenie/.eslintrc.cjs b/icongenie/.eslintrc.cjs index 87e22523636..f1f3def6c9e 100644 --- a/icongenie/.eslintrc.cjs +++ b/icongenie/.eslintrc.cjs @@ -3,7 +3,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2022, + ecmaVersion: 2023, sourceType: 'module' }, diff --git a/icongenie/package.json b/icongenie/package.json index eededf1da59..ab884fd763b 100644 --- a/icongenie/package.json +++ b/icongenie/package.json @@ -7,7 +7,7 @@ }, ""type"": ""module"", ""scripts"": { - ""lint"": ""eslint --ext .js ./ --fix"" + ""lint"": ""eslint --ext .js ./ --fix --report-unused-disable-directives"" }, ""repository"": { ""type"": ""git"", diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js index 1e5c7c1473c..916c00c9b67 100644 --- a/ui/.eslintrc.js +++ b/ui/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: '2021' // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2023 }, env: { diff --git a/ui/package.json b/ui/package.json index 7e86b6d4c3a..017db607044 100644 --- a/ui/package.json +++ b/ui/package.json @@ -27,8 +27,8 @@ ""dev:umd"": ""node build/script.test-umd.js"", ""dev:quploader"": ""cd dev/upload-server && yarn && cd ../.. && node dev/upload-server/server.js"", ""build"": ""node build/script.build.js"", - ""lint"": ""eslint --ext .js,.vue src dev"", - ""lint-fix"": ""eslint --ext .js,.vue src dev --fix"", + ""lint"": ""eslint --ext .js,.vue src dev --report-unused-disable-directives"", + ""lint-fix"": ""eslint --ext .js,.vue src dev --fix --report-unused-disable-directives"", ""format:types"": ""prettier --write \""types/**/*.{d.ts,ts,json}\"""", ""test:create"": ""node ./test/cypress/helpers/create-spec.js -c"", ""test:build"": ""node build/script.build.js js api && node build/script.build.js js transforms"", diff --git a/utils/render-ssr-error/.eslintrc.cjs b/utils/render-ssr-error/.eslintrc.cjs index 3cca2d10056..c427de394bc 100644 --- a/utils/render-ssr-error/.eslintrc.cjs +++ b/utils/render-ssr-error/.eslintrc.cjs @@ -6,7 +6,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: '2022' // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2023 }, env: { diff --git a/utils/render-ssr-error/package.json b/utils/render-ssr-error/package.json index 764fc146fb4..ad70b4b62c2 100644 --- a/utils/render-ssr-error/package.json +++ b/utils/render-ssr-error/package.json @@ -6,7 +6,7 @@ ""main"": ""src/index.js"", ""module"": ""src/index.js"", ""scripts"": { - ""lint"": ""eslint ./ --ext .js,.vue --fix"", + ""lint"": ""eslint ./ --ext .js,.vue --fix --report-unused-disable-directives"", ""dev"": ""cd src-ui && quasar dev"", ""build"": ""yarn build:ui && yarn build:package"", ""build:ui"": ""cd src-ui && quasar build""," eae158c641bfb7a68c387659b2798154a0861509,2024-08-19 21:31:30,Yusuf Kandemir,fix(app-webpack): fix feature flags generation when adding modes,False,fix feature flags generation when adding modes,fix,"diff --git a/app-webpack/lib/modes/bex/bex-installation.js b/app-webpack/lib/modes/bex/bex-installation.js index 0d6d6473a1f..8e671c94f79 100644 --- a/app-webpack/lib/modes/bex/bex-installation.js +++ b/app-webpack/lib/modes/bex/bex-installation.js @@ -2,6 +2,7 @@ const fs = require('node:fs') const fse = require('fs-extra') const { log, warn } = require('../../utils/logger.js') +const { generateTypesFeatureFlag } = require('../../utils/types-feature-flags.js') const bexDeps = { events: '^3.3.0' @@ -44,7 +45,7 @@ module.exports.addMode = async function addMode ({ log('Creating Browser Extension source folder...') fse.copySync(appPaths.resolve.cli('templates/bex/common'), appPaths.bexDir) - fse.copySync(appPaths.resolve.cli('templates/bex/bex-flag.d.ts'), appPaths.resolve.bex('bex-flag.d.ts')) + generateTypesFeatureFlag('bex', appPaths) const hasTypescript = cacheProxy.getModule('hasTypescript') const format = hasTypescript ? 'ts' : 'default' diff --git a/app-webpack/lib/modes/electron/electron-installation.js b/app-webpack/lib/modes/electron/electron-installation.js index a34b0558a60..b70558eca2b 100644 --- a/app-webpack/lib/modes/electron/electron-installation.js +++ b/app-webpack/lib/modes/electron/electron-installation.js @@ -2,6 +2,7 @@ const fs = require('node:fs') const fse = require('fs-extra') const { log, warn } = require('../../utils/logger.js') +const { generateTypesFeatureFlag } = require('../../utils/types-feature-flags.js') const electronDeps = { electron: 'latest' @@ -37,10 +38,7 @@ module.exports.addMode = function addMode ({ appPaths.electronDir ) - fse.copySync( - appPaths.resolve.cli('templates/electron/electron-flag.d.ts'), - appPaths.resolve.electron('electron-flag.d.ts') - ) + generateTypesFeatureFlag('electron', appPaths) log('Creating Electron icons folder...') fse.copySync( diff --git a/app-webpack/lib/modes/pwa/pwa-installation.js b/app-webpack/lib/modes/pwa/pwa-installation.js index 8dff29f7de5..1e9de96d417 100644 --- a/app-webpack/lib/modes/pwa/pwa-installation.js +++ b/app-webpack/lib/modes/pwa/pwa-installation.js @@ -2,6 +2,7 @@ const fs = require('node:fs') const fse = require('fs-extra') const { log, warn } = require('../../utils/logger.js') +const { generateTypesFeatureFlag } = require('../../utils/types-feature-flags.js') const pwaDevDeps = { 'workbox-webpack-plugin': '^7.0.0' @@ -50,10 +51,7 @@ module.exports.addMode = function addMode ({ hasEslint === true ? { filter: src => !src.endsWith('/.eslintrc.cjs') } : void 0 ) - fse.copySync( - appPaths.resolve.cli('templates/pwa/pwa-flag.d.ts'), - appPaths.resolve.pwa('pwa-flag.d.ts') - ) + generateTypesFeatureFlag('pwa', appPaths) log('Copying PWA icons to /public/icons/ (if they are not already there)...') fse.copySync( diff --git a/app-webpack/lib/modes/ssr/ssr-installation.js b/app-webpack/lib/modes/ssr/ssr-installation.js index e95988c9b89..1d6e0b0c4ac 100644 --- a/app-webpack/lib/modes/ssr/ssr-installation.js +++ b/app-webpack/lib/modes/ssr/ssr-installation.js @@ -2,6 +2,7 @@ const fs = require('node:fs') const fse = require('fs-extra') const { log, warn } = require('../../utils/logger.js') +const { generateTypesFeatureFlag } = require('../../utils/types-feature-flags.js') function isModeInstalled (appPaths) { return fs.existsSync(appPaths.ssrDir) @@ -27,10 +28,7 @@ module.exports.addMode = function addMode ({ appPaths.ssrDir ) - fse.copySync( - appPaths.resolve.cli('templates/ssr/ssr-flag.d.ts'), - appPaths.resolve.ssr('ssr-flag.d.ts') - ) + generateTypesFeatureFlag('ssr', appPaths) log('SSR support was added') } diff --git a/app-webpack/lib/utils/types-feature-flags.js b/app-webpack/lib/utils/types-feature-flags.js index 3a1a01cc409..b14d8199e9b 100644 --- a/app-webpack/lib/utils/types-feature-flags.js +++ b/app-webpack/lib/utils/types-feature-flags.js @@ -3,14 +3,13 @@ const { writeFileSync, existsSync } = require('node:fs') const { log } = require('./logger.js') -module.exports.ensureTypesFeatureFlags = function ensureTypesFeatureFlags (quasarConf) { - // We don't have a specific entry for the augmenting file in `package.json > exports` - // We rely on the wildcard entry, so we use a deep import, instead of let's say `quasar/feature-flags` - // When using TypeScript `moduleResolution: ""bundler""`, it requires the file extension. - // This may sound unusual, but that's because it seems to treat wildcard entries differently. - - // Keep in sync with `create-quasar/templates/**/store-flag.d.ts` - const template = `/* eslint-disable */ +// We don't have a specific entry for the augmenting file in `package.json > exports` +// We rely on the wildcard entry, so we use a deep import, instead of let's say `quasar/feature-flags` +// When using TypeScript `moduleResolution: ""bundler""`, it requires the file extension. +// This may sound unusual, but that's because it seems to treat wildcard entries differently. +// +// Keep in sync with `create-quasar/templates/**/store-flag.d.ts` +const template = `/* eslint-disable */ /* WARNING: DO NOT MODIFY OR DELETE This file is auto-generated by Quasar CLI @@ -26,6 +25,16 @@ declare module ""quasar/dist/types/feature-flag.d.ts"" { } ` +module.exports.generateTypesFeatureFlag = function generateTypesFeatureFlag (modeName, appPaths) { + const destFlagPath = appPaths.resolve[ modeName ](`${ modeName }-flag.d.ts`) + + writeFileSync( + destFlagPath, + template.replace('__FEATURE_NAME__', modeName) + ) +} + +module.exports.ensureTypesFeatureFlags = function ensureTypesFeatureFlags (quasarConf) { // Flags must be available even in pure JS codebases, // because boot and configure wrappers functions files will // provide autocomplete based on them also to JS users" fd2486f88ddef28bb3afbddec985795cf4f20251,2019-11-07 22:43:58,Razvan Stoenescu,"feat(docs): update ""quasar serve"" command description",False,"update ""quasar serve"" command description",feat,"diff --git a/docs/src/pages/quasar-cli/cli-documentation/commands-list.md b/docs/src/pages/quasar-cli/cli-documentation/commands-list.md index ffca9c8fde0..44e9b669783 100644 --- a/docs/src/pages/quasar-cli/cli-documentation/commands-list.md +++ b/docs/src/pages/quasar-cli/cli-documentation/commands-list.md @@ -535,26 +535,32 @@ $ quasar serve -h control is yielded to /index.js and params have no effect. Options - --port, -p Port to use (default: 8080) - --hostname, -H Address to use (default: 0.0.0.0) - --gzip, -g Compress content (default: true) - --silent, -s Supress log message - --colors Log messages with colors (default: true) - --open, -o Open browser window after starting - --cache, -c Cache time (max-age) in seconds; - Does not apply to /service-worker.js - (default: 86400 - 24 hours) - --micro, -m Use micro-cache (default: 1 second) - --history Use history api fallback; - All requests fallback to index.html - --https Enable HTTPS - --cert, -C [path] Path to SSL cert file (Optional) - --key, -K [path] Path to SSL key file (Optional) - --proxy Proxy specific requests defined in file; - File must export Array ({ path, rule }) - See example below. ""rule"" is defined at: - https://github.com/chimurai/http-proxy-middleware - --help, -h Displays this message + --port, -p Port to use (default: 4000) + --hostname, -H Address to use (default: 0.0.0.0) + --gzip, -g Compress content (default: true) + --silent, -s Supress log message + --colors Log messages with colors (default: true) + --open, -o Open browser window after starting + --cache, -c Cache time (max-age) in seconds; + Does not apply to /service-worker.js + (default: 86400 - 24 hours) + --micro, -m Use micro-cache (default: 1 second) + + --history Use history api fallback; + All requests fallback to /index.html, + unless using ""--index"" parameter + --index, -i History mode (only!) index url path + (default: index.html) + + --https Enable HTTPS + --cert, -C [path] Path to SSL cert file (Optional) + --key, -K [path] Path to SSL key file (Optional) + --proxy Proxy specific requests defined in file; + File must export Array ({ path, rule }) + See example below. ""rule"" is defined at: + https://github.com/chimurai/http-proxy-middleware + --cors Enable CORS for all requests + --help, -h Displays this message Proxy file example module.exports = [" dbb51486a41f697ef9b76aedbbd0404984574212,2024-04-13 00:30:37,Razvan Stoenescu,fix(ui/testing): quirk in ast parsing,False,quirk in ast parsing,fix,"diff --git a/ui/testing/specs/astParser.js b/ui/testing/specs/astParser.js index 5467f99509e..259029b392c 100644 --- a/ui/testing/specs/astParser.js +++ b/ui/testing/specs/astParser.js @@ -382,19 +382,19 @@ export function readAstJson (ctx) { declaration.type === 'FunctionDeclaration' || declaration.type === 'ArrowFunctionExpression' ) { + json.defaultExport = true json.functions.default = { - ...parseFunction({ declaration, isExported: false }), + ...parseFunction({ declaration, isExported: false }).def, accessor: ctx.pascalName } - json.defaultExport = true } // export default class X {} else if (declaration.type === 'ClassDeclaration') { + json.defaultExport = true json.classes.default = { - ...parseClass({ declaration, isExported: false }), + ...parseClass({ declaration, isExported: false }).def, accessor: ctx.pascalName } - json.defaultExport = true } })" 3700b8e14345c34e29bfc9ad787b507718024d36,2016-11-13 15:55:08,Razvan Stoenescu,fix: Search - allow user to focus field on left side too,False,Search - allow user to focus field on left side too,fix,"diff --git a/src/vue-components/search/search.ios.styl b/src/vue-components/search/search.ios.styl index e416df2ab98..b832b24e738 100644 --- a/src/vue-components/search/search.ios.styl +++ b/src/vue-components/search/search.ios.styl @@ -16,6 +16,7 @@ .quasar-search-icon left 9px transition all 300ms ease + pointer-events none .quasar-search-clear right 13px diff --git a/src/vue-components/search/search.mat.styl b/src/vue-components/search/search.mat.styl index a2925ef2818..e242c2ecb02 100644 --- a/src/vue-components/search/search.mat.styl +++ b/src/vue-components/search/search.mat.styl @@ -14,6 +14,7 @@ .quasar-search-icon left 10px + pointer-events none .quasar-search-clear right 13px" 5b86dbf9046a05f8734e2fb9acfab7d1848e90ae,2024-03-12 21:09:01,Razvan Stoenescu,chore(ui): JSON API - set some props as added in v2.15,False,JSON API - set some props as added in v2.15,chore,"diff --git a/ui/src/components/dialog/QDialog.json b/ui/src/components/dialog/QDialog.json index d8e536dd273..9df3a45258f 100644 --- a/ui/src/components/dialog/QDialog.json +++ b/ui/src/components/dialog/QDialog.json @@ -58,7 +58,7 @@ ""none"" ], ""category"": ""style"", - ""addedIn"": ""v2.14.8"" + ""addedIn"": ""v2.15"" }, ""maximized"": { diff --git a/ui/src/components/select/QSelect.json b/ui/src/components/select/QSelect.json index 78d9830d003..deecce915e8 100644 --- a/ui/src/components/select/QSelect.json +++ b/ui/src/components/select/QSelect.json @@ -236,7 +236,7 @@ ""type"": ""Boolean"", ""desc"": ""Changing route app won't dismiss the popup (menu or dialog)"", ""category"": ""behavior"", - ""addedIn"": ""v2.14.8"" + ""addedIn"": ""v2.15"" }, ""use-input"": {" eccbd3242d00f5303120689211b5712ce1c78737,2019-10-26 15:22:44,Razvan Stoenescu,chore(ui): Bump version,False,Bump version,chore,"diff --git a/docs/yarn.lock b/docs/yarn.lock index 539fe43dd37..96982f97bc5 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -968,9 +968,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== ""@types/node@*"": - version ""12.11.2"" - resolved ""https://registry.yarnpkg.com/@types/node/-/node-12.11.2.tgz#75ba3beda30d690b89a5089ca1c6e8e386150b76"" - integrity sha512-dsfE4BHJkLQW+reOS6b17xhZ/6FB1rB8eRRvO08nn5o+voxf3i74tuyFWNH6djdfgX7Sm5s6LD8t6mJug4dpDw== + version ""12.11.7"" + resolved ""https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"" + integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA== ""@types/q@^1.5.1"": version ""1.5.2"" @@ -1833,14 +1833,14 @@ browserify-zlib@^0.2.0: dependencies: pako ""~1.0.5"" -browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.7.1: - version ""4.7.1"" - resolved ""https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.1.tgz#bd400d1aea56538580e8c4d5f1c54ac11b5ab468"" - integrity sha512-QtULFqKIAtiyNx7NhZ/p4rB8m3xDozVo/pi5VgTlADLF2tNigz/QH+v0m5qhn7XfHT7u+607NcCNOnC0HZAlMg== +browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.7.2: + version ""4.7.2"" + resolved ""https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.2.tgz#1bb984531a476b5d389cedecb195b2cd69fb1348"" + integrity sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw== dependencies: - caniuse-lite ""^1.0.30000999"" - electron-to-chromium ""^1.3.284"" - node-releases ""^1.1.36"" + caniuse-lite ""^1.0.30001004"" + electron-to-chromium ""^1.3.295"" + node-releases ""^1.1.38"" buffer-from@^1.0.0: version ""1.1.1"" @@ -2031,10 +2031,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.30000980, caniuse-lite@^1.0.30000999: - version ""1.0.30001002"" - resolved ""https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001002.tgz#ba999a737b1abd5bf0fd47efe43a09b9cadbe9b0"" - integrity sha512-pRuxPE8wdrWmVPKcDmJJiGBxr6lFJq4ivdSeo9FTmGj5Rb8NX3Mby2pARG57MXF15hYAhZ0nHV5XxT2ig4bz3g== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30001004: + version ""1.0.30001004"" + resolved ""https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001004.tgz#d879b73981b255488316da946c39327d8c00a586"" + integrity sha512-3nfOR4O8Wa2RWoYfJkMtwRVOsK96TQ+eq57wd0iKaEWl8dwG4hKZ/g0MVBfCvysFvMLi9fQGR/DvozMdkEPl3g== caseless@~0.12.0: version ""0.12.0"" @@ -2489,17 +2489,17 @@ copy-webpack-plugin@5.0.4: webpack-log ""^2.0.0"" core-js-compat@^3.1.1: - version ""3.3.3"" - resolved ""https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.3.3.tgz#82642808cf484a35292b2f8e83ef9376884e760f"" - integrity sha512-GNZkENsx5pMnS7Inwv7ZO/s3B68a9WU5kIjxqrD/tkNR8mtfXJRk8fAKRlbvWZSGPc59/TkiOBDYl5Cb65pTVA== + version ""3.3.4"" + resolved ""https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.3.4.tgz#a151c6cd754edbfe6a4a2a66b9382df2ae74fbcd"" + integrity sha512-7OK3/LPP8R3Ovasf3GilEOp+o1w0ZKJ75FMou2RDfTwIV69G5RkKCGFnqgBv/ZhR6xo9GCzlfVALyHmydbE7DA== dependencies: - browserslist ""^4.7.1"" + browserslist ""^4.7.2"" semver ""^6.3.0"" core-js-pure@^3.0.0: - version ""3.3.3"" - resolved ""https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.3.3.tgz#c6a796e371782394ffb60d82ff67e0e073070093"" - integrity sha512-sBLE90LngoFYwhLsy5ftt+WWxkQnMufRsn2uyYxJxW73SkvAlxonAdZARimkKrK1c+w01eX9r19vA/J5KMtqfA== + version ""3.3.4"" + resolved ""https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.3.4.tgz#01d2842f552a866265dc77ededb2ccd668ff2879"" + integrity sha512-hqxt6XpR4zIMNUY920oNyAtwaq4yg8IScmXumnfyRWF9+ur7wtjr/4eCdfTJzY64jmi8WRCwIqNBKzYeOKdvnw== core-js@^2.4.0, core-js@^2.6.5: version ""2.6.10"" @@ -3142,10 +3142,10 @@ ejs@^2.3.1, ejs@^2.6.1: resolved ""https://registry.yarnpkg.com/ejs/-/ejs-2.7.1.tgz#5b5ab57f718b79d4aca9254457afecd36fa80228"" integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ== -electron-to-chromium@^1.3.284: - version ""1.3.292"" - resolved ""https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.292.tgz#7812fc5138619342f1dd5823df6e9cbb7d2820e9"" - integrity sha512-hqkem5ANpt6mxVXmhAmlbdG8iicuyM/jEYgmP1tiHPeOLyZoTyGUzrDmJS/xyrrZy9frkW1uQcubicu7f6DS5g== +electron-to-chromium@^1.3.295: + version ""1.3.296"" + resolved ""https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.296.tgz#a1d4322d742317945285d3ba88966561b67f3ac8"" + integrity sha512-s5hv+TSJSVRsxH190De66YHb50pBGTweT9XGWYu/LMR20KX6TsjFzObo36CjVAzM+PUeeKSBRtm/mISlCzeojQ== elementtree@0.1.7: version ""0.1.7"" @@ -4127,9 +4127,9 @@ good-listener@^1.2.2: delegate ""^3.1.2"" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2: - version ""4.2.2"" - resolved ""https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"" - integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q== + version ""4.2.3"" + resolved ""https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== gray-matter@^4.0.2: version ""4.0.2"" @@ -5755,10 +5755,10 @@ minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: safe-buffer ""^5.1.2"" yallist ""^3.0.0"" -minipass@^3.0.0: - version ""3.0.1"" - resolved ""https://registry.yarnpkg.com/minipass/-/minipass-3.0.1.tgz#b4fec73bd61e8a40f0b374ddd04260ade2c8ec20"" - integrity sha512-2y5okJ4uBsjoD2vAbLKL9EUQPPkC0YMIp+2mZOXG3nBba++pdfJWRxx2Ewirc0pwAJYu4XtWg2EkVo1nRXuO/w== +minipass@^3.0.0, minipass@^3.1.1: + version ""3.1.1"" + resolved ""https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"" + integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w== dependencies: yallist ""^4.0.0"" @@ -5986,10 +5986,10 @@ node-pre-gyp@^0.12.0: semver ""^5.3.0"" tar ""^4"" -node-releases@^1.1.36: - version ""1.1.38"" - resolved ""https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.38.tgz#d81b365df2936654ba37f509ba2fbe91eff2578b"" - integrity sha512-/5NZAaOyTj134Oy5Cp/J8mso8OD/D9CSuL+6TOXXsTKO8yjc5e4up75SRPCganCjwFKMj2jbp5tR0dViVdox7g== +node-releases@^1.1.38: + version ""1.1.39"" + resolved ""https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.39.tgz#c1011f30343aff5b633153b10ff691d278d08e8d"" + integrity sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA== dependencies: semver ""^6.3.0"" @@ -7022,9 +7022,9 @@ postcss@^6.0.14: supports-color ""^5.4.0"" postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.5, postcss@^7.0.6: - version ""7.0.18"" - resolved ""https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"" - integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g== + version ""7.0.21"" + resolved ""https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"" + integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ== dependencies: chalk ""^2.4.2"" source-map ""^0.6.1"" @@ -7300,9 +7300,9 @@ qs@~6.5.2: integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== quasar@^1.0.0: - version ""1.2.5"" - resolved ""https://registry.yarnpkg.com/quasar/-/quasar-1.2.5.tgz#eefc723b347b20ce324954aff9b412be9520dca3"" - integrity sha512-O/bQtdu4Bn0+VfnvIZW8QY4FvfybCCQVoXmDFq7e3yW/V/1pvIjWPKei/qVKY5v303YohxJoTrGoAkmMMjYp8Q== + version ""1.2.6"" + resolved ""https://registry.yarnpkg.com/quasar/-/quasar-1.2.6.tgz#cf468a1836363ea3f55f59cc979c9dc889b0c5ec"" + integrity sha512-KF+L54gBADq5Wa7CxzzyXB5/KH9p9E+oSYjsHTihUf00AC00Vrk1GLlcJA5UEt0h8UajztUNVOwzZw81tRW11A== query-string@^4.1.0: version ""4.3.4"" @@ -8220,12 +8220,12 @@ ssri@^6.0.1: figgy-pudding ""^3.5.1"" ssri@^7.0.0: - version ""7.0.1"" - resolved ""https://registry.yarnpkg.com/ssri/-/ssri-7.0.1.tgz#b0cab7bbb11ac9ea07f003453e2011f8cbed9f34"" - integrity sha512-FfndBvkXL9AHyGLNzU3r9AvYIBBZ7gm+m+kd0p8cT3/v4OliMAyipZAhLVEv1Zi/k4QFq9CstRGVd9pW/zcHFQ== + version ""7.1.0"" + resolved ""https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d"" + integrity sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g== dependencies: figgy-pudding ""^3.5.1"" - minipass ""^3.0.0"" + minipass ""^3.1.1"" stable@^0.1.8: version ""0.1.8"" @@ -8796,9 +8796,9 @@ uglify-js@^2.6.1: uglify-to-browserify ""~1.0.0"" uglify-js@^3.5.1: - version ""3.6.3"" - resolved ""https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.3.tgz#1351533bbe22cc698f012589ed6bd4cbd971bff8"" - integrity sha512-KfQUgOqTkLp2aZxrMbCuKCDGW9slFYu2A23A36Gs7sGzTLcRBDORdOi5E21KWHFIfkY8kzgi/Pr1cXCh0yIp5g== + version ""3.6.4"" + resolved ""https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.4.tgz#88cc880c6ed5cf9868fdfa0760654e7bed463f1d"" + integrity sha512-9Yc2i881pF4BPGhjteCXQNaXx1DCwm3dtOyBaG2hitHjLWOczw/ki8vD1bqyT3u6K0Ms/FpCShkmfg+FtlOfYA== dependencies: commander ""~2.20.3"" source-map ""~0.6.1"" diff --git a/ui/package.json b/ui/package.json index d46dededbb5..2e977ed0201 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { ""name"": ""quasar"", - ""version"": ""1.2.5"", + ""version"": ""1.2.6"", ""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""," 208e921713a819ff1082a9b14633706ccd0058a6,2023-08-14 23:03:01,Razvan Stoenescu,fix(app-vite/app-webpack): add QUASAR_PUBLIC_FOLDER to electron flag file,False,add QUASAR_PUBLIC_FOLDER to electron flag file,fix,"diff --git a/app-vite/templates/electron/ts/electron-env.d.ts b/app-vite/templates/electron/ts/electron-env.d.ts index dea1502a00f..359c39de9cd 100644 --- a/app-vite/templates/electron/ts/electron-env.d.ts +++ b/app-vite/templates/electron/ts/electron-env.d.ts @@ -2,6 +2,7 @@ declare namespace NodeJS { interface ProcessEnv { + QUASAR_PUBLIC_FOLDER: string; QUASAR_ELECTRON_PRELOAD: string; APP_URL: string; } diff --git a/app-webpack/templates/electron/ts/electron-env.d.ts b/app-webpack/templates/electron/ts/electron-env.d.ts index dea1502a00f..359c39de9cd 100644 --- a/app-webpack/templates/electron/ts/electron-env.d.ts +++ b/app-webpack/templates/electron/ts/electron-env.d.ts @@ -2,6 +2,7 @@ declare namespace NodeJS { interface ProcessEnv { + QUASAR_PUBLIC_FOLDER: string; QUASAR_ELECTRON_PRELOAD: string; APP_URL: string; }" 3d0243410cdb89b3fe3566afbec5414fb376c20c,2020-04-30 20:24:15,Razvan Stoenescu,chore(docs): remove one favicon tag,False,remove one favicon tag,chore,"diff --git a/docs/src/index.template.html b/docs/src/index.template.html index d8b6563661a..8866a06ecf7 100644 --- a/docs/src/index.template.html +++ b/docs/src/index.template.html @@ -14,7 +14,6 @@ - " 2dfef8ab75638482683bb7658d2330a33d84ef74,2020-11-25 07:42:11,Razvan Stoenescu,fix(QTable): accessing header slot,False,accessing header slot,fix,"diff --git a/ui/src/components/table/QTable.js b/ui/src/components/table/QTable.js index a3e0a5f3a7b..75f63c89c18 100644 --- a/ui/src/components/table/QTable.js +++ b/ui/src/components/table/QTable.js @@ -292,11 +292,9 @@ export default defineComponent({ return this.__getGridBody() } - const header = this.hideHeader !== true ? this.__getTHead : void 0 + const header = this.hideHeader !== true ? this.__getTHead : null if (this.hasVirtScroll === true) { - const body = this.$slots.body - return h(QVirtualScroll, { ref: 'virtScroll', class: this.tableClass, @@ -305,20 +303,25 @@ export default defineComponent({ items: this.computedRows, type: '__qtable', tableColspan: this.computedColspan, - 'onVirtual-scroll': this.__onVScroll + onVirtualScroll: this.__onVScroll }, { - default: props => this.__getTBodyTR(props.item, body, props.index), - before: header + default: props => this.__getTBodyTR(props.item, this.$slots.body, props.index), + header }) } + const child = [ + this.__getTBody() + ] + + if (header !== null) { + child.unshift(header()) + } + return getTableMiddle({ class: [ 'q-table__middle scroll', this.tableClass ], style: this.tableStyle - }, [ - header(), - this.__getTBody() - ]) + }, child) }, scrollTo (toIndex) {" ffb62d1c44ebafc5b1fcfdee4d680bbe411f1e99,2020-12-16 00:30:48,Razvan Stoenescu,fix(QTable): duplicate headerClasses added #8205,False,duplicate headerClasses added #8205,fix,"diff --git a/ui/src/components/table/table-header.js b/ui/src/components/table/table-header.js index 658d1a4660e..fa93f9f1cbd 100644 --- a/ui/src/components/table/table-header.js +++ b/ui/src/components/table/table-header.js @@ -51,9 +51,7 @@ export default { ? slot(props) : h(QTh, { key: col.name, - props: { props }, - style: col.headerStyle, - class: col.headerClasses + props: { props } }, col.label) })" 35dfd8edff6aec6d65e5b160115ae4a48f4a6b6b,2021-01-06 20:00:58,Jeff Galbraith,chore(extras): bump version,False,bump version,chore,"diff --git a/extras/package.json b/extras/package.json index 0317c18bb8f..a542216f443 100644 --- a/extras/package.json +++ b/extras/package.json @@ -1,6 +1,6 @@ { ""name"": ""@quasar/extras"", - ""version"": ""1.9.12"", + ""version"": ""1.9.13"", ""description"": ""Quasar Framework fonts, icons and animations"", ""scripts"": { ""build"": ""node build/index.js""" 78149ef82fc5c07f750051bb47577b3c3771c68f,2020-02-18 22:11:39,Allan Gaunt,fix(QCarousel): Autoplay breaks when it's a number (#6408),False,Autoplay breaks when it's a number (#6408),fix,"diff --git a/ui/src/components/carousel/QCarousel.js b/ui/src/components/carousel/QCarousel.js index 3c193a50ed5..ee78959896b 100644 --- a/ui/src/components/carousel/QCarousel.js +++ b/ui/src/components/carousel/QCarousel.js @@ -216,7 +216,7 @@ export default Vue.extend({ }, mounted () { - this.autoplay === true && this.__startTimer() + (this.autoplay === true || isNumber(this.autoplay)) && this.__startTimer() }, beforeDestroy () {" f4482caa343928b4e69548a42a2feef38df7803c,2019-11-13 13:46:54,Razvan Stoenescu,fix(app): Capacitor mode - correctly escape default path #5556,False,Capacitor mode - correctly escape default path #5556,fix,"diff --git a/app/lib/helpers/open-ide.js b/app/lib/helpers/open-ide.js index e36d8021fb0..c2b0b8c48cd 100644 --- a/app/lib/helpers/open-ide.js +++ b/app/lib/helpers/open-ide.js @@ -85,7 +85,11 @@ function runLinux (mode, bin, target) { } function getWindowsPath (bin) { - const studioPath = 'C:\\Program Files\\Android\\Android Studio\\bin\\studio64.exe' + if (bin.windowsAndroidStudio && fs.existsSync(bin.windowsAndroidStudio)) { + return bin.windowsAndroidStudio + } + + const studioPath = 'C:\\Program\ Files\\Android\\Android Studio\\bin\\studio64.exe' if (fs.existsSync(studioPath)) { return studioPath } @@ -103,10 +107,6 @@ function getWindowsPath (bin) { } } catch (e) {} - - if (bin.windowsAndroidStudio && fs.existsSync(bin.windowsAndroidStudio)) { - return bin.windowsAndroidStudio - } } function runWindows (mode, bin, target) { @@ -136,7 +136,7 @@ function runWindows (mode, bin, target) { warn(`⚠️ Cannot determine path to IDE executable`) console.log(' Please set quasar.conf.js > bin > windowsAndroidStudio with the escaped path to your studio64.exe') - console.log(` Example: 'C:\\\\Program Files\\\\Android\\\\Android Studio\\\\bin\\\\studio64.exe'`) + console.log(` Example: 'C:\\\\Program\\ Files\\\\Android\\\\Android Studio\\\\bin\\\\studio64.exe'`) process.exit(1) }" c0502689844fad138fb2c4dd5a62ae87cf7128ad,2022-03-10 23:13:05,Popescu Dan,fix(LoadingBar): update isActive value when xhr events are hijacked #12573 (#12728),False,update isActive value when xhr events are hijacked #12573 (#12728),fix,"diff --git a/ui/dev/src/pages/components/ajax-bar.vue b/ui/dev/src/pages/components/ajax-bar.vue index 241a602207d..e12fe103cb6 100644 --- a/ui/dev/src/pages/components/ajax-bar.vue +++ b/ui/dev/src/pages/components/ajax-bar.vue @@ -58,9 +58,10 @@
-
+
- + +
Loading bar status: {{ loadingState }}
@@ -109,6 +110,10 @@ export default { computed: { computedSize () { return this.size + 'px' + }, + + loadingState () { + return LoadingBar.isActive === true ? 'active' : 'idle' } }, methods: { @@ -135,11 +140,11 @@ export default { }, triggerXhr1 () { - sendXhr('/server') + sendXhr('https://deelay.me/5000/server') }, triggerXhr2 () { - sendXhr('/second-server') + sendXhr('https://deelay.me/2000/second-server') } } } diff --git a/ui/dev/src/pages/global/loadingbar.vue b/ui/dev/src/pages/global/loading-bar.vue similarity index 71% rename from ui/dev/src/pages/global/loadingbar.vue rename to ui/dev/src/pages/global/loading-bar.vue index e08feebc5ee..cfc986f82e4 100644 --- a/ui/dev/src/pages/global/loadingbar.vue +++ b/ui/dev/src/pages/global/loading-bar.vue @@ -1,11 +1,12 @@ @@ -20,7 +22,19 @@ + + diff --git a/dev/components/components/list-item.vue b/dev/components/components/list-item.vue index 4ebddd2221c..ce33eff161e 100644 --- a/dev/components/components/list-item.vue +++ b/dev/components/components/list-item.vue @@ -106,9 +106,47 @@ - - Dense +

Links

+ + + + + + Inactive link + + + + + + + Active link + + + + + + + Inactive link + + + + + + Active link + + + + + + + + Customized active link + + + +

Dense

+ Single line item @@ -525,3 +563,13 @@ export default { } } + + diff --git a/src/components/breadcrumbs/QBreadcrumbsEl.js b/src/components/breadcrumbs/QBreadcrumbsEl.js index 652fb6d92f2..a6fcb4edd8c 100644 --- a/src/components/breadcrumbs/QBreadcrumbsEl.js +++ b/src/components/breadcrumbs/QBreadcrumbsEl.js @@ -1,24 +1,30 @@ import QIcon from '../icon/QIcon.js' -import { routerLinkProps } from '../../utils/router-link.js' +import { RouterLinkMixin } from '../../mixins/router-link.js' export default { name: 'QBreadcrumbsEl', - mixins: [{ props: routerLinkProps }], + + mixins: [ RouterLinkMixin ], + props: { label: String, icon: String, color: String }, + render (h) { - return h(this.to !== void 0 ? 'router-link' : 'span', { + return h(this.hasRouterLink ? 'router-link' : 'span', { staticClass: 'q-breadcrumbs__el q-link flex inline items-center relative-position', - props: this.to !== void 0 ? this.$props : null + props: this.hasRouterLink ? this.routerLinkProps : null }, [ + (this.icon && h(QIcon, { staticClass: 'q-mr-sm', props: { name: this.icon } })) || void 0, + this.label + ].concat(this.$slots.default)) } } diff --git a/src/components/breadcrumbs/breadcrumbs.styl b/src/components/breadcrumbs/breadcrumbs.styl index 688df4642e5..bb6aff0e01c 100644 --- a/src/components/breadcrumbs/breadcrumbs.styl +++ b/src/components/breadcrumbs/breadcrumbs.styl @@ -1,5 +1,9 @@ -.q-breadcrumbs__el .q-icon - font-size 125% +.q-breadcrumbs__el + color inherit + + .q-icon + font-size 125% + .q-breadcrumbs__last a pointer-events none diff --git a/src/components/btn/QBtn.js b/src/components/btn/QBtn.js index 889a93117ac..5f1ef4e89d0 100644 --- a/src/components/btn/QBtn.js +++ b/src/components/btn/QBtn.js @@ -6,7 +6,7 @@ import { stopAndPrevent } from '../../utils/event.js' export default { name: 'QBtn', - mixins: [BtnMixin], + mixins: [ BtnMixin ], props: { percentage: Number, darkPercentage: Boolean, @@ -53,6 +53,7 @@ export default { methods: { click (e) { this.__cleanup() + this.$el.blur() if (this.to !== void 0 || this.isDisabled) { e && stopAndPrevent(e) @@ -159,7 +160,6 @@ export default { directives: this.hasRipple ? [{ name: 'ripple', - value: true, modifiers: { center: this.isRound } }] : null diff --git a/src/components/list/QExpansionItem.js b/src/components/list/QExpansionItem.js index 88b2a1ccf07..3be96e824d9 100644 --- a/src/components/list/QExpansionItem.js +++ b/src/components/list/QExpansionItem.js @@ -7,7 +7,7 @@ import QSlideTransition from '../slide-transition/QSlideTransition.js' import QSeparator from '../separator/QSeparator.js' -import { RouterLinkMixin } from '../../utils/router-link.js' +import { RouterLinkMixin } from '../../mixins/router-link.js' import ModelToggleMixin from '../../mixins/model-toggle.js' import { stopAndPrevent } from '../../utils/event.js' @@ -24,6 +24,7 @@ export default { label: String, caption: String, dark: Boolean, + dense: Boolean, expandIcon: String, duration: Number, @@ -63,17 +64,18 @@ export default { ] }, isClickable () { - return this.to !== void 0 || !this.expandIconToggle + return this.hasRouterLink || !this.expandIconToggle } }, methods: { __toggleItem (e) { - !this.expandIconToggle && this.toggle(e) + !this.hasRouterLink && this.toggle(e) }, __toggleIcon (e) { - if (this.to !== void 0 || this.expandIconToggle) { + if (this.hasRouterLink || this.expandIconToggle) { stopAndPrevent(e) + this.$refs.item.$el.blur() this.toggle(e) } }, @@ -138,27 +140,27 @@ export default { child[this.switchToggleSide ? 'unshift' : 'push'](this.__getToggleIcon(h)) const data = { + ref: 'item', style: this.headerStyle, 'class': this.headerClass, props: { dark: this.dark, disable: this.disable, + dense: this.dense, inset: this.headerInset && !this.switchToggleSide } } if (this.isClickable) { + data.props.clickable = true data.on = { click: this.__toggleItem } - Object.assign(data.props, { - clickable: true, - to: this.to, - exact: this.exact, - append: this.append, - replace: this.replace - }) + this.hasRouterLink && Object.assign( + data.props, + this.routerLinkProps + ) } return h(QItem, data, child) diff --git a/src/components/list/QItem.js b/src/components/list/QItem.js index 3e1162697de..65c1d1b8f73 100644 --- a/src/components/list/QItem.js +++ b/src/components/list/QItem.js @@ -1,10 +1,8 @@ -import { routerLinkProps } from '../../utils/router-link.js' +import { RouterLinkMixin } from '../../mixins/router-link.js' export default { name: 'QItem', - mixins: [{ - props: routerLinkProps - }], + mixins: [ RouterLinkMixin ], props: { clickable: Boolean, dense: Boolean, @@ -24,7 +22,7 @@ export default { isClickable () { return !this.disable && ( this.clickable || - this.to !== void 0 || + this.hasRouterLink || this.tag === 'a' || this.tag === 'label' ) @@ -64,14 +62,16 @@ export default { data.attrs = { tabindex: this.tabindex } - data.on = { + data[this.hasRouterLink ? 'nativeOn' : 'on'] = { click: this.__onClick, keydown: this.__onKeydown } } - if (this.to !== void 0) { - data.props = Object.assign({}, this.$props, { tag: 'a' }) + if (this.hasRouterLink) { + data.tag = 'a' + data.props = this.routerLinkProps + return h('router-link', data, this.__getContent(h)) } diff --git a/src/components/list/list.styl b/src/components/list/list.styl index 515c9efa628..c73ce1f919c 100644 --- a/src/components/list/list.styl +++ b/src/components/list/list.styl @@ -1,6 +1,8 @@ .q-item min-height 48px - padding 4px 16px + padding 8px 16px + + color inherit &--inset padding-left 72px @@ -44,6 +46,12 @@ & + .q-item__label margin-top 4px + &.q-router-link--active + color $primary + .q-item__section--avatar + &, & .q-icon + color $primary + .q-item__section--main ~ .q-item__section--side align-items flex-end padding-right 0 diff --git a/src/components/tab/QRouteTab.js b/src/components/tab/QRouteTab.js index f4fcf8c434d..62c03d7e18e 100644 --- a/src/components/tab/QRouteTab.js +++ b/src/components/tab/QRouteTab.js @@ -1,9 +1,9 @@ -import { RouterLinkMixin, routerLinkEvent, routerLinkEventName } from '../../utils/router-link.js' +import { RouterLinkMixin, routerLinkEvent, routerLinkEventName } from '../../mixins/router-link.js' import TabMixin from './tab-mixin.js' export default { name: 'QRouteTab', - mixins: [TabMixin, RouterLinkMixin], + mixins: [ TabMixin, RouterLinkMixin ], inject: { selectTabRouter: {} }, @@ -22,10 +22,10 @@ export default { }, checkIfSelected () { this.$nextTick(() => { - if (this.$el.classList.contains('q-router-link-exact-active')) { + if (this.isExactActiveRoute(this.$el)) { this.selectTabRouter({ value: this.name, selectable: true, exact: true }) } - else if (this.$el.classList.contains('q-router-link-active')) { + else if (this.isActiveRoute(this.$el)) { const path = this.$router.resolve(this.to, undefined, this.append) this.selectTabRouter({ value: this.name, selectable: true, priority: path.href.length }) } @@ -42,13 +42,8 @@ export default { return h('router-link', { props: { tag: 'a', - to: this.to, - exact: this.exact, - append: this.append, - replace: this.replace, event: routerLinkEventName, - activeClass: 'q-router-link-active', - exactActiveClass: 'q-router-link-exact-active' + ...this.routerLinkProps }, attrs: { tabindex: -1 diff --git a/src/css/core/helpers.styl b/src/css/core/helpers.styl index 2a81a83b981..0e51c3b9893 100644 --- a/src/css/core/helpers.styl +++ b/src/css/core/helpers.styl @@ -32,7 +32,6 @@ -webkit-appearance none margin 0 -a.q-link +.q-link outline 0 - color inherit text-decoration none diff --git a/src/css/variables.styl b/src/css/variables.styl index 1699cea6bf1..2ab19d022fc 100644 --- a/src/css/variables.styl +++ b/src/css/variables.styl @@ -78,9 +78,6 @@ $breakpoint-lg-max ?= $breakpoint-lg $breakpoint-xl-min ?= $sizes[xl] $breakpoint-xl-max ?= 9999px -$router-link-active ?= router-link-active -$router-link-exact-active ?= router-link-exact-active - $headings ?= { h1: { size: 6rem, diff --git a/src/mixins/router-link.js b/src/mixins/router-link.js new file mode 100644 index 00000000000..c1d743cdd7b --- /dev/null +++ b/src/mixins/router-link.js @@ -0,0 +1,58 @@ +import { isSSR } from '../plugins/platform.js' + +export const routerLinkEventName = 'qrouterlinkclick' + +let evt = null + +if (!isSSR) { + try { + evt = new Event(routerLinkEventName) + } + catch (e) { + // IE doesn't support `new Event()`, so...` + evt = document.createEvent('Event') + evt.initEvent(routerLinkEventName, true, false) + } +} + +export const routerLinkProps = { + to: [String, Object], + exact: Boolean, + append: Boolean, + replace: Boolean, + activeClass: String, + exactActiveClass: String +} + +export { evt as routerLinkEvent } + +export const RouterLinkMixin = { + props: routerLinkProps, + + computed: { + hasRouterLink () { + return this.to !== void 0 + }, + + routerLinkProps () { + return { + to: this.to, + exact: this.exact, + append: this.append, + replace: this.replace, + activeClass: this.activeClass || 'q-router-link--active', + exactActiveClass: this.exactActiveClass || 'q-router-link--exact-active' + } + } + }, + + methods: { + isExactActiveRoute (el) { + return el.classList.contains('q-router-link--exact-active') + }, + + isActiveRoute (el) { + return el.classList.contains('q-router-link--active') + } + } +} diff --git a/src/utils/router-link.js b/src/utils/router-link.js deleted file mode 100644 index bcaa4957354..00000000000 --- a/src/utils/router-link.js +++ /dev/null @@ -1,34 +0,0 @@ -import { isSSR } from '../plugins/platform.js' - -export const routerLinkEventName = 'qrouterlinkclick' - -let evt = null - -if (!isSSR) { - try { - evt = new Event(routerLinkEventName) - } - catch (e) { - // IE doesn't support `new Event()`, so...` - evt = document.createEvent('Event') - evt.initEvent(routerLinkEventName, true, false) - } -} - -export const routerLinkProps = { - to: [String, Object], - exact: Boolean, - append: Boolean, - replace: Boolean -} - -export { evt as routerLinkEvent } - -export const RouterLinkMixin = { - props: routerLinkProps, - data () { - return { - routerLinkEventName - } - } -}" 0b6a9b0671d654ce3362d9516ef59ad6bea3cdcf,2023-09-21 13:52:53,Razvan Stoenescu,feat(docs): copy btn -> improve algorithm,False,copy btn -> improve algorithm,feat,"diff --git a/docs/src/components/CopyButton.vue b/docs/src/components/CopyButton.vue index 207b53b267a..54cc03ee9ae 100644 --- a/docs/src/components/CopyButton.vue +++ b/docs/src/components/CopyButton.vue @@ -26,12 +26,15 @@ const copied = ref(false) function copy () { const target = proxy.$el.previousSibling + + // We need to remove artifacts (like line numbers) + // before we copy the content. + // The doc-code--copying class will do that for us target.classList.add('doc-code--copying') + const text = target.innerText + target.classList.remove('doc-code--copying') - copyToClipboard(target.innerText) - .finally(() => { - target.classList.remove('doc-code--copying') - }) + copyToClipboard(text) .then(() => { copied.value = true clearTimeout(timer)" 1e6ad26c65f4ed8875b872fe5e447300e4149d16,2016-11-09 18:50:27,Razvan Stoenescu,feat: #158 Floating label for Datetime & Selectbox,False,#158 Floating label for Datetime & Selectbox,feat,"diff --git a/dev/components/form/datetime.vue b/dev/components/form/datetime.vue index 197e8e6c2d3..f7bc8e2e0d7 100644 --- a/dev/components/form/datetime.vue +++ b/dev/components/form/datetime.vue @@ -54,6 +54,12 @@

Date & Time

+

With Label

+ + +

With Placeholder

+ +

Disabled State

diff --git a/dev/components/form/dialog-select.vue b/dev/components/form/dialog-select.vue index 6ee65acd354..29a15cfe747 100644 --- a/dev/components/form/dialog-select.vue +++ b/dev/components/form/dialog-select.vue @@ -8,6 +8,9 @@

With Toggles

+

With Label

+ +

With Placeholder

@@ -23,33 +26,33 @@

Inside of a List

Single Selection
-
+
supervisor_account -
+

-
+
supervisor_account -
+
Multiple Selection
-
+
supervisor_account -
+
-
+
supervisor_account -
+
diff --git a/dev/components/form/select.vue b/dev/components/form/select.vue index 215dc82883f..0388a37bc0a 100644 --- a/dev/components/form/select.vue +++ b/dev/components/form/select.vue @@ -8,8 +8,11 @@

With Toggles

+

With Label

+ +

With Placeholder

- +

Disabled State

diff --git a/src/css-components/textfield/textfield.ios.styl b/src/css-components/textfield/textfield.ios.styl index 085812a03ea..b0112d71cdb 100644 --- a/src/css-components/textfield/textfield.ios.styl +++ b/src/css-components/textfield/textfield.ios.styl @@ -38,21 +38,6 @@ textarea:not(.no-style) label font-size $label-font-size -input, .textfield - &.caret - position relative - padding-right 17px - white-space nowrap - overflow hidden - > div - overflow hidden - &:after - position absolute - top 50% - right 0 - transform translateY(-50%) scaleY(.45) scaleX(.85) - content '\25BC' - .stacked-label, .floating-label position relative display inline-block diff --git a/src/css-components/textfield/textfield.mat.styl b/src/css-components/textfield/textfield.mat.styl index de27476a232..1045421f4f5 100644 --- a/src/css-components/textfield/textfield.mat.styl +++ b/src/css-components/textfield/textfield.mat.styl @@ -36,21 +36,6 @@ textarea:not(.no-style) label font-size $label-font-size -input, .textfield - &.caret - position relative - padding-right 17px - white-space nowrap - overflow hidden - > div - overflow hidden - &:after - position absolute - top 50% - right 0 - transform translateY(-50%) scaleY(.45) scaleX(.85) - content '\25BC' - .stacked-label, .floating-label position relative display inline-block diff --git a/src/helper-components/picker-textfield/PickerTextfield.vue b/src/helper-components/picker-textfield/PickerTextfield.vue new file mode 100644 index 00000000000..38f6d7f838f --- /dev/null +++ b/src/helper-components/picker-textfield/PickerTextfield.vue @@ -0,0 +1,30 @@ + + + diff --git a/src/helper-components/picker-textfield/picker-textfield.ios.styl b/src/helper-components/picker-textfield/picker-textfield.ios.styl new file mode 100644 index 00000000000..2a245baef3c --- /dev/null +++ b/src/helper-components/picker-textfield/picker-textfield.ios.styl @@ -0,0 +1,32 @@ +$picker-textfield-min-width ?= 100px + +.quasar-picker-textfield + display inline-block + vertical-align middle + min-width $picker-textfield-min-width + position relative + padding-right 17px !important + white-space nowrap + overflow hidden + &:after + position absolute + bottom 8px + right 0 + transform scaleY(.45) scaleX(.85) + content '\25BC' + .quasar-picker-textfield-value + height 1rem + color $faded + .quasar-picker-textfield-label + width 100% + transition transform .15s ease-in-out, color .3s + transform scale(.8) + pointer-events none + transform-origin left top + color $form-active-color + &.with-label + .quasar-picker-textfield-value + color rgba(0, 0, 0, 0) + &.active + .quasar-picker-textfield-value + color inherit diff --git a/src/helper-components/picker-textfield/picker-textfield.mat.styl b/src/helper-components/picker-textfield/picker-textfield.mat.styl new file mode 100644 index 00000000000..8527e312058 --- /dev/null +++ b/src/helper-components/picker-textfield/picker-textfield.mat.styl @@ -0,0 +1,35 @@ +$picker-textfield-min-width ?= 100px + +.quasar-picker-textfield + display inline-block + vertical-align middle + min-width $picker-textfield-min-width + position relative + padding-right 17px !important + white-space nowrap + overflow hidden + &:after + position absolute + bottom 8px + right 0 + transform scaleY(.45) scaleX(.85) + content '\25BC' + .quasar-picker-textfield-value + height 1rem + color $faded + .quasar-picker-textfield-label + width 100% + color $faded + transition transform .15s ease-in-out, color .3s + transform translateY(1rem) scale(1) + pointer-events none + transform-origin left top + &.with-label + .quasar-picker-textfield-value + color rgba(0, 0, 0, 0) + &.active + .quasar-picker-textfield-value + color inherit + .quasar-picker-textfield-label + transform translateY(0) scale(.8) + color $form-active-color diff --git a/src/themes/quasar.ios.styl b/src/themes/quasar.ios.styl index 20c35c46761..e7131058805 100644 --- a/src/themes/quasar.ios.styl +++ b/src/themes/quasar.ios.styl @@ -15,5 +15,6 @@ $toolbar-faded-color ?= composite-color($toolbar-color) @import '../components/*/*.ios' @import '../css-components/*/*.ios' @import '../vue-components/*/*.ios' +@import '../helper-components/*/*.ios' @import './quasar.core.definitions' diff --git a/src/themes/quasar.mat.styl b/src/themes/quasar.mat.styl index db0f02eeaea..b9f13fa7808 100644 --- a/src/themes/quasar.mat.styl +++ b/src/themes/quasar.mat.styl @@ -40,5 +40,6 @@ if $typography-font-family == 'Roboto' @import '../components/*/*.mat' @import '../css-components/*/*.mat' @import '../vue-components/*/*.mat' +@import '../helper-components/*/*.mat' @import './quasar.core.definitions' diff --git a/src/vue-components/datetime/Datetime.vue b/src/vue-components/datetime/Datetime.vue index d7ff75520fc..54c0fd92f17 100644 --- a/src/vue-components/datetime/Datetime.vue +++ b/src/vue-components/datetime/Datetime.vue @@ -1,12 +1,18 @@ diff --git a/src/vue-components/datetime/datetime.ios.styl b/src/vue-components/datetime/datetime.ios.styl index f09f4b475f3..cf4b9199f43 100644 --- a/src/vue-components/datetime/datetime.ios.styl +++ b/src/vue-components/datetime/datetime.ios.styl @@ -1,5 +1,3 @@ -$datetime-desktop-min-width ?= 50px - .quasar-datetime max-width 100vw border 1px solid $grey-4 @@ -8,14 +6,10 @@ $datetime-desktop-min-width ?= 50px &.type-date width 320px &.type-time - width 200px + width 250px &.type-datetime width 320px -.quasar-datetime-desktop - display inline-block - min-width $datetime-desktop-min-width - .quasar-datetime-content height 200px position relative diff --git a/src/vue-components/datetime/datetime.mat.styl b/src/vue-components/datetime/datetime.mat.styl index 54d68f13e0f..95249326c17 100644 --- a/src/vue-components/datetime/datetime.mat.styl +++ b/src/vue-components/datetime/datetime.mat.styl @@ -1,5 +1,4 @@ $datetime-color ?= $primary -$datetime-desktop-min-width ?= 50px .quasar-datetime color rgba(0, 0, 0, .87) @@ -8,10 +7,6 @@ $datetime-desktop-min-width ?= 50px user-select none line-height initial -.quasar-datetime-desktop - display inline-block - min-width $datetime-desktop-min-width - .quasar-datetime-header color opposite-non-color($datetime-color) background $datetime-color diff --git a/src/vue-components/select/DialogSelect.vue b/src/vue-components/select/DialogSelect.vue index 86a546514c0..00cef798041 100644 --- a/src/vue-components/select/DialogSelect.vue +++ b/src/vue-components/select/DialogSelect.vue @@ -1,15 +1,17 @@ diff --git a/src/vue-components/select/Select.vue b/src/vue-components/select/Select.vue index 3728c104edc..853922366f1 100644 --- a/src/vue-components/select/Select.vue +++ b/src/vue-components/select/Select.vue @@ -1,10 +1,11 @@ " ee1c311c2310216ffc4548e02314a02338309029,2024-04-30 20:32:56,Razvan Stoenescu,chore(QPageSticky): add extension to import statement,False,add extension to import statement,chore,"diff --git a/ui/src/components/page-sticky/QPageSticky.js b/ui/src/components/page-sticky/QPageSticky.js index 1bffbbc3ea1..133edb049e1 100644 --- a/ui/src/components/page-sticky/QPageSticky.js +++ b/ui/src/components/page-sticky/QPageSticky.js @@ -1,5 +1,5 @@ import { createComponent } from '../../utils/private.create/create.js' -import usePageSticky, { usePageStickyProps } from './use-page-sticky' +import usePageSticky, { usePageStickyProps } from './use-page-sticky.js' export default createComponent({ name: 'QPageSticky'," ec9f82677390b04b1d3277d9a4eb5bda25f1ad5c,2017-11-01 02:46:13,Razvan Stoenescu,feat: QLayoutDrawer - overlay mode,False,QLayoutDrawer - overlay mode,feat,"diff --git a/dev/components/new-layout/new-layout.vue b/dev/components/new-layout/new-layout.vue index 59397fb7d87..ed80b608cb5 100644 --- a/dev/components/new-layout/new-layout.vue +++ b/dev/components/new-layout/new-layout.vue @@ -43,7 +43,7 @@ - + Go to A Go to B @@ -59,7 +59,7 @@ - + Go to A Go to B Go to C @@ -87,6 +87,8 @@


+
+
view: {{ view }} @@ -167,6 +169,8 @@ export default { headerReveal: false, footerReveal: false, + leftOverlay: true, + rightOverlay: false, scrolling: true, diff --git a/src/components/new-layout/QLayoutDrawer.js b/src/components/new-layout/QLayoutDrawer.js index d707c9cf0f5..d9563392ba2 100644 --- a/src/components/new-layout/QLayoutDrawer.js +++ b/src/components/new-layout/QLayoutDrawer.js @@ -15,6 +15,7 @@ export default { }, props: { value: Boolean, + overlay: Boolean, rightSide: Boolean, breakpoint: { type: Number, @@ -53,7 +54,7 @@ export default { this.mobileOpened = false this.percentage = 0 document.body.classList.remove(bodyClass) - this.__updateModel(this.belowBreakpoint ? false : this.largeScreenState) + this.__updateModel(this.belowBreakpoint || this.overlay ? false : this.largeScreenState) if (typeof this.__onClose === 'function') { setTimeout(() => { resolve() @@ -92,12 +93,15 @@ export default { } if (val) { // from lg to xs - console.log('belowBreakpoint: from lg to xs; largeScreenState set to', this.value, 'model force to false') - this.largeScreenState = this.value + console.log('belowBreakpoint: from lg to xs; model force to false') + if (!this.overlay) { + console.log('belowBreakpoint: largeScreenState set to', this.value) + this.largeScreenState = this.value + } // ensure we close it for small screen this.__updateModel(false) } - else { // from xs to lg + else if (!this.overlay) { // from xs to lg console.log('belowBreakpoint: from xs to lg; model set to', this.largeScreenState) this.__updateModel(this.largeScreenState) } @@ -109,9 +113,13 @@ export default { this.__updateLocal('belowBreakpoint', this.breakpoint > this.layout.width) }, offset (val) { - console.log(this.side, 'OFFSET', val) this.__update('offset', val) }, + onScreenOverlay () { + if (this.animateOverlay) { + this.layout.__animate() + } + }, onLayout (val) { console.log('onLayout', val) this.__update('space', val) @@ -128,10 +136,13 @@ export default { : 0 }, fixed () { - return this.layout.view.indexOf(this.rightSide ? 'R' : 'L') > -1 + return this.overlay || this.layout.view.indexOf(this.rightSide ? 'R' : 'L') > -1 }, onLayout () { - return !this.needsTouch && this.value + return this.value && !this.mobileView && !this.overlay + }, + onScreenOverlay () { + return this.value && this.overlay }, backdropClass () { return { @@ -139,9 +150,25 @@ export default { 'no-pointer-events': !this.inTransit && !this.value } }, - needsTouch () { + mobileView () { return this.belowBreakpoint || this.mobileOpened }, + headerSlot () { + return this.overlay + ? false + : (this.rightSide + ? this.layout.rows.top[2] === 'r' + : this.layout.rows.top[0] === 'l' + ) + }, + footerSlot () { + return this.overlay + ? false + : (this.rightSide + ? this.layout.rows.bottom[2] === 'r' + : this.layout.rows.bottom[0] === 'l' + ) + }, backdropStyle () { return { opacity: this.percentage } }, @@ -152,7 +179,7 @@ export default { 'on-screen': this.value, 'off-screen': !this.value, 'transition-generic': !this.inTransit, - 'top-padding': this.fixed || (this.rightSide ? this.layout.rows.top[2] === 'r' : this.layout.rows.top[0] === 'l') + 'top-padding': this.fixed || this.headerSlot } }, belowStyle () { @@ -161,20 +188,18 @@ export default { } }, aboveClass () { - const onLayout = this.onLayout || (this.value && this.overlay) + const onScreen = this.onLayout || this.onScreenOverlay return { - 'off-screen': !onLayout, - 'on-screen': onLayout, - 'fixed': this.overlay || this.fixed || !this.onLayout, - 'top-padding': this.fixed || (this.rightSide ? this.layout.rows.top[2] === 'r' : this.layout.rows.top[0] === 'l') + 'off-screen': !onScreen, + 'on-screen': onScreen, + 'fixed': this.fixed || !this.onLayout, + 'top-padding': this.fixed || this.headerSlot } }, aboveStyle () { - const - view = this.layout.rows, - css = {} + const css = {} - if (this.layout.header.space && this.rightSide ? view.top[2] !== 'r' : view.top[0] !== 'l') { + if (this.layout.header.space && !this.headerSlot) { if (this.fixed) { css.top = `${this.layout.header.offset}px` } @@ -183,7 +208,7 @@ export default { } } - if (this.layout.footer.space && this.rightSide ? view.bottom[2] !== 'r' : view.bottom[0] !== 'l') { + if (this.layout.footer.space && !this.footerSlot) { if (this.fixed) { css.bottom = `${this.layout.footer.offset}px` } @@ -195,17 +220,17 @@ export default { return css }, computedStyle () { - return this.needsTouch ? this.belowStyle : this.aboveStyle + return this.mobileView ? this.belowStyle : this.aboveStyle }, computedClass () { - return this.needsTouch ? this.belowClass : this.aboveClass + return this.mobileView ? this.belowClass : this.aboveClass } }, render (h) { console.log(`drawer ${this.side} render`) const child = [] - if (this.needsTouch) { + if (this.mobileView) { child.push(h('div', { staticClass: `q-layout-drawer-opener fixed-${this.side}`, directives: [{ @@ -232,7 +257,7 @@ export default { staticClass: `q-layout-drawer q-layout-drawer-${this.side} scroll q-layout-transition`, 'class': this.computedClass, style: this.computedStyle, - directives: this.belowBreakpoint ? [{ + directives: this.mobileView ? [{ name: 'touch-pan', modifier: { horizontal: true }, value: this.__closeByTouch @@ -246,13 +271,17 @@ export default { ])) }, created () { - if (this.belowBreakpoint) { + if (this.belowBreakpoint || this.overlay) { this.__updateModel(false) } else if (this.onLayout) { this.__update('space', true) this.__update('offset', this.offset) } + + this.$nextTick(() => { + this.animateOverlay = true + }) }, destroyed () { this.__update('size', 0) @@ -313,7 +342,6 @@ export default { }, show (fn) { if (this.value === true) { - console.log('show return first', fn) if (typeof fn === 'function') { fn() } @@ -325,7 +353,6 @@ export default { }, hide (fn) { if (this.value === false) { - console.log('hide return first', fn) if (typeof fn === 'function') { fn() } @@ -337,7 +364,6 @@ export default { }, __onResize ({ width }) { - console.log(this.side, 'width', width) this.__update('size', width) this.__updateLocal('size', width) }, diff --git a/src/components/new-layout/QLayoutFooter.js b/src/components/new-layout/QLayoutFooter.js index f135541210c..914e04afe68 100644 --- a/src/components/new-layout/QLayoutFooter.js +++ b/src/components/new-layout/QLayoutFooter.js @@ -16,6 +16,7 @@ export default { watch: { value (val) { this.__update('space', val) + this.__updateLocal('revealed', true) this.layout.__animate() }, offset (val) { diff --git a/src/components/new-layout/QLayoutHeader.js b/src/components/new-layout/QLayoutHeader.js index 091f1608961..7871daac031 100644 --- a/src/components/new-layout/QLayoutHeader.js +++ b/src/components/new-layout/QLayoutHeader.js @@ -20,6 +20,7 @@ export default { watch: { value (val) { this.__update('space', val) + this.__updateLocal('revealed', true) this.layout.__animate() }, offset (val) { diff --git a/src/components/new-layout/QNewLayout.js b/src/components/new-layout/QNewLayout.js index a2caf592e1f..19d5c7f9d6b 100644 --- a/src/components/new-layout/QNewLayout.js +++ b/src/components/new-layout/QNewLayout.js @@ -87,7 +87,7 @@ export default { this.timer = setTimeout(() => { document.body.classList.remove('q-layout-animate') this.timer = null - }, 1150) + }, 150) }, __onPageScroll (data) { this.scroll = data" 12dac6a03d3aae3b749d272941d7d6edcd76ecc5,2022-03-13 23:40:07,Razvan Stoenescu,chore(app-vite): Release first public available version,False,Release first public available version,chore,"diff --git a/app-vite/package.json b/app-vite/package.json index ff8ba21469d..ec410d96b48 100644 --- a/app-vite/package.json +++ b/app-vite/package.json @@ -1,6 +1,6 @@ { ""name"": ""@quasar/app-vite"", - ""version"": ""1.0.0-beta.0"", + ""version"": ""1.0.0-beta.1"", ""description"": ""Quasar Framework App CLI with Vite"", ""bin"": { ""quasar"": ""./bin/quasar"" @@ -44,7 +44,7 @@ }, ""dependencies"": { ""@quasar/fastclick"": ""1.1.5"", - ""@quasar/vite-plugin"": ""^1.0.4"", + ""@quasar/vite-plugin"": ""^1.0.6"", ""@rollup/pluginutils"": ""^4.1.2"", ""@types/cordova"": ""0.0.34"", ""@types/express"": ""^4.17.13""," 1cb77e218e00f84b6d89fe03e0f8289b712715c6,2021-01-31 04:49:26,Razvan Stoenescu,feat(docs): more composables work,False,more composables work,feat,"diff --git a/docs/src/pages/quasar-plugins/dialog.md b/docs/src/pages/quasar-plugins/dialog.md index 6025699e23e..64aa76614fe 100644 --- a/docs/src/pages/quasar-plugins/dialog.md +++ b/docs/src/pages/quasar-plugins/dialog.md @@ -4,6 +4,7 @@ desc: A Quasar plugin that provides an easy way to display a prompt, choice, con related: - /vue-components/dialog - /quasar-plugins/bottom-sheet + - /vue-composables/use-dialog-plugin-component --- Quasar Dialogs are a great way to offer the user the ability to choose a specific action or list of actions. They also can provide the user with important information, or require them to make a decision (or multiple decisions). diff --git a/docs/src/pages/quasar-plugins/meta.md b/docs/src/pages/quasar-plugins/meta.md index 604cb767d98..c58b9e0a4e6 100644 --- a/docs/src/pages/quasar-plugins/meta.md +++ b/docs/src/pages/quasar-plugins/meta.md @@ -1,6 +1,8 @@ --- title: Quasar Meta Plugin desc: A Quasar plugin to easily handle the meta tags of an app, helping you to add SEO. It manages meta, style and script tags, html and body attributes and page titles. +related: + - /vue-composables/use-meta --- **Better SEO for your website!** The Meta plugin can dynamically change page title, manage `` tags, manage `` and `` DOM element attributes, add/remove/change ` diff --git a/docs/src/components/DocApiEntry.js b/docs/src/components/DocApiEntry.js new file mode 100644 index 00000000000..89b650331d7 --- /dev/null +++ b/docs/src/components/DocApiEntry.js @@ -0,0 +1,506 @@ +import { QBadge } from 'quasar' + +import './DocApiEntry.sass' + +function getEventParams (event) { + const params = event.params === void 0 || event.params.length === 0 + ? '' + : Object.keys(event.params).join(', ') + + return ' -> function(' + params + ')' +} + +function getMethodParams (method, noRequired) { + if (!method.params || method.params.length === 0) { + return ' ()' + } + + if (noRequired === true) { + return ` (${Object.keys(method.params).join(', ')})` + } + + const params = Object.keys(method.params) + const optionalIndex = params.findIndex(param => method.params[param].required !== true) + + const str = optionalIndex !== -1 + ? params.slice(0, optionalIndex).join(', ') + + (optionalIndex < params.length + ? '[' + (optionalIndex > 0 ? ', ' : '') + params.slice(optionalIndex).join(', ') + ']' + : '') + : params.join(', ') + + return ' (' + str + ')' +} + +function getMethodReturnValue (method) { + return ' => ' + + (!method.returns + ? 'void 0' + : method.returns.type + ) +} + +function getStringType (type) { + return Array.isArray(type) + ? type.join(' | ') + : type +} + +const NAME_PROP_COLOR = [ + 'orange-8', + 'accent', + 'secondary' +] + +function getDiv (h, col, propName, propValue, slot) { + return h('div', { class: `api-row__item col-xs-12 col-sm-${col}` }, [ + h('div', { class: 'api-row__type' }, propName), + propValue !== void 0 + ? h('div', { class: 'api-row__value' }, propValue) + : slot + ]) +} + +function getNameDiv (h, label, level) { + return h('div', { class: 'api-row__item col-xs-12 col-sm-12' }, [ + h('div', { class: 'api-row__value' }, [ + h(QBadge, { + style: 'font-size: 1em; line-height: 1.2em', + props: { + color: NAME_PROP_COLOR[level], + label + } + }) + ]) + ]) +} + +function getExtendedNameDiv (h, label, level, type, required) { + const suffix = `${type ? ` : ${type}` : ''}${required ? ' - required!' : ''}` + + return h('div', { class: 'api-row__item col-xs-12 col-sm-12' }, [ + h('div', { class: 'api-row__value' }, [ + h(QBadge, { + style: 'font-size: 1em; line-height: 1.2em', + props: { + color: NAME_PROP_COLOR[level], + label + } + }), + suffix + ]) + ]) +} + +function getProp (h, prop, propName, level, onlyChildren) { + const type = getStringType(prop.type) + const child = [] + + if (propName !== void 0) { + child.push( + getExtendedNameDiv(h, propName, level, type, type !== 'Function' && prop.required === true) + ) + + if (prop.reactive === true) { + child.push( + getDiv(h, 3, 'Reactive', 'yes') + ) + } + } + + if (prop.addedIn !== void 0) { + child.push( + getDiv(h, 12, 'Added in', prop.addedIn) + ) + } + + child.push( + getDiv(h, 12, 'Description', prop.desc) + ) + + if (type === 'Function') { + child.push( + getDiv(h, 12, 'Function form', getMethodParams(prop, true) + getMethodReturnValue(prop)) + ) + } + + if (prop.sync === true) { + child.push( + getDiv(h, 3, 'Note', '"".sync"" modifier required!') + ) + } + + if (prop.default !== void 0) { + child.push( + getDiv(h, 3, 'Default value', JSON.stringify(prop.default)) + ) + } + + if (prop.link === true) { + child.push( + getDiv(h, 6, 'External link', prop.link) + ) + } + + if (prop.values !== void 0) { + child.push( + getDiv( + h, + 12, + 'Accepted values', + void 0, + h( + 'div', + { class: 'api-row--indent api-row__value' }, + prop.values.map(val => h('div', { class: 'api-row__example' }, '' + val)) + ) + ) + ) + } + + if (prop.definition !== void 0) { + const nodes = [] + for (const propName in prop.definition) { + nodes.push( + getProp(h, prop.definition[propName], propName, 2) + ) + } + + child.push( + getDiv( + h, + 12, + 'Props', + void 0, + h('div', { class: 'api-row__subitem' }, nodes) + ) + ) + } + + if (prop.params !== void 0 && prop.params !== null) { + const + nodes = [], + newLevel = (level + 1) % NAME_PROP_COLOR.length + + for (const propName in prop.params) { + nodes.push( + getProp(h, prop.params[propName], propName, newLevel) + ) + } + + child.push( + getDiv( + h, + 12, + 'Params', + void 0, + h('div', { class: 'api-row__subitem' }, nodes) + ) + ) + } + + if (prop.returns !== void 0 && prop.returns !== null) { + child.push( + getDiv( + h, + 12, + `Returns <${getStringType(prop.returns.type)}>`, + void 0, + h( + 'div', + { class: 'api-row__subitem' }, + [ getProp(h, prop.returns, void 0, 0) ] + ) + ) + ) + } + + if (prop.scope !== void 0) { + const nodes = [] + for (const propName in prop.scope) { + nodes.push( + getProp(h, prop.scope[propName], propName, 1) + ) + } + + child.push( + getDiv( + h, + 12, + 'Scope', + void 0, + h('div', { class: 'api-row__subitem' }, nodes) + ) + ) + } + + if (prop.examples !== void 0) { + child.push( + getDiv( + h, + 12, + `Example${prop.examples.length > 1 ? 's' : ''}`, + void 0, + h( + 'div', + { class: 'api-row--indent api-row__value' }, + prop.examples.map(example => h('div', { class: 'api-row__example' }, '' + example)) + ) + ) + ) + } + + return onlyChildren !== true + ? h('div', { class: 'api-row row' }, child) + : child +} + +const describe = {} + +describe.props = (h, props) => { + const child = [] + + for (const propName in props) { + child.push( + getProp(h, props[propName], propName, 0) + ) + } + + return child +} + +describe.slots = (h, slots) => { + const child = [] + + for (const slot in slots) { + child.push( + getProp(h, slots[slot], slot, 0) + ) + } + + return child +} + +describe.scopedSlots = (h, scopedSlots) => { + const child = [] + + for (const slot in scopedSlots) { + child.push( + getProp(h, scopedSlots[slot], slot, 0) + ) + } + + return child +} + +describe.events = (h, { $listeners, ...events }) => { + const child = [] + + if ($listeners !== void 0) { + child.push( + h('div', { class: 'api-row api-row__value' }, [ + $listeners.desc + ]) + ) + } + + if (events === void 0) { + return child + } + + for (const eventName in events) { + const event = events[eventName] + const params = [] + + if (event.params !== void 0) { + for (const paramName in event.params) { + params.push( + getProp(h, event.params[paramName], paramName, 1) + ) + } + } + else { + params.push( + h('div', { class: 'text-italic q-py-xs q-px-md' }, '*None*') + ) + } + + child.push( + h('div', { class: 'api-row row' }, [ + getNameDiv(h, `@${eventName}${getEventParams(event)}`, 0), + event.addedIn !== void 0 + ? getDiv(h, 12, 'Added in', event.addedIn) + : null, + getDiv(h, 12, 'Description', event.desc), + getDiv(h, 12, + 'Parameters', + void 0, + h('div', { class: 'api-row__subitem' }, params) + ) + ]) + ) + } + + return child +} + +describe.methods = (h, methods) => { + const child = [] + + for (const methodName in methods) { + const method = methods[methodName] + + const nodes = [ + getNameDiv(h, `${methodName}${getMethodParams(method)}${getMethodReturnValue(method)}`, 0), + method.addedIn !== void 0 + ? getDiv(h, 12, 'Added in', method.addedIn) + : null, + getDiv(h, 12, 'Description', method.desc) + ] + + if (method.params !== void 0) { + const props = [] + for (const paramName in method.params) { + props.push( + getProp(h, method.params[paramName], paramName, 1) + ) + } + nodes.push( + getDiv( + h, + 12, + 'Parameters', + void 0, + h('div', { class: 'api-row__subitem' }, props) + ) + ) + } + if (method.returns !== void 0) { + nodes.push( + getDiv( + h, + 12, + `Returns <${getStringType(method.returns.type)}>`, + void 0, + h( + 'div', + { class: 'api-row__subitem' }, + [ getProp(h, method.returns, void 0, 0) ] + ) + ) + ) + } + + child.push( + h('div', { class: 'api-row row' }, nodes) + ) + } + + return child +} + +describe.value = (h, value) => { + return [ + h('div', { class: 'api-row row' }, [ + getDiv(h, 12, 'Type', getStringType(value.type)) + ].concat(getProp(h, value, void 0, 0, true))) + ] +} + +describe.arg = (h, arg) => { + return [ + h('div', { class: 'api-row row' }, [ + getDiv(h, 12, 'Type', getStringType(arg.type)) + ].concat(getProp(h, arg, void 0, 0, true))) + ] +} + +describe.modifiers = (h, modifiers) => { + const child = [] + + for (const modifierName in modifiers) { + const modifier = modifiers[modifierName] + + child.push( + h( + 'div', + { class: 'api-row row' }, + getProp(h, modifier, modifierName, 0, true) + ) + ) + } + + return child +} + +describe.injection = (h, injection) => { + return [ + h('div', { class: 'api-row row' }, [ + getNameDiv(h, injection, 0) + ]) + ] +} + +describe.quasarConfOptions = (h, conf) => { + const child = [] + const entry = [ + h('div', { class: 'api-row__item col-xs-12 col-sm-12' }, [ + h('div', { class: 'api-row__value' }, [ + h('span', { class: 'api-row__type text-grey' }, 'quasar.conf.js > framework > config > '), + h(QBadge, { + style: 'font-size: 1em; line-height: 1.2em', + props: { + color: NAME_PROP_COLOR[0], + label: conf.propName + } + }) + ]) + ]) + ] + + for (const def in conf.definition) { + child.push( + getProp(h, conf.definition[def], def, 0) + ) + } + + conf.addedIn !== void 0 && entry.push( + getDiv(h, 12, 'Added in', conf.addedIn) + ) + + entry.push( + getDiv( + h, + 12, + 'Definition', + void 0, + h('div', { class: 'api-row__subitem' }, child) + ) + ) + + return [ + h('div', { class: 'api-row row' }, entry) + ] +} + +export default { + name: 'DocApiEntry', + + props: { + type: String, + definition: [ Object, String ] + }, + + render (h) { + const content = Object.keys(this.definition).length !== 0 + ? describe[this.type](h, this.definition) + : [ + h('div', { class: 'q-pa-md doc-api__nothing-to-show' }, [ + h('div', 'No matching entries found on this tab.'), + h('div', 'Please check the other tabs/subtabs with a number badge on their label or refine the filter.') + ]) + ] + + return h('div', { class: 'api-rows' }, content) + } +} diff --git a/docs/src/components/ApiRows.sass b/docs/src/components/DocApiEntry.sass similarity index 94% rename from docs/src/components/ApiRows.sass rename to docs/src/components/DocApiEntry.sass index 393db15f349..721fd0db777 100644 --- a/docs/src/components/ApiRows.sass +++ b/docs/src/components/DocApiEntry.sass @@ -3,9 +3,6 @@ font-weight: 300 color: $grey - &--big-padding - padding: 16px - & + & border-top: 1px solid #ddd diff --git a/docs/src/components/page-parts/layout/LayoutGallery.vue b/docs/src/components/page-parts/layout/LayoutGallery.vue index 679a3195822..fe4fd486640 100644 --- a/docs/src/components/page-parts/layout/LayoutGallery.vue +++ b/docs/src/components/page-parts/layout/LayoutGallery.vue @@ -8,8 +8,8 @@ .row.items-center.no-wrap.q-px-md.q-py-sm div {{ layout.name }} q-space - q-btn(type=""a"", :href=""layout.demoLink"", target=""_blank"", size=""12px"" flat, round, color=""primary"", :icon=""mdiOpenInNew"") - q-btn(type=""a"", :href=""layout.sourceLink"", , target=""_blank"", size=""12px"" flat, round, :icon=""mdiCodeTags"") + q-btn(type=""a"", :href=""layout.demoLink"", target=""_blank"", size=""12px"" flat, round, color=""brand-primary"", :icon=""mdiOpenInNew"") + q-btn(type=""a"", :href=""layout.sourceLink"", , target=""_blank"", size=""12px"" flat, round, color=""grey-7"", :icon=""mdiCodeTags"") q-separator diff --git a/docs/src/components/page-parts/layout/LayoutGalleryPage.vue b/docs/src/components/page-parts/layout/LayoutGalleryPage.vue index 63bc0be1095..eede2a01257 100644 --- a/docs/src/components/page-parts/layout/LayoutGalleryPage.vue +++ b/docs/src/components/page-parts/layout/LayoutGalleryPage.vue @@ -6,7 +6,7 @@ no-caps push color=""white"" - text-color=""primary"" + text-color=""brand-primary"" type=""a"" :href=""sourceLink"" target=""_blank"" diff --git a/docs/src/components/page-parts/releases/PackageReleases.vue b/docs/src/components/page-parts/releases/PackageReleases.vue index e7563dea790..5f823c91b11 100644 --- a/docs/src/components/page-parts/releases/PackageReleases.vue +++ b/docs/src/components/page-parts/releases/PackageReleases.vue @@ -5,7 +5,7 @@ q-splitter.release__splitter(:value=""20"" :limits=""[14, 90]"") q-input(v-model=""search"" dense square standout color=""white"" placeholder=""Search..."" input-class=""text-center"" clearable) template(#append) q-icon(:name=""mdiMagnify"") - q-tabs.text-grey-7(vertical v-model=""selectedVersion"" active-color=""primary"" active-bg-color=""blue-1"" indicator-color=""primary"") + q-tabs.text-grey-7(vertical v-model=""selectedVersion"" active-color=""brand-primary"" active-bg-color=""blue-1"" indicator-color=""brand-primary"") q-tab(v-for=""releaseInfo in filteredReleases"" :key=""releaseInfo.label"" :name=""releaseInfo.label"") .q-tab__label {{ releaseInfo.version }} small.text-grey-7 {{ releaseInfo.date }} diff --git a/docs/src/components/page-parts/releases/QuasarReleases.vue b/docs/src/components/page-parts/releases/QuasarReleases.vue index 209eda41b8a..d77e96bd35b 100644 --- a/docs/src/components/page-parts/releases/QuasarReleases.vue +++ b/docs/src/components/page-parts/releases/QuasarReleases.vue @@ -4,10 +4,10 @@ q-card(flat bordered) q-icon.q-mr-sm(name=""warning"" size=""24px"" color=""negative"") div Cannot connect to GitHub. Please try again later. q-card-section.row.no-wrap.items-center(v-else-if=""loading"") - q-spinner.q-mr-sm(size=""24px"" color=""primary"") + q-spinner.q-mr-sm(size=""24px"" color=""brand-primary"") div Loading release notes from GitHub... template(v-else) - q-tabs.text-grey-7(v-model=""currentPackage"" align=""left"" active-color=""primary"" active-bg-color=""blue-1"" indicator-color=""primary"") + q-tabs.text-grey-7(v-model=""currentPackage"" align=""left"" active-color=""brand-primary"" active-bg-color=""blue-1"" indicator-color=""brand-primary"") q-tab(v-for=""(packageReleases, packageName) in packages"" :label=""packageName"" :name=""packageName"" :key=""packageName"") q-separator q-tab-panels.packages-container(v-model=""currentPackage"" animated) diff --git a/docs/src/components/page-parts/theming/ThemeBuilder.vue b/docs/src/components/page-parts/theming/ThemeBuilder.vue index d2241a43b99..4ce6782acb2 100644 --- a/docs/src/components/page-parts/theming/ThemeBuilder.vue +++ b/docs/src/components/page-parts/theming/ThemeBuilder.vue @@ -72,7 +72,7 @@ q-dialog(v-model=""exportDialog"") q-card - q-tabs.text-grey-7(v-model=""exportTab"", active-color=""primary"" align=""justify"") + q-tabs.text-grey-7(v-model=""exportTab"", active-color=""brand-primary"" align=""justify"") q-tab(name=""sass"", no-caps, label=""Sass"") q-tab(name=""scss"", no-caps, label=""SCSS"") q-tab(name=""styl"", no-caps, label=""Stylus"") @@ -104,7 +104,7 @@ q-separator q-card-actions(align=""right"") - q-btn(color=""primary"", flat, label=""Close"", v-close-popup) + q-btn(color=""brand-primary"", flat, label=""Close"", v-close-popup) diff --git a/ui/dev/src/pages/other/morph-directive-boxes-obj.vue b/ui/dev/src/pages/other/morph-directive-boxes-obj.vue new file mode 100644 index 00000000000..c2faed02cee --- /dev/null +++ b/ui/dev/src/pages/other/morph-directive-boxes-obj.vue @@ -0,0 +1,117 @@ + + + diff --git a/ui/dev/src/pages/other/morph-directive-boxes.vue b/ui/dev/src/pages/other/morph-directive-boxes.vue new file mode 100644 index 00000000000..6b7bb4b57af --- /dev/null +++ b/ui/dev/src/pages/other/morph-directive-boxes.vue @@ -0,0 +1,108 @@ + + + diff --git a/ui/dev/src/pages/other/morph-directive-card.vue b/ui/dev/src/pages/other/morph-directive-card.vue index 68dfcb6e1a1..d8620458e69 100644 --- a/ui/dev/src/pages/other/morph-directive-card.vue +++ b/ui/dev/src/pages/other/morph-directive-card.vue @@ -1,74 +1,76 @@ diff --git a/ui/src/body.js b/ui/src/body.js index dd0bd774a27..32d2a697247 100644 --- a/ui/src/body.js +++ b/ui/src/body.js @@ -1,5 +1,5 @@ import { setBrand } from './utils/colors.js' -import { isSSR } from './plugins/Platform.js' +import { isSSR, fromSSR, client } from './plugins/Platform.js' function getMobilePlatform (is) { if (is.ios === true) return 'ios' @@ -9,15 +9,13 @@ function getMobilePlatform (is) { function getBodyClasses ({ is, has, within }, cfg) { const cls = [ - is.desktop ? 'desktop' : 'mobile', - has.touch ? 'touch' : 'no-touch' + is.desktop === true ? 'desktop' : 'mobile', + `${has.touch === false ? 'no-' : ''}touch` ] if (is.mobile === true) { const mobile = getMobilePlatform(is) - if (mobile !== void 0) { - cls.push('platform-' + mobile) - } + mobile !== void 0 && cls.push('platform-' + mobile) } if (is.nativeMobile === true) { @@ -45,20 +43,27 @@ function getBodyClasses ({ is, has, within }, cfg) { return cls } -function bodyInit (Platform, cfg) { - const cls = getBodyClasses(Platform, cfg) - - if (Platform.is.ie === true && Platform.is.versionNumber === 11) { +function clientApply (cls) { + if (client.is.ie === true && client.is.versionNumber === 11) { cls.forEach(c => document.body.classList.add(c)) } else { document.body.classList.add.apply(document.body.classList, cls) } +} + +// SSR takeover corrections +function clientUpdate () { + const cls = [] - if (Platform.is.ios === true) { - // needed for iOS button active state - document.body.addEventListener('touchstart', () => {}) + if (client.has.touch === true) { + document.body.classList.remove('no-touch') + cls.push('touch') } + + client.within.iframe === true && cls.push('within-iframe') + + cls.length > 0 && clientApply(cls) } function setColors (brand) { @@ -68,7 +73,7 @@ function setColors (brand) { } export default { - install ($q, queues, cfg) { + install (queues, cfg) { if (isSSR === true) { queues.server.push((q, ctx) => { const @@ -82,10 +87,21 @@ export default { ctx.ssr.Q_BODY_CLASSES = cls.join(' ') } }) - return } + else { + if (fromSSR === true) { + clientUpdate() + } + else { + clientApply(getBodyClasses(client, cfg)) + } - cfg.brand && setColors(cfg.brand) - bodyInit($q.platform, cfg) + cfg.brand !== void 0 && setColors(cfg.brand) + + if (client.is.ios === true) { + // needed for iOS button active state + document.body.addEventListener('touchstart', () => {}) + } + } } } diff --git a/ui/src/components/btn/QBtn.js b/ui/src/components/btn/QBtn.js index 09bb4a1d911..2708c512dfa 100644 --- a/ui/src/components/btn/QBtn.js +++ b/ui/src/components/btn/QBtn.js @@ -5,8 +5,6 @@ import QSpinner from '../spinner/QSpinner.js' import BtnMixin from './btn-mixin.js' -import Platform from '../../plugins/Platform.js' - import slot from '../../utils/slot.js' import { stopAndPrevent, listenOpts } from '../../utils/event.js' @@ -214,7 +212,7 @@ export default Vue.extend({ mousedown: this.__onMousedown } - if (Platform.has.touch === true) { + if (this.$q.platform.has.touch === true) { data.on.touchstart = this.__onTouchstart } diff --git a/ui/src/directives/GoBack.js b/ui/src/directives/GoBack.js index 6bb6a594230..a1cccd914ea 100644 --- a/ui/src/directives/GoBack.js +++ b/ui/src/directives/GoBack.js @@ -1,4 +1,4 @@ -import Platform from '../plugins/Platform.js' +import { client } from '../plugins/Platform.js' export default { name: 'go-back', @@ -16,7 +16,7 @@ export default { if (ctx.single) { router.go(-1) } - else if (Platform.is.nativeMobile === true) { + else if (client.is.nativeMobile === true) { router.go(ctx.position - window.history.length) } else { diff --git a/ui/src/directives/Ripple.js b/ui/src/directives/Ripple.js index 050dc88cd84..8dd0104bd25 100644 --- a/ui/src/directives/Ripple.js +++ b/ui/src/directives/Ripple.js @@ -1,6 +1,6 @@ import { css } from '../utils/dom.js' import { position, stop, listenOpts } from '../utils/event.js' -import Platform from '../plugins/Platform.js' +import { client } from '../plugins/Platform.js' function showRipple (evt, el, ctx, forceCenter) { ctx.modifiers.stop === true && stop(evt) @@ -87,7 +87,7 @@ export default { click (evt) { // on ENTER in form IE emits a PointerEvent with negative client cordinates - if (ctx.enabled === true && (Platform.is.ie !== true || evt.clientX >= 0)) { + if (ctx.enabled === true && (client.is.ie !== true || evt.clientX >= 0)) { showRipple(evt, el, ctx, evt.qKeyEvent === true) } }, diff --git a/ui/src/directives/TouchHold.js b/ui/src/directives/TouchHold.js index 7a59ea4d655..ef8307b7b1f 100644 --- a/ui/src/directives/TouchHold.js +++ b/ui/src/directives/TouchHold.js @@ -1,4 +1,4 @@ -import Platform, { clientTouch } from '../plugins/Platform.js' +import { client } from '../plugins/Platform.js' import { addEvt, cleanEvt } from '../utils/touch.js' import { position, leftClick, stopAndPrevent } from '../utils/event.js' import { clearSelection } from '../utils/selection.js' @@ -32,7 +32,7 @@ export default { const { modifiers } = binding // early return, we don't need to do anything - if (modifiers.mouse !== true && clientTouch !== true) { + if (modifiers.mouse !== true && client.has.touch !== true) { return } @@ -62,7 +62,7 @@ export default { const startTime = new Date().getTime() - if (Platform.is.mobile === true) { + if (client.is.mobile === true) { document.body.classList.add('non-selectable') clearSelection() } @@ -70,7 +70,7 @@ export default { ctx.triggered = false ctx.timer = setTimeout(() => { - if (Platform.is.mobile !== true) { + if (client.is.mobile !== true) { document.body.classList.add('non-selectable') clearSelection() } @@ -133,7 +133,7 @@ export default { [ el, 'mousedown', 'mouseStart', `passive${modifiers.mouseCapture === true ? 'Capture' : ''}` ] ]) - clientTouch === true && addEvt(ctx, 'main', [ + client.has.touch === true && addEvt(ctx, 'main', [ [ el, 'touchstart', 'touchStart', `passive${modifiers.capture === true ? 'Capture' : ''}` ] ]) }, diff --git a/ui/src/directives/TouchPan.js b/ui/src/directives/TouchPan.js index 9b7e9246c6b..77c2d7bb71d 100644 --- a/ui/src/directives/TouchPan.js +++ b/ui/src/directives/TouchPan.js @@ -1,4 +1,4 @@ -import Platform, { clientTouch } from '../plugins/Platform.js' +import { client } from '../plugins/Platform.js' import { getModifierDirections, updateModifiers, addEvt, cleanEvt } from '../utils/touch.js' import { position, leftClick, listenOpts, prevent, stop, stopAndPrevent, preventDraggable } from '../utils/event.js' import { clearSelection } from '../utils/selection.js' @@ -100,7 +100,7 @@ export default { bind (el, { value, modifiers }) { // early return, we don't need to do anything - if (modifiers.mouse !== true && clientTouch !== true) { + if (modifiers.mouse !== true && client.has.touch !== true) { return } @@ -150,7 +150,7 @@ export default { }, start (evt, mouseEvent) { - Platform.is.firefox === true && preventDraggable(el, true) + client.is.firefox === true && preventDraggable(el, true) const pos = position(evt) @@ -248,7 +248,7 @@ export default { } cleanEvt(ctx, 'temp') - Platform.is.firefox === true && preventDraggable(el, false) + client.is.firefox === true && preventDraggable(el, false) if (ctx.event.mouse !== true && ctx.event.detected === true) { el.addEventListener('touchmove', ctx.touchMove, notPassiveCapture) @@ -280,7 +280,7 @@ export default { [ el, 'mousedown', 'mouseStart', `passive${modifiers.mouseCapture === true ? 'Capture' : ''}` ] ]) - clientTouch === true && addEvt(ctx, 'main', [ + client.has.touch === true && addEvt(ctx, 'main', [ [ el, 'touchstart', 'start', `passive${modifiers.capture === true ? 'Capture' : ''}` ], [ el, 'touchmove', 'touchMove', 'notPassiveCapture' ] ]) @@ -298,7 +298,7 @@ export default { cleanEvt(ctx, 'main') cleanEvt(ctx, 'temp') - Platform.is.firefox === true && preventDraggable(el, false) + client.is.firefox === true && preventDraggable(el, false) document.documentElement.style.cursor = '' document.body.classList.remove('no-pointer-events') diff --git a/ui/src/directives/TouchRepeat.js b/ui/src/directives/TouchRepeat.js index e3aa2c2973b..a4df241bcaa 100644 --- a/ui/src/directives/TouchRepeat.js +++ b/ui/src/directives/TouchRepeat.js @@ -1,4 +1,4 @@ -import Platform, { clientTouch } from '../plugins/Platform.js' +import { client } from '../plugins/Platform.js' import { addEvt, cleanEvt } from '../utils/touch.js' import { position, leftClick, stopAndPrevent } from '../utils/event.js' import { clearSelection } from '../utils/selection.js' @@ -39,7 +39,7 @@ export default { // early return, we don't need to do anything if ( modifiers.mouse !== true && - clientTouch !== true && + client.has.touch !== true && keyboard.length === 0 ) { return @@ -115,7 +115,7 @@ export default { ctx.origin = position(evt) } - if (Platform.is.mobile === true) { + if (client.is.mobile === true) { document.body.classList.add('non-selectable') clearSelection() } @@ -143,7 +143,7 @@ export default { ctx.event.position = position(evt) } - if (Platform.is.mobile !== true) { + if (client.is.mobile !== true) { document.documentElement.style.cursor = 'pointer' document.body.classList.add('non-selectable') clearSelection() @@ -188,7 +188,7 @@ export default { const triggered = ctx.event.repeatCount > 0 - if (Platform.is.mobile === true || triggered === true) { + if (client.is.mobile === true || triggered === true) { document.documentElement.style.cursor = '' document.body.classList.remove('non-selectable') } @@ -211,7 +211,7 @@ export default { [ el, 'mousedown', 'mouseStart', `passive${modifiers.mouseCapture === true ? 'Capture' : ''}` ] ]) - clientTouch === true && addEvt(ctx, 'main', [ + client.has.touch === true && addEvt(ctx, 'main', [ [ el, 'touchstart', 'touchStart', `passive${modifiers.capture === true ? 'Capture' : ''}` ] ]) @@ -237,7 +237,7 @@ export default { cleanEvt(ctx, 'main') cleanEvt(ctx, 'temp') - if (Platform.is.mobile === true || (ctx.event !== void 0 && ctx.event.repeatCount > 0)) { + if (client.is.mobile === true || (ctx.event !== void 0 && ctx.event.repeatCount > 0)) { document.documentElement.style.cursor = '' document.body.classList.remove('non-selectable') } diff --git a/ui/src/directives/TouchSwipe.js b/ui/src/directives/TouchSwipe.js index 5a6af0a69db..d434500624d 100644 --- a/ui/src/directives/TouchSwipe.js +++ b/ui/src/directives/TouchSwipe.js @@ -1,4 +1,4 @@ -import Platform, { clientTouch } from '../plugins/Platform.js' +import { client } from '../plugins/Platform.js' import { getModifierDirections, updateModifiers, addEvt, cleanEvt } from '../utils/touch.js' import { position, leftClick, stopAndPrevent, listenOpts, preventDraggable } from '../utils/event.js' import { clearSelection } from '../utils/selection.js' @@ -26,7 +26,7 @@ export default { bind (el, { value, arg, modifiers }) { // early return, we don't need to do anything - if (modifiers.mouse !== true && clientTouch !== true) { + if (modifiers.mouse !== true && client.has.touch !== true) { return } @@ -60,7 +60,7 @@ export default { }, start (evt, mouseEvent) { - Platform.is.firefox === true && preventDraggable(el, true) + client.is.firefox === true && preventDraggable(el, true) const pos = position(evt) @@ -200,7 +200,7 @@ export default { } cleanEvt(ctx, 'temp') - Platform.is.firefox === true && preventDraggable(el, false) + client.is.firefox === true && preventDraggable(el, false) if (ctx.event.dir !== false) { stopAndPrevent(evt) @@ -224,7 +224,7 @@ export default { [ el, 'mousedown', 'mouseStart', `passive${mouseCapture}` ] ]) - if (clientTouch === true) { + if (client.has.touch === true) { const capture = modifiers.capture === true ? 'Capture' : '' addEvt(ctx, 'main', [ [ el, 'touchstart', 'touchStart', `passive${capture}` ], @@ -242,7 +242,7 @@ export default { const ctx = el.__qtouchswipe_old || el.__qtouchswipe if (ctx !== void 0) { - Platform.is.firefox === true && preventDraggable(el, false) + client.is.firefox === true && preventDraggable(el, false) cleanEvt(ctx, 'main') cleanEvt(ctx, 'temp') diff --git a/ui/src/install.js b/ui/src/install.js index ec00e498aa6..f56dcf428cc 100644 --- a/ui/src/install.js +++ b/ui/src/install.js @@ -24,7 +24,7 @@ export default function (Vue, opts = {}) { // required plugins Platform.install($q, queues) - Body.install($q, queues, cfg) + Body.install(queues, cfg) Screen.install($q, queues) History.install($q, cfg) Lang.install($q, queues, opts.lang) diff --git a/ui/src/plugins/LocalStorage.js b/ui/src/plugins/LocalStorage.js index c9c7aabffd9..ebc81fd97c1 100644 --- a/ui/src/plugins/LocalStorage.js +++ b/ui/src/plugins/LocalStorage.js @@ -1,9 +1,9 @@ -import { isSSR, hasWebStorage } from './Platform.js' +import { isSSR, client } from './Platform.js' import { getEmptyStorage, getStorage } from '../utils/web-storage.js' export default { install ({ $q }) { - const storage = isSSR === true || hasWebStorage() === false + const storage = isSSR === true || client.has.webStorage === false ? getEmptyStorage() : getStorage('local') diff --git a/ui/src/plugins/Platform.js b/ui/src/plugins/Platform.js index fb535c996a0..266b9bff600 100644 --- a/ui/src/plugins/Platform.js +++ b/ui/src/plugins/Platform.js @@ -32,10 +32,6 @@ function getMatch (userAgent, platformMatch) { } } -function getClientUserAgent () { - return (navigator.userAgent || navigator.vendor || window.opera).toLowerCase() -} - function getPlatformMatch (userAgent) { return /(ipad)/.exec(userAgent) || /(ipod)/.exec(userAgent) || @@ -205,96 +201,101 @@ function getPlatform (userAgent) { browser.electron === void 0 && !!document.querySelector('[data-server-rendered]') - fromSSR === true && (onSSR = true) + if (fromSSR === true) { + onSSR = true + } } return browser } -let webStorage - -export function hasWebStorage () { - if (webStorage !== void 0) { - return webStorage - } +const userAgent = isSSR === false + ? (navigator.userAgent || navigator.vendor || window.opera).toLowerCase() + : '' - try { - if (window.localStorage) { - webStorage = true - return true - } - } - catch (e) {} - - webStorage = false - return false +const ssrClient = { + has: { + touch: false, + webStorage: false + }, + within: { iframe: false } } -export const clientTouch = isSSR === true - ? false - : (() => 'ontouchstart' in window || - window.navigator.maxTouchPoints > 0 - )() - -function getClientProperties () { - return { +// We export ""client"" for hydration error-free parts, +// like touch directives who do not (and must NOT) wait +// for the client takeover; +// Do NOT import this directly in your app, unless you really know +// what you are doing. +export const client = isSSR === false + ? { + userAgent, + is: getPlatform(userAgent), has: { - touch: clientTouch, - webStorage: hasWebStorage() + touch: (() => 'ontouchstart' in window || + window.navigator.maxTouchPoints > 0 + )(), + webStorage: (() => { + try { + if (window.localStorage) { + return true + } + } + catch (e) {} + return false + })() }, within: { iframe: window.self !== window.top } } -} - -export default { - has: { - touch: false, - webStorage: false - }, - within: { iframe: false }, - - parseSSR (/* ssrContext */ ssr) { - if (ssr) { - const userAgent = (ssr.req.headers['user-agent'] || ssr.req.headers['User-Agent'] || '').toLowerCase() - return { - userAgent, - is: getPlatform(userAgent), - has: this.has, - within: this.within - } - } - - const userAgent = getClientUserAgent() - return { - userAgent, - is: getPlatform(userAgent), - ...getClientProperties() - } - }, + : ssrClient +const Platform = { install ($q, queues) { if (isSSR === true) { + // we're on server-side, so we push + // to the server queue instead of + // applying directly queues.server.push((q, ctx) => { q.platform = this.parseSSR(ctx.ssr) }) - return } - - this.userAgent = getClientUserAgent() - this.is = getPlatform(this.userAgent) - - if (fromSSR === true) { + else if (fromSSR === true) { + // must match with server-side before + // client taking over in order to prevent + // hydration errors + Object.assign(this, client, ssrClient) + + // takeover should increase accuracy for + // the rest of the props; we also avoid + // hydration errors queues.takeover.push(q => { onSSR = fromSSR = false - Object.assign(q.platform, getClientProperties()) + Object.assign(q.platform, client) }) + + // we need to make platform reactive + // for the takeover phase Vue.util.defineReactive($q, 'platform', this) } else { - Object.assign(this, getClientProperties()) + // we don't have any business with SSR, so + // directly applying... + Object.assign(this, client) $q.platform = this } } } + +if (isSSR === true) { + Platform.parseSSR = (/* ssrContext */ ssr) => { + const userAgent = (ssr.req.headers['user-agent'] || ssr.req.headers['User-Agent'] || '').toLowerCase() + return { + ...client, + userAgent, + is: getPlatform(userAgent) + } + } +} + +export default Platform diff --git a/ui/src/plugins/SessionStorage.js b/ui/src/plugins/SessionStorage.js index 9657c4ce3b6..69ba68b0a45 100644 --- a/ui/src/plugins/SessionStorage.js +++ b/ui/src/plugins/SessionStorage.js @@ -1,9 +1,9 @@ -import { isSSR, hasWebStorage } from './Platform.js' +import { isSSR, client } from './Platform.js' import { getEmptyStorage, getStorage } from '../utils/web-storage.js' export default { install ({ $q }) { - const storage = isSSR === true || hasWebStorage() === false + const storage = isSSR === true || client.has.webStorage === false ? getEmptyStorage() : getStorage('session')" 4374a4c208fe6ce502ce7a0339bdb209546b3e7b,2021-01-11 22:14:01,Razvan Stoenescu,feat(docs): small tweak to roadmap page,False,small tweak to roadmap page,feat,"diff --git a/docs/src/pages/start/roadmap.md b/docs/src/pages/start/roadmap.md index f11646dc70c..b72e2997063 100644 --- a/docs/src/pages/start/roadmap.md +++ b/docs/src/pages/start/roadmap.md @@ -29,7 +29,7 @@ In the meantime, the wonderful framework you've come to love is still here and y If you want to speed up the development of Quasar please consider donating to the project. With proper funding, it allows more of the team to work on the project in a much more dedicated manner. -[Donations - https://github.com/sponsors/rstoenescu](https://github.com/sponsors/rstoenescu) +[Donations - https://donate.quasar.dev](https://donate.quasar.dev) If you're in a company and using Quasar for commercial projects, explain to your management the importance of monthly donations (eg. $200+) for open source projects: you're the one using it every day and this makes you the best suited person to convince them. Be creative! :)" 937c37eeb0e7ab78d3f63744f39b498f7118629c,2019-09-11 02:08:19,Razvan Stoenescu,fix(ui): errors in Sass files #5049,False,errors in Sass files #5049,fix,"diff --git a/ui/src/components/btn/QBtn.sass b/ui/src/components/btn/QBtn.sass index 89f6704fabe..18d1a9e501d 100644 --- a/ui/src/components/btn/QBtn.sass +++ b/ui/src/components/btn/QBtn.sass @@ -42,7 +42,7 @@ left: 0 border-radius: inherit transition: $button-transition - &:active + &:active, &.q-btn--active &:before box-shadow: $button-shadow-active diff --git a/ui/src/components/card/QCard.sass b/ui/src/components/card/QCard.sass index 1c27a3b4d8d..435af5955b3 100644 --- a/ui/src/components/card/QCard.sass +++ b/ui/src/components/card/QCard.sass @@ -46,13 +46,13 @@ padding: 0 8px &--horiz - > .q-btn-item + .q-btn-item - > .q-btn-group + .q-btn-item + > .q-btn-item + .q-btn-item, + > .q-btn-group + .q-btn-item, > .q-btn-item + .q-btn-group margin-left: 8px &--vert - > .q-btn-item + .q-btn-item - > .q-btn-group + .q-btn-item + > .q-btn-item + .q-btn-item, + > .q-btn-group + .q-btn-item, > .q-btn-item + .q-btn-group margin-top: 4px diff --git a/ui/src/components/fab/QFab.sass b/ui/src/components/fab/QFab.sass index bef82a61d7f..78ba2276612 100644 --- a/ui/src/components/fab/QFab.sass +++ b/ui/src/components/fab/QFab.sass @@ -12,7 +12,7 @@ pointer-events: all .q-fab__icon transform: rotate3d(0, 0, 1, 180deg) - opacity 0 + opacity: 0 .q-fab__active-icon transform: rotate3d(0, 0, 1, 0deg) opacity: 1 diff --git a/ui/src/components/layout/QLayout.sass b/ui/src/components/layout/QLayout.sass index aef264ea595..a04a185331b 100644 --- a/ui/src/components/layout/QLayout.sass +++ b/ui/src/components/layout/QLayout.sass @@ -131,14 +131,14 @@ body.q-ios-padding .q-layout--standard .q-header > .q-toolbar:nth-child(2), - .q-layout--standard .q-header > .q-tabs:nth-child(2) .q-tabs-head + .q-layout--standard .q-header > .q-tabs:nth-child(2) .q-tabs-head, .q-layout--standard .q-drawer--top-padding .q-drawer__content padding-top: $ios-statusbar-height min-height: ($toolbar-min-height + $ios-statusbar-height) padding-top: env(safe-area-inset-top) min-height: calc(env(safe-area-inset-top) + #{$toolbar-min-height}) .q-layout--standard .q-footer > .q-toolbar:last-child, - .q-layout--standard .q-footer > .q-tabs:last-child .q-tabs-head + .q-layout--standard .q-footer > .q-tabs:last-child .q-tabs-head, .q-layout--standard .q-drawer--top-padding .q-drawer__content padding-bottom: env(safe-area-inset-bottom) min-height: calc(env(safe-area-inset-bottom) + #{$toolbar-min-height}) @@ -162,6 +162,6 @@ body.q-ios-padding @media (max-width: $breakpoint-xs-max) padding: 8px @media (min-width: $breakpoint-sm-min) and (max-width: $breakpoint-md-max) - padding 16px + padding: 16px @media (min-width: $breakpoint-lg-min) padding: 24px diff --git a/ui/src/components/slider/QSlider.sass b/ui/src/components/slider/QSlider.sass index 828ddc38e4c..fcbcecb0bd7 100644 --- a/ui/src/components/slider/QSlider.sass +++ b/ui/src/components/slider/QSlider.sass @@ -1,6 +1,6 @@ .q-slider - position relative + position: relative width: 100% height: 40px color: $primary diff --git a/ui/src/ie-compat/ie.sass b/ui/src/ie-compat/ie.sass index 513706dc169..1021e046d42 100644 --- a/ui/src/ie-compat/ie.sass +++ b/ui/src/ie-compat/ie.sass @@ -26,9 +26,9 @@ min-height: 24px !important /* Flex Basis */ - .q-btn__content - .q-time__content - .q-toolbar__title + .q-btn__content, + .q-time__content, + .q-toolbar__title, .q-menu .q-item__section--main flex-basis: auto @@ -80,8 +80,7 @@ /* QFab */ .q-fab--opened .q-fab__actions - &--left - &--right + &--left, &--right display: block white-space: nowrap" 4923786b3558f0dc3378b5a36cb20dc9a8c7b5bb,2023-04-26 14:32:31,freddy38510,feat(extras): add missing type declarations for svg mdi v4 icons (#15748),False,add missing type declarations for svg mdi v4 icons (#15748),feat,"diff --git a/extras/mdi-v4/index.d.ts b/extras/mdi-v4/index.d.ts new file mode 100644 index 00000000000..36e211f24c0 --- /dev/null +++ b/extras/mdi-v4/index.d.ts @@ -0,0 +1,4997 @@ +/* MDI v4.9.95 */ + +export declare const mdiAbTesting: string; +export declare const mdiAbjadArabic: string; +export declare const mdiAbjadHebrew: string; +export declare const mdiAbugidaDevanagari: string; +export declare const mdiAbugidaThai: string; +export declare const mdiAccessPoint: string; +export declare const mdiAccessPointNetwork: string; +export declare const mdiAccessPointNetworkOff: string; +export declare const mdiAccount: string; +export declare const mdiAccountAlert: string; +export declare const mdiAccountAlertOutline: string; +export declare const mdiAccountArrowLeft: string; +export declare const mdiAccountArrowLeftOutline: string; +export declare const mdiAccountArrowRight: string; +export declare const mdiAccountArrowRightOutline: string; +export declare const mdiAccountBadge: string; +export declare const mdiAccountBadgeAlert: string; +export declare const mdiAccountBadgeAlertOutline: string; +export declare const mdiAccountBadgeHorizontal: string; +export declare const mdiAccountBadgeHorizontalOutline: string; +export declare const mdiAccountBadgeOutline: string; +export declare const mdiAccountBox: string; +export declare const mdiAccountBoxMultiple: string; +export declare const mdiAccountBoxMultipleOutline: string; +export declare const mdiAccountBoxOutline: string; +export declare const mdiAccountCancel: string; +export declare const mdiAccountCancelOutline: string; +export declare const mdiAccountCardDetails: string; +export declare const mdiAccountCardDetailsOutline: string; +export declare const mdiAccountCash: string; +export declare const mdiAccountCashOutline: string; +export declare const mdiAccountCheck: string; +export declare const mdiAccountCheckOutline: string; +export declare const mdiAccountChild: string; +export declare const mdiAccountChildCircle: string; +export declare const mdiAccountChildOutline: string; +export declare const mdiAccountCircle: string; +export declare const mdiAccountCircleOutline: string; +export declare const mdiAccountClock: string; +export declare const mdiAccountClockOutline: string; +export declare const mdiAccountCog: string; +export declare const mdiAccountCogOutline: string; +export declare const mdiAccountConvert: string; +export declare const mdiAccountConvertOutline: string; +export declare const mdiAccountDetails: string; +export declare const mdiAccountDetailsOutline: string; +export declare const mdiAccountEdit: string; +export declare const mdiAccountEditOutline: string; +export declare const mdiAccountGroup: string; +export declare const mdiAccountGroupOutline: string; +export declare const mdiAccountHeart: string; +export declare const mdiAccountHeartOutline: string; +export declare const mdiAccountKey: string; +export declare const mdiAccountKeyOutline: string; +export declare const mdiAccountLock: string; +export declare const mdiAccountLockOutline: string; +export declare const mdiAccountMinus: string; +export declare const mdiAccountMinusOutline: string; +export declare const mdiAccountMultiple: string; +export declare const mdiAccountMultipleCheck: string; +export declare const mdiAccountMultipleCheckOutline: string; +export declare const mdiAccountMultipleMinus: string; +export declare const mdiAccountMultipleMinusOutline: string; +export declare const mdiAccountMultipleOutline: string; +export declare const mdiAccountMultiplePlus: string; +export declare const mdiAccountMultiplePlusOutline: string; +export declare const mdiAccountMultipleRemove: string; +export declare const mdiAccountMultipleRemoveOutline: string; +export declare const mdiAccountNetwork: string; +export declare const mdiAccountNetworkOutline: string; +export declare const mdiAccountOff: string; +export declare const mdiAccountOffOutline: string; +export declare const mdiAccountOutline: string; +export declare const mdiAccountPlus: string; +export declare const mdiAccountPlusOutline: string; +export declare const mdiAccountQuestion: string; +export declare const mdiAccountQuestionOutline: string; +export declare const mdiAccountRemove: string; +export declare const mdiAccountRemoveOutline: string; +export declare const mdiAccountSearch: string; +export declare const mdiAccountSearchOutline: string; +export declare const mdiAccountSettings: string; +export declare const mdiAccountSettingsOutline: string; +export declare const mdiAccountStar: string; +export declare const mdiAccountStarOutline: string; +export declare const mdiAccountSupervisor: string; +export declare const mdiAccountSupervisorCircle: string; +export declare const mdiAccountSupervisorOutline: string; +export declare const mdiAccountSwitch: string; +export declare const mdiAccountTie: string; +export declare const mdiAccountTieOutline: string; +export declare const mdiAccountTieVoice: string; +export declare const mdiAccountTieVoiceOff: string; +export declare const mdiAccountTieVoiceOffOutline: string; +export declare const mdiAccountTieVoiceOutline: string; +export declare const mdiAccusoft: string; +export declare const mdiAdjust: string; +export declare const mdiAdobe: string; +export declare const mdiAdobeAcrobat: string; +export declare const mdiAirConditioner: string; +export declare const mdiAirFilter: string; +export declare const mdiAirHorn: string; +export declare const mdiAirHumidifier: string; +export declare const mdiAirPurifier: string; +export declare const mdiAirbag: string; +export declare const mdiAirballoon: string; +export declare const mdiAirballoonOutline: string; +export declare const mdiAirplane: string; +export declare const mdiAirplaneLanding: string; +export declare const mdiAirplaneOff: string; +export declare const mdiAirplaneTakeoff: string; +export declare const mdiAirplay: string; +export declare const mdiAirport: string; +export declare const mdiAlarm: string; +export declare const mdiAlarmBell: string; +export declare const mdiAlarmCheck: string; +export declare const mdiAlarmLight: string; +export declare const mdiAlarmLightOutline: string; +export declare const mdiAlarmMultiple: string; +export declare const mdiAlarmNote: string; +export declare const mdiAlarmNoteOff: string; +export declare const mdiAlarmOff: string; +export declare const mdiAlarmPlus: string; +export declare const mdiAlarmSnooze: string; +export declare const mdiAlbum: string; +export declare const mdiAlert: string; +export declare const mdiAlertBox: string; +export declare const mdiAlertBoxOutline: string; +export declare const mdiAlertCircle: string; +export declare const mdiAlertCircleCheck: string; +export declare const mdiAlertCircleCheckOutline: string; +export declare const mdiAlertCircleOutline: string; +export declare const mdiAlertDecagram: string; +export declare const mdiAlertDecagramOutline: string; +export declare const mdiAlertOctagon: string; +export declare const mdiAlertOctagonOutline: string; +export declare const mdiAlertOctagram: string; +export declare const mdiAlertOctagramOutline: string; +export declare const mdiAlertOutline: string; +export declare const mdiAlertRhombus: string; +export declare const mdiAlertRhombusOutline: string; +export declare const mdiAlien: string; +export declare const mdiAlienOutline: string; +export declare const mdiAlignHorizontalCenter: string; +export declare const mdiAlignHorizontalLeft: string; +export declare const mdiAlignHorizontalRight: string; +export declare const mdiAlignVerticalBottom: string; +export declare const mdiAlignVerticalCenter: string; +export declare const mdiAlignVerticalTop: string; +export declare const mdiAllInclusive: string; +export declare const mdiAllergy: string; +export declare const mdiAlpha: string; +export declare const mdiAlphaA: string; +export declare const mdiAlphaABox: string; +export declare const mdiAlphaABoxOutline: string; +export declare const mdiAlphaACircle: string; +export declare const mdiAlphaACircleOutline: string; +export declare const mdiAlphaB: string; +export declare const mdiAlphaBBox: string; +export declare const mdiAlphaBBoxOutline: string; +export declare const mdiAlphaBCircle: string; +export declare const mdiAlphaBCircleOutline: string; +export declare const mdiAlphaC: string; +export declare const mdiAlphaCBox: string; +export declare const mdiAlphaCBoxOutline: string; +export declare const mdiAlphaCCircle: string; +export declare const mdiAlphaCCircleOutline: string; +export declare const mdiAlphaD: string; +export declare const mdiAlphaDBox: string; +export declare const mdiAlphaDBoxOutline: string; +export declare const mdiAlphaDCircle: string; +export declare const mdiAlphaDCircleOutline: string; +export declare const mdiAlphaE: string; +export declare const mdiAlphaEBox: string; +export declare const mdiAlphaEBoxOutline: string; +export declare const mdiAlphaECircle: string; +export declare const mdiAlphaECircleOutline: string; +export declare const mdiAlphaF: string; +export declare const mdiAlphaFBox: string; +export declare const mdiAlphaFBoxOutline: string; +export declare const mdiAlphaFCircle: string; +export declare const mdiAlphaFCircleOutline: string; +export declare const mdiAlphaG: string; +export declare const mdiAlphaGBox: string; +export declare const mdiAlphaGBoxOutline: string; +export declare const mdiAlphaGCircle: string; +export declare const mdiAlphaGCircleOutline: string; +export declare const mdiAlphaH: string; +export declare const mdiAlphaHBox: string; +export declare const mdiAlphaHBoxOutline: string; +export declare const mdiAlphaHCircle: string; +export declare const mdiAlphaHCircleOutline: string; +export declare const mdiAlphaI: string; +export declare const mdiAlphaIBox: string; +export declare const mdiAlphaIBoxOutline: string; +export declare const mdiAlphaICircle: string; +export declare const mdiAlphaICircleOutline: string; +export declare const mdiAlphaJ: string; +export declare const mdiAlphaJBox: string; +export declare const mdiAlphaJBoxOutline: string; +export declare const mdiAlphaJCircle: string; +export declare const mdiAlphaJCircleOutline: string; +export declare const mdiAlphaK: string; +export declare const mdiAlphaKBox: string; +export declare const mdiAlphaKBoxOutline: string; +export declare const mdiAlphaKCircle: string; +export declare const mdiAlphaKCircleOutline: string; +export declare const mdiAlphaL: string; +export declare const mdiAlphaLBox: string; +export declare const mdiAlphaLBoxOutline: string; +export declare const mdiAlphaLCircle: string; +export declare const mdiAlphaLCircleOutline: string; +export declare const mdiAlphaM: string; +export declare const mdiAlphaMBox: string; +export declare const mdiAlphaMBoxOutline: string; +export declare const mdiAlphaMCircle: string; +export declare const mdiAlphaMCircleOutline: string; +export declare const mdiAlphaN: string; +export declare const mdiAlphaNBox: string; +export declare const mdiAlphaNBoxOutline: string; +export declare const mdiAlphaNCircle: string; +export declare const mdiAlphaNCircleOutline: string; +export declare const mdiAlphaO: string; +export declare const mdiAlphaOBox: string; +export declare const mdiAlphaOBoxOutline: string; +export declare const mdiAlphaOCircle: string; +export declare const mdiAlphaOCircleOutline: string; +export declare const mdiAlphaP: string; +export declare const mdiAlphaPBox: string; +export declare const mdiAlphaPBoxOutline: string; +export declare const mdiAlphaPCircle: string; +export declare const mdiAlphaPCircleOutline: string; +export declare const mdiAlphaQ: string; +export declare const mdiAlphaQBox: string; +export declare const mdiAlphaQBoxOutline: string; +export declare const mdiAlphaQCircle: string; +export declare const mdiAlphaQCircleOutline: string; +export declare const mdiAlphaR: string; +export declare const mdiAlphaRBox: string; +export declare const mdiAlphaRBoxOutline: string; +export declare const mdiAlphaRCircle: string; +export declare const mdiAlphaRCircleOutline: string; +export declare const mdiAlphaS: string; +export declare const mdiAlphaSBox: string; +export declare const mdiAlphaSBoxOutline: string; +export declare const mdiAlphaSCircle: string; +export declare const mdiAlphaSCircleOutline: string; +export declare const mdiAlphaT: string; +export declare const mdiAlphaTBox: string; +export declare const mdiAlphaTBoxOutline: string; +export declare const mdiAlphaTCircle: string; +export declare const mdiAlphaTCircleOutline: string; +export declare const mdiAlphaU: string; +export declare const mdiAlphaUBox: string; +export declare const mdiAlphaUBoxOutline: string; +export declare const mdiAlphaUCircle: string; +export declare const mdiAlphaUCircleOutline: string; +export declare const mdiAlphaV: string; +export declare const mdiAlphaVBox: string; +export declare const mdiAlphaVBoxOutline: string; +export declare const mdiAlphaVCircle: string; +export declare const mdiAlphaVCircleOutline: string; +export declare const mdiAlphaW: string; +export declare const mdiAlphaWBox: string; +export declare const mdiAlphaWBoxOutline: string; +export declare const mdiAlphaWCircle: string; +export declare const mdiAlphaWCircleOutline: string; +export declare const mdiAlphaX: string; +export declare const mdiAlphaXBox: string; +export declare const mdiAlphaXBoxOutline: string; +export declare const mdiAlphaXCircle: string; +export declare const mdiAlphaXCircleOutline: string; +export declare const mdiAlphaY: string; +export declare const mdiAlphaYBox: string; +export declare const mdiAlphaYBoxOutline: string; +export declare const mdiAlphaYCircle: string; +export declare const mdiAlphaYCircleOutline: string; +export declare const mdiAlphaZ: string; +export declare const mdiAlphaZBox: string; +export declare const mdiAlphaZBoxOutline: string; +export declare const mdiAlphaZCircle: string; +export declare const mdiAlphaZCircleOutline: string; +export declare const mdiAlphabetAurebesh: string; +export declare const mdiAlphabetCyrillic: string; +export declare const mdiAlphabetGreek: string; +export declare const mdiAlphabetLatin: string; +export declare const mdiAlphabetPiqad: string; +export declare const mdiAlphabetTengwar: string; +export declare const mdiAlphabetical: string; +export declare const mdiAlphabeticalOff: string; +export declare const mdiAlphabeticalVariant: string; +export declare const mdiAlphabeticalVariantOff: string; +export declare const mdiAltimeter: string; +export declare const mdiAmazon: string; +export declare const mdiAmazonAlexa: string; +export declare const mdiAmazonDrive: string; +export declare const mdiAmbulance: string; +export declare const mdiAmmunition: string; +export declare const mdiAmpersand: string; +export declare const mdiAmplifier: string; +export declare const mdiAmplifierOff: string; +export declare const mdiAnchor: string; +export declare const mdiAndroid: string; +export declare const mdiAndroidAuto: string; +export declare const mdiAndroidDebugBridge: string; +export declare const mdiAndroidHead: string; +export declare const mdiAndroidMessages: string; +export declare const mdiAndroidStudio: string; +export declare const mdiAngleAcute: string; +export declare const mdiAngleObtuse: string; +export declare const mdiAngleRight: string; +export declare const mdiAngular: string; +export declare const mdiAngularjs: string; +export declare const mdiAnimation: string; +export declare const mdiAnimationOutline: string; +export declare const mdiAnimationPlay: string; +export declare const mdiAnimationPlayOutline: string; +export declare const mdiAnsible: string; +export declare const mdiAntenna: string; +export declare const mdiAnvil: string; +export declare const mdiApacheKafka: string; +export declare const mdiApi: string; +export declare const mdiApiOff: string; +export declare const mdiApple: string; +export declare const mdiAppleFinder: string; +export declare const mdiAppleIcloud: string; +export declare const mdiAppleIos: string; +export declare const mdiAppleKeyboardCaps: string; +export declare const mdiAppleKeyboardCommand: string; +export declare const mdiAppleKeyboardControl: string; +export declare const mdiAppleKeyboardOption: string; +export declare const mdiAppleKeyboardShift: string; +export declare const mdiAppleSafari: string; +export declare const mdiApplication: string; +export declare const mdiApplicationExport: string; +export declare const mdiApplicationImport: string; +export declare const mdiApproximatelyEqual: string; +export declare const mdiApproximatelyEqualBox: string; +export declare const mdiApps: string; +export declare const mdiAppsBox: string; +export declare const mdiArch: string; +export declare const mdiArchive: string; +export declare const mdiArchiveArrowDown: string; +export declare const mdiArchiveArrowDownOutline: string; +export declare const mdiArchiveArrowUp: string; +export declare const mdiArchiveArrowUpOutline: string; +export declare const mdiArchiveOutline: string; +export declare const mdiArmFlex: string; +export declare const mdiArmFlexOutline: string; +export declare const mdiArrangeBringForward: string; +export declare const mdiArrangeBringToFront: string; +export declare const mdiArrangeSendBackward: string; +export declare const mdiArrangeSendToBack: string; +export declare const mdiArrowAll: string; +export declare const mdiArrowBottomLeft: string; +export declare const mdiArrowBottomLeftBoldOutline: string; +export declare const mdiArrowBottomLeftThick: string; +export declare const mdiArrowBottomRight: string; +export declare const mdiArrowBottomRightBoldOutline: string; +export declare const mdiArrowBottomRightThick: string; +export declare const mdiArrowCollapse: string; +export declare const mdiArrowCollapseAll: string; +export declare const mdiArrowCollapseDown: string; +export declare const mdiArrowCollapseHorizontal: string; +export declare const mdiArrowCollapseLeft: string; +export declare const mdiArrowCollapseRight: string; +export declare const mdiArrowCollapseUp: string; +export declare const mdiArrowCollapseVertical: string; +export declare const mdiArrowDecision: string; +export declare const mdiArrowDecisionAuto: string; +export declare const mdiArrowDecisionAutoOutline: string; +export declare const mdiArrowDecisionOutline: string; +export declare const mdiArrowDown: string; +export declare const mdiArrowDownBold: string; +export declare const mdiArrowDownBoldBox: string; +export declare const mdiArrowDownBoldBoxOutline: string; +export declare const mdiArrowDownBoldCircle: string; +export declare const mdiArrowDownBoldCircleOutline: string; +export declare const mdiArrowDownBoldHexagonOutline: string; +export declare const mdiArrowDownBoldOutline: string; +export declare const mdiArrowDownBox: string; +export declare const mdiArrowDownCircle: string; +export declare const mdiArrowDownCircleOutline: string; +export declare const mdiArrowDownDropCircle: string; +export declare const mdiArrowDownDropCircleOutline: string; +export declare const mdiArrowDownThick: string; +export declare const mdiArrowExpand: string; +export declare const mdiArrowExpandAll: string; +export declare const mdiArrowExpandDown: string; +export declare const mdiArrowExpandHorizontal: string; +export declare const mdiArrowExpandLeft: string; +export declare const mdiArrowExpandRight: string; +export declare const mdiArrowExpandUp: string; +export declare const mdiArrowExpandVertical: string; +export declare const mdiArrowHorizontalLock: string; +export declare const mdiArrowLeft: string; +export declare const mdiArrowLeftBold: string; +export declare const mdiArrowLeftBoldBox: string; +export declare const mdiArrowLeftBoldBoxOutline: string; +export declare const mdiArrowLeftBoldCircle: string; +export declare const mdiArrowLeftBoldCircleOutline: string; +export declare const mdiArrowLeftBoldHexagonOutline: string; +export declare const mdiArrowLeftBoldOutline: string; +export declare const mdiArrowLeftBox: string; +export declare const mdiArrowLeftCircle: string; +export declare const mdiArrowLeftCircleOutline: string; +export declare const mdiArrowLeftDropCircle: string; +export declare const mdiArrowLeftDropCircleOutline: string; +export declare const mdiArrowLeftRight: string; +export declare const mdiArrowLeftRightBold: string; +export declare const mdiArrowLeftRightBoldOutline: string; +export declare const mdiArrowLeftThick: string; +export declare const mdiArrowRight: string; +export declare const mdiArrowRightBold: string; +export declare const mdiArrowRightBoldBox: string; +export declare const mdiArrowRightBoldBoxOutline: string; +export declare const mdiArrowRightBoldCircle: string; +export declare const mdiArrowRightBoldCircleOutline: string; +export declare const mdiArrowRightBoldHexagonOutline: string; +export declare const mdiArrowRightBoldOutline: string; +export declare const mdiArrowRightBox: string; +export declare const mdiArrowRightCircle: string; +export declare const mdiArrowRightCircleOutline: string; +export declare const mdiArrowRightDropCircle: string; +export declare const mdiArrowRightDropCircleOutline: string; +export declare const mdiArrowRightThick: string; +export declare const mdiArrowSplitHorizontal: string; +export declare const mdiArrowSplitVertical: string; +export declare const mdiArrowTopLeft: string; +export declare const mdiArrowTopLeftBoldOutline: string; +export declare const mdiArrowTopLeftBottomRight: string; +export declare const mdiArrowTopLeftBottomRightBold: string; +export declare const mdiArrowTopLeftThick: string; +export declare const mdiArrowTopRight: string; +export declare const mdiArrowTopRightBoldOutline: string; +export declare const mdiArrowTopRightBottomLeft: string; +export declare const mdiArrowTopRightBottomLeftBold: string; +export declare const mdiArrowTopRightThick: string; +export declare const mdiArrowUp: string; +export declare const mdiArrowUpBold: string; +export declare const mdiArrowUpBoldBox: string; +export declare const mdiArrowUpBoldBoxOutline: string; +export declare const mdiArrowUpBoldCircle: string; +export declare const mdiArrowUpBoldCircleOutline: string; +export declare const mdiArrowUpBoldHexagonOutline: string; +export declare const mdiArrowUpBoldOutline: string; +export declare const mdiArrowUpBox: string; +export declare const mdiArrowUpCircle: string; +export declare const mdiArrowUpCircleOutline: string; +export declare const mdiArrowUpDown: string; +export declare const mdiArrowUpDownBold: string; +export declare const mdiArrowUpDownBoldOutline: string; +export declare const mdiArrowUpDropCircle: string; +export declare const mdiArrowUpDropCircleOutline: string; +export declare const mdiArrowUpThick: string; +export declare const mdiArrowVerticalLock: string; +export declare const mdiArtist: string; +export declare const mdiArtistOutline: string; +export declare const mdiArtstation: string; +export declare const mdiAspectRatio: string; +export declare const mdiAssistant: string; +export declare const mdiAsterisk: string; +export declare const mdiAt: string; +export declare const mdiAtlassian: string; +export declare const mdiAtm: string; +export declare const mdiAtom: string; +export declare const mdiAtomVariant: string; +export declare const mdiAttachment: string; +export declare const mdiAudioVideo: string; +export declare const mdiAudioVideoOff: string; +export declare const mdiAudiobook: string; +export declare const mdiAugmentedReality: string; +export declare const mdiAutoDownload: string; +export declare const mdiAutoFix: string; +export declare const mdiAutoUpload: string; +export declare const mdiAutorenew: string; +export declare const mdiAvTimer: string; +export declare const mdiAws: string; +export declare const mdiAxe: string; +export declare const mdiAxis: string; +export declare const mdiAxisArrow: string; +export declare const mdiAxisArrowLock: string; +export declare const mdiAxisLock: string; +export declare const mdiAxisXArrow: string; +export declare const mdiAxisXArrowLock: string; +export declare const mdiAxisXRotateClockwise: string; +export declare const mdiAxisXRotateCounterclockwise: string; +export declare const mdiAxisXYArrowLock: string; +export declare const mdiAxisYArrow: string; +export declare const mdiAxisYArrowLock: string; +export declare const mdiAxisYRotateClockwise: string; +export declare const mdiAxisYRotateCounterclockwise: string; +export declare const mdiAxisZArrow: string; +export declare const mdiAxisZArrowLock: string; +export declare const mdiAxisZRotateClockwise: string; +export declare const mdiAxisZRotateCounterclockwise: string; +export declare const mdiAzure: string; +export declare const mdiAzureDevops: string; +export declare const mdiBabel: string; +export declare const mdiBaby: string; +export declare const mdiBabyBottle: string; +export declare const mdiBabyBottleOutline: string; +export declare const mdiBabyCarriage: string; +export declare const mdiBabyCarriageOff: string; +export declare const mdiBabyFace: string; +export declare const mdiBabyFaceOutline: string; +export declare const mdiBackburger: string; +export declare const mdiBackspace: string; +export declare const mdiBackspaceOutline: string; +export declare const mdiBackspaceReverse: string; +export declare const mdiBackspaceReverseOutline: string; +export declare const mdiBackupRestore: string; +export declare const mdiBacteria: string; +export declare const mdiBacteriaOutline: string; +export declare const mdiBadminton: string; +export declare const mdiBagCarryOn: string; +export declare const mdiBagCarryOnCheck: string; +export declare const mdiBagCarryOnOff: string; +export declare const mdiBagChecked: string; +export declare const mdiBagPersonal: string; +export declare const mdiBagPersonalOff: string; +export declare const mdiBagPersonalOffOutline: string; +export declare const mdiBagPersonalOutline: string; +export declare const mdiBaguette: string; +export declare const mdiBalloon: string; +export declare const mdiBallot: string; +export declare const mdiBallotOutline: string; +export declare const mdiBallotRecount: string; +export declare const mdiBallotRecountOutline: string; +export declare const mdiBandage: string; +export declare const mdiBandcamp: string; +export declare const mdiBank: string; +export declare const mdiBankMinus: string; +export declare const mdiBankOutline: string; +export declare const mdiBankPlus: string; +export declare const mdiBankRemove: string; +export declare const mdiBankTransfer: string; +export declare const mdiBankTransferIn: string; +export declare const mdiBankTransferOut: string; +export declare const mdiBarcode: string; +export declare const mdiBarcodeOff: string; +export declare const mdiBarcodeScan: string; +export declare const mdiBarley: string; +export declare const mdiBarleyOff: string; +export declare const mdiBarn: string; +export declare const mdiBarrel: string; +export declare const mdiBaseball: string; +export declare const mdiBaseballBat: string; +export declare const mdiBasecamp: string; +export declare const mdiBash: string; +export declare const mdiBasket: string; +export declare const mdiBasketFill: string; +export declare const mdiBasketOutline: string; +export declare const mdiBasketUnfill: string; +export declare const mdiBasketball: string; +export declare const mdiBasketballHoop: string; +export declare const mdiBasketballHoopOutline: string; +export declare const mdiBat: string; +export declare const mdiBattery: string; +export declare const mdiBattery10: string; +export declare const mdiBattery10Bluetooth: string; +export declare const mdiBattery20: string; +export declare const mdiBattery20Bluetooth: string; +export declare const mdiBattery30: string; +export declare const mdiBattery30Bluetooth: string; +export declare const mdiBattery40: string; +export declare const mdiBattery40Bluetooth: string; +export declare const mdiBattery50: string; +export declare const mdiBattery50Bluetooth: string; +export declare const mdiBattery60: string; +export declare const mdiBattery60Bluetooth: string; +export declare const mdiBattery70: string; +export declare const mdiBattery70Bluetooth: string; +export declare const mdiBattery80: string; +export declare const mdiBattery80Bluetooth: string; +export declare const mdiBattery90: string; +export declare const mdiBattery90Bluetooth: string; +export declare const mdiBatteryAlert: string; +export declare const mdiBatteryAlertBluetooth: string; +export declare const mdiBatteryAlertVariant: string; +export declare const mdiBatteryAlertVariantOutline: string; +export declare const mdiBatteryBluetooth: string; +export declare const mdiBatteryBluetoothVariant: string; +export declare const mdiBatteryCharging: string; +export declare const mdiBatteryCharging10: string; +export declare const mdiBatteryCharging100: string; +export declare const mdiBatteryCharging20: string; +export declare const mdiBatteryCharging30: string; +export declare const mdiBatteryCharging40: string; +export declare const mdiBatteryCharging50: string; +export declare const mdiBatteryCharging60: string; +export declare const mdiBatteryCharging70: string; +export declare const mdiBatteryCharging80: string; +export declare const mdiBatteryCharging90: string; +export declare const mdiBatteryChargingHigh: string; +export declare const mdiBatteryChargingLow: string; +export declare const mdiBatteryChargingMedium: string; +export declare const mdiBatteryChargingOutline: string; +export declare const mdiBatteryChargingWireless: string; +export declare const mdiBatteryChargingWireless10: string; +export declare const mdiBatteryChargingWireless20: string; +export declare const mdiBatteryChargingWireless30: string; +export declare const mdiBatteryChargingWireless40: string; +export declare const mdiBatteryChargingWireless50: string; +export declare const mdiBatteryChargingWireless60: string; +export declare const mdiBatteryChargingWireless70: string; +export declare const mdiBatteryChargingWireless80: string; +export declare const mdiBatteryChargingWireless90: string; +export declare const mdiBatteryChargingWirelessAlert: string; +export declare const mdiBatteryChargingWirelessOutline: string; +export declare const mdiBatteryHeart: string; +export declare const mdiBatteryHeartOutline: string; +export declare const mdiBatteryHeartVariant: string; +export declare const mdiBatteryHigh: string; +export declare const mdiBatteryLow: string; +export declare const mdiBatteryMedium: string; +export declare const mdiBatteryMinus: string; +export declare const mdiBatteryNegative: string; +export declare const mdiBatteryOff: string; +export declare const mdiBatteryOffOutline: string; +export declare const mdiBatteryOutline: string; +export declare const mdiBatteryPlus: string; +export declare const mdiBatteryPositive: string; +export declare const mdiBatteryUnknown: string; +export declare const mdiBatteryUnknownBluetooth: string; +export declare const mdiBattlenet: string; +export declare const mdiBeach: string; +export declare const mdiBeaker: string; +export declare const mdiBeakerAlert: string; +export declare const mdiBeakerAlertOutline: string; +export declare const mdiBeakerCheck: string; +export declare const mdiBeakerCheckOutline: string; +export declare const mdiBeakerMinus: string; +export declare const mdiBeakerMinusOutline: string; +export declare const mdiBeakerOutline: string; +export declare const mdiBeakerPlus: string; +export declare const mdiBeakerPlusOutline: string; +export declare const mdiBeakerQuestion: string; +export declare const mdiBeakerQuestionOutline: string; +export declare const mdiBeakerRemove: string; +export declare const mdiBeakerRemoveOutline: string; +export declare const mdiBeats: string; +export declare const mdiBedDouble: string; +export declare const mdiBedDoubleOutline: string; +export declare const mdiBedEmpty: string; +export declare const mdiBedKing: string; +export declare const mdiBedKingOutline: string; +export declare const mdiBedQueen: string; +export declare const mdiBedQueenOutline: string; +export declare const mdiBedSingle: string; +export declare const mdiBedSingleOutline: string; +export declare const mdiBee: string; +export declare const mdiBeeFlower: string; +export declare const mdiBeehiveOutline: string; +export declare const mdiBeer: string; +export declare const mdiBeerOutline: string; +export declare const mdiBehance: string; +export declare const mdiBell: string; +export declare const mdiBellAlert: string; +export declare const mdiBellAlertOutline: string; +export declare const mdiBellCheck: string; +export declare const mdiBellCheckOutline: string; +export declare const mdiBellCircle: string; +export declare const mdiBellCircleOutline: string; +export declare const mdiBellOff: string; +export declare const mdiBellOffOutline: string; +export declare const mdiBellOutline: string; +export declare const mdiBellPlus: string; +export declare const mdiBellPlusOutline: string; +export declare const mdiBellRing: string; +export declare const mdiBellRingOutline: string; +export declare const mdiBellSleep: string; +export declare const mdiBellSleepOutline: string; +export declare const mdiBeta: string; +export declare const mdiBetamax: string; +export declare const mdiBiathlon: string; +export declare const mdiBible: string; +export declare const mdiBicycle: string; +export declare const mdiBicycleBasket: string; +export declare const mdiBike: string; +export declare const mdiBikeFast: string; +export declare const mdiBillboard: string; +export declare const mdiBilliards: string; +export declare const mdiBilliardsRack: string; +export declare const mdiBing: string; +export declare const mdiBinoculars: string; +export declare const mdiBio: string; +export declare const mdiBiohazard: string; +export declare const mdiBitbucket: string; +export declare const mdiBitcoin: string; +export declare const mdiBlackMesa: string; +export declare const mdiBlackberry: string; +export declare const mdiBlender: string; +export declare const mdiBlenderSoftware: string; +export declare const mdiBlinds: string; +export declare const mdiBlindsOpen: string; +export declare const mdiBlockHelper: string; +export declare const mdiBlogger: string; +export declare const mdiBloodBag: string; +export declare const mdiBluetooth: string; +export declare const mdiBluetoothAudio: string; +export declare const mdiBluetoothConnect: string; +export declare const mdiBluetoothOff: string; +export declare const mdiBluetoothSettings: string; +export declare const mdiBluetoothTransfer: string; +export declare const mdiBlur: string; +export declare const mdiBlurLinear: string; +export declare const mdiBlurOff: string; +export declare const mdiBlurRadial: string; +export declare const mdiBolnisiCross: string; +export declare const mdiBolt: string; +export declare const mdiBomb: string; +export declare const mdiBombOff: string; +export declare const mdiBone: string; +export declare const mdiBook: string; +export declare const mdiBookInformationVariant: string; +export declare const mdiBookLock: string; +export declare const mdiBookLockOpen: string; +export declare const mdiBookMinus: string; +export declare const mdiBookMinusMultiple: string; +export declare const mdiBookMultiple: string; +export declare const mdiBookOpen: string; +export declare const mdiBookOpenOutline: string; +export declare const mdiBookOpenPageVariant: string; +export declare const mdiBookOpenVariant: string; +export declare const mdiBookOutline: string; +export declare const mdiBookPlay: string; +export declare const mdiBookPlayOutline: string; +export declare const mdiBookPlus: string; +export declare const mdiBookPlusMultiple: string; +export declare const mdiBookRemove: string; +export declare const mdiBookRemoveMultiple: string; +export declare const mdiBookSearch: string; +export declare const mdiBookSearchOutline: string; +export declare const mdiBookVariant: string; +export declare const mdiBookVariantMultiple: string; +export declare const mdiBookmark: string; +export declare const mdiBookmarkCheck: string; +export declare const mdiBookmarkCheckOutline: string; +export declare const mdiBookmarkMinus: string; +export declare const mdiBookmarkMinusOutline: string; +export declare const mdiBookmarkMultiple: string; +export declare const mdiBookmarkMultipleOutline: string; +export declare const mdiBookmarkMusic: string; +export declare const mdiBookmarkMusicOutline: string; +export declare const mdiBookmarkOff: string; +export declare const mdiBookmarkOffOutline: string; +export declare const mdiBookmarkOutline: string; +export declare const mdiBookmarkPlus: string; +export declare const mdiBookmarkPlusOutline: string; +export declare const mdiBookmarkRemove: string; +export declare const mdiBookmarkRemoveOutline: string; +export declare const mdiBookshelf: string; +export declare const mdiBoomGate: string; +export declare const mdiBoomGateAlert: string; +export declare const mdiBoomGateAlertOutline: string; +export declare const mdiBoomGateDown: string; +export declare const mdiBoomGateDownOutline: string; +export declare const mdiBoomGateOutline: string; +export declare const mdiBoomGateUp: string; +export declare const mdiBoomGateUpOutline: string; +export declare const mdiBoombox: string; +export declare const mdiBoomerang: string; +export declare const mdiBootstrap: string; +export declare const mdiBorderAll: string; +export declare const mdiBorderAllVariant: string; +export declare const mdiBorderBottom: string; +export declare const mdiBorderBottomVariant: string; +export declare const mdiBorderColor: string; +export declare const mdiBorderHorizontal: string; +export declare const mdiBorderInside: string; +export declare const mdiBorderLeft: string; +export declare const mdiBorderLeftVariant: string; +export declare const mdiBorderNone: string; +export declare const mdiBorderNoneVariant: string; +export declare const mdiBorderOutside: string; +export declare const mdiBorderRight: string; +export declare const mdiBorderRightVariant: string; +export declare const mdiBorderStyle: string; +export declare const mdiBorderTop: string; +export declare const mdiBorderTopVariant: string; +export declare const mdiBorderVertical: string; +export declare const mdiBottleSoda: string; +export declare const mdiBottleSodaClassic: string; +export declare const mdiBottleSodaClassicOutline: string; +export declare const mdiBottleSodaOutline: string; +export declare const mdiBottleTonic: string; +export declare const mdiBottleTonicOutline: string; +export declare const mdiBottleTonicPlus: string; +export declare const mdiBottleTonicPlusOutline: string; +export declare const mdiBottleTonicSkull: string; +export declare const mdiBottleTonicSkullOutline: string; +export declare const mdiBottleWine: string; +export declare const mdiBottleWineOutline: string; +export declare const mdiBowTie: string; +export declare const mdiBowl: string; +export declare const mdiBowling: string; +export declare const mdiBox: string; +export declare const mdiBoxCutter: string; +export declare const mdiBoxShadow: string; +export declare const mdiBoxingGlove: string; +export declare const mdiBraille: string; +export declare const mdiBrain: string; +export declare const mdiBreadSlice: string; +export declare const mdiBreadSliceOutline: string; +export declare const mdiBridge: string; +export declare const mdiBriefcase: string; +export declare const mdiBriefcaseAccount: string; +export declare const mdiBriefcaseAccountOutline: string; +export declare const mdiBriefcaseCheck: string; +export declare const mdiBriefcaseCheckOutline: string; +export declare const mdiBriefcaseClock: string; +export declare const mdiBriefcaseClockOutline: string; +export declare const mdiBriefcaseDownload: string; +export declare const mdiBriefcaseDownloadOutline: string; +export declare const mdiBriefcaseEdit: string; +export declare const mdiBriefcaseEditOutline: string; +export declare const mdiBriefcaseMinus: string; +export declare const mdiBriefcaseMinusOutline: string; +export declare const mdiBriefcaseOutline: string; +export declare const mdiBriefcasePlus: string; +export declare const mdiBriefcasePlusOutline: string; +export declare const mdiBriefcaseRemove: string; +export declare const mdiBriefcaseRemoveOutline: string; +export declare const mdiBriefcaseSearch: string; +export declare const mdiBriefcaseSearchOutline: string; +export declare const mdiBriefcaseUpload: string; +export declare const mdiBriefcaseUploadOutline: string; +export declare const mdiBrightness1: string; +export declare const mdiBrightness2: string; +export declare const mdiBrightness3: string; +export declare const mdiBrightness4: string; +export declare const mdiBrightness5: string; +export declare const mdiBrightness6: string; +export declare const mdiBrightness7: string; +export declare const mdiBrightnessAuto: string; +export declare const mdiBrightnessPercent: string; +export declare const mdiBroom: string; +export declare const mdiBrush: string; +export declare const mdiBuddhism: string; +export declare const mdiBuffer: string; +export declare const mdiBug: string; +export declare const mdiBugCheck: string; +export declare const mdiBugCheckOutline: string; +export declare const mdiBugOutline: string; +export declare const mdiBugle: string; +export declare const mdiBulldozer: string; +export declare const mdiBullet: string; +export declare const mdiBulletinBoard: string; +export declare const mdiBullhorn: string; +export declare const mdiBullhornOutline: string; +export declare const mdiBullseye: string; +export declare const mdiBullseyeArrow: string; +export declare const mdiBulma: string; +export declare const mdiBunkBed: string; +export declare const mdiBus: string; +export declare const mdiBusAlert: string; +export declare const mdiBusArticulatedEnd: string; +export declare const mdiBusArticulatedFront: string; +export declare const mdiBusClock: string; +export declare const mdiBusDoubleDecker: string; +export declare const mdiBusMarker: string; +export declare const mdiBusMultiple: string; +export declare const mdiBusSchool: string; +export declare const mdiBusSide: string; +export declare const mdiBusStop: string; +export declare const mdiBusStopCovered: string; +export declare const mdiBusStopUncovered: string; +export declare const mdiCached: string; +export declare const mdiCactus: string; +export declare const mdiCake: string; +export declare const mdiCakeLayered: string; +export declare const mdiCakeVariant: string; +export declare const mdiCalculator: string; +export declare const mdiCalculatorVariant: string; +export declare const mdiCalendar: string; +export declare const mdiCalendarAccount: string; +export declare const mdiCalendarAccountOutline: string; +export declare const mdiCalendarAlert: string; +export declare const mdiCalendarArrowLeft: string; +export declare const mdiCalendarArrowRight: string; +export declare const mdiCalendarBlank: string; +export declare const mdiCalendarBlankMultiple: string; +export declare const mdiCalendarBlankOutline: string; +export declare const mdiCalendarCheck: string; +export declare const mdiCalendarCheckOutline: string; +export declare const mdiCalendarClock: string; +export declare const mdiCalendarEdit: string; +export declare const mdiCalendarExport: string; +export declare const mdiCalendarHeart: string; +export declare const mdiCalendarImport: string; +export declare const mdiCalendarMinus: string; +export declare const mdiCalendarMonth: string; +export declare const mdiCalendarMonthOutline: string; +export declare const mdiCalendarMultiple: string; +export declare const mdiCalendarMultipleCheck: string; +export declare const mdiCalendarMultiselect: string; +export declare const mdiCalendarOutline: string; +export declare const mdiCalendarPlus: string; +export declare const mdiCalendarQuestion: string; +export declare const mdiCalendarRange: string; +export declare const mdiCalendarRangeOutline: string; +export declare const mdiCalendarRemove: string; +export declare const mdiCalendarRemoveOutline: string; +export declare const mdiCalendarRepeat: string; +export declare const mdiCalendarRepeatOutline: string; +export declare const mdiCalendarSearch: string; +export declare const mdiCalendarStar: string; +export declare const mdiCalendarText: string; +export declare const mdiCalendarTextOutline: string; +export declare const mdiCalendarToday: string; +export declare const mdiCalendarWeek: string; +export declare const mdiCalendarWeekBegin: string; +export declare const mdiCalendarWeekend: string; +export declare const mdiCalendarWeekendOutline: string; +export declare const mdiCallMade: string; +export declare const mdiCallMerge: string; +export declare const mdiCallMissed: string; +export declare const mdiCallReceived: string; +export declare const mdiCallSplit: string; +export declare const mdiCamcorder: string; +export declare const mdiCamcorderBox: string; +export declare const mdiCamcorderBoxOff: string; +export declare const mdiCamcorderOff: string; +export declare const mdiCamera: string; +export declare const mdiCameraAccount: string; +export declare const mdiCameraBurst: string; +export declare const mdiCameraControl: string; +export declare const mdiCameraEnhance: string; +export declare const mdiCameraEnhanceOutline: string; +export declare const mdiCameraFront: string; +export declare const mdiCameraFrontVariant: string; +export declare const mdiCameraGopro: string; +export declare const mdiCameraImage: string; +export declare const mdiCameraIris: string; +export declare const mdiCameraMeteringCenter: string; +export declare const mdiCameraMeteringMatrix: string; +export declare const mdiCameraMeteringPartial: string; +export declare const mdiCameraMeteringSpot: string; +export declare const mdiCameraOff: string; +export declare const mdiCameraOutline: string; +export declare const mdiCameraPartyMode: string; +export declare const mdiCameraPlus: string; +export declare const mdiCameraPlusOutline: string; +export declare const mdiCameraRear: string; +export declare const mdiCameraRearVariant: string; +export declare const mdiCameraRetake: string; +export declare const mdiCameraRetakeOutline: string; +export declare const mdiCameraSwitch: string; +export declare const mdiCameraTimer: string; +export declare const mdiCameraWireless: string; +export declare const mdiCameraWirelessOutline: string; +export declare const mdiCampfire: string; +export declare const mdiCancel: string; +export declare const mdiCandle: string; +export declare const mdiCandycane: string; +export declare const mdiCannabis: string; +export declare const mdiCapsLock: string; +export declare const mdiCar: string; +export declare const mdiCar2Plus: string; +export declare const mdiCar3Plus: string; +export declare const mdiCarBack: string; +export declare const mdiCarBattery: string; +export declare const mdiCarBrakeAbs: string; +export declare const mdiCarBrakeAlert: string; +export declare const mdiCarBrakeHold: string; +export declare const mdiCarBrakeParking: string; +export declare const mdiCarBrakeRetarder: string; +export declare const mdiCarChildSeat: string; +export declare const mdiCarClutch: string; +export declare const mdiCarConnected: string; +export declare const mdiCarConvertible: string; +export declare const mdiCarCoolantLevel: string; +export declare const mdiCarCruiseControl: string; +export declare const mdiCarDefrostFront: string; +export declare const mdiCarDefrostRear: string; +export declare const mdiCarDoor: string; +export declare const mdiCarDoorLock: string; +export declare const mdiCarElectric: string; +export declare const mdiCarEsp: string; +export declare const mdiCarEstate: string; +export declare const mdiCarHatchback: string; +export declare const mdiCarInfo: string; +export declare const mdiCarKey: string; +export declare const mdiCarLightDimmed: string; +export declare const mdiCarLightFog: string; +export declare const mdiCarLightHigh: string; +export declare const mdiCarLimousine: string; +export declare const mdiCarMultiple: string; +export declare const mdiCarOff: string; +export declare const mdiCarParkingLights: string; +export declare const mdiCarPickup: string; +export declare const mdiCarSeat: string; +export declare const mdiCarSeatCooler: string; +export declare const mdiCarSeatHeater: string; +export declare const mdiCarShiftPattern: string; +export declare const mdiCarSide: string; +export declare const mdiCarSports: string; +export declare const mdiCarTireAlert: string; +export declare const mdiCarTractionControl: string; +export declare const mdiCarTurbocharger: string; +export declare const mdiCarWash: string; +export declare const mdiCarWindshield: string; +export declare const mdiCarWindshieldOutline: string; +export declare const mdiCaravan: string; +export declare const mdiCard: string; +export declare const mdiCardBulleted: string; +export declare const mdiCardBulletedOff: string; +export declare const mdiCardBulletedOffOutline: string; +export declare const mdiCardBulletedOutline: string; +export declare const mdiCardBulletedSettings: string; +export declare const mdiCardBulletedSettingsOutline: string; +export declare const mdiCardOutline: string; +export declare const mdiCardPlus: string; +export declare const mdiCardPlusOutline: string; +export declare const mdiCardSearch: string; +export declare const mdiCardSearchOutline: string; +export declare const mdiCardText: string; +export declare const mdiCardTextOutline: string; +export declare const mdiCards: string; +export declare const mdiCardsClub: string; +export declare const mdiCardsDiamond: string; +export declare const mdiCardsDiamondOutline: string; +export declare const mdiCardsHeart: string; +export declare const mdiCardsOutline: string; +export declare const mdiCardsPlayingOutline: string; +export declare const mdiCardsSpade: string; +export declare const mdiCardsVariant: string; +export declare const mdiCarrot: string; +export declare const mdiCart: string; +export declare const mdiCartArrowDown: string; +export declare const mdiCartArrowRight: string; +export declare const mdiCartArrowUp: string; +export declare const mdiCartMinus: string; +export declare const mdiCartOff: string; +export declare const mdiCartOutline: string; +export declare const mdiCartPlus: string; +export declare const mdiCartRemove: string; +export declare const mdiCaseSensitiveAlt: string; +export declare const mdiCash: string; +export declare const mdiCash100: string; +export declare const mdiCashMarker: string; +export declare const mdiCashMinus: string; +export declare const mdiCashMultiple: string; +export declare const mdiCashPlus: string; +export declare const mdiCashRefund: string; +export declare const mdiCashRegister: string; +export declare const mdiCashRemove: string; +export declare const mdiCashUsd: string; +export declare const mdiCashUsdOutline: string; +export declare const mdiCassette: string; +export declare const mdiCast: string; +export declare const mdiCastAudio: string; +export declare const mdiCastConnected: string; +export declare const mdiCastEducation: string; +export declare const mdiCastOff: string; +export declare const mdiCastle: string; +export declare const mdiCat: string; +export declare const mdiCctv: string; +export declare const mdiCeilingLight: string; +export declare const mdiCellphone: string; +export declare const mdiCellphoneAndroid: string; +export declare const mdiCellphoneArrowDown: string; +export declare const mdiCellphoneBasic: string; +export declare const mdiCellphoneDock: string; +export declare const mdiCellphoneErase: string; +export declare const mdiCellphoneInformation: string; +export declare const mdiCellphoneIphone: string; +export declare const mdiCellphoneKey: string; +export declare const mdiCellphoneLink: string; +export declare const mdiCellphoneLinkOff: string; +export declare const mdiCellphoneLock: string; +export declare const mdiCellphoneMessage: string; +export declare const mdiCellphoneMessageOff: string; +export declare const mdiCellphoneNfc: string; +export declare const mdiCellphoneNfcOff: string; +export declare const mdiCellphoneOff: string; +export declare const mdiCellphonePlay: string; +export declare const mdiCellphoneScreenshot: string; +export declare const mdiCellphoneSettings: string; +export declare const mdiCellphoneSettingsVariant: string; +export declare const mdiCellphoneSound: string; +export declare const mdiCellphoneText: string; +export declare const mdiCellphoneWireless: string; +export declare const mdiCelticCross: string; +export declare const mdiCentos: string; +export declare const mdiCertificate: string; +export declare const mdiCertificateOutline: string; +export declare const mdiChairRolling: string; +export declare const mdiChairSchool: string; +export declare const mdiCharity: string; +export declare const mdiChartArc: string; +export declare const mdiChartAreaspline: string; +export declare const mdiChartAreasplineVariant: string; +export declare const mdiChartBar: string; +export declare const mdiChartBarStacked: string; +export declare const mdiChartBellCurve: string; +export declare const mdiChartBellCurveCumulative: string; +export declare const mdiChartBubble: string; +export declare const mdiChartDonut: string; +export declare const mdiChartDonutVariant: string; +export declare const mdiChartGantt: string; +export declare const mdiChartHistogram: string; +export declare const mdiChartLine: string; +export declare const mdiChartLineStacked: string; +export declare const mdiChartLineVariant: string; +export declare const mdiChartMultiline: string; +export declare const mdiChartMultiple: string; +export declare const mdiChartPie: string; +export declare const mdiChartPpf: string; +export declare const mdiChartScatterPlot: string; +export declare const mdiChartScatterPlotHexbin: string; +export declare const mdiChartSnakey: string; +export declare const mdiChartSnakeyVariant: string; +export declare const mdiChartTimeline: string; +export declare const mdiChartTimelineVariant: string; +export declare const mdiChartTree: string; +export declare const mdiChat: string; +export declare const mdiChatAlert: string; +export declare const mdiChatAlertOutline: string; +export declare const mdiChatOutline: string; +export declare const mdiChatProcessing: string; +export declare const mdiChatProcessingOutline: string; +export declare const mdiChatSleep: string; +export declare const mdiChatSleepOutline: string; +export declare const mdiCheck: string; +export declare const mdiCheckAll: string; +export declare const mdiCheckBold: string; +export declare const mdiCheckBoxMultipleOutline: string; +export declare const mdiCheckBoxOutline: string; +export declare const mdiCheckCircle: string; +export declare const mdiCheckCircleOutline: string; +export declare const mdiCheckDecagram: string; +export declare const mdiCheckNetwork: string; +export declare const mdiCheckNetworkOutline: string; +export declare const mdiCheckOutline: string; +export declare const mdiCheckUnderline: string; +export declare const mdiCheckUnderlineCircle: string; +export declare const mdiCheckUnderlineCircleOutline: string; +export declare const mdiCheckbook: string; +export declare const mdiCheckboxBlank: string; +export declare const mdiCheckboxBlankCircle: string; +export declare const mdiCheckboxBlankCircleOutline: string; +export declare const mdiCheckboxBlankOff: string; +export declare const mdiCheckboxBlankOffOutline: string; +export declare const mdiCheckboxBlankOutline: string; +export declare const mdiCheckboxIntermediate: string; +export declare const mdiCheckboxMarked: string; +export declare const mdiCheckboxMarkedCircle: string; +export declare const mdiCheckboxMarkedCircleOutline: string; +export declare const mdiCheckboxMarkedOutline: string; +export declare const mdiCheckboxMultipleBlank: string; +export declare const mdiCheckboxMultipleBlankCircle: string; +export declare const mdiCheckboxMultipleBlankCircleOutline: string; +export declare const mdiCheckboxMultipleBlankOutline: string; +export declare const mdiCheckboxMultipleMarked: string; +export declare const mdiCheckboxMultipleMarkedCircle: string; +export declare const mdiCheckboxMultipleMarkedCircleOutline: string; +export declare const mdiCheckboxMultipleMarkedOutline: string; +export declare const mdiCheckerboard: string; +export declare const mdiCheckerboardMinus: string; +export declare const mdiCheckerboardPlus: string; +export declare const mdiCheckerboardRemove: string; +export declare const mdiCheese: string; +export declare const mdiChefHat: string; +export declare const mdiChemicalWeapon: string; +export declare const mdiChessBishop: string; +export declare const mdiChessKing: string; +export declare const mdiChessKnight: string; +export declare const mdiChessPawn: string; +export declare const mdiChessQueen: string; +export declare const mdiChessRook: string; +export declare const mdiChevronDoubleDown: string; +export declare const mdiChevronDoubleLeft: string; +export declare const mdiChevronDoubleRight: string; +export declare const mdiChevronDoubleUp: string; +export declare const mdiChevronDown: string; +export declare const mdiChevronDownBox: string; +export declare const mdiChevronDownBoxOutline: string; +export declare const mdiChevronDownCircle: string; +export declare const mdiChevronDownCircleOutline: string; +export declare const mdiChevronLeft: string; +export declare const mdiChevronLeftBox: string; +export declare const mdiChevronLeftBoxOutline: string; +export declare const mdiChevronLeftCircle: string; +export declare const mdiChevronLeftCircleOutline: string; +export declare const mdiChevronRight: string; +export declare const mdiChevronRightBox: string; +export declare const mdiChevronRightBoxOutline: string; +export declare const mdiChevronRightCircle: string; +export declare const mdiChevronRightCircleOutline: string; +export declare const mdiChevronTripleDown: string; +export declare const mdiChevronTripleLeft: string; +export declare const mdiChevronTripleRight: string; +export declare const mdiChevronTripleUp: string; +export declare const mdiChevronUp: string; +export declare const mdiChevronUpBox: string; +export declare const mdiChevronUpBoxOutline: string; +export declare const mdiChevronUpCircle: string; +export declare const mdiChevronUpCircleOutline: string; +export declare const mdiChiliHot: string; +export declare const mdiChiliMedium: string; +export declare const mdiChiliMild: string; +export declare const mdiChip: string; +export declare const mdiChristianity: string; +export declare const mdiChristianityOutline: string; +export declare const mdiChurch: string; +export declare const mdiCigar: string; +export declare const mdiCircle: string; +export declare const mdiCircleDouble: string; +export declare const mdiCircleEditOutline: string; +export declare const mdiCircleExpand: string; +export declare const mdiCircleMedium: string; +export declare const mdiCircleOffOutline: string; +export declare const mdiCircleOutline: string; +export declare const mdiCircleSlice1: string; +export declare const mdiCircleSlice2: string; +export declare const mdiCircleSlice3: string; +export declare const mdiCircleSlice4: string; +export declare const mdiCircleSlice5: string; +export declare const mdiCircleSlice6: string; +export declare const mdiCircleSlice7: string; +export declare const mdiCircleSlice8: string; +export declare const mdiCircleSmall: string; +export declare const mdiCircularSaw: string; +export declare const mdiCiscoWebex: string; +export declare const mdiCity: string; +export declare const mdiCityVariant: string; +export declare const mdiCityVariantOutline: string; +export declare const mdiClipboard: string; +export declare const mdiClipboardAccount: string; +export declare const mdiClipboardAccountOutline: string; +export declare const mdiClipboardAlert: string; +export declare const mdiClipboardAlertOutline: string; +export declare const mdiClipboardArrowDown: string; +export declare const mdiClipboardArrowDownOutline: string; +export declare const mdiClipboardArrowLeft: string; +export declare const mdiClipboardArrowLeftOutline: string; +export declare const mdiClipboardArrowRight: string; +export declare const mdiClipboardArrowRightOutline: string; +export declare const mdiClipboardArrowUp: string; +export declare const mdiClipboardArrowUpOutline: string; +export declare const mdiClipboardCheck: string; +export declare const mdiClipboardCheckMultiple: string; +export declare const mdiClipboardCheckMultipleOutline: string; +export declare const mdiClipboardCheckOutline: string; +export declare const mdiClipboardFile: string; +export declare const mdiClipboardFileOutline: string; +export declare const mdiClipboardFlow: string; +export declare const mdiClipboardFlowOutline: string; +export declare const mdiClipboardList: string; +export declare const mdiClipboardListOutline: string; +export declare const mdiClipboardMultiple: string; +export declare const mdiClipboardMultipleOutline: string; +export declare const mdiClipboardOutline: string; +export declare const mdiClipboardPlay: string; +export declare const mdiClipboardPlayMultiple: string; +export declare const mdiClipboardPlayMultipleOutline: string; +export declare const mdiClipboardPlayOutline: string; +export declare const mdiClipboardPlus: string; +export declare const mdiClipboardPlusOutline: string; +export declare const mdiClipboardPulse: string; +export declare const mdiClipboardPulseOutline: string; +export declare const mdiClipboardText: string; +export declare const mdiClipboardTextMultiple: string; +export declare const mdiClipboardTextMultipleOutline: string; +export declare const mdiClipboardTextOutline: string; +export declare const mdiClipboardTextPlay: string; +export declare const mdiClipboardTextPlayOutline: string; +export declare const mdiClippy: string; +export declare const mdiClock: string; +export declare const mdiClockAlert: string; +export declare const mdiClockAlertOutline: string; +export declare const mdiClockCheck: string; +export declare const mdiClockCheckOutline: string; +export declare const mdiClockDigital: string; +export declare const mdiClockEnd: string; +export declare const mdiClockFast: string; +export declare const mdiClockIn: string; +export declare const mdiClockOut: string; +export declare const mdiClockOutline: string; +export declare const mdiClockStart: string; +export declare const mdiClose: string; +export declare const mdiCloseBox: string; +export declare const mdiCloseBoxMultiple: string; +export declare const mdiCloseBoxMultipleOutline: string; +export declare const mdiCloseBoxOutline: string; +export declare const mdiCloseCircle: string; +export declare const mdiCloseCircleOutline: string; +export declare const mdiCloseNetwork: string; +export declare const mdiCloseNetworkOutline: string; +export declare const mdiCloseOctagon: string; +export declare const mdiCloseOctagonOutline: string; +export declare const mdiCloseOutline: string; +export declare const mdiClosedCaption: string; +export declare const mdiClosedCaptionOutline: string; +export declare const mdiCloud: string; +export declare const mdiCloudAlert: string; +export declare const mdiCloudBraces: string; +export declare const mdiCloudCheck: string; +export declare const mdiCloudCheckOutline: string; +export declare const mdiCloudCircle: string; +export declare const mdiCloudDownload: string; +export declare const mdiCloudDownloadOutline: string; +export declare const mdiCloudLock: string; +export declare const mdiCloudLockOutline: string; +export declare const mdiCloudOffOutline: string; +export declare const mdiCloudOutline: string; +export declare const mdiCloudPrint: string; +export declare const mdiCloudPrintOutline: string; +export declare const mdiCloudQuestion: string; +export declare const mdiCloudSearch: string; +export declare const mdiCloudSearchOutline: string; +export declare const mdiCloudSync: string; +export declare const mdiCloudSyncOutline: string; +export declare const mdiCloudTags: string; +export declare const mdiCloudUpload: string; +export declare const mdiCloudUploadOutline: string; +export declare const mdiClover: string; +export declare const mdiCoachLamp: string; +export declare const mdiCoatRack: string; +export declare const mdiCodeArray: string; +export declare const mdiCodeBraces: string; +export declare const mdiCodeBracesBox: string; +export declare const mdiCodeBrackets: string; +export declare const mdiCodeEqual: string; +export declare const mdiCodeGreaterThan: string; +export declare const mdiCodeGreaterThanOrEqual: string; +export declare const mdiCodeLessThan: string; +export declare const mdiCodeLessThanOrEqual: string; +export declare const mdiCodeNotEqual: string; +export declare const mdiCodeNotEqualVariant: string; +export declare const mdiCodeParentheses: string; +export declare const mdiCodeParenthesesBox: string; +export declare const mdiCodeString: string; +export declare const mdiCodeTags: string; +export declare const mdiCodeTagsCheck: string; +export declare const mdiCodepen: string; +export declare const mdiCoffee: string; +export declare const mdiCoffeeMaker: string; +export declare const mdiCoffeeOff: string; +export declare const mdiCoffeeOffOutline: string; +export declare const mdiCoffeeOutline: string; +export declare const mdiCoffeeToGo: string; +export declare const mdiCoffeeToGoOutline: string; +export declare const mdiCoffin: string; +export declare const mdiCogClockwise: string; +export declare const mdiCogCounterclockwise: string; +export declare const mdiCogs: string; +export declare const mdiCoin: string; +export declare const mdiCoinOutline: string; +export declare const mdiCoins: string; +export declare const mdiCollage: string; +export declare const mdiCollapseAll: string; +export declare const mdiCollapseAllOutline: string; +export declare const mdiColorHelper: string; +export declare const mdiComma: string; +export declare const mdiCommaBox: string; +export declare const mdiCommaBoxOutline: string; +export declare const mdiCommaCircle: string; +export declare const mdiCommaCircleOutline: string; +export declare const mdiComment: string; +export declare const mdiCommentAccount: string; +export declare const mdiCommentAccountOutline: string; +export declare const mdiCommentAlert: string; +export declare const mdiCommentAlertOutline: string; +export declare const mdiCommentArrowLeft: string; +export declare const mdiCommentArrowLeftOutline: string; +export declare const mdiCommentArrowRight: string; +export declare const mdiCommentArrowRightOutline: string; +export declare const mdiCommentCheck: string; +export declare const mdiCommentCheckOutline: string; +export declare const mdiCommentEdit: string; +export declare const mdiCommentEditOutline: string; +export declare const mdiCommentEye: string; +export declare const mdiCommentEyeOutline: string; +export declare const mdiCommentMultiple: string; +export declare const mdiCommentMultipleOutline: string; +export declare const mdiCommentOutline: string; +export declare const mdiCommentPlus: string; +export declare const mdiCommentPlusOutline: string; +export declare const mdiCommentProcessing: string; +export declare const mdiCommentProcessingOutline: string; +export declare const mdiCommentQuestion: string; +export declare const mdiCommentQuestionOutline: string; +export declare const mdiCommentQuote: string; +export declare const mdiCommentQuoteOutline: string; +export declare const mdiCommentRemove: string; +export declare const mdiCommentRemoveOutline: string; +export declare const mdiCommentSearch: string; +export declare const mdiCommentSearchOutline: string; +export declare const mdiCommentText: string; +export declare const mdiCommentTextMultiple: string; +export declare const mdiCommentTextMultipleOutline: string; +export declare const mdiCommentTextOutline: string; +export declare const mdiCompare: string; +export declare const mdiCompass: string; +export declare const mdiCompassOff: string; +export declare const mdiCompassOffOutline: string; +export declare const mdiCompassOutline: string; +export declare const mdiCompassRose: string; +export declare const mdiConcourseCi: string; +export declare const mdiConsole: string; +export declare const mdiConsoleLine: string; +export declare const mdiConsoleNetwork: string; +export declare const mdiConsoleNetworkOutline: string; +export declare const mdiConsolidate: string; +export declare const mdiContactMail: string; +export declare const mdiContactMailOutline: string; +export declare const mdiContactPhone: string; +export declare const mdiContactPhoneOutline: string; +export declare const mdiContactlessPayment: string; +export declare const mdiContacts: string; +export declare const mdiContain: string; +export declare const mdiContainEnd: string; +export declare const mdiContainStart: string; +export declare const mdiContentCopy: string; +export declare const mdiContentCut: string; +export declare const mdiContentDuplicate: string; +export declare const mdiContentPaste: string; +export declare const mdiContentSave: string; +export declare const mdiContentSaveAlert: string; +export declare const mdiContentSaveAlertOutline: string; +export declare const mdiContentSaveAll: string; +export declare const mdiContentSaveAllOutline: string; +export declare const mdiContentSaveEdit: string; +export declare const mdiContentSaveEditOutline: string; +export declare const mdiContentSaveMove: string; +export declare const mdiContentSaveMoveOutline: string; +export declare const mdiContentSaveOutline: string; +export declare const mdiContentSaveSettings: string; +export declare const mdiContentSaveSettingsOutline: string; +export declare const mdiContrast: string; +export declare const mdiContrastBox: string; +export declare const mdiContrastCircle: string; +export declare const mdiControllerClassic: string; +export declare const mdiControllerClassicOutline: string; +export declare const mdiCookie: string; +export declare const mdiCoolantTemperature: string; +export declare const mdiCopyright: string; +export declare const mdiCordova: string; +export declare const mdiCorn: string; +export declare const mdiCounter: string; +export declare const mdiCow: string; +export declare const mdiCowboy: string; +export declare const mdiCpu32Bit: string; +export declare const mdiCpu64Bit: string; +export declare const mdiCrane: string; +export declare const mdiCreation: string; +export declare const mdiCreativeCommons: string; +export declare const mdiCreditCard: string; +export declare const mdiCreditCardClock: string; +export declare const mdiCreditCardClockOutline: string; +export declare const mdiCreditCardMarker: string; +export declare const mdiCreditCardMarkerOutline: string; +export declare const mdiCreditCardMinus: string; +export declare const mdiCreditCardMinusOutline: string; +export declare const mdiCreditCardMultiple: string; +export declare const mdiCreditCardMultipleOutline: string; +export declare const mdiCreditCardOff: string; +export declare const mdiCreditCardOffOutline: string; +export declare const mdiCreditCardOutline: string; +export declare const mdiCreditCardPlus: string; +export declare const mdiCreditCardPlusOutline: string; +export declare const mdiCreditCardRefund: string; +export declare const mdiCreditCardRefundOutline: string; +export declare const mdiCreditCardRemove: string; +export declare const mdiCreditCardRemoveOutline: string; +export declare const mdiCreditCardScan: string; +export declare const mdiCreditCardScanOutline: string; +export declare const mdiCreditCardSettings: string; +export declare const mdiCreditCardSettingsOutline: string; +export declare const mdiCreditCardWireless: string; +export declare const mdiCreditCardWirelessOutline: string; +export declare const mdiCricket: string; +export declare const mdiCrop: string; +export declare const mdiCropFree: string; +export declare const mdiCropLandscape: string; +export declare const mdiCropPortrait: string; +export declare const mdiCropRotate: string; +export declare const mdiCropSquare: string; +export declare const mdiCrosshairs: string; +export declare const mdiCrosshairsGps: string; +export declare const mdiCrosshairsOff: string; +export declare const mdiCrosshairsQuestion: string; +export declare const mdiCrown: string; +export declare const mdiCrownOutline: string; +export declare const mdiCryengine: string; +export declare const mdiCrystalBall: string; +export declare const mdiCube: string; +export declare const mdiCubeOutline: string; +export declare const mdiCubeScan: string; +export declare const mdiCubeSend: string; +export declare const mdiCubeUnfolded: string; +export declare const mdiCup: string; +export declare const mdiCupOff: string; +export declare const mdiCupOffOutline: string; +export declare const mdiCupOutline: string; +export declare const mdiCupWater: string; +export declare const mdiCupboard: string; +export declare const mdiCupboardOutline: string; +export declare const mdiCupcake: string; +export declare const mdiCurling: string; +export declare const mdiCurrencyBdt: string; +export declare const mdiCurrencyBrl: string; +export declare const mdiCurrencyBtc: string; +export declare const mdiCurrencyCny: string; +export declare const mdiCurrencyEth: string; +export declare const mdiCurrencyEur: string; +export declare const mdiCurrencyEurOff: string; +export declare const mdiCurrencyGbp: string; +export declare const mdiCurrencyIls: string; +export declare const mdiCurrencyInr: string; +export declare const mdiCurrencyJpy: string; +export declare const mdiCurrencyKrw: string; +export declare const mdiCurrencyKzt: string; +export declare const mdiCurrencyNgn: string; +export declare const mdiCurrencyPhp: string; +export declare const mdiCurrencyRial: string; +export declare const mdiCurrencyRub: string; +export declare const mdiCurrencySign: string; +export declare const mdiCurrencyTry: string; +export declare const mdiCurrencyTwd: string; +export declare const mdiCurrencyUsd: string; +export declare const mdiCurrencyUsdOff: string; +export declare const mdiCurrentAc: string; +export declare const mdiCurrentDc: string; +export declare const mdiCursorDefault: string; +export declare const mdiCursorDefaultClick: string; +export declare const mdiCursorDefaultClickOutline: string; +export declare const mdiCursorDefaultGesture: string; +export declare const mdiCursorDefaultGestureOutline: string; +export declare const mdiCursorDefaultOutline: string; +export declare const mdiCursorMove: string; +export declare const mdiCursorPointer: string; +export declare const mdiCursorText: string; +export declare const mdiDatabase: string; +export declare const mdiDatabaseCheck: string; +export declare const mdiDatabaseEdit: string; +export declare const mdiDatabaseExport: string; +export declare const mdiDatabaseImport: string; +export declare const mdiDatabaseLock: string; +export declare const mdiDatabaseMarker: string; +export declare const mdiDatabaseMinus: string; +export declare const mdiDatabasePlus: string; +export declare const mdiDatabaseRefresh: string; +export declare const mdiDatabaseRemove: string; +export declare const mdiDatabaseSearch: string; +export declare const mdiDatabaseSettings: string; +export declare const mdiDeathStar: string; +export declare const mdiDeathStarVariant: string; +export declare const mdiDeathlyHallows: string; +export declare const mdiDebian: string; +export declare const mdiDebugStepInto: string; +export declare const mdiDebugStepOut: string; +export declare const mdiDebugStepOver: string; +export declare const mdiDecagram: string; +export declare const mdiDecagramOutline: string; +export declare const mdiDecimal: string; +export declare const mdiDecimalComma: string; +export declare const mdiDecimalCommaDecrease: string; +export declare const mdiDecimalCommaIncrease: string; +export declare const mdiDecimalDecrease: string; +export declare const mdiDecimalIncrease: string; +export declare const mdiDelete: string; +export declare const mdiDeleteAlert: string; +export declare const mdiDeleteAlertOutline: string; +export declare const mdiDeleteCircle: string; +export declare const mdiDeleteCircleOutline: string; +export declare const mdiDeleteEmpty: string; +export declare const mdiDeleteEmptyOutline: string; +export declare const mdiDeleteForever: string; +export declare const mdiDeleteForeverOutline: string; +export declare const mdiDeleteOff: string; +export declare const mdiDeleteOffOutline: string; +export declare const mdiDeleteOutline: string; +export declare const mdiDeleteRestore: string; +export declare const mdiDeleteSweep: string; +export declare const mdiDeleteSweepOutline: string; +export declare const mdiDeleteVariant: string; +export declare const mdiDelta: string; +export declare const mdiDesk: string; +export declare const mdiDeskLamp: string; +export declare const mdiDeskphone: string; +export declare const mdiDesktopClassic: string; +export declare const mdiDesktopMac: string; +export declare const mdiDesktopMacDashboard: string; +export declare const mdiDesktopTower: string; +export declare const mdiDesktopTowerMonitor: string; +export declare const mdiDetails: string; +export declare const mdiDevTo: string; +export declare const mdiDeveloperBoard: string; +export declare const mdiDeviantart: string; +export declare const mdiDevices: string; +export declare const mdiDiabetes: string; +export declare const mdiDialpad: string; +export declare const mdiDiameter: string; +export declare const mdiDiameterOutline: string; +export declare const mdiDiameterVariant: string; +export declare const mdiDiamond: string; +export declare const mdiDiamondOutline: string; +export declare const mdiDiamondStone: string; +export declare const mdiDice1: string; +export declare const mdiDice1Outline: string; +export declare const mdiDice2: string; +export declare const mdiDice2Outline: string; +export declare const mdiDice3: string; +export declare const mdiDice3Outline: string; +export declare const mdiDice4: string; +export declare const mdiDice4Outline: string; +export declare const mdiDice5: string; +export declare const mdiDice5Outline: string; +export declare const mdiDice6: string; +export declare const mdiDice6Outline: string; +export declare const mdiDiceD10: string; +export declare const mdiDiceD10Outline: string; +export declare const mdiDiceD12: string; +export declare const mdiDiceD12Outline: string; +export declare const mdiDiceD20: string; +export declare const mdiDiceD20Outline: string; +export declare const mdiDiceD4: string; +export declare const mdiDiceD4Outline: string; +export declare const mdiDiceD6: string; +export declare const mdiDiceD6Outline: string; +export declare const mdiDiceD8: string; +export declare const mdiDiceD8Outline: string; +export declare const mdiDiceMultiple: string; +export declare const mdiDiceMultipleOutline: string; +export declare const mdiDictionary: string; +export declare const mdiDigitalOcean: string; +export declare const mdiDipSwitch: string; +export declare const mdiDirections: string; +export declare const mdiDirectionsFork: string; +export declare const mdiDisc: string; +export declare const mdiDiscAlert: string; +export declare const mdiDiscPlayer: string; +export declare const mdiDiscord: string; +export declare const mdiDishwasher: string; +export declare const mdiDishwasherAlert: string; +export declare const mdiDishwasherOff: string; +export declare const mdiDisqus: string; +export declare const mdiDisqusOutline: string; +export declare const mdiDistributeHorizontalCenter: string; +export declare const mdiDistributeHorizontalLeft: string; +export declare const mdiDistributeHorizontalRight: string; +export declare const mdiDistributeVerticalBottom: string; +export declare const mdiDistributeVerticalCenter: string; +export declare const mdiDistributeVerticalTop: string; +export declare const mdiDivingFlippers: string; +export declare const mdiDivingHelmet: string; +export declare const mdiDivingScuba: string; +export declare const mdiDivingScubaFlag: string; +export declare const mdiDivingScubaTank: string; +export declare const mdiDivingScubaTankMultiple: string; +export declare const mdiDivingSnorkel: string; +export declare const mdiDivision: string; +export declare const mdiDivisionBox: string; +export declare const mdiDlna: string; +export declare const mdiDna: string; +export declare const mdiDns: string; +export declare const mdiDnsOutline: string; +export declare const mdiDoNotDisturb: string; +export declare const mdiDoNotDisturbOff: string; +export declare const mdiDockBottom: string; +export declare const mdiDockLeft: string; +export declare const mdiDockRight: string; +export declare const mdiDockWindow: string; +export declare const mdiDocker: string; +export declare const mdiDoctor: string; +export declare const mdiDog: string; +export declare const mdiDogService: string; +export declare const mdiDogSide: string; +export declare const mdiDolby: string; +export declare const mdiDolly: string; +export declare const mdiDomain: string; +export declare const mdiDomainOff: string; +export declare const mdiDomainPlus: string; +export declare const mdiDomainRemove: string; +export declare const mdiDominoMask: string; +export declare const mdiDonkey: string; +export declare const mdiDoor: string; +export declare const mdiDoorClosed: string; +export declare const mdiDoorClosedLock: string; +export declare const mdiDoorOpen: string; +export declare const mdiDoorbell: string; +export declare const mdiDoorbellVideo: string; +export declare const mdiDotNet: string; +export declare const mdiDotsHorizontal: string; +export declare const mdiDotsHorizontalCircle: string; +export declare const mdiDotsHorizontalCircleOutline: string; +export declare const mdiDotsVertical: string; +export declare const mdiDotsVerticalCircle: string; +export declare const mdiDotsVerticalCircleOutline: string; +export declare const mdiDouban: string; +export declare const mdiDownload: string; +export declare const mdiDownloadLock: string; +export declare const mdiDownloadLockOutline: string; +export declare const mdiDownloadMultiple: string; +export declare const mdiDownloadNetwork: string; +export declare const mdiDownloadNetworkOutline: string; +export declare const mdiDownloadOff: string; +export declare const mdiDownloadOffOutline: string; +export declare const mdiDownloadOutline: string; +export declare const mdiDrag: string; +export declare const mdiDragHorizontal: string; +export declare const mdiDragHorizontalVariant: string; +export declare const mdiDragVariant: string; +export declare const mdiDragVertical: string; +export declare const mdiDragVerticalVariant: string; +export declare const mdiDramaMasks: string; +export declare const mdiDraw: string; +export declare const mdiDrawing: string; +export declare const mdiDrawingBox: string; +export declare const mdiDresser: string; +export declare const mdiDresserOutline: string; +export declare const mdiDribbble: string; +export declare const mdiDribbbleBox: string; +export declare const mdiDrone: string; +export declare const mdiDropbox: string; +export declare const mdiDrupal: string; +export declare const mdiDuck: string; +export declare const mdiDumbbell: string; +export declare const mdiDumpTruck: string; +export declare const mdiEarHearing: string; +export declare const mdiEarHearingOff: string; +export declare const mdiEarth: string; +export declare const mdiEarthArrowRight: string; +export declare const mdiEarthBox: string; +export declare const mdiEarthBoxOff: string; +export declare const mdiEarthOff: string; +export declare const mdiEdge: string; +export declare const mdiEdgeLegacy: string; +export declare const mdiEgg: string; +export declare const mdiEggEaster: string; +export declare const mdiEightTrack: string; +export declare const mdiEject: string; +export declare const mdiEjectOutline: string; +export declare const mdiElectricSwitch: string; +export declare const mdiElectricSwitchClosed: string; +export declare const mdiElectronFramework: string; +export declare const mdiElephant: string; +export declare const mdiElevationDecline: string; +export declare const mdiElevationRise: string; +export declare const mdiElevator: string; +export declare const mdiElevatorDown: string; +export declare const mdiElevatorPassenger: string; +export declare const mdiElevatorUp: string; +export declare const mdiEllipse: string; +export declare const mdiEllipseOutline: string; +export declare const mdiEmail: string; +export declare const mdiEmailAlert: string; +export declare const mdiEmailAlertOutline: string; +export declare const mdiEmailBox: string; +export declare const mdiEmailCheck: string; +export declare const mdiEmailCheckOutline: string; +export declare const mdiEmailEdit: string; +export declare const mdiEmailEditOutline: string; +export declare const mdiEmailLock: string; +export declare const mdiEmailMarkAsUnread: string; +export declare const mdiEmailMinus: string; +export declare const mdiEmailMinusOutline: string; +export declare const mdiEmailMultiple: string; +export declare const mdiEmailMultipleOutline: string; +export declare const mdiEmailNewsletter: string; +export declare const mdiEmailOpen: string; +export declare const mdiEmailOpenMultiple: string; +export declare const mdiEmailOpenMultipleOutline: string; +export declare const mdiEmailOpenOutline: string; +export declare const mdiEmailOutline: string; +export declare const mdiEmailPlus: string; +export declare const mdiEmailPlusOutline: string; +export declare const mdiEmailReceive: string; +export declare const mdiEmailReceiveOutline: string; +export declare const mdiEmailSearch: string; +export declare const mdiEmailSearchOutline: string; +export declare const mdiEmailSend: string; +export declare const mdiEmailSendOutline: string; +export declare const mdiEmailSync: string; +export declare const mdiEmailSyncOutline: string; +export declare const mdiEmailVariant: string; +export declare const mdiEmber: string; +export declare const mdiEmby: string; +export declare const mdiEmoticon: string; +export declare const mdiEmoticonAngry: string; +export declare const mdiEmoticonAngryOutline: string; +export declare const mdiEmoticonConfused: string; +export declare const mdiEmoticonConfusedOutline: string; +export declare const mdiEmoticonCool: string; +export declare const mdiEmoticonCoolOutline: string; +export declare const mdiEmoticonCry: string; +export declare const mdiEmoticonCryOutline: string; +export declare const mdiEmoticonDead: string; +export declare const mdiEmoticonDeadOutline: string; +export declare const mdiEmoticonDevil: string; +export declare const mdiEmoticonDevilOutline: string; +export declare const mdiEmoticonExcited: string; +export declare const mdiEmoticonExcitedOutline: string; +export declare const mdiEmoticonFrown: string; +export declare const mdiEmoticonFrownOutline: string; +export declare const mdiEmoticonHappy: string; +export declare const mdiEmoticonHappyOutline: string; +export declare const mdiEmoticonKiss: string; +export declare const mdiEmoticonKissOutline: string; +export declare const mdiEmoticonLol: string; +export declare const mdiEmoticonLolOutline: string; +export declare const mdiEmoticonNeutral: string; +export declare const mdiEmoticonNeutralOutline: string; +export declare const mdiEmoticonOutline: string; +export declare const mdiEmoticonPoop: string; +export declare const mdiEmoticonPoopOutline: string; +export declare const mdiEmoticonSad: string; +export declare const mdiEmoticonSadOutline: string; +export declare const mdiEmoticonTongue: string; +export declare const mdiEmoticonTongueOutline: string; +export declare const mdiEmoticonWink: string; +export declare const mdiEmoticonWinkOutline: string; +export declare const mdiEngine: string; +export declare const mdiEngineOff: string; +export declare const mdiEngineOffOutline: string; +export declare const mdiEngineOutline: string; +export declare const mdiEpsilon: string; +export declare const mdiEqual: string; +export declare const mdiEqualBox: string; +export declare const mdiEqualizer: string; +export declare const mdiEqualizerOutline: string; +export declare const mdiEraser: string; +export declare const mdiEraserVariant: string; +export declare const mdiEscalator: string; +export declare const mdiEscalatorDown: string; +export declare const mdiEscalatorUp: string; +export declare const mdiEslint: string; +export declare const mdiEt: string; +export declare const mdiEthereum: string; +export declare const mdiEthernet: string; +export declare const mdiEthernetCable: string; +export declare const mdiEthernetCableOff: string; +export declare const mdiEtsy: string; +export declare const mdiEvStation: string; +export declare const mdiEventbrite: string; +export declare const mdiEvernote: string; +export declare const mdiExcavator: string; +export declare const mdiExclamation: string; +export declare const mdiExclamationThick: string; +export declare const mdiExitRun: string; +export declare const mdiExitToApp: string; +export declare const mdiExpandAll: string; +export declare const mdiExpandAllOutline: string; +export declare const mdiExpansionCard: string; +export declare const mdiExpansionCardVariant: string; +export declare const mdiExponent: string; +export declare const mdiExponentBox: string; +export declare const mdiExport: string; +export declare const mdiExportVariant: string; +export declare const mdiEye: string; +export declare const mdiEyeCheck: string; +export declare const mdiEyeCheckOutline: string; +export declare const mdiEyeCircle: string; +export declare const mdiEyeCircleOutline: string; +export declare const mdiEyeMinus: string; +export declare const mdiEyeMinusOutline: string; +export declare const mdiEyeOff: string; +export declare const mdiEyeOffOutline: string; +export declare const mdiEyeOutline: string; +export declare const mdiEyePlus: string; +export declare const mdiEyePlusOutline: string; +export declare const mdiEyeSettings: string; +export declare const mdiEyeSettingsOutline: string; +export declare const mdiEyedropper: string; +export declare const mdiEyedropperVariant: string; +export declare const mdiFace: string; +export declare const mdiFaceAgent: string; +export declare const mdiFaceOutline: string; +export declare const mdiFaceProfile: string; +export declare const mdiFaceProfileWoman: string; +export declare const mdiFaceRecognition: string; +export declare const mdiFaceWoman: string; +export declare const mdiFaceWomanOutline: string; +export declare const mdiFacebook: string; +export declare const mdiFacebookBox: string; +export declare const mdiFacebookMessenger: string; +export declare const mdiFacebookWorkplace: string; +export declare const mdiFactory: string; +export declare const mdiFan: string; +export declare const mdiFanOff: string; +export declare const mdiFastForward: string; +export declare const mdiFastForward10: string; +export declare const mdiFastForward30: string; +export declare const mdiFastForward5: string; +export declare const mdiFastForwardOutline: string; +export declare const mdiFax: string; +export declare const mdiFeather: string; +export declare const mdiFeatureSearch: string; +export declare const mdiFeatureSearchOutline: string; +export declare const mdiFedora: string; +export declare const mdiFerrisWheel: string; +export declare const mdiFerry: string; +export declare const mdiFile: string; +export declare const mdiFileAccount: string; +export declare const mdiFileAccountOutline: string; +export declare const mdiFileAlert: string; +export declare const mdiFileAlertOutline: string; +export declare const mdiFileCabinet: string; +export declare const mdiFileCad: string; +export declare const mdiFileCadBox: string; +export declare const mdiFileCancel: string; +export declare const mdiFileCancelOutline: string; +export declare const mdiFileCertificate: string; +export declare const mdiFileCertificateOutline: string; +export declare const mdiFileChart: string; +export declare const mdiFileChartOutline: string; +export declare const mdiFileCheck: string; +export declare const mdiFileCheckOutline: string; +export declare const mdiFileClock: string; +export declare const mdiFileClockOutline: string; +export declare const mdiFileCloud: string; +export declare const mdiFileCloudOutline: string; +export declare const mdiFileCode: string; +export declare const mdiFileCodeOutline: string; +export declare const mdiFileCompare: string; +export declare const mdiFileDelimited: string; +export declare const mdiFileDelimitedOutline: string; +export declare const mdiFileDocument: string; +export declare const mdiFileDocumentBox: string; +export declare const mdiFileDocumentBoxCheck: string; +export declare const mdiFileDocumentBoxCheckOutline: string; +export declare const mdiFileDocumentBoxMinus: string; +export declare const mdiFileDocumentBoxMinusOutline: string; +export declare const mdiFileDocumentBoxMultiple: string; +export declare const mdiFileDocumentBoxMultipleOutline: string; +export declare const mdiFileDocumentBoxOutline: string; +export declare const mdiFileDocumentBoxPlus: string; +export declare const mdiFileDocumentBoxPlusOutline: string; +export declare const mdiFileDocumentBoxRemove: string; +export declare const mdiFileDocumentBoxRemoveOutline: string; +export declare const mdiFileDocumentBoxSearch: string; +export declare const mdiFileDocumentBoxSearchOutline: string; +export declare const mdiFileDocumentEdit: string; +export declare const mdiFileDocumentEditOutline: string; +export declare const mdiFileDocumentOutline: string; +export declare const mdiFileDownload: string; +export declare const mdiFileDownloadOutline: string; +export declare const mdiFileEdit: string; +export declare const mdiFileEditOutline: string; +export declare const mdiFileExcel: string; +export declare const mdiFileExcelBox: string; +export declare const mdiFileExcelBoxOutline: string; +export declare const mdiFileExcelOutline: string; +export declare const mdiFileExport: string; +export declare const mdiFileExportOutline: string; +export declare const mdiFileEye: string; +export declare const mdiFileEyeOutline: string; +export declare const mdiFileFind: string; +export declare const mdiFileFindOutline: string; +export declare const mdiFileHidden: string; +export declare const mdiFileImage: string; +export declare const mdiFileImageOutline: string; +export declare const mdiFileImport: string; +export declare const mdiFileImportOutline: string; +export declare const mdiFileKey: string; +export declare const mdiFileKeyOutline: string; +export declare const mdiFileLink: string; +export declare const mdiFileLinkOutline: string; +export declare const mdiFileLock: string; +export declare const mdiFileLockOutline: string; +export declare const mdiFileMove: string; +export declare const mdiFileMoveOutline: string; +export declare const mdiFileMultiple: string; +export declare const mdiFileMultipleOutline: string; +export declare const mdiFileMusic: string; +export declare const mdiFileMusicOutline: string; +export declare const mdiFileOutline: string; +export declare const mdiFilePdf: string; +export declare const mdiFilePdfBox: string; +export declare const mdiFilePdfBoxOutline: string; +export declare const mdiFilePdfOutline: string; +export declare const mdiFilePercent: string; +export declare const mdiFilePercentOutline: string; +export declare const mdiFilePhone: string; +export declare const mdiFilePhoneOutline: string; +export declare const mdiFilePlus: string; +export declare const mdiFilePlusOutline: string; +export declare const mdiFilePowerpoint: string; +export declare const mdiFilePowerpointBox: string; +export declare const mdiFilePowerpointBoxOutline: string; +export declare const mdiFilePowerpointOutline: string; +export declare const mdiFilePresentationBox: string; +export declare const mdiFileQuestion: string; +export declare const mdiFileQuestionOutline: string; +export declare const mdiFileRemove: string; +export declare const mdiFileRemoveOutline: string; +export declare const mdiFileReplace: string; +export declare const mdiFileReplaceOutline: string; +export declare const mdiFileRestore: string; +export declare const mdiFileRestoreOutline: string; +export declare const mdiFileSearch: string; +export declare const mdiFileSearchOutline: string; +export declare const mdiFileSend: string; +export declare const mdiFileSendOutline: string; +export declare const mdiFileSettings: string; +export declare const mdiFileSettingsOutline: string; +export declare const mdiFileSettingsVariant: string; +export declare const mdiFileSettingsVariantOutline: string; +export declare const mdiFileStar: string; +export declare const mdiFileStarOutline: string; +export declare const mdiFileSwap: string; +export declare const mdiFileSwapOutline: string; +export declare const mdiFileSync: string; +export declare const mdiFileSyncOutline: string; +export declare const mdiFileTable: string; +export declare const mdiFileTableBox: string; +export declare const mdiFileTableBoxMultiple: string; +export declare const mdiFileTableBoxMultipleOutline: string; +export declare const mdiFileTableBoxOutline: string; +export declare const mdiFileTableOutline: string; +export declare const mdiFileTree: string; +export declare const mdiFileUndo: string; +export declare const mdiFileUndoOutline: string; +export declare const mdiFileUpload: string; +export declare const mdiFileUploadOutline: string; +export declare const mdiFileVideo: string; +export declare const mdiFileVideoOutline: string; +export declare const mdiFileWord: string; +export declare const mdiFileWordBox: string; +export declare const mdiFileWordBoxOutline: string; +export declare const mdiFileWordOutline: string; +export declare const mdiFilm: string; +export declare const mdiFilmstrip: string; +export declare const mdiFilmstripOff: string; +export declare const mdiFilter: string; +export declare const mdiFilterMenu: string; +export declare const mdiFilterMenuOutline: string; +export declare const mdiFilterMinus: string; +export declare const mdiFilterMinusOutline: string; +export declare const mdiFilterOutline: string; +export declare const mdiFilterPlus: string; +export declare const mdiFilterPlusOutline: string; +export declare const mdiFilterRemove: string; +export declare const mdiFilterRemoveOutline: string; +export declare const mdiFilterVariant: string; +export declare const mdiFilterVariantMinus: string; +export declare const mdiFilterVariantPlus: string; +export declare const mdiFilterVariantRemove: string; +export declare const mdiFinance: string; +export declare const mdiFindReplace: string; +export declare const mdiFingerprint: string; +export declare const mdiFingerprintOff: string; +export declare const mdiFire: string; +export declare const mdiFireExtinguisher: string; +export declare const mdiFireHydrant: string; +export declare const mdiFireHydrantAlert: string; +export declare const mdiFireHydrantOff: string; +export declare const mdiFireTruck: string; +export declare const mdiFirebase: string; +export declare const mdiFirefox: string; +export declare const mdiFireplace: string; +export declare const mdiFireplaceOff: string; +export declare const mdiFirework: string; +export declare const mdiFish: string; +export declare const mdiFishbowl: string; +export declare const mdiFishbowlOutline: string; +export declare const mdiFitToPage: string; +export declare const mdiFitToPageOutline: string; +export declare const mdiFlag: string; +export declare const mdiFlagCheckered: string; +export declare const mdiFlagMinus: string; +export declare const mdiFlagMinusOutline: string; +export declare const mdiFlagOutline: string; +export declare const mdiFlagPlus: string; +export declare const mdiFlagPlusOutline: string; +export declare const mdiFlagRemove: string; +export declare const mdiFlagRemoveOutline: string; +export declare const mdiFlagTriangle: string; +export declare const mdiFlagVariant: string; +export declare const mdiFlagVariantOutline: string; +export declare const mdiFlare: string; +export declare const mdiFlash: string; +export declare const mdiFlashAlert: string; +export declare const mdiFlashAlertOutline: string; +export declare const mdiFlashAuto: string; +export declare const mdiFlashCircle: string; +export declare const mdiFlashOff: string; +export declare const mdiFlashOutline: string; +export declare const mdiFlashRedEye: string; +export declare const mdiFlashlight: string; +export declare const mdiFlashlightOff: string; +export declare const mdiFlask: string; +export declare const mdiFlaskEmpty: string; +export declare const mdiFlaskEmptyMinus: string; +export declare const mdiFlaskEmptyMinusOutline: string; +export declare const mdiFlaskEmptyOutline: string; +export declare const mdiFlaskEmptyPlus: string; +export declare const mdiFlaskEmptyPlusOutline: string; +export declare const mdiFlaskEmptyRemove: string; +export declare const mdiFlaskEmptyRemoveOutline: string; +export declare const mdiFlaskMinus: string; +export declare const mdiFlaskMinusOutline: string; +export declare const mdiFlaskOutline: string; +export declare const mdiFlaskPlus: string; +export declare const mdiFlaskPlusOutline: string; +export declare const mdiFlaskRemove: string; +export declare const mdiFlaskRemoveOutline: string; +export declare const mdiFlaskRoundBottom: string; +export declare const mdiFlaskRoundBottomEmpty: string; +export declare const mdiFlaskRoundBottomEmptyOutline: string; +export declare const mdiFlaskRoundBottomOutline: string; +export declare const mdiFlattr: string; +export declare const mdiFleurDeLis: string; +export declare const mdiFlickr: string; +export declare const mdiFlipHorizontal: string; +export declare const mdiFlipToBack: string; +export declare const mdiFlipToFront: string; +export declare const mdiFlipVertical: string; +export declare const mdiFloorLamp: string; +export declare const mdiFloorLampDual: string; +export declare const mdiFloorLampVariant: string; +export declare const mdiFloorPlan: string; +export declare const mdiFloppy: string; +export declare const mdiFloppyVariant: string; +export declare const mdiFlower: string; +export declare const mdiFlowerOutline: string; +export declare const mdiFlowerPoppy: string; +export declare const mdiFlowerTulip: string; +export declare const mdiFlowerTulipOutline: string; +export declare const mdiFocusAuto: string; +export declare const mdiFocusField: string; +export declare const mdiFocusFieldHorizontal: string; +export declare const mdiFocusFieldVertical: string; +export declare const mdiFolder: string; +export declare const mdiFolderAccount: string; +export declare const mdiFolderAccountOutline: string; +export declare const mdiFolderAlert: string; +export declare const mdiFolderAlertOutline: string; +export declare const mdiFolderClock: string; +export declare const mdiFolderClockOutline: string; +export declare const mdiFolderDownload: string; +export declare const mdiFolderDownloadOutline: string; +export declare const mdiFolderEdit: string; +export declare const mdiFolderEditOutline: string; +export declare const mdiFolderGoogleDrive: string; +export declare const mdiFolderHeart: string; +export declare const mdiFolderHeartOutline: string; +export declare const mdiFolderHome: string; +export declare const mdiFolderHomeOutline: string; +export declare const mdiFolderImage: string; +export declare const mdiFolderInformation: string; +export declare const mdiFolderInformationOutline: string; +export declare const mdiFolderKey: string; +export declare const mdiFolderKeyNetwork: string; +export declare const mdiFolderKeyNetworkOutline: string; +export declare const mdiFolderKeyOutline: string; +export declare const mdiFolderLock: string; +export declare const mdiFolderLockOpen: string; +export declare const mdiFolderMarker: string; +export declare const mdiFolderMarkerOutline: string; +export declare const mdiFolderMove: string; +export declare const mdiFolderMoveOutline: string; +export declare const mdiFolderMultiple: string; +export declare const mdiFolderMultipleImage: string; +export declare const mdiFolderMultipleOutline: string; +export declare const mdiFolderMusic: string; +export declare const mdiFolderMusicOutline: string; +export declare const mdiFolderNetwork: string; +export declare const mdiFolderNetworkOutline: string; +export declare const mdiFolderOpen: string; +export declare const mdiFolderOpenOutline: string; +export declare const mdiFolderOutline: string; +export declare const mdiFolderPlus: string; +export declare const mdiFolderPlusOutline: string; +export declare const mdiFolderPound: string; +export declare const mdiFolderPoundOutline: string; +export declare const mdiFolderRemove: string; +export declare const mdiFolderRemoveOutline: string; +export declare const mdiFolderSearch: string; +export declare const mdiFolderSearchOutline: string; +export declare const mdiFolderSettings: string; +export declare const mdiFolderSettingsOutline: string; +export declare const mdiFolderSettingsVariant: string; +export declare const mdiFolderSettingsVariantOutline: string; +export declare const mdiFolderStar: string; +export declare const mdiFolderStarOutline: string; +export declare const mdiFolderSwap: string; +export declare const mdiFolderSwapOutline: string; +export declare const mdiFolderSync: string; +export declare const mdiFolderSyncOutline: string; +export declare const mdiFolderTable: string; +export declare const mdiFolderTableOutline: string; +export declare const mdiFolderText: string; +export declare const mdiFolderTextOutline: string; +export declare const mdiFolderUpload: string; +export declare const mdiFolderUploadOutline: string; +export declare const mdiFolderZip: string; +export declare const mdiFolderZipOutline: string; +export declare const mdiFontAwesome: string; +export declare const mdiFood: string; +export declare const mdiFoodApple: string; +export declare const mdiFoodAppleOutline: string; +export declare const mdiFoodCroissant: string; +export declare const mdiFoodForkDrink: string; +export declare const mdiFoodOff: string; +export declare const mdiFoodVariant: string; +export declare const mdiFootPrint: string; +export declare const mdiFootball: string; +export declare const mdiFootballAustralian: string; +export declare const mdiFootballHelmet: string; +export declare const mdiForklift: string; +export declare const mdiFormatAlignBottom: string; +export declare const mdiFormatAlignCenter: string; +export declare const mdiFormatAlignJustify: string; +export declare const mdiFormatAlignLeft: string; +export declare const mdiFormatAlignMiddle: string; +export declare const mdiFormatAlignRight: string; +export declare const mdiFormatAlignTop: string; +export declare const mdiFormatAnnotationMinus: string; +export declare const mdiFormatAnnotationPlus: string; +export declare const mdiFormatBold: string; +export declare const mdiFormatClear: string; +export declare const mdiFormatColorFill: string; +export declare const mdiFormatColorHighlight: string; +export declare const mdiFormatColorMarkerCancel: string; +export declare const mdiFormatColorText: string; +export declare const mdiFormatColumns: string; +export declare const mdiFormatFloatCenter: string; +export declare const mdiFormatFloatLeft: string; +export declare const mdiFormatFloatNone: string; +export declare const mdiFormatFloatRight: string; +export declare const mdiFormatFont: string; +export declare const mdiFormatFontSizeDecrease: string; +export declare const mdiFormatFontSizeIncrease: string; +export declare const mdiFormatHeader1: string; +export declare const mdiFormatHeader2: string; +export declare const mdiFormatHeader3: string; +export declare const mdiFormatHeader4: string; +export declare const mdiFormatHeader5: string; +export declare const mdiFormatHeader6: string; +export declare const mdiFormatHeaderDecrease: string; +export declare const mdiFormatHeaderEqual: string; +export declare const mdiFormatHeaderIncrease: string; +export declare const mdiFormatHeaderPound: string; +export declare const mdiFormatHorizontalAlignCenter: string; +export declare const mdiFormatHorizontalAlignLeft: string; +export declare const mdiFormatHorizontalAlignRight: string; +export declare const mdiFormatIndentDecrease: string; +export declare const mdiFormatIndentIncrease: string; +export declare const mdiFormatItalic: string; +export declare const mdiFormatLetterCase: string; +export declare const mdiFormatLetterCaseLower: string; +export declare const mdiFormatLetterCaseUpper: string; +export declare const mdiFormatLetterEndsWith: string; +export declare const mdiFormatLetterMatches: string; +export declare const mdiFormatLetterStartsWith: string; +export declare const mdiFormatLineSpacing: string; +export declare const mdiFormatLineStyle: string; +export declare const mdiFormatLineWeight: string; +export declare const mdiFormatListBulleted: string; +export declare const mdiFormatListBulletedSquare: string; +export declare const mdiFormatListBulletedTriangle: string; +export declare const mdiFormatListBulletedType: string; +export declare const mdiFormatListCheckbox: string; +export declare const mdiFormatListChecks: string; +export declare const mdiFormatListNumbered: string; +export declare const mdiFormatListNumberedRtl: string; +export declare const mdiFormatListText: string; +export declare const mdiFormatOverline: string; +export declare const mdiFormatPageBreak: string; +export declare const mdiFormatPaint: string; +export declare const mdiFormatParagraph: string; +export declare const mdiFormatPilcrow: string; +export declare const mdiFormatQuoteClose: string; +export declare const mdiFormatQuoteCloseOutline: string; +export declare const mdiFormatQuoteOpen: string; +export declare const mdiFormatQuoteOpenOutline: string; +export declare const mdiFormatRotate90: string; +export declare const mdiFormatSection: string; +export declare const mdiFormatSize: string; +export declare const mdiFormatStrikethrough: string; +export declare const mdiFormatStrikethroughVariant: string; +export declare const mdiFormatSubscript: string; +export declare const mdiFormatSuperscript: string; +export declare const mdiFormatText: string; +export declare const mdiFormatTextRotationAngleDown: string; +export declare const mdiFormatTextRotationAngleUp: string; +export declare const mdiFormatTextRotationDown: string; +export declare const mdiFormatTextRotationDownVertical: string; +export declare const mdiFormatTextRotationNone: string; +export declare const mdiFormatTextRotationUp: string; +export declare const mdiFormatTextRotationVertical: string; +export declare const mdiFormatTextVariant: string; +export declare const mdiFormatTextWrappingClip: string; +export declare const mdiFormatTextWrappingOverflow: string; +export declare const mdiFormatTextWrappingWrap: string; +export declare const mdiFormatTextbox: string; +export declare const mdiFormatTextdirectionLToR: string; +export declare const mdiFormatTextdirectionRToL: string; +export declare const mdiFormatTitle: string; +export declare const mdiFormatUnderline: string; +export declare const mdiFormatVerticalAlignBottom: string; +export declare const mdiFormatVerticalAlignCenter: string; +export declare const mdiFormatVerticalAlignTop: string; +export declare const mdiFormatWrapInline: string; +export declare const mdiFormatWrapSquare: string; +export declare const mdiFormatWrapTight: string; +export declare const mdiFormatWrapTopBottom: string; +export declare const mdiForum: string; +export declare const mdiForumOutline: string; +export declare const mdiForward: string; +export declare const mdiForwardburger: string; +export declare const mdiFountain: string; +export declare const mdiFountainPen: string; +export declare const mdiFountainPenTip: string; +export declare const mdiFoursquare: string; +export declare const mdiFreebsd: string; +export declare const mdiFrequentlyAskedQuestions: string; +export declare const mdiFridge: string; +export declare const mdiFridgeAlert: string; +export declare const mdiFridgeAlertOutline: string; +export declare const mdiFridgeBottom: string; +export declare const mdiFridgeOff: string; +export declare const mdiFridgeOffOutline: string; +export declare const mdiFridgeOutline: string; +export declare const mdiFridgeTop: string; +export declare const mdiFruitCherries: string; +export declare const mdiFruitCitrus: string; +export declare const mdiFruitGrapes: string; +export declare const mdiFruitGrapesOutline: string; +export declare const mdiFruitPineapple: string; +export declare const mdiFruitWatermelon: string; +export declare const mdiFuel: string; +export declare const mdiFullscreen: string; +export declare const mdiFullscreenExit: string; +export declare const mdiFunction: string; +export declare const mdiFunctionVariant: string; +export declare const mdiFuriganaHorizontal: string; +export declare const mdiFuriganaVertical: string; +export declare const mdiFuse: string; +export declare const mdiFuseBlade: string; +export declare const mdiGamepad: string; +export declare const mdiGamepadCircle: string; +export declare const mdiGamepadCircleDown: string; +export declare const mdiGamepadCircleLeft: string; +export declare const mdiGamepadCircleOutline: string; +export declare const mdiGamepadCircleRight: string; +export declare const mdiGamepadCircleUp: string; +export declare const mdiGamepadDown: string; +export declare const mdiGamepadLeft: string; +export declare const mdiGamepadRight: string; +export declare const mdiGamepadRound: string; +export declare const mdiGamepadRoundDown: string; +export declare const mdiGamepadRoundLeft: string; +export declare const mdiGamepadRoundOutline: string; +export declare const mdiGamepadRoundRight: string; +export declare const mdiGamepadRoundUp: string; +export declare const mdiGamepadSquare: string; +export declare const mdiGamepadSquareOutline: string; +export declare const mdiGamepadUp: string; +export declare const mdiGamepadVariant: string; +export declare const mdiGamepadVariantOutline: string; +export declare const mdiGamma: string; +export declare const mdiGantryCrane: string; +export declare const mdiGarage: string; +export declare const mdiGarageAlert: string; +export declare const mdiGarageAlertVariant: string; +export declare const mdiGarageOpen: string; +export declare const mdiGarageOpenVariant: string; +export declare const mdiGarageVariant: string; +export declare const mdiGasCylinder: string; +export declare const mdiGasStation: string; +export declare const mdiGasStationOutline: string; +export declare const mdiGate: string; +export declare const mdiGateAnd: string; +export declare const mdiGateArrowRight: string; +export declare const mdiGateNand: string; +export declare const mdiGateNor: string; +export declare const mdiGateNot: string; +export declare const mdiGateOpen: string; +export declare const mdiGateOr: string; +export declare const mdiGateXnor: string; +export declare const mdiGateXor: string; +export declare const mdiGatsby: string; +export declare const mdiGauge: string; +export declare const mdiGaugeEmpty: string; +export declare const mdiGaugeFull: string; +export declare const mdiGaugeLow: string; +export declare const mdiGavel: string; +export declare const mdiGenderFemale: string; +export declare const mdiGenderMale: string; +export declare const mdiGenderMaleFemale: string; +export declare const mdiGenderMaleFemaleVariant: string; +export declare const mdiGenderNonBinary: string; +export declare const mdiGenderTransgender: string; +export declare const mdiGentoo: string; +export declare const mdiGesture: string; +export declare const mdiGestureDoubleTap: string; +export declare const mdiGesturePinch: string; +export declare const mdiGestureSpread: string; +export declare const mdiGestureSwipe: string; +export declare const mdiGestureSwipeDown: string; +export declare const mdiGestureSwipeHorizontal: string; +export declare const mdiGestureSwipeLeft: string; +export declare const mdiGestureSwipeRight: string; +export declare const mdiGestureSwipeUp: string; +export declare const mdiGestureSwipeVertical: string; +export declare const mdiGestureTap: string; +export declare const mdiGestureTapBox: string; +export declare const mdiGestureTapButton: string; +export declare const mdiGestureTapHold: string; +export declare const mdiGestureTwoDoubleTap: string; +export declare const mdiGestureTwoTap: string; +export declare const mdiGhost: string; +export declare const mdiGhostOff: string; +export declare const mdiGif: string; +export declare const mdiGift: string; +export declare const mdiGiftOutline: string; +export declare const mdiGit: string; +export declare const mdiGithubBox: string; +export declare const mdiGithubCircle: string; +export declare const mdiGithubFace: string; +export declare const mdiGitlab: string; +export declare const mdiGlassCocktail: string; +export declare const mdiGlassFlute: string; +export declare const mdiGlassMug: string; +export declare const mdiGlassMugVariant: string; +export declare const mdiGlassPintOutline: string; +export declare const mdiGlassStange: string; +export declare const mdiGlassTulip: string; +export declare const mdiGlassWine: string; +export declare const mdiGlassdoor: string; +export declare const mdiGlasses: string; +export declare const mdiGlobeLight: string; +export declare const mdiGlobeModel: string; +export declare const mdiGmail: string; +export declare const mdiGnome: string; +export declare const mdiGoKart: string; +export declare const mdiGoKartTrack: string; +export declare const mdiGog: string; +export declare const mdiGold: string; +export declare const mdiGolf: string; +export declare const mdiGolfCart: string; +export declare const mdiGolfTee: string; +export declare const mdiGondola: string; +export declare const mdiGoodreads: string; +export declare const mdiGoogle: string; +export declare const mdiGoogleAdwords: string; +export declare const mdiGoogleAnalytics: string; +export declare const mdiGoogleAssistant: string; +export declare const mdiGoogleCardboard: string; +export declare const mdiGoogleChrome: string; +export declare const mdiGoogleCircles: string; +export declare const mdiGoogleCirclesCommunities: string; +export declare const mdiGoogleCirclesExtended: string; +export declare const mdiGoogleCirclesGroup: string; +export declare const mdiGoogleClassroom: string; +export declare const mdiGoogleCloud: string; +export declare const mdiGoogleController: string; +export declare const mdiGoogleControllerOff: string; +export declare const mdiGoogleDownasaur: string; +export declare const mdiGoogleDrive: string; +export declare const mdiGoogleEarth: string; +export declare const mdiGoogleFit: string; +export declare const mdiGoogleGlass: string; +export declare const mdiGoogleHangouts: string; +export declare const mdiGoogleHome: string; +export declare const mdiGoogleKeep: string; +export declare const mdiGoogleLens: string; +export declare const mdiGoogleMaps: string; +export declare const mdiGoogleMyBusiness: string; +export declare const mdiGoogleNearby: string; +export declare const mdiGooglePages: string; +export declare const mdiGooglePhotos: string; +export declare const mdiGooglePhysicalWeb: string; +export declare const mdiGooglePlay: string; +export declare const mdiGooglePlus: string; +export declare const mdiGooglePlusBox: string; +export declare const mdiGooglePodcast: string; +export declare const mdiGoogleSpreadsheet: string; +export declare const mdiGoogleStreetView: string; +export declare const mdiGoogleTranslate: string; +export declare const mdiGradient: string; +export declare const mdiGrain: string; +export declare const mdiGraph: string; +export declare const mdiGraphOutline: string; +export declare const mdiGraphql: string; +export declare const mdiGraveStone: string; +export declare const mdiGreasePencil: string; +export declare const mdiGreaterThan: string; +export declare const mdiGreaterThanOrEqual: string; +export declare const mdiGrid: string; +export declare const mdiGridLarge: string; +export declare const mdiGridOff: string; +export declare const mdiGrill: string; +export declare const mdiGrillOutline: string; +export declare const mdiGroup: string; +export declare const mdiGuitarAcoustic: string; +export declare const mdiGuitarElectric: string; +export declare const mdiGuitarPick: string; +export declare const mdiGuitarPickOutline: string; +export declare const mdiGuyFawkesMask: string; +export declare const mdiHackernews: string; +export declare const mdiHail: string; +export declare const mdiHairDryer: string; +export declare const mdiHairDryerOutline: string; +export declare const mdiHalloween: string; +export declare const mdiHamburger: string; +export declare const mdiHammer: string; +export declare const mdiHammerScrewdriver: string; +export declare const mdiHammerWrench: string; +export declare const mdiHand: string; +export declare const mdiHandHeart: string; +export declare const mdiHandLeft: string; +export declare const mdiHandOkay: string; +export declare const mdiHandPeace: string; +export declare const mdiHandPeaceVariant: string; +export declare const mdiHandPointingDown: string; +export declare const mdiHandPointingLeft: string; +export declare const mdiHandPointingRight: string; +export declare const mdiHandPointingUp: string; +export declare const mdiHandRight: string; +export declare const mdiHandSaw: string; +export declare const mdiHandball: string; +export declare const mdiHandcuffs: string; +export declare const mdiHandshake: string; +export declare const mdiHanger: string; +export declare const mdiHardHat: string; +export declare const mdiHarddisk: string; +export declare const mdiHarddiskPlus: string; +export declare const mdiHarddiskRemove: string; +export declare const mdiHatFedora: string; +export declare const mdiHazardLights: string; +export declare const mdiHdr: string; +export declare const mdiHdrOff: string; +export declare const mdiHead: string; +export declare const mdiHeadAlert: string; +export declare const mdiHeadAlertOutline: string; +export declare const mdiHeadCheck: string; +export declare const mdiHeadCheckOutline: string; +export declare const mdiHeadCog: string; +export declare const mdiHeadCogOutline: string; +export declare const mdiHeadDotsHorizontal: string; +export declare const mdiHeadDotsHorizontalOutline: string; +export declare const mdiHeadFlash: string; +export declare const mdiHeadFlashOutline: string; +export declare const mdiHeadHeart: string; +export declare const mdiHeadHeartOutline: string; +export declare const mdiHeadLightbulb: string; +export declare const mdiHeadLightbulbOutline: string; +export declare const mdiHeadMinus: string; +export declare const mdiHeadMinusOutline: string; +export declare const mdiHeadOutline: string; +export declare const mdiHeadPlus: string; +export declare const mdiHeadPlusOutline: string; +export declare const mdiHeadQuestion: string; +export declare const mdiHeadQuestionOutline: string; +export declare const mdiHeadRemove: string; +export declare const mdiHeadRemoveOutline: string; +export declare const mdiHeadSnowflake: string; +export declare const mdiHeadSnowflakeOutline: string; +export declare const mdiHeadSync: string; +export declare const mdiHeadSyncOutline: string; +export declare const mdiHeadphones: string; +export declare const mdiHeadphonesBluetooth: string; +export declare const mdiHeadphonesBox: string; +export declare const mdiHeadphonesOff: string; +export declare const mdiHeadphonesSettings: string; +export declare const mdiHeadset: string; +export declare const mdiHeadsetDock: string; +export declare const mdiHeadsetOff: string; +export declare const mdiHeart: string; +export declare const mdiHeartBox: string; +export declare const mdiHeartBoxOutline: string; +export declare const mdiHeartBroken: string; +export declare const mdiHeartBrokenOutline: string; +export declare const mdiHeartCircle: string; +export declare const mdiHeartCircleOutline: string; +export declare const mdiHeartFlash: string; +export declare const mdiHeartHalf: string; +export declare const mdiHeartHalfFull: string; +export declare const mdiHeartHalfOutline: string; +export declare const mdiHeartMultiple: string; +export declare const mdiHeartMultipleOutline: string; +export declare const mdiHeartOff: string; +export declare const mdiHeartOutline: string; +export declare const mdiHeartPulse: string; +export declare const mdiHelicopter: string; +export declare const mdiHelp: string; +export declare const mdiHelpBox: string; +export declare const mdiHelpCircle: string; +export declare const mdiHelpCircleOutline: string; +export declare const mdiHelpNetwork: string; +export declare const mdiHelpNetworkOutline: string; +export declare const mdiHelpRhombus: string; +export declare const mdiHelpRhombusOutline: string; +export declare const mdiHexadecimal: string; +export declare const mdiHexagon: string; +export declare const mdiHexagonMultiple: string; +export declare const mdiHexagonMultipleOutline: string; +export declare const mdiHexagonOutline: string; +export declare const mdiHexagonSlice1: string; +export declare const mdiHexagonSlice2: string; +export declare const mdiHexagonSlice3: string; +export declare const mdiHexagonSlice4: string; +export declare const mdiHexagonSlice5: string; +export declare const mdiHexagonSlice6: string; +export declare const mdiHexagram: string; +export declare const mdiHexagramOutline: string; +export declare const mdiHighDefinition: string; +export declare const mdiHighDefinitionBox: string; +export declare const mdiHighway: string; +export declare const mdiHiking: string; +export declare const mdiHinduism: string; +export declare const mdiHistory: string; +export declare const mdiHockeyPuck: string; +export declare const mdiHockeySticks: string; +export declare const mdiHololens: string; +export declare const mdiHome: string; +export declare const mdiHomeAccount: string; +export declare const mdiHomeAlert: string; +export declare const mdiHomeAnalytics: string; +export declare const mdiHomeAssistant: string; +export declare const mdiHomeAutomation: string; +export declare const mdiHomeCircle: string; +export declare const mdiHomeCircleOutline: string; +export declare const mdiHomeCity: string; +export declare const mdiHomeCityOutline: string; +export declare const mdiHomeCurrencyUsd: string; +export declare const mdiHomeEdit: string; +export declare const mdiHomeEditOutline: string; +export declare const mdiHomeExportOutline: string; +export declare const mdiHomeFlood: string; +export declare const mdiHomeFloor0: string; +export declare const mdiHomeFloor1: string; +export declare const mdiHomeFloor2: string; +export declare const mdiHomeFloor3: string; +export declare const mdiHomeFloorA: string; +export declare const mdiHomeFloorB: string; +export declare const mdiHomeFloorG: string; +export declare const mdiHomeFloorL: string; +export declare const mdiHomeFloorNegative1: string; +export declare const mdiHomeGroup: string; +export declare const mdiHomeHeart: string; +export declare const mdiHomeImportOutline: string; +export declare const mdiHomeLightbulb: string; +export declare const mdiHomeLightbulbOutline: string; +export declare const mdiHomeLock: string; +export declare const mdiHomeLockOpen: string; +export declare const mdiHomeMapMarker: string; +export declare const mdiHomeMinus: string; +export declare const mdiHomeModern: string; +export declare const mdiHomeOutline: string; +export declare const mdiHomePlus: string; +export declare const mdiHomeRemove: string; +export declare const mdiHomeRoof: string; +export declare const mdiHomeThermometer: string; +export declare const mdiHomeThermometerOutline: string; +export declare const mdiHomeVariant: string; +export declare const mdiHomeVariantOutline: string; +export declare const mdiHook: string; +export declare const mdiHookOff: string; +export declare const mdiHops: string; +export declare const mdiHorizontalRotateClockwise: string; +export declare const mdiHorizontalRotateCounterclockwise: string; +export declare const mdiHorseshoe: string; +export declare const mdiHospital: string; +export declare const mdiHospitalBox: string; +export declare const mdiHospitalBoxOutline: string; +export declare const mdiHospitalBuilding: string; +export declare const mdiHospitalMarker: string; +export declare const mdiHotTub: string; +export declare const mdiHotel: string; +export declare const mdiHouzz: string; +export declare const mdiHouzzBox: string; +export declare const mdiHubspot: string; +export declare const mdiHulu: string; +export declare const mdiHuman: string; +export declare const mdiHumanChild: string; +export declare const mdiHumanFemale: string; +export declare const mdiHumanFemaleBoy: string; +export declare const mdiHumanFemaleFemale: string; +export declare const mdiHumanFemaleGirl: string; +export declare const mdiHumanGreeting: string; +export declare const mdiHumanHandsdown: string; +export declare const mdiHumanHandsup: string; +export declare const mdiHumanMale: string; +export declare const mdiHumanMaleBoy: string; +export declare const mdiHumanMaleFemale: string; +export declare const mdiHumanMaleGirl: string; +export declare const mdiHumanMaleHeight: string; +export declare const mdiHumanMaleHeightVariant: string; +export declare const mdiHumanMaleMale: string; +export declare const mdiHumanPregnant: string; +export declare const mdiHumbleBundle: string; +export declare const mdiHvac: string; +export declare const mdiHydraulicOilLevel: string; +export declare const mdiHydraulicOilTemperature: string; +export declare const mdiHydroPower: string; +export declare const mdiIceCream: string; +export declare const mdiIcePop: string; +export declare const mdiIdCard: string; +export declare const mdiIdentifier: string; +export declare const mdiIdeogramCjk: string; +export declare const mdiIdeogramCjkVariant: string; +export declare const mdiIframe: string; +export declare const mdiIframeArray: string; +export declare const mdiIframeArrayOutline: string; +export declare const mdiIframeBraces: string; +export declare const mdiIframeBracesOutline: string; +export declare const mdiIframeOutline: string; +export declare const mdiIframeParentheses: string; +export declare const mdiIframeParenthesesOutline: string; +export declare const mdiIframeVariable: string; +export declare const mdiIframeVariableOutline: string; +export declare const mdiImage: string; +export declare const mdiImageAlbum: string; +export declare const mdiImageArea: string; +export declare const mdiImageAreaClose: string; +export declare const mdiImageAutoAdjust: string; +export declare const mdiImageBroken: string; +export declare const mdiImageBrokenVariant: string; +export declare const mdiImageEdit: string; +export declare const mdiImageEditOutline: string; +export declare const mdiImageFilter: string; +export declare const mdiImageFilterBlackWhite: string; +export declare const mdiImageFilterCenterFocus: string; +export declare const mdiImageFilterCenterFocusStrong: string; +export declare const mdiImageFilterCenterFocusStrongOutline: string; +export declare const mdiImageFilterCenterFocusWeak: string; +export declare const mdiImageFilterDrama: string; +export declare const mdiImageFilterFrames: string; +export declare const mdiImageFilterHdr: string; +export declare const mdiImageFilterNone: string; +export declare const mdiImageFilterTiltShift: string; +export declare const mdiImageFilterVintage: string; +export declare const mdiImageFrame: string; +export declare const mdiImageMove: string; +export declare const mdiImageMultiple: string; +export declare const mdiImageOff: string; +export declare const mdiImageOffOutline: string; +export declare const mdiImageOutline: string; +export declare const mdiImagePlus: string; +export declare const mdiImageSearch: string; +export declare const mdiImageSearchOutline: string; +export declare const mdiImageSizeSelectActual: string; +export declare const mdiImageSizeSelectLarge: string; +export declare const mdiImageSizeSelectSmall: string; +export declare const mdiImport: string; +export declare const mdiInbox: string; +export declare const mdiInboxArrowDown: string; +export declare const mdiInboxArrowDownOutline: string; +export declare const mdiInboxArrowUp: string; +export declare const mdiInboxArrowUpOutline: string; +export declare const mdiInboxFull: string; +export declare const mdiInboxFullOutline: string; +export declare const mdiInboxMultiple: string; +export declare const mdiInboxMultipleOutline: string; +export declare const mdiInboxOutline: string; +export declare const mdiIncognito: string; +export declare const mdiInfinity: string; +export declare const mdiInformation: string; +export declare const mdiInformationOutline: string; +export declare const mdiInformationVariant: string; +export declare const mdiInstagram: string; +export declare const mdiInstapaper: string; +export declare const mdiInstrumentTriangle: string; +export declare const mdiInternetExplorer: string; +export declare const mdiInvertColors: string; +export declare const mdiInvertColorsOff: string; +export declare const mdiIobroker: string; +export declare const mdiIp: string; +export declare const mdiIpNetwork: string; +export declare const mdiIpNetworkOutline: string; +export declare const mdiIpod: string; +export declare const mdiIslam: string; +export declare const mdiIsland: string; +export declare const mdiItunes: string; +export declare const mdiIvBag: string; +export declare const mdiJabber: string; +export declare const mdiJeepney: string; +export declare const mdiJellyfish: string; +export declare const mdiJellyfishOutline: string; +export declare const mdiJira: string; +export declare const mdiJquery: string; +export declare const mdiJsfiddle: string; +export declare const mdiJson: string; +export declare const mdiJudaism: string; +export declare const mdiJumpRope: string; +export declare const mdiKabaddi: string; +export declare const mdiKarate: string; +export declare const mdiKeg: string; +export declare const mdiKettle: string; +export declare const mdiKettleAlert: string; +export declare const mdiKettleAlertOutline: string; +export declare const mdiKettleOff: string; +export declare const mdiKettleOffOutline: string; +export declare const mdiKettleOutline: string; +export declare const mdiKettleSteam: string; +export declare const mdiKettleSteamOutline: string; +export declare const mdiKettlebell: string; +export declare const mdiKey: string; +export declare const mdiKeyArrowRight: string; +export declare const mdiKeyChange: string; +export declare const mdiKeyLink: string; +export declare const mdiKeyMinus: string; +export declare const mdiKeyOutline: string; +export declare const mdiKeyPlus: string; +export declare const mdiKeyRemove: string; +export declare const mdiKeyStar: string; +export declare const mdiKeyVariant: string; +export declare const mdiKeyWireless: string; +export declare const mdiKeyboard: string; +export declare const mdiKeyboardBackspace: string; +export declare const mdiKeyboardCaps: string; +export declare const mdiKeyboardClose: string; +export declare const mdiKeyboardEsc: string; +export declare const mdiKeyboardF1: string; +export declare const mdiKeyboardF10: string; +export declare const mdiKeyboardF11: string; +export declare const mdiKeyboardF12: string; +export declare const mdiKeyboardF2: string; +export declare const mdiKeyboardF3: string; +export declare const mdiKeyboardF4: string; +export declare const mdiKeyboardF5: string; +export declare const mdiKeyboardF6: string; +export declare const mdiKeyboardF7: string; +export declare const mdiKeyboardF8: string; +export declare const mdiKeyboardF9: string; +export declare const mdiKeyboardOff: string; +export declare const mdiKeyboardOffOutline: string; +export declare const mdiKeyboardOutline: string; +export declare const mdiKeyboardReturn: string; +export declare const mdiKeyboardSettings: string; +export declare const mdiKeyboardSettingsOutline: string; +export declare const mdiKeyboardSpace: string; +export declare const mdiKeyboardTab: string; +export declare const mdiKeyboardVariant: string; +export declare const mdiKhanda: string; +export declare const mdiKickstarter: string; +export declare const mdiKlingon: string; +export declare const mdiKnife: string; +export declare const mdiKnifeMilitary: string; +export declare const mdiKodi: string; +export declare const mdiKotlin: string; +export declare const mdiKubernetes: string; +export declare const mdiLabel: string; +export declare const mdiLabelMultiple: string; +export declare const mdiLabelMultipleOutline: string; +export declare const mdiLabelOff: string; +export declare const mdiLabelOffOutline: string; +export declare const mdiLabelOutline: string; +export declare const mdiLabelPercent: string; +export declare const mdiLabelPercentOutline: string; +export declare const mdiLabelVariant: string; +export declare const mdiLabelVariantOutline: string; +export declare const mdiLadybug: string; +export declare const mdiLambda: string; +export declare const mdiLamp: string; +export declare const mdiLan: string; +export declare const mdiLanCheck: string; +export declare const mdiLanConnect: string; +export declare const mdiLanDisconnect: string; +export declare const mdiLanPending: string; +export declare const mdiLanguageC: string; +export declare const mdiLanguageCpp: string; +export declare const mdiLanguageCsharp: string; +export declare const mdiLanguageCss3: string; +export declare const mdiLanguageFortran: string; +export declare const mdiLanguageGo: string; +export declare const mdiLanguageHaskell: string; +export declare const mdiLanguageHtml5: string; +export declare const mdiLanguageJava: string; +export declare const mdiLanguageJavascript: string; +export declare const mdiLanguageLua: string; +export declare const mdiLanguagePhp: string; +export declare const mdiLanguagePython: string; +export declare const mdiLanguagePythonText: string; +export declare const mdiLanguageR: string; +export declare const mdiLanguageRubyOnRails: string; +export declare const mdiLanguageSwift: string; +export declare const mdiLanguageTypescript: string; +export declare const mdiLaptop: string; +export declare const mdiLaptopChromebook: string; +export declare const mdiLaptopMac: string; +export declare const mdiLaptopOff: string; +export declare const mdiLaptopWindows: string; +export declare const mdiLaravel: string; +export declare const mdiLasso: string; +export declare const mdiLastfm: string; +export declare const mdiLastpass: string; +export declare const mdiLatitude: string; +export declare const mdiLaunch: string; +export declare const mdiLavaLamp: string; +export declare const mdiLayers: string; +export declare const mdiLayersMinus: string; +export declare const mdiLayersOff: string; +export declare const mdiLayersOffOutline: string; +export declare const mdiLayersOutline: string; +export declare const mdiLayersPlus: string; +export declare const mdiLayersRemove: string; +export declare const mdiLayersSearch: string; +export declare const mdiLayersSearchOutline: string; +export declare const mdiLayersTriple: string; +export declare const mdiLayersTripleOutline: string; +export declare const mdiLeadPencil: string; +export declare const mdiLeaf: string; +export declare const mdiLeafMaple: string; +export declare const mdiLeafMapleOff: string; +export declare const mdiLeafOff: string; +export declare const mdiLeak: string; +export declare const mdiLeakOff: string; +export declare const mdiLedOff: string; +export declare const mdiLedOn: string; +export declare const mdiLedOutline: string; +export declare const mdiLedStrip: string; +export declare const mdiLedStripVariant: string; +export declare const mdiLedVariantOff: string; +export declare const mdiLedVariantOn: string; +export declare const mdiLedVariantOutline: string; +export declare const mdiLeek: string; +export declare const mdiLessThan: string; +export declare const mdiLessThanOrEqual: string; +export declare const mdiLibrary: string; +export declare const mdiLibraryBooks: string; +export declare const mdiLibraryMovie: string; +export declare const mdiLibraryMusic: string; +export declare const mdiLibraryMusicOutline: string; +export declare const mdiLibraryShelves: string; +export declare const mdiLibraryVideo: string; +export declare const mdiLicense: string; +export declare const mdiLifebuoy: string; +export declare const mdiLightSwitch: string; +export declare const mdiLightbulb: string; +export declare const mdiLightbulbCfl: string; +export declare const mdiLightbulbCflOff: string; +export declare const mdiLightbulbCflSpiral: string; +export declare const mdiLightbulbCflSpiralOff: string; +export declare const mdiLightbulbGroup: string; +export declare const mdiLightbulbGroupOff: string; +export declare const mdiLightbulbGroupOffOutline: string; +export declare const mdiLightbulbGroupOutline: string; +export declare const mdiLightbulbMultiple: string; +export declare const mdiLightbulbMultipleOff: string; +export declare const mdiLightbulbMultipleOffOutline: string; +export declare const mdiLightbulbMultipleOutline: string; +export declare const mdiLightbulbOff: string; +export declare const mdiLightbulbOffOutline: string; +export declare const mdiLightbulbOn: string; +export declare const mdiLightbulbOnOutline: string; +export declare const mdiLightbulbOutline: string; +export declare const mdiLighthouse: string; +export declare const mdiLighthouseOn: string; +export declare const mdiLink: string; +export declare const mdiLinkBox: string; +export declare const mdiLinkBoxOutline: string; +export declare const mdiLinkBoxVariant: string; +export declare const mdiLinkBoxVariantOutline: string; +export declare const mdiLinkLock: string; +export declare const mdiLinkOff: string; +export declare const mdiLinkPlus: string; +export declare const mdiLinkVariant: string; +export declare const mdiLinkVariantMinus: string; +export declare const mdiLinkVariantOff: string; +export declare const mdiLinkVariantPlus: string; +export declare const mdiLinkVariantRemove: string; +export declare const mdiLinkedin: string; +export declare const mdiLinkedinBox: string; +export declare const mdiLinux: string; +export declare const mdiLinuxMint: string; +export declare const mdiLitecoin: string; +export declare const mdiLoading: string; +export declare const mdiLocationEnter: string; +export declare const mdiLocationExit: string; +export declare const mdiLock: string; +export declare const mdiLockAlert: string; +export declare const mdiLockClock: string; +export declare const mdiLockOpen: string; +export declare const mdiLockOpenOutline: string; +export declare const mdiLockOpenVariant: string; +export declare const mdiLockOpenVariantOutline: string; +export declare const mdiLockOutline: string; +export declare const mdiLockPattern: string; +export declare const mdiLockPlus: string; +export declare const mdiLockQuestion: string; +export declare const mdiLockReset: string; +export declare const mdiLockSmart: string; +export declare const mdiLocker: string; +export declare const mdiLockerMultiple: string; +export declare const mdiLogin: string; +export declare const mdiLoginVariant: string; +export declare const mdiLogout: string; +export declare const mdiLogoutVariant: string; +export declare const mdiLongitude: string; +export declare const mdiLooks: string; +export declare const mdiLoupe: string; +export declare const mdiLumx: string; +export declare const mdiLungs: string; +export declare const mdiLyft: string; +export declare const mdiMagnet: string; +export declare const mdiMagnetOn: string; +export declare const mdiMagnify: string; +export declare const mdiMagnifyClose: string; +export declare const mdiMagnifyMinus: string; +export declare const mdiMagnifyMinusCursor: string; +export declare const mdiMagnifyMinusOutline: string; +export declare const mdiMagnifyPlus: string; +export declare const mdiMagnifyPlusCursor: string; +export declare const mdiMagnifyPlusOutline: string; +export declare const mdiMagnifyRemoveCursor: string; +export declare const mdiMagnifyRemoveOutline: string; +export declare const mdiMagnifyScan: string; +export declare const mdiMail: string; +export declare const mdiMailRu: string; +export declare const mdiMailbox: string; +export declare const mdiMailboxOpen: string; +export declare const mdiMailboxOpenOutline: string; +export declare const mdiMailboxOpenUp: string; +export declare const mdiMailboxOpenUpOutline: string; +export declare const mdiMailboxOutline: string; +export declare const mdiMailboxUp: string; +export declare const mdiMailboxUpOutline: string; +export declare const mdiMap: string; +export declare const mdiMapCheck: string; +export declare const mdiMapCheckOutline: string; +export declare const mdiMapClock: string; +export declare const mdiMapClockOutline: string; +export declare const mdiMapLegend: string; +export declare const mdiMapMarker: string; +export declare const mdiMapMarkerAlert: string; +export declare const mdiMapMarkerAlertOutline: string; +export declare const mdiMapMarkerCheck: string; +export declare const mdiMapMarkerCheckOutline: string; +export declare const mdiMapMarkerCircle: string; +export declare const mdiMapMarkerDistance: string; +export declare const mdiMapMarkerDown: string; +export declare const mdiMapMarkerLeft: string; +export declare const mdiMapMarkerLeftOutline: string; +export declare const mdiMapMarkerMinus: string; +export declare const mdiMapMarkerMinusOutline: string; +export declare const mdiMapMarkerMultiple: string; +export declare const mdiMapMarkerMultipleOutline: string; +export declare const mdiMapMarkerOff: string; +export declare const mdiMapMarkerOffOutline: string; +export declare const mdiMapMarkerOutline: string; +export declare const mdiMapMarkerPath: string; +export declare const mdiMapMarkerPlus: string; +export declare const mdiMapMarkerPlusOutline: string; +export declare const mdiMapMarkerQuestion: string; +export declare const mdiMapMarkerQuestionOutline: string; +export declare const mdiMapMarkerRadius: string; +export declare const mdiMapMarkerRadiusOutline: string; +export declare const mdiMapMarkerRemove: string; +export declare const mdiMapMarkerRemoveOutline: string; +export declare const mdiMapMarkerRemoveVariant: string; +export declare const mdiMapMarkerRight: string; +export declare const mdiMapMarkerRightOutline: string; +export declare const mdiMapMarkerUp: string; +export declare const mdiMapMinus: string; +export declare const mdiMapOutline: string; +export declare const mdiMapPlus: string; +export declare const mdiMapSearch: string; +export declare const mdiMapSearchOutline: string; +export declare const mdiMapbox: string; +export declare const mdiMargin: string; +export declare const mdiMarkdown: string; +export declare const mdiMarkdownOutline: string; +export declare const mdiMarker: string; +export declare const mdiMarkerCancel: string; +export declare const mdiMarkerCheck: string; +export declare const mdiMastodon: string; +export declare const mdiMastodonVariant: string; +export declare const mdiMaterialDesign: string; +export declare const mdiMaterialUi: string; +export declare const mdiMathCompass: string; +export declare const mdiMathCos: string; +export declare const mdiMathIntegral: string; +export declare const mdiMathIntegralBox: string; +export declare const mdiMathLog: string; +export declare const mdiMathNorm: string; +export declare const mdiMathNormBox: string; +export declare const mdiMathSin: string; +export declare const mdiMathTan: string; +export declare const mdiMatrix: string; +export declare const mdiMedal: string; +export declare const mdiMedalOutline: string; +export declare const mdiMedicalBag: string; +export declare const mdiMeditation: string; +export declare const mdiMedium: string; +export declare const mdiMeetup: string; +export declare const mdiMemory: string; +export declare const mdiMenu: string; +export declare const mdiMenuDown: string; +export declare const mdiMenuDownOutline: string; +export declare const mdiMenuLeft: string; +export declare const mdiMenuLeftOutline: string; +export declare const mdiMenuOpen: string; +export declare const mdiMenuRight: string; +export declare const mdiMenuRightOutline: string; +export declare const mdiMenuSwap: string; +export declare const mdiMenuSwapOutline: string; +export declare const mdiMenuUp: string; +export declare const mdiMenuUpOutline: string; +export declare const mdiMerge: string; +export declare const mdiMessage: string; +export declare const mdiMessageAlert: string; +export declare const mdiMessageAlertOutline: string; +export declare const mdiMessageArrowLeft: string; +export declare const mdiMessageArrowLeftOutline: string; +export declare const mdiMessageArrowRight: string; +export declare const mdiMessageArrowRightOutline: string; +export declare const mdiMessageBulleted: string; +export declare const mdiMessageBulletedOff: string; +export declare const mdiMessageDraw: string; +export declare const mdiMessageImage: string; +export declare const mdiMessageImageOutline: string; +export declare const mdiMessageLock: string; +export declare const mdiMessageLockOutline: string; +export declare const mdiMessageMinus: string; +export declare const mdiMessageMinusOutline: string; +export declare const mdiMessageOutline: string; +export declare const mdiMessagePlus: string; +export declare const mdiMessagePlusOutline: string; +export declare const mdiMessageProcessing: string; +export declare const mdiMessageProcessingOutline: string; +export declare const mdiMessageReply: string; +export declare const mdiMessageReplyText: string; +export declare const mdiMessageSettings: string; +export declare const mdiMessageSettingsOutline: string; +export declare const mdiMessageSettingsVariant: string; +export declare const mdiMessageSettingsVariantOutline: string; +export declare const mdiMessageText: string; +export declare const mdiMessageTextClock: string; +export declare const mdiMessageTextClockOutline: string; +export declare const mdiMessageTextLock: string; +export declare const mdiMessageTextLockOutline: string; +export declare const mdiMessageTextOutline: string; +export declare const mdiMessageVideo: string; +export declare const mdiMeteor: string; +export declare const mdiMetronome: string; +export declare const mdiMetronomeTick: string; +export declare const mdiMicroSd: string; +export declare const mdiMicrophone: string; +export declare const mdiMicrophoneMinus: string; +export declare const mdiMicrophoneOff: string; +export declare const mdiMicrophoneOutline: string; +export declare const mdiMicrophonePlus: string; +export declare const mdiMicrophoneSettings: string; +export declare const mdiMicrophoneVariant: string; +export declare const mdiMicrophoneVariantOff: string; +export declare const mdiMicroscope: string; +export declare const mdiMicrosoft: string; +export declare const mdiMicrosoftDynamics: string; +export declare const mdiMicrowave: string; +export declare const mdiMiddleware: string; +export declare const mdiMiddlewareOutline: string; +export declare const mdiMidi: string; +export declare const mdiMidiPort: string; +export declare const mdiMine: string; +export declare const mdiMinecraft: string; +export declare const mdiMiniSd: string; +export declare const mdiMinidisc: string; +export declare const mdiMinus: string; +export declare const mdiMinusBox: string; +export declare const mdiMinusBoxMultiple: string; +export declare const mdiMinusBoxMultipleOutline: string; +export declare const mdiMinusBoxOutline: string; +export declare const mdiMinusCircle: string; +export declare const mdiMinusCircleOutline: string; +export declare const mdiMinusNetwork: string; +export declare const mdiMinusNetworkOutline: string; +export declare const mdiMirror: string; +export declare const mdiMixcloud: string; +export declare const mdiMixedMartialArts: string; +export declare const mdiMixedReality: string; +export declare const mdiMixer: string; +export declare const mdiMolecule: string; +export declare const mdiMonitor: string; +export declare const mdiMonitorCellphone: string; +export declare const mdiMonitorCellphoneStar: string; +export declare const mdiMonitorClean: string; +export declare const mdiMonitorDashboard: string; +export declare const mdiMonitorEdit: string; +export declare const mdiMonitorLock: string; +export declare const mdiMonitorMultiple: string; +export declare const mdiMonitorOff: string; +export declare const mdiMonitorScreenshot: string; +export declare const mdiMonitorSpeaker: string; +export declare const mdiMonitorSpeakerOff: string; +export declare const mdiMonitorStar: string; +export declare const mdiMoonFirstQuarter: string; +export declare const mdiMoonFull: string; +export declare const mdiMoonLastQuarter: string; +export declare const mdiMoonNew: string; +export declare const mdiMoonWaningCrescent: string; +export declare const mdiMoonWaningGibbous: string; +export declare const mdiMoonWaxingCrescent: string; +export declare const mdiMoonWaxingGibbous: string; +export declare const mdiMoped: string; +export declare const mdiMore: string; +export declare const mdiMotherHeart: string; +export declare const mdiMotherNurse: string; +export declare const mdiMotionSensor: string; +export declare const mdiMotorbike: string; +export declare const mdiMouse: string; +export declare const mdiMouseBluetooth: string; +export declare const mdiMouseOff: string; +export declare const mdiMouseVariant: string; +export declare const mdiMouseVariantOff: string; +export declare const mdiMoveResize: string; +export declare const mdiMoveResizeVariant: string; +export declare const mdiMovie: string; +export declare const mdiMovieEdit: string; +export declare const mdiMovieEditOutline: string; +export declare const mdiMovieFilter: string; +export declare const mdiMovieFilterOutline: string; +export declare const mdiMovieOpen: string; +export declare const mdiMovieOpenOutline: string; +export declare const mdiMovieOutline: string; +export declare const mdiMovieRoll: string; +export declare const mdiMovieSearch: string; +export declare const mdiMovieSearchOutline: string; +export declare const mdiMuffin: string; +export declare const mdiMultiplication: string; +export declare const mdiMultiplicationBox: string; +export declare const mdiMushroom: string; +export declare const mdiMushroomOutline: string; +export declare const mdiMusic: string; +export declare const mdiMusicAccidentalDoubleFlat: string; +export declare const mdiMusicAccidentalDoubleSharp: string; +export declare const mdiMusicAccidentalFlat: string; +export declare const mdiMusicAccidentalNatural: string; +export declare const mdiMusicAccidentalSharp: string; +export declare const mdiMusicBox: string; +export declare const mdiMusicBoxOutline: string; +export declare const mdiMusicCircle: string; +export declare const mdiMusicCircleOutline: string; +export declare const mdiMusicClefAlto: string; +export declare const mdiMusicClefBass: string; +export declare const mdiMusicClefTreble: string; +export declare const mdiMusicNote: string; +export declare const mdiMusicNoteBluetooth: string; +export declare const mdiMusicNoteBluetoothOff: string; +export declare const mdiMusicNoteEighth: string; +export declare const mdiMusicNoteEighthDotted: string; +export declare const mdiMusicNoteHalf: string; +export declare const mdiMusicNoteHalfDotted: string; +export declare const mdiMusicNoteOff: string; +export declare const mdiMusicNoteOffOutline: string; +export declare const mdiMusicNoteOutline: string; +export declare const mdiMusicNotePlus: string; +export declare const mdiMusicNoteQuarter: string; +export declare const mdiMusicNoteQuarterDotted: string; +export declare const mdiMusicNoteSixteenth: string; +export declare const mdiMusicNoteSixteenthDotted: string; +export declare const mdiMusicNoteWhole: string; +export declare const mdiMusicNoteWholeDotted: string; +export declare const mdiMusicOff: string; +export declare const mdiMusicRestEighth: string; +export declare const mdiMusicRestHalf: string; +export declare const mdiMusicRestQuarter: string; +export declare const mdiMusicRestSixteenth: string; +export declare const mdiMusicRestWhole: string; +export declare const mdiNail: string; +export declare const mdiNas: string; +export declare const mdiNativescript: string; +export declare const mdiNature: string; +export declare const mdiNaturePeople: string; +export declare const mdiNavigation: string; +export declare const mdiNearMe: string; +export declare const mdiNecklace: string; +export declare const mdiNeedle: string; +export declare const mdiNetflix: string; +export declare const mdiNetwork: string; +export declare const mdiNetworkOff: string; +export declare const mdiNetworkOffOutline: string; +export declare const mdiNetworkOutline: string; +export declare const mdiNetworkRouter: string; +export declare const mdiNetworkStrength1: string; +export declare const mdiNetworkStrength1Alert: string; +export declare const mdiNetworkStrength2: string; +export declare const mdiNetworkStrength2Alert: string; +export declare const mdiNetworkStrength3: string; +export declare const mdiNetworkStrength3Alert: string; +export declare const mdiNetworkStrength4: string; +export declare const mdiNetworkStrength4Alert: string; +export declare const mdiNetworkStrengthOff: string; +export declare const mdiNetworkStrengthOffOutline: string; +export declare const mdiNetworkStrengthOutline: string; +export declare const mdiNewBox: string; +export declare const mdiNewspaper: string; +export declare const mdiNewspaperMinus: string; +export declare const mdiNewspaperPlus: string; +export declare const mdiNewspaperVariant: string; +export declare const mdiNewspaperVariantMultiple: string; +export declare const mdiNewspaperVariantMultipleOutline: string; +export declare const mdiNewspaperVariantOutline: string; +export declare const mdiNfc: string; +export declare const mdiNfcOff: string; +export declare const mdiNfcSearchVariant: string; +export declare const mdiNfcTap: string; +export declare const mdiNfcVariant: string; +export declare const mdiNfcVariantOff: string; +export declare const mdiNinja: string; +export declare const mdiNintendoSwitch: string; +export declare const mdiNix: string; +export declare const mdiNodejs: string; +export declare const mdiNoodles: string; +export declare const mdiNotEqual: string; +export declare const mdiNotEqualVariant: string; +export declare const mdiNote: string; +export declare const mdiNoteMultiple: string; +export declare const mdiNoteMultipleOutline: string; +export declare const mdiNoteOutline: string; +export declare const mdiNotePlus: string; +export declare const mdiNotePlusOutline: string; +export declare const mdiNoteText: string; +export declare const mdiNoteTextOutline: string; +export declare const mdiNotebook: string; +export declare const mdiNotebookMultiple: string; +export declare const mdiNotebookOutline: string; +export declare const mdiNotificationClearAll: string; +export declare const mdiNpm: string; +export declare const mdiNpmVariant: string; +export declare const mdiNpmVariantOutline: string; +export declare const mdiNuke: string; +export declare const mdiNull: string; +export declare const mdiNumeric: string; +export declare const mdiNumeric0: string; +export declare const mdiNumeric0Box: string; +export declare const mdiNumeric0BoxMultiple: string; +export declare const mdiNumeric0BoxMultipleOutline: string; +export declare const mdiNumeric0BoxOutline: string; +export declare const mdiNumeric0Circle: string; +export declare const mdiNumeric0CircleOutline: string; +export declare const mdiNumeric1: string; +export declare const mdiNumeric1Box: string; +export declare const mdiNumeric1BoxMultiple: string; +export declare const mdiNumeric1BoxMultipleOutline: string; +export declare const mdiNumeric1BoxOutline: string; +export declare const mdiNumeric1Circle: string; +export declare const mdiNumeric1CircleOutline: string; +export declare const mdiNumeric10: string; +export declare const mdiNumeric10Box: string; +export declare const mdiNumeric10BoxMultiple: string; +export declare const mdiNumeric10BoxMultipleOutline: string; +export declare const mdiNumeric10BoxOutline: string; +export declare const mdiNumeric10Circle: string; +export declare const mdiNumeric10CircleOutline: string; +export declare const mdiNumeric2: string; +export declare const mdiNumeric2Box: string; +export declare const mdiNumeric2BoxMultiple: string; +export declare const mdiNumeric2BoxMultipleOutline: string; +export declare const mdiNumeric2BoxOutline: string; +export declare const mdiNumeric2Circle: string; +export declare const mdiNumeric2CircleOutline: string; +export declare const mdiNumeric3: string; +export declare const mdiNumeric3Box: string; +export declare const mdiNumeric3BoxMultiple: string; +export declare const mdiNumeric3BoxMultipleOutline: string; +export declare const mdiNumeric3BoxOutline: string; +export declare const mdiNumeric3Circle: string; +export declare const mdiNumeric3CircleOutline: string; +export declare const mdiNumeric4: string; +export declare const mdiNumeric4Box: string; +export declare const mdiNumeric4BoxMultiple: string; +export declare const mdiNumeric4BoxMultipleOutline: string; +export declare const mdiNumeric4BoxOutline: string; +export declare const mdiNumeric4Circle: string; +export declare const mdiNumeric4CircleOutline: string; +export declare const mdiNumeric5: string; +export declare const mdiNumeric5Box: string; +export declare const mdiNumeric5BoxMultiple: string; +export declare const mdiNumeric5BoxMultipleOutline: string; +export declare const mdiNumeric5BoxOutline: string; +export declare const mdiNumeric5Circle: string; +export declare const mdiNumeric5CircleOutline: string; +export declare const mdiNumeric6: string; +export declare const mdiNumeric6Box: string; +export declare const mdiNumeric6BoxMultiple: string; +export declare const mdiNumeric6BoxMultipleOutline: string; +export declare const mdiNumeric6BoxOutline: string; +export declare const mdiNumeric6Circle: string; +export declare const mdiNumeric6CircleOutline: string; +export declare const mdiNumeric7: string; +export declare const mdiNumeric7Box: string; +export declare const mdiNumeric7BoxMultiple: string; +export declare const mdiNumeric7BoxMultipleOutline: string; +export declare const mdiNumeric7BoxOutline: string; +export declare const mdiNumeric7Circle: string; +export declare const mdiNumeric7CircleOutline: string; +export declare const mdiNumeric8: string; +export declare const mdiNumeric8Box: string; +export declare const mdiNumeric8BoxMultiple: string; +export declare const mdiNumeric8BoxMultipleOutline: string; +export declare const mdiNumeric8BoxOutline: string; +export declare const mdiNumeric8Circle: string; +export declare const mdiNumeric8CircleOutline: string; +export declare const mdiNumeric9: string; +export declare const mdiNumeric9Box: string; +export declare const mdiNumeric9BoxMultiple: string; +export declare const mdiNumeric9BoxMultipleOutline: string; +export declare const mdiNumeric9BoxOutline: string; +export declare const mdiNumeric9Circle: string; +export declare const mdiNumeric9CircleOutline: string; +export declare const mdiNumeric9Plus: string; +export declare const mdiNumeric9PlusBox: string; +export declare const mdiNumeric9PlusBoxMultiple: string; +export declare const mdiNumeric9PlusBoxMultipleOutline: string; +export declare const mdiNumeric9PlusBoxOutline: string; +export declare const mdiNumeric9PlusCircle: string; +export declare const mdiNumeric9PlusCircleOutline: string; +export declare const mdiNumericNegative1: string; +export declare const mdiNut: string; +export declare const mdiNutrition: string; +export declare const mdiNuxt: string; +export declare const mdiOar: string; +export declare const mdiOcarina: string; +export declare const mdiOci: string; +export declare const mdiOcr: string; +export declare const mdiOctagon: string; +export declare const mdiOctagonOutline: string; +export declare const mdiOctagram: string; +export declare const mdiOctagramOutline: string; +export declare const mdiOdnoklassniki: string; +export declare const mdiOffer: string; +export declare const mdiOffice: string; +export declare const mdiOfficeBuilding: string; +export declare const mdiOil: string; +export declare const mdiOilLamp: string; +export declare const mdiOilLevel: string; +export declare const mdiOilTemperature: string; +export declare const mdiOmega: string; +export declare const mdiOneUp: string; +export declare const mdiOnedrive: string; +export declare const mdiOnenote: string; +export declare const mdiOnepassword: string; +export declare const mdiOpacity: string; +export declare const mdiOpenInApp: string; +export declare const mdiOpenInNew: string; +export declare const mdiOpenSourceInitiative: string; +export declare const mdiOpenid: string; +export declare const mdiOpera: string; +export declare const mdiOrbit: string; +export declare const mdiOrigin: string; +export declare const mdiOrnament: string; +export declare const mdiOrnamentVariant: string; +export declare const mdiOutdoorLamp: string; +export declare const mdiOutlook: string; +export declare const mdiOverscan: string; +export declare const mdiOwl: string; +export declare const mdiPacMan: string; +export declare const mdiPackage: string; +export declare const mdiPackageDown: string; +export declare const mdiPackageUp: string; +export declare const mdiPackageVariant: string; +export declare const mdiPackageVariantClosed: string; +export declare const mdiPageFirst: string; +export declare const mdiPageLast: string; +export declare const mdiPageLayoutBody: string; +export declare const mdiPageLayoutFooter: string; +export declare const mdiPageLayoutHeader: string; +export declare const mdiPageLayoutHeaderFooter: string; +export declare const mdiPageLayoutSidebarLeft: string; +export declare const mdiPageLayoutSidebarRight: string; +export declare const mdiPageNext: string; +export declare const mdiPageNextOutline: string; +export declare const mdiPagePrevious: string; +export declare const mdiPagePreviousOutline: string; +export declare const mdiPalette: string; +export declare const mdiPaletteAdvanced: string; +export declare const mdiPaletteOutline: string; +export declare const mdiPaletteSwatch: string; +export declare const mdiPaletteSwatchOutline: string; +export declare const mdiPalmTree: string; +export declare const mdiPan: string; +export declare const mdiPanBottomLeft: string; +export declare const mdiPanBottomRight: string; +export declare const mdiPanDown: string; +export declare const mdiPanHorizontal: string; +export declare const mdiPanLeft: string; +export declare const mdiPanRight: string; +export declare const mdiPanTopLeft: string; +export declare const mdiPanTopRight: string; +export declare const mdiPanUp: string; +export declare const mdiPanVertical: string; +export declare const mdiPanda: string; +export declare const mdiPandora: string; +export declare const mdiPanorama: string; +export declare const mdiPanoramaFisheye: string; +export declare const mdiPanoramaHorizontal: string; +export declare const mdiPanoramaVertical: string; +export declare const mdiPanoramaWideAngle: string; +export declare const mdiPaperCutVertical: string; +export declare const mdiPaperRoll: string; +export declare const mdiPaperRollOutline: string; +export declare const mdiPaperclip: string; +export declare const mdiParachute: string; +export declare const mdiParachuteOutline: string; +export declare const mdiParking: string; +export declare const mdiPartyPopper: string; +export declare const mdiPassport: string; +export declare const mdiPassportBiometric: string; +export declare const mdiPasta: string; +export declare const mdiPatioHeater: string; +export declare const mdiPatreon: string; +export declare const mdiPause: string; +export declare const mdiPauseCircle: string; +export declare const mdiPauseCircleOutline: string; +export declare const mdiPauseOctagon: string; +export declare const mdiPauseOctagonOutline: string; +export declare const mdiPaw: string; +export declare const mdiPawOff: string; +export declare const mdiPaypal: string; +export declare const mdiPdfBox: string; +export declare const mdiPeace: string; +export declare const mdiPeanut: string; +export declare const mdiPeanutOff: string; +export declare const mdiPeanutOffOutline: string; +export declare const mdiPeanutOutline: string; +export declare const mdiPen: string; +export declare const mdiPenLock: string; +export declare const mdiPenMinus: string; +export declare const mdiPenOff: string; +export declare const mdiPenPlus: string; +export declare const mdiPenRemove: string; +export declare const mdiPencil: string; +export declare const mdiPencilBox: string; +export declare const mdiPencilBoxMultiple: string; +export declare const mdiPencilBoxMultipleOutline: string; +export declare const mdiPencilBoxOutline: string; +export declare const mdiPencilCircle: string; +export declare const mdiPencilCircleOutline: string; +export declare const mdiPencilLock: string; +export declare const mdiPencilLockOutline: string; +export declare const mdiPencilMinus: string; +export declare const mdiPencilMinusOutline: string; +export declare const mdiPencilOff: string; +export declare const mdiPencilOffOutline: string; +export declare const mdiPencilOutline: string; +export declare const mdiPencilPlus: string; +export declare const mdiPencilPlusOutline: string; +export declare const mdiPencilRemove: string; +export declare const mdiPencilRemoveOutline: string; +export declare const mdiPencilRuler: string; +export declare const mdiPenguin: string; +export declare const mdiPentagon: string; +export declare const mdiPentagonOutline: string; +export declare const mdiPercent: string; +export declare const mdiPercentOutline: string; +export declare const mdiPeriodicTable: string; +export declare const mdiPeriodicTableCo: string; +export declare const mdiPeriodicTableCo2: string; +export declare const mdiPeriscope: string; +export declare const mdiPerspectiveLess: string; +export declare const mdiPerspectiveMore: string; +export declare const mdiPharmacy: string; +export declare const mdiPhone: string; +export declare const mdiPhoneAlert: string; +export declare const mdiPhoneAlertOutline: string; +export declare const mdiPhoneBluetooth: string; +export declare const mdiPhoneBluetoothOutline: string; +export declare const mdiPhoneCancel: string; +export declare const mdiPhoneCancelOutline: string; +export declare const mdiPhoneCheck: string; +export declare const mdiPhoneCheckOutline: string; +export declare const mdiPhoneClassic: string; +export declare const mdiPhoneClassicOff: string; +export declare const mdiPhoneForward: string; +export declare const mdiPhoneForwardOutline: string; +export declare const mdiPhoneHangup: string; +export declare const mdiPhoneHangupOutline: string; +export declare const mdiPhoneInTalk: string; +export declare const mdiPhoneInTalkOutline: string; +export declare const mdiPhoneIncoming: string; +export declare const mdiPhoneIncomingOutline: string; +export declare const mdiPhoneLock: string; +export declare const mdiPhoneLockOutline: string; +export declare const mdiPhoneLog: string; +export declare const mdiPhoneLogOutline: string; +export declare const mdiPhoneMessage: string; +export declare const mdiPhoneMessageOutline: string; +export declare const mdiPhoneMinus: string; +export declare const mdiPhoneMinusOutline: string; +export declare const mdiPhoneMissed: string; +export declare const mdiPhoneMissedOutline: string; +export declare const mdiPhoneOff: string; +export declare const mdiPhoneOffOutline: string; +export declare const mdiPhoneOutgoing: string; +export declare const mdiPhoneOutgoingOutline: string; +export declare const mdiPhoneOutline: string; +export declare const mdiPhonePaused: string; +export declare const mdiPhonePausedOutline: string; +export declare const mdiPhonePlus: string; +export declare const mdiPhonePlusOutline: string; +export declare const mdiPhoneReturn: string; +export declare const mdiPhoneReturnOutline: string; +export declare const mdiPhoneRing: string; +export declare const mdiPhoneRingOutline: string; +export declare const mdiPhoneRotateLandscape: string; +export declare const mdiPhoneRotatePortrait: string; +export declare const mdiPhoneSettings: string; +export declare const mdiPhoneSettingsOutline: string; +export declare const mdiPhoneVoip: string; +export declare const mdiPi: string; +export declare const mdiPiBox: string; +export declare const mdiPiHole: string; +export declare const mdiPiano: string; +export declare const mdiPickaxe: string; +export declare const mdiPictureInPictureBottomRight: string; +export declare const mdiPictureInPictureBottomRightOutline: string; +export declare const mdiPictureInPictureTopRight: string; +export declare const mdiPictureInPictureTopRightOutline: string; +export declare const mdiPier: string; +export declare const mdiPierCrane: string; +export declare const mdiPig: string; +export declare const mdiPigVariant: string; +export declare const mdiPiggyBank: string; +export declare const mdiPill: string; +export declare const mdiPillar: string; +export declare const mdiPin: string; +export declare const mdiPinOff: string; +export declare const mdiPinOffOutline: string; +export declare const mdiPinOutline: string; +export declare const mdiPineTree: string; +export declare const mdiPineTreeBox: string; +export declare const mdiPinterest: string; +export declare const mdiPinterestBox: string; +export declare const mdiPinwheel: string; +export declare const mdiPinwheelOutline: string; +export declare const mdiPipe: string; +export declare const mdiPipeDisconnected: string; +export declare const mdiPipeLeak: string; +export declare const mdiPipeWrench: string; +export declare const mdiPirate: string; +export declare const mdiPistol: string; +export declare const mdiPiston: string; +export declare const mdiPizza: string; +export declare const mdiPlay: string; +export declare const mdiPlayBox: string; +export declare const mdiPlayBoxOutline: string; +export declare const mdiPlayCircle: string; +export declare const mdiPlayCircleOutline: string; +export declare const mdiPlayNetwork: string; +export declare const mdiPlayNetworkOutline: string; +export declare const mdiPlayOutline: string; +export declare const mdiPlayPause: string; +export declare const mdiPlayProtectedContent: string; +export declare const mdiPlaySpeed: string; +export declare const mdiPlaylistCheck: string; +export declare const mdiPlaylistEdit: string; +export declare const mdiPlaylistMinus: string; +export declare const mdiPlaylistMusic: string; +export declare const mdiPlaylistMusicOutline: string; +export declare const mdiPlaylistPlay: string; +export declare const mdiPlaylistPlus: string; +export declare const mdiPlaylistRemove: string; +export declare const mdiPlaylistStar: string; +export declare const mdiPlaystation: string; +export declare const mdiPlex: string; +export declare const mdiPlus: string; +export declare const mdiPlusBox: string; +export declare const mdiPlusBoxMultiple: string; +export declare const mdiPlusBoxMultipleOutline: string; +export declare const mdiPlusBoxOutline: string; +export declare const mdiPlusCircle: string; +export declare const mdiPlusCircleMultipleOutline: string; +export declare const mdiPlusCircleOutline: string; +export declare const mdiPlusMinus: string; +export declare const mdiPlusMinusBox: string; +export declare const mdiPlusNetwork: string; +export declare const mdiPlusNetworkOutline: string; +export declare const mdiPlusOne: string; +export declare const mdiPlusOutline: string; +export declare const mdiPlusThick: string; +export declare const mdiPocket: string; +export declare const mdiPodcast: string; +export declare const mdiPodium: string; +export declare const mdiPodiumBronze: string; +export declare const mdiPodiumGold: string; +export declare const mdiPodiumSilver: string; +export declare const mdiPointOfSale: string; +export declare const mdiPokeball: string; +export declare const mdiPokemonGo: string; +export declare const mdiPokerChip: string; +export declare const mdiPolaroid: string; +export declare const mdiPoliceBadge: string; +export declare const mdiPoliceBadgeOutline: string; +export declare const mdiPoll: string; +export declare const mdiPollBox: string; +export declare const mdiPollBoxOutline: string; +export declare const mdiPolymer: string; +export declare const mdiPool: string; +export declare const mdiPopcorn: string; +export declare const mdiPost: string; +export declare const mdiPostOutline: string; +export declare const mdiPostageStamp: string; +export declare const mdiPot: string; +export declare const mdiPotMix: string; +export declare const mdiPound: string; +export declare const mdiPoundBox: string; +export declare const mdiPoundBoxOutline: string; +export declare const mdiPower: string; +export declare const mdiPowerCycle: string; +export declare const mdiPowerOff: string; +export declare const mdiPowerOn: string; +export declare const mdiPowerPlug: string; +export declare const mdiPowerPlugOff: string; +export declare const mdiPowerSettings: string; +export declare const mdiPowerSleep: string; +export declare const mdiPowerSocket: string; +export declare const mdiPowerSocketAu: string; +export declare const mdiPowerSocketDe: string; +export declare const mdiPowerSocketEu: string; +export declare const mdiPowerSocketFr: string; +export declare const mdiPowerSocketJp: string; +export declare const mdiPowerSocketUk: string; +export declare const mdiPowerSocketUs: string; +export declare const mdiPowerStandby: string; +export declare const mdiPowershell: string; +export declare const mdiPrescription: string; +export declare const mdiPresentation: string; +export declare const mdiPresentationPlay: string; +export declare const mdiPrinter: string; +export declare const mdiPrinter3d: string; +export declare const mdiPrinter3dNozzle: string; +export declare const mdiPrinter3dNozzleAlert: string; +export declare const mdiPrinter3dNozzleAlertOutline: string; +export declare const mdiPrinter3dNozzleOutline: string; +export declare const mdiPrinterAlert: string; +export declare const mdiPrinterCheck: string; +export declare const mdiPrinterOff: string; +export declare const mdiPrinterPos: string; +export declare const mdiPrinterSettings: string; +export declare const mdiPrinterWireless: string; +export declare const mdiPriorityHigh: string; +export declare const mdiPriorityLow: string; +export declare const mdiProfessionalHexagon: string; +export declare const mdiProgressAlert: string; +export declare const mdiProgressCheck: string; +export declare const mdiProgressClock: string; +export declare const mdiProgressClose: string; +export declare const mdiProgressDownload: string; +export declare const mdiProgressUpload: string; +export declare const mdiProgressWrench: string; +export declare const mdiProjector: string; +export declare const mdiProjectorScreen: string; +export declare const mdiPropaneTank: string; +export declare const mdiPropaneTankOutline: string; +export declare const mdiProtocol: string; +export declare const mdiPublish: string; +export declare const mdiPulse: string; +export declare const mdiPumpkin: string; +export declare const mdiPurse: string; +export declare const mdiPurseOutline: string; +export declare const mdiPuzzle: string; +export declare const mdiPuzzleOutline: string; +export declare const mdiQi: string; +export declare const mdiQqchat: string; +export declare const mdiQrcode: string; +export declare const mdiQrcodeEdit: string; +export declare const mdiQrcodeMinus: string; +export declare const mdiQrcodePlus: string; +export declare const mdiQrcodeRemove: string; +export declare const mdiQrcodeScan: string; +export declare const mdiQuadcopter: string; +export declare const mdiQualityHigh: string; +export declare const mdiQualityLow: string; +export declare const mdiQualityMedium: string; +export declare const mdiQuicktime: string; +export declare const mdiQuora: string; +export declare const mdiRabbit: string; +export declare const mdiRacingHelmet: string; +export declare const mdiRacquetball: string; +export declare const mdiRadar: string; +export declare const mdiRadiator: string; +export declare const mdiRadiatorDisabled: string; +export declare const mdiRadiatorOff: string; +export declare const mdiRadio: string; +export declare const mdiRadioAm: string; +export declare const mdiRadioFm: string; +export declare const mdiRadioHandheld: string; +export declare const mdiRadioOff: string; +export declare const mdiRadioTower: string; +export declare const mdiRadioactive: string; +export declare const mdiRadioactiveOff: string; +export declare const mdiRadioboxBlank: string; +export declare const mdiRadioboxMarked: string; +export declare const mdiRadius: string; +export declare const mdiRadiusOutline: string; +export declare const mdiRailroadLight: string; +export declare const mdiRaspberryPi: string; +export declare const mdiRayEnd: string; +export declare const mdiRayEndArrow: string; +export declare const mdiRayStart: string; +export declare const mdiRayStartArrow: string; +export declare const mdiRayStartEnd: string; +export declare const mdiRayVertex: string; +export declare const mdiReact: string; +export declare const mdiRead: string; +export declare const mdiReceipt: string; +export declare const mdiRecord: string; +export declare const mdiRecordCircle: string; +export declare const mdiRecordCircleOutline: string; +export declare const mdiRecordPlayer: string; +export declare const mdiRecordRec: string; +export declare const mdiRectangle: string; +export declare const mdiRectangleOutline: string; +export declare const mdiRecycle: string; +export declare const mdiReddit: string; +export declare const mdiRedhat: string; +export declare const mdiRedo: string; +export declare const mdiRedoVariant: string; +export declare const mdiReflectHorizontal: string; +export declare const mdiReflectVertical: string; +export declare const mdiRefresh: string; +export declare const mdiRefreshCircle: string; +export declare const mdiRegex: string; +export declare const mdiRegisteredTrademark: string; +export declare const mdiRelativeScale: string; +export declare const mdiReload: string; +export declare const mdiReloadAlert: string; +export declare const mdiReminder: string; +export declare const mdiRemote: string; +export declare const mdiRemoteDesktop: string; +export declare const mdiRemoteOff: string; +export declare const mdiRemoteTv: string; +export declare const mdiRemoteTvOff: string; +export declare const mdiRenameBox: string; +export declare const mdiReorderHorizontal: string; +export declare const mdiReorderVertical: string; +export declare const mdiRepeat: string; +export declare const mdiRepeatOff: string; +export declare const mdiRepeatOnce: string; +export declare const mdiReplay: string; +export declare const mdiReply: string; +export declare const mdiReplyAll: string; +export declare const mdiReplyAllOutline: string; +export declare const mdiReplyCircle: string; +export declare const mdiReplyOutline: string; +export declare const mdiReproduction: string; +export declare const mdiResistor: string; +export declare const mdiResistorNodes: string; +export declare const mdiResize: string; +export declare const mdiResizeBottomRight: string; +export declare const mdiResponsive: string; +export declare const mdiRestart: string; +export declare const mdiRestartAlert: string; +export declare const mdiRestartOff: string; +export declare const mdiRestore: string; +export declare const mdiRestoreAlert: string; +export declare const mdiRewind: string; +export declare const mdiRewind10: string; +export declare const mdiRewind30: string; +export declare const mdiRewind5: string; +export declare const mdiRewindOutline: string; +export declare const mdiRhombus: string; +export declare const mdiRhombusMedium: string; +export declare const mdiRhombusOutline: string; +export declare const mdiRhombusSplit: string; +export declare const mdiRibbon: string; +export declare const mdiRice: string; +export declare const mdiRing: string; +export declare const mdiRivet: string; +export declare const mdiRoad: string; +export declare const mdiRoadVariant: string; +export declare const mdiRobber: string; +export declare const mdiRobot: string; +export declare const mdiRobotIndustrial: string; +export declare const mdiRobotMower: string; +export declare const mdiRobotMowerOutline: string; +export declare const mdiRobotVacuum: string; +export declare const mdiRobotVacuumVariant: string; +export declare const mdiRocket: string; +export declare const mdiRodent: string; +export declare const mdiRollerSkate: string; +export declare const mdiRollerblade: string; +export declare const mdiRollupjs: string; +export declare const mdiRomanNumeral1: string; +export declare const mdiRomanNumeral10: string; +export declare const mdiRomanNumeral2: string; +export declare const mdiRomanNumeral3: string; +export declare const mdiRomanNumeral4: string; +export declare const mdiRomanNumeral5: string; +export declare const mdiRomanNumeral6: string; +export declare const mdiRomanNumeral7: string; +export declare const mdiRomanNumeral8: string; +export declare const mdiRomanNumeral9: string; +export declare const mdiRoomService: string; +export declare const mdiRoomServiceOutline: string; +export declare const mdiRotate3d: string; +export declare const mdiRotate3dVariant: string; +export declare const mdiRotateLeft: string; +export declare const mdiRotateLeftVariant: string; +export declare const mdiRotateOrbit: string; +export declare const mdiRotateRight: string; +export declare const mdiRotateRightVariant: string; +export declare const mdiRoundedCorner: string; +export declare const mdiRouter: string; +export declare const mdiRouterWireless: string; +export declare const mdiRouterWirelessSettings: string; +export declare const mdiRoutes: string; +export declare const mdiRoutesClock: string; +export declare const mdiRowing: string; +export declare const mdiRss: string; +export declare const mdiRssBox: string; +export declare const mdiRssOff: string; +export declare const mdiRuby: string; +export declare const mdiRugby: string; +export declare const mdiRuler: string; +export declare const mdiRulerSquare: string; +export declare const mdiRulerSquareCompass: string; +export declare const mdiRun: string; +export declare const mdiRunFast: string; +export declare const mdiRvTruck: string; +export declare const mdiSack: string; +export declare const mdiSackPercent: string; +export declare const mdiSafe: string; +export declare const mdiSafeSquare: string; +export declare const mdiSafeSquareOutline: string; +export declare const mdiSafetyGoggles: string; +export declare const mdiSailing: string; +export declare const mdiSale: string; +export declare const mdiSalesforce: string; +export declare const mdiSass: string; +export declare const mdiSatellite: string; +export declare const mdiSatelliteUplink: string; +export declare const mdiSatelliteVariant: string; +export declare const mdiSausage: string; +export declare const mdiSawBlade: string; +export declare const mdiSaxophone: string; +export declare const mdiScale: string; +export declare const mdiScaleBalance: string; +export declare const mdiScaleBathroom: string; +export declare const mdiScaleOff: string; +export declare const mdiScanner: string; +export declare const mdiScannerOff: string; +export declare const mdiScatterPlot: string; +export declare const mdiScatterPlotOutline: string; +export declare const mdiSchool: string; +export declare const mdiSchoolOutline: string; +export declare const mdiScissorsCutting: string; +export declare const mdiScooter: string; +export declare const mdiScoreboard: string; +export declare const mdiScoreboardOutline: string; +export declare const mdiScreenRotation: string; +export declare const mdiScreenRotationLock: string; +export declare const mdiScrewFlatTop: string; +export declare const mdiScrewLag: string; +export declare const mdiScrewMachineFlatTop: string; +export declare const mdiScrewMachineRoundTop: string; +export declare const mdiScrewRoundTop: string; +export declare const mdiScrewdriver: string; +export declare const mdiScript: string; +export declare const mdiScriptOutline: string; +export declare const mdiScriptText: string; +export declare const mdiScriptTextOutline: string; +export declare const mdiSd: string; +export declare const mdiSeal: string; +export declare const mdiSealVariant: string; +export declare const mdiSearchWeb: string; +export declare const mdiSeat: string; +export declare const mdiSeatFlat: string; +export declare const mdiSeatFlatAngled: string; +export declare const mdiSeatIndividualSuite: string; +export declare const mdiSeatLegroomExtra: string; +export declare const mdiSeatLegroomNormal: string; +export declare const mdiSeatLegroomReduced: string; +export declare const mdiSeatOutline: string; +export declare const mdiSeatPassenger: string; +export declare const mdiSeatReclineExtra: string; +export declare const mdiSeatReclineNormal: string; +export declare const mdiSeatbelt: string; +export declare const mdiSecurity: string; +export declare const mdiSecurityNetwork: string; +export declare const mdiSeed: string; +export declare const mdiSeedOutline: string; +export declare const mdiSegment: string; +export declare const mdiSelect: string; +export declare const mdiSelectAll: string; +export declare const mdiSelectColor: string; +export declare const mdiSelectCompare: string; +export declare const mdiSelectDrag: string; +export declare const mdiSelectGroup: string; +export declare const mdiSelectInverse: string; +export declare const mdiSelectMarker: string; +export declare const mdiSelectMultiple: string; +export declare const mdiSelectMultipleMarker: string; +export declare const mdiSelectOff: string; +export declare const mdiSelectPlace: string; +export declare const mdiSelectSearch: string; +export declare const mdiSelection: string; +export declare const mdiSelectionDrag: string; +export declare const mdiSelectionEllipse: string; +export declare const mdiSelectionEllipseArrowInside: string; +export declare const mdiSelectionMarker: string; +export declare const mdiSelectionMultipleMarker: string; +export declare const mdiSelectionMutliple: string; +export declare const mdiSelectionOff: string; +export declare const mdiSelectionSearch: string; +export declare const mdiSemanticWeb: string; +export declare const mdiSend: string; +export declare const mdiSendCheck: string; +export declare const mdiSendCheckOutline: string; +export declare const mdiSendCircle: string; +export declare const mdiSendCircleOutline: string; +export declare const mdiSendClock: string; +export declare const mdiSendClockOutline: string; +export declare const mdiSendLock: string; +export declare const mdiSendLockOutline: string; +export declare const mdiSendOutline: string; +export declare const mdiSerialPort: string; +export declare const mdiServer: string; +export declare const mdiServerMinus: string; +export declare const mdiServerNetwork: string; +export declare const mdiServerNetworkOff: string; +export declare const mdiServerOff: string; +export declare const mdiServerPlus: string; +export declare const mdiServerRemove: string; +export declare const mdiServerSecurity: string; +export declare const mdiSetAll: string; +export declare const mdiSetCenter: string; +export declare const mdiSetCenterRight: string; +export declare const mdiSetLeft: string; +export declare const mdiSetLeftCenter: string; +export declare const mdiSetLeftRight: string; +export declare const mdiSetNone: string; +export declare const mdiSetRight: string; +export declare const mdiSetTopBox: string; +export declare const mdiSettings: string; +export declare const mdiSettingsBox: string; +export declare const mdiSettingsHelper: string; +export declare const mdiSettingsOutline: string; +export declare const mdiSettingsTransfer: string; +export declare const mdiSettingsTransferOutline: string; +export declare const mdiShaker: string; +export declare const mdiShakerOutline: string; +export declare const mdiShape: string; +export declare const mdiShapeCirclePlus: string; +export declare const mdiShapeOutline: string; +export declare const mdiShapeOvalPlus: string; +export declare const mdiShapePlus: string; +export declare const mdiShapePolygonPlus: string; +export declare const mdiShapeRectanglePlus: string; +export declare const mdiShapeSquarePlus: string; +export declare const mdiShare: string; +export declare const mdiShareAll: string; +export declare const mdiShareAllOutline: string; +export declare const mdiShareCircle: string; +export declare const mdiShareOff: string; +export declare const mdiShareOffOutline: string; +export declare const mdiShareOutline: string; +export declare const mdiShareVariant: string; +export declare const mdiSheep: string; +export declare const mdiShield: string; +export declare const mdiShieldAccount: string; +export declare const mdiShieldAccountOutline: string; +export declare const mdiShieldAirplane: string; +export declare const mdiShieldAirplaneOutline: string; +export declare const mdiShieldAlert: string; +export declare const mdiShieldAlertOutline: string; +export declare const mdiShieldCar: string; +export declare const mdiShieldCheck: string; +export declare const mdiShieldCheckOutline: string; +export declare const mdiShieldCross: string; +export declare const mdiShieldCrossOutline: string; +export declare const mdiShieldEdit: string; +export declare const mdiShieldEditOutline: string; +export declare const mdiShieldHalf: string; +export declare const mdiShieldHalfFull: string; +export declare const mdiShieldHome: string; +export declare const mdiShieldHomeOutline: string; +export declare const mdiShieldKey: string; +export declare const mdiShieldKeyOutline: string; +export declare const mdiShieldLinkVariant: string; +export declare const mdiShieldLinkVariantOutline: string; +export declare const mdiShieldLock: string; +export declare const mdiShieldLockOutline: string; +export declare const mdiShieldOff: string; +export declare const mdiShieldOffOutline: string; +export declare const mdiShieldOutline: string; +export declare const mdiShieldPlus: string; +export declare const mdiShieldPlusOutline: string; +export declare const mdiShieldRefresh: string; +export declare const mdiShieldRefreshOutline: string; +export declare const mdiShieldRemove: string; +export declare const mdiShieldRemoveOutline: string; +export declare const mdiShieldSearch: string; +export declare const mdiShieldStar: string; +export declare const mdiShieldStarOutline: string; +export declare const mdiShieldSun: string; +export declare const mdiShieldSunOutline: string; +export declare const mdiShipWheel: string; +export declare const mdiShoeFormal: string; +export declare const mdiShoeHeel: string; +export declare const mdiShoePrint: string; +export declare const mdiShopify: string; +export declare const mdiShopping: string; +export declare const mdiShoppingMusic: string; +export declare const mdiShoppingOutline: string; +export declare const mdiShoppingSearch: string; +export declare const mdiShovel: string; +export declare const mdiShovelOff: string; +export declare const mdiShower: string; +export declare const mdiShowerHead: string; +export declare const mdiShredder: string; +export declare const mdiShuffle: string; +export declare const mdiShuffleDisabled: string; +export declare const mdiShuffleVariant: string; +export declare const mdiShuriken: string; +export declare const mdiSigma: string; +export declare const mdiSigmaLower: string; +export declare const mdiSignCaution: string; +export declare const mdiSignDirection: string; +export declare const mdiSignDirectionMinus: string; +export declare const mdiSignDirectionPlus: string; +export declare const mdiSignDirectionRemove: string; +export declare const mdiSignRealEstate: string; +export declare const mdiSignText: string; +export declare const mdiSignal: string; +export declare const mdiSignal2g: string; +export declare const mdiSignal3g: string; +export declare const mdiSignal4g: string; +export declare const mdiSignal5g: string; +export declare const mdiSignalCellular1: string; +export declare const mdiSignalCellular2: string; +export declare const mdiSignalCellular3: string; +export declare const mdiSignalCellularOutline: string; +export declare const mdiSignalDistanceVariant: string; +export declare const mdiSignalHspa: string; +export declare const mdiSignalHspaPlus: string; +export declare const mdiSignalOff: string; +export declare const mdiSignalVariant: string; +export declare const mdiSignature: string; +export declare const mdiSignatureFreehand: string; +export declare const mdiSignatureImage: string; +export declare const mdiSignatureText: string; +export declare const mdiSilo: string; +export declare const mdiSilverware: string; +export declare const mdiSilverwareClean: string; +export declare const mdiSilverwareFork: string; +export declare const mdiSilverwareForkKnife: string; +export declare const mdiSilverwareSpoon: string; +export declare const mdiSilverwareVariant: string; +export declare const mdiSim: string; +export declare const mdiSimAlert: string; +export declare const mdiSimOff: string; +export declare const mdiSimpleIcons: string; +export declare const mdiSinaWeibo: string; +export declare const mdiSitemap: string; +export declare const mdiSkate: string; +export declare const mdiSkewLess: string; +export declare const mdiSkewMore: string; +export declare const mdiSki: string; +export declare const mdiSkiCrossCountry: string; +export declare const mdiSkiWater: string; +export declare const mdiSkipBackward: string; +export declare const mdiSkipBackwardOutline: string; +export declare const mdiSkipForward: string; +export declare const mdiSkipForwardOutline: string; +export declare const mdiSkipNext: string; +export declare const mdiSkipNextCircle: string; +export declare const mdiSkipNextCircleOutline: string; +export declare const mdiSkipNextOutline: string; +export declare const mdiSkipPrevious: string; +export declare const mdiSkipPreviousCircle: string; +export declare const mdiSkipPreviousCircleOutline: string; +export declare const mdiSkipPreviousOutline: string; +export declare const mdiSkull: string; +export declare const mdiSkullCrossbones: string; +export declare const mdiSkullCrossbonesOutline: string; +export declare const mdiSkullOutline: string; +export declare const mdiSkype: string; +export declare const mdiSkypeBusiness: string; +export declare const mdiSlack: string; +export declare const mdiSlackware: string; +export declare const mdiSlashForward: string; +export declare const mdiSlashForwardBox: string; +export declare const mdiSleep: string; +export declare const mdiSleepOff: string; +export declare const mdiSlopeDownhill: string; +export declare const mdiSlopeUphill: string; +export declare const mdiSlotMachine: string; +export declare const mdiSlotMachineOutline: string; +export declare const mdiSmartCard: string; +export declare const mdiSmartCardOutline: string; +export declare const mdiSmartCardReader: string; +export declare const mdiSmartCardReaderOutline: string; +export declare const mdiSmog: string; +export declare const mdiSmokeDetector: string; +export declare const mdiSmoking: string; +export declare const mdiSmokingOff: string; +export declare const mdiSnapchat: string; +export declare const mdiSnowboard: string; +export declare const mdiSnowflake: string; +export declare const mdiSnowflakeAlert: string; +export declare const mdiSnowflakeMelt: string; +export declare const mdiSnowflakeVariant: string; +export declare const mdiSnowman: string; +export declare const mdiSoccer: string; +export declare const mdiSoccerField: string; +export declare const mdiSofa: string; +export declare const mdiSolarPanel: string; +export declare const mdiSolarPanelLarge: string; +export declare const mdiSolarPower: string; +export declare const mdiSolderingIron: string; +export declare const mdiSolid: string; +export declare const mdiSort: string; +export declare const mdiSortAlphabetical: string; +export declare const mdiSortAlphabeticalAscending: string; +export declare const mdiSortAlphabeticalDescending: string; +export declare const mdiSortAscending: string; +export declare const mdiSortDescending: string; +export declare const mdiSortNumeric: string; +export declare const mdiSortVariant: string; +export declare const mdiSortVariantLock: string; +export declare const mdiSortVariantLockOpen: string; +export declare const mdiSortVariantRemove: string; +export declare const mdiSoundcloud: string; +export declare const mdiSourceBranch: string; +export declare const mdiSourceCommit: string; +export declare const mdiSourceCommitEnd: string; +export declare const mdiSourceCommitEndLocal: string; +export declare const mdiSourceCommitLocal: string; +export declare const mdiSourceCommitNextLocal: string; +export declare const mdiSourceCommitStart: string; +export declare const mdiSourceCommitStartNextLocal: string; +export declare const mdiSourceFork: string; +export declare const mdiSourceMerge: string; +export declare const mdiSourcePull: string; +export declare const mdiSourceRepository: string; +export declare const mdiSourceRepositoryMultiple: string; +export declare const mdiSoySauce: string; +export declare const mdiSpa: string; +export declare const mdiSpaOutline: string; +export declare const mdiSpaceInvaders: string; +export declare const mdiSpaceStation: string; +export declare const mdiSpade: string; +export declare const mdiSpeaker: string; +export declare const mdiSpeakerBluetooth: string; +export declare const mdiSpeakerMultiple: string; +export declare const mdiSpeakerOff: string; +export declare const mdiSpeakerWireless: string; +export declare const mdiSpeedometer: string; +export declare const mdiSpeedometerMedium: string; +export declare const mdiSpeedometerSlow: string; +export declare const mdiSpellcheck: string; +export declare const mdiSpider: string; +export declare const mdiSpiderThread: string; +export declare const mdiSpiderWeb: string; +export declare const mdiSpotify: string; +export declare const mdiSpotlight: string; +export declare const mdiSpotlightBeam: string; +export declare const mdiSpray: string; +export declare const mdiSprayBottle: string; +export declare const mdiSprinkler: string; +export declare const mdiSprinklerVariant: string; +export declare const mdiSprout: string; +export declare const mdiSproutOutline: string; +export declare const mdiSquare: string; +export declare const mdiSquareEditOutline: string; +export declare const mdiSquareInc: string; +export declare const mdiSquareIncCash: string; +export declare const mdiSquareMedium: string; +export declare const mdiSquareMediumOutline: string; +export declare const mdiSquareOff: string; +export declare const mdiSquareOffOutline: string; +export declare const mdiSquareOutline: string; +export declare const mdiSquareRoot: string; +export declare const mdiSquareRootBox: string; +export declare const mdiSquareSmall: string; +export declare const mdiSqueegee: string; +export declare const mdiSsh: string; +export declare const mdiStackExchange: string; +export declare const mdiStackOverflow: string; +export declare const mdiStackpath: string; +export declare const mdiStadium: string; +export declare const mdiStadiumVariant: string; +export declare const mdiStairs: string; +export declare const mdiStairsDown: string; +export declare const mdiStairsUp: string; +export declare const mdiStamper: string; +export declare const mdiStandardDefinition: string; +export declare const mdiStar: string; +export declare const mdiStarBox: string; +export declare const mdiStarBoxMultiple: string; +export declare const mdiStarBoxMultipleOutline: string; +export declare const mdiStarBoxOutline: string; +export declare const mdiStarCircle: string; +export declare const mdiStarCircleOutline: string; +export declare const mdiStarFace: string; +export declare const mdiStarFourPoints: string; +export declare const mdiStarFourPointsOutline: string; +export declare const mdiStarHalf: string; +export declare const mdiStarOff: string; +export declare const mdiStarOutline: string; +export declare const mdiStarThreePoints: string; +export declare const mdiStarThreePointsOutline: string; +export declare const mdiStateMachine: string; +export declare const mdiSteam: string; +export declare const mdiSteamBox: string; +export declare const mdiSteering: string; +export declare const mdiSteeringOff: string; +export declare const mdiStepBackward: string; +export declare const mdiStepBackward2: string; +export declare const mdiStepForward: string; +export declare const mdiStepForward2: string; +export declare const mdiStethoscope: string; +export declare const mdiSticker: string; +export declare const mdiStickerAlert: string; +export declare const mdiStickerAlertOutline: string; +export declare const mdiStickerCheck: string; +export declare const mdiStickerCheckOutline: string; +export declare const mdiStickerCircleOutline: string; +export declare const mdiStickerEmoji: string; +export declare const mdiStickerMinus: string; +export declare const mdiStickerMinusOutline: string; +export declare const mdiStickerOutline: string; +export declare const mdiStickerPlus: string; +export declare const mdiStickerPlusOutline: string; +export declare const mdiStickerRemove: string; +export declare const mdiStickerRemoveOutline: string; +export declare const mdiStocking: string; +export declare const mdiStomach: string; +export declare const mdiStop: string; +export declare const mdiStopCircle: string; +export declare const mdiStopCircleOutline: string; +export declare const mdiStore: string; +export declare const mdiStore24Hour: string; +export declare const mdiStoreOutline: string; +export declare const mdiStorefront: string; +export declare const mdiStove: string; +export declare const mdiStrategy: string; +export declare const mdiStrava: string; +export declare const mdiStretchToPage: string; +export declare const mdiStretchToPageOutline: string; +export declare const mdiStringLights: string; +export declare const mdiStringLightsOff: string; +export declare const mdiSubdirectoryArrowLeft: string; +export declare const mdiSubdirectoryArrowRight: string; +export declare const mdiSubtitles: string; +export declare const mdiSubtitlesOutline: string; +export declare const mdiSubway: string; +export declare const mdiSubwayAlertVariant: string; +export declare const mdiSubwayVariant: string; +export declare const mdiSummit: string; +export declare const mdiSunglasses: string; +export declare const mdiSurroundSound: string; +export declare const mdiSurroundSound20: string; +export declare const mdiSurroundSound31: string; +export declare const mdiSurroundSound51: string; +export declare const mdiSurroundSound71: string; +export declare const mdiSvg: string; +export declare const mdiSwapHorizontal: string; +export declare const mdiSwapHorizontalBold: string; +export declare const mdiSwapHorizontalCircle: string; +export declare const mdiSwapHorizontalCircleOutline: string; +export declare const mdiSwapHorizontalVariant: string; +export declare const mdiSwapVertical: string; +export declare const mdiSwapVerticalBold: string; +export declare const mdiSwapVerticalCircle: string; +export declare const mdiSwapVerticalCircleOutline: string; +export declare const mdiSwapVerticalVariant: string; +export declare const mdiSwim: string; +export declare const mdiSwitch: string; +export declare const mdiSword: string; +export declare const mdiSwordCross: string; +export declare const mdiSyllabaryHangul: string; +export declare const mdiSyllabaryHiragana: string; +export declare const mdiSyllabaryKatakana: string; +export declare const mdiSyllabaryKatakanaHalfWidth: string; +export declare const mdiSymfony: string; +export declare const mdiSync: string; +export declare const mdiSyncAlert: string; +export declare const mdiSyncCircle: string; +export declare const mdiSyncOff: string; +export declare const mdiTab: string; +export declare const mdiTabMinus: string; +export declare const mdiTabPlus: string; +export declare const mdiTabRemove: string; +export declare const mdiTabUnselected: string; +export declare const mdiTable: string; +export declare const mdiTableBorder: string; +export declare const mdiTableChair: string; +export declare const mdiTableColumn: string; +export declare const mdiTableColumnPlusAfter: string; +export declare const mdiTableColumnPlusBefore: string; +export declare const mdiTableColumnRemove: string; +export declare const mdiTableColumnWidth: string; +export declare const mdiTableEdit: string; +export declare const mdiTableEye: string; +export declare const mdiTableHeadersEye: string; +export declare const mdiTableHeadersEyeOff: string; +export declare const mdiTableLarge: string; +export declare const mdiTableLargePlus: string; +export declare const mdiTableLargeRemove: string; +export declare const mdiTableMergeCells: string; +export declare const mdiTableOfContents: string; +export declare const mdiTablePlus: string; +export declare const mdiTableRemove: string; +export declare const mdiTableRow: string; +export declare const mdiTableRowHeight: string; +export declare const mdiTableRowPlusAfter: string; +export declare const mdiTableRowPlusBefore: string; +export declare const mdiTableRowRemove: string; +export declare const mdiTableSearch: string; +export declare const mdiTableSettings: string; +export declare const mdiTableTennis: string; +export declare const mdiTablet: string; +export declare const mdiTabletAndroid: string; +export declare const mdiTabletCellphone: string; +export declare const mdiTabletDashboard: string; +export declare const mdiTabletIpad: string; +export declare const mdiTaco: string; +export declare const mdiTag: string; +export declare const mdiTagFaces: string; +export declare const mdiTagHeart: string; +export declare const mdiTagHeartOutline: string; +export declare const mdiTagMinus: string; +export declare const mdiTagMinusOutline: string; +export declare const mdiTagMultiple: string; +export declare const mdiTagMultipleOutline: string; +export declare const mdiTagOff: string; +export declare const mdiTagOffOutline: string; +export declare const mdiTagOutline: string; +export declare const mdiTagPlus: string; +export declare const mdiTagPlusOutline: string; +export declare const mdiTagRemove: string; +export declare const mdiTagRemoveOutline: string; +export declare const mdiTagText: string; +export declare const mdiTagTextOutline: string; +export declare const mdiTank: string; +export declare const mdiTankerTruck: string; +export declare const mdiTapeMeasure: string; +export declare const mdiTarget: string; +export declare const mdiTargetAccount: string; +export declare const mdiTargetVariant: string; +export declare const mdiTaxi: string; +export declare const mdiTea: string; +export declare const mdiTeaOutline: string; +export declare const mdiTeach: string; +export declare const mdiTeamviewer: string; +export declare const mdiTelegram: string; +export declare const mdiTelescope: string; +export declare const mdiTelevision: string; +export declare const mdiTelevisionAmbientLight: string; +export declare const mdiTelevisionBox: string; +export declare const mdiTelevisionClassic: string; +export declare const mdiTelevisionClassicOff: string; +export declare const mdiTelevisionClean: string; +export declare const mdiTelevisionGuide: string; +export declare const mdiTelevisionOff: string; +export declare const mdiTelevisionPause: string; +export declare const mdiTelevisionPlay: string; +export declare const mdiTelevisionStop: string; +export declare const mdiTemperatureCelsius: string; +export declare const mdiTemperatureFahrenheit: string; +export declare const mdiTemperatureKelvin: string; +export declare const mdiTennis: string; +export declare const mdiTennisBall: string; +export declare const mdiTent: string; +export declare const mdiTerraform: string; +export declare const mdiTerrain: string; +export declare const mdiTestTube: string; +export declare const mdiTestTubeEmpty: string; +export declare const mdiTestTubeOff: string; +export declare const mdiText: string; +export declare const mdiTextRecognition: string; +export declare const mdiTextShadow: string; +export declare const mdiTextShort: string; +export declare const mdiTextSubject: string; +export declare const mdiTextToSpeech: string; +export declare const mdiTextToSpeechOff: string; +export declare const mdiTextarea: string; +export declare const mdiTextbox: string; +export declare const mdiTextboxLock: string; +export declare const mdiTextboxPassword: string; +export declare const mdiTexture: string; +export declare const mdiTextureBox: string; +export declare const mdiTheater: string; +export declare const mdiThemeLightDark: string; +export declare const mdiThermometer: string; +export declare const mdiThermometerAlert: string; +export declare const mdiThermometerChevronDown: string; +export declare const mdiThermometerChevronUp: string; +export declare const mdiThermometerHigh: string; +export declare const mdiThermometerLines: string; +export declare const mdiThermometerLow: string; +export declare const mdiThermometerMinus: string; +export declare const mdiThermometerPlus: string; +export declare const mdiThermostat: string; +export declare const mdiThermostatBox: string; +export declare const mdiThoughtBubble: string; +export declare const mdiThoughtBubbleOutline: string; +export declare const mdiThumbDown: string; +export declare const mdiThumbDownOutline: string; +export declare const mdiThumbUp: string; +export declare const mdiThumbUpOutline: string; +export declare const mdiThumbsUpDown: string; +export declare const mdiTicket: string; +export declare const mdiTicketAccount: string; +export declare const mdiTicketConfirmation: string; +export declare const mdiTicketOutline: string; +export declare const mdiTicketPercent: string; +export declare const mdiTie: string; +export declare const mdiTilde: string; +export declare const mdiTimelapse: string; +export declare const mdiTimeline: string; +export declare const mdiTimelineAlert: string; +export declare const mdiTimelineAlertOutline: string; +export declare const mdiTimelineClock: string; +export declare const mdiTimelineClockOutline: string; +export declare const mdiTimelineHelp: string; +export declare const mdiTimelineHelpOutline: string; +export declare const mdiTimelineOutline: string; +export declare const mdiTimelinePlus: string; +export declare const mdiTimelinePlusOutline: string; +export declare const mdiTimelineText: string; +export declare const mdiTimelineTextOutline: string; +export declare const mdiTimer: string; +export declare const mdiTimer10: string; +export declare const mdiTimer3: string; +export declare const mdiTimerOff: string; +export declare const mdiTimerSand: string; +export declare const mdiTimerSandEmpty: string; +export declare const mdiTimerSandFull: string; +export declare const mdiTimetable: string; +export declare const mdiToaster: string; +export declare const mdiToasterOff: string; +export declare const mdiToasterOven: string; +export declare const mdiToggleSwitch: string; +export declare const mdiToggleSwitchOff: string; +export declare const mdiToggleSwitchOffOutline: string; +export declare const mdiToggleSwitchOutline: string; +export declare const mdiToilet: string; +export declare const mdiToolbox: string; +export declare const mdiToolboxOutline: string; +export declare const mdiTools: string; +export declare const mdiTooltip: string; +export declare const mdiTooltipAccount: string; +export declare const mdiTooltipEdit: string; +export declare const mdiTooltipEditOutline: string; +export declare const mdiTooltipImage: string; +export declare const mdiTooltipImageOutline: string; +export declare const mdiTooltipOutline: string; +export declare const mdiTooltipPlus: string; +export declare const mdiTooltipPlusOutline: string; +export declare const mdiTooltipText: string; +export declare const mdiTooltipTextOutline: string; +export declare const mdiTooth: string; +export declare const mdiToothOutline: string; +export declare const mdiToothbrush: string; +export declare const mdiToothbrushElectric: string; +export declare const mdiToothbrushPaste: string; +export declare const mdiTor: string; +export declare const mdiTortoise: string; +export declare const mdiToslink: string; +export declare const mdiTournament: string; +export declare const mdiTowerBeach: string; +export declare const mdiTowerFire: string; +export declare const mdiTowing: string; +export declare const mdiToyBrick: string; +export declare const mdiToyBrickMarker: string; +export declare const mdiToyBrickMarkerOutline: string; +export declare const mdiToyBrickMinus: string; +export declare const mdiToyBrickMinusOutline: string; +export declare const mdiToyBrickOutline: string; +export declare const mdiToyBrickPlus: string; +export declare const mdiToyBrickPlusOutline: string; +export declare const mdiToyBrickRemove: string; +export declare const mdiToyBrickRemoveOutline: string; +export declare const mdiToyBrickSearch: string; +export declare const mdiToyBrickSearchOutline: string; +export declare const mdiTrackLight: string; +export declare const mdiTrackpad: string; +export declare const mdiTrackpadLock: string; +export declare const mdiTractor: string; +export declare const mdiTrademark: string; +export declare const mdiTrafficCone: string; +export declare const mdiTrafficLight: string; +export declare const mdiTrain: string; +export declare const mdiTrainCar: string; +export declare const mdiTrainVariant: string; +export declare const mdiTram: string; +export declare const mdiTramSide: string; +export declare const mdiTranscribe: string; +export declare const mdiTranscribeClose: string; +export declare const mdiTransfer: string; +export declare const mdiTransferDown: string; +export declare const mdiTransferLeft: string; +export declare const mdiTransferRight: string; +export declare const mdiTransferUp: string; +export declare const mdiTransitConnection: string; +export declare const mdiTransitConnectionVariant: string; +export declare const mdiTransitDetour: string; +export declare const mdiTransitTransfer: string; +export declare const mdiTransition: string; +export declare const mdiTransitionMasked: string; +export declare const mdiTranslate: string; +export declare const mdiTranslateOff: string; +export declare const mdiTransmissionTower: string; +export declare const mdiTrashCan: string; +export declare const mdiTrashCanOutline: string; +export declare const mdiTray: string; +export declare const mdiTrayAlert: string; +export declare const mdiTrayFull: string; +export declare const mdiTrayMinus: string; +export declare const mdiTrayPlus: string; +export declare const mdiTrayRemove: string; +export declare const mdiTreasureChest: string; +export declare const mdiTree: string; +export declare const mdiTreeOutline: string; +export declare const mdiTrello: string; +export declare const mdiTrendingDown: string; +export declare const mdiTrendingNeutral: string; +export declare const mdiTrendingUp: string; +export declare const mdiTriangle: string; +export declare const mdiTriangleOutline: string; +export declare const mdiTriforce: string; +export declare const mdiTrophy: string; +export declare const mdiTrophyAward: string; +export declare const mdiTrophyBroken: string; +export declare const mdiTrophyOutline: string; +export declare const mdiTrophyVariant: string; +export declare const mdiTrophyVariantOutline: string; +export declare const mdiTruck: string; +export declare const mdiTruckCheck: string; +export declare const mdiTruckCheckOutline: string; +export declare const mdiTruckDelivery: string; +export declare const mdiTruckDeliveryOutline: string; +export declare const mdiTruckFast: string; +export declare const mdiTruckFastOutline: string; +export declare const mdiTruckOutline: string; +export declare const mdiTruckTrailer: string; +export declare const mdiTrumpet: string; +export declare const mdiTshirtCrew: string; +export declare const mdiTshirtCrewOutline: string; +export declare const mdiTshirtV: string; +export declare const mdiTshirtVOutline: string; +export declare const mdiTumbleDryer: string; +export declare const mdiTumbleDryerAlert: string; +export declare const mdiTumbleDryerOff: string; +export declare const mdiTumblr: string; +export declare const mdiTumblrBox: string; +export declare const mdiTumblrReblog: string; +export declare const mdiTune: string; +export declare const mdiTuneVertical: string; +export declare const mdiTurnstile: string; +export declare const mdiTurnstileOutline: string; +export declare const mdiTurtle: string; +export declare const mdiTwitch: string; +export declare const mdiTwitter: string; +export declare const mdiTwitterBox: string; +export declare const mdiTwitterCircle: string; +export declare const mdiTwitterRetweet: string; +export declare const mdiTwoFactorAuthentication: string; +export declare const mdiTypewriter: string; +export declare const mdiUber: string; +export declare const mdiUbisoft: string; +export declare const mdiUbuntu: string; +export declare const mdiUfo: string; +export declare const mdiUfoOutline: string; +export declare const mdiUltraHighDefinition: string; +export declare const mdiUmbraco: string; +export declare const mdiUmbrella: string; +export declare const mdiUmbrellaClosed: string; +export declare const mdiUmbrellaOutline: string; +export declare const mdiUndo: string; +export declare const mdiUndoVariant: string; +export declare const mdiUnfoldLessHorizontal: string; +export declare const mdiUnfoldLessVertical: string; +export declare const mdiUnfoldMoreHorizontal: string; +export declare const mdiUnfoldMoreVertical: string; +export declare const mdiUngroup: string; +export declare const mdiUnicode: string; +export declare const mdiUnity: string; +export declare const mdiUnreal: string; +export declare const mdiUntappd: string; +export declare const mdiUpdate: string; +export declare const mdiUpload: string; +export declare const mdiUploadLock: string; +export declare const mdiUploadLockOutline: string; +export declare const mdiUploadMultiple: string; +export declare const mdiUploadNetwork: string; +export declare const mdiUploadNetworkOutline: string; +export declare const mdiUploadOff: string; +export declare const mdiUploadOffOutline: string; +export declare const mdiUploadOutline: string; +export declare const mdiUsb: string; +export declare const mdiUsbFlashDrive: string; +export declare const mdiUsbFlashDriveOutline: string; +export declare const mdiUsbPort: string; +export declare const mdiValve: string; +export declare const mdiValveClosed: string; +export declare const mdiValveOpen: string; +export declare const mdiVanPassenger: string; +export declare const mdiVanUtility: string; +export declare const mdiVanish: string; +export declare const mdiVanityLight: string; +export declare const mdiVariable: string; +export declare const mdiVariableBox: string; +export declare const mdiVectorArrangeAbove: string; +export declare const mdiVectorArrangeBelow: string; +export declare const mdiVectorBezier: string; +export declare const mdiVectorCircle: string; +export declare const mdiVectorCircleVariant: string; +export declare const mdiVectorCombine: string; +export declare const mdiVectorCurve: string; +export declare const mdiVectorDifference: string; +export declare const mdiVectorDifferenceAb: string; +export declare const mdiVectorDifferenceBa: string; +export declare const mdiVectorEllipse: string; +export declare const mdiVectorIntersection: string; +export declare const mdiVectorLine: string; +export declare const mdiVectorLink: string; +export declare const mdiVectorPoint: string; +export declare const mdiVectorPolygon: string; +export declare const mdiVectorPolyline: string; +export declare const mdiVectorPolylineEdit: string; +export declare const mdiVectorPolylineMinus: string; +export declare const mdiVectorPolylinePlus: string; +export declare const mdiVectorPolylineRemove: string; +export declare const mdiVectorRadius: string; +export declare const mdiVectorRectangle: string; +export declare const mdiVectorSelection: string; +export declare const mdiVectorSquare: string; +export declare const mdiVectorTriangle: string; +export declare const mdiVectorUnion: string; +export declare const mdiVenmo: string; +export declare const mdiVhs: string; +export declare const mdiVibrate: string; +export declare const mdiVibrateOff: string; +export declare const mdiVideo: string; +export declare const mdiVideo3d: string; +export declare const mdiVideo3dVariant: string; +export declare const mdiVideo4kBox: string; +export declare const mdiVideoAccount: string; +export declare const mdiVideoCheck: string; +export declare const mdiVideoCheckOutline: string; +export declare const mdiVideoImage: string; +export declare const mdiVideoInputAntenna: string; +export declare const mdiVideoInputComponent: string; +export declare const mdiVideoInputHdmi: string; +export declare const mdiVideoInputScart: string; +export declare const mdiVideoInputSvideo: string; +export declare const mdiVideoMinus: string; +export declare const mdiVideoOff: string; +export declare const mdiVideoOffOutline: string; +export declare const mdiVideoOutline: string; +export declare const mdiVideoPlus: string; +export declare const mdiVideoStabilization: string; +export declare const mdiVideoSwitch: string; +export declare const mdiVideoVintage: string; +export declare const mdiVideoWireless: string; +export declare const mdiVideoWirelessOutline: string; +export declare const mdiViewAgenda: string; +export declare const mdiViewAgendaOutline: string; +export declare const mdiViewArray: string; +export declare const mdiViewCarousel: string; +export declare const mdiViewColumn: string; +export declare const mdiViewComfy: string; +export declare const mdiViewCompact: string; +export declare const mdiViewCompactOutline: string; +export declare const mdiViewDashboard: string; +export declare const mdiViewDashboardOutline: string; +export declare const mdiViewDashboardVariant: string; +export declare const mdiViewDay: string; +export declare const mdiViewGrid: string; +export declare const mdiViewGridOutline: string; +export declare const mdiViewGridPlus: string; +export declare const mdiViewGridPlusOutline: string; +export declare const mdiViewHeadline: string; +export declare const mdiViewList: string; +export declare const mdiViewModule: string; +export declare const mdiViewParallel: string; +export declare const mdiViewQuilt: string; +export declare const mdiViewSequential: string; +export declare const mdiViewSplitHorizontal: string; +export declare const mdiViewSplitVertical: string; +export declare const mdiViewStream: string; +export declare const mdiViewWeek: string; +export declare const mdiVimeo: string; +export declare const mdiViolin: string; +export declare const mdiVirtualReality: string; +export declare const mdiVisualStudio: string; +export declare const mdiVisualStudioCode: string; +export declare const mdiVk: string; +export declare const mdiVkBox: string; +export declare const mdiVkCircle: string; +export declare const mdiVlc: string; +export declare const mdiVoice: string; +export declare const mdiVoiceOff: string; +export declare const mdiVoicemail: string; +export declare const mdiVolleyball: string; +export declare const mdiVolumeHigh: string; +export declare const mdiVolumeLow: string; +export declare const mdiVolumeMedium: string; +export declare const mdiVolumeMinus: string; +export declare const mdiVolumeMute: string; +export declare const mdiVolumeOff: string; +export declare const mdiVolumePlus: string; +export declare const mdiVolumeSource: string; +export declare const mdiVolumeVariantOff: string; +export declare const mdiVolumeVibrate: string; +export declare const mdiVote: string; +export declare const mdiVoteOutline: string; +export declare const mdiVpn: string; +export declare const mdiVuejs: string; +export declare const mdiVuetify: string; +export declare const mdiWalk: string; +export declare const mdiWall: string; +export declare const mdiWallSconce: string; +export declare const mdiWallSconceFlat: string; +export declare const mdiWallSconceVariant: string; +export declare const mdiWallet: string; +export declare const mdiWalletGiftcard: string; +export declare const mdiWalletMembership: string; +export declare const mdiWalletOutline: string; +export declare const mdiWalletPlus: string; +export declare const mdiWalletPlusOutline: string; +export declare const mdiWalletTravel: string; +export declare const mdiWallpaper: string; +export declare const mdiWan: string; +export declare const mdiWardrobe: string; +export declare const mdiWardrobeOutline: string; +export declare const mdiWarehouse: string; +export declare const mdiWashingMachine: string; +export declare const mdiWashingMachineAlert: string; +export declare const mdiWashingMachineOff: string; +export declare const mdiWatch: string; +export declare const mdiWatchExport: string; +export declare const mdiWatchExportVariant: string; +export declare const mdiWatchImport: string; +export declare const mdiWatchImportVariant: string; +export declare const mdiWatchVariant: string; +export declare const mdiWatchVibrate: string; +export declare const mdiWatchVibrateOff: string; +export declare const mdiWater: string; +export declare const mdiWaterBoiler: string; +export declare const mdiWaterBoilerAlert: string; +export declare const mdiWaterBoilerOff: string; +export declare const mdiWaterOff: string; +export declare const mdiWaterOutline: string; +export declare const mdiWaterPercent: string; +export declare const mdiWaterPolo: string; +export declare const mdiWaterPump: string; +export declare const mdiWaterPumpOff: string; +export declare const mdiWaterWell: string; +export declare const mdiWaterWellOutline: string; +export declare const mdiWatermark: string; +export declare const mdiWave: string; +export declare const mdiWaves: string; +export declare const mdiWaze: string; +export declare const mdiWeatherCloudy: string; +export declare const mdiWeatherCloudyAlert: string; +export declare const mdiWeatherCloudyArrowRight: string; +export declare const mdiWeatherFog: string; +export declare const mdiWeatherHail: string; +export declare const mdiWeatherHazy: string; +export declare const mdiWeatherHurricane: string; +export declare const mdiWeatherLightning: string; +export declare const mdiWeatherLightningRainy: string; +export declare const mdiWeatherNight: string; +export declare const mdiWeatherNightPartlyCloudy: string; +export declare const mdiWeatherPartlyCloudy: string; +export declare const mdiWeatherPartlyLightning: string; +export declare const mdiWeatherPartlyRainy: string; +export declare const mdiWeatherPartlySnowy: string; +export declare const mdiWeatherPartlySnowyRainy: string; +export declare const mdiWeatherPouring: string; +export declare const mdiWeatherRainy: string; +export declare const mdiWeatherSnowy: string; +export declare const mdiWeatherSnowyHeavy: string; +export declare const mdiWeatherSnowyRainy: string; +export declare const mdiWeatherSunny: string; +export declare const mdiWeatherSunnyAlert: string; +export declare const mdiWeatherSunset: string; +export declare const mdiWeatherSunsetDown: string; +export declare const mdiWeatherSunsetUp: string; +export declare const mdiWeatherTornado: string; +export declare const mdiWeatherWindy: string; +export declare const mdiWeatherWindyVariant: string; +export declare const mdiWeb: string; +export declare const mdiWebBox: string; +export declare const mdiWebClock: string; +export declare const mdiWebcam: string; +export declare const mdiWebhook: string; +export declare const mdiWebpack: string; +export declare const mdiWebrtc: string; +export declare const mdiWechat: string; +export declare const mdiWeight: string; +export declare const mdiWeightGram: string; +export declare const mdiWeightKilogram: string; +export declare const mdiWeightLifter: string; +export declare const mdiWeightPound: string; +export declare const mdiWhatsapp: string; +export declare const mdiWheelchairAccessibility: string; +export declare const mdiWhistle: string; +export declare const mdiWhistleOutline: string; +export declare const mdiWhiteBalanceAuto: string; +export declare const mdiWhiteBalanceIncandescent: string; +export declare const mdiWhiteBalanceIridescent: string; +export declare const mdiWhiteBalanceSunny: string; +export declare const mdiWidgets: string; +export declare const mdiWidgetsOutline: string; +export declare const mdiWifi: string; +export declare const mdiWifiOff: string; +export declare const mdiWifiStar: string; +export declare const mdiWifiStrength1: string; +export declare const mdiWifiStrength1Alert: string; +export declare const mdiWifiStrength1Lock: string; +export declare const mdiWifiStrength2: string; +export declare const mdiWifiStrength2Alert: string; +export declare const mdiWifiStrength2Lock: string; +export declare const mdiWifiStrength3: string; +export declare const mdiWifiStrength3Alert: string; +export declare const mdiWifiStrength3Lock: string; +export declare const mdiWifiStrength4: string; +export declare const mdiWifiStrength4Alert: string; +export declare const mdiWifiStrength4Lock: string; +export declare const mdiWifiStrengthAlertOutline: string; +export declare const mdiWifiStrengthLockOutline: string; +export declare const mdiWifiStrengthOff: string; +export declare const mdiWifiStrengthOffOutline: string; +export declare const mdiWifiStrengthOutline: string; +export declare const mdiWii: string; +export declare const mdiWiiu: string; +export declare const mdiWikipedia: string; +export declare const mdiWindTurbine: string; +export declare const mdiWindowClose: string; +export declare const mdiWindowClosed: string; +export declare const mdiWindowClosedVariant: string; +export declare const mdiWindowMaximize: string; +export declare const mdiWindowMinimize: string; +export declare const mdiWindowOpen: string; +export declare const mdiWindowOpenVariant: string; +export declare const mdiWindowRestore: string; +export declare const mdiWindowShutter: string; +export declare const mdiWindowShutterAlert: string; +export declare const mdiWindowShutterOpen: string; +export declare const mdiWindows: string; +export declare const mdiWindowsClassic: string; +export declare const mdiWiper: string; +export declare const mdiWiperWash: string; +export declare const mdiWordpress: string; +export declare const mdiWorker: string; +export declare const mdiWrap: string; +export declare const mdiWrapDisabled: string; +export declare const mdiWrench: string; +export declare const mdiWrenchOutline: string; +export declare const mdiWunderlist: string; +export declare const mdiXamarin: string; +export declare const mdiXamarinOutline: string; +export declare const mdiXaml: string; +export declare const mdiXbox: string; +export declare const mdiXboxController: string; +export declare const mdiXboxControllerBatteryAlert: string; +export declare const mdiXboxControllerBatteryCharging: string; +export declare const mdiXboxControllerBatteryEmpty: string; +export declare const mdiXboxControllerBatteryFull: string; +export declare const mdiXboxControllerBatteryLow: string; +export declare const mdiXboxControllerBatteryMedium: string; +export declare const mdiXboxControllerBatteryUnknown: string; +export declare const mdiXboxControllerMenu: string; +export declare const mdiXboxControllerOff: string; +export declare const mdiXboxControllerView: string; +export declare const mdiXda: string; +export declare const mdiXing: string; +export declare const mdiXingBox: string; +export declare const mdiXingCircle: string; +export declare const mdiXml: string; +export declare const mdiXmpp: string; +export declare const mdiYahoo: string; +export declare const mdiYammer: string; +export declare const mdiYeast: string; +export declare const mdiYelp: string; +export declare const mdiYinYang: string; +export declare const mdiYoga: string; +export declare const mdiYoutube: string; +export declare const mdiYoutubeCreatorStudio: string; +export declare const mdiYoutubeGaming: string; +export declare const mdiYoutubeSubscription: string; +export declare const mdiYoutubeTv: string; +export declare const mdiZWave: string; +export declare const mdiZend: string; +export declare const mdiZigbee: string; +export declare const mdiZipBox: string; +export declare const mdiZipBoxOutline: string; +export declare const mdiZipDisk: string; +export declare const mdiZodiacAquarius: string; +export declare const mdiZodiacAries: string; +export declare const mdiZodiacCancer: string; +export declare const mdiZodiacCapricorn: string; +export declare const mdiZodiacGemini: string; +export declare const mdiZodiacLeo: string; +export declare const mdiZodiacLibra: string; +export declare const mdiZodiacPisces: string; +export declare const mdiZodiacSagittarius: string; +export declare const mdiZodiacScorpio: string; +export declare const mdiZodiacTaurus: string; +export declare const mdiZodiacVirgo: string;" 1b873b101c2e7623fc1839e75050a59049beafc3,2022-02-28 19:43:13,Razvan Stoenescu,feat(cli): upgrade command should take into account q/app to q/app-webpack rename,False,upgrade command should take into account q/app to q/app-webpack rename,feat,"diff --git a/cli/bin/quasar-upgrade b/cli/bin/quasar-upgrade index cf66495e92f..b3554231972 100755 --- a/cli/bin/quasar-upgrade +++ b/cli/bin/quasar-upgrade @@ -122,6 +122,7 @@ function upgradeQuasar () { console.log() let updateAvailable = false + let removeDeprecatedAppPkg = false for (const type of Object.keys(deps)) { for (const packageName of Object.keys(pkg[type] || {})) { @@ -135,6 +136,12 @@ function upgradeQuasar () { ? json.version : null + // q/app has been renamed to q/app-webpack + if (packageName === '@quasar/app') { + removeDeprecatedAppPkg = true + packageName = '@quasar/app-webpack' + } + const latestVersion = getLatestVersion(packager, packageName, curVersion) const current = curVersion === null @@ -180,6 +187,19 @@ function upgradeQuasar () { const { removeSync } = require('fs-extra') const spawn = require('../lib/spawn') + if (removeDeprecatedAppPkg === true) { + const params = packager === 'yarn' + ? [ 'remove', '@quasar/app' ] + : [ 'uninstall', '--save--dev', '@quasar/app' ] + + // need to delete tha package otherwise + // installing the new version might fail on Windows + removeSync(path.join(root, 'node_modules/@quasar/app')) + + console.log() + spawn(packager, params, root) + } + for (const type of Object.keys(deps)) { if (deps[type].length === 0) { continue @@ -212,4 +232,3 @@ function upgradeQuasar () { } upgradeQuasar() -" a2199f945f8b0102eb1e35122229d0f91fbb17b5,2024-11-09 18:25:28,Razvan Stoenescu,feat(app-vite): use Vite 6 Environment API for SSR,False,use Vite 6 Environment API for SSR,feat,"diff --git a/app-vite/lib/modes/ssr/ssr-config.js b/app-vite/lib/modes/ssr/ssr-config.js index b68a8b84490..cdf59eaf2a1 100644 --- a/app-vite/lib/modes/ssr/ssr-config.js +++ b/app-vite/lib/modes/ssr/ssr-config.js @@ -56,6 +56,7 @@ export const quasarSsrConfig = { viteServer: async quasarConf => { let cfg = await createViteConfig(quasarConf, { compileId: 'vite-ssr-server' }) const { appPaths } = quasarConf.ctx + const ssrEntryFile = appPaths.resolve.entry('server-entry.mjs') cfg = mergeViteConfig(cfg, { target: quasarConf.build.target.node, @@ -72,7 +73,10 @@ export const quasarSsrConfig = { server: { ws: false, // let client config deal with it hmr: false, // let client config deal with it - middlewareMode: true + middlewareMode: true, + warmup: { + ssrFiles: [ ssrEntryFile ] + } }, ssr: { // we don't externalize ourselves because of @@ -83,7 +87,7 @@ export const quasarSsrConfig = { ssr: true, outDir: join(quasarConf.build.distDir, 'server'), rollupOptions: { - input: appPaths.resolve.entry('server-entry.mjs') + input: ssrEntryFile } } }) diff --git a/app-vite/lib/modes/ssr/ssr-devserver.js b/app-vite/lib/modes/ssr/ssr-devserver.js index 0635733771f..7aab856c484 100644 --- a/app-vite/lib/modes/ssr/ssr-devserver.js +++ b/app-vite/lib/modes/ssr/ssr-devserver.js @@ -1,7 +1,7 @@ import { readFileSync } from 'node:fs' import { join, isAbsolute } from 'node:path' import { pathToFileURL } from 'node:url' -import { createServer } from 'vite' +import { createServer, createServerModuleRunner } from 'vite' import chokidar from 'chokidar' import debounce from 'lodash/debounce.js' import serialize from 'serialize-javascript' @@ -24,7 +24,9 @@ function logServerMessage (title, msg, additional) { info(`${ msg }${ additional !== void 0 ? ` ${ green(dot) } ${ additional }` : '' }`, title) } -let renderSSRError +let renderSSRError = null +let vueRenderToString = null + function renderError ({ err, req, res }) { log() warn(req.url, 'Render failed') @@ -32,27 +34,6 @@ function renderError ({ err, req, res }) { renderSSRError({ err, req, res }) } -async function warmupServer ({ viteClient, viteServer, clientEntry, serverEntry }) { - const done = progress('Warming up...') - - if (renderSSRError === void 0) { - const { default: render } = await import('@quasar/render-ssr-error') - renderSSRError = render - } - - try { - await viteServer.ssrLoadModule(serverEntry) - await viteClient.transformRequest(clientEntry) - } - catch (err) { - warn('Warmup failed!', 'FAIL') - console.error(err) - return - } - - done('Warmed up') -} - function renderStoreState (ssrContext) { const nonce = ssrContext.nonce !== void 0 ? ` nonce=""${ ssrContext.nonce }""` @@ -63,11 +44,11 @@ function renderStoreState (ssrContext) { } export class QuasarModeDevserver extends AppDevserver { - #closeWebserver - #viteClient - #viteServer - #htmlWatcher - #webserverWatcher + #webserver = null + #viteClient = null + #viteWatcherList = [] + #webserverWatcher = null + /** * @type {{ * port: number; @@ -83,7 +64,6 @@ export class QuasarModeDevserver extends AppDevserver { #pwaServiceWorkerWatcher #pathMap = {} - #vueRenderToString = null constructor (opts) { super(opts) @@ -171,29 +151,36 @@ export class QuasarModeDevserver extends AppDevserver { } async #compileWebserver (quasarConf, queue) { - if (this.#webserverWatcher) { + if (this.#webserverWatcher !== null) { await this.#webserverWatcher.close() } const esbuildConfig = await quasarSsrConfig.webserver(quasarConf) await this.watchWithEsbuild('SSR Webserver', esbuildConfig, () => { - if (this.#closeWebserver !== void 0) { - queue(async () => { - await this.#closeWebserver() - return this.#bootWebserver(quasarConf) - }) - } + queue(() => this.#bootWebserver(quasarConf)) }).then(esbuildCtx => { - this.#webserverWatcher = { close: esbuildCtx.dispose } + this.#webserverWatcher = { + close: () => { + this.#webserverWatcher = null + return esbuildCtx.dispose() + } + } }) } async #runVite (quasarConf, urlDiffers) { - if (this.#closeWebserver !== void 0) { - this.#htmlWatcher.close() - this.#viteClient.close() - this.#viteServer.close() - await this.#closeWebserver() + while (this.#viteWatcherList.length !== 0) { + await this.#viteWatcherList.pop().close() + } + + if (renderSSRError === null) { + const { default: render } = await import('@quasar/render-ssr-error') + renderSSRError = render + } + + if (vueRenderToString === null) { + const { renderToString } = await getPackage('vue/server-renderer', quasarConf.ctx.appPaths.appDir) + vueRenderToString = renderToString } this.#appOptions.port = quasarConf.devServer.port @@ -204,7 +191,15 @@ export class QuasarModeDevserver extends AppDevserver { : url => (url ? (publicPath + url).replace(doubleSlashRE, '/') : publicPath) const viteClient = this.#viteClient = await createServer(await quasarSsrConfig.viteClient(quasarConf)) - const viteServer = this.#viteServer = await createServer(await quasarSsrConfig.viteServer(quasarConf)) + this.#viteWatcherList.push({ + close: () => { + this.#viteClient = null + return viteClient.close() + } + }) + + const viteServer = await createServer(await quasarSsrConfig.viteServer(quasarConf)) + this.#viteWatcherList.push(viteServer) if (quasarConf.ssr.pwa === true) { injectPwaManifest(quasarConf, true) @@ -221,14 +216,15 @@ export class QuasarModeDevserver extends AppDevserver { updateTemplate() - this.#htmlWatcher = chokidar.watch(this.#pathMap.templatePath).on('change', updateTemplate) + this.#viteWatcherList.push( + chokidar.watch(this.#pathMap.templatePath) + .on('change', updateTemplate) + ) - if (this.#vueRenderToString === null) { - const { renderToString } = await getPackage('vue/server-renderer', quasarConf.ctx.appPaths.appDir) - this.#vueRenderToString = renderToString - } + const viteModuleRunner = createServerModuleRunner(viteServer.environments.ssr) + this.#viteWatcherList.push(viteModuleRunner) - this.#appOptions.render = async (ssrContext) => { + this.#appOptions.render = async ssrContext => { const startTime = Date.now() const onRenderedList = [] @@ -238,10 +234,10 @@ export class QuasarModeDevserver extends AppDevserver { }) try { - const renderApp = await viteServer.ssrLoadModule(this.#pathMap.serverEntryFile) + const renderApp = await viteModuleRunner.import(this.#pathMap.serverEntryFile) const app = await renderApp.default(ssrContext) - const runtimePageContent = await this.#vueRenderToString(app, ssrContext) + const runtimePageContent = await vueRenderToString(app, ssrContext) onRenderedList.forEach(fn => { fn() }) @@ -271,13 +267,6 @@ export class QuasarModeDevserver extends AppDevserver { } } - await warmupServer({ - viteClient, - viteServer, - clientEntry: quasarConf.metaConf.entryScriptWebPath, - serverEntry: this.#pathMap.serverEntryFile - }) - await this.#bootWebserver(quasarConf) if (urlDiffers === true && quasarConf.metaConf.openBrowser) { @@ -290,7 +279,11 @@ export class QuasarModeDevserver extends AppDevserver { } async #bootWebserver (quasarConf) { - const done = progress(`${ this.#closeWebserver !== void 0 ? 'Restarting' : 'Starting' } webserver...`) + const done = progress(`Booting Webserver...`) + + if (this.#webserver !== null) { + await this.#webserver.close() + } const { create, listen, close, injectMiddlewares, serveStaticContent } = await import( pathToFileURL(this.#pathMap.serverFile) + '?t=' + Date.now() @@ -302,7 +295,7 @@ export class QuasarModeDevserver extends AppDevserver { port: this.#appOptions.port, resolve: { urlPath: this.#appOptions.resolveUrlPath, - root () { return join(this.#pathMap.rootFolder, ...arguments) }, + root: (...args) => join(this.#pathMap.rootFolder, ...args), public: resolvePublicFolder }, publicPath, @@ -324,6 +317,11 @@ export class QuasarModeDevserver extends AppDevserver { // vite devmiddleware modifies req.url to account for publicPath // but we'll break usage in the webserver if we do so app.use((req, res, next) => { + if (this.#viteClient === null) { + next() + return + } + const { url } = req this.#viteClient.middlewares.handle(req, res, err => { req.url = url @@ -382,11 +380,21 @@ export class QuasarModeDevserver extends AppDevserver { middlewareParams.listenResult = await listen(middlewareParams) - this.#closeWebserver = () => close(middlewareParams) + this.#webserver = { + close: () => { + this.#webserver = null + return close(middlewareParams) + } + } done('Webserver is ready') this.printBanner(quasarConf) + + this.#viteClient?.ws.send({ + type: 'full-reload', + path: '*' + }) } // also update pwa-devserver.js when changing here @@ -406,12 +414,10 @@ export class QuasarModeDevserver extends AppDevserver { ).on('change', debounce(() => { inject() - if (this.#viteClient !== void 0) { - this.#viteClient.hot.send({ - type: 'full-reload', - path: '*' - }) - } + this.#viteClient?.ws.send({ + type: 'full-reload', + path: '*' + }) }, 550)) inject() diff --git a/app-vite/lib/quasar-config-file.js b/app-vite/lib/quasar-config-file.js index 9e5379b010d..726a4f9d05b 100644 --- a/app-vite/lib/quasar-config-file.js +++ b/app-vite/lib/quasar-config-file.js @@ -1080,13 +1080,15 @@ export class QuasarConfigFile { } } - const entryScriptWebPath = relative(appPaths.appDir, appPaths.resolve.entry('client-entry.js')).replaceAll('\\', '/') - Object.assign(cfg.metaConf, { - entryScriptWebPath: cfg.build.publicPath + entryScriptWebPath, - // publicPath will be handled by Vite middleware: - entryScriptTag: `` - }) + const entryScriptAbsolutePath = appPaths.resolve.entry('client-entry.js') + const entryScriptWebPath = relative(appPaths.appDir, entryScriptAbsolutePath) + cfg.metaConf.entryScript = { + absolutePath: entryScriptAbsolutePath, + webPath: cfg.build.publicPath + entryScriptWebPath, + // publicPath will be handled by Vite middleware: + tag: `` + } cfg.htmlVariables = merge({ ctx: cfg.ctx, process: { env: cfg.build.env }, diff --git a/app-vite/lib/utils/html-template.js b/app-vite/lib/utils/html-template.js index f9d1f6a5025..630b69cdcfd 100644 --- a/app-vite/lib/utils/html-template.js +++ b/app-vite/lib/utils/html-template.js @@ -93,7 +93,7 @@ export async function transformHtml (template, quasarConf) { html = html.replace( entryPointMarkup, (quasarConf.ctx.mode.ssr === true ? entryPointMarkup : attachMarkup) - + quasarConf.metaConf.entryScriptTag + + quasarConf.metaConf.entryScript.tag ) // publicPath will be handled by Vite middleware @@ -152,7 +152,7 @@ export function getDevSsrTemplateFn (template, quasarConf) { html = html.replace( entryPointMarkup, - `${ entryPointMarkup }${ quasarConf.metaConf.entryScriptTag }` + `${ entryPointMarkup }${ quasarConf.metaConf.entryScript.tag }` ) return compileTemplate(html, { interpolate: ssrInterpolationsRE, variable: 'ssrContext' })" 424f8217c3614f8005036725dbd98fc06fc6e195,2019-10-06 17:39:26,Noah Klayman,"feat(app): add capacitor support, fixes #4388 (#4475)",False,"add capacitor support, fixes #4388 (#4475)",feat,"diff --git a/app/bin/quasar-build b/app/bin/quasar-build index 69a80d58dd9..ebf35edae97 100755 --- a/app/bin/quasar-build +++ b/app/bin/quasar-build @@ -46,10 +46,12 @@ if (argv.help) { $ quasar build -m ios -- some params --and options --here Options - --mode, -m App mode [spa|ssr|pwa|cordova|electron] (default: spa) + --mode, -m App mode [spa|ssr|pwa|cordova|electron|capacitor] (default: spa) --target, -T App target - Cordova (default: all installed) [android|ios|blackberry10|browser|osx|ubuntu|webos|windows] + - Capacitor + [android|ios] - Electron with default ""electron-packager"" bundler (default: yours) [darwin|win32|linux|mas|all] - Electron with ""electron-builder"" bundler (default: yours) @@ -63,6 +65,9 @@ if (argv.help) { - Electron (it only creates the /dist/electron/UnPackaged folder) --help, -h Displays this message + ONLY for Capacitor mode: + --openIde (Android only) Open Android Studio instead of building app automatically + ONLY for Electron mode: --bundler, -b Bundler (electron-packager or electron-builder) [packager|builder] @@ -120,9 +125,13 @@ function finalize (mode, quasarConfig) { if (mode === 'cordova') { return require('../lib/cordova').build(quasarConfig, argv['skip-pkg'], argv._) } - - if (argv['skip-pkg'] !== true && mode === 'electron') { - return require('../lib/electron').build(quasarConfig) + else if (argv['skip-pkg'] !== true) { + if (mode === 'capacitor') { + return require('../lib/capacitor').build(quasarConfig) + } + if (mode === 'electron') { + return require('../lib/electron').build(quasarConfig) + } } return Promise.resolve() diff --git a/app/bin/quasar-dev b/app/bin/quasar-dev index dbc852f967e..739c4859f5e 100755 --- a/app/bin/quasar-dev +++ b/app/bin/quasar-dev @@ -51,7 +51,7 @@ if (argv.help) { $ quasar dev -m electron -- --no-sandbox --disable-setuid-sandbox Options - --mode, -m App mode [spa|ssr|pwa|cordova|electron] (default: spa) + --mode, -m App mode [spa|ssr|pwa|cordova|electron|capacitor] (default: spa) --port, -p A port number on which to start the application --hostname, -H A hostname to use for serving the application --help, -h Displays this message @@ -59,6 +59,9 @@ if (argv.help) { Only for Cordova mode: --target, -T (required) App target [android|ios|blackberry10|browser|osx|ubuntu|webos|windows] + Only for Capacitor mode: + --target, -T (required) App target + [android|ios] --emulator, -e (optional) Emulator name Examples: iPhone-7, iPhone-X iPhone-X,com.apple.CoreSimulator.SimRuntime.iOS-12-2 @@ -70,7 +73,11 @@ require('../lib/helpers/ensure-argv')(argv, 'dev') require('../lib/helpers/banner')(argv, 'dev') if (argv.mode !== 'spa') { - require('../lib/mode/install-missing')(argv.mode, argv.target) + require('../lib/mode/install-missing')(argv.mode, argv.target).then(() => { + goLive() + }) +} else { + goLive() } const findPort = require('../lib/helpers/net').findClosestOpenPort @@ -83,7 +90,7 @@ async function parseAddress ({ host, port }) { if (host && ['localhost', '127.0.0.1', '::1'].includes(host.toLowerCase())) { host = '0.0.0.0' } - if (argv.mode === 'cordova' && (!host || host === '0.0.0.0')) { + if ((argv.mode === 'cordova' || argv.mode === 'capacitor' )&& (!host || host === '0.0.0.0')) { const getExternalIP = require('../lib/helpers/get-external-ip') host = await getExternalIP() this.chosenHost = host @@ -188,6 +195,7 @@ async function goLive () { const generator = new Generator(quasarConfig), Cordova = argv.mode === 'cordova' ? require('../lib/cordova') : false, + Capacitor = argv.mode === 'capacitor' ? require('../lib/capacitor') : false, Electron = argv.mode === 'electron' ? require('../lib/electron') : false function startDev (oldDevServer) { @@ -200,6 +208,7 @@ async function goLive () { .then(() => devServer.listen()) // Start listening .then(() => Electron && Electron.run(quasarConfig, argv._)) .then(() => Cordova && Cordova.run(quasarConfig, argv._)) + .then(() => Capacitor && Capacitor.run(quasarConfig, argv._)) .then(() => devServer) // Pass new builder to watch chain } @@ -217,5 +226,3 @@ async function goLive () { return devServer }) } - -goLive() diff --git a/app/bin/quasar-info b/app/bin/quasar-info index 467c6fb46dd..249188bf735 100755 --- a/app/bin/quasar-info +++ b/app/bin/quasar-info @@ -83,6 +83,10 @@ print({ key: 'Important local packages', section: true }) 'electron', 'electron-packager', 'electron-builder', + '@capacitor/core', + '@capacitor/cli', + '@capacitor/android', + '@capacitor/ios', '@babel/core', 'webpack', 'webpack-dev-server', diff --git a/app/bin/quasar-inspect b/app/bin/quasar-inspect index 55c4b448358..d83e98ddeb7 100755 --- a/app/bin/quasar-inspect +++ b/app/bin/quasar-inspect @@ -34,7 +34,7 @@ if (argv.help) { Options --cmd, -c Quasar command [dev|build] (default: dev) - --mode, -m App mode [spa|ssr|pwa|cordova|electron] (default: spa) + --mode, -m App mode [spa|ssr|pwa|cordova|electron|capacitor] (default: spa) --depth, -d Number of levels deep (default: 5) --path, -p Path of config in dot notation Examples: diff --git a/app/bin/quasar-mode b/app/bin/quasar-mode index da20ab13e88..3e04a0bf195 100755 --- a/app/bin/quasar-mode +++ b/app/bin/quasar-mode @@ -18,10 +18,10 @@ const argv = parseArgs(process.argv.slice(2), { function showHelp() { console.log(` Description - Add/Remove support for PWA / Cordova / Electron modes. + Add/Remove support for PWA / Cordova / Electron / Capacitor modes. Usage - $ quasar mode [add|remove] [pwa|ssr|cordova|electron] [--yes] + $ quasar mode [add|remove] [pwa|ssr|cordova|electron|capacitor] [--yes] # determine what modes are currently installed: $ quasar mode @@ -60,12 +60,11 @@ async function run () { process.exit(1) } - if (![undefined, 'pwa', 'cordova', 'electron', 'ssr'].includes(mode)) { + if (![undefined, 'pwa', 'cordova', 'electron', 'ssr', 'capacitor'].includes(mode)) { warn(`⚠️ Unknown mode ""${ mode }"" to ${action}`) warn() process.exit(1) } - const cliMode = getMode(mode) if (action === 'remove' && argv.yes !== true && cliMode.isInstalled) { @@ -87,14 +86,21 @@ async function run () { } } - cliMode[action]() + const possiblePromise = cliMode[action]() + if (possiblePromise && possiblePromise.then && typeof possiblePromise.then === 'function') { + possiblePromise.then(() => { + process.exit(0) + }) + } else { + process.exit(0) + } } function displayModes () { log(`Detecting installed modes...`) const info = [] - ;['pwa', 'ssr', 'cordova', 'electron'].forEach(mode => { + ;['pwa', 'ssr', 'cordova', 'electron', 'capacitor'].forEach(mode => { info.push([ `Mode ${mode.toUpperCase()}`, getMode(mode).isInstalled ? green('yes') : grey('no') @@ -114,3 +120,4 @@ if (argv._.length === 2) { else { displayModes() } + diff --git a/app/lib/app-paths.js b/app/lib/app-paths.js index 710c739d0fb..bfae2a71510 100644 --- a/app/lib/app-paths.js +++ b/app/lib/app-paths.js @@ -16,8 +16,8 @@ function getAppDir () { } const - logger = require('./helpers/logger') - warn = logger('app:paths', 'red') + logger = require('./helpers/logger') + warn = logger('app:paths', 'red') warn(`⚠️ Error. This command must be executed inside a Quasar v1+ project folder.`) warn() @@ -31,7 +31,8 @@ const pwaDir = resolve(appDir, 'src-pwa'), ssrDir = resolve(appDir, 'src-ssr'), cordovaDir = resolve(appDir, 'src-cordova'), - electronDir = resolve(appDir, 'src-electron') + electronDir = resolve(appDir, 'src-electron'), + capacitorDir = resolve(appDir, 'src-capacitor') module.exports = { cliDir, @@ -41,6 +42,7 @@ module.exports = { ssrDir, cordovaDir, electronDir, + capacitorDir, resolve: { cli: dir => join(cliDir, dir), @@ -49,6 +51,7 @@ module.exports = { pwa: dir => join(pwaDir, dir), ssr: dir => join(ssrDir, dir), cordova: dir => join(cordovaDir, dir), - electron: dir => join(electronDir, dir) + electron: dir => join(electronDir, dir), + capacitor: dir => join(capacitorDir, dir) } } diff --git a/app/lib/capacitor/getCapacitorBinaryPath.js b/app/lib/capacitor/getCapacitorBinaryPath.js new file mode 100644 index 00000000000..7fa53975288 --- /dev/null +++ b/app/lib/capacitor/getCapacitorBinaryPath.js @@ -0,0 +1,11 @@ +const path = require('path') + +module.exports = () => { + try { + // For production, to support workspaces or different cwd + return path.join(require.resolve('@capacitor/cli'), '../../bin/capacitor') + } catch (e) { + // For development with `yarn link` + return '../node_modules/.bin/capacitor' + } +} diff --git a/app/lib/capacitor/hide-splashscreen.js b/app/lib/capacitor/hide-splashscreen.js new file mode 100644 index 00000000000..9df78f1d0e3 --- /dev/null +++ b/app/lib/capacitor/hide-splashscreen.js @@ -0,0 +1,8 @@ +import { Plugins } from '@capacitor/core' +const { SplashScreen } = Plugins + +export default ({ app }) => { + app.mounted = () => { + SplashScreen.hide() + } +} diff --git a/app/lib/capacitor/index.js b/app/lib/capacitor/index.js new file mode 100644 index 00000000000..9ea3e379ecc --- /dev/null +++ b/app/lib/capacitor/index.js @@ -0,0 +1,187 @@ +const log = require('../helpers/logger')('app:capacitor'), + warn = require('../helpers/logger')('app:capacitor', 'red'), + fse = require('fs-extra'), + path = require('path'), + { spawn, spawnSync } = require('../helpers/spawn'), + getCapacitorBinaryBath = require('../capacitor/getCapacitorBinaryPath'), + appPaths = require('../app-paths'), + nodePackager = require('../helpers/node-packager') + +class CapacitorRunner { + run(quasarConfig) { + return new Promise(async resolve => { + const cfg = quasarConfig.getBuildConfig(), + url = cfg.build.APP_URL, + targetPlatform = cfg.ctx.targetName + await this.__installPlatformIfMissing(targetPlatform) + // Make sure there is an index.html, otherwise Capacitor will crash + fse.ensureFileSync(appPaths.resolve.app('./dist/capacitor/index.html')) + // Copy package.json + this.__copyPackageJson() + // Copy app data + await this.__runCapacitorCommand(['sync', cfg.ctx.targetName]) + this.__setCapacitorConfig(targetPlatform, url) + // Make sure cleartext is enabled + if (cfg.ctx.targetName === 'android') { + const androidManifest = fse.readFileSync( + appPaths.resolve.capacitor( + 'android/app/src/main/AndroidManifest.xml' + ), + 'utf8' + ) + if (!androidManifest.match('android:usesCleartextTraffic=""true""')) { + warn( + 'Cleartext must be enabled to connect to the dev server on Android!' + ) + warn( + 'Add `android:usesCleartextTraffic=""true""` to src-capacitor/android/app/src/main/AndroidManifest.xml in the `application` tag' + ) + // TODO: actual url with instructions + warn('See [need url] for more instructions') + process.exit(1) + } + } + await this.__runCapacitorCommand(['open', cfg.ctx.targetName]) + // TODO: Properly determine if dev server is hosted on local network + if (!/^https?:\/\/192/.test(url)) { + warn( + 'It appears your dev server is not hosted on your local network. You will only be able to run your app on an emulator.' + ) + } + log( + `Launching ${ + targetPlatform === 'android' ? 'Android Studio' : 'XCode' + }. Run your app here, and it will automatically connect to the dev server.\n` + ) + resolve() + }) + } + + build(quasarConfig) { + return new Promise(async resolve => { + const cfg = quasarConfig.getBuildConfig(), + targetPlatform = cfg.ctx.targetName + + await this.__installPlatformIfMissing(targetPlatform) + + this.__copyPackageJson() + await this.__runCapacitorCommand(['sync', targetPlatform]) + + if (process.argv.includes('--openIde') || targetPlatform !== 'android') { + return this.__runCapacitorCommand(['open', targetPlatform]) + } else { + const basePath = appPaths.resolve.capacitor( + 'android/app/build/outputs/apk/release' + ) + // Remove old build output + fse.removeSync(basePath) + log('Building android app') + spawn( + `./gradlew${process.platform === 'win32' ? '.bat' : ''}`, + ['assembleRelease'], + appPaths.resolve.capacitor('android'), + () => { + // Copy built apk to dist folder + const unsignedPath = path.join(basePath, 'app-release-unsigned.apk') + const signedPath = path.join(basePath, 'app-release.apk') + if (fse.existsSync(signedPath)) { + fse.copySync( + signedPath, + appPaths.resolve.app('dist/capacitor/app-release.apk') + ) + } else if (fse.existsSync(unsignedPath)) { + fse.copySync( + unsignedPath, + appPaths.resolve.app('dist/capacitor/app-release.apk') + ) + } else { + warn( + 'Could not find outputted apk. Please resolve any errors with Capacitor. To run the build in Android Studio, pass the ""--openIde"" argument to this command.' + ) + process.exit(1) + } + resolve() + } + ) + } + }) + } + + __copyPackageJson() { + fse.copySync( + appPaths.resolve.app('package.json'), + appPaths.resolve.capacitor('package.json') + ) + } + + __runCapacitorCommand(args) { + return new Promise(resolve => { + spawn(getCapacitorBinaryBath(), args, appPaths.capacitorDir, code => { + if (code) { + warn(`⚠️ [FAIL] Capacitor CLI has failed`) + process.exit(1) + } + resolve(code) + }) + }) + } + + async __installPlatformIfMissing(targetPlatform) { + if (!fse.existsSync(appPaths.resolve.capacitor(targetPlatform))) { + // Platform not installed, install deps and add it + const cmdParam = + nodePackager === 'npm' ? ['install', '--save-dev'] : ['add', '--dev'] + + log(`Installing Capacitor dependencies...`) + spawnSync( + nodePackager, + cmdParam.concat([`@capacitor/${targetPlatform}`]), + appPaths.appDir, + () => warn('Failed to install Capacitor dependencies') + ) + this.__copyPackageJson() + await this.__runCapacitorCommand(['add', targetPlatform]) + if (targetPlatform === 'android') { + // Enable cleartext support in manifest + const androidManifestPath = appPaths.resolve.capacitor( + 'android/app/src/main/AndroidManifest.xml' + ) + let androidManifest = fse.readFileSync(androidManifestPath, 'utf8') + androidManifest = androidManifest.replace( + ')`) + warn() + process.exit(1) + } + if (!targets.includes(argv.target)) { + warn(`⚠️ Unknown target ""${ argv.target }"" for Capacitor`) + warn() + process.exit(1) + } + } + if (cmd === 'build' && argv.mode === 'electron') { if (![undefined, 'packager', 'builder'].includes(argv.bundler)) { warn(`⚠️ Unknown bundler ""${ argv.bundler }"" for Electron`) diff --git a/app/lib/mode/index.js b/app/lib/mode/index.js index d5864a03dff..cff2e7c650a 100644 --- a/app/lib/mode/index.js +++ b/app/lib/mode/index.js @@ -1,7 +1,7 @@ const warn = require('../helpers/logger')('app:quasar-mode', 'red') module.exports = function (mode) { - if (!['pwa', 'cordova', 'electron', 'ssr'].includes(mode)) { + if (!['pwa', 'cordova', 'electron', 'ssr', 'capacitor'].includes(mode)) { warn(`⚠️ Unknown mode specified: ${mode}`) process.exit(1) } diff --git a/app/lib/mode/install-missing.js b/app/lib/mode/install-missing.js index e220421f42f..72be51981e5 100644 --- a/app/lib/mode/install-missing.js +++ b/app/lib/mode/install-missing.js @@ -4,7 +4,7 @@ const warn = logger('app:mode', 'red'), getMode = require('./index') -module.exports = function (mode, target) { +module.exports = async function (mode, target) { const Mode = getMode(mode) if (Mode.isInstalled) { @@ -15,5 +15,5 @@ module.exports = function (mode, target) { } warn(`Quasar ${mode.toUpperCase()} is missing. Installing it...`) - Mode.add(target) + await Mode.add(target) } diff --git a/app/lib/mode/mode-capacitor.js b/app/lib/mode/mode-capacitor.js new file mode 100644 index 00000000000..e905d55ad11 --- /dev/null +++ b/app/lib/mode/mode-capacitor.js @@ -0,0 +1,136 @@ +const fs = require('fs'), + fse = require('fs-extra'), + appPaths = require('../app-paths'), + inquirer = require('inquirer'), + getCapacitorBinaryBath = require('../capacitor/getCapacitorBinaryPath'), + logger = require('../helpers/logger'), + log = logger('app:mode-capacitor'), + warn = logger('app:mode-capacitor', 'red'), + { spawnSync } = require('../helpers/spawn'), + nodePackager = require('../helpers/node-packager') + +const capacitorDeps = { + '@capacitor/cli': '^1.0.0', + '@capacitor/core': '^1.0.0' +} + +class Mode { + get isInstalled() { + return fs.existsSync(appPaths.capacitorDir) + } + + async add() { + if (this.isInstalled) { + warn(`Capacitor support detected already. Aborting.`) + return + } + const { platforms } = await inquirer.prompt([ + { + type: 'checkbox', + choices: ['android', 'ios'], + name: 'platforms', + message: + 'What platforms would you like to install? Choose at least one.', + default: ['android'], + validate: options => options.length > 0 + } + ]) + + platforms.forEach(platform => { + capacitorDeps[`@capacitor/${platform}`] = '^1.0.0' + }) + + const pkgPath = appPaths.resolve.app('package.json'), + pkg = require(pkgPath), + appName = pkg.productName || pkg.name || 'Quasar App' + + // TODO: determine if this is necessary + if (/^[0-9]/.test(appName)) { + warn( + `⚠️ App product name cannot start with a number. ` + + `Please change the ""productName"" prop in your /package.json then try again.` + ) + return + } + + const cmdParam = + nodePackager === 'npm' ? ['install', '--save-dev'] : ['add', '--dev'] + + log(`Installing Capacitor dependencies...`) + spawnSync( + nodePackager, + cmdParam.concat( + Object.keys(capacitorDeps).map(dep => { + return `${dep}@${capacitorDeps[dep]}` + }) + ), + appPaths.appDir, + () => warn('Failed to install Capacitor dependencies') + ) + + fse.ensureDirSync(appPaths.capacitorDir) + log(`Initializing capacitor...`) + spawnSync( + getCapacitorBinaryBath(), + [ + 'init', + '--web-dir', + '../dist/capacitor', + appName, + pkg.cordovaId || 'org.quasar.capacitor.app' + ], + appPaths.capacitorDir + ) + // Add copied package.json to .gitignore as it is auto-generated + fse.writeFileSync(appPaths.resolve.capacitor('.gitignore'), 'package.json') + // Adding platforms will fail if there is no index + fse.ensureFileSync(appPaths.resolve.app('dist/capacitor/index.html')) + // Copy package.json to prevent capacitor from reinstalling deps + fse.copySync(pkgPath, appPaths.resolve.capacitor('package.json')) + platforms.forEach(platform => { + spawnSync( + getCapacitorBinaryBath(), + ['add', platform], + appPaths.capacitorDir + ) + }) + if (platforms.includes('android')) { + const androidManifestPath = appPaths.resolve.capacitor( + 'android/app/src/main/AndroidManifest.xml' + ) + // Enable cleartext support in manifest + let androidManifest = fse.readFileSync(androidManifestPath, 'utf8') + androidManifest = androidManifest.replace( + ' warn('Failed to uninstall Capacitor dependencies') + ) + + log(`Capacitor support was removed`) + } +} + +module.exports = Mode diff --git a/app/lib/webpack/capacitor/index.js b/app/lib/webpack/capacitor/index.js new file mode 100644 index 00000000000..a8c8afb8b92 --- /dev/null +++ b/app/lib/webpack/capacitor/index.js @@ -0,0 +1,18 @@ +const injectHtml = require('../inject.html'), + injectClientSpecifics = require('../inject.client-specifics'), + injectHotUpdate = require('../inject.hot-update'), + appPaths = require('../../app-paths') + +module.exports = function(chain, cfg) { + if (!cfg.capacitor || cfg.capacitor.autoHideSplashscreen !== false) { + // Hide splashcreen when app is loaded + cfg.boot.push({ + path: appPaths.resolve.app( + 'node_modules/@quasar/app/lib/capacitor/hide-splashscreen.js' + ) + }) + } + injectHtml(chain, cfg) + injectClientSpecifics(chain, cfg) + injectHotUpdate(chain, cfg) +} diff --git a/app/lib/webpack/create-chain.js b/app/lib/webpack/create-chain.js index f3064f3a573..7cb31ddf84e 100644 --- a/app/lib/webpack/create-chain.js +++ b/app/lib/webpack/create-chain.js @@ -13,6 +13,7 @@ const module.exports = function (cfg, configName) { const chain = new WebpackChain(), + // TODO: determine if capacitor needs hash as well needsHash = !cfg.ctx.dev && !['electron', 'cordova'].includes(cfg.ctx.modeName), fileHash = needsHash ? '.[hash:8]' : '', chunkHash = needsHash ? '.[contenthash:8]' : '', diff --git a/app/lib/webpack/index.js b/app/lib/webpack/index.js index 5b5e56e1d3d..5d189bf2d83 100644 --- a/app/lib/webpack/index.js +++ b/app/lib/webpack/index.js @@ -71,6 +71,16 @@ async function getCordova (cfg) { }) } +async function getCapacitor (cfg) { + const chain = createChain(cfg, 'Capacitor') + require('./capacitor')(chain, cfg) + return await getWebpackConfig(chain, cfg, { + name: 'Capacitor', + hot: true, + invokeParams: { isClient: true, isServer: false } + }) +} + async function getElectron (cfg) { const rendererChain = createChain(cfg, 'Renderer process'), @@ -129,6 +139,9 @@ module.exports = async function (cfg) { else if (mode.cordova) { return await getCordova(cfg) } + else if (mode.capacitor) { + return await getCapacitor(cfg) + } else if (mode.pwa) { return await getPWA(cfg) } diff --git a/docs/src/assets/menu.js b/docs/src/assets/menu.js index 1aff33aabf1..b3dd1a742b9 100644 --- a/docs/src/assets/menu.js +++ b/docs/src/assets/menu.js @@ -328,6 +328,36 @@ const cli = [ } ] }, + { + name: 'Developing Mobile Apps', + path: 'developing-mobile-apps' + }, + { + name: 'Developing Capacitor Apps', + path: 'developing-capacitor-apps', + children: [ + { + name: 'Introduction', + path: 'introduction' + }, + { + name: 'Preparation', + path: 'preparation' + }, + { + name: 'Build Commands', + path: 'build-commands' + }, + { + name: 'Troubleshooting and Tips', + path: 'troubleshooting-and-tips' + }, + { + name: 'Publishing to Store', + path: 'publishing-to-store' + } + ] + }, { name: 'Developing Cordova Apps', path: 'developing-cordova-apps', diff --git a/docs/src/pages/quasar-cli/developing-capacitor-apps/build-commands.md b/docs/src/pages/quasar-cli/developing-capacitor-apps/build-commands.md new file mode 100644 index 00000000000..758cc65f452 --- /dev/null +++ b/docs/src/pages/quasar-cli/developing-capacitor-apps/build-commands.md @@ -0,0 +1,42 @@ +--- +title: Capacitor Build Commands +--- + +[Quasar CLI](/quasar-cli/installation) makes it incredibly simple to develop or build the final distributables from your source code. + +## Developing + +```bash +$ quasar dev -m capacitor -T [ios|android] + +# ..or the longer form: +$ quasar dev --mode capacitor --target [ios|android] +``` + +In order for you to be able to develop on a device emulator or directly on a phone (with Hot Module Reload included), Quasar CLI follows these steps: + +1. Detects your machine's external IP address. If there are multiple such IPs detected, then it asks you to choose one. If you'll be using a mobile phone to develop then choose the IP address of your machine that's pingable from the phone/tablet. +2. It starts up a development server on your machine. +3. It tells Capacitor to use the IP previously detected. This allows the app to connect to the development server. +4. It uses the Capacitor CLI to update all of your plugins. +5. Finally, it opens your native IDE. Run your app here, and it will automatically connect to the dev server. + +::: danger +If developing on a mobile phone/tablet, it is very important that the external IP address of your build machine is accessible from the phone/tablet, otherwise you'll get a development app with white screen only. Also check your machine's firewall to allow connections to the development chosen port. +::: + +## Building for Production + +```bash +$ quasar build -m capacitor -T [ios|android] + +# ..or the longer form: +$ quasar build --mode cordova --target [ios|android] + +# this opens Android Studio instead of building the apk for you. On iOS, XCode is always opened. +$ quasar build -m cordova -T [ios|android] --openIde +``` + +These commands parse and build your `/src` folder then overwrite `/dist/capacitor` then use the Capacitor CLI to update your plugins and open your IDE. + +If you are building for Android, the apk will be built for you instead of opening Android Studio, unless the `--openIde` arg is passed. The file will be located at `dist/capacitor/app-release.apk`. diff --git a/docs/src/pages/quasar-cli/developing-capacitor-apps/introduction.md b/docs/src/pages/quasar-cli/developing-capacitor-apps/introduction.md new file mode 100644 index 00000000000..9430e28bf0e --- /dev/null +++ b/docs/src/pages/quasar-cli/developing-capacitor-apps/introduction.md @@ -0,0 +1,9 @@ +--- +title: What is Capacitor +--- + +[Capacitor](https://capacitor.ionicframework.com) is a framework to deploy web applications to mobile. It is designed as a modern alternative to Cordova by [Ionic Framework](ionicframework.com). It supports most, but not all Cordova plugins, as well as Capacitor-specific plugins. It exposes native device APIs in the form of JavaScript modules. + +:::warning +Capacitor support in Quasar CLI is currently experimental. Things may break, and you should not use this in a production environment. If you find any issues, please report them on the [Quasar Github Repo](https://github.com/quasarframework/quasar). +::: \ No newline at end of file diff --git a/docs/src/pages/quasar-cli/developing-capacitor-apps/preparation.md b/docs/src/pages/quasar-cli/developing-capacitor-apps/preparation.md new file mode 100644 index 00000000000..ef4ce249e2c --- /dev/null +++ b/docs/src/pages/quasar-cli/developing-capacitor-apps/preparation.md @@ -0,0 +1,55 @@ +--- +title: Mobile App Preparation +--- + +Before we dive in to the actual development, we need to do some preparation work. Here we will go over Android as the target platform. + +## 1. Installation + +- You will need to install Android Studio and the Android platform SDK on your machine. You can [download the Android Studio here](https://developer.android.com/studio/index.html) and follow these [installation steps](https://developer.android.com/studio/install.html) afterwards. + +- Add Android installation to your path: + +### Unix (macOS, linux) + +```bash +export ANDROID_HOME=""$HOME/Android/Sdk"" +PATH=$PATH:$ANDROID_HOME/tools; PATH=$PATH:$ANDROID_HOME/platform-tools +``` + +> Please note that sometimes the `/Android/Sdk` folder is added inside `/Library/` inside your user folder. Check your user folder and if the `/Android/` folder is only inside `/Library/` do: `export ANDROID_HOME=""$HOME/Library/Android/Sdk""` instead. + +### Windows + +```bash +setx ANDROID_HOME ""%USERPROFILE%\AppData\Local\Android\Sdk"" +setx path ""%path%;%ANDROID_HOME%\tools;%ANDROID_HOME%\platform-tools"" +``` + +- Start Android studio by changing into the folder you installed it in and run `./studio.sh`. Next step is to install the individual SDKs: + +- Open the ""Configure"" menu at the bottom of the window: + + ![SDK manager](https://cdn.quasar.dev/img/Android-Studio-SDK-Menu.png 'SDK manager') + +- Select the desired SDKs and click on ""Apply"" to install the SDKs. + + ![SDK selection](https://cdn.quasar.dev/img/Android-Studio-SDK-selection.png 'SDK selection') + +## 2. Add Capacitor Quasar Mode + +In order to develop/build a Mobile app, we need to add the Capacitor mode to our Quasar project. This will use the Capacitor CLI to generate a Capacitor project in `/src-capacitor/[PLATFORM]` folder. When installing the mode, it will ask you which platforms you would like to add. You must select at least one, and the other can be added later. + +```bash +$ quasar mode add capacitor +``` + +## 3. Start Developing + +To start a dev server with HMR, run the fallowing command: + +```bash +$ quasar dev -m capacitor -T [android|ios] +``` + +If you did not add the chosen target on install, it will add it for you. Once the dev server is ready, your native IDE will open (Android Studio for Android and Xcode for iOS). Run your app here, and it will automatically connect to the dev server. diff --git a/docs/src/pages/quasar-cli/developing-capacitor-apps/publishing-to-store.md b/docs/src/pages/quasar-cli/developing-capacitor-apps/publishing-to-store.md new file mode 100644 index 00000000000..cba3855ce25 --- /dev/null +++ b/docs/src/pages/quasar-cli/developing-capacitor-apps/publishing-to-store.md @@ -0,0 +1,159 @@ +--- +title: Publishing to Store +--- + +So, you've finished working on your Mobile App. Now it's time to deploy it. Let's learn how. + +## Android Publishing + +To generate a release build for Android, we can use the following Quasar CLI command: + +```bash +$ quasar build -m capacitor -T android +``` + +This will generate a release build. + +Next, we can find our unsigned APK file in `/dist/capacitor/app-release.apk`. Now, we need to sign the unsigned APK and run an alignment utility on it to optimize it and prepare it for the app store. If you already have a signing key, skip these steps and use that one instead. + +Let’s generate our private key using the keytool command that comes with the JDK. If this tool isn’t found, refer to the installation guide: + +```bash +$ keytool -genkey -v -keystore my-release-key.keystore -alias alias_name -keyalg RSA -keysize 2048 -validity 20000 +``` + +You’ll first be prompted to create a password for the keystore. Then, answer the rest of the nice tools’s questions and when it’s all done, you should have a file called my-release-key.keystore created in the current directory. + +::: danger +Make sure to save this file somewhere safe and secure, if you lose it you won’t be able to submit updates to your app! +::: + +To sign the unsigned APK, run the jarsigner tool which is also included in the JDK: + +```bash +$ jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore my-release-key.keystore alias_name +``` + +This signs the apk in place. Finally, we need to run the zip align tool to optimize the APK. The zipalign tool can be found in `/path/to/Android/sdk/build-tools/VERSION/zipalign`. For example, on OS X with Android Studio installed, zipalign is in `~/Library/Android/sdk/build-tools/VERSION/zipalign`: + +```bash +$ zipalign -v 4 HelloWorld.apk +``` + +Now we have our final release binary called HelloWorld.apk and we can release this on the Google Play Store for all the world to enjoy! + +(There are a few other ways to sign APKs. Refer to the official Android App Signing documentation for more information.) + +### Google Play Store + +Now that we have our release APK ready for the Google Play Store, we can create a Play Store listing and upload our APK. + +To start, you’ll need to visit the [Google Play Store Developer Console](https://play.google.com/apps/publish) and create a new developer account. Unfortunately, this is not free. However, the cost is only $25 compared to Apple’s $99. + +Once you have a developer account, you can go ahead and click “Publish an Android App on Google Play”. + +Then, you can go ahead and click the button to edit the store listing (We will upload an APK later). You’ll want to fill out the description for the app. + +When you are ready, upload the APK for the release build and publish the listing. Be patient and your hard work should be live in the wild! + +### Updating your App + +As you develop your app, you’ll want to update it periodically. + +In order for the Google Play Store to accept updated APKs, you’ll need to bump the app version (from `/package.json` or from `/quasar.conf.js > cordova > version`, then rebuild the app for release. + +## iOS Publishing + +::: danger +These docs have not been verified to work properly yet. If you run into any issues, please report them on the [Quasar Github Repo](https://github.com/quasarframework/quasar). +::: + +First, you need to enroll in [Apple Developer Program](https://developer.apple.com/programs/). As with Google, if you have a personal account with Apple, you can create an additional one for your applications. + +### Connecting Xcode with your developer account + +After you receive your developer status, open Xcode on your Mac and go to Preferences > Accounts. Add your account to Xcode by clicking the `+` button on the lower left-hand side and follow the instructions. + +### Signing + +Now that you linked Xcode with your developer account, go to Preferences > Accounts, select your Apple Id on the left-hand side and then click the View Details button shown on the previous image. + +Click the Create button next to the iOS Distribution option. + +You can learn more about maintaining your signing identities and certificates from the official documentation. + +### Setting up the app identifier + +Next, through the Apple Developer Member Center we’ll set up the app ID identifier details. Identifiers are used to allow an app to have access to certain app services like for example Apple Pay. You can login to Apple Developer Member Center with your Apple ID and password. + +Once you’re logged in you should choose Certificates, Identifiers, and Profiles option. Also select the Identifiers option under the iOS Apps. Then select the `+` button in order to add a new iOS App ID. + +Then you’ll have to set the name of your app, use the Explicit App ID option and set the Bundle ID to the value of the id in your Cordova config.xml tag. + +Additionally, you’ll have to choose any of the services that need to be enabled. For example, if you use Apple Pay or Wallet in your app, you need to choose those option. + +You can learn more about registering app identifiers from the [official documentation](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingProfiles/MaintainingProfiles.html). + +### Creating the app listing + +Apple uses iTunes Connect to manage app submissions. After your login, you should select the My Apps button, and on the next screen select the `+` button, just below the iTunes Connect My Apps header. + +This will show three options in a dropdown, and you should select the New App. After this the popup appears where you have to choose the name of the application, platform, primary language, bundle ID and SKU. + +Once you’re done, click on the Create button and you’ll be presented with a screen where you’ll have to set some basic options like Privacy Policy URL, category and sub category. + +Now, before we fill out everything in the listing, we’ll build our app and get it uploaded with Xcode. Then you’ll come back to finish the listing. + +You can learn more about managing your app in iTunes Connect from the [official documentation](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/UsingiTunesConnect/UsingiTunesConnect.html). + +### Building the app for production + +```bash +$ quasar build -m capacitor -T ios +``` + +If everything went well, Xcode will open automatically. + +### Configuring the project in Xcode + +Once Xcode opens up the project, you should see the details about your app in the general view. + +You should just check that the bundle identifier is set up correctly, so that it’s the same as the value you specified earlier in the app ID. Also, make sure that the version and build numbers are correct. Team option should be set to your Apple developer account. Under the deployment target you can choose which devices your application will support. + +### Creating an archive of the application + +In Xcode, select Product > Scheme > Edit Scheme to open the scheme editor. Next, select the Archive from the list on the left-hand side. Make sure that the Build configuration is set to Release. + +To create an archive, choose a Generic iOS Device, or your device if it’s connected to your Mac (you can’t create an archive if simulator is selected), from the Scheme toolbar menu in the project editor. + +Next, select Product > Archive, and the Archive organizer appears and displays the new archive. + +At this point you can click the `Upload to App Store...` button, and if everything goes fine you’ll have an uploaded app, and the only thing that’s left to do is to complete the iTunes Connect listing and submit it for review! + +At this point you should get an email from iTunes Connect shortly after you uploaded the archive with the content. + +### Finishing the app list process + +Now you should head back to the iTunes Connect portal and login. Next, click on the Pricing and Availability on the left-hand side under APP STORE INFORMATION. + +You don’t have to worry about forgetting to insert any crucial and required information about your application, since you’ll be notified about what’s missing and what needs to be added/changed if you try to submit the app for review before all details are filled in. + +Next, click on the 1.0 Prepare for Submission button on the left-hand side, as shown on the image below. When we uploaded our archive, iTunes Connect automatically determined which device sizes are supported. You’ll need to upload at least one screenshot image for each of the various app sizes that were detected by iTunes Connect. + +Next, you’ll have to insert Description, Keywords, Support URL and Marketing URL (optionally). + +In the Build section you have to click on the `+` button and select the build that was uploaded through Xcode in the previous steps. + +Next, you’ll have to upload the icon, edit the rating, and set some additional info like copyright and your information. Note that the size of the icon that you’ll have to upload here will have to be 1024 by 1024 pixels. Thankfully, you can use the splash.png from the second tutorial. If you’re the sole developer then the data in the App Review Information should be your own. Finally, as the last option, you can leave the default checked option that once your app is approved that it is automatically released to the App Store. + +Now that we’re finished with adding all of the details to the app listing, we can press Save and then Submit for Review. Finally, you’ll be presented with the last form that you’ll have to fill out. + +After you submit your app for review you’ll see the status of it in the My Apps as Waiting for review, as shown on the image below. Also, shortly after you submit your app for review you’ll get a confirmation email from iTunes Connect that your app is in review. + +Apple prides itself with a manual review process, which basically means it can take several days for your app to be reviewed. You’ll be notified of any issues or updates to your app status. + +### Updating the app + +Since you’ll probably want to update your app at some point you’ll first need to bump the app version (from `/package.json`), then rebuild the app for release. Once Xcode opens, follow the same steps all over again. + +Once you submit for the review, you’ll have to wait for the review process again. diff --git a/docs/src/pages/quasar-cli/developing-capacitor-apps/troubleshooting-and-tips.md b/docs/src/pages/quasar-cli/developing-capacitor-apps/troubleshooting-and-tips.md new file mode 100644 index 00000000000..b87bc571904 --- /dev/null +++ b/docs/src/pages/quasar-cli/developing-capacitor-apps/troubleshooting-and-tips.md @@ -0,0 +1,152 @@ +--- +title: Capacitor Troubleshooting and Tips +--- + +## Browser Simulator + +Use Google Chrome's emulator from Developer Tools. It's a fantastic tool. You can select which device to emulate, but keep in mind that it's an _emulator_ and not the real deal. + +::: danger +If you change from desktop to mobile emulator or backwards, hit the refresh button as Quasar Platform detection is not dynamic (nor it should be). +::: + +![Google Chrome emulator](https://cdn.quasar.dev/img/browser-simulator.png 'Google Chrome emulator') + +## Android Tips + +### Android remote debugging + +If you are debugging Android Apps, you can use Google Chrome [Remote Debugging](https://developers.google.com/web/tools/chrome-devtools/debug/remote-debugging/remote-debugging?hl=en) through a USB cable attached to your Android phone/tablet. It can be used for emulator too. + +This way you have Chrome Dev Tools directly for your App running on the emulator/phone/table. Inspect elements, check console output, and so on and so forth. + +![Android Remote Debugging](https://cdn.quasar.dev/img/remote-debug.png 'Android Remote Debugging') +![Android Remote Debugging](https://cdn.quasar.dev/img/remote-debug-2.png 'Android Remote Debugging') + +### Accept Licenses + +If you are having problems getting Android builds to finish and you see a message like: + +``` +> Failed to install the following Android SDK packages as some licences have not been accepted. +``` + +If this is the case you need to accept ALL the licenses. Thankfully there is a tool for this: + +Linux: `sdkmanager --licenses` +macOS: `~/Library/Android/sdk/tools/bin/sdkmanager --licenses` +Windows: `%ANDROID_HOME%/tools/bin/sdkmanager --licenses` + +### Android SDK not found after installation of the SDK + +Some newer Debian-based OS (e.g. ubuntu, elementary OS) might leave you with a `Android SDK not found.` after you installed and (correctly) configured the environment. + +This could have two different reasons: Usually the paths aren't configured correctly. The first step is to verify if your paths are set correctly. This can be done by running the following commands: + +```bash +$ echo $ANDROID_HOME +``` + +The expected output should be a path similar to this `$HOME/Android/Sdk`. After this run: + +```bash +$ ls -la $ANDROID_HOME +``` + +To ensure the folder contains the SDK. The expected output should contain folders like 'tools', 'sources', 'platform-tools', etc. + +```bash +$ echo $PATH +``` + +The output should contain each one entry for the Android SDK 'tools'-folder and 'platform-tools'-tools. This could look like this: + +```bash +/home/your_user/bin:/home/your_user/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/your_user/Android/Sdk/tools:/home/your_user/Android/Sdk/platform-tools +``` + +> If you ensured your paths are set correctly and still get the error, you can try the following fix: [Replacing the Android Studio 'tools' folder manually](https://github.com/meteor/meteor/issues/8464#issuecomment-288112504) + +### Setting up device on Linux + +You may bump into `?????? no permissions` problem when trying to run your App directly on an Android phone/tablet. + +Here's how you fix this: + +```bash +# create the .rules file and insert the content +# from below this example +sudo vim /etc/udev/rules.d/51-android.rules +sudo chmod 644 /etc/udev/rules.d/51-android.rules +sudo chown root. /etc/udev/rules.d/51-android.rules +sudo service udev restart +sudo killall adb +``` + +The content for `51-android.rules`: + +``` +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0bb4"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0e79"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0502"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0b05"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""413c"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0489"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""091e"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""18d1"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0bb4"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""12d1"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""24e3"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""2116"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0482"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""17ef"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""1004"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""22b8"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0409"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""2080"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0955"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""2257"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""10a9"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""1d4d"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0471"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""04da"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""05c6"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""1f53"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""04e8"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""04dd"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0fce"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""0930"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""19d2"", MODE=""0666"" +SUBSYSTEM==""usb"", ATTRS{idVendor}==""1bbb"", MODE=""0666"" +``` + +Now running `adb devices` should discover your device. + +## iOS Tips + +### iOS remote debugging + +If you are debugging iOS Apps, you can use the Safari developer tools to remotely debug through a USB cable attached to your iOS phone/tablet. It can be used for emulator too. + +This way you have Safari developer tools directly for your App running on the emulator/phone/table. Inspect elements, check console output, and so on and so forth. + +First enable the ""developer"" menu option in the Settings of Safari. Then if you navigate to the ""developer"" menu option you will see your emulator or connected device listed near the top. From here you can open the developer tools. + +### Status bar and notch safe-areas + +Since mobile phones have a status bar and/or notches, your app's styling might need some tweaking when building on Capacitor. In order to prevent parts of your app from going behind the status bar, there is a global CSS variable that can be used for creating a ""safe-area"". This variable can then be applied in your app's top and bottom padding or margin. + +Quasar has support for these CSS safe-areas by default in QHeader/QFooter and Notify. However it's important to always check your Cordova build on several models to see if all cases of your app are dealing with the safe areas correctly. + +In cases you need to manually tweak your CSS you can do so with: + +```stylus +// for your app's header +padding-top constant(safe-area-inset-top) // for iOS 11.0 +padding-top env(safe-area-inset-top) // for iOS 11.2 + +// for your app's footer +padding-bottom constant(safe-area-inset-bottom) +padding-bottom env(safe-area-inset-bottom) +``` + +Of course you can also use the above example with `margin` instead of `padding` depending on your app. diff --git a/docs/src/pages/quasar-cli/developing-mobile-apps.md b/docs/src/pages/quasar-cli/developing-mobile-apps.md new file mode 100644 index 00000000000..6b1e5823dd4 --- /dev/null +++ b/docs/src/pages/quasar-cli/developing-mobile-apps.md @@ -0,0 +1,13 @@ +--- +title: Developing Mobile Apps +--- + +Quasar offers two solutions for creating mobile apps: [Apache Cordova](https://cordova.apache.org/), and [Ionic Capacitor](https://capacitor.ionicframework.com). + +Cordova is a mobile application development framework originally created by Nitobi. Adobe Systems purchased Nitobi in 2011, rebranded it as PhoneGap, and later released an open source version of the software called Apache Cordova. + +Capacitor was created by [Ionic Framework](https://ionicframework.com/) as a more modern replacement for Cordova. It supports most, but not all, Cordova plugins as well as Capacitor-specific plugins. + +Both tools enable you to run your website as a native app through a webview. They both expose native device APIs to your JavaScript code, and allow you to write native code in the form of plugins, which can be called through JS. While Cordova supports a wide range of targets, Capacitor only supports iOS and Android. Since Capacitor support in Quasar CLI is not finalized and is considered experimental, we reccomend using Cordova for production apps. + +See the docs for [Developing with Capacitor (experimental)](/quasar-cli/developing-capacitor-apps/introduction) or [Developing with Cordova](/quasar-cli/developing-cordova-apps/introduction)." 463927d0e36b333878ed52cdf85877227627ead3,2020-10-01 12:24:02,Razvan Stoenescu,"fix(docs): remove obsolete ""hoverable"" CSS class (from the 0.x era) #7843",False,"remove obsolete ""hoverable"" CSS class (from the 0.x era) #7843",fix,"diff --git a/docs/src/pages/style/shadows.md b/docs/src/pages/style/shadows.md index aa1c7705679..d7c6976ecb5 100644 --- a/docs/src/pages/style/shadows.md +++ b/docs/src/pages/style/shadows.md @@ -14,7 +14,7 @@ The shadows are in accordance to Material Design specifications (24 levels of de | `shadow-1` | Set a depth of 1 | | `shadow-2` | Set a depth of 2 | | `shadow-N` | Where `N` is an integer from 1 to 24. | -| `shadow-transition` | Apply a CSS transition on the shadow; best use in conjunction with `hoverable` classes | +| `shadow-transition` | Apply the default CSS transition effect on the shadow | " a6340ba7682bd15cdfad069442be5da675f7f817,2023-05-12 15:01:05,Razvan Stoenescu,refactor(app-webpack): prepare for ESM transition,False,prepare for ESM transition,refactor,"diff --git a/app-vite/lib/modes/capacitor/config-file.js b/app-vite/lib/modes/capacitor/config-file.js index 4b354ba090d..1ed19534058 100644 --- a/app-vite/lib/modes/capacitor/config-file.js +++ b/app-vite/lib/modes/capacitor/config-file.js @@ -148,8 +148,9 @@ class CapacitorConfigFile { } const fn = `${ add ? '' : 'un' }installPackage` + const nameParam = add ? '@jcesarmobile/ssl-skip@^0.2.0' : '@jcesarmobile/ssl-skip' - nodePackager[ fn ]('@jcesarmobile/ssl-skip@^0.2.0', { + nodePackager[ fn ](nameParam, { cwd: appPaths.capacitorDir, displayName: 'Capacitor (DEVELOPMENT ONLY) SSL support' }) diff --git a/app-vite/lib/node-version-check.js b/app-vite/lib/node-version-check.js index 8e0f77700c2..b3d03c91f6f 100644 --- a/app-vite/lib/node-version-check.js +++ b/app-vite/lib/node-version-check.js @@ -6,8 +6,8 @@ const minor = parseInt(version[ 1 ].replace(/\D/g, ''), 10) const patch = parseInt(version[ 2 ].replace(/\D/g, ''), 10) const min = { - major: 14, - minor: 19, + major: 16, + minor: 0, patch: 0 } diff --git a/app-webpack/bin/quasar b/app-webpack/bin/quasar index 5649bdef748..61f7ef454ca 100755 --- a/app-webpack/bin/quasar +++ b/app-webpack/bin/quasar @@ -2,6 +2,9 @@ require('../lib/node-version-check.js') +const { log, warn } = require('../lib/helpers/logger.js') +const { cliPkg } = require('../lib/app-pkg.js') + const commands = [ 'dev', 'build', @@ -41,16 +44,13 @@ if (cmd) { } else { if (cmd === '-v' || cmd === '--version') { - const pkg = require('../package.json') console.log( - `${ pkg.name } ${ pkg.version }` + `${ cliPkg.name } ${ cliPkg.version }` + (process.env.QUASAR_CLI_VERSION ? ` (@quasar/cli ${ process.env.QUASAR_CLI_VERSION })` : '') ) process.exit(0) } - const { log, warn } = require('../lib/helpers/logger.js') - if (cmd === '-h' || cmd === '--help') { cmd = 'help' } diff --git a/app-webpack/lib/app-extension/BaseAPI.js b/app-webpack/lib/app-extension/BaseAPI.js index 9b47a35b923..c1c361b8a7c 100644 --- a/app-webpack/lib/app-extension/BaseAPI.js +++ b/app-webpack/lib/app-extension/BaseAPI.js @@ -1,9 +1,9 @@ const appPaths = require('../app-paths.js') -const { name } = require('../../package.json') +const { appPkg } = require('../app-pkg.js') -module.exports = class ApiBase { - engine = name +module.exports.ApiBase = class ApiBase { + engine = appPkg.name hasWebpack = true hasVite = false diff --git a/app-webpack/lib/app-extension/Extension.js b/app-webpack/lib/app-extension/Extension.js index 7a43d985de8..8614602ef44 100644 --- a/app-webpack/lib/app-extension/Extension.js +++ b/app-webpack/lib/app-extension/Extension.js @@ -3,7 +3,8 @@ const path = require('node:path') const { log, warn, fatal } = require('../helpers/logger.js') const appPaths = require('../app-paths.js') -const extensionJson = require('./extension-json.js') +const { extensionJson } = require('./extension-json.js') +const { nodePackager } = require('../helpers/node-packager.js') async function promptOverwrite ({ targetPath, options }) { const inquirer = require('inquirer') @@ -99,7 +100,7 @@ async function renderFolders ({ source, rawCopy, scope }) { } } -module.exports = class Extension { +module.exports.Extension = class Extension { constructor (name) { if (name.charAt(0) === '@') { const slashIndex = name.indexOf('/') @@ -230,7 +231,7 @@ module.exports = class Extension { } const script = this.__getScript('index', true) - const IndexAPI = require('./IndexAPI.js') + const { IndexAPI } = require('./IndexAPI.js') const api = new IndexAPI({ extId: this.extId, @@ -267,14 +268,10 @@ module.exports = class Extension { } __installPackage () { - const nodePackager = require('../helpers/node-packager.js') - nodePackager.installPackage(this.packageFullName, { isDevDependency: true }) } __uninstallPackage () { - const nodePackager = require('../helpers/node-packager.js') - nodePackager.uninstallPackage(this.packageFullName) } @@ -328,7 +325,7 @@ module.exports = class Extension { log('Running App Extension install script...') - const InstallAPI = require('./InstallAPI.js') + const { InstallAPI } = require('./InstallAPI.js') const api = new InstallAPI({ extId: this.extId, @@ -352,8 +349,6 @@ module.exports = class Extension { } if (api.__needsNodeModulesUpdate) { - const nodePackager = require('../helpers/node-packager.js') - nodePackager.install() } @@ -369,7 +364,7 @@ module.exports = class Extension { log('Running App Extension uninstall script...') - const UninstallAPI = require('./UninstallAPI.js') + const { UninstallAPI } = require('./UninstallAPI.js') const api = new UninstallAPI({ extId: this.extId, prompts diff --git a/app-webpack/lib/app-extension/IndexAPI.js b/app-webpack/lib/app-extension/IndexAPI.js index f41a884e695..1b6c30962e7 100644 --- a/app-webpack/lib/app-extension/IndexAPI.js +++ b/app-webpack/lib/app-extension/IndexAPI.js @@ -2,10 +2,10 @@ const semver = require('semver') const { merge } = require('webpack-merge') const { fatal } = require('../helpers/logger.js') -const getPackageJson = require('../helpers/get-package-json.js') -const getCallerPath = require('../helpers/get-caller-path.js') -const extensionJson = require('./extension-json.js') -const BaseAPI = require('./BaseAPI.js') +const { getPackageJson } = require('../helpers/get-package-json.js') +const { getCallerPath } = require('../helpers/get-caller-path.js') +const { extensionJson } = require('./extension-json.js') +const { BaseAPI } = require('./BaseAPI.js') // for backward compatibility function getPackageName (packageName) { @@ -17,7 +17,7 @@ function getPackageName (packageName) { /** * API for extension's /index.js script */ -module.exports = class IndexAPI extends BaseAPI { +module.exports.IndexAPI = class IndexAPI extends BaseAPI { ctx __hooks = { diff --git a/app-webpack/lib/app-extension/InstallAPI.js b/app-webpack/lib/app-extension/InstallAPI.js index 0f4d4484bae..ace8568930f 100644 --- a/app-webpack/lib/app-extension/InstallAPI.js +++ b/app-webpack/lib/app-extension/InstallAPI.js @@ -4,10 +4,10 @@ const { merge } = require('webpack-merge') const semver = require('semver') const { warn, fatal } = require('../helpers/logger.js') -const getPackageJson = require('../helpers/get-package-json.js') -const getCallerPath = require('../helpers/get-caller-path.js') -const extensionJson = require('./extension-json.js') -const BaseAPI = require('./BaseAPI.js') +const { getPackageJson } = require('../helpers/get-package-json.js') +const { getCallerPath } = require('../helpers/get-caller-path.js') +const { extensionJson } = require('./extension-json.js') +const { BaseAPI } = require('./BaseAPI.js') // for backward compatibility function getPackageName (packageName) { @@ -19,7 +19,7 @@ function getPackageName (packageName) { /** * API for extension's /install.js script */ -module.exports = class InstallAPI extends BaseAPI { +module.exports.InstallAPI = class InstallAPI extends BaseAPI { __hooks = { renderFolders: [], renderFiles: [], diff --git a/app-webpack/lib/app-extension/UninstallAPI.js b/app-webpack/lib/app-extension/UninstallAPI.js index 544f6c278e6..9d4dc4d08bb 100644 --- a/app-webpack/lib/app-extension/UninstallAPI.js +++ b/app-webpack/lib/app-extension/UninstallAPI.js @@ -1,9 +1,9 @@ const { removeSync } = require('fs-extra') const semver = require('semver') -const extensionJson = require('./extension-json.js') -const getPackageJson = require('../helpers/get-package-json.js') -const BaseAPI = require('./BaseAPI.js') +const { extensionJson } = require('./extension-json.js') +const { getPackageJson } = require('../helpers/get-package-json.js') +const { BaseAPI } = require('./BaseAPI.js') // for backward compatibility function getPackageName (packageName) { @@ -15,7 +15,7 @@ function getPackageName (packageName) { /** * API for extension's /uninstall.js script */ -module.exports = class UninstallAPI extends BaseAPI { +module.exports.UninstallAPI = class UninstallAPI extends BaseAPI { __hooks = { exitLog: [] } diff --git a/app-webpack/lib/app-extension/extension-json.js b/app-webpack/lib/app-extension/extension-json.js index 45cd337232f..01b5835eae2 100644 --- a/app-webpack/lib/app-extension/extension-json.js +++ b/app-webpack/lib/app-extension/extension-json.js @@ -90,4 +90,4 @@ class ExtensionJson { } } -module.exports = new ExtensionJson() +module.exports.extensionJson = new ExtensionJson() diff --git a/app-webpack/lib/app-extension/extensions-runner.js b/app-webpack/lib/app-extension/extensions-runner.js index c26104f8cb9..9b3d68709a6 100644 --- a/app-webpack/lib/app-extension/extensions-runner.js +++ b/app-webpack/lib/app-extension/extensions-runner.js @@ -1,7 +1,7 @@ const { merge } = require('webpack-merge') -const extensionJson = require('./extension-json.js') -const Extension = require('./Extension.js') +const { extensionJson } = require('./extension-json.js') +const { Extension } = require('./Extension.js') class ExtensionsRunner { constructor () { @@ -28,4 +28,4 @@ class ExtensionsRunner { } } -module.exports = new ExtensionsRunner() +module.exports.extensionsRunner = new ExtensionsRunner() diff --git a/app-webpack/lib/app-pkg.js b/app-webpack/lib/app-pkg.js new file mode 100644 index 00000000000..a55d5f3f009 --- /dev/null +++ b/app-webpack/lib/app-pkg.js @@ -0,0 +1,12 @@ + +const { getPackageJson } = require('./helpers/get-package-json.js') + +const appPaths = require('./app-paths.js') + +const cliPkg = require('../package.json') +const appPkg = require(appPaths.resolve.app('package.json')) +const quasarPkg = getPackageJson('quasar') + +module.exports.cliPkg = cliPkg +module.exports.appPkg = appPkg +module.exports.quasarPkg = quasarPkg diff --git a/app-webpack/lib/artifacts.js b/app-webpack/lib/artifacts.js index 608a1499225..9cc5211bec0 100644 --- a/app-webpack/lib/artifacts.js +++ b/app-webpack/lib/artifacts.js @@ -22,7 +22,7 @@ function save (content) { fs.writeFileSync(filePath, JSON.stringify(content), 'utf-8') } -module.exports.add = function (entry) { +module.exports.addArtifacts = function addArtifacts (entry) { const content = getArtifacts() if (!content.folders.includes(entry)) { @@ -32,7 +32,7 @@ module.exports.add = function (entry) { } } -module.exports.clean = function (folder) { +module.exports.cleanArtifacts = function cleanArtifacts (folder) { if (folder.endsWith(path.join('src-cordova', 'www'))) { fse.emptyDirSync(folder) } @@ -50,7 +50,7 @@ module.exports.clean = function (folder) { log(`Cleaned build artifact: ""${ folder }""`) } -module.exports.cleanAll = function () { +module.exports.cleanAllArtifacts = function cleanAllArtifacts () { getArtifacts().folders.forEach(folder => { if (folder.endsWith(path.join('src-cordova', 'www'))) { fse.emptyDirSync(folder) diff --git a/app-webpack/lib/capacitor/cap-cli.js b/app-webpack/lib/capacitor/cap-cli.js index bcb21767023..0d5d878f921 100644 --- a/app-webpack/lib/capacitor/cap-cli.js +++ b/app-webpack/lib/capacitor/cap-cli.js @@ -1,5 +1,5 @@ const appPaths = require('../app-paths.js') -const getPackagePath = require('../helpers/get-package-path.js') +const { getPackagePath } = require('../helpers/get-package-path.js') const getPackageMajorVersion = require('../helpers/get-package-major-version.js') module.exports.capBin = getPackagePath('@capacitor/cli/bin/capacitor', appPaths.capacitorDir) diff --git a/app-webpack/lib/capacitor/capacitor-config.js b/app-webpack/lib/capacitor/capacitor-config.js index 49ceebb177a..bc8f6ebc436 100644 --- a/app-webpack/lib/capacitor/capacitor-config.js +++ b/app-webpack/lib/capacitor/capacitor-config.js @@ -2,13 +2,14 @@ const fs = require('node:fs') const path = require('node:path') const appPaths = require('../app-paths.js') +const { appPkg } = require('../app-pkg.js') const { log, warn } = require('../helpers/logger.js') -const ensureConsistency = require('./ensure-consistency.js') +const { ensureConsistency } = require('./ensure-consistency.js') const { capVersion } = require('./cap-cli.js') // necessary for Capacitor 4+ -const nodePackager = require('../helpers/node-packager.js') -const getPackageJson = require('../helpers/get-package-json.js') +const { nodePackager } = require('../helpers/node-packager.js') +const { getPackageJson } = require('../helpers/get-package-json.js') // Capacitor 1 & 2 function getAndroidMainActivity (capVersion, appId) { @@ -54,20 +55,20 @@ public class EnableHttpsSelfSigned { } class CapacitorConfig { + #tamperedFiles + prepare (quasarConf, target) { ensureConsistency() - this.pkg = require(appPaths.resolve.app('package.json')) - - this.#updateCapPkg(quasarConf, this.pkg) + this.#updateCapPkg(quasarConf) log('Updated src-capacitor/package.json') - this.tamperedFiles = [] + this.#tamperedFiles = [] const capJsonPath = appPaths.resolve.capacitor('capacitor.config.json') const capJson = require(capJsonPath) - this.tamperedFiles.push({ + this.#tamperedFiles.push({ path: capJsonPath, name: 'capacitor.config.json', content: this.#updateCapJson(quasarConf, capJson), @@ -79,16 +80,16 @@ class CapacitorConfig { } reset () { - this.tamperedFiles.forEach(file => { + this.#tamperedFiles.forEach(file => { file.content = file.originalContent }) this.#save() - this.tamperedFiles = [] + this.#tamperedFiles = [] } #save () { - this.tamperedFiles.forEach(file => { + this.#tamperedFiles.forEach(file => { fs.writeFileSync(file.path, file.content, 'utf8') log(`Updated ${ file.name }`) }) @@ -97,7 +98,7 @@ class CapacitorConfig { #updateCapJson (quasarConf, originalCapCfg) { const capJson = { ...originalCapCfg } - capJson.appName = quasarConf.capacitor.appName || this.pkg.productName || 'Quasar App' + capJson.appName = quasarConf.capacitor.appName || appPkg.productName || 'Quasar App' capJson.bundledWebRuntime = false if (quasarConf.ctx.dev) { @@ -116,15 +117,15 @@ class CapacitorConfig { return JSON.stringify(capJson, null, 2) } - #updateCapPkg (quasarConf, pkg) { + #updateCapPkg (quasarConf) { const capPkgPath = appPaths.resolve.capacitor('package.json') const capPkg = require(capPkgPath) Object.assign(capPkg, { - name: quasarConf.capacitor.appName || pkg.name, - version: quasarConf.capacitor.version || pkg.version, - description: quasarConf.capacitor.description || pkg.description, - author: pkg.author + name: quasarConf.capacitor.appName || appPkg.name, + version: quasarConf.capacitor.version || appPkg.version, + description: quasarConf.capacitor.description || appPkg.description, + author: appPkg.author }) fs.writeFileSync(capPkgPath, JSON.stringify(capPkg, null, 2), 'utf-8') @@ -142,8 +143,9 @@ class CapacitorConfig { } const fn = `${ add ? '' : 'un' }installPackage` + const nameParam = add ? '@jcesarmobile/ssl-skip@^0.2.0' : '@jcesarmobile/ssl-skip' - nodePackager[ fn ]('@jcesarmobile/ssl-skip@^0.2.0', { + nodePackager[ fn ](nameParam, { cwd: appPaths.capacitorDir, displayName: 'Capacitor (DEVELOPMENT ONLY) SSL support' }) @@ -346,4 +348,4 @@ import com.getcapacitor.BridgeActivity;`) } } -module.exports = CapacitorConfig +module.exports.CapacitorConfig = CapacitorConfig diff --git a/app-webpack/lib/capacitor/ensure-consistency.js b/app-webpack/lib/capacitor/ensure-consistency.js index ab41670bb2e..2a1812c960f 100644 --- a/app-webpack/lib/capacitor/ensure-consistency.js +++ b/app-webpack/lib/capacitor/ensure-consistency.js @@ -2,7 +2,7 @@ const fs = require('node:fs') const fse = require('fs-extra') const appPaths = require('../app-paths.js') -const nodePackager = require('../helpers/node-packager.js') +const { nodePackager } = require('../helpers/node-packager.js') function ensureWWW (forced) { const www = appPaths.resolve.capacitor('www') @@ -28,7 +28,7 @@ function ensureDeps () { }) } -module.exports = function () { +module.exports.ensureConsistency = function ensureConsistency () { ensureWWW() ensureDeps() } diff --git a/app-webpack/lib/capacitor/index.js b/app-webpack/lib/capacitor/index.js index bb3fdbed13d..92c62b3536d 100644 --- a/app-webpack/lib/capacitor/index.js +++ b/app-webpack/lib/capacitor/index.js @@ -1,11 +1,12 @@ const fse = require('fs-extra') const { log, warn, fatal } = require('../helpers/logger.js') -const CapacitorConfig = require('./capacitor-config.js') -const { spawn, spawnSync } = require('../helpers/spawn.js') -const onShutdown = require('../helpers/on-shutdown.js') const appPaths = require('../app-paths.js') -const openIde = require('../helpers/open-ide.js') +const { CapacitorConfig } = require('./capacitor-config.js') +const { spawn, spawnSync } = require('../helpers/spawn.js') +const { onShutdown } = require('../helpers/on-shutdown.js') +const { openIDE } = require('../helpers/open-ide.js') +const { fixAndroidCleartext } = require('../helpers/fix-android-cleartext.js') const { capBin } = require('./cap-cli.js') @@ -24,7 +25,7 @@ class CapacitorRunner { this.target = ctx.targetName if (this.target === 'android') { - require('../helpers/fix-android-cleartext.js')('capacitor') + fixAndroidCleartext('capacitor') } } @@ -45,7 +46,7 @@ class CapacitorRunner { await this.__runCapacitorCommand(cfg.capacitor.capacitorCliPreparationParams) - await openIde('capacitor', cfg.bin, this.target, true) + await openIDE('capacitor', cfg.bin, this.target, true) } async build (quasarConfFile, argv) { @@ -60,7 +61,7 @@ class CapacitorRunner { } if (argv.ide === true) { - await openIde('capacitor', cfg.bin, this.target) + await openIDE('capacitor', cfg.bin, this.target) process.exit(0) } diff --git a/app-webpack/lib/cmd/build.js b/app-webpack/lib/cmd/build.js index 98d89fa5b06..28a79feb67c 100755 --- a/app-webpack/lib/cmd/build.js +++ b/app-webpack/lib/cmd/build.js @@ -89,10 +89,10 @@ if (argv.help) { process.exit(0) } -const ensureArgv = require('../helpers/ensure-argv.js') +const { ensureArgv } = require('../helpers/ensure-argv.js') ensureArgv(argv, 'build') -const ensureVueDeps = require('../helpers/ensure-vue-deps.js') +const { ensureVueDeps } = require('../helpers/ensure-vue-deps.js') ensureVueDeps() const path = require('node:path') @@ -104,8 +104,8 @@ console.log( ) ) -const banner = require('../helpers/banner.js') -banner(argv, 'build') +const { displayBanner } = require('../helpers/banner.js') +displayBanner(argv, 'build') const { log, fatal } = require('../helpers/logger.js') const { printWebpackErrors } = require('../helpers/print-webpack-issue/index.js') @@ -148,15 +148,15 @@ function finalizeBuild (mode, ctx, quasarConfFile) { async function build () { if (argv.mode !== 'spa') { - const installMissing = require('../mode/install-missing.js') + const { installMissing } = require('../mode/install-missing.js') await installMissing(argv.mode, argv.target) } - const QuasarConfFile = require('../quasar-config-file.js') - const Generator = require('../generator.js') - const artifacts = require('../artifacts.js') - const getQuasarCtx = require('../helpers/get-quasar-ctx.js') - const extensionRunner = require('../app-extension/extensions-runner.js') + const { QuasarConfigFile } = require('../quasar-config-file.js') + const { Generator } = require('../generator.js') + const { cleanArtifacts, addArtifacts } = require('../artifacts.js') + const { getQuasarCtx } = require('../helpers/get-quasar-ctx.js') + const { extensionsRunner } = require('../app-extension/extensions-runner.js') const regenerateTypesFeatureFlags = require('../helpers/types-feature-flags.js') const ctx = getQuasarCtx({ @@ -170,9 +170,9 @@ async function build () { }) // register app extensions - await extensionRunner.registerExtensions(ctx) + await extensionsRunner.registerExtensions(ctx) - const quasarConfFile = new QuasarConfFile(ctx, argv) + const quasarConfFile = new QuasarConfigFile(ctx, argv) try { await quasarConfFile.prepare() @@ -192,9 +192,9 @@ async function build () { let outputFolder = quasarConf.build.packagedDistDir || quasarConf.build.distDir - artifacts.clean(quasarConf.build.distDir) + cleanArtifacts(quasarConf.build.distDir) if (quasarConf.build.packagedDistDir) { - artifacts.clean(quasarConf.build.packagedDistDir) + cleanArtifacts(quasarConf.build.packagedDistDir) } generator.build() @@ -204,7 +204,7 @@ async function build () { } // run possible beforeBuild hooks - await extensionRunner.runHook('beforeBuild', async hook => { + await extensionsRunner.runHook('beforeBuild', async hook => { log(`Extension(${ hook.api.extId }): Running beforeBuild hook...`) await hook.fn(hook.api, { quasarConf }) }) @@ -232,9 +232,9 @@ async function build () { process.exit(1) } - artifacts.add(quasarConf.build.distDir) + addArtifacts(quasarConf.build.distDir) if (quasarConf.build.packagedDistDir) { - artifacts.add(quasarConf.build.packagedDistDir) + addArtifacts(quasarConf.build.packagedDistDir) } const statsArray = stats.stats @@ -249,7 +249,7 @@ async function build () { fatal(`for ""${ webpackData.name[ index ] }"" with ${ summary }. Please check the log above.`, 'COMPILATION FAILED') }) - const printWebpackStats = require('../helpers/print-webpack-stats.js') + const { printWebpackStats } = require('../helpers/print-webpack-stats.js') console.log() statsArray.forEach((stats, index) => { @@ -264,14 +264,14 @@ async function build () { ? path.join(outputFolder, '..') : outputFolder - banner(argv, 'build', { outputFolder, transpileBanner: quasarConf.__transpileBanner }) + displayBanner(argv, 'build', { outputFolder, transpileBanner: quasarConf.__transpileBanner }) if (typeof quasarConf.build.afterBuild === 'function') { await quasarConf.build.afterBuild({ quasarConf }) } // run possible beforeBuild hooks - await extensionRunner.runHook('afterBuild', async hook => { + await extensionsRunner.runHook('afterBuild', async hook => { log(`Extension(${ hook.api.extId }): Running afterBuild hook...`) await hook.fn(hook.api, { quasarConf }) }) @@ -288,7 +288,7 @@ async function build () { } // run possible onPublish hooks - await extensionRunner.runHook('onPublish', async hook => { + await extensionsRunner.runHook('onPublish', async hook => { log(`Extension(${ hook.api.extId }): Running onPublish hook...`) await hook.fn(hook.api, opts) }) diff --git a/app-webpack/lib/cmd/clean.js b/app-webpack/lib/cmd/clean.js index ea31e60d088..728fd12f64a 100755 --- a/app-webpack/lib/cmd/clean.js +++ b/app-webpack/lib/cmd/clean.js @@ -22,8 +22,8 @@ if (argv.help) { process.exit(0) } -const { cleanAll } = require('../artifacts.js') -cleanAll() +const { cleanAllArtifacts } = require('../artifacts.js') +cleanAllArtifacts() console.log() log('Done cleaning build artifacts\n') diff --git a/app-webpack/lib/cmd/describe.js b/app-webpack/lib/cmd/describe.js index 28d2a0143e3..b65528be2a7 100755 --- a/app-webpack/lib/cmd/describe.js +++ b/app-webpack/lib/cmd/describe.js @@ -2,7 +2,7 @@ const parseArgs = require('minimist') const chalk = require('chalk') -const getApi = require('../helpers/get-api.js') +const { getApi } = require('../helpers/get-api.js') const { fatal } = require('../helpers/logger.js') const partArgs = { @@ -496,7 +496,7 @@ async function run () { if (apiParts.docs) { if (api.meta && api.meta.docsUrl) { - const openBrowser = require('../helpers/open-browser.js') + const { openBrowser } = require('../helpers/open-browser.js') openBrowser({ url: api.meta.docsUrl, wait: false }) } else { @@ -525,7 +525,7 @@ async function run () { } function listElements () { - const getPackage = require('../helpers/get-package.js') + const { getPackage } = require('../helpers/get-package.js') let api = getPackage('quasar/dist/transforms/api-list.json') if (api === void 0) { diff --git a/app-webpack/lib/cmd/dev.js b/app-webpack/lib/cmd/dev.js index 2ae7a76daa8..bcdb5b13727 100755 --- a/app-webpack/lib/cmd/dev.js +++ b/app-webpack/lib/cmd/dev.js @@ -76,10 +76,10 @@ if (argv.help) { process.exit(0) } -const ensureArgv = require('../helpers/ensure-argv.js') +const { ensureArgv } = require('../helpers/ensure-argv.js') ensureArgv(argv, 'dev') -const ensureVueDeps = require('../helpers/ensure-vue-deps.js') +const { ensureVueDeps } = require('../helpers/ensure-vue-deps.js') ensureVueDeps() console.log( @@ -89,8 +89,8 @@ console.log( ) ) -const banner = require('../helpers/banner.js') -banner(argv, 'dev') +const { displayBanner } = require('../helpers/banner.js') +displayBanner(argv, 'dev') const findPort = require('../helpers/net.js').findClosestOpenPort @@ -102,7 +102,7 @@ async function parseAddress ({ host, port }) { [ 'cordova', 'capacitor' ].includes(argv.mode) && (!host || [ '0.0.0.0', 'localhost', '127.0.0.1', '::1' ].includes(host.toLowerCase())) ) { - const getExternalIP = require('../helpers/get-external-ip.js') + const { getExternalIP } = require('../helpers/get-external-ip.js') host = await getExternalIP() this.chosenHost = host } @@ -146,7 +146,7 @@ async function parseAddress ({ host, port }) { function startVueDevtools () { const { spawn } = require('../helpers/spawn.js') - const getPackagePath = require('../helpers/get-package-path.js') + const { getPackagePath } = require('../helpers/get-package-path.js') let vueDevtoolsBin = getPackagePath('@vue/devtools/bin.js') @@ -160,8 +160,7 @@ function startVueDevtools () { return } - const nodePackager = require('../helpers/node-packager.js') - + const { nodePackager } = require('../helpers/node-packager.js') nodePackager.installPackage('@vue/devtools', { isDevDependency: true }) // a small delay is a must, otherwise require.resolve @@ -175,17 +174,17 @@ function startVueDevtools () { async function goLive () { if (argv.mode !== 'spa') { - const installMissing = require('../mode/install-missing.js') + const { installMissing } = require('../mode/install-missing.js') await installMissing(argv.mode, argv.target) } - const DevServer = argv.mode === 'ssr' + const { DevServer } = argv.mode === 'ssr' ? require('../dev-server-ssr.js') : require('../dev-server-regular.js') - const QuasarConfFile = require('../quasar-config-file.js') - const Generator = require('../generator.js') - const getQuasarCtx = require('../helpers/get-quasar-ctx.js') - const extensionRunner = require('../app-extension/extensions-runner.js') + const { QuasarConfigFile } = require('../quasar-config-file.js') + const { Generator } = require('../generator.js') + const { getQuasarCtx } = require('../helpers/get-quasar-ctx.js') + const { extensionsRunner } = require('../app-extension/extensions-runner.js') const regenerateTypesFeatureFlags = require('../helpers/types-feature-flags.js') const ctx = getQuasarCtx({ @@ -197,9 +196,9 @@ async function goLive () { }) // register app extensions - await extensionRunner.registerExtensions(ctx) + await extensionsRunner.registerExtensions(ctx) - const quasarConfFile = new QuasarConfFile(ctx, { + const quasarConfFile = new QuasarConfigFile(ctx, { port: argv.port, host: argv.hostname, onAddress: parseAddress, @@ -236,7 +235,7 @@ async function goLive () { } // run possible beforeDev hooks - await extensionRunner.runHook('beforeDev', async hook => { + await extensionsRunner.runHook('beforeDev', async hook => { log(`Extension(${ hook.api.extId }): Running beforeDev hook...`) await hook.fn(hook.api, { quasarConf }) }) @@ -285,7 +284,7 @@ async function goLive () { await quasarConf.build.afterDev({ quasarConf }) } // run possible afterDev hooks - await extensionRunner.runHook('afterDev', async hook => { + await extensionsRunner.runHook('afterDev', async hook => { log(`Extension(${ hook.api.extId }): Running afterDev hook...`) await hook.fn(hook.api, { quasarConf }) }) diff --git a/app-webpack/lib/cmd/ext.js b/app-webpack/lib/cmd/ext.js index d23822779db..42dd1667cac 100755 --- a/app-webpack/lib/cmd/ext.js +++ b/app-webpack/lib/cmd/ext.js @@ -52,7 +52,7 @@ if (argv._.length !== 0 && argv._.length !== 2) { } async function run (action, name) { - const Extension = require('../app-extension/Extension.js') + const { Extension } = require('../app-extension/Extension.js') const extension = new Extension(name) await extension[ @@ -63,7 +63,7 @@ async function run (action, name) { } if (argv._.length === 0) { - const extensionJson = require('../app-extension/extension-json.js') + const { extensionJson } = require('../app-extension/extension-json.js') extensionJson.list() } else { diff --git a/app-webpack/lib/cmd/help.js b/app-webpack/lib/cmd/help.js index 8c5b49e3cb2..6ba768bd66b 100755 --- a/app-webpack/lib/cmd/help.js +++ b/app-webpack/lib/cmd/help.js @@ -1,4 +1,6 @@ +const { cliPkg } = require('../app-pkg.js') + console.log() console.log( require('node:fs').readFileSync( @@ -10,7 +12,7 @@ console.log( if (process.env.QUASAR_CLI_VERSION) { console.log(' Running @quasar/cli v' + process.env.QUASAR_CLI_VERSION) } -console.log(' Running @quasar/app-webpack v' + require('../../package.json').version) +console.log(' Running @quasar/app-webpack v' + cliPkg.version) console.log(` Example usage diff --git a/app-webpack/lib/cmd/info.js b/app-webpack/lib/cmd/info.js index 92e401c445b..ff1c6a6a43e 100755 --- a/app-webpack/lib/cmd/info.js +++ b/app-webpack/lib/cmd/info.js @@ -2,7 +2,7 @@ const parseArgs = require('minimist') const chalk = require('chalk') -const getPackageJson = require('../helpers/get-package-json.js') +const { getPackageJson } = require('../helpers/get-package-json.js') const argv = parseArgs(process.argv.slice(2), { alias: { @@ -103,11 +103,11 @@ print({ key: 'Important local packages', section: true }) print({ key: 'Quasar App Extensions', section: true }) -const extensionJson = require('../app-extension/extension-json.js') +const { extensionJson } = require('../app-extension/extension-json.js') const extensions = Object.keys(extensionJson.getList()) if (extensions.length > 0) { - const Extension = require('../app-extension/Extension.js') + const { Extension } = require('../app-extension/Extension.js') extensions.forEach(ext => { const instance = new Extension(ext) print(safePkgInfo(instance.packageName)) diff --git a/app-webpack/lib/cmd/inspect.js b/app-webpack/lib/cmd/inspect.js index 85802940e81..015afafe5eb 100755 --- a/app-webpack/lib/cmd/inspect.js +++ b/app-webpack/lib/cmd/inspect.js @@ -43,26 +43,29 @@ if (argv.help) { process.exit(0) } -require('../helpers/ensure-argv.js')(argv, 'inspect') -require('../helpers/banner.js')(argv, argv.cmd) +const { ensureArgv } = require('../helpers/ensure-argv.js') +ensureArgv(argv, 'inspect') + +const { displayBanner } = require('../helpers/banner.js') +displayBanner(argv, argv.cmd) const { log, fatal } = require('../helpers/logger.js') if (argv.mode !== 'spa') { - const getMode = require('../mode/index.js') - if (getMode(argv.mode).isInstalled !== true) { + const { getQuasarMode } = require('../mode/index.js') + if (getQuasarMode(argv.mode).isInstalled !== true) { fatal('Requested mode for inspection is NOT installed.') } } -const QuasarConfFile = require('../quasar-config-file.js') +const { QuasarConfigFile } = require('../quasar-config-file.js') const { splitWebpackConfig } = require('../webpack/symbols.js') const depth = parseInt(argv.depth, 10) || Infinity async function inspect () { - const extensionRunner = require('../app-extension/extensions-runner.js') - const getQuasarCtx = require('../helpers/get-quasar-ctx.js') + const { extensionsRunner } = require('../app-extension/extensions-runner.js') + const { getQuasarCtx } = require('../helpers/get-quasar-ctx.js') const ctx = getQuasarCtx({ mode: argv.mode, @@ -75,9 +78,9 @@ async function inspect () { }) // register app extensions - await extensionRunner.registerExtensions(ctx) + await extensionsRunner.registerExtensions(ctx) - const quasarConfFile = new QuasarConfFile(ctx) + const quasarConfFile = new QuasarConfigFile(ctx) try { await quasarConfFile.prepare() diff --git a/app-webpack/lib/cmd/mode.js b/app-webpack/lib/cmd/mode.js index 2174ded9bae..cd7f771a534 100755 --- a/app-webpack/lib/cmd/mode.js +++ b/app-webpack/lib/cmd/mode.js @@ -42,7 +42,7 @@ if (argv._.length !== 0 && argv._.length !== 2) { process.exit(1) } -const getMode = require('../mode/index.js') +const { getQuasarMode } = require('../mode/index.js') const { green, grey } = require('chalk') async function run () { @@ -59,7 +59,7 @@ async function run () { fatal(`Unknown mode ""${ mode }"" to ${ action }`) } - const cliMode = getMode(mode) + const cliMode = getQuasarMode(mode) if (action === 'remove' && argv.yes !== true && cliMode.isInstalled) { console.log() @@ -90,7 +90,7 @@ function displayModes () { ;[ 'pwa', 'ssr', 'cordova', 'capacitor', 'electron', 'bex' ].forEach(mode => { info.push([ `Mode ${ mode.toUpperCase() }`, - getMode(mode).isInstalled ? green('yes') : grey('no') + getQuasarMode(mode).isInstalled ? green('yes') : grey('no') ]) }) diff --git a/app-webpack/lib/cmd/new.js b/app-webpack/lib/cmd/new.js index 2e312f5aedb..c261f50ae6f 100755 --- a/app-webpack/lib/cmd/new.js +++ b/app-webpack/lib/cmd/new.js @@ -7,7 +7,7 @@ const fse = require('fs-extra') const { log, warn } = require('../helpers/logger.js') const appPaths = require('../app-paths.js') const storeProvider = require('../helpers/store-provider.js') -const hasTypescript = require('../helpers/has-typescript.js') +const { hasTypescript } = require('../helpers/has-typescript.js') const argv = parseArgs(process.argv.slice(2), { alias: { diff --git a/app-webpack/lib/cmd/run.js b/app-webpack/lib/cmd/run.js index b7bd939abd0..fef3a96793c 100755 --- a/app-webpack/lib/cmd/run.js +++ b/app-webpack/lib/cmd/run.js @@ -46,7 +46,7 @@ function getArgv (argv) { } async function run () { - const Extension = require('../app-extension/Extension.js') + const { Extension } = require('../app-extension/Extension.js') const extension = new Extension(extId) const hooks = await extension.run({}) diff --git a/app-webpack/lib/cmd/test.js b/app-webpack/lib/cmd/test.js index 54d47b42d09..2dcdb9c108d 100755 --- a/app-webpack/lib/cmd/test.js +++ b/app-webpack/lib/cmd/test.js @@ -43,7 +43,7 @@ function getArgv (argv) { } async function run () { - const Extension = require('../app-extension/Extension.js') + const { Extension } = require('../app-extension/Extension.js') const extension = new Extension('@quasar/testing') const hooks = await extension.run() diff --git a/app-webpack/lib/cordova/cordova-config.js b/app-webpack/lib/cordova/cordova-config.js index 74518f4d5f0..2183deb1951 100644 --- a/app-webpack/lib/cordova/cordova-config.js +++ b/app-webpack/lib/cordova/cordova-config.js @@ -2,8 +2,9 @@ const fs = require('node:fs') const et = require('elementtree') const appPaths = require('../app-paths.js') +const { appPkg } = require('../app-pkg.js') const { log, warn } = require('../helpers/logger.js') -const ensureConsistency = require('./ensure-consistency.js') +const { ensureConsistency } = require('./ensure-consistency.js') const filePath = appPaths.resolve.cordova('config.xml') @@ -36,35 +37,38 @@ function setFields (root, cfg) { } class CordovaConfig { + #tamperedFiles + #AppURL + prepare (cfg) { ensureConsistency() const doc = et.parse(fs.readFileSync(filePath, 'utf-8')) - this.pkg = require(appPaths.resolve.app('package.json')) - this.APP_URL = cfg.build.APP_URL - this.tamperedFiles = [] + + this.#AppURL = cfg.build.APP_URL + this.#tamperedFiles = [] const root = doc.getroot() - root.set('version', cfg.cordova.version || this.pkg.version) + root.set('version', cfg.cordova.version || appPkg.version) if (cfg.cordova.androidVersionCode) { root.set('android-versionCode', cfg.cordova.androidVersionCode) } setFields(root, { - content: { src: this.APP_URL }, - description: cfg.cordova.description || this.pkg.description + content: { src: this.#AppURL }, + description: cfg.cordova.description || appPkg.description }) - if (this.APP_URL !== 'index.html' && !root.find(`allow-navigation[@href='${ this.APP_URL }']`)) { - et.SubElement(root, 'allow-navigation', { href: this.APP_URL }) + if (this.#AppURL !== 'index.html' && !root.find(`allow-navigation[@href='${ this.#AppURL }']`)) { + et.SubElement(root, 'allow-navigation', { href: this.#AppURL }) if (cfg.devServer.server.type === 'https' && cfg.ctx.targetName === 'ios') { const node = root.find('name') if (node) { - this.__prepareAppDelegate(node) - this.__prepareWkWebEngine(node) + this.#prepareAppDelegate(node) + this.#prepareWkWebEngine(node) } } } @@ -74,11 +78,11 @@ class CordovaConfig { et.SubElement(root, 'allow-navigation', { href: 'about:*' }) } - this.__save(doc) + this.#save(doc) } reset () { - if (!this.APP_URL || this.APP_URL === 'index.html') { + if (!this.#AppURL || this.#AppURL === 'index.html') { return } @@ -87,32 +91,32 @@ class CordovaConfig { root.find('content').set('src', 'index.html') - const nav = root.find(`allow-navigation[@href='${ this.APP_URL }']`) + const nav = root.find(`allow-navigation[@href='${ this.#AppURL }']`) if (nav) { root.remove(nav) } - this.tamperedFiles.forEach(file => { + this.#tamperedFiles.forEach(file => { file.content = file.originalContent }) - this.__save(doc) + this.#save(doc) - this.tamperedFiles = [] + this.#tamperedFiles = [] } - __save (doc) { + #save (doc) { const content = doc.write({ indent: 4 }) fs.writeFileSync(filePath, content, 'utf8') log('Updated Cordova config.xml') - this.tamperedFiles.forEach(file => { + this.#tamperedFiles.forEach(file => { fs.writeFileSync(file.path, file.content, 'utf8') log(`Updated ${ file.name }`) }) } - __prepareAppDelegate (node) { + #prepareAppDelegate (node) { const appDelegatePath = appPaths.resolve.cordova( `platforms/ios/${ node.text }/Classes/AppDelegate.m` ) @@ -149,12 +153,12 @@ return YES; } @end ` - this.tamperedFiles.push(tamperedFile) + this.#tamperedFiles.push(tamperedFile) } } } - __prepareWkWebEngine (node) { + #prepareWkWebEngine (node) { [ 'cordova-plugin-ionic-webview', 'cordova-plugin-wkwebview-engine' @@ -187,11 +191,11 @@ return YES; } ` + tamperedFile.originalContent.substring(insertIndex) - this.tamperedFiles.push(tamperedFile) + this.#tamperedFiles.push(tamperedFile) } } }) } } -module.exports = CordovaConfig +module.exports.CordovaConfig = CordovaConfig diff --git a/app-webpack/lib/cordova/ensure-consistency.js b/app-webpack/lib/cordova/ensure-consistency.js index 12bf121a1a3..c4276c535fb 100644 --- a/app-webpack/lib/cordova/ensure-consistency.js +++ b/app-webpack/lib/cordova/ensure-consistency.js @@ -35,7 +35,7 @@ function ensureDeps () { ) } -module.exports = function () { +module.exports.ensureConsistency = function ensureConsistency () { ensureWWW() ensureDeps() } diff --git a/app-webpack/lib/cordova/index.js b/app-webpack/lib/cordova/index.js index 2d6f9bf440c..8ed40210cc4 100644 --- a/app-webpack/lib/cordova/index.js +++ b/app-webpack/lib/cordova/index.js @@ -1,11 +1,12 @@ const fse = require('fs-extra') +const appPaths = require('../app-paths.js') const { log, fatal } = require('../helpers/logger.js') -const CordovaConfig = require('./cordova-config.js') +const { CordovaConfig } = require('./cordova-config.js') const { spawn } = require('../helpers/spawn.js') -const onShutdown = require('../helpers/on-shutdown.js') -const appPaths = require('../app-paths.js') -const openIde = require('../helpers/open-ide.js') +const { onShutdown } = require('../helpers/on-shutdown.js') +const { openIDE } = require('../helpers/open-ide.js') +const { fixAndroidCleartext } = require('../helpers/fix-android-cleartext.js') class CordovaRunner { constructor () { @@ -22,7 +23,7 @@ class CordovaRunner { this.target = ctx.targetName if (this.target === 'android') { - require('../helpers/fix-android-cleartext.js')('cordova') + fixAndroidCleartext('cordova') } } @@ -46,7 +47,7 @@ class CordovaRunner { [ 'prepare', this.target ].concat(argv._) ) - await openIde('cordova', cfg.bin, this.target, true) + await openIDE('cordova', cfg.bin, this.target, true) return } @@ -87,7 +88,7 @@ class CordovaRunner { } if (argv.ide) { - await openIde('cordova', cfg.bin, this.target) + await openIDE('cordova', cfg.bin, this.target) process.exit(0) } diff --git a/app-webpack/lib/dev-server-regular.js b/app-webpack/lib/dev-server-regular.js index 24bbb5d17ae..01d30bf170c 100644 --- a/app-webpack/lib/dev-server-regular.js +++ b/app-webpack/lib/dev-server-regular.js @@ -1,11 +1,11 @@ const webpack = require('webpack') const WebpackDevServer = require('webpack-dev-server') -const openBrowser = require('./helpers/open-browser.js') +const { openBrowser } = require('./helpers/open-browser.js') let openedBrowser = false -module.exports = class DevServer { +module.exports.DevServer = class DevServer { constructor (quasarConfFile) { this.quasarConfFile = quasarConfFile this.server = null diff --git a/app-webpack/lib/dev-server-ssr.js b/app-webpack/lib/dev-server-ssr.js index 29e2ed01686..b2649224329 100644 --- a/app-webpack/lib/dev-server-ssr.js +++ b/app-webpack/lib/dev-server-ssr.js @@ -12,9 +12,9 @@ const { doneExternalWork } = require('./webpack/plugin.progress.js') const { webpackNames } = require('./webpack/symbols.js') const appPaths = require('./app-paths.js') -const getPackage = require('./helpers/get-package.js') +const { getPackage } = require('./helpers/get-package.js') const { renderToString } = getPackage('vue/server-renderer') -const openBrowser = require('./helpers/open-browser.js') +const { openBrowser } = require('./helpers/open-browser.js') const banner = '[Quasar Dev Webserver]' const compiledMiddlewareFile = appPaths.resolve.app('.quasar/ssr/compiled-middlewares.js') @@ -32,7 +32,7 @@ const doubleSlashRE = /\/\//g let openedBrowser = false -module.exports = class DevServer { +module.exports.DevServer = class DevServer { constructor (quasarConfFile) { this.quasarConfFile = quasarConfFile this.setInitialState() diff --git a/app-webpack/lib/electron/bundler.js b/app-webpack/lib/electron/bundler.js index 151d69ae954..1c834628a24 100644 --- a/app-webpack/lib/electron/bundler.js +++ b/app-webpack/lib/electron/bundler.js @@ -1,5 +1,5 @@ -const appPaths = require('../app-paths.js') -const getPackage = require('../helpers/get-package.js') +const { appPkg } = require('../app-pkg.js') +const { getPackage } = require('../helpers/get-package.js') const { fatal } = require('../helpers/logger.js') const versions = { @@ -12,7 +12,7 @@ function isValidName (bundlerName) { } function installBundler (bundlerName) { - const nodePackager = require('../helpers/node-packager.js') + const { nodePackager } = require('../helpers/node-packager.js') nodePackager.installPackage( `electron-${ bundlerName }@^${ versions[ bundlerName ] }`, @@ -21,7 +21,6 @@ function installBundler (bundlerName) { } function bundlerIsInstalled (bundlerName) { - const appPkg = require(appPaths.resolve.app('package.json')) const pgkName = `electron-${ bundlerName }` return ( (appPkg.devDependencies && appPkg.devDependencies[ pgkName ]) @@ -31,7 +30,7 @@ function bundlerIsInstalled (bundlerName) { module.exports.bundlerIsInstalled = bundlerIsInstalled -module.exports.ensureInstall = function (bundlerName) { +module.exports.ensureInstall = function ensureInstall (bundlerName) { if (!isValidName(bundlerName)) { fatal(`Unknown bundler ""${ bundlerName }"" for Electron`) } @@ -41,7 +40,7 @@ module.exports.ensureInstall = function (bundlerName) { } } -module.exports.getDefaultName = function () { +module.exports.getDefaultName = function getDefaultName () { if (bundlerIsInstalled('packager')) { return 'packager' } @@ -53,6 +52,6 @@ module.exports.getDefaultName = function () { return 'packager' } -module.exports.getBundler = function (bundlerName) { +module.exports.getBundler = function getBundler (bundlerName) { return getPackage(`electron-${ bundlerName }`) } diff --git a/app-webpack/lib/electron/index.js b/app-webpack/lib/electron/index.js index 1a2a0e10973..16415c388a9 100644 --- a/app-webpack/lib/electron/index.js +++ b/app-webpack/lib/electron/index.js @@ -4,9 +4,9 @@ const debounce = require('lodash/debounce.js') const { log, warn, fatal, success } = require('../helpers/logger.js') const { spawn } = require('../helpers/spawn.js') const appPaths = require('../app-paths.js') -const nodePackager = require('../helpers/node-packager.js') -const getPackageJson = require('../helpers/get-package-json.js') -const getPackage = require('../helpers/get-package.js') +const { nodePackager } = require('../helpers/node-packager.js') +const { getPackageJson } = require('../helpers/get-package-json.js') +const { getPackage } = require('../helpers/get-package.js') class ElectronRunner { constructor () { diff --git a/app-webpack/lib/generator.js b/app-webpack/lib/generator.js index a42a1ee2b16..ee0c4cab535 100644 --- a/app-webpack/lib/generator.js +++ b/app-webpack/lib/generator.js @@ -5,12 +5,16 @@ const compileTemplate = require('lodash/template.js') const appPaths = require('./app-paths.js') const quasarFolder = appPaths.resolve.app('.quasar') -class Generator { +module.exports.Generator = class Generator { + #alreadyGenerated + #quasarConfFile + #files + constructor (quasarConfFile) { const { ctx } = quasarConfFile.quasarConf - this.alreadyGenerated = false - this.quasarConfFile = quasarConfFile + this.#alreadyGenerated = false + this.#quasarConfFile = quasarConfFile const paths = [ 'app.js', @@ -33,7 +37,7 @@ class Generator { } } - this.files = paths.map(file => { + this.#files = paths.map(file => { const content = fs.readFileSync( appPaths.resolve.cli(`templates/entry/${ file }`), 'utf-8' @@ -50,7 +54,7 @@ class Generator { } build () { - const data = this.quasarConfFile.quasarConf + const data = this.#quasarConfFile.quasarConf // ensure .quasar folder if (!fs.existsSync(quasarFolder)) { @@ -62,20 +66,18 @@ class Generator { fs.mkdirSync(quasarFolder) } - this.files.forEach(file => { + this.#files.forEach(file => { fs.writeFileSync(file.dest, file.template(data), 'utf-8') }) - if (!this.alreadyGenerated) { + if (!this.#alreadyGenerated) { const then = Date.now() / 1000 - 120 - this.files.forEach(file => { + this.#files.forEach(file => { fs.utimes(file.dest, then, then, function (err) { if (err) throw err }) }) - this.alreadyGenerated = true + this.#alreadyGenerated = true } } } - -module.exports = Generator diff --git a/app-webpack/lib/helpers/animations.js b/app-webpack/lib/helpers/animations.js index 95d023add9f..27222c1b17a 100644 --- a/app-webpack/lib/helpers/animations.js +++ b/app-webpack/lib/helpers/animations.js @@ -1,4 +1,4 @@ -const getPackage = require('./get-package.js') +const { getPackage } = require('./get-package.js') const { generalAnimations, @@ -6,4 +6,4 @@ const { outAnimations } = getPackage('@quasar/extras/animate/animate-list.common') -module.exports = generalAnimations.concat(inAnimations).concat(outAnimations) +module.exports.animations = generalAnimations.concat(inAnimations).concat(outAnimations) diff --git a/app-webpack/lib/helpers/app-files-validations.js b/app-webpack/lib/helpers/app-files-validations.js index 84c949fb956..d4407a0341a 100644 --- a/app-webpack/lib/helpers/app-files-validations.js +++ b/app-webpack/lib/helpers/app-files-validations.js @@ -3,7 +3,7 @@ const fs = require('node:fs') const { warn } = require('./logger.js') const appPaths = require('../app-paths.js') -module.exports = function (cfg) { +module.exports.appFilesValidations = function appFilesValidations (cfg) { let error = false const file = appPaths.resolve.app(cfg.sourceFiles.indexHtmlTemplate) diff --git a/app-webpack/lib/helpers/banner.js b/app-webpack/lib/helpers/banner.js index 6ecdf36ed10..e4409c55294 100644 --- a/app-webpack/lib/helpers/banner.js +++ b/app-webpack/lib/helpers/banner.js @@ -1,9 +1,7 @@ const { green, grey, underline } = require('chalk') +const { quasarPkg, cliPkg } = require('../app-pkg.js') const { getBrowsersBanner } = require('./browsers-support.js') -const getPackageJson = require('./get-package-json.js') -const quasarVersion = getPackageJson('quasar').version -const cliAppVersion = require('../../package.json').version function getPackager (argv, cmd) { if (argv.ide || (argv.mode === 'capacitor' && cmd === 'dev')) { @@ -19,7 +17,7 @@ function getPackager (argv, cmd) { : 'gradle' } -module.exports = function (argv, cmd, details) { +module.exports.displayBanner = function displayBanner (argv, cmd, details) { let banner = '' if (details) { @@ -28,8 +26,8 @@ module.exports = function (argv, cmd, details) { banner += ` ${ cmd === 'dev' ? 'Dev mode..................' : 'Build mode................' } ${ green(argv.mode) } - Pkg quasar................ ${ green('v' + quasarVersion) } - Pkg @quasar/app-webpack... ${ green('v' + cliAppVersion) } + Pkg quasar................ ${ green('v' + quasarPkg.version) } + Pkg @quasar/app-webpack... ${ green('v' + cliPkg.version) } Pkg webpack............... ${ green('v5') } Debugging................. ${ cmd === 'dev' || argv.debug ? green('enabled') : grey('no') }` @@ -109,6 +107,3 @@ module.exports = function (argv, cmd, details) { console.log(getBrowsersBanner()) } } - -module.exports.quasarVersion = quasarVersion -module.exports.cliAppVersion = cliAppVersion diff --git a/app-webpack/lib/helpers/css-variables.js b/app-webpack/lib/helpers/css-variables.js index 882b4f0e7dd..f3e9c55012c 100644 --- a/app-webpack/lib/helpers/css-variables.js +++ b/app-webpack/lib/helpers/css-variables.js @@ -24,4 +24,4 @@ for (const ext of Object.keys(cssVariables.appFile)) { } } -module.exports = cssVariables +module.exports.cssVariables = cssVariables diff --git a/app-webpack/lib/helpers/ensure-argv.js b/app-webpack/lib/helpers/ensure-argv.js index 23e6619228b..40779e3cc0e 100644 --- a/app-webpack/lib/helpers/ensure-argv.js +++ b/app-webpack/lib/helpers/ensure-argv.js @@ -1,6 +1,6 @@ const { fatal } = require('./logger.js') -module.exports = function (argv, cmd) { +module.exports.ensureArgv = function ensureArgv (argv, cmd) { if (argv.mode) { if (argv.mode === 'ios') { argv.m = argv.mode = 'cordova' @@ -53,7 +53,7 @@ module.exports = function (argv, cmd) { } } -module.exports.ensureElectronArgv = function (bundlerName, argv) { +module.exports.ensureElectronArgv = function ensureElectronArgv (bundlerName, argv) { if (![ 'packager', 'builder' ].includes(bundlerName)) { fatal(`Unknown bundler ""${ bundlerName }"" for Electron`) } diff --git a/app-webpack/lib/helpers/ensure-vue-deps.js b/app-webpack/lib/helpers/ensure-vue-deps.js index d07bedbd374..6ff28c9b6aa 100644 --- a/app-webpack/lib/helpers/ensure-vue-deps.js +++ b/app-webpack/lib/helpers/ensure-vue-deps.js @@ -1,9 +1,8 @@ const { log } = require('../helpers/logger.js') -const nodePackager = require('../helpers/node-packager.js') +const { nodePackager } = require('../helpers/node-packager.js') +const { getPackagePath } = require('./get-package-path.js') -const getPackagePath = require('./get-package-path.js') - -module.exports = function () { +module.exports.ensureVueDeps = function ensureVueDeps () { const packagesToInstall = [ getPackagePath('vue') === void 0 ? 'vue@^3.0.0' : '', getPackagePath('vue-router') === void 0 ? 'vue-router@^4.0.0' : '' diff --git a/app-webpack/lib/helpers/fix-android-cleartext.js b/app-webpack/lib/helpers/fix-android-cleartext.js index 0922f1bf059..284310ea017 100644 --- a/app-webpack/lib/helpers/fix-android-cleartext.js +++ b/app-webpack/lib/helpers/fix-android-cleartext.js @@ -1,7 +1,7 @@ const fs = require('node:fs') const appPaths = require('../app-paths.js') -module.exports = function (mode) { +module.exports.fixAndroidCleartext = function fixAndroidCleartext (mode) { const androidManifestPath = appPaths.resolve[ mode ]( mode === 'cordova' ? 'platforms/android/app/src/main/AndroidManifest.xml' diff --git a/app-webpack/lib/helpers/get-api.js b/app-webpack/lib/helpers/get-api.js index 7c92d39d724..4ab2ca26b16 100644 --- a/app-webpack/lib/helpers/get-api.js +++ b/app-webpack/lib/helpers/get-api.js @@ -1,7 +1,7 @@ const appPaths = require('../app-paths.js') const { fatal } = require('./logger.js') -module.exports = async function getApi (item) { +module.exports.getApi = async function (item) { try { const api = require( require.resolve(`quasar/dist/api/${ item }.json`, { @@ -16,11 +16,11 @@ module.exports = async function getApi (item) { /* do nothing */ } - const extensionJson = require('../app-extension/extension-json.js') + const { extensionJson } = require('../app-extension/extension-json.js') const extensions = Object.keys(extensionJson.getList()) if (extensions.length > 0) { - const Extension = require('../app-extension/Extension.js') + const { Extension } = require('../app-extension/Extension.js') for (const ext of extensions) { const instance = new Extension(ext) diff --git a/app-webpack/lib/helpers/get-caller-path.js b/app-webpack/lib/helpers/get-caller-path.js index 5477b5ff701..c9d3efdb3df 100644 --- a/app-webpack/lib/helpers/get-caller-path.js +++ b/app-webpack/lib/helpers/get-caller-path.js @@ -1,6 +1,6 @@ const path = require('node:path') -module.exports = function getCallerPath () { +module.exports.getCallerPath = function getCallerPath () { const _prepareStackTrace = Error.prepareStackTrace Error.prepareStackTrace = (_, stack) => stack const stack = new Error().stack.slice(1) diff --git a/app-webpack/lib/helpers/get-external-ip.js b/app-webpack/lib/helpers/get-external-ip.js index d1d1ee3d9af..41482c4f4d7 100644 --- a/app-webpack/lib/helpers/get-external-ip.js +++ b/app-webpack/lib/helpers/get-external-ip.js @@ -1,6 +1,6 @@ const { warn, fatal } = require('./logger.js') -module.exports = async function () { +module.exports.getExternalIP = async function () { const { getExternalNetworkInterface } = require('./net.js') const interfaces = await getExternalNetworkInterface() diff --git a/app-webpack/lib/helpers/get-fixed-deps.js b/app-webpack/lib/helpers/get-fixed-deps.js index 6ba6519bae0..cd52f1ae8e3 100644 --- a/app-webpack/lib/helpers/get-fixed-deps.js +++ b/app-webpack/lib/helpers/get-fixed-deps.js @@ -1,4 +1,4 @@ -const getPackageJson = require('./get-package-json.js') +const { getPackageJson } = require('./get-package-json.js') const urlRangePattern = /^[a-zA-Z]/ @@ -12,7 +12,7 @@ const urlRangePattern = /^[a-zA-Z]/ * // { 'quasar': '2.7.1', 'whatever': 'https://some.url' } * ``` */ -module.exports = function getFixedDeps (deps) { +module.exports.getFixedDeps = function getFixedDeps (deps) { if (!deps) { return {} } diff --git a/app-webpack/lib/helpers/get-package-json.js b/app-webpack/lib/helpers/get-package-json.js index 49ada326248..d7acaf974bc 100644 --- a/app-webpack/lib/helpers/get-package-json.js +++ b/app-webpack/lib/helpers/get-package-json.js @@ -1,5 +1,5 @@ const appPaths = require('../app-paths.js') -const getPackagePath = require('./get-package-path.js') +const { getPackagePath } = require('./get-package-path.js') /** * Get package.json of a host package. @@ -7,7 +7,7 @@ const getPackagePath = require('./get-package-path.js') * Don't use it for direct dependencies of this project. * Use plain `require('pkg')` and `require.resolve('pkg')` instead. */ -module.exports = function getPackageJson (pkgName, folder = appPaths.appDir) { +module.exports.getPackageJson = function getPackageJson (pkgName, folder = appPaths.appDir) { try { return require(getPackagePath(`${ pkgName }/package.json`, folder)) } diff --git a/app-webpack/lib/helpers/get-package-major-version.js b/app-webpack/lib/helpers/get-package-major-version.js index ceb54b6093d..b98c4ca2432 100644 --- a/app-webpack/lib/helpers/get-package-major-version.js +++ b/app-webpack/lib/helpers/get-package-major-version.js @@ -1,5 +1,5 @@ const appPaths = require('../app-paths.js') -const getPackageJson = require('./get-package-json.js') +const { getPackageJson } = require('./get-package-json.js') function getMajorVersion (version) { const matches = version.match(/^(\d)\./) diff --git a/app-webpack/lib/helpers/get-package-path.js b/app-webpack/lib/helpers/get-package-path.js index fed093433b0..0ee0b5a77ea 100644 --- a/app-webpack/lib/helpers/get-package-path.js +++ b/app-webpack/lib/helpers/get-package-path.js @@ -3,7 +3,7 @@ const appPaths = require('../app-paths.js') /** * Get the resolved path of a host package. */ -module.exports = function getPackagePath (pkgName, folder = appPaths.appDir) { +module.exports.getPackagePath = function getPackagePath (pkgName, folder = appPaths.appDir) { try { return require.resolve(pkgName, { paths: [ folder ] diff --git a/app-webpack/lib/helpers/get-package.js b/app-webpack/lib/helpers/get-package.js index 31770349bbb..9a4268869f3 100644 --- a/app-webpack/lib/helpers/get-package.js +++ b/app-webpack/lib/helpers/get-package.js @@ -1,10 +1,10 @@ const appPaths = require('../app-paths.js') -const getPackagePath = require('./get-package-path.js') +const { getPackagePath } = require('./get-package-path.js') /** * Import a host package. */ -module.exports = function getPackage (pkgName, folder = appPaths.appDir) { +module.exports.getPackage = function getPackage (pkgName, folder = appPaths.appDir) { try { return require(getPackagePath(pkgName, folder)) } diff --git a/app-webpack/lib/helpers/get-quasar-ctx.js b/app-webpack/lib/helpers/get-quasar-ctx.js index 540b46f3712..352549ab976 100644 --- a/app-webpack/lib/helpers/get-quasar-ctx.js +++ b/app-webpack/lib/helpers/get-quasar-ctx.js @@ -1,4 +1,4 @@ -module.exports = function (opts) { +module.exports.getQuasarCtx = function getQuasarCtx (opts) { const ctx = { dev: opts.dev || false, prod: opts.prod || false, diff --git a/app-webpack/lib/helpers/has-eslint.js b/app-webpack/lib/helpers/has-eslint.js index 545414199c8..e0fb7ed37e7 100644 --- a/app-webpack/lib/helpers/has-eslint.js +++ b/app-webpack/lib/helpers/has-eslint.js @@ -2,7 +2,7 @@ const { existsSync } = require('node:fs') const appPaths = require('../app-paths.js') -const appPkg = require(appPaths.resolve.app('package.json')) +const { appPkg } = require('../app-pkg.js') const eslintConfigFile = [ '.eslintrc.cjs', diff --git a/app-webpack/lib/helpers/has-typescript.js b/app-webpack/lib/helpers/has-typescript.js index 2dc0698812b..183a3b858bf 100644 --- a/app-webpack/lib/helpers/has-typescript.js +++ b/app-webpack/lib/helpers/has-typescript.js @@ -1,4 +1,4 @@ const fs = require('node:fs') const appPaths = require('../app-paths.js') -module.exports = fs.existsSync(appPaths.resolve.app('tsconfig.json')) +module.exports.hasTypescript = fs.existsSync(appPaths.resolve.app('tsconfig.json')) diff --git a/app-webpack/lib/helpers/is-minimal-terminal.js b/app-webpack/lib/helpers/is-minimal-terminal.js index 5b13081736c..624fc2093f9 100644 --- a/app-webpack/lib/helpers/is-minimal-terminal.js +++ b/app-webpack/lib/helpers/is-minimal-terminal.js @@ -1,9 +1,9 @@ const ci = require('ci-info') -const isMinimal = ( +const inMinimalTerminal = ( ci.isCI || process.env.NODE_ENV === 'test' || !process.stdout.isTTY ) -module.exports = isMinimal +module.exports.inMinimalTerminal = inMinimalTerminal diff --git a/app-webpack/lib/helpers/logger.js b/app-webpack/lib/helpers/logger.js index f3c4964ad56..61470828701 100644 --- a/app-webpack/lib/helpers/logger.js +++ b/app-webpack/lib/helpers/logger.js @@ -27,11 +27,11 @@ module.exports.clearConsole = process.stdout.isTTY } : () => {} -module.exports.log = function (msg) { +module.exports.log = function log (msg) { console.log(msg ? ` ${ greenBanner } ${ msg }` : '') } -module.exports.warn = function (msg, pill) { +module.exports.warn = function warn (msg, pill) { if (msg !== void 0) { const pillBanner = pill !== void 0 ? bgYellow.black('', pill, '') + ' ' @@ -44,7 +44,7 @@ module.exports.warn = function (msg, pill) { } } -module.exports.fatal = function (msg, pill) { +module.exports.fatal = function fatal (msg, pill) { if (msg !== void 0) { const pillBanner = pill !== void 0 ? errorPill(pill) + ' ' @@ -69,33 +69,33 @@ const errorPill = msg => bgRed.white('', msg, '') const warningPill = msg => bgYellow.black('', msg, '') module.exports.successPill = successPill -module.exports.success = function (msg, title = 'SUCCESS') { +module.exports.success = function success (msg, title = 'SUCCESS') { console.log(` ${ greenBanner } ${ successPill(title) } ${ green(dot + ' ' + msg) }`) } -module.exports.getSuccess = function (msg, title) { +module.exports.getSuccess = function getSuccess (msg, title) { return ` ${ greenBanner } ${ successPill(title) } ${ green(dot + ' ' + msg) }` } module.exports.infoPill = infoPill -module.exports.info = function (msg, title = 'INFO') { +module.exports.info = function info (msg, title = 'INFO') { console.log(` ${ greenBanner } ${ infoPill(title) } ${ green(dot) } ${ msg }`) } -module.exports.getInfo = function (msg, title) { +module.exports.getInfo = function getInfo (msg, title) { return ` ${ greenBanner } ${ infoPill(title) } ${ green(dot) } ${ msg }` } module.exports.errorPill = errorPill -module.exports.error = function (msg, title = 'ERROR') { +module.exports.error = function error (msg, title = 'ERROR') { console.log(` ${ redBanner } ${ errorPill(title) } ${ red(dot + ' ' + msg) }`) } -module.exports.getError = function (msg, title = 'ERROR') { +module.exports.getError = function getError (msg, title = 'ERROR') { return ` ${ redBanner } ${ errorPill(title) } ${ red(dot + ' ' + msg) }` } module.exports.warningPill = warningPill -module.exports.warning = function (msg, title = 'WARNING') { +module.exports.warning = function warning (msg, title = 'WARNING') { console.log(` ${ yellowBanner } ${ warningPill(title) } ${ yellow(dot + ' ' + msg) }`) } -module.exports.getWarning = function (msg, title = 'WARNING') { +module.exports.getWarning = function getWarning (msg, title = 'WARNING') { return ` ${ yellowBanner } ${ warningPill(title) } ${ yellow(dot + ' ' + msg) }` } diff --git a/app-webpack/lib/helpers/net.js b/app-webpack/lib/helpers/net.js index 3cede47bcd6..2793353606f 100644 --- a/app-webpack/lib/helpers/net.js +++ b/app-webpack/lib/helpers/net.js @@ -1,7 +1,7 @@ const os = require('os') const net = require('net') -module.exports.getExternalNetworkInterface = function () { +module.exports.getExternalNetworkInterface = function getExternalNetworkInterface () { const networkInterfaces = os.networkInterfaces() const devices = [] @@ -18,7 +18,7 @@ module.exports.getExternalNetworkInterface = function () { return devices } -module.exports.getIPs = function () { +module.exports.getIPs = function getIPs () { const networkInterfaces = os.networkInterfaces() const list = [] @@ -35,7 +35,7 @@ module.exports.getIPs = function () { return list } -module.exports.findClosestOpenPort = async function (port, host) { +module.exports.findClosestOpenPort = async function findClosestOpenPort (port, host) { let portProposal = port do { @@ -49,7 +49,7 @@ module.exports.findClosestOpenPort = async function (port, host) { throw new Error('ERROR_NETWORK_PORT_NOT_AVAIL') } -module.exports.isPortAvailable = async function (port, host) { +module.exports.isPortAvailable = async function isPortAvailable (port, host) { return new Promise((resolve, reject) => { const tester = net.createServer() .once('error', err => { diff --git a/app-webpack/lib/helpers/node-packager.js b/app-webpack/lib/helpers/node-packager.js index 94afa9b0858..c65f2b7b548 100644 --- a/app-webpack/lib/helpers/node-packager.js +++ b/app-webpack/lib/helpers/node-packager.js @@ -334,4 +334,4 @@ function getPackager () { fatal('Please install Yarn, PNPM, or NPM before running this command.\n') } -module.exports = getPackager() +module.exports.nodePackager = getPackager() diff --git a/app-webpack/lib/helpers/on-shutdown.js b/app-webpack/lib/helpers/on-shutdown.js index 77e9c261f09..b58c3a91229 100644 --- a/app-webpack/lib/helpers/on-shutdown.js +++ b/app-webpack/lib/helpers/on-shutdown.js @@ -1,6 +1,6 @@ const { log } = require('./logger.js') -module.exports = function (fn, msg) { +module.exports.onShutdown = function onShutdown (fn, msg) { const cleanup = () => { try { msg && log(msg) diff --git a/app-webpack/lib/helpers/open-browser.js b/app-webpack/lib/helpers/open-browser.js index 041be858c59..11ef5fb78d3 100644 --- a/app-webpack/lib/helpers/open-browser.js +++ b/app-webpack/lib/helpers/open-browser.js @@ -1,6 +1,6 @@ const { log, warn } = require('./logger.js') -module.exports = function openBrowser ({ url, opts, wait = true }) { +module.exports.openBrowser = function openBrowser ({ url, opts, wait = true }) { const open = require('open') const openDefault = () => { diff --git a/app-webpack/lib/helpers/open-ide.js b/app-webpack/lib/helpers/open-ide.js index 6d827ec5c86..feaccc3de9d 100644 --- a/app-webpack/lib/helpers/open-ide.js +++ b/app-webpack/lib/helpers/open-ide.js @@ -144,7 +144,7 @@ function runWindows (mode, bin, target) { process.exit(1) } -module.exports = function (mode, bin, target, dev) { +module.exports.openIDE = function openIDE (mode, bin, target, dev) { console.log() console.log(' ⚠️ ') console.log(` ⚠️ Opening ${ target === 'ios' ? 'XCode' : 'Android Studio' } IDE...`) diff --git a/app-webpack/lib/helpers/parse-build-env.js b/app-webpack/lib/helpers/parse-build-env.js index f8a2a467afb..4428caa9c36 100644 --- a/app-webpack/lib/helpers/parse-build-env.js +++ b/app-webpack/lib/helpers/parse-build-env.js @@ -1,18 +1,3 @@ -module.exports = function parseBuildEnv (envDefinitions, rootDefinitions) { - const env = {} - - const flatEnv = flattenObject(envDefinitions) - - for (const key in flatEnv) { - env[ `process.env.${ key }` ] = JSON.stringify(flatEnv[ key ]) - } - - if (rootDefinitions !== void 0) { - Object.assign(env, rootDefinitions) - } - - return env -} /** * Flattens the object to a single level. @@ -67,3 +52,19 @@ const flattenObject = obj => { return result } + +module.exports.parseBuildEnv = function parseBuildEnv (envDefinitions, rootDefinitions) { + const env = {} + + const flatEnv = flattenObject(envDefinitions) + + for (const key in flatEnv) { + env[ `process.env.${ key }` ] = JSON.stringify(flatEnv[ key ]) + } + + if (rootDefinitions !== void 0) { + Object.assign(env, rootDefinitions) + } + + return env +} diff --git a/app-webpack/lib/helpers/print-webpack-issue/formatters/moduleNotFound.js b/app-webpack/lib/helpers/print-webpack-issue/formatters/moduleNotFound.js index 8f8323b94a8..26f264b2cae 100644 --- a/app-webpack/lib/helpers/print-webpack-issue/formatters/moduleNotFound.js +++ b/app-webpack/lib/helpers/print-webpack-issue/formatters/moduleNotFound.js @@ -1,7 +1,7 @@ const { bold } = require('chalk') const { removeFileLoaders } = require('../utils.js') -const nodePackager = require('../../node-packager.js') +const { nodePackager } = require('../../node-packager.js') const depRE = /Can't resolve '(.*)' in/ const relativeRE = /^(\.\/|\.\.\/)/ diff --git a/app-webpack/lib/helpers/print-webpack-stats.js b/app-webpack/lib/helpers/print-webpack-stats.js index f08f922fb80..c31bfa43baa 100644 --- a/app-webpack/lib/helpers/print-webpack-stats.js +++ b/app-webpack/lib/helpers/print-webpack-stats.js @@ -96,7 +96,7 @@ function getTableIndexDelimiters (assets) { return delimiters } -module.exports = (stats, outputFolder, name) => { +module.exports.printWebpackStats = (stats, outputFolder, name) => { const assets = getAssets(stats) const tableLines = getTableLines(assets, outputFolder) const tableIndexDelimiters = getTableIndexDelimiters(assets) diff --git a/app-webpack/lib/helpers/progress-log.js b/app-webpack/lib/helpers/progress-log.js index 1a72de99d19..6b90d7c9f3d 100644 --- a/app-webpack/lib/helpers/progress-log.js +++ b/app-webpack/lib/helpers/progress-log.js @@ -55,4 +55,4 @@ progressLog.stop = function () { console.error = consoleError } -module.exports = progressLog +module.exports.progressLog = progressLog diff --git a/app-webpack/lib/helpers/spawn.js b/app-webpack/lib/helpers/spawn.js index b40b3dbff3f..d86e9b4e1fd 100644 --- a/app-webpack/lib/helpers/spawn.js +++ b/app-webpack/lib/helpers/spawn.js @@ -5,7 +5,7 @@ const { log, warn, fatal } = require('./logger.js') /* Returns pid, takes onClose */ -module.exports.spawn = function (cmd, params, opts, onClose) { +module.exports.spawn = function spawn (cmd, params, opts, onClose) { if (!cmd) { fatal('Command name was not available. Please run again.') } @@ -42,7 +42,7 @@ module.exports.spawn = function (cmd, params, opts, onClose) { /* Returns nothing, takes onFail */ -module.exports.spawnSync = function (cmd, params, opts, onFail) { +module.exports.spawnSync = function spawnSync (cmd, params, opts, onFail) { const targetFolder = opts && opts.cwd ? ` in ${ opts.cwd }` : '' diff --git a/app-webpack/lib/helpers/store-provider.js b/app-webpack/lib/helpers/store-provider.js index 8d6e1491b44..53c087fb3d3 100644 --- a/app-webpack/lib/helpers/store-provider.js +++ b/app-webpack/lib/helpers/store-provider.js @@ -1,5 +1,5 @@ -const getPackagePath = require('./get-package-path') -const nodePackager = require('./node-packager') +const { getPackagePath } = require('./get-package-path') +const { nodePackager } = require('./node-packager') function getStoreProvider () { /** @type {'pinia' | 'vuex'} */ diff --git a/app-webpack/lib/helpers/types-feature-flags.js b/app-webpack/lib/helpers/types-feature-flags.js index 72f6958b490..005e07f07ea 100644 --- a/app-webpack/lib/helpers/types-feature-flags.js +++ b/app-webpack/lib/helpers/types-feature-flags.js @@ -3,7 +3,7 @@ const fs = require('node:fs') const fse = require('fs-extra') const { log } = require('./logger.js') -const getMode = require('../mode/index.js') +const { getQuasarMode } = require('../mode/index.js') const appPaths = require('../app-paths.js') function getStoreFlagPath (storeIndexPath) { @@ -32,7 +32,7 @@ module.exports = function regenerateTypesFeatureFlags (quasarConf) { appPaths.resolve.app(getStoreFlagPath(quasarConf.sourceFiles.store)) ] : [ - getMode(feature).isInstalled, + getQuasarMode(feature).isInstalled, appPaths.resolve.cli(`templates/${ feature }/${ feature }-flag.d.ts`), appPaths.resolve[ feature ](`${ feature }-flag.d.ts`) ] diff --git a/app-webpack/lib/mode/index.js b/app-webpack/lib/mode/index.js index fe2fd1b1088..62ed31ba144 100644 --- a/app-webpack/lib/mode/index.js +++ b/app-webpack/lib/mode/index.js @@ -1,10 +1,10 @@ const { fatal } = require('../helpers/logger.js') -module.exports = function (mode) { +module.exports.getQuasarMode = function getQuasarMode (mode) { if (![ 'pwa', 'cordova', 'capacitor', 'electron', 'ssr', 'bex' ].includes(mode)) { fatal(`Unknown mode specified: ${ mode }`) } - const QuasarMode = require(`./mode-${ mode }.js`) + const { QuasarMode } = require(`./mode-${ mode }.js`) return new QuasarMode() } diff --git a/app-webpack/lib/mode/install-missing.js b/app-webpack/lib/mode/install-missing.js index a7061d4a196..8ad31f7de4c 100644 --- a/app-webpack/lib/mode/install-missing.js +++ b/app-webpack/lib/mode/install-missing.js @@ -1,8 +1,8 @@ const { warn } = require('../helpers/logger.js') -const getMode = require('./index.js') +const { getQuasarMode } = require('./index.js') -module.exports = async function (mode, target) { - const Mode = getMode(mode) +module.exports.installMissing = async function (mode, target) { + const Mode = getQuasarMode(mode) if (Mode.isInstalled) { if ([ 'cordova', 'capacitor' ].includes(mode)) { diff --git a/app-webpack/lib/mode/mode-bex.js b/app-webpack/lib/mode/mode-bex.js index 37f4b5a3c51..9bffa09f205 100644 --- a/app-webpack/lib/mode/mode-bex.js +++ b/app-webpack/lib/mode/mode-bex.js @@ -4,7 +4,7 @@ const fse = require('fs-extra') const appPaths = require('../app-paths.js') const { log, warn } = require('../helpers/logger.js') -class Mode { +module.exports.QuasarMode = class QuasarMode { get isInstalled () { return fs.existsSync(appPaths.bexDir) } @@ -31,5 +31,3 @@ class Mode { log('Browser Extension support was removed') } } - -module.exports = Mode diff --git a/app-webpack/lib/mode/mode-capacitor.js b/app-webpack/lib/mode/mode-capacitor.js index 4f00c08607f..29e8294de9a 100644 --- a/app-webpack/lib/mode/mode-capacitor.js +++ b/app-webpack/lib/mode/mode-capacitor.js @@ -3,11 +3,12 @@ const fse = require('fs-extra') const compileTemplate = require('lodash/template.js') const appPaths = require('../app-paths.js') +const { appPkg } = require('../app-pkg.js') const { log, warn } = require('../helpers/logger.js') const { spawnSync } = require('../helpers/spawn.js') -const nodePackager = require('../helpers/node-packager.js') +const { nodePackager } = require('../helpers/node-packager.js') -class Mode { +module.exports.QuasarMode = class QuasarMode { get isInstalled () { return fs.existsSync(appPaths.capacitorDir) } @@ -18,9 +19,7 @@ class Mode { return } - const pkgPath = appPaths.resolve.app('package.json') - const pkg = require(pkgPath) - const appName = pkg.productName || pkg.name || 'Quasar App' + const appName = appPkg.productName || appPkg.name || 'Quasar App' if (/^[0-9]/.test(appName)) { warn( @@ -50,7 +49,7 @@ class Mode { const scope = { appName, appId: answer.appId, - pkg, + pkg: appPkg, nodePackager } @@ -98,7 +97,7 @@ class Mode { } addPlatform (target) { - const ensureConsistency = require('../capacitor/ensure-consistency.js') + const { ensureConsistency } = require('../capacitor/ensure-consistency.js') ensureConsistency() if (this.hasPlatform(target)) { @@ -134,5 +133,3 @@ class Mode { log('Capacitor support was removed') } } - -module.exports = Mode diff --git a/app-webpack/lib/mode/mode-cordova.js b/app-webpack/lib/mode/mode-cordova.js index 2e426cd2570..351ae1d6079 100644 --- a/app-webpack/lib/mode/mode-cordova.js +++ b/app-webpack/lib/mode/mode-cordova.js @@ -2,10 +2,11 @@ const fs = require('node:fs') const fse = require('fs-extra') const appPaths = require('../app-paths.js') +const { appPkg } = require('../app-pkg.js') const { log, warn, fatal } = require('../helpers/logger.js') const { spawnSync } = require('../helpers/spawn.js') -class Mode { +module.exports.QuasarMode = class QuasarMode { get isInstalled () { return fs.existsSync(appPaths.cordovaDir) } @@ -16,8 +17,7 @@ class Mode { return } - const pkg = require(appPaths.resolve.app('package.json')) - const appName = pkg.productName || pkg.name || 'Quasar App' + const appName = appPkg.productName || appPkg.name || 'Quasar App' if (/^[0-9]/.test(appName)) { warn( @@ -79,7 +79,7 @@ class Mode { } addPlatform (target) { - const ensureConsistency = require('../cordova/ensure-consistency.js') + const { ensureConsistency } = require('../cordova/ensure-consistency.js') ensureConsistency() if (this.hasPlatform(target)) { @@ -108,5 +108,3 @@ class Mode { log('Cordova support was removed') } } - -module.exports = Mode diff --git a/app-webpack/lib/mode/mode-electron.js b/app-webpack/lib/mode/mode-electron.js index 4b9c0c3bfc9..f29caf5a5a5 100644 --- a/app-webpack/lib/mode/mode-electron.js +++ b/app-webpack/lib/mode/mode-electron.js @@ -3,15 +3,15 @@ const fse = require('fs-extra') const appPaths = require('../app-paths.js') const { log, warn } = require('../helpers/logger.js') -const nodePackager = require('../helpers/node-packager.js') -const hasTypescript = require('../helpers/has-typescript.js') +const { nodePackager } = require('../helpers/node-packager.js') +const { hasTypescript } = require('../helpers/has-typescript.js') const { bundlerIsInstalled } = require('../electron/bundler.js') const electronDeps = { electron: 'latest' } -class Mode { +module.exports.QuasarMode = class QuasarMode { get isInstalled () { return fs.existsSync(appPaths.electronDir) } @@ -71,5 +71,3 @@ class Mode { log('Electron support was removed') } } - -module.exports = Mode diff --git a/app-webpack/lib/mode/mode-pwa.js b/app-webpack/lib/mode/mode-pwa.js index 331dc6b84c9..a7215731b1e 100644 --- a/app-webpack/lib/mode/mode-pwa.js +++ b/app-webpack/lib/mode/mode-pwa.js @@ -3,15 +3,15 @@ const fse = require('fs-extra') const appPaths = require('../app-paths.js') const { log, warn } = require('../helpers/logger.js') -const nodePackager = require('../helpers/node-packager.js') -const hasTypescript = require('../helpers/has-typescript.js') +const { nodePackager } = require('../helpers/node-packager.js') +const { hasTypescript } = require('../helpers/has-typescript.js') const { hasEslint } = require('../helpers/has-eslint.js') const pwaDeps = { 'workbox-webpack-plugin': '^6.0.0' } -class Mode { +module.exports.QuasarMode = class QuasarMode { get isInstalled () { return fs.existsSync(appPaths.pwaDir) } @@ -68,5 +68,3 @@ class Mode { log('PWA support was removed') } } - -module.exports = Mode diff --git a/app-webpack/lib/mode/mode-ssr.js b/app-webpack/lib/mode/mode-ssr.js index 04bb93bce77..a23291bbfd4 100644 --- a/app-webpack/lib/mode/mode-ssr.js +++ b/app-webpack/lib/mode/mode-ssr.js @@ -3,9 +3,9 @@ const fse = require('fs-extra') const appPaths = require('../app-paths.js') const { log, warn } = require('../helpers/logger.js') -const hasTypescript = require('../helpers/has-typescript.js') +const { hasTypescript } = require('../helpers/has-typescript.js') -class Mode { +module.exports.QuasarMode = class QuasarMode { get isInstalled () { return fs.existsSync(appPaths.ssrDir) } @@ -43,5 +43,3 @@ class Mode { log('SSR support was removed') } } - -module.exports = Mode diff --git a/app-webpack/lib/node-version-check.js b/app-webpack/lib/node-version-check.js index e8f14f517ac..0f72a8c55ab 100644 --- a/app-webpack/lib/node-version-check.js +++ b/app-webpack/lib/node-version-check.js @@ -6,9 +6,9 @@ const minor = parseInt(version[ 1 ].replace(/\D/g, ''), 10) const patch = parseInt(version[ 2 ].replace(/\D/g, ''), 10) const min = { - major: 14, - minor: 15, - patch: 1 + major: 16, + minor: 0, + patch: 0 } if ( diff --git a/app-webpack/lib/quasar-config-file.js b/app-webpack/lib/quasar-config-file.js index 697616c0b8d..c172c8189fe 100644 --- a/app-webpack/lib/quasar-config-file.js +++ b/app-webpack/lib/quasar-config-file.js @@ -8,20 +8,19 @@ const { green } = require('chalk') const { build: esBuild } = require('esbuild') const appPaths = require('./app-paths.js') +const { appPkg, quasarPkg } = require('./app-pkg.js') const { log, warn, fatal } = require('./helpers/logger.js') -const extensionRunner = require('./app-extension/extensions-runner.js') -const appFilesValidations = require('./helpers/app-files-validations.js') -const cssVariables = require('./helpers/css-variables.js') -const getPackage = require('./helpers/get-package.js') +const { extensionsRunner } = require('./app-extension/extensions-runner.js') +const { appFilesValidations } = require('./helpers/app-files-validations.js') +const { cssVariables } = require('./helpers/css-variables.js') +const { getPackage } = require('./helpers/get-package.js') const getPackageMajorVersion = require('./helpers/get-package-major-version.js') const storeProvider = require('./helpers/store-provider.js') -const { quasarVersion } = require('./helpers/banner.js') +const { createWebpackConfig } = require('./webpack/index.js') const transformAssetUrls = getPackage('quasar/dist/transforms/loader-asset-urls.json') const urlRegex = /^http(s)?:\/\// -const appPkg = require(appPaths.resolve.app('package.json')) - function encode (obj) { return JSON.stringify(obj, (_, value) => { return typeof value === 'function' @@ -104,7 +103,7 @@ function uniqueRegexFilter (value, index, self) { * this.webpackConf - Webpack config(s) */ -class QuasarConfFile { +module.exports.QuasarConfigFile = class QuasarConfigFile { ctx opts quasarConf @@ -281,7 +280,8 @@ class QuasarConfFile { }, userCfg) if (cfg.animations === 'all') { - cfg.animations = require('./helpers/animations.js') + const { animations } = require('./helpers/animations.js') + cfg.animations = animations } if (!cfg.framework.plugins) { @@ -345,7 +345,7 @@ class QuasarConfFile { async compile () { const cfg = this.sourceCfg - await extensionRunner.runHook('extendQuasarConf', async hook => { + await extensionsRunner.runHook('extendQuasarConf', async hook => { log(`Extension(${ hook.api.extId }): Extending quasar.config file...`) await hook.fn(cfg, hook.api) }) @@ -378,7 +378,7 @@ class QuasarConfFile { __VUE_PROD_DEVTOOLS__: this.ctx.dev === true || this.ctx.debug === true, // quasar - __QUASAR_VERSION__: JSON.stringify(quasarVersion), + __QUASAR_VERSION__: JSON.stringify(quasarPkg.version), __QUASAR_SSR__: this.ctx.mode.ssr === true, __QUASAR_SSR_SERVER__: false, __QUASAR_SSR_CLIENT__: false, @@ -628,7 +628,8 @@ class QuasarConfFile { } if (cfg.ssr.pwa) { - await require('./mode/install-missing.js')('pwa') + const { installMissing } = require('./mode/install-missing.js') + await installMissing('pwa') cfg.__rootDefines.__QUASAR_SSR_PWA__ = true } @@ -747,7 +748,7 @@ class QuasarConfFile { } if (cfg.devServer.open) { - const isMinimalTerminal = require('./helpers/is-minimal-terminal.js') + const { isMinimalTerminal } = require('./helpers/is-minimal-terminal.js') if (isMinimalTerminal) { cfg.devServer.open = false } @@ -1021,9 +1022,7 @@ class QuasarConfFile { this.quasarConf = cfg if (this.webpackConfChanged !== false) { - this.webpackConf = await require('./webpack/index.js')(cfg) + this.webpackConf = await createWebpackConfig(cfg) } } } - -module.exports = QuasarConfFile diff --git a/app-webpack/lib/ssr/html-template.js b/app-webpack/lib/ssr/html-template.js index 56e86e14a61..44e65e66f2c 100644 --- a/app-webpack/lib/ssr/html-template.js +++ b/app-webpack/lib/ssr/html-template.js @@ -118,7 +118,7 @@ function htmlTagObjectToString (tagDefinition) { + (tagDefinition.voidTag ? '' : '') } -module.exports.getIndexHtml = function (template, cfg) { +module.exports.getIndexHtml = function getIndexHtml (template, cfg) { const compiled = compileTemplate(template) let html = compiled(cfg.htmlVariables) diff --git a/app-webpack/lib/webpack/bex/main.js b/app-webpack/lib/webpack/bex/main.js index d96183a215f..2af2a957f92 100644 --- a/app-webpack/lib/webpack/bex/main.js +++ b/app-webpack/lib/webpack/bex/main.js @@ -2,7 +2,7 @@ const path = require('node:path') const appPaths = require('../../app-paths.js') -module.exports = function (chain, cfg) { +module.exports.injectBexMain = function injectBexMain (chain, cfg) { const outputPath = path.join(cfg.ctx.dev ? appPaths.bexDir : cfg.build.distDir, 'www') // Reset some bits we don't need following the default createChain() call. diff --git a/app-webpack/lib/webpack/bex/plugin.bex-packager.js b/app-webpack/lib/webpack/bex/plugin.bex-packager.js index 82065e94e0d..c6025e9da12 100644 --- a/app-webpack/lib/webpack/bex/plugin.bex-packager.js +++ b/app-webpack/lib/webpack/bex/plugin.bex-packager.js @@ -7,7 +7,7 @@ function findAndReplaceInSection (sectionArray, find, replace) { sectionArray[ index ] = replace } -class BexPackager { +module.exports.BexPackagerPlugin = class BexPackagerPlugin { constructor (options) { this.options = options this.chromeDir = path.join(options.dest, 'chrome') @@ -65,5 +65,3 @@ class BexPackager { archive.finalize() } } - -module.exports = BexPackager diff --git a/app-webpack/lib/webpack/bex/renderer.js b/app-webpack/lib/webpack/bex/renderer.js index 1021db3987f..f0a13cfdba4 100644 --- a/app-webpack/lib/webpack/bex/renderer.js +++ b/app-webpack/lib/webpack/bex/renderer.js @@ -2,10 +2,11 @@ const path = require('node:path') const fse = require('fs-extra') const appPaths = require('../../app-paths.js') -const artifacts = require('../../artifacts.js') -const injectHtml = require('../inject.html.js') +const { appPkg } = require('../../app-pkg.js') +const { cleanArtifacts } = require('../../artifacts.js') +const { injectHtml } = require('../inject.html.js') -module.exports = function (chain, cfg) { +module.exports.injectBexRenderer = function injectBexRenderer (chain, cfg) { const rootPath = cfg.ctx.dev ? appPaths.bexDir : cfg.build.distDir const outputPath = path.join(rootPath, 'www') @@ -32,7 +33,7 @@ module.exports = function (chain, cfg) { if (cfg.ctx.dev) { // Clean old dir - artifacts.clean(outputPath) + cleanArtifacts(outputPath) } else { // We need this bundled in with the rest of the source to match the manifest instructions. @@ -40,12 +41,12 @@ module.exports = function (chain, cfg) { cfg.build.htmlFilename = path.join('www', 'index.html') // Register our plugin, update the manifest and package the browser extension. - const BexPackager = require('./plugin.bex-packager.js') + const { BexPackagerPlugin } = require('./plugin.bex-packager.js') chain.plugin('webpack-bex-packager') - .use(BexPackager, [ { + .use(BexPackagerPlugin, [ { src: cfg.bex.builder.directories.input, dest: cfg.bex.builder.directories.output, - name: require(appPaths.resolve.app('package.json')).name + name: appPkg.name } ]) // Copy our user edited BEX files to the dist dir (excluding the already built www folder) diff --git a/app-webpack/lib/webpack/capacitor/index.js b/app-webpack/lib/webpack/capacitor/index.js index d3bd757bb8b..511dc86f29d 100644 --- a/app-webpack/lib/webpack/capacitor/index.js +++ b/app-webpack/lib/webpack/capacitor/index.js @@ -1,9 +1,9 @@ const appPaths = require('../../app-paths.js') -const injectHtml = require('../inject.html.js') +const { injectHtml } = require('../inject.html.js') const capNodeModules = appPaths.resolve.capacitor('node_modules') -module.exports = function (chain, cfg) { +module.exports.injectCapacitor = function injectCapacitor (chain, cfg) { // need to also look into /src-capacitor // for deps like @capacitor/core chain.resolve.modules diff --git a/app-webpack/lib/webpack/cordova/index.js b/app-webpack/lib/webpack/cordova/index.js index 9c14903c6a3..04e0cc9cbca 100644 --- a/app-webpack/lib/webpack/cordova/index.js +++ b/app-webpack/lib/webpack/cordova/index.js @@ -1,5 +1,5 @@ -const injectHtml = require('../inject.html.js') +const { injectHtml } = require('../inject.html.js') -module.exports = function (chain, cfg) { +module.exports.injectCordova = function injectCordova (chain, cfg) { injectHtml(chain, cfg) } diff --git a/app-webpack/lib/webpack/create-chain.js b/app-webpack/lib/webpack/create-chain.js index 37761077f0b..7aa11ef0aa7 100644 --- a/app-webpack/lib/webpack/create-chain.js +++ b/app-webpack/lib/webpack/create-chain.js @@ -4,13 +4,13 @@ const { merge } = require('webpack-merge') const WebpackChain = require('webpack-chain') const { VueLoaderPlugin } = require('vue-loader') -const WebpackProgressPlugin = require('./plugin.progress.js') -const BootDefaultExport = require('./plugin.boot-default-export.js') -const parseBuildEnv = require('../helpers/parse-build-env.js') -const getPackagePath = require('../helpers/get-package-path.js') +const { WebpackProgressPlugin } = require('./plugin.progress.js') +const { BootDefaultExportPlugin } = require('./plugin.boot-default-export.js') +const { parseBuildEnv } = require('../helpers/parse-build-env.js') +const { getPackagePath } = require('../helpers/get-package-path.js') const appPaths = require('../app-paths.js') -const injectStyleRules = require('./inject.style-rules.js') +const { injectStyleRules } = require('./inject.style-rules.js') const { webpackNames } = require('./symbols.js') function getDependenciesRegex (list) { @@ -46,7 +46,7 @@ const extrasPath = (() => { : false })() -module.exports = function (cfg, configName) { +module.exports.createChain = function createChain (cfg, configName) { const chain = new WebpackChain() const useFastHash = cfg.ctx.dev || [ 'electron', 'cordova', 'capacitor', 'bex' ].includes(cfg.ctx.modeName) @@ -280,7 +280,7 @@ module.exports = function (cfg, configName) { if (cfg.ctx.dev && configName !== webpackNames.ssr.serverSide && cfg.ctx.mode.pwa && cfg.pwa.workboxPluginMode === 'InjectManifest') { // need to place it here before the status plugin - const CustomSwWarningPlugin = require('./pwa/plugin.custom-sw-warning.js') + const { CustomSwWarningPlugin } = require('./pwa/plugin.custom-sw-warning.js') chain.plugin('custom-sw-warning') .use(CustomSwWarningPlugin) } @@ -289,7 +289,7 @@ module.exports = function (cfg, configName) { .use(WebpackProgressPlugin, [ { name: configName, cfg } ]) chain.plugin('boot-default-export') - .use(BootDefaultExport) + .use(BootDefaultExportPlugin) chain.performance .hints(false) diff --git a/app-webpack/lib/webpack/electron/create-node-chain.js b/app-webpack/lib/webpack/electron/create-node-chain.js index 897d65a8880..959b041e50b 100644 --- a/app-webpack/lib/webpack/electron/create-node-chain.js +++ b/app-webpack/lib/webpack/electron/create-node-chain.js @@ -1,20 +1,25 @@ const webpack = require('webpack') const WebpackChain = require('webpack-chain') -const ExpressionDependency = require('./plugin.expression-dependency.js') -const parseBuildEnv = require('../../helpers/parse-build-env.js') -const injectNodeBabel = require('../inject.node-babel.js') -const injectNodeTypescript = require('../inject.node-typescript.js') - const appPaths = require('../../app-paths.js') -const WebpackProgressPlugin = require('../plugin.progress.js') +const { appPkg, cliPkg } = require('../../app-pkg.js') +const { parseBuildEnv } = require('../../helpers/parse-build-env.js') +const { injectNodeBabel } = require('../inject.node-babel.js') +const { injectNodeTypescript } = require('../inject.node-typescript.js') +const { ExpressionDependencyPlugin } = require('./plugin.expression-dependency.js') +const { WebpackProgressPlugin } = require('../plugin.progress.js') const tempElectronDir = '.quasar/electron' -module.exports = (nodeType, cfg, configName) => { - const { dependencies: appDeps = {} } = require(appPaths.resolve.app('package.json')) - const { dependencies: cliDeps = {} } = require(appPaths.resolve.cli('package.json')) +const { dependencies: appDeps = {} } = appPkg +const { dependencies: cliDeps = {} } = cliPkg + +const externalsList = [ + ...Object.keys(cliDeps), + ...Object.keys(appDeps) +] +module.exports.createNodeChain = (nodeType, cfg, configName) => { const chain = new WebpackChain() const resolveModules = [ 'node_modules', @@ -39,13 +44,10 @@ module.exports = (nodeType, cfg, configName) => { : cfg.build.distDir ) - chain.externals([ - ...Object.keys(cliDeps), - ...Object.keys(appDeps) - ]) + chain.externals(externalsList) chain.plugin('expression-dependency') - .use(ExpressionDependency) + .use(ExpressionDependencyPlugin) injectNodeBabel(cfg, chain) injectNodeTypescript(cfg, chain) diff --git a/app-webpack/lib/webpack/electron/main.js b/app-webpack/lib/webpack/electron/main.js index 98e7149886e..400eb1d3057 100644 --- a/app-webpack/lib/webpack/electron/main.js +++ b/app-webpack/lib/webpack/electron/main.js @@ -1,7 +1,7 @@ const appPaths = require('../../app-paths.js') -const createNodeChain = require('./create-node-chain.js') +const { createNodeChain } = require('./create-node-chain.js') -module.exports = function (cfg, configName) { +module.exports.injectElectronMain = function injectElectronMain (cfg, configName) { const chain = createNodeChain('main', cfg, configName) chain.entry('electron-main') @@ -10,11 +10,11 @@ module.exports = function (cfg, configName) { )) if (cfg.ctx.prod) { - const ElectronPackageJson = require('./plugin.electron-package-json.js') + const { ElectronPackageJsonPlugin } = require('./plugin.electron-package-json.js') // write package.json file chain.plugin('package-json') - .use(ElectronPackageJson, [ cfg ]) + .use(ElectronPackageJsonPlugin, [ cfg ]) const patterns = [ appPaths.resolve.app('.npmrc'), diff --git a/app-webpack/lib/webpack/electron/plugin.electron-package-json.js b/app-webpack/lib/webpack/electron/plugin.electron-package-json.js index 7d837f73225..f27a5931d52 100644 --- a/app-webpack/lib/webpack/electron/plugin.electron-package-json.js +++ b/app-webpack/lib/webpack/electron/plugin.electron-package-json.js @@ -1,13 +1,14 @@ const { sources } = require('webpack') +const { merge } = require('webpack-merge') -const appPaths = require('../../app-paths.js') -const getFixedDeps = require('../../helpers/get-fixed-deps.js') +const { appPkg } = require('../../app-pkg.js') +const { getFixedDeps } = require('../../helpers/get-fixed-deps.js') -module.exports = class ElectronPackageJson { +module.exports.ElectronPackageJsonPlugin = class ElectronPackageJsonPlugin { constructor (cfg = {}) { this.cfg = cfg - const pkg = require(appPaths.resolve.app('package.json')) + const pkg = merge({}, appPkg) if (pkg.dependencies) { pkg.dependencies = getFixedDeps(pkg.dependencies) diff --git a/app-webpack/lib/webpack/electron/plugin.expression-dependency.js b/app-webpack/lib/webpack/electron/plugin.expression-dependency.js index 868d2731b34..8ecc33589c7 100644 --- a/app-webpack/lib/webpack/electron/plugin.expression-dependency.js +++ b/app-webpack/lib/webpack/electron/plugin.expression-dependency.js @@ -1,4 +1,4 @@ -module.exports = class ExpressionDependency { +module.exports.ExpressionDependencyPlugin = class ExpressionDependencyPlugin { apply (compiler) { compiler.hooks.done.tap('expression-dependency', stats => { stats.compilation.warnings = stats.compilation.warnings.filter( diff --git a/app-webpack/lib/webpack/electron/preload.js b/app-webpack/lib/webpack/electron/preload.js index cd0bef9607b..2fef41efab9 100644 --- a/app-webpack/lib/webpack/electron/preload.js +++ b/app-webpack/lib/webpack/electron/preload.js @@ -1,8 +1,8 @@ const appPaths = require('../../app-paths.js') -const createNodeChain = require('./create-node-chain.js') +const { createNodeChain } = require('./create-node-chain.js') -module.exports = function (cfg, configName) { +module.exports.injectElectronPreload = function injectElectronPreload (cfg, configName) { const chain = createNodeChain('preload', cfg, configName) chain.entry('electron-preload') diff --git a/app-webpack/lib/webpack/electron/renderer.js b/app-webpack/lib/webpack/electron/renderer.js index d3e895b80d0..ef42cd3d702 100644 --- a/app-webpack/lib/webpack/electron/renderer.js +++ b/app-webpack/lib/webpack/electron/renderer.js @@ -1,6 +1,6 @@ -const injectHtml = require('../inject.html.js') +const { injectHtml } = require('../inject.html.js') -module.exports = function (chain, cfg) { +module.exports.injectElectronRenderer = function injectElectronRenderer (chain, cfg) { injectHtml(chain, cfg) if (cfg.ctx.build) { diff --git a/app-webpack/lib/webpack/index.js b/app-webpack/lib/webpack/index.js index f5313173469..5c7d7c8134b 100644 --- a/app-webpack/lib/webpack/index.js +++ b/app-webpack/lib/webpack/index.js @@ -1,7 +1,7 @@ -const createChain = require('./create-chain.js') +const { createChain } = require('./create-chain.js') const { log } = require('../helpers/logger.js') const { webpackNames } = require('./symbols.js') -const extensionRunner = require('../app-extension/extensions-runner.js') +const { extensionsRunner } = require('../app-extension/extensions-runner.js') async function getWebpackConfig (chain, cfg, { name, @@ -10,7 +10,7 @@ async function getWebpackConfig (chain, cfg, { cmdSuffix = '', invokeParams }) { - await extensionRunner.runHook('chainWebpack' + hookSuffix, async hook => { + await extensionsRunner.runHook('chainWebpack' + hookSuffix, async hook => { log(`Extension(${ hook.api.extId }): Chaining ""${ name }"" Webpack config`) await hook.fn(chain, invokeParams, hook.api) }) @@ -22,7 +22,7 @@ async function getWebpackConfig (chain, cfg, { const webpackConfig = chain.toConfig() - await extensionRunner.runHook('extendWebpack' + hookSuffix, async hook => { + await extensionsRunner.runHook('extendWebpack' + hookSuffix, async hook => { log(`Extension(${ hook.api.extId }): Extending ""${ name }"" Webpack config`) await hook.fn(webpackConfig, invokeParams, hook.api) }) @@ -46,10 +46,10 @@ async function getWebpackConfig (chain, cfg, { } function getCSW (cfg) { - const createCSW = require('./pwa/create-custom-sw.js') + const { createCustomSw } = require('./pwa/create-custom-sw.js') // csw - custom service worker - return getWebpackConfig(createCSW(cfg, webpackNames.pwa.csw), cfg, { + return getWebpackConfig(createCustomSw(cfg, webpackNames.pwa.csw), cfg, { name: webpackNames.pwa.csw, cfgExtendBase: cfg.pwa, hookSuffix: 'PwaCustomSW', @@ -59,9 +59,9 @@ function getCSW (cfg) { } async function getSPA (cfg) { + const { injectSpa } = require('./spa/index.js') const chain = createChain(cfg, webpackNames.spa.renderer) - - require('./spa/index.js')(chain, cfg) + injectSpa(chain, cfg) return { renderer: await getWebpackConfig(chain, cfg, { @@ -78,8 +78,11 @@ async function getPWA (cfg) { function getRenderer () { const chain = createChain(cfg, webpackNames.pwa.renderer) - require('./spa/index.js')(chain, cfg) // extending a SPA - require('./pwa/index.js')(chain, cfg) + const { injectSpa } = require('./spa/index.js') + injectSpa(chain, cfg) // extending a SPA + + const { injectPwa } = require('./pwa/index.js') + injectPwa(chain, cfg) return getWebpackConfig(chain, cfg, { name: webpackNames.pwa.renderer, @@ -94,9 +97,9 @@ async function getPWA (cfg) { } async function getCordova (cfg) { + const { injectCordova } = require('./cordova/index.js') const chain = createChain(cfg, webpackNames.cordova.renderer) - - require('./cordova/index.js')(chain, cfg) + injectCordova(chain, cfg) return { renderer: await getWebpackConfig(chain, cfg, { @@ -107,8 +110,10 @@ async function getCordova (cfg) { } async function getCapacitor (cfg) { + const { injectCapacitor } = require('./capacitor/index.js') const chain = createChain(cfg, webpackNames.capacitor.renderer) - require('./capacitor/index.js')(chain, cfg) + + injectCapacitor(chain, cfg) return { renderer: await getWebpackConfig(chain, cfg, { @@ -120,10 +125,15 @@ async function getCapacitor (cfg) { async function getElectron (cfg) { const rendererChain = createChain(cfg, webpackNames.electron.renderer) - const preloadChain = require('./electron/preload.js')(cfg, webpackNames.electron.preload) - const mainChain = require('./electron/main.js')(cfg, webpackNames.electron.main) - require('./electron/renderer.js')(rendererChain, cfg) + const { injectElectronPreload } = require('./electron/preload.js') + const preloadChain = injectElectronPreload(cfg, webpackNames.electron.preload) + + const { injectElectronMain } = require('./electron/main.js') + const mainChain = injectElectronMain(cfg, webpackNames.electron.main) + + const { injectElectronRenderer } = require('./electron/renderer.js') + injectElectronRenderer(rendererChain, cfg) return { renderer: await getWebpackConfig(rendererChain, cfg, { @@ -148,17 +158,21 @@ async function getElectron (cfg) { } async function getSSR (cfg) { + const { injectSSRClient } = require('./ssr/client.js') const client = createChain(cfg, webpackNames.ssr.clientSide) - require('./ssr/client.js')(client, cfg) + injectSSRClient(client, cfg) if (cfg.ctx.mode.pwa) { - require('./pwa/index.js')(client, cfg) // extending a PWA + const { injectPwa } = require('./pwa/index.js') + injectPwa(client, cfg) // extending a PWA } + const { injectSSRServer } = require('./ssr/server.js') const server = createChain(cfg, webpackNames.ssr.serverSide) - require('./ssr/server.js')(server, cfg) + injectSSRServer(server, cfg) - const webserver = require('./ssr/webserver.js')(cfg, webpackNames.ssr.webserver) + const { createSSRWebserverChain } = require('./ssr/webserver.js') + const webserver = createSSRWebserverChain(cfg, webpackNames.ssr.webserver) return { ...(cfg.pwa.workboxPluginMode === 'InjectManifest' ? { csw: await getCSW(cfg) } : {}), @@ -184,11 +198,13 @@ async function getSSR (cfg) { } async function getBEX (cfg) { + const { injectBexRenderer } = require('./bex/renderer.js') const rendererChain = createChain(cfg, webpackNames.bex.renderer) - require('./bex/renderer.js')(rendererChain, cfg) + injectBexRenderer(rendererChain, cfg) + const { injectBexMain } = require('./bex/main.js') const mainChain = createChain(cfg, webpackNames.bex.main) - require('./bex/main.js')(mainChain, cfg) + injectBexMain(mainChain, cfg) return { renderer: await getWebpackConfig(rendererChain, cfg, { @@ -204,28 +220,32 @@ async function getBEX (cfg) { } } -module.exports = async function (cfg) { +module.exports.createWebpackConfig = async function (cfg) { const mode = cfg.ctx.mode if (mode.ssr) { return await getSSR(cfg) } - else if (mode.electron) { + + if (mode.electron) { return await getElectron(cfg) } - else if (mode.cordova) { + + if (mode.cordova) { return await getCordova(cfg) } - else if (mode.capacitor) { + + if (mode.capacitor) { return await getCapacitor(cfg) } - else if (mode.pwa) { + + if (mode.pwa) { return await getPWA(cfg) } - else if (mode.bex) { + + if (mode.bex) { return await getBEX(cfg) } - else { - return await getSPA(cfg) - } + + return await getSPA(cfg) } diff --git a/app-webpack/lib/webpack/inject.html.js b/app-webpack/lib/webpack/inject.html.js index d403572d324..a46e9aa36d2 100644 --- a/app-webpack/lib/webpack/inject.html.js +++ b/app-webpack/lib/webpack/inject.html.js @@ -2,7 +2,7 @@ const { join } = require('node:path') const HtmlWebpackPlugin = require('html-webpack-plugin') const appPaths = require('../app-paths.js') -const { plugin: HtmlAddonsPlugin } = require('./plugin.html-addons.js') +const { HtmlAddonsPlugin } = require('./plugin.html-addons.js') function getHtmlFilename (cfg) { if (cfg.ctx.mode.ssr && cfg.ctx.mode.pwa) { @@ -16,7 +16,7 @@ function getHtmlFilename (cfg) { : join(cfg.build.distDir, cfg.build.htmlFilename) } -module.exports = function (chain, cfg, templateParam) { +module.exports.injectHtml = function injectHtml (chain, cfg, templateParam) { chain.plugin('html-webpack') .use(HtmlWebpackPlugin, [ { filename: getHtmlFilename(cfg), diff --git a/app-webpack/lib/webpack/inject.node-babel.js b/app-webpack/lib/webpack/inject.node-babel.js index 114a410e042..312eb56a02a 100644 --- a/app-webpack/lib/webpack/inject.node-babel.js +++ b/app-webpack/lib/webpack/inject.node-babel.js @@ -1,6 +1,6 @@ const appPaths = require('../app-paths.js') -module.exports = function (cfg, chain) { +module.exports.injectNodeBabel = function injectNodeBabel (cfg, chain) { if (cfg.build.transpile === true) { chain.module.rule('babel') .test(/\.js$/) diff --git a/app-webpack/lib/webpack/inject.node-typescript.js b/app-webpack/lib/webpack/inject.node-typescript.js index f53dc2950d2..d95302bd7d5 100644 --- a/app-webpack/lib/webpack/inject.node-typescript.js +++ b/app-webpack/lib/webpack/inject.node-typescript.js @@ -1,4 +1,4 @@ -module.exports = function (cfg, chain) { +module.exports.injectNodeTypescript = function injectNodeTypescript (cfg, chain) { if (cfg.supportTS !== false) { chain.resolve.extensions .merge([ '.ts' ]) diff --git a/app-webpack/lib/webpack/inject.style-rules.js b/app-webpack/lib/webpack/inject.style-rules.js index 23d540b5a5d..696f60c2c57 100644 --- a/app-webpack/lib/webpack/inject.style-rules.js +++ b/app-webpack/lib/webpack/inject.style-rules.js @@ -3,7 +3,7 @@ const { merge } = require('webpack-merge') const path = require('node:path') const appPaths = require('../app-paths.js') -const cssVariables = require('../helpers/css-variables.js') +const { cssVariables } = require('../helpers/css-variables.js') const quasarCssPaths = [ path.join('node_modules', 'quasar', 'dist'), path.join('node_modules', 'quasar', 'src'), @@ -173,7 +173,7 @@ function injectRule (chain, pref, lang, test, loader, loaderOptions) { } } -module.exports = function (chain, pref) { +module.exports.injectStyleRules = function injectStyleRules (chain, pref) { injectRule(chain, pref, 'css', /\.css$/) injectRule(chain, pref, 'stylus', /\.styl(us)?$/, 'stylus-loader', pref.stylusLoaderOptions) injectRule(chain, pref, 'scss', /\.scss$/, 'sass-loader', merge( diff --git a/app-webpack/lib/webpack/loader.js.transform-quasar-imports.js b/app-webpack/lib/webpack/loader.js.transform-quasar-imports.js index d3093a9944e..0cb540622c5 100644 --- a/app-webpack/lib/webpack/loader.js.transform-quasar-imports.js +++ b/app-webpack/lib/webpack/loader.js.transform-quasar-imports.js @@ -1,4 +1,4 @@ -const getPackage = require('../helpers/get-package.js') +const { getPackage } = require('../helpers/get-package.js') const importTransformation = getPackage('quasar/dist/transforms/import-transformation.js') const regex = /import\s*\{([\w,\s]+)\}\s*from\s*(['""])quasar\2;?/g diff --git a/app-webpack/lib/webpack/loader.quasar-sass-variables.js b/app-webpack/lib/webpack/loader.quasar-sass-variables.js index a1c91efb03c..d57598e533b 100644 --- a/app-webpack/lib/webpack/loader.quasar-sass-variables.js +++ b/app-webpack/lib/webpack/loader.quasar-sass-variables.js @@ -1,4 +1,4 @@ -const cssVariables = require('../helpers/css-variables.js') +const { cssVariables } = require('../helpers/css-variables.js') const ext = cssVariables.appFile.sass ? 'sass' diff --git a/app-webpack/lib/webpack/loader.quasar-scss-variables.js b/app-webpack/lib/webpack/loader.quasar-scss-variables.js index df0bb093c2c..dd9be47a73a 100644 --- a/app-webpack/lib/webpack/loader.quasar-scss-variables.js +++ b/app-webpack/lib/webpack/loader.quasar-scss-variables.js @@ -1,4 +1,4 @@ -const cssVariables = require('../helpers/css-variables.js') +const { cssVariables } = require('../helpers/css-variables.js') const ext = cssVariables.appFile.scss ? 'scss' diff --git a/app-webpack/lib/webpack/loader.vue.auto-import-quasar.js b/app-webpack/lib/webpack/loader.vue.auto-import-quasar.js index b209215a568..37f317b91e5 100644 --- a/app-webpack/lib/webpack/loader.vue.auto-import-quasar.js +++ b/app-webpack/lib/webpack/loader.vue.auto-import-quasar.js @@ -1,6 +1,6 @@ const hash = require('hash-sum') -const getPackage = require('../helpers/get-package.js') +const { getPackage } = require('../helpers/get-package.js') const autoImportData = getPackage('quasar/dist/transforms/auto-import.json') const importTransformation = getPackage('quasar/dist/transforms/import-transformation.js') diff --git a/app-webpack/lib/webpack/plugin.boot-default-export.js b/app-webpack/lib/webpack/plugin.boot-default-export.js index a4fadd979f9..8fee929da9a 100644 --- a/app-webpack/lib/webpack/plugin.boot-default-export.js +++ b/app-webpack/lib/webpack/plugin.boot-default-export.js @@ -1,4 +1,4 @@ -module.exports = class BootDefaultExport { +module.exports.BootDefaultExportPlugin = class BootDefaultExportPlugin { apply (compiler) { compiler.hooks.done.tap('boot-default-export', stats => { // we filter out warnings about the default export diff --git a/app-webpack/lib/webpack/plugin.html-addons.js b/app-webpack/lib/webpack/plugin.html-addons.js index d822b0aaf0b..922c6a533df 100644 --- a/app-webpack/lib/webpack/plugin.html-addons.js +++ b/app-webpack/lib/webpack/plugin.html-addons.js @@ -25,7 +25,7 @@ function fillBaseTag (html, base) { module.exports.fillBaseTag = fillBaseTag -module.exports.plugin = class HtmlAddonsPlugin { +module.exports.HtmlAddonsPlugin = class HtmlAddonsPlugin { constructor (cfg = {}) { this.cfg = cfg } diff --git a/app-webpack/lib/webpack/plugin.progress.js b/app-webpack/lib/webpack/plugin.progress.js index 2f0537e3061..9b9ca8e4915 100644 --- a/app-webpack/lib/webpack/plugin.progress.js +++ b/app-webpack/lib/webpack/plugin.progress.js @@ -3,11 +3,11 @@ const throttle = require('lodash/throttle.js') const chalk = require('chalk') const appPaths = require('../app-paths.js') +const { quasarPkg, cliPkg } = require('../app-pkg.js') const { success, info, error, warning, clearConsole } = require('../helpers/logger.js') -const { quasarVersion, cliAppVersion } = require('../helpers/banner.js') -const isMinimalTerminal = require('../helpers/is-minimal-terminal.js') +const { isMinimalTerminal } = require('../helpers/is-minimal-terminal.js') const { printWebpackWarnings, printWebpackErrors } = require('../helpers/print-webpack-issue/index.js') -const progressLog = require('../helpers/progress-log.js') +const { progressLog } = require('../helpers/progress-log.js') let maxLengthName = 0 let isDev = false @@ -129,8 +129,8 @@ function getReadyBanner (cfg) { return [ ` ${ greenBanner } App dir................... ${ chalk.green(appPaths.appDir) }`, ` ${ greenBanner } Dev mode.................. ${ chalk.green(cfg.ctx.modeName + (cfg.ctx.mode.ssr && cfg.ctx.mode.pwa ? ' + pwa' : '')) }`, - ` ${ greenBanner } Pkg quasar................ ${ chalk.green('v' + quasarVersion) }`, - ` ${ greenBanner } Pkg @quasar/app-webpack... ${ chalk.green('v' + cliAppVersion) }`, + ` ${ greenBanner } Pkg quasar................ ${ chalk.green('v' + quasarPkg.version) }`, + ` ${ greenBanner } Pkg @quasar/app-webpack... ${ chalk.green('v' + cliPkg.version) }`, ` ${ greenBanner } Transpiled JS..... ${ cfg.__transpileBanner }`, ' ----------------------------', ` ${ greenBanner } Load the dev extension from:`, @@ -151,8 +151,8 @@ function getReadyBanner (cfg) { ` ${ greenBanner } App dir................... ${ chalk.green(appPaths.appDir) }`, ` ${ greenBanner } App URL................... ${ urlList }`, ` ${ greenBanner } Dev mode.................. ${ chalk.green(cfg.ctx.modeName + (cfg.ctx.mode.ssr && cfg.ctx.mode.pwa ? ' + pwa' : '')) }`, - ` ${ greenBanner } Pkg quasar................ ${ chalk.green('v' + quasarVersion) }`, - ` ${ greenBanner } Pkg @quasar/app-webpack... ${ chalk.green('v' + cliAppVersion) }`, + ` ${ greenBanner } Pkg quasar................ ${ chalk.green('v' + quasarPkg.version) }`, + ` ${ greenBanner } Pkg @quasar/app-webpack... ${ chalk.green('v' + cliPkg.version) }`, ` ${ greenBanner } Transpiled JS............. ${ cfg.__transpileBanner }` ].join('\n') + '\n' } @@ -194,7 +194,7 @@ function printStatus () { } } -module.exports = class WebpackProgressPlugin extends ProgressPlugin { +module.exports.WebpackProgressPlugin = class WebpackProgressPlugin extends ProgressPlugin { constructor ({ name, cfg, hasExternalWork }) { const useBars = isMinimalTerminal !== true && cfg.build.showProgress === true diff --git a/app-webpack/lib/webpack/pwa/create-custom-sw.js b/app-webpack/lib/webpack/pwa/create-custom-sw.js index 4d6ac0d660e..ecda246e514 100644 --- a/app-webpack/lib/webpack/pwa/create-custom-sw.js +++ b/app-webpack/lib/webpack/pwa/create-custom-sw.js @@ -3,8 +3,8 @@ const webpack = require('webpack') const WebpackChain = require('webpack-chain') const appPaths = require('../../app-paths.js') -const parseBuildEnv = require('../../helpers/parse-build-env.js') -const WebpackProgressPlugin = require('../plugin.progress.js') +const { parseBuildEnv } = require('../../helpers/parse-build-env.js') +const { WebpackProgressPlugin } = require('../plugin.progress.js') function getDependenciesRegex (list) { const deps = list.map(dep => { // eslint-disable-line array-callback-return @@ -20,7 +20,7 @@ function getDependenciesRegex (list) { return new RegExp(deps.join('|')) } -module.exports = function (cfg, configName) { +module.exports.createCustomSw = function createCustomSw (cfg, configName) { const chain = new WebpackChain() const resolveModules = [ diff --git a/app-webpack/lib/webpack/pwa/index.js b/app-webpack/lib/webpack/pwa/index.js index b3d3e8ce992..eb935aaddfd 100644 --- a/app-webpack/lib/webpack/pwa/index.js +++ b/app-webpack/lib/webpack/pwa/index.js @@ -1,23 +1,24 @@ +const { merge } = require('webpack-merge') + const appPaths = require('../../app-paths.js') -const PwaManifestPlugin = require('./plugin.pwa-manifest.js') -const { plugin: HtmlPwaPlugin } = require('./plugin.html-pwa.js') -const getPackage = require('../../helpers/get-package.js') +const { appPkg } = require('../../app-pkg.js') +const { log } = require('../../helpers/logger.js') +const { PwaManifestPlugin } = require('./plugin.pwa-manifest.js') +const { HtmlPwaPlugin } = require('./plugin.html-pwa.js') +const { getPackage } = require('../../helpers/get-package.js') const WorkboxPlugin = getPackage('workbox-webpack-plugin') -module.exports = function (chain, cfg) { +module.exports.injectPwa = function injectPwa (chain, cfg) { // write manifest.json file chain.plugin('pwa-manifest') .use(PwaManifestPlugin, [ cfg ]) let defaultOptions const pluginMode = cfg.pwa.workboxPluginMode - const { log } = require('../../helpers/logger.js') if (pluginMode === 'GenerateSW') { - const pkg = require(appPaths.resolve.app('package.json')) - defaultOptions = { - cacheId: pkg.name || 'quasar-pwa-app' + cacheId: appPkg.name || 'quasar-pwa-app' } log('[GenerateSW] Will generate a service-worker file. Ignoring your custom written one.') @@ -44,7 +45,6 @@ module.exports = function (chain, cfg) { if (cfg.ctx.mode.ssr) { // if Object form: if (cfg.ssr.pwa && cfg.ssr.pwa !== true) { - const { merge } = require('webpack-merge') opts = merge({}, opts, cfg.ssr.pwa) } diff --git a/app-webpack/lib/webpack/pwa/plugin.custom-sw-warning.js b/app-webpack/lib/webpack/pwa/plugin.custom-sw-warning.js index ddca948e647..e8f9dff3f27 100644 --- a/app-webpack/lib/webpack/pwa/plugin.custom-sw-warning.js +++ b/app-webpack/lib/webpack/pwa/plugin.custom-sw-warning.js @@ -6,7 +6,7 @@ const filterFn = warn => !( && msgRE.test(warn.message) === true ) -module.exports = class CustomSwWarningPlugin { +module.exports.CustomSwWarningPlugin = class CustomSwWarningPlugin { apply (compiler) { compiler.hooks.done.tap('pwa-custom-sw-warning', stats => { stats.compilation.warnings = stats.compilation.warnings.filter(filterFn) diff --git a/app-webpack/lib/webpack/pwa/plugin.html-pwa.js b/app-webpack/lib/webpack/pwa/plugin.html-pwa.js index ae4531b58dc..64a7722a672 100644 --- a/app-webpack/lib/webpack/pwa/plugin.html-pwa.js +++ b/app-webpack/lib/webpack/pwa/plugin.html-pwa.js @@ -89,7 +89,7 @@ function fillPwaTags (data, { pwa: { manifest, metaVariables, metaVariablesFn, u module.exports.fillPwaTags = fillPwaTags -module.exports.plugin = class HtmlPwaPlugin { +module.exports.HtmlPwaPlugin = class HtmlPwaPlugin { constructor (cfg = {}) { this.cfg = cfg } diff --git a/app-webpack/lib/webpack/pwa/plugin.pwa-manifest.js b/app-webpack/lib/webpack/pwa/plugin.pwa-manifest.js index 3c12c07653c..118cf7005e8 100644 --- a/app-webpack/lib/webpack/pwa/plugin.pwa-manifest.js +++ b/app-webpack/lib/webpack/pwa/plugin.pwa-manifest.js @@ -1,6 +1,6 @@ const { sources } = require('webpack') -module.exports = class PwaManifest { +module.exports.PwaManifestPlugin = class PwaManifestPlugin { constructor (cfg = {}) { this.manifest = JSON.stringify(cfg.pwa.manifest) } diff --git a/app-webpack/lib/webpack/spa/index.js b/app-webpack/lib/webpack/spa/index.js index 9c14903c6a3..3ab9c1ec359 100644 --- a/app-webpack/lib/webpack/spa/index.js +++ b/app-webpack/lib/webpack/spa/index.js @@ -1,5 +1,5 @@ -const injectHtml = require('../inject.html.js') +const { injectHtml } = require('../inject.html.js') -module.exports = function (chain, cfg) { +module.exports.injectSpa = function injectPwa (chain, cfg) { injectHtml(chain, cfg) } diff --git a/app-webpack/lib/webpack/ssr/client.js b/app-webpack/lib/webpack/ssr/client.js index a47a0cc9f4b..91ee6f80f71 100644 --- a/app-webpack/lib/webpack/ssr/client.js +++ b/app-webpack/lib/webpack/ssr/client.js @@ -1,9 +1,9 @@ const path = require('node:path') -const injectHtml = require('../inject.html.js') +const { injectHtml } = require('../inject.html.js') const { QuasarSSRClientPlugin } = require('./plugin.client-side.js') -module.exports = function (chain, cfg) { +module.exports.injectSSRClient = function injectSSRClient (chain, cfg) { if (cfg.ctx.prod) { chain.output .path(path.join(cfg.build.distDir, 'www')) diff --git a/app-webpack/lib/webpack/ssr/plugin.webserver-assets.js b/app-webpack/lib/webpack/ssr/plugin.webserver-assets.js index c9942a369d9..4ad099edd1b 100644 --- a/app-webpack/lib/webpack/ssr/plugin.webserver-assets.js +++ b/app-webpack/lib/webpack/ssr/plugin.webserver-assets.js @@ -1,11 +1,13 @@ const fs = require('node:fs') const { sources } = require('webpack') +const { merge } = require('webpack-merge') const appPaths = require('../../app-paths.js') -const getFixedDeps = require('../../helpers/get-fixed-deps.js') +const { appPkg, cliPkg } = require('../../app-pkg.js') +const { getFixedDeps } = require('../../helpers/get-fixed-deps.js') const { getIndexHtml } = require('../../ssr/html-template.js') -module.exports = class WebserverAssetsPlugin { +module.exports.WebserverAssetsPlugin = class WebserverAssetsPlugin { constructor (cfg = {}) { this.cfg = cfg this.initPackageJson() @@ -20,21 +22,20 @@ module.exports = class WebserverAssetsPlugin { } initPackageJson () { - const appPkg = require(appPaths.resolve.app('package.json')) - const cliPkg = require(appPaths.resolve.cli('package.json')) + const localAppPkg = merge({}, appPkg) - if (appPkg.dependencies !== void 0) { - delete appPkg.dependencies[ '@quasar/extras' ] + if (localAppPkg.dependencies !== void 0) { + delete localAppPkg.dependencies[ '@quasar/extras' ] } - const appDeps = getFixedDeps(appPkg.dependencies || {}) + const appDeps = getFixedDeps(localAppPkg.dependencies || {}) const cliDeps = getFixedDeps(cliPkg.dependencies) const pkg = { - name: appPkg.name, - version: appPkg.version, - description: appPkg.description, - author: appPkg.author, + name: localAppPkg.name, + version: localAppPkg.version, + description: localAppPkg.description, + author: localAppPkg.author, private: true, scripts: { start: 'node index.js' diff --git a/app-webpack/lib/webpack/ssr/server.js b/app-webpack/lib/webpack/ssr/server.js index 9c2327e8b67..961eb6be533 100644 --- a/app-webpack/lib/webpack/ssr/server.js +++ b/app-webpack/lib/webpack/ssr/server.js @@ -23,7 +23,7 @@ function getModuleDirs () { const additionalModuleDirs = getModuleDirs() -module.exports = function (chain, cfg) { +module.exports.injectSSRServer = function injectSSRServer (chain, cfg) { chain.entry('app') .clear() .add(appPaths.resolve.app('.quasar/server-entry.js')) diff --git a/app-webpack/lib/webpack/ssr/webserver.js b/app-webpack/lib/webpack/ssr/webserver.js index f172bee8832..f9009308a0e 100644 --- a/app-webpack/lib/webpack/ssr/webserver.js +++ b/app-webpack/lib/webpack/ssr/webserver.js @@ -3,9 +3,10 @@ const WebpackChain = require('webpack-chain') const { existsSync } = require('fs-extra') const appPaths = require('../../app-paths.js') -const WebserverAssetsPlugin = require('./plugin.webserver-assets') -const injectNodeTypescript = require('../inject.node-typescript.js') -const WebpackProgressPlugin = require('../plugin.progress.js') +const { appPkg, cliPkg } = require('../../app-pkg.js') +const { WebserverAssetsPlugin } = require('./plugin.webserver-assets') +const { injectNodeTypescript } = require('../inject.node-typescript.js') +const { WebpackProgressPlugin } = require('../plugin.progress.js') const nodeEnvBanner = 'if(process.env.NODE_ENV===void 0){process.env.NODE_ENV=\'production\'}' const prodExportFile = { @@ -14,6 +15,23 @@ const prodExportFile = { fallback: appPaths.resolve.app('.quasar/ssr-fallback-production-export.js') } +const { dependencies: appDeps = {} } = appPkg +const { dependencies: cliDeps = {} } = cliPkg +const externalsList = [ + 'vue/server-renderer', + '@vue/server-renderer', + 'vue/compiler-sfc', + '@vue/compiler-sfc', + '@quasar/ssr-helpers/create-renderer', + './render-template.js', + './quasar.server-manifest.json', + './quasar.client-manifest.json', + 'compression', + 'express', + ...Object.keys(cliDeps), + ...Object.keys(appDeps) +] + const flattenObject = (obj, prefix = 'process.env') => { return Object.keys(obj) .reduce((acc, k) => { @@ -30,10 +48,7 @@ const flattenObject = (obj, prefix = 'process.env') => { }, {}) } -module.exports = function (cfg, configName) { - const { dependencies: appDeps = {} } = require(appPaths.resolve.app('package.json')) - const { dependencies: cliDeps = {} } = require(appPaths.resolve.cli('package.json')) - +module.exports.createSSRWebserverChain = function createSSRWebserverChain (cfg, configName) { const chain = new WebpackChain() const resolveModules = [ 'node_modules', @@ -79,20 +94,7 @@ module.exports = function (cfg, configName) { export: 'default' }) - chain.externals([ - 'vue/server-renderer', - '@vue/server-renderer', - 'vue/compiler-sfc', - '@vue/compiler-sfc', - '@quasar/ssr-helpers/create-renderer', - './render-template.js', - './quasar.server-manifest.json', - './quasar.client-manifest.json', - 'compression', - 'express', - ...Object.keys(cliDeps), - ...Object.keys(appDeps) - ]) + chain.externals(externalsList) chain.node .merge({" 181ac9ee2136a821157738c123c0ce83bd3986f7,2019-02-07 16:57:54,Razvan Stoenescu,feat(docs): Further pages review,False,Further pages review,feat,"diff --git a/docs/src/layouts/Layout.vue b/docs/src/layouts/Layout.vue index 033172fec88..4f75b2f84ab 100644 --- a/docs/src/layouts/Layout.vue +++ b/docs/src/layouts/Layout.vue @@ -12,7 +12,7 @@ q-layout.doc-layout(view=""hHh LpR lff"", @scroll=""onScroll"") template(v-if=""hasDrawer !== true"") q-separator.q-mx-xs(vertical, dark, inset) - q-btn.text-bold(key=""docs"", flat, stretch, no-caps, to=""/docs"", label=""Docs"") + q-btn.text-bold(key=""docs"", flat, stretch, no-caps, to=""/getting-started/pick-quasar-flavour"", label=""Docs"") q-space @@ -265,15 +265,18 @@ export default { height 25px .footer + font-size 11px padding 24px 0 &__icons - font-size 2em + font-size 28px a margin 0 8px 8px text-decoration none outline 0 color inherit + .q-icon:hover + color lighten($primary, 50%) .doc-link color inherit diff --git a/docs/src/pages/Landing.vue b/docs/src/pages/Landing.vue index cf66484cfb6..78dae8afd32 100644 --- a/docs/src/pages/Landing.vue +++ b/docs/src/pages/Landing.vue @@ -6,7 +6,7 @@ q-page(padding) div.row.col-12 img(src='https://cdn.quasar-framework.org/img/responsive-logo.png') - div.col-12.q-pt-sm Todo... Meanwhile, go to Documentation pages. + div.col-12.q-pt-sm Todo... Meanwhile, go to Documentation pages. div.col-12.q-pt-md If you encounter a problem you can’t solve, you can also get help from: li the Quasar forum. diff --git a/docs/src/pages/docs.md b/docs/src/pages/docs.md deleted file mode 100644 index eb52d098621..00000000000 --- a/docs/src/pages/docs.md +++ /dev/null @@ -1,83 +0,0 @@ ---- -title: The Quasar Framework ---- - -[Internal Link](/docs), [External Link](https://vuejs.org) - -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer non laoreet eros. `token` Morbi non ipsum ac purus dignissim rutrum. Nulla nec ante congue, rutrum tortor facilisis, aliquet ligula. Fusce vitae odio elit. `/quasar.conf.js` - -## Heading 2 -### Heading 3 -#### Heading 4 -##### Heading 5 -###### Heading 6 - -``` -const m = 'lala' -``` - -```html -
- Do something - -
-``` - -```vue - - - - - -``` - -| Table Example | Type | Description | -| --- | --- | --- | -| infinite | Boolean | Infinite slides scrolling | -| size | String | Thickness of loading bar. | - -> Something... - -::: tip -Some tip -::: - -::: warning -Some tip -::: - -::: danger -Some tip -::: - -::: warning CUSTOM TITLE -Some tip -::: - -* Something - * something - * else -* Back - * wee - -## Installation - - -## Usage - - -## API - diff --git a/docs/src/pages/sponsors-and-backers.md b/docs/src/pages/sponsors-and-backers.md index c32d9b0e36b..bb4b19dc717 100644 --- a/docs/src/pages/sponsors-and-backers.md +++ b/docs/src/pages/sponsors-and-backers.md @@ -12,6 +12,7 @@ Quasar Framework an MIT-licensed open-source project and is maintained by Razvan Like most open source products, Quasar can't do it alone. We rely on *sponsors, backers and supporters* to keep things going. When Quasar starts to bring you some financial stability, please be considerate of the tens of thousands of hours that went into its creation and send some money back to the team that made it possible. And finally, if your company relies on Quasar, the best way to guarantee that Quasar continues to be there for you is to invest in its maintenance! +## Donating You can help Quasar Development by making a monthly pledge through Patreon or send a one-time donation through Paypal. If you are representing a company who wants to become a **Sponsor** and need an invoice for your donations, please send an email to `razvan.stoenescu [at] gmail [dot] com`.
@@ -44,6 +45,8 @@ You can help Quasar Development by making a monthly pledge through Patreon or se
+All of your donations are used for Quasar Development purposes exclusively. + ::: tip For a full list of our wonderful people who make Quasar happen, visit the [Backers](https://github.com/quasarframework/quasar/blob/dev/backers.md) page. ::: diff --git a/docs/src/router/routes.js b/docs/src/router/routes.js index ec117eebd49..904a14b365e 100644 --- a/docs/src/router/routes.js +++ b/docs/src/router/routes.js @@ -5,10 +5,6 @@ const docsPages = [ { path: '', component: () => import('pages/Landing.vue') - }, - { - path: 'docs', - component: () => import('pages/docs.md') } ]" d51a41b7067d3cfac61baf1084eb717c6049235d,2023-05-09 21:43:25,Razvan Stoenescu,chore: temporarily downgrade ecmaVersion because of vscode quirk,False,temporarily downgrade ecmaVersion because of vscode quirk,chore,"diff --git a/app-vite/.eslintrc.js b/app-vite/.eslintrc.js index c5a58ac4a78..370329c9cfe 100644 --- a/app-vite/.eslintrc.js +++ b/app-vite/.eslintrc.js @@ -3,7 +3,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2023, + ecmaVersion: 2021, sourceType: 'module' }, diff --git a/app-webpack/.eslintrc.js b/app-webpack/.eslintrc.js index c5a58ac4a78..370329c9cfe 100644 --- a/app-webpack/.eslintrc.js +++ b/app-webpack/.eslintrc.js @@ -3,7 +3,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2023, + ecmaVersion: 2021, sourceType: 'module' }, diff --git a/cli/.eslintrc.cjs b/cli/.eslintrc.cjs index ed19d5d01dc..4ae17e1a414 100644 --- a/cli/.eslintrc.cjs +++ b/cli/.eslintrc.cjs @@ -3,7 +3,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2023, + ecmaVersion: 2021, sourceType: 'module' }, diff --git a/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintrc.cjs b/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintrc.cjs index 1f635933fd1..d20f49d3692 100644 --- a/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintrc.cjs +++ b/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintrc.cjs @@ -5,7 +5,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2023, // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2021, // Allows for the parsing of modern ECMAScript features }, env: { diff --git a/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintrc.cjs b/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintrc.cjs index 7e4a554b5fd..a696ec34d44 100644 --- a/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintrc.cjs +++ b/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintrc.cjs @@ -6,7 +6,7 @@ module.exports = { parserOptions: { parser: '@babel/eslint-parser', - ecmaVersion: 2023, // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2021, // Allows for the parsing of modern ECMAScript features sourceType: 'module' // Allows for the use of imports }, diff --git a/docs/.eslintrc.js b/docs/.eslintrc.js index 57f6c14df16..470a5660fa1 100644 --- a/docs/.eslintrc.js +++ b/docs/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2023, // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2021, // Allows for the parsing of modern ECMAScript features }, env: { diff --git a/docs/src/pages/quasar-cli-webpack/supporting-ts.md b/docs/src/pages/quasar-cli-webpack/supporting-ts.md index 7239895afdc..3a3ce6125ac 100644 --- a/docs/src/pages/quasar-cli-webpack/supporting-ts.md +++ b/docs/src/pages/quasar-cli-webpack/supporting-ts.md @@ -99,7 +99,7 @@ module.exports = { parser: '@typescript-eslint/parser', project: resolve(__dirname, './tsconfig.json'), tsconfigRootDir: __dirname, - ecmaVersion: 2023, // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2021, // Allows for the parsing of modern ECMAScript features sourceType: 'module', // Allows for the use of imports }, diff --git a/icongenie/.eslintrc.cjs b/icongenie/.eslintrc.cjs index f1f3def6c9e..d95e0ef17c1 100644 --- a/icongenie/.eslintrc.cjs +++ b/icongenie/.eslintrc.cjs @@ -3,7 +3,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2023, + ecmaVersion: 2021, sourceType: 'module' }, diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js index 916c00c9b67..7b5ebcecb90 100644 --- a/ui/.eslintrc.js +++ b/ui/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2023 + ecmaVersion: 2021 }, env: { diff --git a/utils/render-ssr-error/.eslintrc.cjs b/utils/render-ssr-error/.eslintrc.cjs index c427de394bc..ed2746c13ae 100644 --- a/utils/render-ssr-error/.eslintrc.cjs +++ b/utils/render-ssr-error/.eslintrc.cjs @@ -6,7 +6,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2023 + ecmaVersion: 2021 }, env: { diff --git a/vite-plugin/.eslintrc.cjs b/vite-plugin/.eslintrc.cjs index c427de394bc..ed2746c13ae 100644 --- a/vite-plugin/.eslintrc.cjs +++ b/vite-plugin/.eslintrc.cjs @@ -6,7 +6,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2023 + ecmaVersion: 2021 }, env: {" 0de50cc998dfa008d94eb05b2ef481cd89b81a3b,2019-11-19 16:59:47,Popescu Dan,fix(anchor-mixin): Add cleanup events for context menu #5638 (#5640),False,Add cleanup events for context menu #5638 (#5640),fix,"diff --git a/ui/src/mixins/anchor.js b/ui/src/mixins/anchor.js index ed032910385..0e82a5ee83b 100644 --- a/ui/src/mixins/anchor.js +++ b/ui/src/mixins/anchor.js @@ -1,6 +1,6 @@ import { clearSelection } from '../utils/selection.js' import { prevent } from '../utils/event.js' -import { addEvt, cleanEvt } from '../utils/touch.js' +import { addEvt, cleanEvt, getTouchTarget } from '../utils/touch.js' export default { props: { @@ -66,12 +66,19 @@ export default { } }, - __mobileTouch (evt) { + __mobileCleanup (evt) { + this.anchorEl.classList.remove('non-selectable') clearTimeout(this.touchTimer) if (this.showing === true && evt !== void 0) { clearSelection() } + }, + + __mobilePrevent: prevent, + + __mobileTouch (evt) { + this.__mobileCleanup(evt) if (this.__showCondition(evt) !== true) { return @@ -80,9 +87,16 @@ export default { this.hide(evt) this.anchorEl.classList.add('non-selectable') + const target = getTouchTarget(evt.target) + addEvt(this, 'anchor', [ + [ target, 'touchmove', '__mobileCleanup', 'passive' ], + [ target, 'touchend', '__mobileCleanup', 'passive' ], + [ target, 'touchcancel', '__mobileCleanup', 'passive' ], + [ this.anchorEl, 'contextmenu', '__mobilePrevent', 'notPassive' ] + ]) + this.touchTimer = setTimeout(() => { this.show(evt) - this.anchorEl.classList.remove('non-selectable') }, 300) }," af7b40374a93671a2ddc8c4aa16980f911f44a31,2020-12-25 00:05:57,Razvan Stoenescu,feat(ui): more tweaks,False,more tweaks,feat,"diff --git a/ui/src/components/btn/QBtn.js b/ui/src/components/btn/QBtn.js index 57266b507b3..d2d601f8835 100644 --- a/ui/src/components/btn/QBtn.js +++ b/ui/src/components/btn/QBtn.js @@ -337,7 +337,7 @@ export default defineComponent({ class: 'absolute-full flex flex-center' }, slots.loading !== void 0 ? slots.loading() : [h(QSpinner)]) ] - : void 0 + : null )) ) diff --git a/ui/src/components/dialog/QDialog.js b/ui/src/components/dialog/QDialog.js index 55b65aba38b..1a22ba7ef24 100644 --- a/ui/src/components/dialog/QDialog.js +++ b/ui/src/components/dialog/QDialog.js @@ -341,7 +341,7 @@ export default defineComponent({ function renderPortalContent () { return h('div', { - ...attrs, // TODO vue3 - verify reactivity + ...attrs, class: [ 'q-dialog fullscreen no-pointer-events ' + `q-dialog--${ useBackdrop.value === true ? 'modal' : 'seamless' }`, diff --git a/ui/src/components/menu/QMenu.js b/ui/src/components/menu/QMenu.js index 4a438ffd62c..56c881529ba 100644 --- a/ui/src/components/menu/QMenu.js +++ b/ui/src/components/menu/QMenu.js @@ -350,7 +350,7 @@ export default defineComponent({ () => ( showing.value === true ? h('div', { - ...attrs, // TODO vue3 - verify reactivity + ...attrs, ref: innerRef, tabindex: -1, class: [ diff --git a/ui/src/components/table/QTable.js b/ui/src/components/table/QTable.js index 5a7c0be73c3..ad89e071c88 100644 --- a/ui/src/components/table/QTable.js +++ b/ui/src/components/table/QTable.js @@ -992,7 +992,6 @@ export default defineComponent({ // expose public methods and needed computed props Object.assign(vm.proxy, { - filteredSortedRows, // TODO vue3 - make it a getter requestServerInteraction, setPagination, firstPage, @@ -1009,6 +1008,11 @@ export default defineComponent({ getCellValue }) + Object.defineProperty(vm.proxy, 'filteredSortedRows', { + get: () => filteredSortedRows.value, + enumerable: true + }) + return () => { const child = [getTopDiv()] const data = { ref: rootRef, class: containerClass.value } diff --git a/ui/src/components/tabs/QTabs.js b/ui/src/components/tabs/QTabs.js index b63671d046c..d3176e56703 100644 --- a/ui/src/components/tabs/QTabs.js +++ b/ui/src/components/tabs/QTabs.js @@ -168,7 +168,6 @@ export default defineComponent({ function recalculateScroll () { registerTick(() => { - // TODO vue3 -> verify vm.isDeactivated/isUnmounted if (vm.isDeactivated !== true && vm.isUnmounted !== true) { updateContainer({ width: rootRef.value.offsetWidth, diff --git a/ui/src/components/tabs/use-tab.js b/ui/src/components/tabs/use-tab.js index 292f7d0744c..c50f184565f 100644 --- a/ui/src/components/tabs/use-tab.js +++ b/ui/src/components/tabs/use-tab.js @@ -74,13 +74,6 @@ export default function (props, slots, emit, routerProps) { props.disable === true || isActive.value === true ? -1 : props.tabindex || 0 )) - // TODO vue3 - not needed??? - // const attributes = computed(() => - // props.disable === true - // ? { 'aria-disabled': 'true' } - // : {} - // ) - function onClick (e, keyboard) { keyboard !== true && blurTargetRef.value !== null && blurTargetRef.value.focus() diff --git a/ui/src/components/tooltip/QTooltip.js b/ui/src/components/tooltip/QTooltip.js index e8a4c0b1714..f0b0fbcd26c 100644 --- a/ui/src/components/tooltip/QTooltip.js +++ b/ui/src/components/tooltip/QTooltip.js @@ -249,7 +249,7 @@ export default defineComponent({ function getTooltipContent () { return showing.value === true ? h('div', { - ...attrs, // TODO vue3 - verify reactivity + ...attrs, ref: innerRef, class: [ 'q-tooltip q-tooltip--style q-position-engine no-pointer-events', diff --git a/ui/src/composables/private/use-anchor.js b/ui/src/composables/private/use-anchor.js index 937877d5afd..df1cac2376c 100644 --- a/ui/src/composables/private/use-anchor.js +++ b/ui/src/composables/private/use-anchor.js @@ -151,8 +151,7 @@ export default function ({ } if (el !== void 0 && el !== null) { - // TODO vue3 - correctly handle el._isVue - anchorEl.value = el._isVue === true && el.$el !== void 0 ? el.$el : el + anchorEl.value = el.$el || el configureAnchorEl() } else { diff --git a/ui/src/composables/private/use-field.js b/ui/src/composables/private/use-field.js index 15ce0b90dee..83f12094110 100644 --- a/ui/src/composables/private/use-field.js +++ b/ui/src/composables/private/use-field.js @@ -238,7 +238,6 @@ export default function ({ const controlSlotScope = computed(() => ({ id: state.targetUid.value, - // field: markRaw(state.rootRef.value), // TODO vue3 editable: state.editable.value, focused: state.focused.value, floatingLabel: floatingLabel.value," 0f6a8eb8c0f7d18bc91cea15e22da32683a3c78a,2019-03-26 08:46:40,Razvan Stoenescu,"feat(docs): Add references to current ""search with no results"" terms",False,"Add references to current ""search with no results"" terms",feat,"diff --git a/docs/src/pages/layout/drawer.md b/docs/src/pages/layout/drawer.md index d8f7f239e8c..f0d26aea5bc 100644 --- a/docs/src/pages/layout/drawer.md +++ b/docs/src/pages/layout/drawer.md @@ -7,6 +7,8 @@ related: QLayout allows you to configure your views as a 3x3 matrix, containing optional left-side and/or right-side Drawers. If you haven’t already, please read [QLayout](/layout/layout) documentation page first. +QDrawer is the sidebar part of your QLayout. + ## Installation diff --git a/docs/src/pages/layout/header-and-footer.md b/docs/src/pages/layout/header-and-footer.md index 8246151c693..dcdf1ea9286 100644 --- a/docs/src/pages/layout/header-and-footer.md +++ b/docs/src/pages/layout/header-and-footer.md @@ -9,7 +9,7 @@ related: - /vue-components/bar --- -QLayout allows you to configure your views as a 3x3 matrix, containing an optional Header and/or Footer. If you haven’t already, please read [QLayout](/layout/layout) documentation page first. +QLayout allows you to configure your views as a 3x3 matrix, containing an optional Header and/or Footer (mostly used for navbar, but can be anything). If you haven’t already, please read [QLayout](/layout/layout) documentation page first. ## Installation Pick only what you are using from the list below. diff --git a/docs/src/pages/quasar-plugins/notify.md b/docs/src/pages/quasar-plugins/notify.md index 7946f94ea6e..0a9c856f495 100644 --- a/docs/src/pages/quasar-plugins/notify.md +++ b/docs/src/pages/quasar-plugins/notify.md @@ -1,7 +1,7 @@ --- title: Notify --- -Notify is a Quasar plugin that can display animated messages (floating above everything in your pages) to users in the form of a notification. They are useful for alerting the user of an event and can even engage the user through actions. +Notify is a Quasar plugin that can display animated messages (floating above everything in your pages) to users in the form of a notification. They are useful for alerting the user of an event and can even engage the user through actions. Also known as a toast. ## Installation " 64e7e739ee076249bef14318c23049ac2db34dc7,2021-04-23 18:45:50,Razvan Stoenescu,fix(app): Progress - do not show entry until at least one compilation started,False,Progress - do not show entry until at least one compilation started,fix,"diff --git a/app/lib/webpack/plugin.progress.js b/app/lib/webpack/plugin.progress.js index 41490009da1..aa43ec77035 100644 --- a/app/lib/webpack/plugin.progress.js +++ b/app/lib/webpack/plugin.progress.js @@ -108,9 +108,7 @@ const renderBars = throttle(printBars, 200) * Status related */ -const greenTop = chalk.green('┌─') -const greenMid = chalk.green('├─') -const greenBot = chalk.green('└─') +const greenBanner = chalk.green('»') let readyBanner = false @@ -132,16 +130,16 @@ function getReadyBanner (cfg) { } const urlList = cfg.devServer.host === '0.0.0.0' - ? getIPList().map(ip => chalk.green(cfg.__getUrl(ip))).join(`\n `) + ? getIPList().map(ip => chalk.green(cfg.__getUrl(ip))).join(`\n `) : chalk.green(cfg.build.APP_URL) return [ - ` ${greenTop} App dir........... ${chalk.green(appPaths.appDir)}`, - ` ${greenMid} Dev mode.......... ${chalk.green(cfg.ctx.modeName + (cfg.ctx.mode.ssr && cfg.ctx.mode.pwa ? ' + pwa' : ''))}`, - ` ${greenMid} Pkg quasar........ ${chalk.green('v' + quasarVersion)}`, - ` ${greenMid} Pkg @quasar/app... ${chalk.green('v' + cliAppVersion)}`, - ` ${greenMid} Transpiled JS..... ${cfg.__transpileBanner}`, - ` ${greenBot} App URL........... ${urlList}` + ` ${greenBanner} App dir........... ${chalk.green(appPaths.appDir)}`, + ` ${greenBanner} App URL........... ${urlList}`, + ` ${greenBanner} Dev mode.......... ${chalk.green(cfg.ctx.modeName + (cfg.ctx.mode.ssr && cfg.ctx.mode.pwa ? ' + pwa' : ''))}`, + ` ${greenBanner} Pkg quasar........ ${chalk.green('v' + quasarVersion)}`, + ` ${greenBanner} Pkg @quasar/app... ${chalk.green('v' + cliAppVersion)}`, + ` ${greenBanner} Transpiled JS..... ${cfg.__transpileBanner}` ].join('\n') + '\n' } @@ -197,8 +195,6 @@ module.exports = class WebpackProgressPlugin extends ProgressPlugin { super({ handler: () => {} }) } - this.state = createState(name, hasExternalWork) - this.opts = { name, useBars, @@ -215,8 +211,6 @@ module.exports = class WebpackProgressPlugin extends ProgressPlugin { } compiler.hooks.watchClose.tap('QuasarProgressPlugin', () => { - this.destroyed = true - const index = compilations.indexOf(this.state) compilations.splice(index, 1) @@ -236,9 +230,8 @@ module.exports = class WebpackProgressPlugin extends ProgressPlugin { }) compiler.hooks.compile.tap('QuasarProgressPlugin', () => { - if (this.destroyed === true) { + if (this.state === void 0) { this.state = createState(this.opts.name, this.opts.hasExternalWork) - this.destroyed = false } else { this.resetStats() @@ -305,7 +298,7 @@ module.exports = class WebpackProgressPlugin extends ProgressPlugin { updateBars (percent, msg, details) { // it may still be called even after compilation was closed // due to Webpack's delayed call of handler - if (this.destroyed === true) { return } + if (this.state === void 0) { return } const progress = Math.floor(percent * 100) const running = progress < 100" feefc4159363ad8f335a87a7e1f156f60c7d61d0,2021-04-02 21:23:31,Razvan Stoenescu,"feat(app): SSR middleware - pass process.env (build > env); add more prod settings (ssr > prodPort, prodCacheDuration)",False,"SSR middleware - pass process.env (build > env); add more prod settings (ssr > prodPort, prodCacheDuration)",feat,"diff --git a/app/lib/quasar-conf-file.js b/app/lib/quasar-conf-file.js index b6e055ccc5e..5886f7c0b4e 100644 --- a/app/lib/quasar-conf-file.js +++ b/app/lib/quasar-conf-file.js @@ -551,6 +551,8 @@ class QuasarConfFile { cfg.ssr = merge({ pwa: false, manualHydration: false, + prodPort: 3000, // gets superseeded in production by an eventual process.env.PORT + prodCacheDuration: 1000 * 60 * 60 * 24 * 30, directiveTransforms: require('quasar/dist/ssr-directives/index.js') }, cfg.ssr) diff --git a/app/lib/webpack/ssr/webserver.js b/app/lib/webpack/ssr/webserver.js index 328c45f8835..8de8769b211 100644 --- a/app/lib/webpack/ssr/webserver.js +++ b/app/lib/webpack/ssr/webserver.js @@ -1,10 +1,25 @@ +const webpack = require('webpack') const WebpackChain = require('webpack-chain') const WebpackProgress = require('../plugin.progress') const appPaths = require('../../app-paths') const WebserverAssetsPlugin = require('./plugin.webserver-assets') -// Used only in production +const flattenObject = (obj, prefix = 'process.env') => { + return Object.keys(obj) + .reduce((acc, k) => { + const pre = prefix.length ? prefix + '.' : '' + + if (Object(obj[k]) === obj[k]) { + Object.assign(acc, flattenObject(obj[k], pre + k)) + } + else { + acc[pre + k] = obj[k] + } + + return acc + }, {}) +} module.exports = function (cfg, configName) { const { dependencies:appDeps = {} } = require(appPaths.resolve.app('package.json')) @@ -78,6 +93,13 @@ module.exports = function (cfg, configName) { chain.optimization .noEmitOnErrors(true) + chain.plugin('define') + .use(webpack.DefinePlugin, [ + // flatten the object keys + // example: some: { object } becomes 'process.env.some.object' + { ...flattenObject(cfg.build.env), ...cfg.__rootDefines } + ]) + if (cfg.build.showProgress) { chain.plugin('progress') .use(WebpackProgress, [{ name: configName }]) diff --git a/app/templates/entry/ssr-prod-webserver.js b/app/templates/entry/ssr-prod-webserver.js index 33eb9300a3f..bac4e3593b1 100644 --- a/app/templates/entry/ssr-prod-webserver.js +++ b/app/templates/entry/ssr-prod-webserver.js @@ -32,8 +32,8 @@ const renderer = createRenderer({ }) // util to serve files -const defaultCache = 1000 * 60 * 60 * 24 * 30 -const serve = (path, cache = defaultCache) => express.static(resolve('www/' + path), { +const prodCacheDuration = <%= ssr.prodCacheDuration %> +const serve = (path, cache = prodCacheDuration) => express.static(resolve('www/' + path), { maxAge: cache }) @@ -52,11 +52,11 @@ injectMiddlewares({ render: { vue: ssrContext => renderer(ssrContext, renderTemplate) } -}) - -// finally start listening to clients -const port = process.env.PORT || 3000 +}).then(() => { + // finally start listening to clients + const port = process.env.PORT || <%= ssr.prodPort %> -app.listen(port, () => { - console.log('Server listening at port ' + port) + app.listen(port, () => { + console.log('Server listening at port ' + port) + }) })" 5b8f1d9381d2be0303a543f5ce9ec1a684cbaf24,2019-11-22 15:09:38,Popescu Dan,perf(ui): Use special key in QSelect if it hasDialog (#5673),False,Use special key in QSelect if it hasDialog (#5673),perf,"diff --git a/ui/src/components/select/QSelect.js b/ui/src/components/select/QSelect.js index 6c2166927a8..8b71fe5d325 100755 --- a/ui/src/components/select/QSelect.js +++ b/ui/src/components/select/QSelect.js @@ -820,7 +820,7 @@ export default Vue.extend({ disabled: this.disable === true, readonly: this.readonly === true }, - on: cache(this, 'inp', on) + on: cache(this, 'inp#' + this.hasDialog, on) }) }," f0a774b9accdc347fb7ac6c92839cbbebd753f85,2024-11-26 16:07:51,Razvan Stoenescu,fix(create-quasar): small style quirks for the new app-vite/webpack templates,False,small style quirks for the new app-vite/webpack templates,fix,"diff --git a/create-quasar/templates/app/quasar-v2/js-vite-1/BASE/quasar.config.js b/create-quasar/templates/app/quasar-v2/js-vite-1/BASE/quasar.config.js index d9d09e1e6c1..b79a1bed788 100644 --- a/create-quasar/templates/app/quasar-v2/js-vite-1/BASE/quasar.config.js +++ b/create-quasar/templates/app/quasar-v2/js-vite-1/BASE/quasar.config.js @@ -137,7 +137,6 @@ module.exports = configure(function (/* ctx */) { // https://v2.quasar.dev/quasar-cli-vite/developing-ssr/configuring-ssr ssr: { // ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name! - // will mess up SSR // extendSSRWebserverConf (esbuildConf) {}, // extendPackageJson (json) {}, diff --git a/create-quasar/templates/app/quasar-v2/js-vite-2/BASE/quasar.config.js b/create-quasar/templates/app/quasar-v2/js-vite-2/BASE/quasar.config.js index 00c87caddb7..a0d75365ad0 100644 --- a/create-quasar/templates/app/quasar-v2/js-vite-2/BASE/quasar.config.js +++ b/create-quasar/templates/app/quasar-v2/js-vite-2/BASE/quasar.config.js @@ -223,4 +223,4 @@ export default defineConfig((<% if (preset.i18n) { %>ctx<% } else { %>/* ctx */< extraScripts: [] } } -}); +}) diff --git a/create-quasar/templates/app/quasar-v2/js-webpack-4/BASE/quasar.config.js b/create-quasar/templates/app/quasar-v2/js-webpack-4/BASE/quasar.config.js index 64da10a4af3..9278f0d765f 100644 --- a/create-quasar/templates/app/quasar-v2/js-webpack-4/BASE/quasar.config.js +++ b/create-quasar/templates/app/quasar-v2/js-webpack-4/BASE/quasar.config.js @@ -70,7 +70,6 @@ export default defineConfig((ctx) => { }, // rtl: true, // https://quasar.dev/options/rtl-support - // preloadChunks: true, // showProgress: false, // gzip: true, // analyze: true, @@ -147,7 +146,6 @@ export default defineConfig((ctx) => { pwa: false // pwaOfflineHtmlFilename: 'offline.html', // do NOT use index.html as name! - // will mess up SSR // pwaExtendGenerateSWOptions (cfg) {}, // pwaExtendInjectManifestOptions (cfg) {} @@ -216,9 +214,7 @@ export default defineConfig((ctx) => { // extendBexScriptsConf (esbuildConf) {}, // extendBexManifestJson (json) {}, - contentScripts: [ - 'my-content-script' - ] + extraScripts: [] } } -}); +}) diff --git a/create-quasar/templates/app/quasar-v2/ts-vite-1/BASE/quasar.config.js b/create-quasar/templates/app/quasar-v2/ts-vite-1/BASE/quasar.config.js index 5815d847df4..fd56c4fb261 100644 --- a/create-quasar/templates/app/quasar-v2/ts-vite-1/BASE/quasar.config.js +++ b/create-quasar/templates/app/quasar-v2/ts-vite-1/BASE/quasar.config.js @@ -141,7 +141,6 @@ module.exports = configure(function (/* ctx */) { // https://v2.quasar.dev/quasar-cli-vite/developing-ssr/configuring-ssr ssr: { // ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name! - // will mess up SSR // extendSSRWebserverConf (esbuildConf) {}, // extendPackageJson (json) {}," 934116eaade8805ee35e9e065455a1bb76939255,2020-08-13 20:03:33,Paolo Caleffi,refactor(app): check AE install status by accessing index file directly (#7625),False,check AE install status by accessing index file directly (#7625),refactor,"diff --git a/app/lib/app-extension/Extension.js b/app/lib/app-extension/Extension.js index f869fe05f3d..9aa49d24cc3 100644 --- a/app/lib/app-extension/Extension.js +++ b/app/lib/app-extension/Extension.js @@ -125,7 +125,7 @@ module.exports = class Extension { isInstalled () { try { - require.resolve(this.packageName, { + require.resolve(this.packageName + '/src/index', { paths: [ appPaths.appDir ] }) }" 99b9b53d8dbfd2d62cfcc9df60f7e038ddfe5064,2022-03-23 03:12:02,Razvan Stoenescu,feat(cli): upgrade deps,False,upgrade deps,feat,"diff --git a/cli/package.json b/cli/package.json index fef9d9d7ac3..4912cfcae17 100644 --- a/cli/package.json +++ b/cli/package.json @@ -43,33 +43,33 @@ ""yarn"": "">= 1.6.0"" }, ""dependencies"": { - ""async"": ""3.2.3"", - ""kolorist"": ""1.5.1"", - ""ci-info"": ""3.3.0"", - ""compression"": ""1.7.4"", - ""connect-history-api-fallback"": ""1.6.0"", + ""async"": ""^3.2.3"", + ""kolorist"": ""^1.5.1"", + ""ci-info"": ""^3.3.0"", + ""compression"": ""^1.7.4"", + ""connect-history-api-fallback"": ""^1.6.0"", ""consolidate"": ""0.16.0"", - ""cors"": ""2.8.5"", - ""cross-spawn"": ""7.0.3"", - ""download-git-repo"": ""3.0.2"", - ""express"": ""4.17.3"", - ""fs-extra"": ""9.0.1"", - ""handlebars"": ""4.7.7"", - ""http-proxy-middleware"": ""2.0.3"", - ""inquirer"": ""8.2.0"", - ""metalsmith"": ""2.4.2"", - ""minimatch"": ""3.0.4"", - ""minimist"": ""1.2.6"", - ""multimatch"": ""5.0.0"", + ""cors"": ""^2.8.5"", + ""cross-spawn"": ""^7.0.3"", + ""download-git-repo"": ""^3.0.2"", + ""express"": ""^4.17.3"", + ""fs-extra"": ""^10.0.0"", + ""handlebars"": ""^4.7.7"", + ""http-proxy-middleware"": ""^2.0.3"", + ""inquirer"": ""^8.2.0"", + ""metalsmith"": ""^2.4.2"", + ""minimatch"": ""^3.0.4"", + ""minimist"": ""^1.2.6"", + ""multimatch"": ""^5.0.0"", ""open"": ""7.0.4"", ""ora"": ""5.4.0"", - ""read-metadata"": ""1.0.0"", - ""rimraf"": ""3.0.2"", + ""read-metadata"": ""^1.0.0"", + ""rimraf"": ""^3.0.2"", ""route-cache"": ""0.4.7"", ""selfsigned"": ""1.10.11"", - ""tildify"": ""2.0.0"", - ""update-notifier"": ""5.1.0"", - ""validate-npm-package-name"": ""3.0.0"" + ""tildify"": ""^2.0.0"", + ""update-notifier"": ""^5.1.0"", + ""validate-npm-package-name"": ""^3.0.0"" }, ""publishConfig"": { ""access"": ""public""" 86ec98655be853313ee20d752b2e671a8786f375,2018-01-29 01:16:12,Razvan Stoenescu,feat(QBtnToggle): readonly prop,False,readonly prop,feat,"diff --git a/src/components/btn/QBtnToggle.js b/src/components/btn/QBtnToggle.js index ae5b800e81b..950e55583a6 100644 --- a/src/components/btn/QBtnToggle.js +++ b/src/components/btn/QBtnToggle.js @@ -20,6 +20,7 @@ export default { required: true, validator: v => v.every(opt => ('label' in opt || 'icon' in opt) && 'value' in opt) }, + readonly: Boolean, disable: Boolean, noCaps: Boolean, noWrap: Boolean, @@ -40,6 +41,9 @@ export default { }, methods: { set (value, opt) { + if (this.readonly) { + return + } this.$emit('input', value, opt) this.$nextTick(() => { if (JSON.stringify(value) !== JSON.stringify(this.value)) {" 0de33e005ec2871ea059fc41f916a081bdf55b8a,2016-02-10 19:04:41,Razvan Stoenescu,feat: List,False,List,feat,"diff --git a/preview/src/layouts/main/layout.main.html b/preview/src/layouts/main/layout.main.html index 3cc9636ae7e..d9f135b755a 100644 --- a/preview/src/layouts/main/layout.main.html +++ b/preview/src/layouts/main/layout.main.html @@ -33,6 +33,8 @@ + + diff --git a/preview/src/pages/list/config.list.yml b/preview/src/pages/list/config.list.yml new file mode 100644 index 00000000000..8722a0b536e --- /dev/null +++ b/preview/src/pages/list/config.list.yml @@ -0,0 +1,5 @@ +label: 'List' +icon: 'pages' +layout: 'main' +navigation: + group: 'main' diff --git a/preview/src/pages/list/script.list.js b/preview/src/pages/list/script.list.js new file mode 100644 index 00000000000..5f556c9bf1e --- /dev/null +++ b/preview/src/pages/list/script.list.js @@ -0,0 +1,7 @@ +'use strict'; + +var html = require('raw!./view.list.html'); + +module.exports = { + template: html +}; diff --git a/preview/src/pages/list/style.list.styl b/preview/src/pages/list/style.list.styl new file mode 100644 index 00000000000..e69de29bb2d diff --git a/preview/src/pages/list/view.list.html b/preview/src/pages/list/view.list.html new file mode 100644 index 00000000000..fcbc74a3bcf --- /dev/null +++ b/preview/src/pages/list/view.list.html @@ -0,0 +1,116 @@ +
    +
  • Quasar Framework
    • +
  • Quasar Framework
    • +
  • Quasar Framework
    • +
+ +
    +
  • List Title
    • +
  • Quasar Framework
    • +
  • Quasar Framework
    • +
  • Quasar Framework
    • +
+ +
    +
  • List Title
    • +
  • Quasar Framework
    • +
  • List Title
    • +
  • Quasar Framework
    • +
  • Quasar Framework
    • +
  • List Title
    • +
+ +
    +
  • List Header
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
+ +
    +
  • List Header
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
+ +
    +
  • List Header
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
+ +
    +
  • + insert_chart +

    + Title + First Line
    + Second Line +

    + grade +
    • +
  • + insert_chart +

    + Title + 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. +

    + grade +
    • +
  • + insert_chart +

    + Title + Second Line +

    + grade +
    • +
+ +
    +
  • + insert_chart +

    + Title + First Line
    + Second Line +

    + grade +
    • +
  • + insert_chart +

    + Title + 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. +

    + grade +
    • +
  • + insert_chart +

    + Title + Second Line +

    + grade +
    • +
+ +
    +
  • List Header
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
+ +
    +
  • List Header
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
  • Quasar Frameworksend
    • +
diff --git a/src/lib/web-components/list/list.styl b/src/lib/web-components/list/list.styl new file mode 100644 index 00000000000..249777cb771 --- /dev/null +++ b/src/lib/web-components/list/list.styl @@ -0,0 +1,57 @@ +ul.list + margin .5em 0 1em 0 + border 1px solid $grey-200 + overflow hidden + position relative + padding 0 + list-style-type none + border-radius 3px + + li + line-height 1.5em + padding 10px 20px + margin 0 + border-bottom 1px solid $grey-200 + + p + margin .2em + color $grey-600 + span:first-of-type + color black + font-size 1.4em + display block + margin-bottom .3em + + img, i + font-size 2em + + &.complex + @extend .grid, .grid.horizontal, .grid.full-width + p + @extend .grid .flex-12 + > i:first-child + font-size 2.9em + img, i + color $primary + margin .2em .2em 0 0 + .secondary-content + @extend .grid, .grid.horizontal + padding-top .4em + + .list-title + font-size 1.8em + + .secondary-content + float right + + &.borderless + border 0 + &.no-separator li + border 0 + &.highlight li:not(.list-title):hover + background-color rgba(0, 0, 0, .05) + &.link li:not(.list-title) + cursor pointer + + &.highlight.borderless li + border-radius 3px" 38563c73022990a9b044df042aafacc0924664cd,2024-01-31 15:34:24,Sami Baadarani,docs: update contribution guide heading link (#16838),False,update contribution guide heading link (#16838),docs,"diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7581e06535d..5a0d887bf91 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ Hi! We are really excited that you are interested in contributing to Quasar 👏 - [Issue Reporting Guidelines](#issue-reporting-guidelines) - [Pull Request Guidelines](#pull-request-guidelines) - [Development Setup](#development-setup) -- [Project Structure](#project-structure) +- [Project Structure](#project-structure-ui) - [Financial Contribution](#financial-contribution) ## Issue Reporting Guidelines @@ -111,6 +111,7 @@ $ yarn lint # or: npm run lint - **`dev`**: app with Quasar sources linked directly used for testing purposes. Each feature/component has its own `*.vue` file. Adding a new file automatically creates a route for it and adds it to the ""homepage"" list (based on the file name). ## Dev Server for Quasar (/ui) + Running `yarn dev` (or `npm run dev`) starts up a dev server which uses HMR (Hot Module Reload) for Quasar source code. You can easily test your changes by making necessary changes to `/dev` `*.vue` files. ## Financial Contribution" 8f50b22317b4ffc2680265aa8fdd5a12b5224c7c,2020-02-10 14:52:11,Razvan Stoenescu,refactor(QFab): better naming for vertical actions align,False,better naming for vertical actions align,refactor,"diff --git a/ui/dev/src/pages/components/fab-extended.vue b/ui/dev/src/pages/components/fab-extended.vue index 5a68ef337ae..faa522b0fb2 100644 --- a/ui/dev/src/pages/components/fab-extended.vue +++ b/ui/dev/src/pages/components/fab-extended.vue @@ -3,7 +3,7 @@ - + @@ -23,9 +23,9 @@ alignValues.includes(v) @@ -60,7 +60,7 @@ export default Vue.extend({ }, classes () { - return `q-fab--align-${this.actionsVerticalAlign} ${this.formClass}` + + return `q-fab--align-${this.verticalActionsAlign} ${this.formClass}` + (this.showing === true ? ' q-fab--opened' : '') } }, diff --git a/ui/src/components/fab/QFab.json b/ui/src/components/fab/QFab.json index 904669a8e39..000e4a2ccd4 100644 --- a/ui/src/components/fab/QFab.json +++ b/ui/src/components/fab/QFab.json @@ -24,7 +24,7 @@ ""category"": ""behavior"" }, - ""actions-vertical-align"": { + ""vertical-actions-align"": { ""type"": ""String"", ""desc"": ""The side of the Fab where Fab Actions will expand (only when direction is 'up' or 'down')"", ""default"": ""center"","