Skip to content
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

fix(repo): Run pnpm without --preserve-env #5232

Merged
merged 8 commits into from
Feb 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ jobs:
- name: Run Integration Tests
if: ${{ steps.task-status.outputs.affected == '1' }}
id: integration-tests
run: sudo npm install -g pnpm && sudo --preserve-env pnpm turbo test:integration:${{ matrix.test-name }} $TURBO_ARGS
run: pnpm turbo test:integration:${{ matrix.test-name }} $TURBO_ARGS
env:
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
E2E_CLERK_VERSION: 'latest'
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ playground/*/yarn.lock
.temp_integration
playwright-report
test-results
sessions-key.pem
sessions.pem

# Verdaccio
.verdaccio
Expand Down
2 changes: 2 additions & 0 deletions integration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ You'll only need to follow these instructions once when you setup the integratio
```
1. Open Clerk's 1Password and search for **JS SDKs integration tests**. Inside the secure note you'll find the secret keys that should go into `.env.local` and `.keys.json`. Copy them over.

1. Generate the required session keys by running the following command in the `./certs` directory: `mkcert -cert-file sessions.pem -key-file sessions-key.pem "example.com" "*.example.com"`.

> [!CAUTION]
> Make sure to not accidentally commit any keys. Double check that the two new files are ignored by git.

Expand Down
2 changes: 1 addition & 1 deletion integration/certs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Good news! If you've set up your local development environment for Clerk, you've
To generate a new cert/key pair, you can simply run the following command:

```bash
mkcert -cert-file example.pem -key-file example-key.pem "example.com" "*.example.com"
mkcert -cert-file sessions.pem -key-file sessions-key.pem "example.com" "*.example.com"
```

The command above will create a `example.pem` and a `example-key.pem` file in the current directory. The certificate will be valid for `example.com` and all subdomains of `example.com`.
Expand Down
2 changes: 1 addition & 1 deletion integration/scripts/proxyServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const createProxyServer = (opts: ProxyServerOptions) => {
res.writeHead(404);
res.end();
}
}).listen(usingSSL ? 443 : 80, '127.0.0.1');
}).listen(usingSSL ? 8443 : 8880, '127.0.0.1');
};

export type { Server };
4 changes: 2 additions & 2 deletions integration/tests/non-secure-context.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { createTestUtils, testAgainstRunningApps } from '../testUtils';
// and is not listed in the HSTS preload list
// For more info, refer to https://hstspreload.org/
// and https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
const APP_HOST = 'lclclerk.com';
const APP_HOST = 'lclclerk.com:8880';

testAgainstRunningApps({ withPattern: ['next.appRouter.withEmailCodes'] })(
'localhost non-secure context @generic',
Expand Down Expand Up @@ -53,7 +53,7 @@ testAgainstRunningApps({ withPattern: ['next.appRouter.withEmailCodes'] })(

test('sign-in flow', async ({ page }) => {
const u = createTestUtils({ app, page });
await u.page.goto(`http://${APP_HOST}`);
await u.page.goto(`http://${APP_HOST}`, { timeout: 50000 });
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword(fakeUser);
await u.po.expect.toBeSignedIn();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ test.describe('root and subdomain production apps @sessions', () => {
* 5. The second app is going to be served on sub-1.multiple-apps-e2e.clerk.app
*/
test.describe('multiple apps same domain for the same production instances', () => {
const hosts = ['multiple-apps-e2e.clerk.app', 'sub-1.multiple-apps-e2e.clerk.app'];
const hosts = ['multiple-apps-e2e.clerk.app:8443', 'sub-1.multiple-apps-e2e.clerk.app:8443'];

let fakeUser: FakeUser;
let server: Server;
Expand Down
Loading