From d223d11908220085e8bc3e9f996dcae012cbb6e5 Mon Sep 17 00:00:00 2001 From: Jan Thurau Date: Mon, 17 Oct 2022 19:28:13 +0200 Subject: [PATCH 1/4] Moves prosemirror* and yjs* to peerDependencies --- packages/extension-database/package.json | 4 +++- packages/extension-monitor/package.json | 4 +++- packages/extension-redis/package.json | 4 +++- packages/extension-webhook/package.json | 5 +++-- packages/provider/package.json | 4 +++- packages/server/package.json | 4 +++- packages/transformer/package.json | 4 +++- 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/packages/extension-database/package.json b/packages/extension-database/package.json index d81a1b4a7..750c5c9d9 100644 --- a/packages/extension-database/package.json +++ b/packages/extension-database/package.json @@ -26,7 +26,9 @@ "dist" ], "dependencies": { - "@hocuspocus/server": "^1.0.0-beta.2", + "@hocuspocus/server": "^1.0.0-beta.2" + }, + "peerDependencies": { "yjs": "^13.5.29" }, "publishConfig": { diff --git a/packages/extension-monitor/package.json b/packages/extension-monitor/package.json index fe314ca26..3e1c18f15 100644 --- a/packages/extension-monitor/package.json +++ b/packages/extension-monitor/package.json @@ -51,7 +51,9 @@ "vue": "^2.6.14", "vue-plotly": "^1.1.0", "vue-virtual-scroller": "^1.0.10", - "ws": "^8.5.0", + "ws": "^8.5.0" + }, + "peerDependencies": { "yjs": "^13.5.29" }, "devDependencies": { diff --git a/packages/extension-redis/package.json b/packages/extension-redis/package.json index 0cf73547c..08deea8d5 100644 --- a/packages/extension-redis/package.json +++ b/packages/extension-redis/package.json @@ -37,7 +37,9 @@ "kleur": "^4.1.4", "lodash.debounce": "^4.0.8", "redlock": "^4.2.0", - "uuid": "^8.3.2", + "uuid": "^8.3.2" + }, + "peerDependencies": { "y-protocols": "^1.0.5", "yjs": "^13.5.23" }, diff --git a/packages/extension-webhook/package.json b/packages/extension-webhook/package.json index f549d8dc7..c7436e7bb 100644 --- a/packages/extension-webhook/package.json +++ b/packages/extension-webhook/package.json @@ -30,8 +30,9 @@ ], "dependencies": { "@hocuspocus/server": "^1.0.0-beta.2", - "@hocuspocus/transformer": "^1.0.0-beta.2", - "axios": "^0.27.2", + "@hocuspocus/transformer": "^1.0.0-beta.2" + }, + "peerDependencies": { "yjs": "^13.5.29" }, "gitHead": "b3454a4ca289a84ddfb7fa5607a2d4b8d5c37e9d" diff --git a/packages/provider/package.json b/packages/provider/package.json index ba55788f6..3e3539bce 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -30,7 +30,9 @@ "dependencies": { "@hocuspocus/common": "^1.0.0-beta.2", "@lifeomic/attempt": "^3.0.2", - "lib0": "^0.2.46", + "lib0": "^0.2.46" + }, + "peerDependencies": { "y-protocols": "^1.0.5", "yjs": "^13.5.29" }, diff --git a/packages/server/package.json b/packages/server/package.json index 540fbf938..7491f059c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -36,7 +36,9 @@ "kleur": "^4.1.4", "lib0": "^0.2.46", "uuid": "^8.3.2", - "ws": "^8.5.0", + "ws": "^8.5.0" + }, + "peerDependencies": { "y-protocols": "^1.0.5", "yjs": "^13.5.29" }, diff --git a/packages/transformer/package.json b/packages/transformer/package.json index b3d3222a8..f15163a3c 100644 --- a/packages/transformer/package.json +++ b/packages/transformer/package.json @@ -28,7 +28,9 @@ ], "dependencies": { "@tiptap/core": "^2.0.0-beta.174", - "@tiptap/starter-kit": "^2.0.0-beta.183", + "@tiptap/starter-kit": "^2.0.0-beta.183" + }, + "peerDependencies": { "prosemirror-model": "^1.16.1", "y-prosemirror": "^1.0.15", "yjs": "^13.5.29" From bc5a73639d9bbce39dec9603b70bd7aaf1f7c8ef Mon Sep 17 00:00:00 2001 From: Jan Thurau Date: Mon, 17 Oct 2022 19:41:34 +0200 Subject: [PATCH 2/4] re-adds axios --- packages/extension-webhook/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/extension-webhook/package.json b/packages/extension-webhook/package.json index c7436e7bb..71dd5c7bf 100644 --- a/packages/extension-webhook/package.json +++ b/packages/extension-webhook/package.json @@ -30,10 +30,11 @@ ], "dependencies": { "@hocuspocus/server": "^1.0.0-beta.2", - "@hocuspocus/transformer": "^1.0.0-beta.2" + "@hocuspocus/transformer": "^1.0.0-beta.2", + "axios": "^0.27.2" }, "peerDependencies": { - "yjs": "^13.5.29" + "axios": "^1.1.3" }, "gitHead": "b3454a4ca289a84ddfb7fa5607a2d4b8d5c37e9d" } From 21c23192dc82e511bc24db6f6a6ab8114be999fa Mon Sep 17 00:00:00 2001 From: Jan Thurau Date: Mon, 17 Oct 2022 19:44:30 +0200 Subject: [PATCH 3/4] extension-webhook fix --- package-lock.json | 24 ++++++++++++++++++++++++ packages/extension-webhook/package.json | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index b78133352..5eba384bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12366,6 +12366,25 @@ } } }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/font-atlas": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/font-atlas/-/font-atlas-2.1.0.tgz", @@ -36203,6 +36222,11 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, + "follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + }, "font-atlas": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/font-atlas/-/font-atlas-2.1.0.tgz", diff --git a/packages/extension-webhook/package.json b/packages/extension-webhook/package.json index 71dd5c7bf..baa99fa7a 100644 --- a/packages/extension-webhook/package.json +++ b/packages/extension-webhook/package.json @@ -34,7 +34,7 @@ "axios": "^0.27.2" }, "peerDependencies": { - "axios": "^1.1.3" + "yjs": "^13.5.29" }, "gitHead": "b3454a4ca289a84ddfb7fa5607a2d4b8d5c37e9d" } From 26d0dccf66de2375772ed6cb97ff7f5cb0c52c78 Mon Sep 17 00:00:00 2001 From: janthurau Date: Thu, 20 Oct 2022 17:57:52 +0000 Subject: [PATCH 4/4] ci: fix code style linting errors --- package-lock.json | 84 +++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 53 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5eba384bd..0680d13e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12347,25 +12347,6 @@ "resolved": "https://registry.npmjs.org/flip-pixels/-/flip-pixels-1.0.2.tgz", "integrity": "sha512-oXbJGbjDnfJRWPC7Va38EFhd+A8JWE5/hCiKcK8qjCdbLj9DTpsq6MEudwpRTH+V4qq+Jw7d3pUgQdSr3x3mTA==" }, - "node_modules/follow-redirects": { - "version": "1.14.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, "node_modules/follow-redirects": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", @@ -26249,7 +26230,9 @@ "version": "1.0.0-beta.2", "license": "MIT", "dependencies": { - "@hocuspocus/server": "^1.0.0-beta.2", + "@hocuspocus/server": "^1.0.0-beta.2" + }, + "peerDependencies": { "yjs": "^13.5.29" } }, @@ -26279,8 +26262,7 @@ "vue": "^2.6.14", "vue-plotly": "^1.1.0", "vue-virtual-scroller": "^1.0.10", - "ws": "^8.5.0", - "yjs": "^13.5.29" + "ws": "^8.5.0" }, "devDependencies": { "@fullhuman/postcss-purgecss": "^3.0.0", @@ -26293,6 +26275,9 @@ "tailwindcss": "npm:@tailwindcss/postcss7-compat", "vue-hot-reload-api": "^2.3.4", "vue-template-compiler": "^2.6.14" + }, + "peerDependencies": { + "yjs": "^13.5.29" } }, "packages/extension-monitor/dashboard": { @@ -26379,14 +26364,16 @@ "kleur": "^4.1.4", "lodash.debounce": "^4.0.8", "redlock": "^4.2.0", - "uuid": "^8.3.2", - "y-protocols": "^1.0.5", - "yjs": "^13.5.23" + "uuid": "^8.3.2" }, "devDependencies": { "@types/ioredis": "^4.28.7", "@types/lodash.debounce": "^4.0.6", "@types/redlock": "^4.0.3" + }, + "peerDependencies": { + "y-protocols": "^1.0.5", + "yjs": "^13.5.23" } }, "packages/extension-sqlite": { @@ -26417,7 +26404,9 @@ "dependencies": { "@hocuspocus/server": "^1.0.0-beta.2", "@hocuspocus/transformer": "^1.0.0-beta.2", - "axios": "^0.27.2", + "axios": "^0.27.2" + }, + "peerDependencies": { "yjs": "^13.5.29" } }, @@ -26428,7 +26417,9 @@ "dependencies": { "@hocuspocus/common": "^1.0.0-beta.2", "@lifeomic/attempt": "^3.0.2", - "lib0": "^0.2.46", + "lib0": "^0.2.46" + }, + "peerDependencies": { "y-protocols": "^1.0.5", "yjs": "^13.5.29" } @@ -26446,7 +26437,9 @@ "kleur": "^4.1.4", "lib0": "^0.2.46", "uuid": "^8.3.2", - "ws": "^8.5.0", + "ws": "^8.5.0" + }, + "peerDependencies": { "y-protocols": "^1.0.5", "yjs": "^13.5.29" } @@ -26477,7 +26470,9 @@ "license": "MIT", "dependencies": { "@tiptap/core": "^2.0.0-beta.174", - "@tiptap/starter-kit": "^2.0.0-beta.183", + "@tiptap/starter-kit": "^2.0.0-beta.183" + }, + "peerDependencies": { "prosemirror-model": "^1.16.1", "y-prosemirror": "^1.0.15", "yjs": "^13.5.29" @@ -28340,8 +28335,7 @@ "@hocuspocus/extension-database": { "version": "file:packages/extension-database", "requires": { - "@hocuspocus/server": "^1.0.0-beta.2", - "yjs": "^13.5.29" + "@hocuspocus/server": "^1.0.0-beta.2" } }, "@hocuspocus/extension-logger": { @@ -28374,8 +28368,7 @@ "vue-plotly": "^1.1.0", "vue-template-compiler": "^2.6.14", "vue-virtual-scroller": "^1.0.10", - "ws": "^8.5.0", - "yjs": "^13.5.29" + "ws": "^8.5.0" }, "dependencies": { "postcss": { @@ -28414,9 +28407,7 @@ "kleur": "^4.1.4", "lodash.debounce": "^4.0.8", "redlock": "^4.2.0", - "uuid": "^8.3.2", - "y-protocols": "^1.0.5", - "yjs": "^13.5.23" + "uuid": "^8.3.2" } }, "@hocuspocus/extension-sqlite": { @@ -28439,8 +28430,7 @@ "requires": { "@hocuspocus/server": "^1.0.0-beta.2", "@hocuspocus/transformer": "^1.0.0-beta.2", - "axios": "^0.27.2", - "yjs": "^13.5.29" + "axios": "^0.27.2" } }, "@hocuspocus/provider": { @@ -28448,9 +28438,7 @@ "requires": { "@hocuspocus/common": "^1.0.0-beta.2", "@lifeomic/attempt": "^3.0.2", - "lib0": "^0.2.46", - "y-protocols": "^1.0.5", - "yjs": "^13.5.29" + "lib0": "^0.2.46" } }, "@hocuspocus/provider-demos": { @@ -28585,9 +28573,7 @@ "kleur": "^4.1.4", "lib0": "^0.2.46", "uuid": "^8.3.2", - "ws": "^8.5.0", - "y-protocols": "^1.0.5", - "yjs": "^13.5.29" + "ws": "^8.5.0" }, "dependencies": { "ws": { @@ -28626,10 +28612,7 @@ "version": "file:packages/transformer", "requires": { "@tiptap/core": "^2.0.0-beta.174", - "@tiptap/starter-kit": "^2.0.0-beta.183", - "prosemirror-model": "^1.16.1", - "y-prosemirror": "^1.0.15", - "yjs": "^13.5.29" + "@tiptap/starter-kit": "^2.0.0-beta.183" } }, "@humanwhocodes/config-array": { @@ -36217,11 +36200,6 @@ "resolved": "https://registry.npmjs.org/flip-pixels/-/flip-pixels-1.0.2.tgz", "integrity": "sha512-oXbJGbjDnfJRWPC7Va38EFhd+A8JWE5/hCiKcK8qjCdbLj9DTpsq6MEudwpRTH+V4qq+Jw7d3pUgQdSr3x3mTA==" }, - "follow-redirects": { - "version": "1.14.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" - }, "follow-redirects": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",