Move client dependencies out of devDependencies and fix chainpad-crypto issue

package.json

@@ -27,14 +27,13 @@
     "stream-to-pull-stream": "^1.7.2",
     "tweetnacl": "~0.12.2",
     "ulimit": "0.0.2",
-    "ws": "^3.3.1"
-  },
-  "devDependencies": {
+    "ws": "^3.3.1",
+
     "alertify.js": "1.0.11",
     "bootstrap": "^4.0.0",
     "bootstrap-tokenfield": "^0.12.0",
     "chainpad": "^5.2.0",
-    "chainpad-listmap": "github:xwiki-labs/chainpad-listmap#^1.0.0",
+    "chainpad-listmap": "^1.0.0",
     "chainpad-netflux": "^1.0.0",
     "ckeditor": "^4.12.1",
     "codemirror": "^5.19.0",
@@ -43,13 +42,10 @@
     "file-saver": "1.3.1",
     "hyper-json": "~1.4.0",
     "jquery": "3.6.0",
-    "jshint": "^2.13.4",
     "json.sortify": "~2.1.0",
     "jszip": "3.7.1",
     "dragula": "3.7.2",
     "html2canvas": "^1.4.0",
-    "less": "3.7.1",
-    "lesshint": "6.3.7",
     "localforage": "^1.5.2",
     "marked": "^1.1.0",
     "mathjax": "3.0.5",
@@ -59,14 +55,18 @@
     "requirejs": "2.3.5",
     "requirejs-plugins": "^1.0.2",
     "scrypt-async": "1.2.0",
-    "saferphore": "^0.0.1",
-    "selenium-webdriver": "^3.6.0",
     "sortablejs": "^1.6.0"
   },
+  "devDependencies": {
+    "jshint": "^2.13.4",
+    "less": "3.7.1",
+    "lesshint": "6.3.7",
+    "selenium-webdriver": "^3.6.0"
+  },
   "scripts": {
     "install:components": "node scripts/copy-components.js",
     "start": "node server.js",
-    "dev": "npm run install:components && DEV=1 node server.js",
+    "dev": "DEV=1 node server.js",
     "fresh": "FRESH=1 node server.js",
     "offline": "FRESH=1 OFFLINE=1 node server.js",
     "offlinedev": "DEV=1 OFFLINE=1 node server.js",

scripts/copy-components.js

@@ -6,37 +6,38 @@ const componentsPath = Path.join("www", "components");
 Fse.mkdirpSync(componentsPath);
 
 [
-    "jquery",
-    "tweetnacl",
-    "ckeditor",
-    "codemirror",
-    "marked",
-    "rangy",
-    "components-font-awesome",
-    "requirejs",
-    "requirejs-plugins",
-    "json.sortify",
-    "hyper-json",
+    "alertify.js",
+    "bootstrap",
+    "bootstrap-tokenfield",
     "chainpad",
-    "chainpad-crypto",
     "chainpad-listmap",
     "chainpad-netflux",
-    "file-saver",
-    "alertify.js",
-    "scrypt-async",
-    "require-css",
-    "bootstrap",
-    "nthen",
-    "open-sans-fontface",
-    "bootstrap-tokenfield",
-    "localforage",
-    "html2canvas",
+    "ckeditor",
+    "codemirror",
+    "components-font-awesome",
     "croppie",
-    "sortablejs",
-    "saferphore",
+    "file-saver",
+    "hyper-json",
+    "jquery",
+    "json.sortify",
     "jszip",
     "dragula",
+    "html2canvas",
+    "localforage",
+    "marked",
     "mathjax",
+    "open-sans-fontface",
+    "tweetnacl",
+    "rangy",
+    "require-css",
+    "requirejs",
+    "requirejs-plugins",
+    "scrypt-async",
+    "sortablejs",
+    // both client and server:
+    "chainpad-crypto",
+    "saferphore",
+    "nthen",
     "netflux-websocket",
 ].forEach(l => {
     const source = Path.join("node_modules", l);

www/common/requireconfig.js

@@ -4,7 +4,7 @@ define([
     var out = {
         // fix up locations so that relative urls work.
         baseUrl: window.location.pathname,
-        paths: { 
+        paths: {
             // json plugin
             text: '/components/requirejs-plugins/lib/text',
             json: '/components/requirejs-plugins/src/json',
@@ -28,6 +28,7 @@ define([
             '*': {
                 'css': '/components/require-css/css.js',
                 'less': '/common/RequireLess.js',
+                '/bower_components/tweetnacl/nacl-fast.min.js': '/components/tweetnacl/nacl-fast.min.js'
             }
         }
     };