Merge pull request #9 from Unknown15082/stot

Merge source-academy/modules into Unknown15082/modules

Author: press-stuart

.github/workflows/pages-deploy.yml

@@ -13,30 +13,27 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
+
+      - name: Enable Corepack
+        run: corepack enable
 
       - name: Use Node.js 💻
         uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: yarn
 
-      - name: Install dependencies (apt)
-        run: |
-          sudo apt-get update && \
-          sudo apt-get install -y --no-install-recommends libxi-dev libgl1-mesa-dev
-      
       - name: Install Dependencies 📦
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Build Modules 🔧
         run: yarn build --tsc --lint
 
-      
       - name: include java json
         run: cp -r src/java build
 
       - name: Deploy 🚀
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }} 
           publish_dir: ./build # The folder the action should deploy.

.github/workflows/pull-request.yml

@@ -13,20 +13,18 @@ jobs:
           uses: actions/checkout@v4
           with:
             submodules: recursive
+
+        - name: Enable Corepack
+          run: corepack enable
 
         - name: Use Node.js 💻
           uses: actions/setup-node@v4
           with:
             node-version: 20
             cache: yarn
 
-        - name: Install dependencies (apt)
-          run: |
-            sudo apt-get update && \
-            sudo apt-get install -y --no-install-recommends libxi-dev libgl1-mesa-dev
-
         - name: Install dependencies
-          run: yarn install --frozen-lockfile
+          run: yarn install --immutable
 
         - name: Build bundles and tabs
           run: yarn build --tsc --lint

.gitignore

@@ -4,11 +4,9 @@
 node_modules/
 devserver/node_modules
 build/*
-/package-lock.json
 coverage/
 
-scripts/build/database.json
-scripts/bin.js
+scripts/dist
 
 # Compiled source #
 ###################

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "src/java/java-packages"]
 	path = src/java/java-packages
-	url = https://github.com/source-academy/java-packages
+	url = ../../source-academy/java-packages.git

.husky/post-checkout

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 yarn yarnhook

.husky/post-merge

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 yarn yarnhook

.husky/post-rewrite

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 yarn yarnhook

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 yarn test --color

.husky/pre-push

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 yarn build --lint --tsc