repo: cleanup dependencies (#10717)

The commit performs the following changes: - removes an unused dependencies from `@theia` extensions - adds any missing dependencies (declared but never added to the respective `package.json`) Signed-off-by: vince-fugnitto <[email protected]>
eclipse-theia · Feb 17, 2022 · 924eda3 · 924eda3
1 parent 1ef86ee
commit 924eda3
Show file tree

Hide file tree

Showing 31 changed files with 8 additions and 139 deletions.
diff --git a/dev-packages/cli/package.json b/dev-packages/cli/package.json
@@ -36,12 +36,9 @@
     "@theia/localization-manager": "1.22.1",
     "@theia/ovsx-client": "1.22.1",
     "@types/chai": "^4.2.7",
-    "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^5.2.7",
     "@types/node-fetch": "^2.5.7",
     "@types/puppeteer": "^2.0.0",
-    "@types/requestretry": "^1.12.3",
-    "@types/tar": "^4.0.3",
     "chai": "^4.2.0",
     "chalk": "4.0.0",
     "decompress": "^4.2.1",
@@ -52,18 +49,13 @@
     "puppeteer": "^2.0.0",
     "puppeteer-to-istanbul": "^1.2.2",
     "temp": "^0.9.1",
-    "unzipper": "^0.9.11",
     "yargs": "^15.3.1"
   },
   "devDependencies": {
     "@types/chai": "^4.2.7",
-    "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^5.2.7",
     "@types/node-fetch": "^2.5.7",
     "@types/proxy-from-env": "^1.0.1",
-    "@types/puppeteer": "^2.0.0",
-    "@types/requestretry": "^1.12.3",
-    "@types/tar": "^4.0.3",
-    "@types/unzipper": "^0.9.2"
+    "@types/puppeteer": "^2.0.0"
   }
 }
diff --git a/packages/callhierarchy/package.json b/packages/callhierarchy/package.json
@@ -5,7 +5,6 @@
   "dependencies": {
     "@theia/core": "1.22.1",
     "@theia/editor": "1.22.1",
-    "@theia/monaco": "1.22.1",
     "ts-md5": "^1.2.2"
   },
   "publishConfig": {

diff --git a/packages/callhierarchy/tsconfig.json b/packages/callhierarchy/tsconfig.json
@@ -14,9 +14,6 @@
     },
     {
       "path": "../editor"
-    },
-    {
-      "path": "../monaco"
     }
   ]
 }
diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -10,11 +10,9 @@
     "@theia/markers": "1.22.1",
     "@theia/monaco": "1.22.1",
     "@theia/output": "1.22.1",
-    "@theia/preferences": "1.22.1",
     "@theia/process": "1.22.1",
     "@theia/task": "1.22.1",
     "@theia/terminal": "1.22.1",
-    "@theia/userstorage": "1.22.1",
     "@theia/variable-resolver": "1.22.1",
     "@theia/workspace": "1.22.1",
     "jsonc-parser": "^2.2.0",

diff --git a/packages/debug/tsconfig.json b/packages/debug/tsconfig.json
@@ -30,9 +30,6 @@
     {
       "path": "../output"
     },
-    {
-      "path": "../preferences"
-    },
     {
       "path": "../process"
     },
@@ -42,9 +39,6 @@
     {
       "path": "../terminal"
     },
-    {
-      "path": "../userstorage"
-    },
     {
       "path": "../variable-resolver"
     },

diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -4,9 +4,7 @@
   "description": "Theia - Editor Extension",
   "dependencies": {
     "@theia/core": "1.22.1",
-    "@theia/variable-resolver": "1.22.1",
-    "@types/base64-arraybuffer": "0.1.0",
-    "base64-arraybuffer": "^0.1.5"
+    "@theia/variable-resolver": "1.22.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/file-search/package.json b/packages/file-search/package.json
@@ -6,7 +6,6 @@
     "@theia/core": "1.22.1",
     "@theia/editor": "1.22.1",
     "@theia/filesystem": "1.22.1",
-    "@theia/monaco": "1.22.1",
     "@theia/process": "1.22.1",
     "@theia/workspace": "1.22.1",
     "vscode-ripgrep": "^1.2.4"

diff --git a/packages/file-search/src/common/monaco.d.ts b/packages/file-search/src/common/monaco.d.ts
diff --git a/packages/file-search/tsconfig.json b/packages/file-search/tsconfig.json
@@ -18,9 +18,6 @@
     {
       "path": "../filesystem"
     },
-    {
-      "path": "../monaco"
-    },
     {
       "path": "../process"
     },

diff --git a/packages/filesystem/package.json b/packages/filesystem/package.json
@@ -14,7 +14,6 @@
     "http-status-codes": "^1.3.0",
     "minimatch": "^3.0.4",
     "multer": "^1.4.2",
-    "perfect-scrollbar": "^1.3.0",
     "rimraf": "^2.6.2",
     "tar-fs": "^1.16.2",
     "trash": "^6.1.1",

diff --git a/packages/getting-started/package.json b/packages/getting-started/package.json
@@ -4,7 +4,6 @@
   "description": "Theia - GettingStarted Extension",
   "dependencies": {
     "@theia/core": "1.22.1",
-    "@theia/filesystem": "1.22.1",
     "@theia/keymaps": "1.22.1",
     "@theia/workspace": "1.22.1"
   },

diff --git a/packages/getting-started/tsconfig.json b/packages/getting-started/tsconfig.json
@@ -12,9 +12,6 @@
     {
       "path": "../core"
     },
-    {
-      "path": "../filesystem"
-    },
     {
       "path": "../keymaps"
     },

diff --git a/packages/git/package.json b/packages/git/package.json
@@ -6,7 +6,6 @@
     "@theia/core": "1.22.1",
     "@theia/editor": "1.22.1",
     "@theia/filesystem": "1.22.1",
-    "@theia/monaco": "1.22.1",
     "@theia/navigator": "1.22.1",
     "@theia/scm": "1.22.1",
     "@theia/scm-extra": "1.22.1",

diff --git a/packages/git/tsconfig.json b/packages/git/tsconfig.json
@@ -18,9 +18,6 @@
     {
       "path": "../filesystem"
     },
-    {
-      "path": "../monaco"
-    },
     {
       "path": "../navigator"
     },

diff --git a/packages/keymaps/package.json b/packages/keymaps/package.json
@@ -6,14 +6,10 @@
     "@theia/core": "1.22.1",
     "@theia/monaco": "1.22.1",
     "@theia/userstorage": "1.22.1",
-    "@theia/workspace": "1.22.1",
-    "@types/lodash.debounce": "4.0.3",
     "jsonc-parser": "^2.2.0"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.22.1",
-    "@types/temp": "^0.8.29",
-    "temp": "^0.8.3"
+    "@theia/ext-scripts": "1.22.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/keymaps/tsconfig.json b/packages/keymaps/tsconfig.json
@@ -17,9 +17,6 @@
     },
     {
       "path": "../userstorage"
-    },
-    {
-      "path": "../workspace"
     }
   ]
 }
diff --git a/packages/monaco/package.json b/packages/monaco/package.json
@@ -9,7 +9,6 @@
     "@theia/markers": "1.22.1",
     "@theia/monaco-editor-core": "0.23.0",
     "@theia/outline-view": "1.22.1",
-    "@theia/workspace": "1.22.1",
     "fast-plist": "^0.1.2",
     "idb": "^4.0.5",
     "jsonc-parser": "^2.2.0",

diff --git a/packages/monaco/tsconfig.json b/packages/monaco/tsconfig.json
@@ -23,9 +23,6 @@
     },
     {
       "path": "../outline-view"
-    },
-    {
-      "path": "../workspace"
     }
   ]
 }
