diff --git a/package.json b/package.json index 82ad7d94..4745d9f8 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "dev": "nodemon --exec \"yarn build:server && yarn build:i18n && node --inspect=0.0.0.0 build/server/index.js\" -e js --ignore build/ --ignore app/", "lint": "eslint app server shared", "deploy": "git push heroku master", + "postinstall": "yarn yarn-deduplicate yarn.lock", "heroku-postbuild": "yarn build && yarn db:migrate", "sequelize:migrate": "sequelize db:migrate", "db:create-migration": "sequelize migration:create", @@ -200,7 +201,8 @@ "webpack-cli": "^3.3.12", "webpack-manifest-plugin": "^3.0.0", "webpack-pwa-manifest": "^4.3.0", - "workbox-webpack-plugin": "^6.1.0" + "workbox-webpack-plugin": "^6.1.0", + "yarn-deduplicate": "^3.1.0" }, "resolutions": { "prosemirror-view": "1.18.1", diff --git a/shared/i18n/locales/en_US/translation.json b/shared/i18n/locales/en_US/translation.json index c6903c26..7d42aee8 100644 --- a/shared/i18n/locales/en_US/translation.json +++ b/shared/i18n/locales/en_US/translation.json @@ -152,12 +152,12 @@ "Path to document": "Path to document", "Group member options": "Group member options", "Remove": "Remove", - "Collection": "Collection", "New document": "New document", "Import document": "Import document", "Edit": "Edit", "Permissions": "Permissions", "Delete": "Delete", + "Collection": "Collection", "Collection permissions": "Collection permissions", "Edit collection": "Edit collection", "Delete collection": "Delete collection", diff --git a/yarn.lock b/yarn.lock index 34de1529..bd8e2973 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2354,6 +2354,11 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + abab@^2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" @@ -14378,6 +14383,15 @@ yargs@^15.1.0, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" +yarn-deduplicate@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-3.1.0.tgz#3018d93e95f855f236a215b591fe8bc4bcabba3e" + integrity sha512-q2VZ6ThNzQpGfNpkPrkmV7x5HT9MOhCUsTxVTzyyZB0eSXz1NTodHn+r29DlLb+peKk8iXxzdUVhQG9pI7moFw== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + commander "^6.1.0" + semver "^7.3.2" + yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"