Fix a buildtools gitignore?

Author: leeyi45

.github/actions/package.json

@@ -3,8 +3,8 @@
   "private": true,
   "type": "module",
   "devDependencies": {
-    "@types/node": "^22.15.30",
     "@sourceacademy/modules-repotools": "workspace:^",
+    "@types/node": "^22.15.30",
     "typescript": "^5.8.2"
   },
   "dependencies": {

.github/workflows/new-workflow.yml

@@ -9,8 +9,8 @@ on:
       - master
 
 jobs:
-  setup-repo:
-    name: Setup Repository Tooling
+  setup-repotools:
+    name: Setup Repotools package
     runs-on: ubuntu-latest
 
     steps:
@@ -47,30 +47,9 @@ jobs:
           path: ./lib/repotools/dist
           key: repotools
 
-      - name: Install Buildtools Dependencies
-        run: yarn workspaces focus @sourceacademy/modules-buildtools
-      
-      - name: Check cache for buildtools
-        uses: actions/cache/restore@v4
-        id: cache-buildtools
-        with:
-          path: ./lib/buildtools/bin/index.js
-          key: buildtools
-      
-      - name: Build Buildtools
-        if: steps.cache-buildtools.outputs.cache-hit != 'true'
-        run: yarn workspaces foreach -A --include @sourceacademy/modules-buildtools run build
-
-      - name: Cache Buildtools
-        if: steps.cache-repotools.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: ./lib/buildtools/bin/index.js
-          key: buildtools
-
   find-packages:
     name: Determine the packages present in the repo for the given type
-    needs: setup-repo
+    needs: setup-repotools
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -103,46 +82,83 @@ jobs:
         with:
           type: ${{ matrix.type }}
 
-  test-libs:
-    name: Test and Typecheck libraries
+  build-libs:
+    name: Build and compile the libraries
     runs-on: ubuntu-latest
     needs: find-packages
     strategy:
       matrix:
-        package: ${{ fromJson(needs.find-packages.outputs.tabs) }}
-    
-    steps:
-      - name: Check out source code
-        uses: actions/checkout@v4
-
-      - name: Enable Corepack
-        run: corepack enable
+        package: ${{ fromJSON(needs.find-packages.outputs.libs )}}
 
-      - name: Use Node.js 💻
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .node-version
-          cache: yarn
+    defaults:
+      run:
+        working-directory: ${{ matrix.package.directory }}
 
+    steps:
       - name: Install dependencies
         run: yarn workspaces focus ${{ matrix.package.name }}
 
-      - name: Restore repotools
+      - name: Check cache
         uses: actions/cache/restore@v4
+        id: cache
         with:
-          path: ./lib/repotools/dist
-          key: repotools
+          path: ${{ matrix.package.directory }}/dist
+          key: ${{ matrix.package.name }}
 
-      - name: tsc and test
-        run: |
-          cd ${{ matrix.package.directory }}
-          yarn tsc
-          yarn test
+      - name: Build ${{ matrix.package.name }}
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: yarn build
+
+      - name: Store in Cache
+        if: steps.cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ matrix.package.directory }}/dist
+          key: ${{ matrix.package.name }}
+
+  # test-libs:
+  #   name: Test and Typecheck libraries
+  #   runs-on: ubuntu-latest
+  #   needs: find-packages
+  #   strategy:
+  #     matrix:
+  #       package: ${{ fromJson(needs.find-packages.outputs.tabs) }}
+    
+  #   steps:
+  #     - name: Check out source code
+  #       uses: actions/checkout@v4
+
+  #     - name: Enable Corepack
+  #       run: corepack enable
+
+  #     - name: Use Node.js 💻
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version-file: .node-version
+  #         cache: yarn
+
+  #     - name: Install dependencies
+  #       run: yarn workspaces focus ${{ matrix.package.name }}
+
+  #     - name: Restore repotools
+  #       uses: actions/cache/restore@v4
+  #       with:
+  #         path: ./lib/repotools/dist
+  #         key: repotools
+
+  #     - name: tsc and test
+  #       run: |
+  #         cd ${{ matrix.package.directory }}
+  #         yarn tsc
+  #         yarn test
 
   test-tabs:
     name: Test and Typecheck tabs
     runs-on: ubuntu-latest
-    needs: find-packages
+    needs: 
+      - build-libs
+      - find-packages
+
     strategy:
       fail-fast: false
       matrix:
@@ -178,13 +194,13 @@ jobs:
       - name: Restore buildtools
         uses: actions/cache/restore@v4
         with:
-          key: buildtools
-          path: ./lib/buildtools/bin/index.js
+          key: "@sourceacademy/modules-buildtools"
+          path: ./lib/buildtools/dist
 
       - name: Restore repotools
         uses: actions/cache/restore@v4
         with:
-          key: repotools
+          key: "@sourceacademy/modules-repotools"
           path: ./lib/repotools/dist
 
       - name: Install dependencies

lib/buildtools/.gitignore

@@ -1 +1,2 @@
-bin/index.js
+!**/dist/**
+**/dist/index.js

lib/buildtools/build.js

@@ -15,7 +15,7 @@ const command = getBuildCommand({
   },
   bundle: true,
   format: 'esm',
-  outfile: './bin/index.js',
+  outfile: './dist/index.js',
   packages: 'external',
   platform: 'node',
   tsconfig: './tsconfig.json',

lib/buildtools/bin/docsreadme.md renamed to lib/buildtools/dist/docsreadme.md

@@ -12,7 +12,7 @@
   },
   "exports": null,
   "bin": {
-    "buildtools": "./bin/index.js"
+    "buildtools": "./dist/index.js"
   },
   "type": "module",
   "dependencies": {

lib/buildtools/bin/templates/bundle/src/index.ts renamed to lib/buildtools/dist/templates/bundle/src/index.ts

@@ -8,7 +8,7 @@
   "extends": "../tsconfig.json",
   "include": ["./src", "vitest.setup.ts", "vitest.d.ts"],
   "exclude": [
-    "./bin",
+    "dist",
     "../__test_mocks__"
   ]
 }