Skip to content

Commit b46ebf0

Browse files
author
Josh Goldberg
authored
Revert 'Fixed package file parsing for Windows' (#1162)
1 parent b42d9f8 commit b46ebf0

File tree

3 files changed

+29
-89
lines changed

3 files changed

+29
-89
lines changed

src/api/dependencies.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,9 @@ export const findConfigurationDependencies = {
110110
importer: boundImporter,
111111
};
112112

113-
export const findPackagesConfigurationDependencies = {
114-
fileSystem: fsFileSystem,
115-
};
116-
117113
export const findOriginalConfigurationsDependencies: FindOriginalConfigurationsDependencies = {
118114
findESLintConfiguration: bind(findESLintConfiguration, findConfigurationDependencies),
119-
findPackagesConfiguration: bind(
120-
findPackagesConfiguration,
121-
findPackagesConfigurationDependencies,
122-
),
115+
findPackagesConfiguration: bind(findPackagesConfiguration, findConfigurationDependencies),
123116
findTypeScriptConfiguration: bind(findTypeScriptConfiguration, findConfigurationDependencies),
124117
findTSLintConfiguration: bind(findTSLintConfiguration, findConfigurationDependencies),
125118
mergeLintConfigurations,
Lines changed: 7 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,33 @@
1-
import { createStubFileSystem } from "../adapters/fileSystem.stub";
1+
import { createStubExec } from "../adapters/exec.stubs";
22
import { findPackagesConfiguration } from "./findPackagesConfiguration";
33

44
describe("findPackagesConfiguration", () => {
55
it("defaults the configuration file when one isn't provided", async () => {
66
// Arrange
7-
const dependencies = {
8-
fileSystem: createStubFileSystem({
9-
data: "{}",
10-
}),
11-
};
7+
const dependencies = { exec: createStubExec() };
128

139
// Act
1410
await findPackagesConfiguration(dependencies, undefined);
1511

1612
// Assert
17-
expect(dependencies.fileSystem.readFile).toHaveBeenLastCalledWith(`./package.json`);
13+
expect(dependencies.exec).toHaveBeenLastCalledWith(`cat "./package.json"`);
1814
});
1915

20-
it("uses the configuration file from the packages command when one is provided", async () => {
16+
it("includes a configuration file in the packages command when one is provided", async () => {
2117
// Arrange
22-
const dependencies = {
23-
fileSystem: createStubFileSystem({
24-
data: "{}",
25-
}),
26-
};
18+
const dependencies = { exec: createStubExec() };
2719
const config = "./custom/package.json";
2820

2921
// Act
3022
await findPackagesConfiguration(dependencies, config);
3123

3224
// Assert
33-
expect(dependencies.fileSystem.readFile).toHaveBeenLastCalledWith(`./custom/package.json`);
34-
});
35-
36-
it("returns an error when readFile returns an error", async () => {
37-
// Arrange
38-
const error = new Error("Oh no!");
39-
const dependencies = {
40-
fileSystem: createStubFileSystem({
41-
data: error,
42-
}),
43-
};
44-
const config = "./custom/package.json";
45-
46-
// Act
47-
const result = await findPackagesConfiguration(dependencies, config);
48-
49-
// Assert
50-
expect(result).toBe(error);
25+
expect(dependencies.exec).toHaveBeenLastCalledWith(`cat "./custom/package.json"`);
5126
});
5227

5328
it("applies packages defaults when none are provided", async () => {
5429
// Arrange
55-
const dependencies = {
56-
fileSystem: createStubFileSystem({
57-
data: "{}",
58-
}),
59-
};
30+
const dependencies = { exec: createStubExec({ stdout: "{}" }) };
6031
const config = "./package.json";
6132

6233
// Act
@@ -68,28 +39,4 @@ describe("findPackagesConfiguration", () => {
6839
devDependencies: {},
6940
});
7041
});
71-
72-
it("uses existing package data when it exists", async () => {
73-
// Arrange
74-
const data = {
75-
dependencies: {
76-
eslint: "^11.22.33",
77-
},
78-
devDependencies: {
79-
tslint: "^12.34.56",
80-
},
81-
};
82-
const dependencies = {
83-
fileSystem: createStubFileSystem({
84-
data: JSON.stringify(data),
85-
}),
86-
};
87-
const config = "./package.json";
88-
89-
// Act
90-
const result = await findPackagesConfiguration(dependencies, config);
91-
92-
// Assert
93-
expect(result).toEqual(data);
94-
});
9542
});
Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
import { FileSystem } from "../adapters/fileSystem";
1+
import {
2+
findReportedConfiguration,
3+
FindReportedConfigurationDependencies,
4+
} from "./findReportedConfiguration";
25

36
export type PackagesConfiguration = {
47
dependencies: Record<string, string | undefined>;
58
devDependencies: Record<string, string | undefined>;
69
};
710

8-
export type FindPackagesConfigurationDependencies = {
9-
fileSystem: Pick<FileSystem, "readFile">;
10-
};
11-
1211
export const findPackagesConfiguration = async (
13-
dependencies: FindPackagesConfigurationDependencies,
14-
config = "./package.json",
12+
dependencies: FindReportedConfigurationDependencies,
13+
config: string | undefined,
1514
): Promise<PackagesConfiguration | Error> => {
16-
const rawConfiguration = await dependencies.fileSystem.readFile(config);
17-
if (rawConfiguration instanceof Error) {
18-
return rawConfiguration;
19-
}
20-
21-
const configuration = JSON.parse(rawConfiguration) as PackagesConfiguration;
15+
const rawConfiguration = await findReportedConfiguration<PackagesConfiguration>(
16+
dependencies.exec,
17+
"cat",
18+
config ?? "./package.json",
19+
);
2220

23-
return {
24-
dependencies: {
25-
...configuration.dependencies,
26-
},
27-
devDependencies: {
28-
...configuration.devDependencies,
29-
},
30-
};
21+
return rawConfiguration instanceof Error
22+
? rawConfiguration
23+
: {
24+
dependencies: {
25+
...rawConfiguration.dependencies,
26+
},
27+
devDependencies: {
28+
...rawConfiguration.devDependencies,
29+
},
30+
};
3131
};

0 commit comments

Comments
 (0)