@appnave/quasar-app-extension-asteroid 3.20.0-beta.32 → 3.20.0-beta.34-alpha.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@appnave/quasar-app-extension-asteroid",
   "description": "Asteroid",
-  "version": "3.20.0-beta.32",
+  "version": "3.20.0-beta.34-alpha.0",
   "author": "Bild & Vitta <systemteam@bild.com.br>",
   "license": "MIT",
   "main": "src/index.js",
@@ -31,18 +31,17 @@
   },
   "peerDependencies": {
     "@fawmi/vue-google-maps": "0.9.79",
-    "quasar": "^2.18.0"
+    "quasar": "2.22.0"
   },
   "dependencies": {
-    "@appnave/quasar-app-extension-asteroid": "file:",
-    "@appnave/quasar-ui-asteroid": "3.20.0-beta.32",
+    "@appnave/quasar-ui-asteroid": "3.20.0-beta.34-alpha.0",
     "@bildvitta/store-adapter": "^1.0.0",
-    "execa": "^7.1.1",
+    "execa": "^10.0.0",
     "fontfaceobserver": "^2.3.0",
     "humps": "^2.0.1",
     "laravel-echo": "^1.15.3",
     "ora": "^8.2.0",
-    "pusher-js": "^8.4.0-rc2",
+    "pusher-js": "8.6.0",
     "unplugin-vue-components": "28.5.0"
   }
 }

package/src/boot/api.js

@@ -1,4 +1,5 @@
 import { camelizeKeys, decamelizeKeys } from 'humps'
+import { handleProcess } from 'asteroid'
 
 import asteroidConfig from 'asteroid-config'
 
@@ -17,12 +18,12 @@ function getBaseURL (isProduction) {
   }
 
   // Caso não haja uma URL de preview válida, utiliza a URL base definida nas variáveis de ambiente ou locahost.
-  return process.env.SERVER_BASE_URL || '/'
+  return handleProcess(() => import.meta.env.SERVER_BASE_URL, '/')
 }
 
 export default async ({ app, router }) => {
   const api = app.config.globalProperties.$axios
-  const isProduction = process.env.ENVIRONMENT === 'production'
+  const isProduction = handleProcess(() => import.meta.env.ENVIRONMENT === 'production', false)
 
   // Defaults
   api.defaults.baseURL = getBaseURL(isProduction)
@@ -32,7 +33,7 @@ export default async ({ app, router }) => {
      * Permite que parâmetros de query string iniciados com $ sejam propagados para todas as rotas,
      * útil para ambiente de preview.
      */
-    router.beforeEach((to, from, next) => {
+    router.beforeEach((to, from) => {
       // Extrai os parâmetros de query string iniciados com $ da rota de origem (from).
       const dollarParams = Object.fromEntries(Object.entries(from.query).filter(([key]) => key.startsWith('$')))
 
@@ -43,9 +44,7 @@ export default async ({ app, router }) => {
       const hasMissingDollarParams = Object.keys(dollarParams).some(key => !(key in to.query))
 
       if (hasMissingDollarParams) {
-        next({ ...to, query: { ...dollarParams, ...to.query } })
-      } else {
-        next()
+        return { ...to, query: { ...dollarParams, ...to.query } }
       }
     })
 

package/src/boot/before-each.js

@@ -1,11 +1,13 @@
 import { useHistory, setDefaultFiltersBeforeEach } from 'asteroid'
 
 export default ({ router }) => {
-  router.beforeEach((to, from, next) => {
+  router.beforeEach((to, from) => {
     const { addRoute } = useHistory()
 
     addRoute(to)
 
-    setDefaultFiltersBeforeEach(to, from, next)
+    return new Promise(resolve => {
+      setDefaultFiltersBeforeEach(to, from, result => resolve(result))
+    })
   })
 }

package/src/boot/debug.js

@@ -3,8 +3,8 @@ import { handleProcess } from 'asteroid'
 import debug from 'debug'
 
 export default async () => {
-  const debuggingEnv = handleProcess(() => process.env.DEBUGGING, false)
-  const debugEnv = handleProcess(() => process.env.DEBUG, '')
+  const debuggingEnv = handleProcess(() => import.meta.env.DEBUGGING, false)
+  const debugEnv = handleProcess(() => import.meta.env.DEBUG, '')
 
   debug.enable(debuggingEnv && !debugEnv ? 'asteroid-*:*' : debugEnv)
 }

package/src/boot/error-pages.js

@@ -1,3 +1,5 @@
+import { handleProcess } from 'asteroid'
+
 export default function ({ router }) {
   const routes = [
     {
@@ -12,7 +14,7 @@ export default function ({ router }) {
     }
   ]
 
-  if (process.env.MODE !== 'ssr') {
+  if (handleProcess(() => import.meta.env.MODE, '') !== 'ssr') {
     routes.push({
       name: 'NotFound',
       path: '/:catchAll(.*)*',

package/src/boot/font-face.js

@@ -1,6 +1,8 @@
-import FontFaceObserver from 'fontfaceobserver'
+import * as FontFaceObserverModule from 'fontfaceobserver'
 import asteroidConfig from 'asteroid-config'
 
+const FontFaceObserver = FontFaceObserverModule.default || FontFaceObserverModule.FontFaceObserver || FontFaceObserverModule
+
 export default async () => {
   function setFontFaceObserver () {
     const font = new FontFaceObserver('Material Symbols Rounded')

package/src/boot/overlay-navigation.js

@@ -4,19 +4,18 @@ import { useOverlayNavigation } from 'asteroid'
  * @param {import('vue-router').Router} router
  */
 export default async function ({ router }) {
-  router.beforeEach((to, from, next) => onBeforeEach(to, from, next, router))
+  router.beforeEach((to, from) => onBeforeEach(to, from, router))
 }
 
 /**
  * @param {import('vue-router').RouteLocationNormalized} to
  * @param {import('vue-router').RouteLocationNormalized} from
- * @param {Function} next
  * @param {import('vue-router').Router} router
  */
-async function onBeforeEach (to, from, next, router) {
+async function onBeforeEach (to, from, router) {
   const useOverlay = to.matched.some(item => item.meta.useOverlay)
 
-  if (!useOverlay) return next()
+  if (!useOverlay) return
 
   const { addRouteToHistory } = useOverlayNavigation()
 
@@ -83,8 +82,6 @@ async function onBeforeEach (to, from, next, router) {
     }
   }
 
-  next()
-
   // functions
 
   /**

package/src/boot/query-cache.js

@@ -63,11 +63,11 @@ function setRouteCache (route) {
 }
 
 export default ({ router }) => {
-  router.beforeEach((to, from, next) => {
+  router.beforeEach((to, from) => {
     if (!useHistory().hasPreviousRoute.value) {
       clearAll(to.name)
 
-      return next()
+      return
     }
 
     setRouteCache(from)
@@ -83,11 +83,9 @@ export default ({ router }) => {
 
       isReplacingQuery = true
 
-      next({ ...to, query: cachedQuery })
-    } else {
-      isReplacingQuery = false
-
-      next()
+      return { ...to, query: cachedQuery }
     }
+
+    isReplacingQuery = false
   })
 }

package/src/helpers/laravel-echo.js

@@ -1,10 +1,12 @@
 import { isLocalDevelopment, handleProcess } from 'asteroid'
 
 import Echo from 'laravel-echo'
-import Pusher from 'pusher-js'
+import * as PusherModule from 'pusher-js'
 
 import { camelizeKeys } from 'humps'
 
+const Pusher = PusherModule.default || PusherModule.Pusher || PusherModule
+
 /**
  * Função para setar configuração do Laravel Echo.
  *
@@ -14,16 +16,21 @@ export function setLaravelEcho (accessToken) {
   window.Pusher = Pusher
 
   const isLocal = isLocalDevelopment()
+  const serverBaseURL = handleProcess(() => import.meta.env.SERVER_BASE_URL, '/')
+  const normalizedServerBaseURL = serverBaseURL === '/'
+    ? ''
+    : serverBaseURL.replace(/\/$/, '')
 
   window.Echo = new Echo({
     broadcaster: 'pusher',
-    key: isLocal ? 'app-key' : handleProcess(() => process.env.ABLY_KEY, ''),
+    key: isLocal ? 'app-key' : handleProcess(() => import.meta.env.ABLY_KEY, ''),
     wsHost: isLocal ? 'localhost' : 'realtime-pusher.ably.io',
     wsPort: isLocal ? 6001 : 443,
     disableStats: true,
     encrypted: true,
     cluster: isLocal ? 'mt1' : 'eu',
-    authEndpoint: `${process.env.SERVER_BASE_URL}/broadcasting/auth`,
+    authEndpoint: `${normalizedServerBaseURL}/broadcasting/auth`,
+    enabledTransports: ['ws', 'wss'],
     auth: {
       headers: {
         Authorization: accessToken

package/src/index.js

@@ -1,7 +1,6 @@
 import asteroidConfigHandler from './helpers/asteroid-config-handler.js'
 
 import ComponentsVite from 'unplugin-vue-components/vite'
-import ComponentsWebpack from 'unplugin-vue-components/webpack'
 import { pathToFileURL } from 'url'
 
 const sourcePath = '~@appnave/quasar-app-extension-asteroid/src/'
@@ -28,19 +27,6 @@ function extendQuasar (quasar, api, asteroidConfigFile) {
     quasar.boot.push(...resolve('boot/notifications'))
   }
 
-  // Transpilação de arquivos!
-  if (api.hasWebpack) {
-    const transpileTarget = (
-      quasar.build.webpackTranspileDependencies || // q/app-webpack >= v4
-      quasar.build.transpileDependencies // q/app-webpack v3
-    )
-
-    transpileTarget.push(
-      /quasar-app-extension-asteroid[\\/]src/,
-      /@bildvitta[\\/]quasar-ui-asteroid[\\/]src/
-    )
-  }
-
   // Adiciona todas classes do asteroid
   quasar.css.push(...resolve('index.scss'))
 
@@ -74,7 +60,7 @@ function extendQuasar (quasar, api, asteroidConfigFile) {
 
 export default async function (api) {
   api.compatibleWith('quasar', '^2.0.0')
-  api.compatibleWith('date-fns', '^2.3.0')
+  api.compatibleWith('date-fns', '^4.1.0')
 
   const asteroid = 'node_modules/@appnave/quasar-ui-asteroid/src/asteroid.js'
   const asteroidComponents = 'node_modules/@appnave/quasar-ui-asteroid/src/components'
@@ -91,10 +77,11 @@ export default async function (api) {
   const { default: asteroidConfigFile } = await import(pathToFileURL(asteroidConfigPath).href)
 
   const unpluginVueComponentsConfig = {
-    dirs: [api.resolve.app(asteroidComponents)], // ajusta o path para a lib
+    dirs: [api.resolve.app(asteroidComponents)],
     extensions: ['vue'],
     deep: true,
-    dts: false // desativa geração de types
+    dts: false,
+    include: [/\.vue$/, /\.vue\?vue/]
   }
 
   const alias = {
@@ -108,45 +95,31 @@ export default async function (api) {
     'images/marker-icon.png': api.resolve.app('node_modules/leaflet/dist/images/marker-icon.png')
   }
 
-  if (api.hasVite) {
-    api.compatibleWith('@quasar/app-vite', '^2.0.0')
-
-    api.extendViteConf(viteConf => {
-      Object.assign(viteConf.resolve.alias, alias)
-
-      // optimizeDeps (necessário para funcionamento do QasMap)
-      viteConf.optimizeDeps = viteConf.optimizeDeps || {}
-      viteConf.optimizeDeps.include = viteConf.optimizeDeps.include || []
-      viteConf.optimizeDeps.include.push(...[
-        '@fawmi/vue-google-maps',
-        'fast-deep-equal',
-        'humps',
-        'debug',
-        'pica',
-        'hammerjs',
-        'lodash-es',
-        'date-fns',
-        'date-fns/locale',
-        'leaflet'
-      ])
-
-      viteConf.plugins = viteConf.plugins || []
-      viteConf.plugins.push(ComponentsVite(unpluginVueComponentsConfig))
-    })
-
-    api.extendQuasarConf(quasar => extendQuasar(quasar, api, asteroidConfigFile))
-
-    return
-  }
-
-  api.compatibleWith('@quasar/app', '^3.10.0 || ^4.0.0')
-
-  api.extendWebpack(webpack => {
-    Object.assign(webpack.resolve.alias, alias)
-
-    // Adiciona o plugin de componentes
-    webpack.plugins = webpack.plugins || []
-    webpack.plugins.push(ComponentsWebpack(unpluginVueComponentsConfig))
+  api.compatibleWith('@quasar/app-vite', '^3.2.0')
+
+  api.extendViteConf(viteConf => {
+    Object.assign(viteConf.resolve.alias, alias)
+
+    // optimizeDeps (necessário para funcionamento do QasMap)
+    viteConf.optimizeDeps = viteConf.optimizeDeps || {}
+    viteConf.optimizeDeps.include = viteConf.optimizeDeps.include || []
+    viteConf.optimizeDeps.include.push(...[
+      '@fawmi/vue-google-maps',
+      'fast-deep-equal',
+      'humps',
+      'debug',
+      'pica',
+      'hammerjs',
+      'lodash-es',
+      'date-fns',
+      'date-fns/locale',
+      'leaflet',
+      'fontfaceobserver',
+      'autonumeric'
+    ])
+
+    viteConf.plugins = viteConf.plugins || []
+    viteConf.plugins.push(ComponentsVite(unpluginVueComponentsConfig))
   })
 
   api.extendQuasarConf(quasar => extendQuasar(quasar, api, asteroidConfigFile))