Merge pull request #6 from mvc-works/nanoid

upgrade deps; switch to nanoid

README.md

@@ -56,6 +56,12 @@ ws-edn.client/ws-set-on-data! $ fn (data)
   println data
 ```
 
+Deps:
+
+```bash
+yarn add nanoid
+```
+
 ### License
 
 MIT

compact.cirru

@@ -1,8 +1,12 @@
 
 {} (:package |ws-edn)
-  :configs $ {} (:init-fn |ws-edn.app.server/main!) (:reload-fn |ws-edn.app.server/reload!)
+  :configs $ {} (:init-fn |ws-edn.app.page/main!) (:reload-fn |ws-edn.app.page/reload!)
     :modules $ []
-    :version |0.0.4
+    :version |0.0.5
+  :entries $ {}
+    :server $ {} (:reload-fn |ws-edn.app.server/reload!) (:storage-key |calcit.cirru)
+      :modules $ []
+      :init-fn |ws-edn.app.server/main!
   :files $ {}
     |ws-edn.client $ {}
       :ns $ quote
@@ -77,9 +81,9 @@
             println "\"reload!"
     |ws-edn.server $ {}
       :ns $ quote
-        ns ws-edn.server $ :require ([] "\"ws" :as ws)
-          [] ws-edn.util :refer $ [] when-let parse-data
-          [] "\"shortid" :as shortid
+        ns ws-edn.server $ :require ("\"ws" :as ws)
+          ws-edn.util :refer $ when-let parse-data
+          "\"nanoid" :refer $ nanoid
       :defs $ {}
         |wss-each! $ quote
           defn wss-each! (handler)
@@ -116,7 +120,7 @@
         |maintain-socket! $ quote
           defn maintain-socket! (socket options)
             let
-                sid $ shortid/generate
+                sid $ nanoid
               swap! *global-connections assoc sid socket
               when-let
                 on-open $ :on-open options

package.json

@@ -1,22 +1,22 @@
 {
-  "version": "0.0.4",
+  "version": "0.0.5",
   "dependencies": {
-    "@calcit/procs": "^0.4.13"
+    "@calcit/procs": "^0.5.16",
+    "nanoid": "^3.2.0"
   },
   "scripts": {
-    "watch-server": "cr --emit-js",
-    "compile-server": "cr --emit-js --once",
-    "compile-page": "cr --emit-js --once --emit-path out-page/ --init-fn ws-edn.app.page/main! --reload-fn ws-edn.app.page/reload!",
+    "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/ --init-fn ws-edn.app.page/main! --reload-fn ws-edn.app.page/reload!"
+    "watch-page": "cr --emit-js --emit-path out-page/"
   },
   "devDependencies": {
-    "shortid": "^2.2.16",
-    "vite": "^2.4.4",
-    "webpack": "5.45.1",
-    "webpack-cli": "^4.7.2",
-    "ws": "^8.0.0"
+    "vite": "^2.7.13",
+    "webpack": "5.67.0",
+    "webpack-cli": "^4.9.2",
+    "ws": "^8.4.2"
   }
 }

webpack.config.js

@@ -20,7 +20,7 @@ module.exports = {
   devtool: "hidden-source-map",
   externals: {
     ws: "commonjs ws",
-    shortid: "commonjs shortid",
+    nanoid: "commonjs nanoid",
   },
   output: {
     path: path.resolve(__dirname, "js-out/"),