Skip to content

Commit 2334f9f

Browse files
authored
Merge pull request #193 from obeli-sk/componentizejs-legacy
Move ComponentizeJS to legacy
2 parents 8164203 + 8d4e4c6 commit 2334f9f

140 files changed

Lines changed: 223 additions & 305 deletions

File tree

Some content is hidden

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

.github/workflows/check-test-e2e.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ jobs:
6262
run: |
6363
nix develop --command ./scripts/test-e2e.sh obelisk-oci.toml truncate
6464
65-
- name: Build JavaScript WASM components
66-
run: nix develop --command ./scripts/build-components-js.sh
67-
6865
- name: Verify obelisk-local-js-all.toml
6966
env:
7067
GITHUB_TOKEN_STARGAZERS: ${{ secrets.E2E_GITHUB_TOKEN }}
@@ -74,23 +71,26 @@ jobs:
7471
run: |
7572
nix develop --command ./scripts/test-e2e.sh ./obelisk-local-js-all.toml truncate
7673
77-
- name: Build Go WASM components
78-
run: nix develop --command ./scripts/build-components-go.sh
74+
- name: Build legacy ComponentizeJS WASM components
75+
run: nix develop --command just legacy-componentizejs
7976

80-
- name: Verify obelisk-local-go-all.toml
77+
- name: Verify obelisk-local-legacy-componentizejs-all.toml
8178
env:
8279
GITHUB_TOKEN_STARGAZERS: ${{ secrets.E2E_GITHUB_TOKEN }}
8380
TEST_GITHUB_LOGIN: ${{ secrets.TEST_GITHUB_LOGIN }}
8481
TURSO_TOKEN: ${{ secrets.E2E_TURSO_TOKEN }}
8582
TURSO_LOCATION: ${{ secrets.E2E_TURSO_LOCATION }}
8683
run: |
87-
nix develop --command ./scripts/test-e2e.sh ./obelisk-local-go-all.toml truncate
84+
nix develop --command ./scripts/test-e2e.sh ./obelisk-local-legacy-componentizejs-all.toml truncate
8885
89-
- name: Verify obelisk-local-native-all.toml
86+
- name: Build Go WASM components
87+
run: nix develop --command ./scripts/build-components-go.sh
88+
89+
- name: Verify obelisk-local-go-all.toml
9090
env:
9191
GITHUB_TOKEN_STARGAZERS: ${{ secrets.E2E_GITHUB_TOKEN }}
9292
TEST_GITHUB_LOGIN: ${{ secrets.TEST_GITHUB_LOGIN }}
9393
TURSO_TOKEN: ${{ secrets.E2E_TURSO_TOKEN }}
9494
TURSO_LOCATION: ${{ secrets.E2E_TURSO_LOCATION }}
9595
run: |
96-
nix develop --command ./scripts/test-e2e.sh obelisk-local-native-all.toml truncate
96+
nix develop --command ./scripts/test-e2e.sh ./obelisk-local-go-all.toml truncate

.github/workflows/check-verify-javascript.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ jobs:
4444
- name: Build Rust Components
4545
run: nix develop --command just rust
4646

47-
- name: Build JavaScript Components
48-
run: nix develop --command just js
47+
- name: Verify obelisk-local-js-all.toml
48+
run: |
49+
nix develop --command obelisk server verify --ignore-missing-env-vars --deployment obelisk-local-js-all.toml
50+
51+
- name: Build legacy ComponentizeJS Components
52+
run: nix develop --command just legacy-componentizejs
4953

50-
- name: Verify obelisk-local-js variants
54+
- name: Verify obelisk-local-legacy-componentizejs-all.toml
5155
run: |
52-
nix develop --command obelisk server verify --ignore-missing-env-vars --deployment obelisk-local-js-activity.toml
53-
nix develop --command obelisk server verify --ignore-missing-env-vars --deployment obelisk-local-js-workflow.toml
54-
nix develop --command obelisk server verify --ignore-missing-env-vars --deployment obelisk-local-js-webhook.toml
55-
# obelisk-local-js-all.toml is verified by e2e workflow
56+
nix develop --command obelisk server verify --ignore-missing-env-vars --deployment obelisk-local-legacy-componentizejs-all.toml

Justfile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Build all components (Rust, JS, Go)
2-
build: rust js go
1+
# Build all components (Rust, legacy ComponentizeJS, Go)
2+
build: rust legacy-componentizejs go
33

44
# Build Rust components
55
rust:
@@ -9,9 +9,13 @@ rust:
99
(cd webhook/webhook-rs && cargo build --release)
1010
(cd workflow/stargazers/workflow-rs && cargo build --release)
1111

12-
# Build JavaScript components
12+
# Direct JavaScript components are loaded by Obelisk and do not need a build.
1313
js:
14-
./scripts/build-components-js.sh
14+
@echo "JavaScript components do not need a build step"
15+
16+
# Build legacy ComponentizeJS components
17+
legacy-componentizejs:
18+
./scripts/build-components-legacy-componentizejs.sh
1519

1620
# Build Go components
1721
go:
@@ -26,7 +30,9 @@ test-integration:
2630
./scripts/test-integration.sh
2731
test-e2e: rust
2832
./scripts/test-e2e.sh ./obelisk-local.toml truncate
29-
test-e2e-js: js
33+
test-e2e-js: rust js
3034
./scripts/test-e2e.sh ./obelisk-local-js-all.toml truncate
35+
test-e2e-legacy-componentizejs: rust legacy-componentizejs
36+
./scripts/test-e2e.sh ./obelisk-local-legacy-componentizejs-all.toml truncate
3137
test-e2e-go: go
3238
./scripts/test-e2e.sh ./obelisk-local-go-all.toml truncate

README.md

Lines changed: 11 additions & 6 deletions

activity/db/turso/README.md

Lines changed: 2 additions & 2 deletions

activity/github/impl/README.md

Lines changed: 1 addition & 1 deletion

activity/llm/openai-go/README.md

Lines changed: 1 addition & 1 deletion

activity/llm/openai-js/README.md

Lines changed: 6 additions & 13 deletions
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Native JS implementation of stargazers:llm/llm.respond
1+
// JavaScript implementation of stargazers:llm/llm.respond
22
export default async function respond(userPrompt, settingsString) {
33
const apiKey = getEnv('OPENAI_API_KEY');
44
const baseUrl = getEnv('OPENAI_API_BASE_URL');
Lines changed: 24 additions & 0 deletions

0 commit comments

Comments
 (0)