Skip to content

Commit 8ff74d3

Browse files
jacekradkobrkalow
andauthored
fix(repo): Run pnpm without --preserve-env (#5232)
Co-authored-by: Bryce Kalow <bryce@clerk.dev>
1 parent 460325c commit 8ff74d3

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ jobs:
264264
- name: Run Integration Tests
265265
if: ${{ steps.task-status.outputs.affected == '1' }}
266266
id: integration-tests
267-
run: sudo npm install -g pnpm && sudo --preserve-env pnpm turbo test:integration:${{ matrix.test-name }} $TURBO_ARGS
267+
run: pnpm turbo test:integration:${{ matrix.test-name }} $TURBO_ARGS
268268
env:
269269
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
270270
E2E_CLERK_VERSION: 'latest'

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ playground/*/yarn.lock
8282
.temp_integration
8383
playwright-report
8484
test-results
85+
sessions-key.pem
86+
sessions.pem
8587

8688
# Verdaccio
8789
.verdaccio

integration/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ You'll only need to follow these instructions once when you setup the integratio
3535
```
3636
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.
3737

38+
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"`.
39+
3840
> [!CAUTION]
3941
> Make sure to not accidentally commit any keys. Double check that the two new files are ignored by git.
4042

integration/certs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Good news! If you've set up your local development environment for Clerk, you've
1111
To generate a new cert/key pair, you can simply run the following command:
1212

1313
```bash
14-
mkcert -cert-file example.pem -key-file example-key.pem "example.com" "*.example.com"
14+
mkcert -cert-file sessions.pem -key-file sessions-key.pem "example.com" "*.example.com"
1515
```
1616

1717
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`.

integration/scripts/proxyServer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const createProxyServer = (opts: ProxyServerOptions) => {
2626
res.writeHead(404);
2727
res.end();
2828
}
29-
}).listen(usingSSL ? 443 : 80, '127.0.0.1');
29+
}).listen(usingSSL ? 8443 : 8880, '127.0.0.1');
3030
};
3131

3232
export type { Server };

integration/tests/non-secure-context.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { createTestUtils, testAgainstRunningApps } from '../testUtils';
2424
// and is not listed in the HSTS preload list
2525
// For more info, refer to https://hstspreload.org/
2626
// and https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
27-
const APP_HOST = 'lclclerk.com';
27+
const APP_HOST = 'lclclerk.com:8880';
2828

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

5454
test('sign-in flow', async ({ page }) => {
5555
const u = createTestUtils({ app, page });
56-
await u.page.goto(`http://${APP_HOST}`);
56+
await u.page.goto(`http://${APP_HOST}`, { timeout: 50000 });
5757
await u.po.signIn.goTo();
5858
await u.po.signIn.signInWithEmailAndInstantPassword(fakeUser);
5959
await u.po.expect.toBeSignedIn();

integration/tests/sessions/root-subdomain-prod-instances.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ test.describe('root and subdomain production apps @sessions', () => {
4040
* 5. The second app is going to be served on sub-1.multiple-apps-e2e.clerk.app
4141
*/
4242
test.describe('multiple apps same domain for the same production instances', () => {
43-
const hosts = ['multiple-apps-e2e.clerk.app', 'sub-1.multiple-apps-e2e.clerk.app'];
43+
const hosts = ['multiple-apps-e2e.clerk.app:8443', 'sub-1.multiple-apps-e2e.clerk.app:8443'];
4444

4545
let fakeUser: FakeUser;
4646
let server: Server;

0 commit comments

Comments
 (0)