💄

Author: jeanp413

.gitignore

@@ -3,7 +3,4 @@
 npm-debug.log
 Thumbs.db
 node_modules/
-/**/dist/
-/**/out/
 yarn-error.log
-tsconfig.tsbuildinfo

gitpod-shared/package.json

@@ -23,7 +23,6 @@
     "@types/vscode-webview": "^1.57.0",
     "@types/ws": "^7.2.6",
     "mocha": "^10.0.0",
-    "reflect-metadata": "^0.1.13",
     "svelte": "^3.0.0",
     "svelte-check": "^2.0.0",
     "svelte-preprocess": "^4.0.0",
@@ -40,7 +39,7 @@
     "utf-8-validate": "^5.0.2",
     "uuid": "^8.3.1",
     "vscode-nls": "^5.0.0",
-    "vscode-ws-jsonrpc": "0.2.0",
+    "vscode-ws-jsonrpc": "^0.2.0",
     "ws": "^7.4.6",
     "yaml": "^1.10.0"
   }

gitpod-shared/src/features.ts

@@ -2,8 +2,6 @@
  *  Copyright (c) Gitpod. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
-// TODO get rid of loading inversify and reflect-metadata
-require('reflect-metadata');
 import { GitpodClient, GitpodServer, GitpodServiceImpl } from '@gitpod/gitpod-protocol/lib/gitpod-service';
 import { JsonRpcProxyFactory } from '@gitpod/gitpod-protocol/lib/messaging/proxy-factory';
 import { NavigatorContext } from '@gitpod/gitpod-protocol/lib/protocol';

gitpod-shared/yarn.lock

@@ -1862,7 +1862,7 @@ vscode-uri@^3.0.3:
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.7.tgz#6d19fef387ee6b46c479e5fb00870e15e58c1eb8"
   integrity sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==
 
-vscode-ws-jsonrpc@0.2.0, vscode-ws-jsonrpc@^0.2.0:
+vscode-ws-jsonrpc@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.2.0.tgz#5e9c26e10da54a1a235da7d59e74508bbcb8edd9"
   integrity sha512-NE9HNRgPjCaPyTJvIudcpyIWPImxwRDtuTX16yks7SAiZgSXigxAiZOvSvVBGmD1G/OMfrFo6BblOtjVR9DdVA==

package.json

@@ -5,24 +5,12 @@
   "license": "MIT",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "glob": "^8.1.0",
-    "typescript": "4.9.4"
+    "glob": "^8.1.0"
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.js",
-    "compile": "yarn build:ts && yarn build:gitpod-web && yarn build:gitpod-remote",
-    "watch": "npm-run-all -lp watch:ts watch:gitpod-web",
-    "build:ts": "./node_modules/.bin/tsc -b",
-    "watch:ts": "./node_modules/.bin/tsc -b -w",
-    "build:gitpod-web": "yarn --cwd gitpod-web vscode:prepublish",
-    "watch:gitpod-web": "yarn --cwd gitpod-web watch:webview",
-    "build:gitpod-remote": "yarn --cwd gitpod-remote vscode:prepublish",
-    "watch:gitpod-remote": "yarn --cwd gitpod-remote watch"
-  },
-  "devDependencies": {
-    "@parcel/watcher": "2.1.0",
-    "esbuild": "^0.15.14",
-    "npm-run-all": "^4.1.5",
-    "vscode-grammar-updater": "^1.1.0"
+    "compile:gitpod-shared": "yarn --cwd gitpod-shared compile",
+    "build:gitpod-web": "yarn compile:gitpod-shared && yarn --cwd gitpod-web vscode:prepublish",
+    "build:gitpod-remote": "yarn compile:gitpod-shared && yarn --cwd gitpod-remote vscode:prepublish"
   }
 }

scripts/postinstall.js

@@ -14,6 +14,7 @@ function yarnInstall(location, opts) {
 	const raw = process.env['npm_config_argv'] || '{}';
 	const argv = JSON.parse(raw);
 	const original = argv.original || [];
+	const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile' || arg === '--check-files');
 	if (opts.ignoreEngines) {
 		args.push('--ignore-engines');
 		delete opts.ignoreEngines;
@@ -34,4 +35,3 @@ for (let dir of extensionDirectories) {
     dir = dir.replace("package.json", "");
     yarnInstall(dir, { ignoreEngines: true });
 }
-