Skip to content

Commit e5d26bd

Browse files
authored
Fix infisical-sdk fixture, use in config instead (#1190)
1 parent b6f31ab commit e5d26bd

File tree

11 files changed

+32
-26
lines changed

11 files changed

+32
-26
lines changed

packages/cli-v3/e2e/fixtures.config.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ export interface TestCase {
1111
}
1212

1313
export const fixturesConfig: TestCase[] = [
14+
{
15+
id: "config-infisical-sdk",
16+
skipTypecheck: true,
17+
},
1418
{
1519
id: "config-invalid",
1620
wantConfigInvalidError: true,
@@ -23,12 +27,6 @@ export const fixturesConfig: TestCase[] = [
2327
id: "dep-to-add-scope-parsing",
2428
skipTypecheck: true,
2529
},
26-
{
27-
id: "infisical-sdk",
28-
skipTypecheck: true,
29-
// Should not fail
30-
wantCompilationError: true,
31-
},
3230
{
3331
id: "lock-nested-peer-deps",
3432
skipTypecheck: true,

packages/cli-v3/e2e/fixtures/infisical-sdk/package-lock.json renamed to packages/cli-v3/e2e/fixtures/config-infisical-sdk/package-lock.json

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cli-v3/e2e/fixtures/infisical-sdk/package.json renamed to packages/cli-v3/e2e/fixtures/config-infisical-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "server-only",
2+
"name": "config-infisical-sdk",
33
"private": true,
44
"dependencies": {
55
"@infisical/sdk": "^2.2.3",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { InfisicalClient } from "@infisical/sdk";
2+
3+
export const config = async () => {
4+
console.log("InfisicalClient", InfisicalClient);
5+
6+
return {
7+
project: "config-infisical-sdk",
8+
};
9+
};
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { task } from "@trigger.dev/sdk/v3";
2-
import { LogLevel } from "@infisical/sdk";
32

43
export const helloWorldTask = task({
54
id: "hello-world",
65
run: async (payload) => {
7-
console.log("Hello, World!", payload, LogLevel.Debug);
6+
console.log("Hello, World!", payload);
87
},
98
});

packages/cli-v3/e2e/fixtures/infisical-sdk/yarn.lock renamed to packages/cli-v3/e2e/fixtures/config-infisical-sdk/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,15 @@ __metadata:
986986
languageName: node
987987
linkType: hard
988988

989+
"config-infisical-sdk@workspace:.":
990+
version: 0.0.0-use.local
991+
resolution: "config-infisical-sdk@workspace:."
992+
dependencies:
993+
"@infisical/sdk": "npm:^2.2.3"
994+
"@trigger.dev/sdk": "npm:3.0.0-beta.33"
995+
languageName: unknown
996+
linkType: soft
997+
989998
"cookie@npm:^0.5.0":
990999
version: 0.5.0
9911000
resolution: "cookie@npm:0.5.0"
@@ -1384,15 +1393,6 @@ __metadata:
13841393
languageName: node
13851394
linkType: hard
13861395

1387-
"server-only@workspace:.":
1388-
version: 0.0.0-use.local
1389-
resolution: "server-only@workspace:."
1390-
dependencies:
1391-
"@infisical/sdk": "npm:^2.2.3"
1392-
"@trigger.dev/sdk": "npm:3.0.0-beta.33"
1393-
languageName: unknown
1394-
linkType: soft
1395-
13961396
"shimmer@npm:^1.2.1":
13971397
version: 1.2.1
13981398
resolution: "shimmer@npm:1.2.1"

packages/cli-v3/e2e/fixtures/infisical-sdk/trigger.config.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/cli-v3/e2e/index.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ logger.loggerLevel = options.logLevel;
5050
if (testCases.length > 0) {
5151
describe.concurrent("bundling", async () => {
5252
beforeEach<E2EFixtureTest>(async ({ dir, packageManager }) => {
53-
await rimraf(join(dir, "**/node_modules/**"), {
53+
await rimraf(join(dir, "**/node_modules"), {
5454
glob: true,
5555
});
5656
await rimraf(join(dir, ".yarn"), { glob: true });
@@ -139,7 +139,7 @@ if (testCases.length > 0) {
139139
return;
140140
}
141141

142-
expect(resolvedConfig!).not.toBe("error");
142+
expect(resolvedConfig!.status).not.toBe("error");
143143

144144
if (!skipTypecheck) {
145145
await expect(

0 commit comments

Comments
 (0)