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

Scrollable tabs #8033

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
48b1564
Create codeql.yml
philip-peterson Nov 22, 2024
5ed18b5
Temporarily disable mac and windows builds
philip-peterson Nov 22, 2024
c758523
rely only on codeql-analysis.yml
philip-peterson Nov 23, 2024
68b1950
empty
philip-peterson Nov 23, 2024
052dbea
Bump @types/node from 18.19.31 to 22.9.2 (#72)
dependabot[bot] Nov 23, 2024
ebd3ac2
Bump ava from 6.1.2 to 6.2.0 (#55)
dependabot[bot] Nov 23, 2024
bd24ae3
Bump typescript-json-schema from 0.63.0 to 0.65.1 (#54)
dependabot[bot] Nov 23, 2024
cfee97c
Tweak ava config (#77)
philip-peterson Nov 23, 2024
0a4badc
Enable Mac as a build target (#78)
philip-peterson Nov 23, 2024
606f739
Moves xterm-* dependencies to @xterm/* dependencies and performs (#5)
philip-peterson Nov 23, 2024
12dd534
empty
philip-peterson Nov 23, 2024
1a4db06
Trigger on all branches
corneliusroemer Aug 24, 2024
bd1adbf
add workflow dispatch
corneliusroemer Aug 24, 2024
ea63068
dev(ci): add `--break-system-packages` to `pip install`
corneliusroemer Aug 24, 2024
4329da9
Exclude windows for now from ci
corneliusroemer Aug 24, 2024
f5d9445
Group dependabots
corneliusroemer Aug 24, 2024
b4662f1
No limit on dependabot
corneliusroemer Aug 24, 2024
2094dd3
On push not pull request, avoid double CI
corneliusroemer Aug 24, 2024
c2b3e7f
Bump actions/upload-artifact from 3 to 4
dependabot[bot] Aug 24, 2024
abcbd21
Bump pguyot/arm-runner-action from 2.5.2 to 2.6.5
dependabot[bot] Aug 24, 2024
fe1bee6
Bump dawidd6/action-download-artifact from 3.1.4 to 6
dependabot[bot] Aug 24, 2024
e529445
Don't run ci on pull request
corneliusroemer Aug 24, 2024
3182070
prefix prs
corneliusroemer Aug 24, 2024
279e61c
Allow 100 open pull requests
corneliusroemer Aug 24, 2024
31efb12
Fix upload artifact name
corneliusroemer Aug 24, 2024
13cb1f7
Increase timeout for ava
corneliusroemer Aug 24, 2024
d08bc77
wait for longer to see if that helps get the image
corneliusroemer Aug 24, 2024
68ecfb4
chore(deps-dev): bump the minorandpatch group with 28 updates
dependabot[bot] Aug 24, 2024
e06dca3
Add resolution "@types/retry: 0.12.5" due to async/retry types being …
corneliusroemer Aug 24, 2024
7b799de
chore(deps): bump the minorandpatch group in /app with 5 updates
dependabot[bot] Aug 24, 2024
e72d212
Bump uuid and @types/uuid
dependabot[bot] Aug 24, 2024
5ebc952
use node 20.17, and .nvmrc
corneliusroemer Aug 24, 2024
2ecaa52
chore(deps-dev): bump @ava/typescript from 4.1.0 to 5.0.0 (#50)
dependabot[bot] Aug 24, 2024
f0a56ec
Bump inquirer from 9.2.18 to 10.1.8 (#36)
dependabot[bot] Aug 24, 2024
0fcc65d
fix types/node
corneliusroemer Aug 24, 2024
3038249
Update .husky, husky install is deprecated
corneliusroemer Aug 24, 2024
a28925c
Bump parse-url from 8.1.0 to 9.2.0 in /app (#9)
dependabot[bot] Aug 24, 2024
ead556e
Use electron 23
corneliusroemer Aug 24, 2024
933a045
Update tsconfig to work correctly
corneliusroemer Aug 25, 2024
f035ddc
Use precommit instead of prepush
corneliusroemer Aug 25, 2024
b25b5ce
chore(deps-dev): bump parse-url from 8.1.0 to 9.2.0 (#53)
dependabot[bot] Aug 25, 2024
0bd5179
Bump the npm_and_yarn group across 2 directories with 4 updates (#56)
dependabot[bot] Aug 25, 2024
9d856f6
Update to electron 26, work around typescript overload issue
corneliusroemer Aug 25, 2024
f63284a
Bump uuid from 9.0.1 to 10.0.0 in /app (#8)
dependabot[bot] Aug 25, 2024
e015176
Update to Electron 27
corneliusroemer Aug 25, 2024
a50f56f
Back to
corneliusroemer Aug 25, 2024
0fba499
Test it works locally
corneliusroemer Aug 25, 2024
a5ca121
Update Electron to 28
corneliusroemer Aug 25, 2024
895b52a
chore(deps-dev): bump the minorandpatch group across 1 directory with…
dependabot[bot] Aug 27, 2024
96259b9
Merge histories with @corneliusroemer's Hyper fork
philip-peterson Nov 23, 2024
c6895a6
Change CI badge to Quine Global (#79)
philip-peterson Nov 23, 2024
b5f2934
Shorten pull_request_template.md (#80)
philip-peterson Nov 23, 2024
d372a8d
chore(deps-dev): bump the minorandpatch group with 30 updates (#83)
dependabot[bot] Nov 23, 2024
62c7d3a
Bump concurrently from 8.2.2 to 9.1.0 (#56)
dependabot[bot] Nov 23, 2024
721414a
Bump version to 4.0.0q-canary.6, switch URL to point to quine fork (#87)
philip-peterson Nov 29, 2024
e735989
initial draft
philip-peterson Sep 2, 2024
0d8d90a
remove forwardRef
philip-peterson Sep 2, 2024
b8140df
formatting
philip-peterson Sep 2, 2024
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
18 changes: 16 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,31 @@ updates:
schedule:
interval: weekly
time: '11:00'
open-pull-requests-limit: 30
target-branch: canary
versioning-strategy: increase
commit-message:
prefix: "chore(deps-dev):"
groups:
minorAndPatch:
update-types:
- "minor"
- "patch"
open-pull-requests-limit: 100
- package-ecosystem: npm
directory: "/app"
schedule:
interval: weekly
time: '11:00'
open-pull-requests-limit: 30
target-branch: canary
versioning-strategy: increase
commit-message:
prefix: "chore(deps):"
groups:
minorAndPatch:
update-types:
- "minor"
- "patch"
open-pull-requests-limit: 100
- package-ecosystem: github-actions
directory: "/"
schedule:
Expand Down
9 changes: 1 addition & 8 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
<!-- Hi there! Thanks for submitting a PR! We're excited to see what you've got for us.

- To help whoever reviews your PR, it'd be extremely helpful for you to list whether your PR is ready to be merged,
If there's anything left to do and if there are any related PRs
- It'd also be extremely helpful to enable us to update your PR incase we need to rebase or what-not by checking `Allow edits from maintainers`
- If your PR changes some API, please make a PR for hyper website too: https://github.com/vercel/hyper-site.

Thanks, again! -->
<!-- Please check `Allow edits from maintainers`. Thanks! -->
4 changes: 2 additions & 2 deletions .github/workflows/e2e_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
WORKFLOW_RUN_INFO: ${{ toJSON(github.event.workflow_run) }}
run: echo "$WORKFLOW_RUN_INFO"
- name: Download Artifacts
uses: dawidd6/action-download-artifact@v3.1.4
uses: dawidd6/action-download-artifact@v6
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
workflow: nodejs.yml
run_id: ${{ github.event.workflow_run.id }}
name: e2e
- name: Get PR number
uses: dawidd6/action-download-artifact@v3.1.4
uses: dawidd6/action-download-artifact@v6
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
workflow: nodejs.yml
Expand Down
27 changes: 16 additions & 11 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ name: Node CI
on:
push:
branches:
- master
- canary
pull_request:
workflow_dispatch:
defaults:
run:
shell: bash
env:
NODE_VERSION: 18.x
NODE_VERSION: 20.x
jobs:
build:
runs-on: ${{matrix.os}}
Expand All @@ -18,7 +16,9 @@ jobs:
os:
- macos-latest
- ubuntu-latest
- windows-latest
- macos-latest
#TODO re-enable these:
#- windows-latest
fail-fast: false
steps:
- name: Checkout
Expand All @@ -28,7 +28,12 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}
- name: Fix node-gyp and Python
run: python3 -m pip install packaging setuptools
run: |
if [[ "$RUNNER_OS" == "macOS" ]]; then
brew install python-setuptools python-packaging
else
python3 -m pip install $EXTRA_ARGS packaging setuptools
fi
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -84,7 +89,7 @@ jobs:
dist/*.exe
- name: Run E2E Tests
if: runner.os != 'Linux'
run: yarn run test:e2e
run: yarn run test:e2e --verbose
- name: Run E2E Tests on Linux
if: runner.os == 'Linux'
uses: GabrielBB/[email protected]
Expand All @@ -93,17 +98,17 @@ jobs:
env:
SHELL: /bin/bash
- name: Archive E2E test screenshot
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: e2e
name: e2e-${{ matrix.os }}-${{ strategy.job-index }}
path: dist/tmp/*.png
- name: Save the pr number in an artifact
if: github.event_name == 'pull_request'
env:
PR_NUM: ${{ github.event.number }}
run: echo $PR_NUM > pr_num.txt
- name: Upload the pr num
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: github.event_name == 'pull_request'
with:
name: pr_num
Expand Down Expand Up @@ -152,7 +157,7 @@ jobs:
- name: Compile
run: yarn run build
- name: rebuild node-pty
uses: pguyot/arm-runner-action@v2.5.2
uses: pguyot/arm-runner-action@v2.6.5
with:
image_additional_mb: 2000
base_image: ${{ matrix.image }}
Expand Down
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarn test
4 changes: 0 additions & 4 deletions .husky/pre-push

This file was deleted.

1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18.18
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
</a>
</p>

[![Node CI](https://github.com/vercel/hyper/workflows/Node%20CI/badge.svg?event=push)](https://github.com/vercel/hyper/actions?query=workflow%3A%22Node+CI%22+branch%3Acanary+event%3Apush)
[![Node CI](https://github.com/quine-global/hyper/actions/workflows/nodejs.yml/badge.svg?event=push)](https://github.com/quine-global/hyper/actions/workflows/nodejs.yml)

[![Changelog #213](https://img.shields.io/badge/changelog-%23213-lightgrey.svg)](https://changelog.com/213)

For more details, head to: https://hyper.is
Expand Down
21 changes: 12 additions & 9 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "hyper",
"productName": "Hyper",
"description": "A terminal built on web technologies",
"version": "4.0.0-canary.5",
"version": "4.0.0q-canary.6",
"license": "MIT",
"author": {
"name": "ZEIT, Inc.",
Expand All @@ -13,7 +13,7 @@
"postinstall": "npx patch-package"
},
"dependencies": {
"@babel/parser": "7.24.4",
"@babel/parser": "7.25.4",
"@electron/remote": "2.1.2",
"ast-types": "^0.16.1",
"async-retry": "1.3.3",
Expand All @@ -29,19 +29,22 @@
"lodash": "4.17.21",
"ms": "2.1.3",
"native-process-working-directory": "^1.0.2",
"node-pty": "1.0.0",
"node-pty": "1.1.0-beta21",
"os-locale": "5.0.0",
"parse-url": "8.1.0",
"parse-url": "9.2.0",
"queue": "6.0.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"recast": "0.23.6",
"semver": "7.6.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"recast": "0.23.9",
"semver": "7.6.3",
"shell-env": "3.0.1",
"sudo-prompt": "^9.2.1",
"uuid": "9.0.1"
"uuid": "10.0.0"
},
"optionalDependencies": {
"native-reg": "1.1.1"
},
"devDependencies": {
"node-gyp": "^10.2.0"
}
}
15 changes: 0 additions & 15 deletions app/patches/node-pty+1.0.0.patch

This file was deleted.

2 changes: 1 addition & 1 deletion app/plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ function syncPackageJSON() {
description: 'Auto-generated from `hyper.json`!',
private: true,
version: '0.0.1',
repository: 'vercel/hyper',
repository: 'quine-global/hyper',
license: 'MIT',
homepage: 'https://hyper.is',
dependencies
Expand Down
6 changes: 6 additions & 0 deletions app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
{
"extends": "../tsconfig.base.json",
"compilerOptions": {
"declaration": true,
"declarationDir": "../dist/tmp/appdts/",
"outDir": "../target/",
"composite": true,
"noImplicitAny": false
},
"include": [
"./**/*",
"./package.json",
"../typings/extend-electron.d.ts",
"../typings/ext-modules.d.ts"
],
"exclude": [
"../dist/**/*",
"../target/**/*"
]
}
16 changes: 15 additions & 1 deletion app/updater.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Packages
import electron, {app} from 'electron';
import type {BrowserWindow, AutoUpdater} from 'electron';
import type {BrowserWindow, AutoUpdater as OriginalAutoUpdater} from 'electron';

import retry from 'async-retry';
import ms from 'ms';
Expand All @@ -11,6 +11,20 @@ import {getDefaultProfile} from './config';
import {version} from './package.json';
import {getDecoratedConfig} from './plugins';

// Necessary due to typescript not handling overloads well
type AutoUpdaterEvent =
| 'error'
| 'checking-for-update'
| 'before-quit-for-update'
| 'update-downloaded'
| 'update-available'
| 'update-not-available';

interface AutoUpdater extends OriginalAutoUpdater {
on(event: AutoUpdaterEvent, listener: Function): this;
removeListener(event: AutoUpdaterEvent, listener: Function): this;
}

const {platform} = process;
const isLinux = platform === 'linux';

Expand Down
Loading