From bdc0c5630962dcd2d21eeffe7dd6a7a15f20a1b5 Mon Sep 17 00:00:00 2001 From: sayomaki Date: Wed, 5 Mar 2025 11:26:10 +0800 Subject: [PATCH 1/7] Remove gl dependency override (no longer required) --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index dcffc10b68..b56d31000b 100644 --- a/package.json +++ b/package.json @@ -167,9 +167,6 @@ "url": "^0.11.1", "webpack-bundle-analyzer": "^4.9.0" }, - "resolutions": { - "gl": "^8.0.2" - }, "browserslist": { "production": [ "Firefox ESR", From ddbeb6dd38bdd65dc88dcdc625ebed79a530d1a7 Mon Sep 17 00:00:00 2001 From: sayomaki Date: Wed, 5 Mar 2025 11:26:41 +0800 Subject: [PATCH 2/7] Update setup instructions in README --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d2f81f9876..59bff9ac7b 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,12 @@ The Source Academy () is an immersive online experie 1. Install the version of Node.js as specified in the `.node-version` file -1. Install Python (known working versions: `2.7`, `3.8`, `3.9`, `3.10`) – **Note: Python `3.11` does not work** - 1. Clone this repository and navigate to it using your command line -1. Install the version of `yarn` as specified in `package.json`, `packageManager`. On macos, you may need to run `corepack enable`. +1. Install the version of `yarn` as specified in `package.json`, `packageManager`. + + > [!TIP] + > We recommend using `corepack` to manage the version of `yarn`, you may simply run `corepack enable` to complete this step. 1. Run `yarn install` to install dependencies. From 1d34ba78ffcbe2082751dc1110ed5443ee822a4c Mon Sep 17 00:00:00 2001 From: Martin Henz Date: Wed, 5 Mar 2025 11:21:50 +0800 Subject: [PATCH 3/7] Delete .tool-versions --- .tool-versions | 1 - 1 file changed, 1 deletion(-) delete mode 100755 .tool-versions diff --git a/.tool-versions b/.tool-versions deleted file mode 100755 index 1a3e61bfce..0000000000 --- a/.tool-versions +++ /dev/null @@ -1 +0,0 @@ -nodejs v20.18.1 From 7e4a05d748ef1a9a9543ac4e8581c963c97a227e Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Wed, 5 Mar 2025 11:36:21 +0800 Subject: [PATCH 4/7] Update gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 6b97509b46..6b978f6dc9 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,6 @@ yarn-error.log #!.yarn/cache .pnp.* + +# We use .node-version +/.tool-versions From d1de30810bdc4dcf718b764ce155e1587e1685a5 Mon Sep 17 00:00:00 2001 From: sayomaki Date: Wed, 5 Mar 2025 11:36:46 +0800 Subject: [PATCH 5/7] Fix missing newline --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59bff9ac7b..24ef65e52c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The Source Academy () is an immersive online experie 1. Install the version of `yarn` as specified in `package.json`, `packageManager`. - > [!TIP] + > [!TIP] > We recommend using `corepack` to manage the version of `yarn`, you may simply run `corepack enable` to complete this step. 1. Run `yarn install` to install dependencies. From 23ff9f47a6b834870f5a4fad57fc9cf0ae533b5a Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Wed, 5 Mar 2025 11:40:35 +0800 Subject: [PATCH 6/7] Commit editor settings --- .gitignore | 2 -- .vscode/settings.json | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 6b978f6dc9..2b3388daf5 100644 --- a/.gitignore +++ b/.gitignore @@ -24,8 +24,6 @@ terraform* .env.test.local .env.production.local .idea/ -.vscode/ -cadet-frontend.iml npm-debug.log* .eslintcache diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..1f849d81a0 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "editor.defaultFormatter": "esbenp.prettier-vscode", + "eslint.useFlatConfig": true, + "files.insertFinalNewline": true, + "liveServer.settings.file": "/index.html", + "liveServer.settings.NoBrowser": true, + "liveServer.settings.root": "/build" +} From d3a337f1039f0565933d57a21be5f0686fd5ba37 Mon Sep 17 00:00:00 2001 From: sayomaki Date: Wed, 5 Mar 2025 11:40:43 +0800 Subject: [PATCH 7/7] Revert back to normal blockquote * Alerts are not supported in nested elements yet --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 24ef65e52c..16ebdfb83d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ The Source Academy () is an immersive online experie 1. Install the version of `yarn` as specified in `package.json`, `packageManager`. - > [!TIP] > We recommend using `corepack` to manage the version of `yarn`, you may simply run `corepack enable` to complete this step. 1. Run `yarn install` to install dependencies.