server: fix dav plugin ref to one that fixes the circular import

LivelyKernel · Apr 15, 2022 · f575d1a · f575d1a
1 parent 7124296
commit f575d1a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/flatn/package.json b/flatn/package.json
@@ -12,7 +12,7 @@
     "flatn_env": "./bin/flatn_env"
   },
   "dependencies": {
-    "node-gyp": "3.6.2"
+    "node-gyp": "9.0.0"
   },
   "systemjs": {
     "map": {

diff --git a/lively.server/package.json b/lively.server/package.json
@@ -3,8 +3,7 @@
   "version": "0.1.0",
   "dependencies": {
     "http-proxy": "^1.16.2",
-    "jsDAV": "^0.3.4",
-    "@pylonide/jsdav": "^0.4.2",
+    "jsDAV": "mnutt/jsDAV",
     "lively-system-interface": "https://github.com/LivelyKernel/lively-system-interface",
     "lively.2lively": "https://github.com/LivelyKernel/lively.2lively.git",
     "lively.modules": "*",

diff --git a/lively.server/plugins/dav.js b/lively.server/plugins/dav.js
@@ -27,9 +27,9 @@ const jsDavPlugins = {};
   };
   console.log = () => {};
   try {
-    DavHandler = System._nodeRequire('@pylonide/jsdav/lib/DAV/handler');
-    FsTree = System._nodeRequire('@pylonide/jsdav/lib/DAV/backends/fs/tree');
-    jsDavPlugins.browser = System._nodeRequire('@pylonide/jsdav/lib/DAV/plugins/browser.js');
+    DavHandler = System._nodeRequire('jsDAV/lib/DAV/handler');
+    FsTree = System._nodeRequire('jsDAV/lib/DAV/backends/fs/tree');
+    jsDavPlugins.browser = System._nodeRequire('jsDAV/lib/DAV/plugins/browser.js');
   } catch (err) { console.error('cannot load jsdav:', err); } finally { console.log = log; }
 })();
 

diff --git a/lively.source-transform/index.js b/lively.source-transform/index.js
@@ -2,8 +2,8 @@
 import { parseFunction, parse, stringify, ReplaceVisitor } from 'lively.ast';
 import { QueryReplaceManyVisitor } from 'lively.ast/lib/visitors.js';
 import transformJSX from 'babel-plugin-transform-jsx';
-import catchBinding from 'babel-catch-binding';
-import importMeta from 'babel-import-meta';
+import catchBinding from '@babel/plugin-syntax-import-meta';
+import importMeta from '@babel/plugin-syntax-import-meta';
 
 import * as capturing from './capturing.js';
 import { topLevelDeclsAndRefs } from 'lively.ast/lib/query.js';