v4.6.0

.github/workflows/build.yml

@@ -15,22 +15,34 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-node@v3
       with:
-        node-version: '18'
-    - uses: oven-sh/setup-bun@v1
+        node-version: '22'
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      working-directory: app
+      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+    - name: Cache Yarn Packages
+      id: yarn-cache
+      uses: actions/cache@v3
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: yarn-cache-folder-${{ hashFiles('app/yarn.lock', 'app/.yarnrc.yml') }}
+        restore-keys: |
+          yarn-cache-folder-
     - name: Install node dependencies
       working-directory: app
-      run: bun install
+      run: |
+        yarn
     - name: Lint
       working-directory: app
       run: |
-        bun run typecheck
-        bun run lint
+        yarn typecheck
+        yarn lint
     - name: Build
       working-directory: app
       env:
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       run: |
-        bun run build
+        yarn build
         tar cfJ micropad.tar.xz build/*
     - name: Upload artifact
       uses: actions/upload-artifact@v3
@@ -46,16 +58,26 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-node@v3
       with:
-        node-version: '18'
-    - uses: oven-sh/setup-bun@v1
-    - uses: actions/download-artifact@v3
+        node-version: '22'
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      working-directory: app
+      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+    - name: Cache Yarn Packages
+      id: yarn-cache
+      uses: actions/cache@v3
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: yarn-cache-folder-${{ hashFiles('app/yarn.lock', 'app/.yarnrc.yml') }}
+        restore-keys: |
+          yarn-cache-folder-
+    - uses: actions/download-artifact@v4
       with:
         name: micropad
     - name: Install node dependencies
       working-directory: app
       run: |
-        bun install
-        bun run playwright install
+        yarn
     - name: Run Micropad in background for testing
       run: |
         mkdir micropad
@@ -64,7 +86,8 @@ jobs:
         python3 -m http.server 3000 &
     - name: Test
       working-directory: app
-      run: bun run test
+      run: |
+        yarn test
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
@@ -74,7 +97,7 @@ jobs:
     needs: [build, test]
     if: github.ref == 'refs/heads/master' && github.repository == 'micropad/Micropad-Core'
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: micropad
     - run: |
@@ -99,7 +122,7 @@ jobs:
     needs: [build, test]
     if: github.ref == 'refs/heads/next-dev' && github.repository == 'micropad/Micropad-Core'
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: micropad
     - run: |
@@ -127,7 +150,7 @@ jobs:
       id: micropad-version
       working-directory: app
       run: echo "version=v$(npm pkg get version | sed 's/"//g')" >> $GITHUB_OUTPUT
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: micropad
     - uses: dev-drprasad/delete-tag-and-release@v0.2.1

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'
 			}
 		},

app/package.json

@@ -1,16 +1,16 @@
 {
   "name": "micropad",
-  "version": "4.5.2",
+  "version": "4.6.0",
   "private": true,
   "scripts": {
     "preinstall": "python3 ../libs/build-libs.py && ./get_precache_files.py > src/extraPrecacheFiles.ts",
-    "prestart": "tsc -p _build/tsconfig.json",
+    "prestart": "tsgo -p _build/tsconfig.json",
     "start": "NODE_ENV='' node --experimental-import-meta-resolve _build/build.mjs",
-    "prebuild": "tsc -p _build/tsconfig.json",
+    "prebuild": "tsgo -p _build/tsconfig.json",
     "build": "NODE_ENV=production node --experimental-import-meta-resolve _build/build.mjs",
     "test": "TZ=NZ jest",
-    "typecheck": "tsc --noEmit --p ./tsconfig.json",
-    "typecheck:watch": "tsc --noEmit --watch -p ./tsconfig.json",
+    "typecheck": "tsgo --noEmit --p ./tsconfig.json",
+    "typecheck:watch": "tsgo --noEmit --watch -p ./tsconfig.json",
     "lint": "eslint --flag unstable_ts_config src/",
     "lint:fix": "eslint --flag unstable_ts_config --fix src/"
   },
@@ -66,63 +66,6 @@
     "workbox-routing": "^6.6.1",
     "workbox-strategies": "^6.6.1"
   },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "plugin:jest-playwright/recommended"
-    ],
-    "ignorePatterns": [
-      "*.js"
-    ],
-    "overrides": [
-      {
-        "files": [
-          "**/*.ts?(x)"
-        ],
-        "rules": {
-          "@typescript-eslint/no-use-before-define": "off",
-          "eqeqeq": [
-            "error",
-            "smart"
-          ],
-          "no-multi-spaces": "error",
-          "array-bracket-spacing": [
-            "error",
-            "never"
-          ],
-          "object-curly-spacing": [
-            "error",
-            "always"
-          ],
-          "key-spacing": "error",
-          "@typescript-eslint/prefer-ts-expect-error": "warn",
-          "no-debugger": "error",
-          "quotes": [
-            "error",
-            "single",
-            {
-              "allowTemplateLiterals": true
-            }
-          ],
-          "jsx-quotes": [
-            "error",
-            "prefer-double"
-          ],
-          "no-script-url": "error",
-          "no-eval": "error",
-          "no-console": [
-            "error",
-            {
-              "allow": [
-                "warn",
-                "error"
-              ]
-            }
-          ]
-        }
-      }
-    ]
-  },
   "browserslist": {
     "production": [
       "chrome >= 84",
@@ -154,7 +97,7 @@
     "@types/json-stringify-safe": "^5.0.3",
     "@types/mousetrap": "^1.6.15",
     "@types/node": "^18.19.44",
-    "@types/react": "^17.0.80",
+    "@types/react": "^17",
     "@types/react-dom": "^17.0.25",
     "@types/semver": "^7.5.8",
     "@types/showdown": "^1.9.4",
@@ -166,6 +109,7 @@
     "eslint": "^9.9.0",
     "eslint-plugin-react": "^7.35.0",
     "expect-playwright": "^0.8.0",
+    "globals": "^16.0.0",
     "html-minifier": "^4.0.0",
     "jest": "^27.5.1",
     "jest-circus": "^27.5.1",
@@ -174,12 +118,13 @@
     "jest-junit": "^13.2.0",
     "jest-playwright-preset": "^1.7.2",
     "jest-runner": "^27.5.1",
-    "jiti": "^1.21.6",
+    "jiti": "^2.4.2",
     "playwright": "^1.46.0",
     "servor": "^4.0.2",
     "ts-jest": "^27.1.5",
     "typescript-eslint": "^8.1.0",
-    "workbox-build": "^6.6.1"
+    "workbox-build": "^6.6.1",
+	"@typescript/native-preview": "7.0.0-dev.20250809.1"
   },
   "resolutions": {
     "@types/react": "^17",

app/src/app/ThemeValues.ts

@@ -41,6 +41,23 @@ export const ThemeValues: { [K in ThemeName]: ITheme } = {
 			element: elementInstructionsDark
 		}
 	},
+	Gruvbox: {
+		background: '#282828',
+		accent: '#928374',
+		chrome: '#3c3836',
+		text: '#ebdbb2',
+		links: '#ebdbb2',
+		linkUnderline: true,
+		explorerContent: '#ebdbb2',
+		accentContent: '#ebdbb2',
+		backgroundImage: filledBackground,
+		drawingBackground: '#ffffff15',
+		instructionImages: {
+			notepad: instructionImageDark,
+			note: noteInstructionsDark,
+			element: elementInstructionsDark
+		}
+	},
 	Midnight: {
 		background: '#212121',
 		accent: '#424242',

app/src/app/components/note-viewer/elements/drawing/DrawingElementComponent.tsx

@@ -155,9 +155,7 @@ export default class DrawingElementComponent extends React.Component<Props> {
 
 		const canvasElement = this.canvasElement;
 		if (!!canvasElement) {
-
-			this.initCanvas();
-
+			setTimeout(() => this.initCanvas(), 0);
 			const isNewEditor = this.props.elementEditing !== prevProps?.elementEditing;
 			if (isNewEditor) {
 				// Restore saved image to canvas

app/src/app/components/note-viewer/elements/markdown/MarkdownViewerHtml.tsx

@@ -1,5 +1,6 @@
 // @ts-expect-error TS2306
 import MathJax from '../../../../assets/MathJax.raw.js';
+// @ts-expect-error not a module
 import hljs from '../../../../assets/highlight.js/highlight.min.raw.js';
 // @ts-expect-error TS2307
 import hljsCss from '../../../../assets/highlight.js/default.raw.css';
@@ -52,7 +53,7 @@ export const getHtml = (id: string, theme: ITheme, fontSize: string = '16px'): s
 
 		a {
 			color: ${theme.links};
-			text-decoration: none;
+			text-decoration: ${theme.linkUnderline ? 'underline' : 'none'};
 		}
 
 		h1, h2, h3, h4, h5, h6 {

app/src/app/reducers/AppReducer.ts

@@ -52,7 +52,7 @@ export class AppReducer extends AbstractReducer<IAppStoreState> {
 		defaultFontSize: '16px',
 		zoom: 1,
 		showHelp: true,
-		theme: 'Classic',
+		theme: 'Pastel',
 		explorerWidth: '270px',
 		cursorPos: { x: 0, y: 0 },
 		hasEncryptedNotebooks: {

app/src/app/root.tsx

@@ -9,6 +9,7 @@ import './root.css';
 import './ScrollbarPatch.css';
 /* Themes */
 import './theme-styles/Solarized.css';
+import './theme-styles/Gruvbox.css';
 import './theme-styles/Midnight.css';
 import './theme-styles/Void.css';
 import './theme-styles/Wellington.css';

app/src/app/services/FendService.ts

@@ -1,7 +1,7 @@
 import { Observable, of, shareReplay } from 'rxjs';
 import { ajax } from 'rxjs/ajax';
 import { catchError, map } from 'rxjs/operators';
-import { initialise, initialiseWithHandlers } from 'fend-wasm-web';
+import { initialiseWithHandlers } from 'fend-wasm-web';
 
 export const START_FEND$: Observable<void> = ajax<string>({
 	url: 'https://getmicropad.com/cors-proxy/moolah.xml',
@@ -26,7 +26,8 @@ export const START_FEND$: Observable<void> = ajax<string>({
 	map(currencyData => initialiseWithHandlers(currencyData)),
 	catchError(err => {
 		console.error('Caught an error getting currencies for fend', err);
-		return of(initialise());
+		initialiseWithHandlers(new Map());
+		return of(void 0);
 	}),
 	shareReplay(1)
 );