diff --git a/.github/workflows/upload.yaml b/.github/workflows/upload.yaml index 4f0365a..73d2c00 100644 --- a/.github/workflows/upload.yaml +++ b/.github/workflows/upload.yaml @@ -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: > @@ -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 diff --git a/calcit.cirru b/calcit.cirru index 47c86ec..964318b 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -247,8 +247,8 @@ |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1613809284062) :data $ {} |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1613809284062) (:text |every?) - |j $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1613809284062) (:text |string?) |r $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1613809284062) (:text |cursor) + |v $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1619709910252) (:text |string?) |D $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1613808354475) (:text |true) |D $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1613808349071) (:text |cond) |L $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1613808349425) @@ -908,8 +908,8 @@ |T $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1546536843896) :data $ {} |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1546536856711) (:text |re-matches) - |j $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1546536908494) (:text "|\"^-?\\d") |r $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1546536911528) (:text |text) + |v $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1619710237332) (:text "|\"^-?\\d") |j $ {} (:type :expr) (:by |rJG4IHzWf) (:at 1546536913889) :data $ {} |T $ {} (:type :leaf) (:by |rJG4IHzWf) (:at 1546536914888) (:text |{}) @@ -1525,4 +1525,4 @@ :init-fn |calcit-theme.main/main! :compact-output? true :storage-key |calcit.cirru - :version |0.2.1 + :version |0.2.2 diff --git a/compact.cirru b/compact.cirru index e58f026..7c8bd21 100644 --- a/compact.cirru +++ b/compact.cirru @@ -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 @@ -24,7 +24,6 @@ [] ([]) expr 0 nil fn (acc xs idx prev-kind) cond - empty? xs , acc (string? (first xs)) @@ -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 @@ -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 @@ -226,7 +225,6 @@ :defs $ {} |cdn? $ quote def cdn? $ cond - exists? js/window , false (exists? js/process) (= "\"true" js/process.env.cdn) diff --git a/package.json b/package.json index 1dfed98..40c3c45 100644 --- a/package.json +++ b/package.json @@ -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" } diff --git a/yarn.lock b/yarn.lock index d640915..b22d127 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,103 +2,109 @@ # yarn lockfile v1 -"@calcit/procs@^0.2.62": - version "0.2.62" - resolved "https://registry.npm.taobao.org/@calcit/procs/download/@calcit/procs-0.2.62.tgz#ef92a8d5471f2bfa1edf4d3417a39ff2afd49f56" - integrity sha1-75Ko1UcfK/oe3000F6Of8q/Un1Y= +"@calcit/procs@^0.3.0-a11": + version "0.3.0-a11" + resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.3.0-a11.tgz#bbb55e4132d7f89eaeb1c96adbc3e8b20be630e2" + integrity sha512-fQJs1cPbrM+85Z49eoo07YIdz853LlyVZU+l+6jY/aFsw+LGpcSQv62VqSNEOJiwirdkv3RnapzszEjDNv3Plg== dependencies: - "@calcit/ternary-tree" "0.0.9" - "@cirru/parser.ts" "^0.0.1" - -"@calcit/ternary-tree@0.0.9": - version "0.0.9" - resolved "https://registry.npm.taobao.org/@calcit/ternary-tree/download/@calcit/ternary-tree-0.0.9.tgz#8a1d5d4c18f541a541b4dad857e300537ae4f3ef" - integrity sha1-ih1dTBj1QaVBtNrYV+MAU3rk8+8= - -"@cirru/parser.ts@^0.0.1": - version "0.0.1" - resolved "https://registry.npm.taobao.org/@cirru/parser.ts/download/@cirru/parser.ts-0.0.1.tgz#0870b051bd9f56626759ec22d7a0d5c51b19fe9c" - integrity sha1-CHCwUb2fVmJnWewi16DVxRsZ/pw= - -colorette@^1.2.1: - version "1.2.1" - resolved "https://registry.npm.taobao.org/colorette/download/colorette-1.2.1.tgz?cache=0&sync_timestamp=1593955804228&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolorette%2Fdownload%2Fcolorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" - integrity sha1-TQuSEyXBT6+SYzCGpTbbbolWSxs= - -esbuild@^0.8.34: - version "0.8.49" - resolved "https://registry.npm.taobao.org/esbuild/download/esbuild-0.8.49.tgz?cache=0&sync_timestamp=1613723944236&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fesbuild%2Fdownload%2Fesbuild-0.8.49.tgz#3d33f71b3966611f822cf4c838115f3fbd16def2" - integrity sha1-PTP3GzlmYR+CLPTIOBFfP70W3vI= + "@calcit/ternary-tree" "0.0.12" + "@cirru/parser.ts" "^0.0.3" + "@cirru/writer.ts" "^0.1.3" + +"@calcit/ternary-tree@0.0.12": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@calcit/ternary-tree/-/ternary-tree-0.0.12.tgz#30f33a61e713f48e338b9fd3fd5ad9eabf3d1bdd" + integrity sha512-rouLsMVOEvposSCkYCWrbL6zEk7k9Z1cX23+Fe1wzjBYL0eqZIknwvzMOGnOoPyXuiPk1laM5mSFgOxd25cH4Q== + +"@cirru/parser.ts@^0.0.3": + version "0.0.3" + resolved "https://registry.yarnpkg.com/@cirru/parser.ts/-/parser.ts-0.0.3.tgz#b0ba91ac9812631d0ac0b943922ebb4d04314066" + integrity sha512-Tdj4yd2nL1vxUm9aKqmuclAIRbVm7K3WJEqAzDAnR7oL7Iygwt7JzquRakm8DbSuNFsW7gazDS7wNJF5iowEoQ== + +"@cirru/writer.ts@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@cirru/writer.ts/-/writer.ts-0.1.3.tgz#5f54bdecaa20ba3dab16cbe6da711854138a9c0a" + integrity sha512-vJnhmhm7we5UfQIwmZfQpF3bAFbVybzT6LbmkbQHxgijaQg3gPfNVsnSIa3g3KpmWVtvkzEx+nUy5aMwsJiV1A== + +colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + +esbuild@^0.9.3: + version "0.9.7" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.9.7.tgz#ea0d639cbe4b88ec25fbed4d6ff00c8d788ef70b" + integrity sha512-VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg== fsevents@~2.3.1: version "2.3.2" - resolved "https://registry.npm.taobao.org/fsevents/download/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro= + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0= + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== has@^1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y= + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.npm.taobao.org/is-core-module/download/is-core-module-2.2.0.tgz?cache=0&sync_timestamp=1606411588663&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-core-module%2Fdownload%2Fis-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha1-lwN+89UiJNhRY/VZeytj2a/tmBo= + version "2.3.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" + integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== dependencies: has "^1.0.3" -nanoid@^3.1.20: - version "3.1.20" - resolved "https://registry.npm.taobao.org/nanoid/download/nanoid-3.1.20.tgz?cache=0&sync_timestamp=1606833990942&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnanoid%2Fdownload%2Fnanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha1-utwmPGsdzxS3HvqoX2q0wdbPx4g= +nanoid@^3.1.22: + version "3.1.22" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844" + integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ== path-parse@^1.0.6: version "1.0.6" - resolved "https://registry.npm.taobao.org/path-parse/download/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha1-1i27VnlAXXLEc37FhgDp3c8G0kw= + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== postcss@^8.2.1: - version "8.2.6" - resolved "https://registry.npm.taobao.org/postcss/download/postcss-8.2.6.tgz#5d69a974543b45f87e464bc4c3e392a97d6be9fe" - integrity sha1-XWmpdFQ7Rfh+RkvEw+OSqX1r6f4= + version "8.2.13" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f" + integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ== dependencies: - colorette "^1.2.1" - nanoid "^3.1.20" + colorette "^1.2.2" + nanoid "^3.1.22" source-map "^0.6.1" resolve@^1.19.0: version "1.20.0" - resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU= + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== dependencies: is-core-module "^2.2.0" path-parse "^1.0.6" rollup@^2.38.5: - version "2.39.0" - resolved "https://registry.npm.taobao.org/rollup/download/rollup-2.39.0.tgz?cache=0&sync_timestamp=1613146023169&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup%2Fdownload%2Frollup-2.39.0.tgz#be4f98c9e421793a8fec82c854fb567c35e22ab6" - integrity sha1-vk+YyeQheTqP7ILIVPtWfDXiKrY= + version "2.46.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.46.0.tgz#8cacf89d2ee31a34755f1af40a665168f592b829" + integrity sha512-qPGoUBNl+Z8uNu0z7pD3WPTABWRbcOwIrO/5ccDJzmrtzn0LVf6Lj91+L5CcWhXl6iWf23FQ6m8Jkl2CmN1O7Q== optionalDependencies: fsevents "~2.3.1" source-map@^0.6.1: version "0.6.1" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM= + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -vite@^2.0.1: - version "2.0.1" - resolved "https://registry.npm.taobao.org/vite/download/vite-2.0.1.tgz#348fc5c0de510aa90bd01ecf87df210ce741b38e" - integrity sha1-NI/FwN5RCqkL0B7Ph98hDOdBs44= +vite@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.2.3.tgz#1acbdfa56ac00e00e7ccb6988f63f130c2f99dbb" + integrity sha512-PtjyBL4GtACM+uT5q5hi2+AlMBbb6YI2b2bam6QI8ZdZt4FezseF0yZHQx0G+b3po9jIJ/GS5N9gc5Yq9Rue7g== dependencies: - esbuild "^0.8.34" + esbuild "^0.9.3" postcss "^8.2.1" resolve "^1.19.0" rollup "^2.38.5"