Skip to content

Commit 983be12

Browse files
authored
Merge branch 'main' into bus
2 parents 6cf5201 + 327dd7a commit 983be12

28 files changed

+610
-1534
lines changed

.github/workflows/docs.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,24 @@ jobs:
2424
with:
2525
persist-credentials: false
2626
ref: main
27+
2728
- name: Setup Pages
28-
uses: actions/configure-pages@v3
29+
uses: actions/configure-pages@v5
30+
2931
- name: Install deps
30-
run: npm ci
32+
run: npm i
33+
34+
- name: Add additional deps
35+
run: npm i @rollup/rollup-linux-x64-gnu@4.32.1
36+
3137
- name: Build docs
3238
run: npm run docs:build
39+
3340
- name: Upload artifact
34-
uses: actions/upload-pages-artifact@v2
41+
uses: actions/upload-pages-artifact@v3
3542
with:
3643
path: 'docs/build'
44+
3745
- name: Deploy to GitHub Pages
3846
id: deployment
39-
uses: actions/deploy-pages@v2
47+
uses: actions/deploy-pages@v4

.github/workflows/osv.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ jobs:
2727
permissions:
2828
security-events: write
2929
contents: read
30-
uses: 'google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@1f1242919d8a60496dd1874b24b62b2370ed4c78' # v1.7.1
30+
actions: read
31+
uses: 'google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@126676819209c3a606f31bc46ad974fba4f2012c' # v1.9.2
3132
with:
3233
# Example of specifying custom arguments
3334
scan-args: |-
@@ -39,7 +40,8 @@ jobs:
3940
permissions:
4041
security-events: write
4142
contents: read
42-
uses: 'google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@1f1242919d8a60496dd1874b24b62b2370ed4c78' # v1.7.1
43+
actions: read
44+
uses: 'google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@126676819209c3a606f31bc46ad974fba4f2012c' # v1.9.2
4345
with:
4446
# Example of specifying custom arguments
4547
scan-args: |-

.github/workflows/test.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ jobs:
3838
checks:
3939
needs: build
4040
runs-on: ubuntu-latest
41-
env:
42-
FORCE_COLOR: 3
4341
steps:
4442
- uses: actions/checkout@v4
4543
with:
@@ -71,6 +69,13 @@ jobs:
7169
- name: Circular
7270
run: npm run test:circular
7371

72+
- name: Bundles
73+
run: npm run test:it
74+
timeout-minutes: 1
75+
76+
- name: JSR dry-run
77+
run: npm run test:jsr
78+
7479
test:
7580
needs: build
7681
runs-on: ubuntu-latest

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ build/
33
coverage/
44
package/
55
reports/
6+
docs/.vitepress/cache/
67
yarn.lock
78
temp

docs/.vitepress/config.mts

-7
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@ export default defineConfig({
5353
nav: [
5454
{ text: 'Home', link: '/' },
5555
{ text: 'Docs', link: '/getting-started' },
56-
{
57-
text: 'v8',
58-
items: [
59-
{ text: 'v8', link: '/migration-from-v7' },
60-
{ text: 'v7', link: '/v7/api' },
61-
],
62-
},
6356
],
6457

6558
sidebar: {

docs/.vitepress/theme/MyOxygen.vue

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<template>
2-
<div class="Oxygen">
3-
<a href="https://webpod.dev/?from=zx-site">
4-
<!--<img src="https://webpod.dev/img/banner.png" alt="Webpod - deploy JavaScript apps">-->
5-
<img
6-
src="https://webpod.dev/img/logo.svg"
7-
alt="Webpod - deploy JavaScript apps"
8-
/>
9-
<p>Webpod – deploy JavaScript apps to own cloud or private server</p>
10-
</a>
11-
</div>
2+
<!-- <div class="Oxygen">-->
3+
<!-- <a href="https://webpod.dev/?from=zx-site">-->
4+
<!-- &lt;!&ndash;<img src="https://webpod.dev/img/banner.png" alt="Webpod - deploy JavaScript apps">&ndash;&gt;-->
5+
<!-- <img-->
6+
<!-- src="https://webpod.dev/img/logo.svg"-->
7+
<!-- alt="Webpod - deploy JavaScript apps"-->
8+
<!-- />-->
9+
<!-- <p>Webpod – deploy JavaScript apps to own cloud or private server</p>-->
10+
<!-- </a>-->
11+
<!-- </div>-->
1212
</template>
1313

1414
<style scoped>

0 commit comments

Comments
 (0)