Merge branch 'develop' into cg/catch-instrumentation

Author: chargome

.github/workflows/build.yml

@@ -914,6 +914,7 @@ jobs:
             'react-router-6',
             'solid',
             'solidstart',
+            'solidstart-spa',
             'svelte-5',
             'sveltekit',
             'sveltekit-2',

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json

@@ -45,7 +45,7 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "typescript": "^5.1.6",
-    "vite": "^5.1.0",
+    "vite": "^5.4.10",
     "vite-tsconfig-paths": "^4.2.1"
   },
   "volta": {

dev-packages/e2e-tests/test-applications/solid-solidrouter/package.json

@@ -22,7 +22,7 @@
     "postcss": "^8.4.33",
     "solid-devtools": "^0.29.2",
     "tailwindcss": "^3.4.1",
-    "vite": "^5.0.11",
+    "vite": "^5.4.10",
     "vite-plugin-solid": "^2.8.2"
   },
   "dependencies": {

dev-packages/e2e-tests/test-applications/solid/package.json

@@ -22,7 +22,7 @@
     "postcss": "^8.4.33",
     "solid-devtools": "^0.29.2",
     "tailwindcss": "^3.4.1",
-    "vite": "^5.0.11",
+    "vite": "^5.4.10",
     "vite-plugin-solid": "^2.8.2"
   },
   "dependencies": {

dev-packages/e2e-tests/test-applications/solidstart-spa/.gitignore

@@ -0,0 +1,46 @@
+
+dist
+.solid
+.output
+.vercel
+.netlify
+.vinxi
+
+# Environment
+.env
+.env*.local
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+*.launch
+.settings/
+
+# Temp
+gitignore
+
+# testing
+/coverage
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+/test-results/
+/playwright-report/
+/playwright/.cache/
+
+!*.d.ts

dev-packages/e2e-tests/test-applications/solidstart-spa/.npmrc

@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873

dev-packages/e2e-tests/test-applications/solidstart-spa/README.md

@@ -0,0 +1,45 @@
+# SolidStart
+
+Everything you need to build a Solid project, powered by [`solid-start`](https://start.solidjs.com);
+
+## Creating a project
+
+```bash
+# create a new project in the current directory
+npm init solid@latest
+
+# create a new project in my-app
+npm init solid@latest my-app
+```
+
+## Developing
+
+Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a
+development server:
+
+```bash
+npm run dev
+
+# or start the server and open the app in a new browser tab
+npm run dev -- --open
+```
+
+## Building
+
+Solid apps are built with _presets_, which optimise your project for deployment to different environments.
+
+By default, `npm run build` will generate a Node app that you can run with `npm start`. To use a different preset, add
+it to the `devDependencies` in `package.json` and specify in your `app.config.js`.
+
+## Testing
+
+Tests are written with `vitest`, `@solidjs/testing-library` and `@testing-library/jest-dom` to extend expect with some
+helpful custom matchers.
+
+To run them, simply start:
+
+```sh
+npm test
+```
+
+## This project was created with the [Solid CLI](https://solid-cli.netlify.app)

dev-packages/e2e-tests/test-applications/solidstart-spa/app.config.ts

@@ -0,0 +1,9 @@
+import { sentrySolidStartVite } from '@sentry/solidstart';
+import { defineConfig } from '@solidjs/start/config';
+
+export default defineConfig({
+  ssr: false,
+  vite: {
+    plugins: [sentrySolidStartVite()],
+  },
+});

dev-packages/e2e-tests/test-applications/solidstart-spa/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "solidstart-spa-e2e-testapp",
+  "version": "0.0.0",
+  "scripts": {
+    "clean": "pnpx rimraf node_modules pnpm-lock.yaml .vinxi .output",
+    "dev": "NODE_OPTIONS='--import ./src/instrument.server.mjs' vinxi dev",
+    "build": "vinxi build && sh ./post_build.sh",
+    "preview": "HOST=localhost PORT=3030 NODE_OPTIONS='--import ./src/instrument.server.mjs' vinxi start",
+    "test:prod": "TEST_ENV=production playwright test",
+    "test:build": "pnpm install && npx playwright install && pnpm build",
+    "test:assert": "pnpm test:prod"
+  },
+  "type": "module",
+  "dependencies": {
+    "@sentry/solidstart": "latest || *"
+  },
+  "devDependencies": {
+    "@playwright/test": "^1.44.1",
+    "@solidjs/meta": "^0.29.4",
+    "@solidjs/router": "^0.13.4",
+    "@solidjs/start": "^1.0.2",
+    "@solidjs/testing-library": "^0.8.7",
+    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/user-event": "^14.5.2",
+    "@vitest/ui": "^1.5.0",
+    "jsdom": "^24.0.0",
+    "solid-js": "1.8.17",
+    "typescript": "^5.4.5",
+    "vinxi": "^0.4.0",
+    "vite": "^5.2.8",
+    "vite-plugin-solid": "^2.10.2",
+    "vitest": "^1.5.0"
+  },
+  "overrides": {
+    "@vercel/nft": "0.27.4"
+  }
+}

dev-packages/e2e-tests/test-applications/solidstart-spa/playwright.config.mjs

@@ -0,0 +1,8 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: 'pnpm preview',
+  port: 3030,
+});
+
+export default config;