From 10a4dded8aeefdc4a62792b00eba0485a7589d6c Mon Sep 17 00:00:00 2001 From: "Pete-Humans.Inst" <42595944+humansinstitute@users.noreply.github.com> Date: Sat, 4 Jan 2025 20:09:38 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=94=A7=20Fix:=20Standardize=20L?= =?UTF-8?q?ine=20Endings=20for=20Cross-Platform=20Development"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 --- .prettierrc.json | 3 +-- README.md | 27 --------------------------- package.json | 3 +-- 4 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 314766e9..00000000 --- a/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -* text=auto eol=lf -*.{cmd,[cC][mM][dD]} text eol=crlf -*.{bat,[bB][aA][tT]} text eol=crlf diff --git a/.prettierrc.json b/.prettierrc.json index 75d6bdea..ddd52e34 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -3,6 +3,5 @@ "tabWidth": 2, "printWidth": 100, "singleQuote": true, - "trailingComma": "none", - "endOfLine": "lf" + "trailingComma": "none" } \ No newline at end of file diff --git a/README.md b/README.md index ebac2cd1..1e3a83cc 100644 --- a/README.md +++ b/README.md @@ -46,29 +46,6 @@ If you wish to run only the frontend, follow these steps: - `yarn install` to install the dependencies - `yarn start` to run the frontend locally -## Fix Line Endings for Windows Development 🛠️ - -If you're developing on Windows and encounter line-ending issues with Prettier, you have two options: - -## Option 1: Fix Specific Files - -### Reset the Git index - git rm --cached -r . - git reset --hard - -### Configure Git to handle line endings - git config --global core.autocrlf false - git config --global core.eol lf - -### Run Prettier to fix formatting - - Example: - npx prettier --config .prettierrc.json -w src/store/interface.ts - -### Option 2: Fix All Files (Full Reset) -If you want to reset and fix all files in the project, you can use the provided script: - - yarn fix-line-endings - ## Contributing Guidelines 🤝 All code contributions, including those of people having commit access, must go through a pull request and be approved by a core developer before being merged. This is to ensure a proper review of all the code. @@ -110,10 +87,6 @@ If you wish to run only the frontend, follow these steps: - `yarn install` to install the dependencies - `yarn start` to run the frontend locally -## Fix Line Endings for Windows Development 🛠️ - -If you're developing on Windows and encounter line-ending issues with Prettier, run these commands: - ## Contributing Guidelines 🤝 All code contributions, including those of people having commit access, must go through a pull request and be approved by a core developer before being merged. This is to ensure a proper review of all the code. diff --git a/package.json b/package.json index e5245e75..63450116 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,7 @@ "prepare": "husky install .husky", "test": "yarn run test-jest", "test-jest": "REACT_APP_IS_TEST=true NODE_ENV=test yarn jest --coverage --maxWorkers 2 --no-cache --transformIgnorePatterns \"./svg/\"", - "cypress:run": "npx cypress run", - "fix-line-endings": "git rm --cached -r . && git reset --hard && yarn prettier" + "cypress:run": "npx cypress run" }, "resolutions": { "react-error-overlay": "6.0.9",