Skip to content

Commit

Permalink
Merge branch 'develop' into support-allowjs
Browse files Browse the repository at this point in the history
  • Loading branch information
privatenumber committed Apr 25, 2024
2 parents c80ef6c + 8109677 commit f4484fc
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 33 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ jobs:
with:
node-version-file: .nvmrc

- name: Authenticate GitHub registry
run: npm set "//npm.pkg.github.com:_authToken=${{ secrets.GH_TOKEN }}"

- name: Setup pnpm
uses: pnpm/action-setup@v3
with:
Expand Down
15 changes: 15 additions & 0 deletions docs/.vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ export default defineConfig({

metaChunk: true,

head: [
[
'script',
{
src: 'https://beamanalytics.b-cdn.net/beam.min.js',
'data-token': 'ee893e1d-7484-4fb3-85b7-78c58b3d9c9e',
async: '',
},
],
],

themeConfig: {
siteTitle: 'tsx',

Expand Down Expand Up @@ -62,5 +73,9 @@ export default defineConfig({
link: 'https://github.com/privatenumber/tsx',
},
],

search: {
provider: 'local',
},
},
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"lint-staged": "^15.1.0",
"lintroll": "^1.4.1",
"magic-string": "^0.30.5",
"manten": "^1.2.0",
"manten": "^1.3.0",
"memfs": "^4.6.0",
"node-pty": "^1.0.0",
"outdent": "^0.8.0",
Expand Down
37 changes: 6 additions & 31 deletions pnpm-lock.yaml

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

5 changes: 4 additions & 1 deletion tests/specs/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,10 @@ export default testSuite(({ describe }, node: NodeApis) => {
'SIGINT HANDLER COMPLETED\r\n',
/EXIT_CODE:\s+200/,
]);
}, 10_000);
}, {
timeout: 10_000,
retry: 3,
});

test('Infinite loop', async () => {
const output = await ptyShell(
Expand Down

0 comments on commit f4484fc

Please sign in to comment.