Skip to content

Commit

Permalink
Merge pull request #2 from Cirru/upgrade-runtime
Browse files Browse the repository at this point in the history
update code to use Rust runtime
  • Loading branch information
soyaine authored Apr 30, 2021
2 parents 16db0d6 + 78c6900 commit cda8baa
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 72 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: wget
run: mkdir ci-bin/ && wget -O ci-bin/cr_once http://repo.calcit-lang.org/binaries/linux/cr_once
run: mkdir ci-bin/ && wget -O ci-bin/calcit_runner http://repo.calcit-lang.org/binaries/linux/calcit_runner
- name: "permission"
run: chmod +x ci-bin/cr_once
run: chmod +x ci-bin/calcit_runner

- name: "prepare modules"
run: >
Expand All @@ -28,7 +28,7 @@ jobs:
- name: "compiles to js"
run: >
./ci-bin/cr_once --emit-js
./ci-bin/calcit_runner --emit-js --once
&& yarn && yarn vite build --base=./
- name: Deploy to server
Expand Down
6 changes: 3 additions & 3 deletions calcit.cirru

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

8 changes: 3 additions & 5 deletions compact.cirru
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{} (:package |calcit-theme)
:configs $ {} (:init-fn |calcit-theme.main/main!) (:reload-fn |calcit-theme.main/reload!)
:modules $ [] |memof/compact.cirru |lilac/compact.cirru |respo.calcit/compact.cirru |respo-ui.calcit/compact.cirru |reel.calcit/compact.cirru
:version |0.2.1
:version |0.2.2
:files $ {}
|calcit-theme.comp.expr $ {}
:ns $ quote
Expand All @@ -24,7 +24,6 @@
[] ([]) expr 0 nil
fn (acc xs idx prev-kind)
cond

empty? xs
, acc
(string? (first xs))
Expand All @@ -42,7 +41,7 @@
true $ let
cursor $ first xs
size $ count cursor
simple? $ every? string? cursor
simple? $ every? cursor string?
layout-kind $ if simple?
case prev-kind
nil $ if (> size 6) :expr :inline-expr
Expand Down Expand Up @@ -140,7 +139,7 @@
{} $ :color (hsl 250 50 60)
(= text "\"nil")
{} $ :color (hsl 310 60 40)
(re-matches "\"^-?\\d" text)
(re-matches text "\"^-?\\d")
{} $ :color (hsl 0 70 40)
leading? $ {}
:color $ hsl 40 85 60
Expand Down Expand Up @@ -226,7 +225,6 @@
:defs $ {}
|cdn? $ quote
def cdn? $ cond

exists? js/window
, false
(exists? js/process) (= "\"true" js/process.env.cdn)
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"dependencies": {
"@calcit/procs": "^0.2.62"
"@calcit/procs": "^0.3.0-a11"
},
"devDependencies": {
"vite": "^2.0.1"
"vite": "^2.2.3"
},
"version": "0.2.0"
"version": "0.2.2"
}
122 changes: 64 additions & 58 deletions yarn.lock

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

0 comments on commit cda8baa

Please sign in to comment.