v4.6.0

.github/workflows/build.yml

@@ -1,144 +1,151 @@
-name: "Build & Test"
+name: "CI & Deploy"
 
 on:
   push:
   pull_request:
   schedule:
-    - cron: 0 0 * * 0
+    - cron: '0 0 * * 0'
 
 jobs:
-  build:
-    name: Build
+  ci:
+    name: Build, Lint & Test
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '18'
-    - uses: oven-sh/setup-bun@v1
-    - name: Install node dependencies
-      working-directory: app
-      run: bun install
-    - name: Lint
-      working-directory: app
-      run: |
-        bun run typecheck
-        bun run lint
-    - name: Build
-      working-directory: app
-      env:
-        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-      run: |
-        bun run build
-        tar cfJ micropad.tar.xz build/*
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: micropad
-        path: 'app/micropad.tar.xz'
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    needs: [build]
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '18'
-    - uses: oven-sh/setup-bun@v1
-    - uses: actions/download-artifact@v3
-      with:
-        name: micropad
-    - name: Install node dependencies
-      working-directory: app
-      run: |
-        bun install
-        bun run playwright install
-    - name: Run Micropad in background for testing
-      run: |
-        mkdir micropad
-        tar xf micropad.tar.xz -C micropad
-        cd micropad/build
-        python3 -m http.server 3000 &
-    - name: Test
-      working-directory: app
-      run: bun run test
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js and Yarn Cache
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'yarn'
+          cache-dependency-path: app/yarn.lock
+
+      - name: Install node dependencies
+        working-directory: ./app
+        run: yarn install --frozen-lockfile
+
+      - name: Install Playwright Browsers & Dependencies
+        working-directory: ./app
+        run: npx playwright install --with-deps
+
+      - name: Lint
+        working-directory: ./app
+        run: |
+          yarn typecheck
+          yarn lint
+
+      - name: Build
+        working-directory: ./app
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: yarn build
+
+      - name: Run Tests
+        working-directory: ./app
+        # Start the server in the background and then run tests
+        run: |
+          cd build
+          python3 -m http.server 3000 > /dev/null &
+          cd ..
+          yarn test
+
+      - name: Package build artifact
+        working-directory: ./app
+        run: tar cfJ micropad.tar.xz build/
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: micropad
+          path: app/micropad.tar.xz
+          overwrite: true
+
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
     environment:
       name: production
       url: "https://web.getmicropad.com"
-    needs: [build, test]
+    needs: [ci]
     if: github.ref == 'refs/heads/master' && github.repository == 'micropad/Micropad-Core'
     steps:
-    - uses: actions/download-artifact@v3
-      with:
-        name: micropad
-    - run: |
-        mkdir app
-        tar xf micropad.tar.xz -C app
-    - name: Upload files
-      uses: oracle-actions/run-oci-cli-command@v1.1
-      env:
-        OCI_CLI_USER: ${{ secrets.OCI_CLI_USER }}
-        OCI_CLI_TENANCY: ${{ secrets.OCI_CLI_TENANCY }}
-        OCI_CLI_FINGERPRINT: ${{ secrets.OCI_CLI_FINGERPRINT }}
-        OCI_CLI_KEY_CONTENT: ${{ secrets.OCI_CLI_KEY_CONTENT }}
-        OCI_CLI_REGION: ${{ secrets.OCI_CLI_REGION }}
-      with:
-        command: os object sync -bn micropad-js --content-type auto --src-dir app/build
+      - uses: actions/download-artifact@v4
+        with:
+          name: micropad
+
+      - run: |
+          mkdir -p app/build
+          tar xf micropad.tar.xz -C app/build
+
+      - name: Upload files
+        uses: oracle-actions/run-oci-cli-command@v1.1
+        env:
+          OCI_CLI_USER: ${{ secrets.OCI_CLI_USER }}
+          OCI_CLI_TENANCY: ${{ secrets.OCI_CLI_TENANCY }}
+          OCI_CLI_FINGERPRINT: ${{ secrets.OCI_CLI_FINGERPRINT }}
+          OCI_CLI_KEY_CONTENT: ${{ secrets.OCI_CLI_KEY_CONTENT }}
+          OCI_CLI_REGION: ${{ secrets.OCI_CLI_REGION }}
+        with:
+          command: os object sync -bn micropad-js --content-type auto --src-dir app/build
+
   canary-deploy:
     name: Canary Deploy
     runs-on: ubuntu-latest
     environment:
       name: next
       url: "https://next.getmicropad.com"
-    needs: [build, test]
+    needs: [ci]
     if: github.ref == 'refs/heads/next-dev' && github.repository == 'micropad/Micropad-Core'
     steps:
-    - uses: actions/download-artifact@v3
-      with:
-        name: micropad
-    - run: |
-        mkdir app
-        tar xf micropad.tar.xz -C app
-    - name: Upload files
-      uses: oracle-actions/run-oci-cli-command@v1.1
-      env:
-        OCI_CLI_USER: ${{ secrets.OCI_CLI_USER }}
-        OCI_CLI_TENANCY: ${{ secrets.OCI_CLI_TENANCY }}
-        OCI_CLI_FINGERPRINT: ${{ secrets.OCI_CLI_FINGERPRINT }}
-        OCI_CLI_KEY_CONTENT: ${{ secrets.OCI_CLI_KEY_CONTENT }}
-        OCI_CLI_REGION: ${{ secrets.OCI_CLI_REGION }}
-      with:
-        command: os object sync -bn micropad-js-next --content-type auto --src-dir app/build
+      - uses: actions/download-artifact@v4
+        with:
+          name: micropad
+
+      - run: |
+          mkdir -p app/build
+          tar xf micropad.tar.xz -C app/build
+
+      - name: Upload files
+        uses: oracle-actions/run-oci-cli-command@v1.1
+        env:
+          OCI_CLI_USER: ${{ secrets.OCI_CLI_USER }}
+          OCI_CLI_TENANCY: ${{ secrets.OCI_CLI_TENANCY }}
+          OCI_CLI_FINGERPRINT: ${{ secrets.OCI_CLI_FINGERPRINT }}
+          OCI_CLI_KEY_CONTENT: ${{ secrets.OCI_CLI_KEY_CONTENT }}
+          OCI_CLI_REGION: ${{ secrets.OCI_CLI_REGION }}
+        with:
+          command: os object sync -bn micropad-js-next --content-type auto --src-dir app/build
+
   release:
     name: Publish Release on GitHub
     runs-on: ubuntu-latest
-    needs: [build, test]
+    needs: [ci]
     if: github.ref == 'refs/heads/master' && github.event_name != 'schedule'
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-    - name: Get micropad version
-      id: micropad-version
-      working-directory: app
-      run: echo "version=v$(npm pkg get version | sed 's/"//g')" >> $GITHUB_OUTPUT
-    - uses: actions/download-artifact@v3
-      with:
-        name: micropad
-    - uses: dev-drprasad/delete-tag-and-release@v0.2.1
-      with:
-        delete_release: true
-        tag_name: ${{ steps.micropad-version.outputs.version }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        files: micropad.tar.xz
-        tag_name: ${{ steps.micropad-version.outputs.version }}
-        target_commitish: master
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Get micropad version
+        id: micropad-version
+        working-directory: ./app
+        run: echo "version=v$(npm pkg get version | sed 's/\"//g')" >> $GITHUB_OUTPUT
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: micropad
+
+      - name: Delete existing tag and release
+        uses: dev-drprasad/delete-tag-and-release@v0.2.1
+        with:
+          delete_release: true
+          tag_name: ${{ steps.micropad-version.outputs.version }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: micropad.tar.xz
+          tag_name: ${{ steps.micropad-version.outputs.version }}
+          target_commitish: master

app/.run/build.run.xml → .run/build.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="build" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json" />
+    <package-json value="$PROJECT_DIR$/app/package.json" />
     <command value="run" />
     <scripts>
       <script value="build" />

app/.run/lint.run.xml → .run/lint.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="lint" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json" />
+    <package-json value="$PROJECT_DIR$/app/package.json" />
     <command value="run" />
     <scripts>
       <script value="lint" />

app/.run/start.run.xml → .run/start.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="start" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json" />
+    <package-json value="$PROJECT_DIR$/app/package.json" />
     <command value="run" />
     <scripts>
       <script value="start" />

app/.run/typecheck.run.xml → .run/typecheck.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="typecheck" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json" />
+    <package-json value="$PROJECT_DIR$/app/package.json" />
     <command value="run" />
     <scripts>
       <script value="typecheck" />

app/.run/typecheck_watch.run.xml → .run/typecheck_watch.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="typecheck:watch" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json" />
+    <package-json value="$PROJECT_DIR$/app/package.json" />
     <command value="run" />
     <scripts>
       <script value="typecheck:watch" />

README.md

@@ -8,22 +8,22 @@ There are a couple [GitHub Project boards](https://github.com/orgs/MicroPad/proj
 
 ## Building MicroPad
 You will need the following:  
-- [Bun](https://bun.sh/)
+- [Yarn](https://classic.yarnpkg.com/lang/en/) classic
 - [Node.js](https://nodejs.org/en/)
 - [Python 3](https://www.python.org/)
 
 ### Installing dependencies
 ```bash
 git clone https://github.com/MicroPad/MicroPad-Core.git micropad-core
 cd micropad-core/app
-bun install
+yarn install
 ```
 
 ### Running a dev server
 ```bash
-bun run start
+yarn typecheck:watch & yarn start
 ```
 ### Building for production
 ```bash
-bun run build
+yarn build
 ```

app/_build/build.mts

@@ -9,7 +9,7 @@ import servor from 'servor';
 import { getUserAgentRegex } from 'browserslist-useragent-regexp';
 import { createHash } from 'crypto';
 import { sentryEsbuildPlugin } from '@sentry/esbuild-plugin';
-import packageJson from '../package.json' assert { type: 'json' };
+import packageJson from '../package.json' with { type: 'json' };
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 

app/eslint.config.ts

@@ -15,7 +15,6 @@ const config: Linter.Config[] = [
 		},
 		settings: {
 			react: {
-				...react.configs.recommended.settings,
 				version: 'detect'
 			}
 		},