Skip to content

Commit 8e581e7

Browse files
committed
refactor: initialize frameworksDirectory path
1 parent d921285 commit 8e581e7

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

server/config/directories.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
import path from "path";
2-
import { cwd } from "process";
1+
import { join } from "path";
2+
import process from "process";
33

4-
let FrameworksDirectory = path.join(cwd(), "..", "frameworks");
4+
const isFrameworksDirectorySpecifies = process.argv.length === 3;
55

6-
if (process.argv.length === 3) {
6+
const frameworksDirectory = isFrameworksDirectorySpecifies
7+
? join(process.cwd(), "..", process.argv[2])
8+
: join(process.cwd(), "..", "frameworks");
9+
10+
if (isFrameworksDirectorySpecifies) {
711
console.log(`Changing working directory to ${process.argv[2]}`);
8-
FrameworksDirectory = path.join(cwd(), "..", process.argv[2]);
912
}
1013

11-
export { FrameworksDirectory };
14+
export { frameworksDirectory };

server/frameworks/frameworksControllers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import path from "path";
22
import fs from "fs";
33

4-
import { FrameworksDirectory } from "../config/directories.js";
4+
import { frameworksDirectory } from "../config/directories.js";
55
import isFrameworkDir from "./utils/isFrameworkDir.js";
66
import { loadFrameworkInfo } from "./helpers/index.js";
77

88
export async function loadFrameworkVersionInformation(filterForFramework) {
99
const resultsProm = [];
10-
const frameworksPath = path.resolve(FrameworksDirectory);
10+
const frameworksPath = path.resolve(frameworksDirectory);
1111
const keyedTypes = ["keyed", "non-keyed"];
1212

1313
for (const keyedType of keyedTypes) {

server/frameworks/helpers/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import fs from "fs";
22
import fsp from "fs/promises";
33
import path from "path";
44

5-
import { FrameworksDirectory } from "../../config/directories.js";
5+
import { frameworksDirectory } from "../../config/directories.js";
66

77
function copyProps(result, benchmarkData) {
88
const {
@@ -35,7 +35,7 @@ export async function loadFrameworkInfo(keyedDir, directoryName) {
3535
};
3636

3737
const frameworkPath = path.resolve(
38-
FrameworksDirectory,
38+
frameworksDirectory,
3939
keyedDir,
4040
directoryName
4141
);

server/frameworks/utils/isFrameworkDir.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import fs from "fs";
22
import path from "path";
3-
import { FrameworksDirectory } from "../../config/directories.js";
3+
import { frameworksDirectory } from "../../config/directories.js";
44

55
/**
66
* @param {string} keyedDir
@@ -9,7 +9,7 @@ import { FrameworksDirectory } from "../../config/directories.js";
99
*/
1010
function isFrameworkDir(keyedDir, directoryName) {
1111
const frameworkPath = path.resolve(
12-
FrameworksDirectory,
12+
frameworksDirectory,
1313
keyedDir,
1414
directoryName
1515
);

server/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { addSiteIsolationForIndex } from "./middlewares/addSiteIsolationForIndex
66
import frameworksRouter from "./frameworks/frameworksRouter.js";
77
import cspRouter from "./csp/cspRouter.js";
88
import { isCSPEnabled } from "./csp/cspControllers.js";
9-
import { FrameworksDirectory } from "./config/directories.js";
9+
import { frameworksDirectory } from "./config/directories.js";
1010

1111
const app = express();
1212
const PORT = 8080;
@@ -18,7 +18,7 @@ app.use(addSiteIsolationForIndex);
1818

1919
app.use(
2020
"/frameworks",
21-
express.static(FrameworksDirectory, {
21+
express.static(frameworksDirectory, {
2222
setHeaders: (res, path) => {
2323
if (isCSPEnabled && path.endsWith("index.html")) {
2424
console.log("adding CSP to ", path);
@@ -31,7 +31,7 @@ app.use(
3131
})
3232
);
3333
app.use("/webdriver-ts-results", express.static(webDriverResultDirectory));
34-
app.use("/css", express.static(path.join(FrameworksDirectory, "..", "css")));
34+
app.use("/css", express.static(path.join(frameworksDirectory, "..", "css")));
3535

3636
app.use(frameworksRouter);
3737
app.use(cspRouter);

0 commit comments

Comments
 (0)