Skip to content

Commit 6c5a4a2

Browse files
committed
Edge cases
1 parent 8b2d0a0 commit 6c5a4a2

File tree

6 files changed

+19
-34
lines changed

6 files changed

+19
-34
lines changed

packages/cli-v3/e2e/fixtures/compile-monorepo-packages/pnpm-lock.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,15 +1165,6 @@ __metadata:
11651165
languageName: node
11661166
linkType: hard
11671167

1168-
"infisical-sdk@workspace:.":
1169-
version: 0.0.0-use.local
1170-
resolution: "infisical-sdk@workspace:."
1171-
dependencies:
1172-
"@infisical/sdk": "npm:^2.2.3"
1173-
"@trigger.dev/sdk": "npm:3.0.0-beta.33"
1174-
languageName: unknown
1175-
linkType: soft
1176-
11771168
"ini@npm:^1.3.2":
11781169
version: 1.3.8
11791170
resolution: "ini@npm:1.3.8"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
legacy-peer-deps=true
2+
auto-install-peers=false

packages/cli-v3/e2e/fixtures/resolve-legacy-peer-deps/pnpm-lock.yaml

Lines changed: 1 addition & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ logger.loggerLevel = options.logLevel;
5151

5252
if (testCases.length > 0) {
5353
describe.concurrent("bundling", async () => {
54-
beforeEach<E2EFixtureTest>(async ({ fixtureDir, packageManager, workspaceDir }) => {
54+
beforeEach<E2EFixtureTest>(async ({ fixtureDir, packageManager, skip, workspaceDir }) => {
5555
await rimraf(join(workspaceDir, "**/node_modules"), {
5656
glob: true,
5757
});
@@ -75,6 +75,13 @@ if (testCases.length > 0) {
7575
}
7676
}
7777

78+
if (
79+
options.packageManager &&
80+
!existsSync(resolve(fixtureDir, LOCKFILES[options.packageManager]))
81+
) {
82+
skip();
83+
}
84+
7885
await installFixtureDeps({ fixtureDir, packageManager, workspaceDir });
7986
}, TIMEOUT);
8087

@@ -112,10 +119,8 @@ if (testCases.length > 0) {
112119
`fixture '${testCase.id}'`,
113120
{ timeout: TIMEOUT },
114121
async ({
115-
fixtureDir,
116122
packageManager,
117123
resolveEnv,
118-
skip,
119124
skipTypecheck,
120125
tempDir,
121126
wantCompilationError,
@@ -126,13 +131,6 @@ if (testCases.length > 0) {
126131
wantWorkerError,
127132
workspaceDir,
128133
}) => {
129-
if (
130-
options.packageManager &&
131-
!existsSync(resolve(fixtureDir, LOCKFILES[options.packageManager]))
132-
) {
133-
skip();
134-
}
135-
136134
let resolvedConfig: ReadConfigResult;
137135
const configExpect = expect(
138136
(async () => {

packages/cli-v3/src/utilities/javascriptProject.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,12 +483,14 @@ class NPMCommands implements PackageManagerCommands {
483483
return results;
484484
}
485485

486-
async extractDirectDependenciesMeta(options: PackageManagerOptions) {
486+
async extractDirectDependenciesMeta(
487+
options: PackageManagerOptions
488+
): Promise<Record<string, DependencyMeta>> {
487489
const result = await this.#listDirectDependencies(options);
488490

489491
logger.debug(`Extracting direct dependencies metadata using ${this.name}`);
490492

491-
return this.#flattenDependenciesMeta(result.dependencies);
493+
return result.dependencies ? this.#flattenDependenciesMeta(result.dependencies) : {};
492494
}
493495

494496
async #listDirectDependencies(options: PackageManagerOptions) {
@@ -546,11 +548,11 @@ class NPMCommands implements PackageManagerCommands {
546548
let results: Record<string, DependencyMeta> = {};
547549

548550
for (const [name, dep] of Object.entries(dependencies)) {
549-
const { version, resolved, dependencies } = dep;
550-
results[name] = { version, external: !resolved.startsWith("file:") };
551+
const { version, resolved, dependencies: children } = dep;
552+
results[name] = { version, external: !!resolved && !resolved.startsWith("file:") };
551553

552-
if (dependencies) {
553-
results = { ...results, ...this.#flattenDependenciesMeta(dependencies) };
554+
if (children) {
555+
results = { ...results, ...this.#flattenDependenciesMeta(children) };
554556
}
555557
}
556558

0 commit comments

Comments
 (0)