Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Node.js version and add Zed as editor #27

Merged
merged 4 commits into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20.14.0
- name: Install dependencies
run: npm install
- name: Build
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20.14.0
- name: Install dependencies
run: npm install
- name: Build
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20.14.0
- name: Install dependencies
run: npm install
- name: Build
Expand All @@ -57,10 +57,10 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20.14.0
- name: Install dependencies
run: npm install
- name: Build
run: |
npx electron-forge make --platform=darwin
npx electron-forge publish --platform=darwin
npx electron-forge make --platform=darwin --arch=universal
npx electron-forge publish --platform=darwin --arch=universal
2 changes: 1 addition & 1 deletion .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20.14.0
- name: Install dependencies
run: npm install
- name: Configure git
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
node_modules
!dist/assets
dist
.DS_Store

out/
out/
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18.16.1
nodejs 20.14.0
174 changes: 115 additions & 59 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/constants/detections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ enum EDITORS {
NOTEPAD_PLUS_PLUS = 'Notepad++',
NOTEPAD = 'Notepad',
XCODE = 'Xcode',
ZED = 'Zed',
}

enum TERMINALS {
Expand Down
16 changes: 16 additions & 0 deletions src/services/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,22 @@ export const editorList: Settings[] = [
}),
enableCommonPathCheck: false, // Checking for binary is enough
},
{
name: 'Zed',
binary: 'zed',
enableBinaryCheck: true,
enableCommonPathCheck: false,
commonFilepaths: Platform.select({
darwin: ['/Applications/Zed.app'],
linux: ['/usr/bin/zed'],
win32: null, // Not available
}),
command: Platform.select({
darwin: 'zed',
linux: 'zed',
win32: null, // Not available
}),
},
{
name: 'Sublime Text',
command: 'subl',
Expand Down
Loading