recompiled .quasar
This commit is contained in:
parent
7ce93ab676
commit
a91f1fd625
|
|
@ -10,23 +10,37 @@
|
|||
* Boot files are your "main.js"
|
||||
**/
|
||||
|
||||
import { Quasar } from 'quasar';
|
||||
import RootComponent from 'app/src/App.vue';
|
||||
|
||||
import createRouter from 'app/src/router/index';
|
||||
|
||||
import { Quasar } from 'quasar'
|
||||
import RootComponent from 'app/src/App.vue'
|
||||
|
||||
|
||||
import createRouter from 'app/src/router/index'
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
export default async function (createAppFn, quasarUserOptions) {
|
||||
// create store and router instances
|
||||
|
||||
const router = typeof createRouter === 'function' ? await createRouter({}) : createRouter;
|
||||
const router = typeof createRouter === 'function'
|
||||
? await createRouter({})
|
||||
: createRouter
|
||||
|
||||
|
||||
// Create the app instance.
|
||||
// Here we inject into it the Quasar UI, the router & possibly the store.
|
||||
const app = createAppFn(RootComponent);
|
||||
const app = createAppFn(RootComponent)
|
||||
|
||||
|
||||
app.config.devtools = true
|
||||
|
||||
|
||||
app.use(Quasar, quasarUserOptions)
|
||||
|
||||
app.config.devtools = true;
|
||||
|
||||
app.use(Quasar, quasarUserOptions);
|
||||
|
||||
// Expose the app, the router and the store.
|
||||
// Note that we are not mounting the app here, since bootstrapping will be
|
||||
|
|
@ -34,6 +48,6 @@ export default async function (createAppFn, quasarUserOptions) {
|
|||
return {
|
||||
app,
|
||||
|
||||
router,
|
||||
};
|
||||
router
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,51 +10,79 @@
|
|||
* Boot files are your "main.js"
|
||||
**/
|
||||
|
||||
import { createApp } from 'vue';
|
||||
|
||||
import '@quasar/extras/roboto-font/roboto-font.css';
|
||||
import { createApp } from 'vue'
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
import '@quasar/extras/roboto-font/roboto-font.css'
|
||||
|
||||
import '@quasar/extras/material-icons/material-icons.css'
|
||||
|
||||
|
||||
|
||||
import '@quasar/extras/material-icons/material-icons.css';
|
||||
|
||||
// We load Quasar stylesheet file
|
||||
import 'quasar/dist/quasar.sass';
|
||||
import 'quasar/dist/quasar.sass'
|
||||
|
||||
import 'src/css/app.scss';
|
||||
|
||||
import createQuasarApp from './app.js';
|
||||
import quasarUserOptions from './quasar-user-options.js';
|
||||
|
||||
console.info('[Quasar] Running SPA.');
|
||||
|
||||
const publicPath = ``;
|
||||
import 'src/css/app.scss'
|
||||
|
||||
async function start({ app, router }, bootFiles) {
|
||||
let hasRedirected = false;
|
||||
const getRedirectUrl = (url) => {
|
||||
try {
|
||||
return router.resolve(url).href;
|
||||
} catch (err) {}
|
||||
|
||||
return Object(url) === url ? null : url;
|
||||
};
|
||||
const redirect = (url) => {
|
||||
hasRedirected = true;
|
||||
import createQuasarApp from './app.js'
|
||||
import quasarUserOptions from './quasar-user-options.js'
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
console.info('[Quasar] Running SPA.')
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
const publicPath = ``
|
||||
|
||||
|
||||
async function start ({ app, router }, bootFiles) {
|
||||
|
||||
|
||||
|
||||
let hasRedirected = false
|
||||
const getRedirectUrl = url => {
|
||||
try { return router.resolve(url).href }
|
||||
catch (err) {}
|
||||
|
||||
return Object(url) === url
|
||||
? null
|
||||
: url
|
||||
}
|
||||
const redirect = url => {
|
||||
hasRedirected = true
|
||||
|
||||
if (typeof url === 'string' && /^https?:\/\//.test(url)) {
|
||||
window.location.href = url;
|
||||
return;
|
||||
window.location.href = url
|
||||
return
|
||||
}
|
||||
|
||||
const href = getRedirectUrl(url);
|
||||
const href = getRedirectUrl(url)
|
||||
|
||||
// continue if we didn't fail to resolve the url
|
||||
if (href !== null) {
|
||||
window.location.href = href;
|
||||
window.location.reload();
|
||||
window.location.href = href
|
||||
window.location.reload()
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const urlPath = window.location.href.replace(window.location.origin, '');
|
||||
const urlPath = window.location.href.replace(window.location.origin, '')
|
||||
|
||||
for (let i = 0; hasRedirected === false && i < bootFiles.length; i++) {
|
||||
try {
|
||||
|
|
@ -65,36 +93,57 @@ async function start({ app, router }, bootFiles) {
|
|||
ssrContext: null,
|
||||
redirect,
|
||||
urlPath,
|
||||
publicPath,
|
||||
});
|
||||
} catch (err) {
|
||||
publicPath
|
||||
})
|
||||
}
|
||||
catch (err) {
|
||||
if (err && err.url) {
|
||||
redirect(err.url);
|
||||
return;
|
||||
redirect(err.url)
|
||||
return
|
||||
}
|
||||
|
||||
console.error('[Quasar] boot error:', err);
|
||||
return;
|
||||
console.error('[Quasar] boot error:', err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if (hasRedirected === true) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
app.use(router);
|
||||
|
||||
app.mount('#q-app');
|
||||
app.use(router)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
app.mount('#q-app')
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
createQuasarApp(createApp, quasarUserOptions).then((app) => {
|
||||
createQuasarApp(createApp, quasarUserOptions)
|
||||
|
||||
.then(app => {
|
||||
return Promise.all([
|
||||
|
||||
import(/* webpackMode: "eager" */ 'boot/i18n'),
|
||||
|
||||
import(/* webpackMode: "eager" */ 'boot/axios'),
|
||||
]).then((bootFiles) => {
|
||||
const boot = bootFiles.map((entry) => entry.default).filter((entry) => typeof entry === 'function');
|
||||
import(/* webpackMode: "eager" */ 'boot/axios')
|
||||
|
||||
]).then(bootFiles => {
|
||||
const boot = bootFiles
|
||||
.map(entry => entry.default)
|
||||
.filter(entry => typeof entry === 'function')
|
||||
|
||||
start(app, boot)
|
||||
})
|
||||
})
|
||||
|
||||
start(app, boot);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -10,104 +10,104 @@
|
|||
* Boot files are your "main.js"
|
||||
**/
|
||||
|
||||
import App from 'app/src/App.vue';
|
||||
let appPrefetch =
|
||||
typeof App.preFetch === 'function'
|
||||
|
||||
|
||||
|
||||
|
||||
import App from 'app/src/App.vue'
|
||||
let appPrefetch = typeof App.preFetch === 'function'
|
||||
? App.preFetch
|
||||
: // Class components return the component options (and the preFetch hook) inside __c property
|
||||
: (
|
||||
// Class components return the component options (and the preFetch hook) inside __c property
|
||||
App.__c !== void 0 && typeof App.__c.preFetch === 'function'
|
||||
? App.__c.preFetch
|
||||
: false;
|
||||
: false
|
||||
)
|
||||
|
||||
function getMatchedComponents(to, router) {
|
||||
const route = to ? (to.matched ? to : router.resolve(to).route) : router.currentRoute;
|
||||
|
||||
if (!route) {
|
||||
return [];
|
||||
}
|
||||
function getMatchedComponents (to, router) {
|
||||
const route = to
|
||||
? (to.matched ? to : router.resolve(to).route)
|
||||
: router.currentRoute
|
||||
|
||||
return Array.prototype.concat.apply(
|
||||
[],
|
||||
route.matched.map((m) => {
|
||||
return Object.keys(m.components).map((key) => {
|
||||
const comp = m.components[key];
|
||||
if (!route) { return [] }
|
||||
|
||||
return Array.prototype.concat.apply([], route.matched.map(m => {
|
||||
return Object.keys(m.components).map(key => {
|
||||
const comp = m.components[key]
|
||||
return {
|
||||
path: m.path,
|
||||
c: comp,
|
||||
};
|
||||
});
|
||||
c: comp
|
||||
}
|
||||
})
|
||||
);
|
||||
}))
|
||||
}
|
||||
|
||||
export function addPreFetchHooks(router, publicPath) {
|
||||
export function addPreFetchHooks (router, publicPath) {
|
||||
// Add router hook for handling preFetch.
|
||||
// Doing it after initial route is resolved so that we don't double-fetch
|
||||
// the data that we already have. Using router.beforeResolve() so that all
|
||||
// async components are resolved.
|
||||
router.beforeResolve((to, from, next) => {
|
||||
const urlPath = window.location.href.replace(window.location.origin, ''),
|
||||
const
|
||||
urlPath = window.location.href.replace(window.location.origin, ''),
|
||||
matched = getMatchedComponents(to, router),
|
||||
prevMatched = getMatchedComponents(from, router);
|
||||
prevMatched = getMatchedComponents(from, router)
|
||||
|
||||
let diffed = false;
|
||||
let diffed = false
|
||||
const preFetchList = matched
|
||||
.filter((m, i) => {
|
||||
return (
|
||||
diffed ||
|
||||
(diffed =
|
||||
!prevMatched[i] || prevMatched[i].c !== m.c || m.path.indexOf('/:') > -1) // does it has params?
|
||||
);
|
||||
return diffed || (diffed = (
|
||||
!prevMatched[i] ||
|
||||
prevMatched[i].c !== m.c ||
|
||||
m.path.indexOf('/:') > -1 // does it has params?
|
||||
))
|
||||
})
|
||||
.filter(
|
||||
(m) =>
|
||||
m.c !== void 0 &&
|
||||
(typeof m.c.preFetch === 'function' ||
|
||||
.filter(m => m.c !== void 0 && (
|
||||
typeof m.c.preFetch === 'function'
|
||||
// Class components return the component options (and the preFetch hook) inside __c property
|
||||
(m.c.__c !== void 0 && typeof m.c.__c.preFetch === 'function'))
|
||||
)
|
||||
.map((m) => (m.c.__c !== void 0 ? m.c.__c.preFetch : m.c.preFetch));
|
||||
|| (m.c.__c !== void 0 && typeof m.c.__c.preFetch === 'function')
|
||||
))
|
||||
.map(m => m.c.__c !== void 0 ? m.c.__c.preFetch : m.c.preFetch)
|
||||
|
||||
|
||||
if (appPrefetch !== false) {
|
||||
preFetchList.unshift(appPrefetch);
|
||||
appPrefetch = false;
|
||||
preFetchList.unshift(appPrefetch)
|
||||
appPrefetch = false
|
||||
}
|
||||
|
||||
|
||||
if (preFetchList.length === 0) {
|
||||
return next();
|
||||
return next()
|
||||
}
|
||||
|
||||
let hasRedirected = false;
|
||||
const redirect = (url) => {
|
||||
hasRedirected = true;
|
||||
next(url);
|
||||
};
|
||||
let hasRedirected = false
|
||||
const redirect = url => {
|
||||
hasRedirected = true
|
||||
next(url)
|
||||
}
|
||||
const proceed = () => {
|
||||
if (hasRedirected === false) {
|
||||
next();
|
||||
}
|
||||
};
|
||||
|
||||
preFetchList
|
||||
.reduce(
|
||||
(promise, preFetch) =>
|
||||
promise.then(
|
||||
() =>
|
||||
hasRedirected === false &&
|
||||
preFetch({
|
||||
if (hasRedirected === false) { next() }
|
||||
}
|
||||
|
||||
|
||||
|
||||
preFetchList.reduce(
|
||||
(promise, preFetch) => promise.then(() => hasRedirected === false && preFetch({
|
||||
|
||||
currentRoute: to,
|
||||
previousRoute: from,
|
||||
redirect,
|
||||
urlPath,
|
||||
publicPath,
|
||||
})
|
||||
),
|
||||
publicPath
|
||||
})),
|
||||
Promise.resolve()
|
||||
)
|
||||
.then(proceed)
|
||||
.catch((e) => {
|
||||
console.error(e);
|
||||
proceed();
|
||||
});
|
||||
});
|
||||
.catch(e => {
|
||||
console.error(e)
|
||||
proceed()
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,11 @@
|
|||
* Boot files are your "main.js"
|
||||
**/
|
||||
|
||||
import { Notify } from 'quasar';
|
||||
|
||||
export default { config: {}, plugins: { Notify } };
|
||||
|
||||
import {Notify} from 'quasar'
|
||||
|
||||
|
||||
|
||||
export default { config: {},plugins: {Notify} }
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue