diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8bd23c..161da10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,12 +31,17 @@ jobs: with: workspaces: './src-tauri -> target' - - name: Setup bun - uses: oven-sh/setup-bun@v1 + - name: Setup Node + uses: actions/setup-node@v4 + with: + # Version Spec of the version to use in SemVer notation. + # It also emits such aliases as lts, latest, nightly and canary builds + # Examples: 12.x, 10.15.1, >=10.15.0, lts/Hydrogen, 16-nightly, latest, node + node-version: 'lts' - name: Install frontend dependencies # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too. - run: bun i # Change this to npm, yarn or pnpm. + run: npm install # Change this to npm, yarn or pnpm. - name: Build the app uses: tauri-apps/tauri-action@v0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..62c9f23 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,29 @@ +name: Test +on: [pull_request] + +jobs: + test-tauri: + strategy: + fail-fast: false + matrix: + platform: [macos-latest, ubuntu-20.04, windows-latest] + + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v4 + - name: setup node + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: install Rust stable + uses: dtolnay/rust-toolchain@stable + - name: install dependencies (ubuntu only) + if: matrix.platform == 'ubuntu-20.04' + run: | + sudo apt-get update + sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf + - name: install frontend dependencies + run: npm install # change this to npm or pnpm depending on which one you use + - uses: tauri-apps/tauri-action@v0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index d4a671e..03cc442 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Marker is a minimalist web editor based on [Monaco Editor](https://microsoft.git * Good for casual users, good for power users * Best default settings * Easy to learn keyboard shortcuts +* Supported on Linux, MacOS and Windows ## 🌐 Languages diff --git a/docs/CNAME b/docs/CNAME deleted file mode 100644 index d5f9906..0000000 --- a/docs/CNAME +++ /dev/null @@ -1 +0,0 @@ -marker.angelmario.eu \ No newline at end of file diff --git a/docs/index.html b/docs/index.html deleted file mode 100644 index c31dcce..0000000 --- a/docs/index.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Welcome - - diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 57b4f5f..cea8bc4 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/schema.json", "build": { - "beforeBuildCommand": "bun run build", + "beforeBuildCommand": "npm run build", "beforeDevCommand": "bun dev", "devPath": "http://localhost:5173", "distDir": "../dist" diff --git a/src/app.css b/src/app.css index 0307caf..3a2d9e1 100644 --- a/src/app.css +++ b/src/app.css @@ -75,19 +75,3 @@ html, body, #app { font-size: 12px; transition: opacity 1s ease-out; } - -/* Unsupported device or browser notice */ -#unsupported { - font-family: "Fira Code"; - height: 100%; - color: var(--vscode-editor-foreground); -} - -#unsupported > div { - display: flex; - flex-flow: column; - justify-content: center; - align-items: center; - text-align: center; - height: 100%; -} \ No newline at end of file