ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix path splitting issues on windows (#3565)

Browse Source 
* Fix path splitting issues on windows

* Fix path splitting issue on routeLoaders

* Enable some e2e tests

* Swap enabled e2e tests

* Working bare-min project parse

* Make tsc happy

* Clean up & enable more tests

* Fix paths in browser

* Fix tests for windows

fmt

* Clean up wasm side

* Make build:wasm windows compatible

* More paths cleanup & some tests

* Remove sleep

* Use new config sturcture in parseroute

* Clean up debugger

* Fix: on settings close go back to the same file (#3549)

* Fix: on settings close go back to the same file

* A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest)

* shit aint working yo

* Get that page a-loading

* A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest)

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Frank Noirot <frank@kittycad.io>
Co-authored-by: Jess Frazelle <jessfraz@users.noreply.github.com>

* Fmt

* Comment out currently failing win32 tests

* Ignore tsc for electron monkey-patch

* Force line-endings to only

* Fix tsc

* Enable more tests

* A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest)

* Avoid modifying global for tests

---------

Co-authored-by: 49fl <ircsurfer33@gmail.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Frank Noirot <frank@kittycad.io>
Co-authored-by: Jess Frazelle <jessfraz@users.noreply.github.com>
This commit is contained in:
Adam Sunderland
2024-08-22 13:38:53 -04:00
committed by GitHub
parent 0bb4586e6d
commit a2d8c5a714
14 changed files with 378 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/routeLoaders.ts
View File

@ -36,9 +36,9 @@ export const settingsLoader: LoaderFunction = async ({
configuration
)
if (projectPathData) {
const { project_path } = projectPathData
const { projectPath } = projectPathData
const { settings: s } = await loadAndValidateSettings(
project_path || undefined
projectPath || undefined
)
return s
}
@ -83,48 +83,49 @@ export const fileLoader: LoaderFunction = async (
const isBrowserProject = params.id === decodeURIComponent(BROWSER_PATH)
if (!isBrowserProject && projectPathData) {
const { project_name, project_path, current_file_name, current_file_path } =
const { projectName, projectPath, currentFileName, currentFilePath } =
projectPathData
const urlObj = new URL(routerData.request.url)
let code = ''
if (!urlObj.pathname.endsWith('/settings')) {
if (!current_file_name || !current_file_path || !project_name) {
if (!currentFileName || !currentFilePath || !projectName) {
return redirect(
`${PATHS.FILE}/${encodeURIComponent(
isDesktop()
? (await getProjectInfo(project_path)).default_file
? (await getProjectInfo(projectPath)).default_file
: params.id + '/' + PROJECT_ENTRYPOINT
)}`
)
}
code = await window.electron.readFile(current_file_path)
code = await window.electron.readFile(currentFilePath)
code = normalizeLineEndings(code)
// Update both the state and the editor's code.
// We explicitly do not write to the file here since we are loading from
// the file system and not the editor.
codeManager.updateCurrentFilePath(current_file_path)
codeManager.updateCurrentFilePath(currentFilePath)
codeManager.updateCodeStateEditor(code)
}
// Set the file system manager to the project path
// So that WASM gets an updated path for operations
fileSystemManager.dir = project_path
fileSystemManager.dir = projectPath
const defaultProjectData = {
name: project_name || 'unnamed',
path: project_path,
name: projectName || 'unnamed',
path: projectPath,
children: [],
kcl_file_count: 0,
directory_count: 0,
metadata: null,
default_file: project_path,
default_file: projectPath,
}
const maybeProjectInfo = isDesktop()
? await getProjectInfo(project_path)
? await getProjectInfo(projectPath)
: null
console.log('maybeProjectInfo', {
@ -137,8 +138,8 @@ export const fileLoader: LoaderFunction = async (
code,
project: maybeProjectInfo ?? defaultProjectData,
file: {
name: current_file_name || '',
path: current_file_path || '',
name: currentFileName || '',
path: currentFilePath || '',
children: [],
},
}
@ -187,3 +188,7 @@ export const homeLoader: LoaderFunction = async (): Promise<
}
}
}
const normalizeLineEndings = (str: string, normalized = '\n') => {
return str.replace(/\r?\n/g, normalized)
}