@nitra/vite-boot 1.0.13 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitra/vite-boot",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "Vite boot",
   "type": "module",
   "exports": {
@@ -29,6 +29,7 @@
     "globals": {
       "__HASURA_ROLE__": "readonly",
       "__SENTRY_DSN__": "readonly",
+      "__BRANCH__": "readonly",
       "__GITHUB_SHA__": "readonly"
     }
   },
@@ -40,11 +41,10 @@
     "src"
   ],
   "dependencies": {
-    "@apollo/client": "^3.5.6",
+    "@apollo/client": "^3.5.10",
     "@nitra/consola": "^1.7.0",
     "@sentry/tracing": "^6.16.1",
     "@sentry/vue": "^6.16.1",
-    "graphql": "^16.2.0",
     "graphql-ws": "^5.5.5",
     "petite-vue-i18n": "^9.2.0-beta.26",
     "pinia": "^2.0.9",

package/src/apollo.js

@@ -1,48 +1,13 @@
-/* global CloseEvent */
-
-import { ApolloLink, ApolloClient, Observable, InMemoryCache, from } from '@apollo/client/core'
+import { ApolloClient, InMemoryCache, from } from '@apollo/client/core'
 import { onError } from '@apollo/client/link/error'
-import { print } from 'graphql'
 import { createClient } from 'graphql-ws'
 import { createLogger } from '@nitra/consola'
 import { refreshToken } from './token.js'
+import { GraphQLWsLink } from '@apollo/client/link/subscriptions'
 
 const consola = createLogger(import.meta.url)
 
-class WebSocketLink extends ApolloLink {
-  constructor(options) {
-    super()
-    this.client = createClient(options)
-  }
-
-  request(operation) {
-    return new Observable(sink => {
-      return this.client.subscribe(
-        { ...operation, query: print(operation.query) },
-        {
-          next: sink.next.bind(sink),
-          complete: sink.complete.bind(sink),
-          error: err => {
-            if (Array.isArray(err)) {
-              // GraphQLError[]
-              return sink.error(new Error(err.map(({ message }) => message).join(', ')))
-            }
-            if (err instanceof CloseEvent) {
-              return sink.error(
-                new Error(
-                  `Socket closed with event ${err.code} ${err.reason || ''}` // reason will be available on clean closes only
-                )
-              )
-            }
-            return sink.error(err)
-          }
-        }
-      )
-    })
-  }
-}
-
-const wsLink = new WebSocketLink({
+const wsClient = createClient({
   url: `${import.meta.env.VITE_HASURA_PROTOCOL}://${import.meta.env.VITE_HASURA_HOST}/v1/graphql`,
   disablePong: true,
   connectionParams: () => {
@@ -61,6 +26,8 @@ const wsLink = new WebSocketLink({
   }
 })
 
+const wsLink = new GraphQLWsLink(wsClient)
+
 const errorLink = onError(({ graphQLErrors, networkError, _operation, _forward }) => {
   if (graphQLErrors) {
     for (const err of graphQLErrors) {
@@ -87,7 +54,7 @@ const errorLink = onError(({ graphQLErrors, networkError, _operation, _forward }
   // To retry on network errors, we recommend the RetryLink
   // instead of the onError link. This just logs the error.
   if (networkError) {
-    if (networkError?.message.match('JWTExpired')) {
+    if (networkError?.message?.match('JWTExpired')) {
       //  ретрай токен
       // и якщо цей користувач ще валідний в БД
       // то видавати йому новий токен

package/src/sentry.js

@@ -5,10 +5,11 @@ import { Integrations } from '@sentry/tracing'
  * Ініціалізація Sentry
  */
 export const bootSentry = (app, router) => {
-  Sentry.init({
+  const options = {
     app,
     dsn: __SENTRY_DSN__,
     release: __GITHUB_SHA__,
+    ignoreErrors: ['ResizeObserver loop limit exceeded'],
     integrations: [
       new Integrations.BrowserTracing({
         routingInstrumentation: Sentry.vueRouterInstrumentation(router)
@@ -18,5 +19,13 @@ export const bootSentry = (app, router) => {
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production
     tracesSampleRate: 0.1
-  })
+  }
+
+  // Якщо публікація з різних гілок
+  // записуємо в різні енв для фільтрації в сентрі
+  if (typeof __BRANCH__ !== 'undefined') {
+    options.environment = __BRANCH__
+  }
+
+  Sentry.init(options)
 }