Skip to content
This repository was archived by the owner on Jan 17, 2025. It is now read-only.

Commit 45fda9c

Browse files
authored
Merge pull request #27 from itsMapleLeaf/01-31-overhaul
2 parents 8bd4086 + 4a79d78 commit 45fda9c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2066
-3336
lines changed

.eslintrc.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/actions/pnpm-install-cached/action.yml renamed to .github/actions/setup-pnpm/action.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@ description: Setup pnpm and install dependencies, caches node_modules
33
runs:
44
using: composite
55
steps:
6-
- uses: actions/cache@v3
6+
- name: Cache node_modules
7+
uses: actions/cache@v3
78
with:
89
path: node_modules
910
key: ${{ runner.os }}-node-${{ hashFiles('**/pnpm-lock.yaml') }}
10-
- uses: pnpm/action-setup@v2
11+
- name: Setup pnpm
12+
uses: pnpm/action-setup@v2
1113
with:
1214
version: 8
13-
- uses: actions/setup-node@v3
15+
- name: Setup Node.js
16+
uses: actions/setup-node@v3
1417
with:
1518
node-version: "lts/*"
1619
cache: "pnpm"
17-
- shell: bash
18-
run: pnpm install --frozen-lockfile
20+
- name: Install dependencies
21+
shell: bash
22+
run: pnpm install --no-frozen-lockfile

.github/workflows/checks.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: checks
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
types: [opened, synchronize, reopened]
8+
branches: [main]
9+
workflow_dispatch:
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
env:
16+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
17+
18+
jobs:
19+
# test:
20+
# strategy:
21+
# fail-fast: false
22+
# matrix:
23+
# os: [ubuntu-latest, windows-latest, macos-latest]
24+
# name: test (${{ matrix.os }})
25+
# runs-on: ${{ matrix.os }}
26+
# steps:
27+
# - name: Checkout
28+
# uses: actions/checkout@v3
29+
30+
# - name: Setup pnpm
31+
# uses: ./.github/actions/setup-pnpm
32+
33+
# - name: Run tests with xvfb
34+
# uses: coactions/setup-xvfb@v1
35+
# with:
36+
# run: pnpm test
37+
38+
lint:
39+
name: ${{ matrix.script }}
40+
strategy:
41+
fail-fast: false
42+
matrix:
43+
script: [lint, typecheck, knip]
44+
runs-on: ubuntu-latest
45+
steps:
46+
- name: Checkout
47+
uses: actions/checkout@v3
48+
49+
- name: Setup pnpm
50+
uses: ./.github/actions/setup-pnpm
51+
52+
- name: Build
53+
if: ${{ matrix.script == 'typecheck' }}
54+
run: pnpm run build
55+
56+
- name: Run ${{ matrix.script }}
57+
run: pnpm run ${{ matrix.script }}
58+
59+
format:
60+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
61+
runs-on: ubuntu-latest
62+
steps:
63+
- name: Checkout
64+
uses: actions/checkout@v3
65+
66+
- name: Setup pnpm
67+
uses: ./.github/actions/setup-pnpm
68+
69+
- name: Format
70+
run: pnpm run format
71+
72+
- name: Commit changes
73+
if: ${{ always() }}
74+
uses: stefanzweifel/git-auto-commit-action@v5

.github/workflows/test.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
node_modules
2-
.cache
32
build
3+
public/build
44
dist
5-
.env
6-
.vscode
7-
*.tsbuildinfo

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
ignore-workspace-root-check = true
2+
prefer-workspace-packages = true

.prettierignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"typescript.tsdk": "node_modules\\typescript\\lib",
3+
"[javascript]": {
4+
"editor.defaultFormatter": "biomejs.biome"
5+
},
6+
"[json]": {
7+
"editor.defaultFormatter": "biomejs.biome"
8+
},
9+
"[jsonc]": {
10+
"editor.defaultFormatter": "biomejs.biome"
11+
},
12+
"[javascriptreact]": {
13+
"editor.defaultFormatter": "biomejs.biome"
14+
},
15+
"[typescript]": {
16+
"editor.defaultFormatter": "biomejs.biome"
17+
},
18+
"[typescriptreact]": {
19+
"editor.defaultFormatter": "biomejs.biome"
20+
},
21+
"editor.codeActionsOnSave": {
22+
"source.organizeImports": "never",
23+
"source.organizeImports.biome": "explicit",
24+
"quickfix.biome": "explicit"
25+
}
26+
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Electron integration for Remix
99
Use degit to create a new project from the template.
1010

1111
```sh
12-
npx degit itsMapleLeaf/remix-electron/template my-desktop-app
12+
npx degit itsMapleLeaf/remix-electron/workspaces/template my-desktop-app
1313
```
1414

1515
### Adding to an existing Remix project

biome.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
3+
"organizeImports": {
4+
"enabled": true
5+
},
6+
"linter": {
7+
"enabled": true,
8+
"rules": {
9+
"recommended": true,
10+
"nursery": {
11+
"noUnusedImports": "error",
12+
"useImportType": "error"
13+
}
14+
}
15+
},
16+
"vcs": {
17+
"enabled": true,
18+
"clientKind": "git",
19+
"useIgnoreFile": true
20+
},
21+
"javascript": {
22+
"formatter": {
23+
"semicolons": "asNeeded"
24+
}
25+
}
26+
}

0 commit comments

Comments
 (0)