Skip to content

Commit f7d4126

Browse files
codenemericallam
authored andcommitted
use rimraf in test setup
1 parent 483f8d6 commit f7d4126

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { execa, execaNode } from "execa";
22
import { existsSync, readFileSync } from "node:fs";
33
import { mkdir, rename, rm } from "node:fs/promises";
44
import { join, resolve } from "node:path";
5+
import { rimraf } from "rimraf";
56

67
import { typecheckProject } from "../src/commands/deploy";
78
import { readConfig, ReadConfigFileResult } from "../src/utilities/configFiles";
@@ -57,8 +58,10 @@ if (testCases.length > 0) {
5758
const { name } = testCase;
5859
const fixtureDir = resolve(join(process.cwd(), "e2e/fixtures", name));
5960
await rm(resolve(join(fixtureDir, ".trigger")), { force: true, recursive: true });
60-
await rm(resolve(join(fixtureDir, "node_modules")), { force: true, recursive: true });
61-
const packageManager: PackageManager = await parsepackageManager(options, fixtureDir);
61+
await rimraf(join(fixtureDir, "**/node_modules/**"), {
62+
glob: true,
63+
});
64+
const packageManager: PackageManager = await parsePackageManager(options, fixtureDir);
6265

6366
if (
6467
packageManager === "npm" &&
@@ -97,7 +100,7 @@ if (testCases.length > 0) {
97100
for (let testCase of testCases) {
98101
const { name } = testCase;
99102
const fixtureDir = resolve(join(process.cwd(), "e2e/fixtures", name));
100-
const packageManager: PackageManager = await parsepackageManager(options, fixtureDir);
103+
const packageManager: PackageManager = await parsePackageManager(options, fixtureDir);
101104

102105
if (packageManager === "npm") {
103106
try {
@@ -123,7 +126,7 @@ if (testCases.length > 0) {
123126
} = testCase;
124127
const fixtureDir = resolve(join(process.cwd(), "e2e/fixtures", name));
125128
let shouldSkipFixture: boolean = false;
126-
const packageManager: PackageManager = await parsepackageManager(options, fixtureDir);
129+
const packageManager: PackageManager = await parsePackageManager(options, fixtureDir);
127130

128131
if (options.packageManager)
129132
shouldSkipFixture = !existsSync(resolve(fixtureDir, LOCKFILES[options.packageManager]));
@@ -343,7 +346,7 @@ function installArgs(packageManager: string) {
343346
}
344347
}
345348

346-
async function parsepackageManager(
349+
async function parsePackageManager(
347350
options: E2EOptions,
348351
fixtureDir: string
349352
): Promise<PackageManager> {

packages/cli-v3/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"npm-run-all": "^4.1.5",
5050
"open": "^10.0.3",
5151
"p-retry": "^6.1.0",
52-
"rimraf": "^3.0.2",
52+
"rimraf": "^5.0.7",
5353
"tsup": "^8.0.1",
5454
"type-fest": "^3.6.0",
5555
"typescript": "^5.3.3",
@@ -122,12 +122,12 @@
122122
"terminal-link": "^3.0.0",
123123
"tiny-invariant": "^1.2.0",
124124
"tsconfig-paths": "^4.2.0",
125+
"typescript": "^5.4.0",
125126
"update-check": "^1.5.4",
126127
"url": "^0.11.1",
127128
"ws": "^8.12.0",
128129
"zod": "3.22.3",
129-
"zod-validation-error": "^1.5.0",
130-
"typescript": "^5.4.0"
130+
"zod-validation-error": "^1.5.0"
131131
},
132132
"engines": {
133133
"node": ">=18.0.0"

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)