-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
test(e2e): Add SolidStart spa mode test app #14127
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
dev-packages/e2e-tests/test-applications/solidstart-spa/.gitignore
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 2 additions & 0 deletions
2
dev-packages/e2e-tests/test-applications/solidstart-spa/.npmrc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
@sentry:registry=http://127.0.0.1:4873 | ||
@sentry-internal:registry=http://127.0.0.1:4873 |
45 changes: 45 additions & 0 deletions
45
dev-packages/e2e-tests/test-applications/solidstart-spa/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
9 changes: 9 additions & 0 deletions
9
dev-packages/e2e-tests/test-applications/solidstart-spa/app.config.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import { sentrySolidStartVite } from '@sentry/solidstart'; | ||
import { defineConfig } from '@solidjs/start/config'; | ||
|
||
export default defineConfig({ | ||
ssr: false, | ||
vite: { | ||
plugins: [sentrySolidStartVite()], | ||
}, | ||
}); |
37 changes: 37 additions & 0 deletions
37
dev-packages/e2e-tests/test-applications/solidstart-spa/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
dev-packages/e2e-tests/test-applications/solidstart-spa/playwright.config.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import { getPlaywrightConfig } from '@sentry-internal/test-utils'; | ||
|
||
const config = getPlaywrightConfig({ | ||
startCommand: 'pnpm preview', | ||
port: 3030, | ||
}); | ||
|
||
export default config; |
8 changes: 8 additions & 0 deletions
8
dev-packages/e2e-tests/test-applications/solidstart-spa/post_build.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
# TODO: Investigate the need for this script periodically and remove once these modules are correctly resolved. | ||
|
||
# This script copies `import-in-the-middle` and `@sentry/solidstart` from the E2E test project root `node_modules` | ||
# to the nitro server build output `node_modules` as these are not properly resolved in our yarn workspace/pnpm | ||
# e2e structure. Some files like `hook.mjs` and `@sentry/solidstart/solidrouter.server.js` are missing. This is | ||
# not reproducible in an external project (when pinning `@vercel/nft` to `v0.27.0` and higher). | ||
cp -r node_modules/.pnpm/import-in-the-middle@1.*/node_modules/import-in-the-middle .output/server/node_modules | ||
cp -rL node_modules/@sentry/solidstart .output/server/node_modules/@sentry |
Binary file added
BIN
+664 Bytes
dev-packages/e2e-tests/test-applications/solidstart-spa/public/favicon.ico
Binary file not shown.
22 changes: 22 additions & 0 deletions
22
dev-packages/e2e-tests/test-applications/solidstart-spa/src/app.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import { withSentryRouterRouting } from '@sentry/solidstart/solidrouter'; | ||
import { MetaProvider, Title } from '@solidjs/meta'; | ||
import { Router } from '@solidjs/router'; | ||
import { FileRoutes } from '@solidjs/start/router'; | ||
import { Suspense } from 'solid-js'; | ||
|
||
const SentryRouter = withSentryRouterRouting(Router); | ||
|
||
export default function App() { | ||
return ( | ||
<SentryRouter | ||
root={props => ( | ||
<MetaProvider> | ||
<Title>SolidStart - with Vitest</Title> | ||
<Suspense>{props.children}</Suspense> | ||
</MetaProvider> | ||
)} | ||
> | ||
<FileRoutes /> | ||
</SentryRouter> | ||
); | ||
} |
18 changes: 18 additions & 0 deletions
18
dev-packages/e2e-tests/test-applications/solidstart-spa/src/entry-client.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
// @refresh reload | ||
import * as Sentry from '@sentry/solidstart'; | ||
import { solidRouterBrowserTracingIntegration } from '@sentry/solidstart/solidrouter'; | ||
import { StartClient, mount } from '@solidjs/start/client'; | ||
|
||
Sentry.init({ | ||
// We can't use env variables here, seems like they are stripped | ||
// out in production builds. | ||
dsn: 'https://[email protected]/1337', | ||
environment: 'qa', // dynamic sampling bias to keep transactions | ||
integrations: [solidRouterBrowserTracingIntegration()], | ||
tunnel: 'http://localhost:3031/', // proxy server | ||
// Performance Monitoring | ||
tracesSampleRate: 1.0, // Capture 100% of the transactions | ||
debug: !!import.meta.env.DEBUG, | ||
}); | ||
|
||
mount(() => <StartClient />, document.getElementById('app')!); |
21 changes: 21 additions & 0 deletions
21
dev-packages/e2e-tests/test-applications/solidstart-spa/src/entry-server.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// @refresh reload | ||
import { StartServer, createHandler } from '@solidjs/start/server'; | ||
|
||
export default createHandler(() => ( | ||
<StartServer | ||
document={({ assets, children, scripts }) => ( | ||
<html lang="en"> | ||
<head> | ||
<meta charset="utf-8" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
<link rel="icon" href="/favicon.ico" /> | ||
{assets} | ||
</head> | ||
<body> | ||
<div id="app">{children}</div> | ||
{scripts} | ||
</body> | ||
</html> | ||
)} | ||
/> | ||
)); |
9 changes: 9 additions & 0 deletions
9
dev-packages/e2e-tests/test-applications/solidstart-spa/src/instrument.server.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import * as Sentry from '@sentry/solidstart'; | ||
|
||
Sentry.init({ | ||
dsn: process.env.E2E_TEST_DSN, | ||
environment: 'qa', // dynamic sampling bias to keep transactions | ||
tracesSampleRate: 1.0, // Capture 100% of the transactions | ||
tunnel: 'http://localhost:3031/', // proxy server | ||
debug: !!process.env.DEBUG, | ||
}); |
9 changes: 9 additions & 0 deletions
9
dev-packages/e2e-tests/test-applications/solidstart-spa/src/routes/back-navigation.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import { A } from '@solidjs/router'; | ||
|
||
export default function BackNavigation() { | ||
return ( | ||
<A id="navLink" href="/users/6"> | ||
User 6 | ||
</A> | ||
); | ||
} |
15 changes: 15 additions & 0 deletions
15
dev-packages/e2e-tests/test-applications/solidstart-spa/src/routes/client-error.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
export default function ClientErrorPage() { | ||
return ( | ||
<div class="flex flex-col items-start space-x-2"> | ||
<button | ||
class="border rounded-lg px-2 mb-2 border-red-500 text-red-500 cursor-pointer" | ||
id="errorBtn" | ||
onClick={() => { | ||
throw new Error('Uncaught error thrown from Solid Start E2E test app'); | ||
}} | ||
> | ||
Throw uncaught error | ||
</button> | ||
</div> | ||
); | ||
} |
64 changes: 64 additions & 0 deletions
64
dev-packages/e2e-tests/test-applications/solidstart-spa/src/routes/error-boundary.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
import * as Sentry from '@sentry/solidstart'; | ||
import type { ParentProps } from 'solid-js'; | ||
import { ErrorBoundary, createSignal, onMount } from 'solid-js'; | ||
|
||
const SentryErrorBoundary = Sentry.withSentryErrorBoundary(ErrorBoundary); | ||
|
||
const [count, setCount] = createSignal(1); | ||
const [caughtError, setCaughtError] = createSignal(false); | ||
|
||
export default function ErrorBoundaryTestPage() { | ||
return ( | ||
<SampleErrorBoundary> | ||
{caughtError() && ( | ||
<Throw error={`Error ${count()} thrown from Sentry ErrorBoundary in Solid Start E2E test app`} /> | ||
)} | ||
<section class="bg-gray-100 text-gray-700 p-8"> | ||
<div class="flex flex-col items-start space-x-2"> | ||
<button | ||
class="border rounded-lg px-2 mb-2 border-red-500 text-red-500 cursor-pointer" | ||
id="caughtErrorBtn" | ||
onClick={() => setCaughtError(true)} | ||
> | ||
Throw caught error | ||
</button> | ||
</div> | ||
</section> | ||
</SampleErrorBoundary> | ||
); | ||
} | ||
|
||
function Throw(props: { error: string }) { | ||
onMount(() => { | ||
throw new Error(props.error); | ||
}); | ||
return null; | ||
} | ||
|
||
function SampleErrorBoundary(props: ParentProps) { | ||
return ( | ||
<SentryErrorBoundary | ||
fallback={(error, reset) => ( | ||
<section class="bg-gray-100 text-gray-700 p-8"> | ||
<h1 class="text-2xl font-bold">Error Boundary Fallback</h1> | ||
<div class="flex items-center space-x-2 mb-4"> | ||
<code>{error.message}</code> | ||
</div> | ||
<button | ||
id="errorBoundaryResetBtn" | ||
class="border rounded-lg px-2 border-gray-900" | ||
onClick={() => { | ||
setCount(count() + 1); | ||
setCaughtError(false); | ||
reset(); | ||
}} | ||
> | ||
Reset | ||
</button> | ||
</section> | ||
)} | ||
> | ||
{props.children} | ||
</SentryErrorBoundary> | ||
); | ||
} |
31 changes: 31 additions & 0 deletions
31
dev-packages/e2e-tests/test-applications/solidstart-spa/src/routes/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { A } from '@solidjs/router'; | ||
|
||
export default function Home() { | ||
return ( | ||
<> | ||
<h1>Welcome to Solid Start</h1> | ||
<p> | ||
Visit <a href="https://docs.solidjs.com/solid-start">docs.solidjs.com/solid-start</a> to read the documentation | ||
</p> | ||
<ul> | ||
<li> | ||
<A href="/client-error">Client error</A> | ||
</li> | ||
<li> | ||
<A href="/server-error">Server error</A> | ||
</li> | ||
<li> | ||
<A href="/error-boundary">Error Boundary</A> | ||
</li> | ||
<li> | ||
<A id="navLink" href="/users/5"> | ||
User 5 | ||
</A> | ||
</li> | ||
<li> | ||
<A href="/back-navigation">Test back navigation</A> | ||
</li> | ||
</ul> | ||
</> | ||
); | ||
} |
17 changes: 17 additions & 0 deletions
17
dev-packages/e2e-tests/test-applications/solidstart-spa/src/routes/server-error.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import { withServerActionInstrumentation } from '@sentry/solidstart'; | ||
import { createAsync } from '@solidjs/router'; | ||
|
||
const getPrefecture = async () => { | ||
'use server'; | ||
return await withServerActionInstrumentation('getPrefecture', () => { | ||
throw new Error('Error thrown from Solid Start E2E test app server route'); | ||
|
||
return { prefecture: 'Kanagawa' }; | ||
}); | ||
}; | ||
|
||
export default function ServerErrorPage() { | ||
const data = createAsync(() => getPrefecture()); | ||
|
||
return <div>Prefecture: {data()?.prefecture}</div>; | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this relevant then?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great catch, no it isn't!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did a double take and the
getPrefecture
function is extracted as a server function and then just executed as an api call on this run so I think it's fine to leave this in as is.