Skip to content

Commit 227fa14

Browse files
committed
Fix npm updates yarn.lock
1 parent ad96013 commit 227fa14

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { execa, execaNode } from "execa";
22
import { join, resolve } from "node:path";
33
import { typecheckProject } from "../src/commands/deploy";
44
import { readConfig } from "../src/utilities/configFiles";
5-
import { rm } from "node:fs/promises";
5+
import { rename, rm } from "node:fs/promises";
66
import { readFileSync } from "node:fs";
77

88
type TestCase = {
@@ -27,15 +27,33 @@ const testCases = process.env.MOD
2727

2828
const commandPath = resolve(join(process.cwd(), "dist/e2e.js"));
2929
const logLevel = process.env.LOG || "log";
30+
const packageManager = process.env.PM || "npm";
3031

3132
if (testCases.length > 0) {
33+
console.log(`Using ${packageManager}`);
34+
3235
describe.each(testCases)("fixture $name", ({ name, skipTypecheck }) => {
33-
const packageManager = process.env.PM || "npm";
3436
const fixtureDir = resolve(join(process.cwd(), "e2e/fixtures", name));
3537

3638
beforeAll(async () => {
3739
await rm(resolve(join(fixtureDir, ".trigger")), { force: true, recursive: true });
3840
await rm(resolve(join(fixtureDir, "node_modules")), { force: true, recursive: true });
41+
if (packageManager === "npm") {
42+
// `npm ci` & `npm install` will update an existing yarn.lock
43+
await rename(
44+
resolve(join(fixtureDir, "yarn.lock")),
45+
resolve(join(fixtureDir, "yarn.lock.copy"))
46+
);
47+
}
48+
});
49+
50+
afterAll(async () => {
51+
if (packageManager === "npm") {
52+
await rename(
53+
resolve(join(fixtureDir, "yarn.lock.copy")),
54+
resolve(join(fixtureDir, "yarn.lock"))
55+
);
56+
}
3957
});
4058

4159
test(

0 commit comments

Comments
 (0)