Skip to content

Commit

Permalink
update to use calcit mjs; tag 0.0.7
Browse files Browse the repository at this point in the history
tiye committed Mar 30, 2022
1 parent 13f1472 commit 78af643
Showing 11 changed files with 215 additions and 1,002 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/compile.yaml
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@ name: Compiles only
on:
push:
branches:
- master
- main
pull_request: {}

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: ACTIONS_ALLOW_UNSECURE_COMMANDS
id: ACTIONS_ALLOW_UNSECURE_COMMANDS
@@ -33,4 +33,3 @@ jobs:
yarn compile-page
yarn compile-server
yarn vite build
yarn build-server
12 changes: 7 additions & 5 deletions calcit.cirru

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

9 changes: 5 additions & 4 deletions compact.cirru
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
{} (:package |ws-edn)
:configs $ {} (:init-fn |ws-edn.app.page/main!) (:reload-fn |ws-edn.app.page/reload!)
:modules $ []
:version |0.0.6-a1
:version |0.0.7
:entries $ {}
:server $ {} (:reload-fn |ws-edn.app.server/reload!) (:storage-key |calcit.cirru)
:modules $ []
@@ -83,7 +83,8 @@
println "\"reload!"
|ws-edn.server $ {}
:ns $ quote
ns ws-edn.server $ :require ("\"ws" :as ws)
ns ws-edn.server $ :require
"\"ws" :refer $ WebSocketServer
ws-edn.util :refer $ when-let parse-data
"\"nanoid" :refer $ nanoid
"\"https" :as https
@@ -111,7 +112,7 @@
let
wss $ if
some? $ :cert options
new ws/Server $ let
new WebSocketServer $ let
ssl-options $ js-object
:key $ fs/readFileSync (:key options)
:cert $ fs/readFileSync (:cert options)
@@ -122,7 +123,7 @@
.!on server "\"error" $ fn (err) (js/console.error err)
.!listen server port $ fn () (println "\"server at" port)
js-object (:server server) (:path "\"/")
new ws/Server $ js-object (:port port)
new WebSocketServer $ js-object (:port port)
.!on wss "\"connection" $ fn (socket ? req) (maintain-socket! socket options)
.!on wss "\"listening" $ fn ()
let
19 changes: 13 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@


<body>

<div class="app" ></div>
<!DOCTYPE html>
<html>
<head>
<title>WS EDN</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<style type="text/css">
body {
margin: 0;
}
</style>
</head>

<script type="module" src="./page.js" ></script>
<body>

<div class="app" ></div>
<div>See Console...</div>

<script type="module" src="./page.mjs" ></script>
</body>

</html>
12 changes: 4 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
{
"version": "0.0.6-a1",
"version": "0.0.7",
"dependencies": {
"@calcit/procs": "^0.5.17-a1",
"nanoid": "^3.2.0"
"@calcit/procs": "^0.5.28",
"nanoid": "^3.3.2"
},
"scripts": {
"watch-server": "cr --emit-js --entry server",
"compile-server": "cr --emit-js --once --entry server",
"compile-page": "cr --emit-js --once --emit-path out-page/",
"build-server": "webpack",
"dev-server": "hot=true yarn webpack --watch",
"build-page": "vite build --base=./",
"watch-page": "cr --emit-js --emit-path out-page/"
},
"devDependencies": {
"vite": "^2.8.1",
"webpack": "5.68.0",
"webpack-cli": "^4.9.2",
"vite": "^2.9.0",
"ws": "^8.5.0"
}
}
10 changes: 0 additions & 10 deletions page.js

This file was deleted.

10 changes: 10 additions & 0 deletions page.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

import { main_$x_ } from "./out-page/ws-edn.app.page.mjs"

main_$x_()

if (import.meta.hot) {
import.meta.hot.accept('./out-page/ws-edn.app.page.mjs', (main) => {
main.reload_$x_()
})
}
10 changes: 0 additions & 10 deletions server.js

This file was deleted.

10 changes: 10 additions & 0 deletions server.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

import { main_$x_, reload_$x_ } from "./js-out/ws-edn.app.server.mjs"

main_$x_()

// if (import.module.hot) {
// import.module.hot.accept('./js-out/ws-edn.app.server.mjs', (main) => {
// reload_$x_()
// })
// }
32 changes: 0 additions & 32 deletions webpack.config.js

This file was deleted.

1,088 changes: 164 additions & 924 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 78af643

Please sign in to comment.