diff --git a/packages/outline-view/package.json b/packages/outline-view/package.json
@@ -3,8 +3,7 @@
   "version": "1.22.1",
   "description": "Theia - Outline View Extension",
   "dependencies": {
-    "@theia/core": "1.22.1",
-    "perfect-scrollbar": "^1.3.0"
+    "@theia/core": "1.22.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/plugin-dev/package.json b/packages/plugin-dev/package.json
@@ -10,7 +10,6 @@
     "@theia/filesystem": "1.22.1",
     "@theia/output": "1.22.1",
     "@theia/plugin-ext": "1.22.1",
-    "@theia/preferences": "1.22.1",
     "@theia/workspace": "1.22.1",
     "@types/request": "^2.0.3",
     "ps-tree": "^1.2.0",

diff --git a/packages/plugin-dev/tsconfig.json b/packages/plugin-dev/tsconfig.json
@@ -28,9 +28,6 @@
     {
       "path": "../plugin-ext"
     },
-    {
-      "path": "../preferences"
-    },
     {
       "path": "../workspace"
     }

diff --git a/packages/preferences/package.json b/packages/preferences/package.json
@@ -10,6 +10,7 @@
     "@theia/userstorage": "1.22.1",
     "@theia/workspace": "1.22.1",
     "async-mutex": "^0.3.1",
+    "p-debounce": "^2.1.0",
     "jsonc-parser": "^2.2.0"
   },
   "publishConfig": {

diff --git a/packages/preview/src/browser/markdown/markdown-preview-handler.ts b/packages/preview/src/browser/markdown/markdown-preview-handler.ts
@@ -52,10 +52,9 @@ export class MarkdownPreviewHandler implements PreviewHandler {
     renderContent(params: RenderContentParams): HTMLElement {
         const content = params.content;
         const renderedContent = this.getEngine().render(content, params);
-        const sanitizedContent = DOMPurify.sanitize(renderedContent);
         const contentElement = document.createElement('div');
         contentElement.classList.add(this.contentClass);
-        contentElement.innerHTML = sanitizedContent;
+        contentElement.innerHTML = DOMPurify.sanitize(renderedContent);
         this.addLinkClickedListener(contentElement, params);
         return contentElement;
     }

diff --git a/packages/task/package.json b/packages/task/package.json
@@ -8,13 +8,11 @@
     "@theia/filesystem": "1.22.1",
     "@theia/markers": "1.22.1",
     "@theia/monaco": "1.22.1",
-    "@theia/preferences": "1.22.1",
     "@theia/process": "1.22.1",
     "@theia/terminal": "1.22.1",
     "@theia/userstorage": "1.22.1",
     "@theia/variable-resolver": "1.22.1",
     "@theia/workspace": "1.22.1",
-    "ajv": "^6.5.3",
     "async-mutex": "^0.3.1",
     "jsonc-parser": "^2.2.0",
     "p-debounce": "^2.1.0"

diff --git a/packages/task/tsconfig.json b/packages/task/tsconfig.json
@@ -24,9 +24,6 @@
     {
       "path": "../monaco"
     },
-    {
-      "path": "../preferences"
-    },
     {
       "path": "../process"
     },

diff --git a/packages/terminal/package.json b/packages/terminal/package.json
@@ -6,7 +6,6 @@
     "@theia/core": "1.22.1",
     "@theia/editor": "1.22.1",
     "@theia/filesystem": "1.22.1",
-    "@theia/monaco": "1.22.1",
     "@theia/process": "1.22.1",
     "@theia/workspace": "1.22.1",
     "xterm": "^4.16.0",

diff --git a/packages/terminal/src/common/monaco.d.ts b/packages/terminal/src/common/monaco.d.ts
diff --git a/packages/terminal/tsconfig.json b/packages/terminal/tsconfig.json
@@ -18,9 +18,6 @@
     {
       "path": "../filesystem"
     },
-    {
-      "path": "../monaco"
-    },
     {
       "path": "../process"
     },

diff --git a/packages/vsx-registry/package.json b/packages/vsx-registry/package.json
@@ -10,9 +10,7 @@
     "@theia/plugin-ext-vscode": "1.22.1",
     "@theia/preferences": "1.22.1",
     "@theia/workspace": "1.22.1",
-    "@types/bent": "^7.0.1",
     "@types/showdown": "^1.7.1",
-    "bent": "^7.1.0",
     "p-debounce": "^2.1.0",
     "requestretry": "^3.1.0",
     "semver": "^5.4.1",
@@ -53,7 +51,8 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.22.1"
+    "@theia/ext-scripts": "1.22.1",
+    "@types/requestretry": "^1.12.3"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"

diff --git a/packages/workspace/package.json b/packages/workspace/package.json
@@ -6,9 +6,7 @@
     "@theia/core": "1.22.1",
     "@theia/filesystem": "1.22.1",
     "@theia/variable-resolver": "1.22.1",
-    "ajv": "^6.5.3",
     "jsonc-parser": "^2.2.0",
-    "moment": "2.24.0",
     "valid-filename": "^2.0.1"
   },
   "publishConfig": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,9 +14,6 @@ @@
         },
         {
           "path": "../editor"
-        },
-        {
-          "path": "../monaco"
         }
       ]
     }