Merge branch 'master' into refactor

package.json

@@ -43,11 +43,11 @@
   },
   "homepage": "https://github.com/yjs/y-prosemirror#readme",
   "dependencies": {
-    "@rollup/plugin-commonjs": "^15.0.0",
+    "@rollup/plugin-commonjs": "^15.1.0",
     "@rollup/plugin-node-resolve": "^9.0.0",
-    "lib0": "^0.2.33",
+    "lib0": "^0.2.34",
     "lodash.flatten": "^4.4.0",
-    "rollup": "^2.26.11"
+    "rollup": "^2.32.0"
   },
   "peerDependencies": {
     "yjs": "^13.3.2",
@@ -62,14 +62,14 @@
     "http-server": "^0.12.3",
     "jsdom": "^15.1.1",
     "prosemirror-example-setup": "^1.1.2",
-    "prosemirror-model": "^1.11.2",
+    "prosemirror-model": "^1.12.0",
     "prosemirror-schema-basic": "^1.0.1",
     "prosemirror-state": "^1.3.3",
-    "prosemirror-view": "^1.15.7",
+    "prosemirror-view": "^1.16.0",
     "standard": "^12.0.1",
     "typescript": "^3.9.7",
     "y-protocols": "^1.0.1",
     "y-webrtc": "^10.1.6",
-    "yjs": "13.3.2"
+    "yjs": "^13.4.1"
   }
 }

rollup.config.js

@@ -1,6 +1,17 @@
 import nodeResolve from '@rollup/plugin-node-resolve'
 import commonjs from '@rollup/plugin-commonjs'
 
+/**
+ * in order to use Yjs' testing framework, we need to depend on the bare-bone (untransformed) Yjs bundle
+ */
+const debugResolve = {
+  resolveId (importee) {
+    if (importee === 'yjs') {
+      return `${process.cwd()}/node_modules/yjs/src/index.js`
+    }
+  }
+}
+
 export default [{
   input: './src/y-prosemirror.js',
   output: [{
@@ -28,6 +39,7 @@ export default [{
     sourcemap: true
   },
   plugins: [
+    debugResolve,
     nodeResolve({
       mainFields: ['module', 'browser', 'main']
     }),
@@ -61,6 +73,7 @@ export default [{
     }
   },
   plugins: [
+    debugResolve,
     nodeResolve({
       mainFields: ['module', 'main']
     })