8 files changed, 175 insertions, 161 deletions
diff --git a/FrontEnd/.yarn/sdks/eslint/lib/api.js b/FrontEnd/.yarn/sdks/eslint/lib/api.js
index dd6df163..bbcd99d6 100644
--- a/FrontEnd/.yarn/sdks/eslint/lib/api.js
+++ b/FrontEnd/.yarn/sdks/eslint/lib/api.js
@@ -1,20 +1,20 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.js";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require eslint/lib/api.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real eslint/lib/api.js your application uses
-module.exports = absRequire(`eslint/lib/api.js`);
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, createRequireFromPath} = require(`module`);
+const {resolve, dirname} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.js";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require eslint/lib/api.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real eslint/lib/api.js your application uses
+module.exports = absRequire(`eslint/lib/api.js`);
diff --git a/FrontEnd/.yarn/sdks/eslint/package.json b/FrontEnd/.yarn/sdks/eslint/package.json
index b7d1fe0e..d57cb9c3 100644
--- a/FrontEnd/.yarn/sdks/eslint/package.json
+++ b/FrontEnd/.yarn/sdks/eslint/package.json
@@ -1,6 +1,6 @@
-{
-  "name": "eslint",
-  "version": "7.5.0-pnpify",
-  "main": "./lib/api.js",
-  "type": "commonjs"
-}
-\ No newline at end of file
+{
+  "name": "eslint",
+  "version": "7.12.1-pnpify",
+  "main": "./lib/api.js",
+  "type": "commonjs"
+}
diff --git a/FrontEnd/.yarn/sdks/prettier/index.js b/FrontEnd/.yarn/sdks/prettier/index.js
index 5158364a..984baf1d 100644
--- a/FrontEnd/.yarn/sdks/prettier/index.js
+++ b/FrontEnd/.yarn/sdks/prettier/index.js
@@ -1,20 +1,20 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../.pnp.js";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/index.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real prettier/index.js your application uses
-module.exports = absRequire(`prettier/index.js`);
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, createRequireFromPath} = require(`module`);
+const {resolve, dirname} = require(`path`);
+
+const relPnpApiPath = "../../../.pnp.js";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require prettier/index.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real prettier/index.js your application uses
+module.exports = absRequire(`prettier/index.js`);
diff --git a/FrontEnd/.yarn/sdks/prettier/package.json b/FrontEnd/.yarn/sdks/prettier/package.json
index 0a3b4040..6a957f27 100644
--- a/FrontEnd/.yarn/sdks/prettier/package.json
+++ b/FrontEnd/.yarn/sdks/prettier/package.json
@@ -1,6 +1,6 @@
-{
-  "name": "prettier",
-  "version": "2.0.5-pnpify",
-  "main": "./index.js",
-  "type": "commonjs"
-}
-\ No newline at end of file
+{
+  "name": "prettier",
+  "version": "2.1.2-pnpify",
+  "main": "./index.js",
+  "type": "commonjs"
+}
diff --git a/FrontEnd/.yarn/sdks/typescript/lib/tsc.js b/FrontEnd/.yarn/sdks/typescript/lib/tsc.js
index bae984f9..4bc23fc2 100644
--- a/FrontEnd/.yarn/sdks/typescript/lib/tsc.js
+++ b/FrontEnd/.yarn/sdks/typescript/lib/tsc.js
@@ -1,20 +1,20 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.js";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsc.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/tsc.js your application uses
-module.exports = absRequire(`typescript/lib/tsc.js`);
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, createRequireFromPath} = require(`module`);
+const {resolve, dirname} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.js";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsc.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/tsc.js your application uses
+module.exports = absRequire(`typescript/lib/tsc.js`);
diff --git a/FrontEnd/.yarn/sdks/typescript/lib/tsserver.js b/FrontEnd/.yarn/sdks/typescript/lib/tsserver.js
index 70838e59..eaae166c 100644
--- a/FrontEnd/.yarn/sdks/typescript/lib/tsserver.js
+++ b/FrontEnd/.yarn/sdks/typescript/lib/tsserver.js
@@ -1,63 +1,77 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.js";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-const moduleWrapper = tsserver => {
-  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
-  // doesn't understand. This layer makes sure to remove the protocol
-  // before forwarding it to TS, and to add it back on all returned paths.
-
-  const {isAbsolute} = require(`path`);
-
-  const Session = tsserver.server.Session;
-  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
-
-  return Object.assign(Session.prototype, {
-    onMessage(/** @type {string} */ message) {
-      return originalOnMessage.call(this, JSON.stringify(JSON.parse(message), (key, value) => {
-        return typeof value === 'string' ? removeZipPrefix(value) : value;
-      }));
-    },
-
-    send(/** @type {any} */ msg) {
-      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
-        return typeof value === 'string' ? addZipPrefix(value) : value;
-      })));
-    }
-  });
-
-  function addZipPrefix(str) {
-    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
-    if (isAbsolute(str) && !str.match(/^zip:/) && (str.match(/\.zip\//) || str.match(/\$\$virtual\//))) {
-      // Absolute VSCode `Uri.fsPath`s need to start with a slash.
-      // VSCode only adds it automatically for supported schemes,
-      // so we have to do it manually for the `zip` scheme.
-      return `zip:${str.replace(/^\/?/, `/`)}`;
-    } else {
-      return str;
-    }
-  }
-
-  function removeZipPrefix(str) {
-    return process.platform === 'win32'
-      ? str.replace(/^zip:\//, ``)
-      : str.replace(/^zip:/, ``);
-  }
-};
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsserver.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/tsserver.js your application uses
-module.exports = moduleWrapper(absRequire(`typescript/lib/tsserver.js`));
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, createRequireFromPath} = require(`module`);
+const {resolve, dirname} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.js";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+
+const moduleWrapper = tsserver => {
+  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
+  // doesn't understand. This layer makes sure to remove the protocol
+  // before forwarding it to TS, and to add it back on all returned paths.
+
+  const {isAbsolute} = require(`path`);
+
+  const Session = tsserver.server.Session;
+  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
+  let isVSCode = false;
+
+  return Object.assign(Session.prototype, {
+    onMessage(/** @type {string} */ message) {
+      const parsedMessage = JSON.parse(message)
+
+      if (
+        parsedMessage != null &&
+        typeof parsedMessage === 'object' &&
+        parsedMessage.arguments &&
+        parsedMessage.arguments.hostInfo === 'vscode'
+      ) {
+        isVSCode = true;
+      }
+
+      return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
+        return typeof value === 'string' ? removeZipPrefix(value) : value;
+      }));
+    },
+
+    send(/** @type {any} */ msg) {
+      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
+        return typeof value === 'string' ? addZipPrefix(value) : value;
+      })));
+    }
+  });
+
+  function addZipPrefix(str) {
+    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
+    if (isAbsolute(str) && !str.match(/^\^zip:/) && (str.match(/\.zip\//) || str.match(/\$\$virtual\//))) {
+      // Absolute VSCode `Uri.fsPath`s need to start with a slash.
+      // VSCode only adds it automatically for supported schemes,
+      // so we have to do it manually for the `zip` scheme.
+      // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
+      // https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+      return `${isVSCode ? '^' : ''}zip:${str.replace(/^\/?/, `/`)}`;
+    } else {
+      return str;
+    }
+  }
+
+  function removeZipPrefix(str) {
+    return process.platform === 'win32'
+      ? str.replace(/^\^?zip:\//, ``)
+      : str.replace(/^\^?zip:/, ``);
+  }
+};
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsserver.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/tsserver.js your application uses
+module.exports = moduleWrapper(absRequire(`typescript/lib/tsserver.js`));
diff --git a/FrontEnd/.yarn/sdks/typescript/lib/typescript.js b/FrontEnd/.yarn/sdks/typescript/lib/typescript.js
index 81bea7ce..3ee6808d 100644
--- a/FrontEnd/.yarn/sdks/typescript/lib/typescript.js
+++ b/FrontEnd/.yarn/sdks/typescript/lib/typescript.js
@@ -1,20 +1,20 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.js";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/typescript.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/typescript.js your application uses
-module.exports = absRequire(`typescript/lib/typescript.js`);
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, createRequireFromPath} = require(`module`);
+const {resolve, dirname} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.js";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/typescript.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/typescript.js your application uses
+module.exports = absRequire(`typescript/lib/typescript.js`);
diff --git a/FrontEnd/.yarn/sdks/typescript/package.json b/FrontEnd/.yarn/sdks/typescript/package.json
index a884274a..5fa233a1 100644
--- a/FrontEnd/.yarn/sdks/typescript/package.json
+++ b/FrontEnd/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
-{
-  "name": "typescript",
-  "version": "3.9.7-pnpify",
-  "main": "./lib/typescript.js",
-  "type": "commonjs"
-}
-\ No newline at end of file
+{
+  "name": "typescript",
+  "version": "4.0.5-pnpify",
+  "main": "./lib/typescript.js",
+  "type": "commonjs"
+}