WIP

Author: onurtemizkan

dev-packages/e2e-tests/test-applications/remix-hydrogen/.eslintrc.cjs

@@ -0,0 +1,79 @@
+/**
+ * This is intended to be a basic starting point for linting in your app.
+ * It relies on recommended configs out of the box for simplicity, but you can
+ * and should modify this configuration to best suit your team's needs.
+ */
+
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+  },
+
+  // Base config
+  extends: ['eslint:recommended'],
+
+  overrides: [
+    // React
+    {
+      files: ['**/*.{js,jsx,ts,tsx}'],
+      plugins: ['react', 'jsx-a11y'],
+      extends: [
+        'plugin:react/recommended',
+        'plugin:react/jsx-runtime',
+        'plugin:react-hooks/recommended',
+        'plugin:jsx-a11y/recommended',
+      ],
+      settings: {
+        react: {
+          version: 'detect',
+        },
+        formComponents: ['Form'],
+        linkComponents: [
+          { name: 'Link', linkAttribute: 'to' },
+          { name: 'NavLink', linkAttribute: 'to' },
+        ],
+        'import/resolver': {
+          typescript: {},
+        },
+      },
+    },
+
+    // Typescript
+    {
+      files: ['**/*.{ts,tsx}'],
+      plugins: ['@typescript-eslint', 'import'],
+      parser: '@typescript-eslint/parser',
+      settings: {
+        'import/internal-regex': '^~/',
+        'import/resolver': {
+          node: {
+            extensions: ['.ts', '.tsx'],
+          },
+          typescript: {
+            alwaysTryTypes: true,
+          },
+        },
+      },
+      extends: ['plugin:@typescript-eslint/recommended', 'plugin:import/recommended', 'plugin:import/typescript'],
+    },
+
+    // Node
+    {
+      files: ['.eslintrc.cjs', 'server.js'],
+      env: {
+        node: true,
+      },
+    },
+  ],
+};

dev-packages/e2e-tests/test-applications/remix-hydrogen/app/entry.client.tsx

