ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into storybook

Browse Source
This commit is contained in:
Robert Schäfer 2019-08-05 12:47:46 +02:00
commit 1aeb93f9fb
9 changed files with 112 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -26,8 +26,8 @@ script:
# Backend # Backend
- docker-compose exec backend yarn run lint - docker-compose exec backend yarn run lint
- docker-compose exec backend yarn run test:jest --ci --verbose=false --coverage - docker-compose exec backend yarn run test:jest --ci --verbose=false --coverage
- docker-compose exec backend yarn run db:reset
- docker-compose exec backend yarn run db:seed - docker-compose exec backend yarn run db:seed
- docker-compose exec backend yarn run db:reset
# ActivityPub cucumber testing temporarily disabled because it's too buggy # ActivityPub cucumber testing temporarily disabled because it's too buggy
# - docker-compose exec backend yarn run test:cucumber --tags "not @wip" # - docker-compose exec backend yarn run test:cucumber --tags "not @wip"
# - docker-compose exec backend yarn run db:reset # - docker-compose exec backend yarn run db:reset

10
backend/package.json
View File

@ -73,24 +73,24 @@
"merge-graphql-schemas": "^1.7.0", "merge-graphql-schemas": "^1.7.0",
"metascraper": "^4.10.3", "metascraper": "^4.10.3",
"metascraper-audio": "^5.6.5", "metascraper-audio": "^5.6.5",
"metascraper-author": "^5.6.3", "metascraper-author": "^5.6.5",
"metascraper-clearbit-logo": "^5.3.0", "metascraper-clearbit-logo": "^5.3.0",
"metascraper-date": "^5.6.5", "metascraper-date": "^5.6.5",
"metascraper-description": "^5.6.5", "metascraper-description": "^5.6.5",
"metascraper-image": "^5.6.3", "metascraper-image": "^5.6.5",
"metascraper-lang": "^5.6.3", "metascraper-lang": "^5.6.3",
"metascraper-lang-detector": "^4.8.5", "metascraper-lang-detector": "^4.8.5",
"metascraper-logo": "^5.6.5", "metascraper-logo": "^5.6.5",
"metascraper-publisher": "^5.6.5", "metascraper-publisher": "^5.6.5",
"metascraper-soundcloud": "^5.6.5", "metascraper-soundcloud": "^5.6.5",
"metascraper-title": "^5.6.3", "metascraper-title": "^5.6.5",
"metascraper-url": "^5.6.5", "metascraper-url": "^5.6.5",
"metascraper-video": "^5.6.3", "metascraper-video": "^5.6.5",
"metascraper-youtube": "^5.6.3", "metascraper-youtube": "^5.6.3",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"neo4j-driver": "~1.7.5", "neo4j-driver": "~1.7.5",
"neo4j-graphql-js": "^2.6.3", "neo4j-graphql-js": "^2.6.3",
"neode": "^0.2.16", "neode": "^0.3.0",
"node-fetch": "~2.6.0", "node-fetch": "~2.6.0",
"nodemailer": "^6.3.0", "nodemailer": "^6.3.0",
"npm-run-all": "~4.1.5", "npm-run-all": "~4.1.5",

2
backend/src/models/User.js
View File

