moving from yarn to bun for package management (and package managemen…

…t only)
MicroPad · Oct 21, 2023 · e7004e1 · e7004e1
1 parent babd2fe
commit e7004e1
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 1,477 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,13 @@ 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
+      run: bun install
     - name: Run Micropad in background for testing
       run: |
         mkdir micropad
@@ -86,8 +62,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/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/bun.lockb b/app/bun.lockb
diff --git a/app/package.json b/app/package.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/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/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';