@@ -7,12 +7,12 @@ import { hydrateRoot } from 'react-dom/client';
 Sentry.init({
   dsn: window.ENV.SENTRY_DSN,
   integrations: [
-    new Sentry.BrowserTracing({
-      routingInstrumentation: Sentry.remixRouterInstrumentation(useEffect, useLocation, useMatches),
+    Sentry.browserTracingIntegration({
+      useEffect,
+      useLocation,
+      useMatches,
     }),
-    // Replay is only available in the client
-    new Sentry.Replay(),
-    new Sentry.BrowserProfilingIntegration(),
+    Sentry.replayIntegration(),
   ],
 
   // Set tracesSampleRate to 1.0 to capture 100%

dev-packages/e2e-tests/test-applications/remix-hydrogen/app/root.tsx

@@ -12,17 +12,21 @@ import {
   useMatches,
   useRouteError,
 } from '@remix-run/react';
-import type { SentryMetaArgs } from '@sentry/remix';
-import { useNonce } from '@shopify/hydrogen';
-import type { CustomerAccessToken } from '@shopify/hydrogen/storefront-api-types';
-import { type LoaderArgs, defer } from '@shopify/remix-oxygen';
+import type {SentryMetaArgs} from '@sentry/remix';
+import {useNonce} from '@shopify/hydrogen';
+import type {CustomerAccessToken} from '@shopify/hydrogen/storefront-api-types';
+import {type LoaderArgs, defer} from '@shopify/remix-oxygen';
 import favicon from '../public/favicon.svg';
-import type { HydrogenSession } from '../server';
+import type {HydrogenSession} from '../server';
 
 import * as Sentry from '@sentry/remix';
 
 // This is important to avoid re-fetching root queries on sub-navigations
-export const shouldRevalidate: ShouldRevalidateFunction = ({ formMethod, currentUrl, nextUrl }) => {
+export const shouldRevalidate: ShouldRevalidateFunction = ({
+  formMethod,
+  currentUrl,
+  nextUrl,
+}) => {
   // revalidate when a mutation is performed e.g add to cart, login...
   if (formMethod && formMethod !== 'GET') {
     return true;
@@ -46,17 +50,20 @@ export function links() {
       rel: 'preconnect',
       href: 'https://shop.app',
     },
-    { rel: 'icon', type: 'image/svg+xml', href: favicon },
+    {rel: 'icon', type: 'image/svg+xml', href: favicon},
   ];
 }
 
-export async function loader({ context }: LoaderArgs) {
-  const { storefront, session, cart } = context;
+export async function loader({context}: LoaderArgs) {
+  const {storefront, session, cart} = context;
   const customerAccessToken = await session.get('customerAccessToken');
   const publicStoreDomain = context.env.PUBLIC_STORE_DOMAIN;
 
   // validate the customer access token is valid
-  const { isLoggedIn, headers } = await validateCustomerAccessToken(session, customerAccessToken);
+  const {isLoggedIn, headers} = await validateCustomerAccessToken(
+    session,
+    customerAccessToken,
+  );
 
   // defer the cart query by not awaiting it
   const cartPromise = cart.get();
@@ -88,11 +95,11 @@ export async function loader({ context }: LoaderArgs) {
         SENTRY_DSN: process.env.E2E_TEST_DSN,
       },
     },
-    { headers },
+    {headers},
   );
 }
 
-export const meta = ({ data }: SentryMetaArgs<MetaFunction<typeof loader>>) => {
+export const meta = ({data}: SentryMetaArgs<MetaFunction<typeof loader>>) => {
   return [
     {
       env: data.ENV,
@@ -110,7 +117,7 @@ export const meta = ({ data }: SentryMetaArgs<MetaFunction<typeof loader>>) => {
 
 function App() {
   const nonce = useNonce();
-  const { ENV } = useLoaderData();
+  const {ENV} = useLoaderData();
 
   return (
     <html lang="en">
@@ -135,7 +142,8 @@ function App() {
   );
 }
 
-export default Sentry.withSentry(App);
+// export default Sentry.withSentry(App);
+export default App;
 
 export function ErrorBoundary() {
   const error = useRouteError();
@@ -144,8 +152,8 @@ export function ErrorBoundary() {
   let errorMessage = 'Unknown error';
   let errorStatus = 500;
 
-  // Send the error to Sentry
-  const eventId = Sentry.captureRemixErrorBoundaryError(error);
+  // // Send the error to Sentry
+  // const eventId = Sentry.captureRemixErrorBoundaryError(error);
 
   if (isRouteErrorResponse(error)) {
     errorMessage = error?.data?.message ?? error.data;
@@ -198,11 +206,14 @@ export function ErrorBoundary() {
  *  );
  *  ```
  *  */
-async function validateCustomerAccessToken(session: HydrogenSession, customerAccessToken?: CustomerAccessToken) {
+async function validateCustomerAccessToken(
+  session: HydrogenSession,
+  customerAccessToken?: CustomerAccessToken,
+) {
   let isLoggedIn = false;
   const headers = new Headers();
   if (!customerAccessToken?.accessToken || !customerAccessToken?.expiresAt) {
-    return { isLoggedIn, headers };
+    return {isLoggedIn, headers};
   }
 
   const expiresAt = new Date(customerAccessToken.expiresAt).getTime();
@@ -216,7 +227,7 @@ async function validateCustomerAccessToken(session: HydrogenSession, customerAcc
     isLoggedIn = true;
   }
 
-  return { isLoggedIn, headers };
+  return {isLoggedIn, headers};
 }
 
 const MENU_FRAGMENT = `#graphql

dev-packages/e2e-tests/test-applications/remix-hydrogen/package.json

@@ -20,7 +20,7 @@
     "@sentry/remix": "latest || *",
     "@shopify/cli": "3.60.0",
     "@shopify/cli-hydrogen": "^8.1.1",
-    "@shopify/hydrogen": "2024.4.5",
+    "@shopify/hydrogen": "2024.4.7",
     "@shopify/remix-oxygen": "^2.0.4",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
@@ -53,6 +53,6 @@
     "vite-tsconfig-paths": "^4.3.1"
   },
   "volta": {
-    "node": "20.15.0"
+    "extends": "../../package.json"
   }
 }

dev-packages/e2e-tests/test-applications/remix-hydrogen/vite.config.ts

@@ -24,7 +24,7 @@ export default defineConfig({
   ],
   build: {
     // Allow a strict Content-Security-Policy
-    // withtout inlining assets as base64:
+    // without inlining assets as base64:
     assetsInlineLimit: 0,
     minify: false,
   },
@@ -40,7 +40,7 @@ export default defineConfig({
        * Include 'example-dep' in the array below.
        * @see https://vitejs.dev/config/dep-optimization-options
        */
-      include: ['hoist-non-react-statics'],
+      include: ['hoist-non-react-statics', '@sentry/remix'],
     },
   },
 });

packages/remix/src/index.client.tsx

@@ -27,6 +27,7 @@ export async function captureRemixServerException(
 }
 /* eslint-enable @typescript-eslint/no-unused-vars */
 
+export { setTags, captureException } from '@sentry/react';
 export * from '@sentry/react';
 
 export function init(options: RemixOptions): Client | undefined {