@ -3,7 +3,7 @@ import uuid from 'uuid/v4'
module.exports = { module.exports = {
id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests
actorId: { type: 'string', allow: [null] }, actorId: { type: 'string', allow: [null] },
name: { type: 'string', min: 3 }, name: { type: 'string', disallow: [null], min: 3 },
slug: 'string', slug: 'string',
encryptedPassword: 'string', encryptedPassword: 'string',
avatar: { type: 'string', allow: [null] }, avatar: { type: 'string', allow: [null] },

93
backend/yarn.lock
View File

@ -4285,16 +4285,6 @@ hide-powered-by@1.1.0:
resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.1.0.tgz#be3ea9cab4bdb16f8744be873755ca663383fa7a" resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.1.0.tgz#be3ea9cab4bdb16f8744be873755ca663383fa7a"
integrity sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg== integrity sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg==
hoek@5.x.x:
version "5.0.4"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.4.tgz#0f7fa270a1cafeb364a4b2ddfaa33f864e4157da"
integrity sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==
hoek@6.x.x:
version "6.1.2"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
homedir-polyfill@^1.0.1: homedir-polyfill@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
@ -4828,13 +4818,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
isemail@3.x.x:
version "3.2.0"
resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c"
integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==
dependencies:
punycode "2.x.x"
isexe@^2.0.0: isexe@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@ -5274,15 +5257,6 @@ jest@~24.8.0:
import-local "^2.0.0" import-local "^2.0.0"
jest-cli "^24.8.0" jest-cli "^24.8.0"
joi@^13.7.0:
version "13.7.0"
resolved "https://registry.yarnpkg.com/joi/-/joi-13.7.0.tgz#cfd85ebfe67e8a1900432400b4d03bbd93fb879f"
integrity sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q==
dependencies:
hoek "5.x.x"
isemail "3.x.x"
topo "3.x.x"
jquery@^3.3.1: jquery@^3.3.1:
version "3.4.0" version "3.4.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"
@ -5809,12 +5783,12 @@ metascraper-audio@^5.6.5:
dependencies: dependencies:
"@metascraper/helpers" "^5.6.5" "@metascraper/helpers" "^5.6.5"
metascraper-author@^5.6.3: metascraper-author@^5.6.5:
version "5.6.3" version "5.6.5"
resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.6.3.tgz#8ecc0d4257be1438e9f8242b4f0c1a5137f5bb13" resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.6.5.tgz#d4e02012e615ccb8a852f4f155a9597301d673cd"
integrity sha512-BNnYWjaEFOS5JX5s6KFo6MIv5M2hgnaWV47LM/EOvfHpe0a6DovVtLkGrVj6SpbPio3tzTjakouBwjQpuo1Dlg== integrity sha512-/UWIVQFNCNoWVIKKoRCuTTRItLTqztoznBR16lIHz5ssiJRCIjRiHfBBmuCHEI9Bki4XAfGg5PTzmALdSa4IMw==
dependencies: dependencies:
"@metascraper/helpers" "^5.6.3" "@metascraper/helpers" "^5.6.5"
lodash "~4.17.15" lodash "~4.17.15"
metascraper-clearbit-logo@^5.3.0: metascraper-clearbit-logo@^5.3.0:
@ -5838,12 +5812,12 @@ metascraper-description@^5.6.5:
dependencies: dependencies:
"@metascraper/helpers" "^5.6.5" "@metascraper/helpers" "^5.6.5"
metascraper-image@^5.6.3: metascraper-image@^5.6.5:
version "5.6.3" version "5.6.5"
resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.6.3.tgz#1d2fa627d90d5545f45bdda6e874af421ee1c622" resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.6.5.tgz#34a5cc5385b173e39b9ffb29e3255d111d7e1339"
integrity sha512-pDq6fU6X59642KNmE1WmJUUgJxepU4TDj1u2HDR0XCdqeiEGpskqmO/rFJSdgRFJNFUo7RJ1Er8cT4yVKCgqtg== integrity sha512-VFy/ztO+KsAZOr3XcSPoLDLWrR8OFsVLNy8z0BHeEjDOpLFn3aSbV+Ji84iVUsduD9kuY6G1i9iOaNDscVJGow==
dependencies: dependencies:
"@metascraper/helpers" "^5.6.3" "@metascraper/helpers" "^5.6.5"
metascraper-lang-detector@^4.8.5: metascraper-lang-detector@^4.8.5:
version "4.10.2" version "4.10.2"
@ -5884,12 +5858,12 @@ metascraper-soundcloud@^5.6.5:
memoize-one "~5.0.5" memoize-one "~5.0.5"
tldts "~5.3.2" tldts "~5.3.2"
metascraper-title@^5.6.3: metascraper-title@^5.6.5:
version "5.6.3" version "5.6.5"
resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.6.3.tgz#219bf9a4da28d48ea180497a1d6d2b4fa4871cc2" resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.6.5.tgz#20e692c7e971076f7a0d654249cf157153eefb55"
integrity sha512-sZ+SWojZhECisyw+el5fc1q2ENEAeQDzy/HabSkeA/saB3xqf3XnfqtCGIuElyxKiXS65KWzQOX+u3KseZdiAg== integrity sha512-gTfhH4/BsgslaykP5qTBDZiVRAPNuexR7JTVQ8o1Rzqsil7VrGsr42JOt7k0xlagEbHCLYrIS/QGiX17MDIdlA==
dependencies: dependencies:
"@metascraper/helpers" "^5.6.3" "@metascraper/helpers" "^5.6.5"
lodash "~4.17.15" lodash "~4.17.15"
metascraper-url@^5.6.5: metascraper-url@^5.6.5:
@ -5899,12 +5873,12 @@ metascraper-url@^5.6.5:
dependencies: dependencies:
"@metascraper/helpers" "^5.6.5" "@metascraper/helpers" "^5.6.5"
metascraper-video@^5.6.3: metascraper-video@^5.6.5:
version "5.6.3" version "5.6.5"
resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.6.3.tgz#4567095b52749c7e8083af6d5bd32a5ff182fcf8" resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.6.5.tgz#ded8124dd164cf8582bb7ed8bbdf767a1e2995d8"
integrity sha512-ejkebLHkktvvDJ1EfPzA4X4LWlkzeJZ69KzslRC94vQJuE36PA6k+EdoorZqryOzhHPV9TaNP5j+ZXU26S731g== integrity sha512-0kMGgQ2Q9C8XKosZ8Y/mfruT3AKpaY0kiqIDmA4G2S2O+gsE7yYExnW1aGEMjLZp54D1HOqjrYsuyO0KQ2abDA==
dependencies: dependencies:
"@metascraper/helpers" "^5.6.3" "@metascraper/helpers" "^5.6.5"
lodash "~4.17.15" lodash "~4.17.15"
metascraper-youtube@^5.6.3: metascraper-youtube@^5.6.3:
@ -6169,13 +6143,13 @@ neo4j-graphql-js@^2.6.3:
lodash "^4.17.11" lodash "^4.17.11"
neo4j-driver "^1.7.3" neo4j-driver "^1.7.3"
neode@^0.2.16: neode@^0.3.0:
version "0.2.16" version "0.3.0"
resolved "https://registry.yarnpkg.com/neode/-/neode-0.2.16.tgz#20532cc67604fd00cc88de841d422f5238ae5bd3" resolved "https://registry.yarnpkg.com/neode/-/neode-0.3.0.tgz#a4a41234fac23236db6b589ec2b505ad6e5fd832"
integrity sha512-L9p55IDKGzAZsQgHdXrfd2xasDuB46RipcrPw6NP7ESgkmfJMaMWRZ1F3Kv+f4V4U1WnhZ1IILvwVFhYPnpXEg== integrity sha512-V6uQhap7FDwbeC+mH6JEI352QSou4Ukj7vs/bGZSrVlMZKVS8vs/mbQYXoFdCkmQJuUtJWqO9wmtWg5GjCaNDQ==
dependencies: dependencies:
"@hapi/joi" "^15.1.0"
dotenv "^4.0.0" dotenv "^4.0.0"
joi "^13.7.0"
neo4j-driver "^1.6.3" neo4j-driver "^1.6.3"
uuid "^3.3.2" uuid "^3.3.2"
@ -7028,16 +7002,16 @@ punycode2@~1.0.0:
resolved "https://registry.yarnpkg.com/punycode2/-/punycode2-1.0.0.tgz#e2b4b9a9a8ff157d0b84438e203181ee7892dfd8" resolved "https://registry.yarnpkg.com/punycode2/-/punycode2-1.0.0.tgz#e2b4b9a9a8ff157d0b84438e203181ee7892dfd8"
integrity sha1-4rS5qaj/FX0LhEOOIDGB7niS39g= integrity sha1-4rS5qaj/FX0LhEOOIDGB7niS39g=
punycode@2.x.x, punycode@^2.1.0, punycode@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
punycode@^1.4.1: punycode@^1.4.1:
version "1.4.1" version "1.4.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
punycode@^2.1.0, punycode@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
qs@6.7.0, qs@^6.5.1: qs@6.7.0, qs@^6.5.1:
version "6.7.0" version "6.7.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
@ -8220,13 +8194,6 @@ toidentifier@1.0.0:
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
topo@3.x.x:
version "3.0.3"
resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c"
integrity sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ==
dependencies:
hoek "6.x.x"
toposort@^2.0.2: toposort@^2.0.2:
version "2.0.2" version "2.0.2"
resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"

3
webapp/components/ContributionForm/ContributionForm.spec.js
View File

@ -6,6 +6,9 @@ import PostMutations from '~/graphql/PostMutations.js'
import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect' import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
import Filters from '~/plugins/vue-filters' import Filters from '~/plugins/vue-filters'
import TeaserImage from '~/components/TeaserImage/TeaserImage' import TeaserImage from '~/components/TeaserImage/TeaserImage'
import MutationObserver from 'mutation-observer'
global.MutationObserver = MutationObserver
const localVue = createLocalVue() const localVue = createLocalVue()

4
webapp/components/Editor/Editor.spec.js
View File

@ -1,8 +1,10 @@
import { mount, createLocalVue } from '@vue/test-utils' import { mount, createLocalVue } from '@vue/test-utils'
import Editor from './Editor' import Editor from './Editor'
import Vuex from 'vuex' import Vuex from 'vuex'
import Styleguide from '@human-connection/styleguide' import Styleguide from '@human-connection/styleguide'
import MutationObserver from 'mutation-observer'
global.MutationObserver = MutationObserver
const localVue = createLocalVue() const localVue = createLocalVue()
localVue.use(Vuex) localVue.use(Vuex)

3
webapp/components/comments/CommentForm/spec.js
View File

@ -2,6 +2,9 @@ import { mount, createLocalVue } from '@vue/test-utils'
import CommentForm from './index.vue' import CommentForm from './index.vue'
import Styleguide from '@human-connection/styleguide' import Styleguide from '@human-connection/styleguide'
import Vuex from 'vuex' import Vuex from 'vuex'
import MutationObserver from 'mutation-observer'
global.MutationObserver = MutationObserver
const localVue = createLocalVue() const localVue = createLocalVue()
localVue.use(Vuex) localVue.use(Vuex)

9
webapp/package.json
View File

@ -51,7 +51,7 @@
}, },
"dependencies": { "dependencies": {
"@human-connection/styleguide": "0.5.17", "@human-connection/styleguide": "0.5.17",
"@nuxtjs/apollo": "^4.0.0-rc9", "@nuxtjs/apollo": "^4.0.0-rc10",
"@nuxtjs/axios": "~5.5.4", "@nuxtjs/axios": "~5.5.4",
"@nuxtjs/dotenv": "~1.3.0", "@nuxtjs/dotenv": "~1.3.0",
"@nuxtjs/style-resources": "~0.1.2", "@nuxtjs/style-resources": "~0.1.2",
@ -71,8 +71,8 @@
"nuxt-env": "~0.1.0", "nuxt-env": "~0.1.0",
"stack-utils": "^1.0.2", "stack-utils": "^1.0.2",
"string-hash": "^1.1.3", "string-hash": "^1.1.3",
"tiptap": "1.21.0", "tiptap": "~1.24.0",
"tiptap-extensions": "1.22.2", "tiptap-extensions": "~1.26.0",
"v-tooltip": "~2.0.2", "v-tooltip": "~2.0.2",
"vue-count-to": "~1.0.13", "vue-count-to": "~1.0.13",
"vue-izitoast": "1.1.2", "vue-izitoast": "1.1.2",
@ -87,7 +87,7 @@
"@storybook/addon-a11y": "^5.1.9", "@storybook/addon-a11y": "^5.1.9",
"@storybook/addon-actions": "^5.1.9", "@storybook/addon-actions": "^5.1.9",
"@storybook/vue": "~5.1.9", "@storybook/vue": "~5.1.9",
"@vue/cli-shared-utils": "~3.9.0", "@vue/cli-shared-utils": "~3.10.0",
"@vue/eslint-config-prettier": "~5.0.0", "@vue/eslint-config-prettier": "~5.0.0",
"@vue/server-test-utils": "~1.0.0-beta.29", "@vue/server-test-utils": "~1.0.0-beta.29",
"@vue/test-utils": "~1.0.0-beta.29", "@vue/test-utils": "~1.0.0-beta.29",
@ -112,6 +112,7 @@
"flush-promises": "^1.0.2", "flush-promises": "^1.0.2",
"fuse.js": "^3.4.5", "fuse.js": "^3.4.5",
"jest": "~24.8.0", "jest": "~24.8.0",
"mutation-observer": "^1.0.3",
"node-sass": "~4.12.0", "node-sass": "~4.12.0",
"nodemon": "~1.19.1", "nodemon": "~1.19.1",
"prettier": "~1.18.2", "prettier": "~1.18.2",

130
webapp/yarn.lock
View File

@ -1372,14 +1372,13 @@
webpack-node-externals "^1.7.2" webpack-node-externals "^1.7.2"
webpackbar "^3.2.0" webpackbar "^3.2.0"
"@nuxtjs/apollo@^4.0.0-rc9": "@nuxtjs/apollo@^4.0.0-rc10":
version "4.0.0-rc9" version "4.0.0-rc10"
resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc9.tgz#9a00166bc88caddc5af25fd43135c99cf1e8e149" resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc10.tgz#0a7ed15f1a4a7d3d4b6ca3652ed0314085dc3ffe"
integrity sha512-s69feXtdn4qrWxX8uF4+PzDRRG+NkfazEHfP3W8sG+PFxE6BASe8iW/zsaggOEw3MXG2ZjEd09jlsVoNNZB03g== integrity sha512-c8bxYpaOGQe7ZAXwYTne+48EViXYyCOV3T5khAhNk7YFFAkz6r12ouUYZ1aZr/BYczKZNPAlcJdmWAldE29Qzg==
dependencies: dependencies:
cookie "^0.4.0" cookie-universal "^2.0.16"
isomorphic-fetch "^2.2.1" isomorphic-fetch "^2.2.1"
js-cookie "^2.2.0"
vue-apollo "^3.0.0-rc.2" vue-apollo "^3.0.0-rc.2"
vue-cli-plugin-apollo "^0.21.0" vue-cli-plugin-apollo "^0.21.0"
webpack-node-externals "^1.7.2" webpack-node-externals "^1.7.2"
@ -2300,10 +2299,10 @@
"@vue/babel-plugin-transform-vue-jsx" "^1.0.0" "@vue/babel-plugin-transform-vue-jsx" "^1.0.0"
camelcase "^5.0.0" camelcase "^5.0.0"
"@vue/cli-shared-utils@~3.9.0": "@vue/cli-shared-utils@~3.10.0":
version "3.9.0" version "3.10.0"
resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.9.0.tgz#cb56a443bf763a873849a11d07e9e7638aa16cc2" resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.10.0.tgz#9d156f3c0ef675a939319062489e98c8d3d80f7e"
integrity sha512-wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g== integrity sha512-i96XBUtLdWeKFCC/ot12ngqnVikN/dXpelGdyxvNZczCkX7Je0FUdrZkiw0+uTYTu1RmuYWpLs+vb/YQerjiWg==
dependencies: dependencies:
"@hapi/joi" "^15.0.1" "@hapi/joi" "^15.0.1"
chalk "^2.4.1" chalk "^2.4.1"
@ -5055,7 +5054,7 @@ cookie-universal@^2.0.16:
"@types/cookie" "^0.3.1" "@types/cookie" "^0.3.1"
cookie "^0.3.1" cookie "^0.3.1"
cookie@0.4.0, cookie@^0.4.0: cookie@0.4.0:
version "0.4.0" version "0.4.0"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
@ -9022,11 +9021,6 @@ js-beautify@^1.6.14:
mkdirp "~0.5.1" mkdirp "~0.5.1"
nopt "~4.0.1" nopt "~4.0.1"
js-cookie@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb"
integrity sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s=
js-levenshtein@^1.1.3: js-levenshtein@^1.1.3:
version "1.1.6" version "1.1.6"
resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@ -10098,6 +10092,11 @@ mustache@^2.3.0:
resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5"
integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==
mutation-observer@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0"
integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==
mute-stream@0.0.7: mute-stream@0.0.7:
version "0.0.7" version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@ -12057,10 +12056,10 @@ prosemirror-dropcursor@^1.1.1:
prosemirror-transform "^1.1.0" prosemirror-transform "^1.1.0"
prosemirror-view "^1.1.0" prosemirror-view "^1.1.0"
prosemirror-gapcursor@^1.0.3: prosemirror-gapcursor@^1.0.4:
version "1.0.3" version "1.0.4"
resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.3.tgz#acc6537fc5a35e9b38966f91a199a382dfc715c4" resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz#4ba663fb8511616e18ad222c904403cfbf6866dc"
integrity sha512-X+hJhr42PcHWiSWL+lI5f/UeOhXCxlBFb8M6O8aG1hssmaRrW7sS2/Fjg5jFV+pTdS1REFkmm1occh01FMdDIQ== integrity sha512-k021MtJibWs3NaJI6S9tCXfTZ/kaugFZBndHkkWx3Zfk0QDUO6JfVATpflxADN6DUkRwJ7qWyHlLDWu71hxHFQ==
dependencies: dependencies:
prosemirror-keymap "^1.0.0" prosemirror-keymap "^1.0.0"
prosemirror-model "^1.0.0" prosemirror-model "^1.0.0"
@ -12092,7 +12091,7 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.0.1:
prosemirror-state "^1.0.0" prosemirror-state "^1.0.0"
w3c-keyname "^1.1.8" w3c-keyname "^1.1.8"
prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.0, prosemirror-model@^1.7.1: prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.1:
version "1.7.1" version "1.7.1"
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.1.tgz#f140a6e366e1e283aa7a94dbb8c2c7d13139689e" resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.1.tgz#f140a6e366e1e283aa7a94dbb8c2c7d13139689e"
integrity sha512-hYrZPbJvdo2QWERmkCuS80BEf5Rcf3+S28ETr4xu8XKPYjmU6aeQn23G1Fu/2rwqUmk5ZyWYo2nyEsN+Cdv2Qg== integrity sha512-hYrZPbJvdo2QWERmkCuS80BEf5Rcf3+S28ETr4xu8XKPYjmU6aeQn23G1Fu/2rwqUmk5ZyWYo2nyEsN+Cdv2Qg==
@ -12133,12 +12132,12 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor
dependencies: dependencies:
prosemirror-model "^1.0.0" prosemirror-model "^1.0.0"
prosemirror-utils@^0.9.0: prosemirror-utils@^0.9.4:
version "0.9.0" version "0.9.5"
resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.0.tgz#3ab616c94ccd61fcb18968f0d5aa273a9f1f28e4" resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.5.tgz#34d7e5bc12f3e6774261cc664bac9499899663d4"
integrity sha512-YcvmHcq7phbn+OagJSvmne92qZG9dOVfb3zfuA1HuyWUif3hUDt2Yfu299BHqVkEkUCF6FN7Gi9folDQntMhxA== integrity sha512-JT3H//Cq2ljNhWadMYRMdlNj2gylFA7L4RC0zmUF9l0IgDpc/gTpPRCmfcDUomDgCrciz57C3MCnZ+058hSTaA==
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.8: prosemirror-view@^1.0.0, prosemirror-view@^1.1.0:
version "1.9.8" version "1.9.8"
resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.8.tgz#47b961204a0b2e8ff87370c270d4f82598e81273" resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.8.tgz#47b961204a0b2e8ff87370c270d4f82598e81273"
integrity sha512-yS4yrqxydvi7ddz9VFLeJgbfVd5g3/bMcRxb1PbWtG0i9OrPSsiHaEBJHLVeTbraGqRlAu+tbNLakO7RhUhp1w== integrity sha512-yS4yrqxydvi7ddz9VFLeJgbfVd5g3/bMcRxb1PbWtG0i9OrPSsiHaEBJHLVeTbraGqRlAu+tbNLakO7RhUhp1w==
@ -12147,6 +12146,15 @@ prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.8:
prosemirror-state "^1.0.0" prosemirror-state "^1.0.0"
prosemirror-transform "^1.1.0" prosemirror-transform "^1.1.0"
prosemirror-view@^1.9.12:
version "1.9.13"
resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.13.tgz#8f146038e776fd0aa6d7811c8b9cb11813b9e319"
integrity sha512-afJxCZR4EH04u4thl7xYHSIgyQiGALstLi+5SW9t3868ghrgcFhpQvbJAN17Yb9nwtnltD64t15Msk2UlXkPeQ==
dependencies:
prosemirror-model "^1.1.0"
prosemirror-state "^1.0.0"
prosemirror-transform "^1.1.0"
proto-list@~1.2.1: proto-list@~1.2.1:
version "1.2.4" version "1.2.4"
resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@ -14223,10 +14231,10 @@ tippy.js@^4.3.5:
dependencies: dependencies:
popper.js "^1.14.7" popper.js "^1.14.7"
tiptap-commands@^1.10.6, tiptap-commands@^1.10.7: tiptap-commands@^1.10.11:
version "1.10.7" version "1.10.11"
resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.7.tgz#c177f875e8a90e05171fdd441190b4b7a769bd27" resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.11.tgz#9df1ef7b553e601598892074f9faa6d836fd8238"
integrity sha512-Ij62dHkYvOFUcaj+xlbahhoqcY8bFIEho6fXKrxcjjtGzS2DyJnvXmWN6Ow65uZWXkf5Zf8ae6XnYNaKqP3Pyg== integrity sha512-SD1Ep18qKGiCOodUttQrJtOfEC4/sx1pQWfROc4t8xeuxS5FLcrXZ+u9mELRSHkBJ+nDAJsn/ewG+yo58T1+Xg==
dependencies: dependencies:
prosemirror-commands "^1.0.8" prosemirror-commands "^1.0.8"
prosemirror-inputrules "^1.0.4" prosemirror-inputrules "^1.0.4"
@ -14234,13 +14242,13 @@ tiptap-commands@^1.10.6, tiptap-commands@^1.10.7:
prosemirror-schema-list "^1.0.3" prosemirror-schema-list "^1.0.3"
prosemirror-state "^1.2.3" prosemirror-state "^1.2.3"
prosemirror-tables "^0.8.1" prosemirror-tables "^0.8.1"
prosemirror-utils "^0.9.0" prosemirror-utils "^0.9.4"
tiptap-utils "^1.5.5" tiptap-utils "^1.6.0"
tiptap-extensions@1.22.2: tiptap-extensions@~1.26.0:
version "1.22.2" version "1.26.0"
resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.22.2.tgz#66b24ef63653481da16419efdf6459c7a9f518f7" resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.26.0.tgz#d3ee033d121c7243a7e8648c69ec6343a2853ccc"
integrity sha512-JJe2yAnbaKBWO/16+lfFphePphG9UYhp3wAUkzhSefJx3dtIdDfCmp5jBzZ6NLahUHNT/Z9WeYdhQmngAeVhoA== integrity sha512-icQYbfl6Cu3XkAoz9y+4x1URuB/EzryF2rZT6GsURghcelaxpjIPoMDBMyi00zlSIKJUvkS14NbnjJ2eT0CG6w==
dependencies: dependencies:
lowlight "^1.12.1" lowlight "^1.12.1"
prosemirror-collab "^1.1.2" prosemirror-collab "^1.1.2"
@ -14249,52 +14257,36 @@ tiptap-extensions@1.22.2:
prosemirror-state "^1.2.3" prosemirror-state "^1.2.3"
prosemirror-tables "^0.8.1" prosemirror-tables "^0.8.1"
prosemirror-transform "^1.1.3" prosemirror-transform "^1.1.3"
prosemirror-utils "^0.9.0" prosemirror-utils "^0.9.4"
prosemirror-view "^1.9.8" prosemirror-view "^1.9.12"
tiptap "^1.22.2" tiptap "^1.24.0"
tiptap-commands "^1.10.7" tiptap-commands "^1.10.11"
tiptap-utils@^1.5.4, tiptap-utils@^1.5.5: tiptap-utils@^1.6.0:
version "1.5.5" version "1.6.0"
resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.5.5.tgz#f06c70f0319d9215433b3466b6ece369a078de0f" resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.6.0.tgz#6af0bf52f93b291b9be5f6adb92c9afc35dd8d62"
integrity sha512-lnaCmIIkyK050qfsPeMDjoTW0sTqBHxfw1h2GXaX5Nr6JF4VQe0izgf2MI6LCd3PKecJBoW4ce5lNkDpV99+WA== integrity sha512-8ehQyNCe1CJvgBBqS3rKM58MFqcwlJQXS6XtZyhOjJDGQbUKNVR/GbAXTPlHnuVBm0kKKTjTqnrEt/PS4d2aXg==
dependencies: dependencies:
prosemirror-model "^1.7.1" prosemirror-model "^1.7.1"
prosemirror-state "^1.2.3" prosemirror-state "^1.2.3"
prosemirror-tables "^0.8.1" prosemirror-tables "^0.8.1"
prosemirror-utils "^0.9.0" prosemirror-utils "^0.9.4"
tiptap@1.21.0: tiptap@^1.24.0, tiptap@~1.24.0:
version "1.21.0" version "1.24.0"
resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.21.0.tgz#4d8c1365c611e41c8d4f3d7aa195ddaf891e605b" resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.24.0.tgz#f386c8fca71275a4794a0e95eca2ea37267d370d"
integrity sha512-MoOj/8OPMlmoAotIZjAIlUZ59yMMR83xReOw2rGjqbFOooncoY1rLEBp0xz5oe5FLYqoe8dKb+kzOoFERqckVQ== integrity sha512-izw0FM5bbOQRtNczqEgo9/EoUI7X/TAj1LEsteMuDqxaZKmYn6so482UnnQUv13+4DtXHYGj5U+60lVNuZlWJw==
dependencies: dependencies:
prosemirror-commands "^1.0.8" prosemirror-commands "^1.0.8"
prosemirror-dropcursor "^1.1.1" prosemirror-dropcursor "^1.1.1"
prosemirror-gapcursor "^1.0.3" prosemirror-gapcursor "^1.0.4"
prosemirror-inputrules "^1.0.4"
prosemirror-keymap "^1.0.1"
prosemirror-model "^1.7.0"
prosemirror-state "^1.2.3"
prosemirror-view "^1.9.8"
tiptap-commands "^1.10.6"
tiptap-utils "^1.5.4"
tiptap@^1.22.2:
version "1.22.2"
resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.22.2.tgz#f3f2b822d9ed087a853520c86593b2e6bd822bdd"
integrity sha512-qMFQJ358Ga8gXzUAMaHGrZDab/IqZf28N8BYYo4hyFIMoEYQVWmBGWuSBHOgpxiueXpC9zMuCoIgrNWN3VpoNQ==
dependencies:
prosemirror-commands "^1.0.8"
prosemirror-dropcursor "^1.1.1"
prosemirror-gapcursor "^1.0.3"
prosemirror-inputrules "^1.0.4" prosemirror-inputrules "^1.0.4"
prosemirror-keymap "^1.0.1" prosemirror-keymap "^1.0.1"
prosemirror-model "^1.7.1" prosemirror-model "^1.7.1"
prosemirror-state "^1.2.3" prosemirror-state "^1.2.3"
prosemirror-view "^1.9.8" prosemirror-view "^1.9.12"
tiptap-commands "^1.10.7" tiptap-commands "^1.10.11"
tiptap-utils "^1.5.5" tiptap-utils "^1.6.0"
title-case@^2.1.0: title-case@^2.1.0:
version "2.1.1" version "2.1.1"