Merge pull request #454 from MicroPad/next-dev

v4.4.0
MicroPad · Oct 21, 2023 · 039a6c8 · 039a6c8
2 parents 1836c55 + cbfc353
commit 039a6c8
Show file tree

Hide file tree

Showing 18 changed files with 95 additions and 14,050 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,33 +16,21 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: '18'
-    - 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: oven-sh/setup-bun@v1
     - name: Install node dependencies
       working-directory: app
-      run: |
-        yarn
+      run: bun install
     - name: Lint
       working-directory: app
       run: |
-        yarn typecheck
-        yarn lint
+        bun run typecheck
+        bun run lint
     - name: Build
       working-directory: app
       env:
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       run: |
-        yarn build
+        bun run build
         tar cfJ micropad.tar.xz build/*
     - name: Upload artifact
       uses: actions/upload-artifact@v3
@@ -59,25 +47,15 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: '18'
-    - 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: oven-sh/setup-bun@v1
     - uses: actions/download-artifact@v3
       with:
         name: micropad
     - name: Install node dependencies
       working-directory: app
       run: |
-        yarn
+        bun install
+        bun run playwright install
     - name: Run Micropad in background for testing
       run: |
         mkdir micropad
@@ -86,8 +64,7 @@ jobs:
         python3 -m http.server 3000 &
     - name: Test
       working-directory: app
-      run: |
-        yarn test
+      run: bun run test
   deploy:
     name: Deploy
     runs-on: ubuntu-latest

diff --git a/README.md b/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:  
-- [Yarn](https://classic.yarnpkg.com/lang/en/) classic
+- [Bun](https://bun.sh/)
 - [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
-yarn
+bun install
 ```
 
 ### Running a dev server
 ```bash
-yarn start
+bun run start
 ```
 ### Building for production
 ```bash
-yarn build
+bun run build
 ```
diff --git a/app/.run/build.run.xml b/app/.run/build.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="build" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/app/.run/lint.run.xml b/app/.run/lint.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lint" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="lint" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/app/.run/start.run.xml b/app/.run/start.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="start" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/app/.run/typecheck_watch.run.xml b/app/.run/typecheck_watch.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="typecheck:watch" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="typecheck:watch" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/app/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/app/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/app/.yarn/releases/yarn-3.5.0.cjs b/app/.yarn/releases/yarn-3.5.0.cjs
diff --git a/app/.yarnrc.yml b/app/.yarnrc.yml
diff --git a/app/_build/build.mts b/app/_build/build.mts
@@ -26,20 +26,23 @@ const esBuildTargets = browserslist().filter(browser => !browser.endsWith('TP'))
 (async () => {
 	process.env.PUBLIC_URL ??= '';
 
+	await copyDir('node_modules/timers-browserify', 'node_modules/timers');
+
 	await rm(OUT_DIR, { recursive: true, force: true });
 	await copyDir('public', OUT_DIR);
 
-	const sentryPlugin = () => sentryEsbuildPlugin({
-		org: "nick-webster",
-		project: "micropad",
-		release: {
-			name: packageJson.version,
-			finalize: false
-		},
-		// Auth tokens can be obtained from https://sentry.io/settings/account/api/auth-tokens/
-		// and need `project:releases` and `org:read` scopes
-		authToken: process.env.SENTRY_AUTH_TOKEN,
-	});
+	// TODO: re-enable when I update esbuild
+	// const sentryPlugin = () => sentryEsbuildPlugin({
+	// 	org: "nick-webster",
+	// 	project: "micropad",
+	// 	release: {
+	// 		name: packageJson.version,
+	// 		finalize: false
+	// 	},
+	// 	// Auth tokens can be obtained from https://sentry.io/settings/account/api/auth-tokens/
+	// 	// and need `project:releases` and `org:read` scopes
+	// 	authToken: process.env.SENTRY_AUTH_TOKEN,
+	// });
 
 	const { metafile: browserCheckMetafile } = await build({
 		entryPoints: ['src/unsupported-page/index.ts'],
@@ -60,7 +63,7 @@ const esBuildTargets = browserslist().filter(browser => !browser.endsWith('TP'))
 			'process.env.PUBLIC_URL': `"${process.env.PUBLIC_URL}"`
 		},
 		assetNames: 'assets/[name].[hash]',
-		plugins: [sentryPlugin()]
+		plugins: []
 	}).catch(() => process.exit(1));
 
 	if (!browserCheckMetafile) throw new Error('Missing metafile');
@@ -101,7 +104,6 @@ const esBuildTargets = browserslist().filter(browser => !browser.endsWith('TP'))
 		},
 		plugins: [
 			esbuildPluginBrowserslist(esBuildTargets),
-			sentryPlugin()
 		],
 	}).catch(() => process.exit(1));
 
@@ -187,7 +189,6 @@ const esBuildTargets = browserslist().filter(browser => !browser.endsWith('TP'))
 		},
 		plugins: [
 			esbuildPluginBrowserslist(esBuildTargets),
-			sentryPlugin()
 		],
 	}).catch(() => process.exit(1));
 
@@ -237,7 +238,6 @@ const esBuildTargets = browserslist().filter(browser => !browser.endsWith('TP'))
 		},
 		plugins: [
 			esbuildPluginBrowserslist(esBuildTargets),
-			sentryPlugin()
 		],
 	}).catch(() => process.exit(1));
 

diff --git a/app/bun.lockb b/app/bun.lockb
diff --git a/app/package.json b/app/package.json
@@ -1,13 +1,13 @@
 {
   "name": "micropad",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "private": true,
   "scripts": {
     "preinstall": "python3 ../libs/build-libs.py && ./get_precache_files.py > src/extraPrecacheFiles.ts",
     "prestart": "tsc -p _build/tsconfig.json",
-    "start": "yarn prestart && NODE_ENV='' node --experimental-import-meta-resolve _build/build.mjs",
+    "start": "NODE_ENV='' node --experimental-import-meta-resolve _build/build.mjs",
     "prebuild": "tsc -p _build/tsconfig.json",
-    "build": "yarn prebuild && NODE_ENV=production node --experimental-import-meta-resolve _build/build.mjs",
+    "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",
@@ -158,9 +158,10 @@
     "babel-eslint": "^10.1.0",
     "browserslist": "^4.21.10",
     "esbuild": "~0.16.17",
-    "esbuild-plugin-browserslist": "~0.7.2",
+    "esbuild-plugin-browserslist": "~0.6.0",
     "esbuild-plugin-manifest": "~0.5.0",
     "eslint": "^8.47.0",
+    "@eslint/eslintrc": "^2.1.2",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.28.0",

diff --git a/app/src/app/actions.ts b/app/src/app/actions.ts
@@ -28,7 +28,6 @@ import { DrawMode } from './reducers/EditorReducer';
 import { AppInfoMessage } from './reducers/AppInfoReducer';
 import { ModalId } from './types/ModalIds';
 import { EncryptionStatus } from './reducers/AppReducer';
-import { hashtagSearchOrJump$ } from './epics/SearchEpics';
 
 export type MicroPadAction = ActionTypes[keyof ActionTypes];
 export type ActionNames = keyof ActionFactories;

diff --git a/app/src/app/assets/Help.npx b/app/src/app/assets/Help.npx
diff --git a/app/src/app/components/note-viewer/elements/markdown/MarkdownElementContainer.ts b/app/src/app/components/note-viewer/elements/markdown/MarkdownElementContainer.ts
@@ -4,9 +4,6 @@ import { IStoreState } from '../../../../types';
 import { actions } from '../../../../actions';
 import { IProgressValues } from './TodoListComponent';
 import { ModalId } from '../../../../types/ModalIds';
-import { store } from '../../../../root';
-import { search } from '../../../../services/SearchService';
-import { SearchResults } from '../../../../reducers/SearchReducer';
 
 export const MD_START_ATTR = 'data-md-start';
 export const MD_END_ATTR = 'data-md-end';

diff --git a/app/src/app/components/note-viewer/elements/markdown/MarkdownViewerHtml.tsx b/app/src/app/components/note-viewer/elements/markdown/MarkdownViewerHtml.tsx
@@ -135,7 +135,7 @@ export const getHtml = (id: string, theme: ITheme, fontSize: string = '16px'): s
 			extensions: ['tex2jax.js', 'asciimath2jax.js'],
 			messageStyle: 'none',
 			tex2jax: {
-				inlineMath: [[';;', ';;'], ['$', '$']],
+				inlineMath: [[';;', ';;']],
 				displayMath: [['$$', '$$']]
 			},
 			asciimath2jax: {

diff --git a/app/src/app/root.tsx b/app/src/app/root.tsx
@@ -19,8 +19,8 @@ import './theme-styles/Purple.css';
 /* JS Imports */
 import React from 'react';
 import 'materialize-css/dist/js/materialize.js';
-import { IStoreState, MICROPAD_URL } from './types';
-import { applyMiddleware, Store } from 'redux';
+import { MICROPAD_URL } from './types';
+import { applyMiddleware } from 'redux';
 import { BaseReducer } from './reducers/BaseReducer';
 import { epicMiddleware } from './epics';
 import localforage from 'localforage';