Skip to content

Commit 8967d0d

Browse files
brandenrodgersbrandenrodgers
committed
Revert "fix: use path.sep to make this os agnostic"
This reverts commit 65309bd.
1 parent eeea214 commit 8967d0d

File tree

3 files changed

+22
-64
lines changed

3 files changed

+22
-64
lines changed

‎api/__tests__/projects.test.ts‎

Lines changed: 19 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ describe('api/projects', () => {
102102
);
103103
expect(http.post).toHaveBeenCalledTimes(1);
104104
expect(http.post).toHaveBeenCalledWith(accountId, {
105-
url: `dfs/v1/projects/upload/${encodeURIComponent(
106-
projectNameIllegalChars
107-
)}`,
105+
url: `dfs/v1/projects/upload/${encodeURIComponent(projectNameIllegalChars)}`,
108106
timeout: 60_000,
109107
data: {
110108
file: formData,
@@ -150,9 +148,7 @@ describe('api/projects', () => {
150148
await fetchProject(accountId, projectNameIllegalChars);
151149
expect(http.get).toHaveBeenCalledTimes(1);
152150
expect(http.get).toHaveBeenCalledWith(accountId, {
153-
url: `developer/projects/v1/by-name/${encodeURIComponent(
154-
projectNameIllegalChars
155-
)}`,
151+
url: `developer/projects/v1/by-name/${encodeURIComponent(projectNameIllegalChars)}`,
156152
});
157153
});
158154
});
@@ -187,9 +183,7 @@ describe('api/projects', () => {
187183
await downloadProject(accountId, projectNameIllegalChars, buildId);
188184
expect(http.get).toHaveBeenCalledTimes(1);
189185
expect(http.get).toHaveBeenCalledWith(accountId, {
190-
url: `dfs/v1/projects/${encodeURIComponent(
191-
projectNameIllegalChars
192-
)}/builds/${buildId}/archive-full`,
186+
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/${buildId}/archive-full`,
193187
responseType: 'arraybuffer',
194188
headers: {
195189
accept: 'application/zip',
@@ -212,9 +206,7 @@ describe('api/projects', () => {
212206
await deleteProject(accountId, projectNameIllegalChars);
213207
expect(http.delete).toHaveBeenCalledTimes(1);
214208
expect(http.delete).toHaveBeenCalledWith(accountId, {
215-
url: `developer/projects/v1/${encodeURIComponent(
216-
projectNameIllegalChars
217-
)}`,
209+
url: `developer/projects/v1/${encodeURIComponent(projectNameIllegalChars)}`,
218210
});
219211
});
220212
});
@@ -246,9 +238,7 @@ describe('api/projects', () => {
246238
await fetchProjectBuilds(accountId, projectNameIllegalChars);
247239
expect(http.get).toHaveBeenCalledTimes(1);
248240
expect(http.get).toHaveBeenCalledWith(accountId, {
249-
url: `dfs/v1/projects/${encodeURIComponent(
250-
projectNameIllegalChars
251-
)}/builds`,
241+
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds`,
252242
params: {},
253243
});
254244
});
@@ -268,9 +258,7 @@ describe('api/projects', () => {
268258
await getBuildStatus(accountId, projectNameIllegalChars, buildId);
269259
expect(http.get).toHaveBeenCalledTimes(1);
270260
expect(http.get).toHaveBeenCalledWith(accountId, {
271-
url: `dfs/v1/projects/${encodeURIComponent(
272-
projectNameIllegalChars
273-
)}/builds/${buildId}/status`,
261+
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/${buildId}/status`,
274262
});
275263
});
276264
});
@@ -289,9 +277,7 @@ describe('api/projects', () => {
289277
await getBuildStructure(accountId, projectNameIllegalChars, buildId);
290278
expect(http.get).toHaveBeenCalledTimes(1);
291279
expect(http.get).toHaveBeenCalledWith(accountId, {
292-
url: `dfs/v1/builds/by-project-name/${encodeURIComponent(
293-
projectNameIllegalChars
294-
)}/builds/${buildId}/structure`,
280+
url: `dfs/v1/builds/by-project-name/${encodeURIComponent(projectNameIllegalChars)}/builds/${buildId}/structure`,
295281
});
296282
});
297283
});
@@ -325,9 +311,7 @@ describe('api/projects', () => {
325311
await getDeployStatus(accountId, projectNameIllegalChars, deployId);
326312
expect(http.get).toHaveBeenCalledTimes(1);
327313
expect(http.get).toHaveBeenCalledWith(accountId, {
328-
url: `dfs/deploy/v1/deploy-status/projects/${encodeURIComponent(
329-
projectNameIllegalChars
330-
)}/deploys/${deployId}`,
314+
url: `dfs/deploy/v1/deploy-status/projects/${encodeURIComponent(projectNameIllegalChars)}/deploys/${deployId}`,
331315
});
332316
});
333317
});
@@ -346,9 +330,7 @@ describe('api/projects', () => {
346330
await getDeployStructure(accountId, projectNameIllegalChars, deployId);
347331
expect(http.get).toHaveBeenCalledTimes(1);
348332
expect(http.get).toHaveBeenCalledWith(accountId, {
349-
url: `dfs/deploy/v1/deploys/by-project-name/${encodeURIComponent(
350-
projectNameIllegalChars
351-
)}/deploys/${deployId}/structure`,
333+
url: `dfs/deploy/v1/deploys/by-project-name/${encodeURIComponent(projectNameIllegalChars)}/deploys/${deployId}/structure`,
352334
});
353335
});
354336
});
@@ -366,9 +348,7 @@ describe('api/projects', () => {
366348
await fetchProjectSettings(accountId, projectNameIllegalChars);
367349
expect(http.get).toHaveBeenCalledTimes(1);
368350
expect(http.get).toHaveBeenCalledWith(accountId, {
369-
url: `developer/projects/v1/${encodeURIComponent(
370-
projectNameIllegalChars
371-
)}/settings`,
351+
url: `developer/projects/v1/${encodeURIComponent(projectNameIllegalChars)}/settings`,
372352
});
373353
});
374354
});
@@ -390,9 +370,7 @@ describe('api/projects', () => {
390370
await provisionBuild(accountId, projectNameIllegalChars);
391371
expect(http.post).toHaveBeenCalledTimes(1);
392372
expect(http.post).toHaveBeenCalledWith(accountId, {
393-
url: `dfs/v1/projects/${encodeURIComponent(
394-
projectNameIllegalChars
395-
)}/builds/staged/provision`,
373+
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/provision`,
396374
params: {},
397375
headers: { 'Content-Type': 'application/json' },
398376
timeout: 50_000,
@@ -416,9 +394,7 @@ describe('api/projects', () => {
416394
await queueBuild(accountId, projectNameIllegalChars);
417395
expect(http.post).toHaveBeenCalledTimes(1);
418396
expect(http.post).toHaveBeenCalledWith(accountId, {
419-
url: `dfs/v1/projects/${encodeURIComponent(
420-
projectNameIllegalChars
421-
)}/builds/staged/queue`,
397+
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/queue`,
422398
params: {},
423399
headers: { 'Content-Type': 'application/json' },
424400
});
@@ -432,9 +408,7 @@ describe('api/projects', () => {
432408
await uploadFileToBuild(accountId, projectName, filePath, path);
433409
expect(http.put).toHaveBeenCalledTimes(1);
434410
expect(http.put).toHaveBeenCalledWith(accountId, {
435-
url: `dfs/v1/projects/${projectName}/builds/staged/files/${encodeURIComponent(
436-
path
437-
)}`,
411+
url: `dfs/v1/projects/${projectName}/builds/staged/files/${encodeURIComponent(path)}`,
438412
data: { file: formData },
439413
headers: { 'Content-Type': 'multipart/form-data' },
440414
});
@@ -451,9 +425,7 @@ describe('api/projects', () => {
451425
);
452426
expect(http.put).toHaveBeenCalledTimes(1);
453427
expect(http.put).toHaveBeenCalledWith(accountId, {
454-
url: `dfs/v1/projects/${encodeURIComponent(
455-
projectNameIllegalChars
456-
)}/builds/staged/files/${encodeURIComponent(path)}`,
428+
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/files/${encodeURIComponent(path)}`,
457429
data: { file: formData },
458430
headers: { 'Content-Type': 'multipart/form-data' },
459431
});
@@ -466,9 +438,7 @@ describe('api/projects', () => {
466438
await deleteFileFromBuild(accountId, projectName, path);
467439
expect(http.delete).toHaveBeenCalledTimes(1);
468440
expect(http.delete).toHaveBeenCalledWith(accountId, {
469-
url: `dfs/v1/projects/${projectName}/builds/staged/files/${encodeURIComponent(
470-
path
471-
)}`,
441+
url: `dfs/v1/projects/${projectName}/builds/staged/files/${encodeURIComponent(path)}`,
472442
});
473443
});
474444

@@ -477,9 +447,7 @@ describe('api/projects', () => {
477447
await deleteFileFromBuild(accountId, projectNameIllegalChars, filePath);
478448
expect(http.delete).toHaveBeenCalledTimes(1);
479449
expect(http.delete).toHaveBeenCalledWith(accountId, {
480-
url: `dfs/v1/projects/${encodeURIComponent(
481-
projectNameIllegalChars
482-
)}/builds/staged/files/${encodeURIComponent(filePath)}`,
450+
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/files/${encodeURIComponent(filePath)}`,
483451
});
484452
});
485453
});
@@ -498,9 +466,7 @@ describe('api/projects', () => {
498466
await cancelStagedBuild(accountId, projectNameIllegalChars);
499467
expect(http.post).toHaveBeenCalledTimes(1);
500468
expect(http.post).toHaveBeenCalledWith(accountId, {
501-
url: `dfs/v1/projects/${encodeURIComponent(
502-
projectNameIllegalChars
503-
)}/builds/staged/cancel`,
469+
url: `dfs/v1/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/staged/cancel`,
504470
headers: { 'Content-Type': 'application/json' },
505471
});
506472
});
@@ -520,9 +486,7 @@ describe('api/projects', () => {
520486
await fetchBuildWarnLogs(accountId, projectNameIllegalChars, buildId);
521487
expect(http.get).toHaveBeenCalledTimes(1);
522488
expect(http.get).toHaveBeenCalledWith(accountId, {
523-
url: `dfs/logging/v1/logs/projects/${encodeURIComponent(
524-
projectNameIllegalChars
525-
)}/builds/${buildId}/combined/warn`,
489+
url: `dfs/logging/v1/logs/projects/${encodeURIComponent(projectNameIllegalChars)}/builds/${buildId}/combined/warn`,
526490
});
527491
});
528492
});
@@ -541,9 +505,7 @@ describe('api/projects', () => {
541505
await fetchDeployWarnLogs(accountId, projectNameIllegalChars, deployId);
542506
expect(http.get).toHaveBeenCalledTimes(1);
543507
expect(http.get).toHaveBeenCalledWith(accountId, {
544-
url: `dfs/logging/v1/logs/projects/${encodeURIComponent(
545-
projectNameIllegalChars
546-
)}/deploys/${deployId}/combined/warn`,
508+
url: `dfs/logging/v1/logs/projects/${encodeURIComponent(projectNameIllegalChars)}/deploys/${deployId}/combined/warn`,
547509
});
548510
});
549511
});

‎api/projects.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ export async function fetchProject(
7676
projectName: string
7777
): Promise<Project> {
7878
return http.get(accountId, {
79-
url: `${DEVELOPER_PROJECTS_API_PATH}/by-name/${encodeURIComponent(
80-
projectName
81-
)}`,
79+
url: `${DEVELOPER_PROJECTS_API_PATH}/by-name/${encodeURIComponent(projectName)}`,
8280
});
8381
}
8482

@@ -200,9 +198,7 @@ export async function fetchProjectSettings(
200198
projectName: string
201199
): Promise<ProjectSettings> {
202200
return http.get(accountId, {
203-
url: `${DEVELOPER_PROJECTS_API_PATH}/${encodeURIComponent(
204-
projectName
205-
)}/settings`,
201+
url: `${DEVELOPER_PROJECTS_API_PATH}/${encodeURIComponent(projectName)}/settings`,
206202
});
207203
}
208204

‎lib/cms/handleFieldsJS.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export function isConvertableFieldJs(
164164
return !!(
165165
convertFields &&
166166
allowedFieldsNames.includes(baseName) &&
167-
(inModuleFolder || relativePath == path.sep)
167+
(inModuleFolder || relativePath == '/')
168168
);
169169
}
170170

0 commit comments

Comments
 (0)