From 06c9ada53993dcbbaa3c4c5ff22ae5693174784d Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Mon, 12 Sep 2022 14:53:25 -0700 Subject: [PATCH] Move markdown-it to package it is used in. Mark as nohoist to prevent entities dependency collisions. --- kolibri/core/package.json | 1 - kolibri/plugins/coach/package.json | 4 ++++ packages/kolibri-core-for-export/package.json | 1 - yarn.lock | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kolibri/core/package.json b/kolibri/core/package.json index 404d3b25d09..087e8778699 100644 --- a/kolibri/core/package.json +++ b/kolibri/core/package.json @@ -24,7 +24,6 @@ "lockr": "0.8.4", "lodash": "^4.17.21", "loglevel": "^1.4.1", - "markdown-it": "12.3.2", "screenfull": "^4.0.0", "shave": "^5.0.0", "tinycolor2": "^1.4.2", diff --git a/kolibri/plugins/coach/package.json b/kolibri/plugins/coach/package.json index 8f92c01e070..19683e53955 100644 --- a/kolibri/plugins/coach/package.json +++ b/kolibri/plugins/coach/package.json @@ -3,7 +3,11 @@ "description": "Coach Plugin for Kolibri", "private": true, "version": "0.0.1", + "workspaces": { + "nohoist": ["markdown-it", "markdown-it/**"] + }, "dependencies": { + "markdown-it": "12.3.2", "truncate-utf8-bytes": "^1.0.2" } } diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json index bfac40e7125..f5ffe69f0e6 100644 --- a/packages/kolibri-core-for-export/package.json +++ b/packages/kolibri-core-for-export/package.json @@ -27,7 +27,6 @@ "lockr": "0.8.4", "lodash": "^4.17.21", "loglevel": "^1.4.1", - "markdown-it": "12.3.2", "screenfull": "^4.0.0", "shave": "^5.0.0", "tinycolor2": "^1.4.2", diff --git a/yarn.lock b/yarn.lock index 6507bd3bef1..bda2893a838 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8397,7 +8397,7 @@ mdn-data@2.0.23: mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= + integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== media-typer@0.3.0: version "0.3.0"