fix: update devdeps and fix lerna config

.yarn/sdks/eslint/bin/eslint.js

@@ -2,7 +2,7 @@
 
 const {existsSync} = require(`fs`);
 const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve, dirname} = require(`path`);
+const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.js";
 

.yarn/sdks/eslint/lib/api.js

@@ -2,7 +2,7 @@
 
 const {existsSync} = require(`fs`);
 const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve, dirname} = require(`path`);
+const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.js";
 

.yarn/sdks/eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "7.13.0-pnpify",
+  "version": "7.15.0-pnpify",
   "main": "./lib/api.js",
   "type": "commonjs"
 }

.yarn/sdks/prettier/index.js

@@ -14,6 +14,16 @@ if (existsSync(absPnpApiPath)) {
     // Setup the environment to be able to require prettier/index.js
     require(absPnpApiPath).setup();
   }
+
+  const pnpifyResolution = require.resolve(`@yarnpkg/pnpify`, {paths: [dirname(absPnpApiPath)]});
+  if (typeof global[`__yarnpkg_sdk_is_using_pnpify__`] === `undefined`) {
+    Object.defineProperty(global, `__yarnpkg_sdk_is_using_pnpify__`, {configurable: true, value: true});
+
+    process.env.NODE_OPTIONS += ` -r ${pnpifyResolution}`;
+
+    // Apply PnPify to the current process
+    absRequire(pnpifyResolution).patchFs();
+  }
 }
 
 // Defer to the real prettier/index.js your application uses

.yarn/sdks/prettier/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.1.2-pnpify",
+  "version": "2.2.1-pnpify",
   "main": "./index.js",
   "type": "commonjs"
 }

.yarn/sdks/typescript/bin/tsc

@@ -2,7 +2,7 @@
 
 const {existsSync} = require(`fs`);
 const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve, dirname} = require(`path`);
+const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.js";
 

.yarn/sdks/typescript/bin/tsserver

@@ -2,7 +2,7 @@
 
 const {existsSync} = require(`fs`);
 const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve, dirname} = require(`path`);
+const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.js";
 

.yarn/sdks/typescript/lib/tsc.js

@@ -2,7 +2,7 @@
 
 const {existsSync} = require(`fs`);
 const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve, dirname} = require(`path`);
+const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.js";
 

.yarn/sdks/typescript/lib/tsserver.js

@@ -2,19 +2,73 @@
 
 const {existsSync} = require(`fs`);
 const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve, dirname} = require(`path`);
+const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.js";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
 const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 const moduleWrapper = tsserver => {
+  const {isAbsolute} = require(`path`);
+  const pnpApi = require(`pnpapi`);
+
+  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
+    return `${locator.name}@${locator.reference}`;
+  }));
+
   // 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`);
+  function toEditorPath(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\//))) {
+      // We also take the opportunity to turn virtual paths into physical ones;
+      // this makes is much easier to work with workspaces that list peer
+      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
+      // file instances instead of the real ones.
+      //
+      // We only do this to modules owned by the the dependency tree roots.
+      // This avoids breaking the resolution when jumping inside a vendor
+      // with peer dep (otherwise jumping into react-dom would show resolution
+      // errors on react).
+      //
+      const resolved = pnpApi.resolveVirtual(str);
+      if (resolved) {
+        const locator = pnpApi.findPackageLocator(resolved);
+        if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
+         str = resolved;
+        }
+      }
+
+      str = str.replace(/\\/g, `/`)
+      str = str.replace(/^\/?/, `/`);
+
+      // 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
+      //
+      // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+      //
+      if (str.match(/\.zip\//)) {
+        str = `${isVSCode ? `^` : ``}zip:${str}`;
+      }
+    }
+
+    return str;
+  }
+
+  function fromEditorPath(str) {
+    return process.platform === `win32`
+      ? str.replace(/^\^?zip:\//, ``)
+      : str.replace(/^\^?zip:/, ``);
+  }
+
+  // And here is the point where we hijack the VSCode <-> TS communications
+  // by adding ourselves in the middle. We locate everything that looks
+  // like an absolute path of ours and normalize it.
 
   const Session = tsserver.server.Session;
   const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
@@ -26,44 +80,24 @@ const moduleWrapper = tsserver => {
 
       if (
         parsedMessage != null &&
-        typeof parsedMessage === 'object' &&
+        typeof parsedMessage === `object` &&
         parsedMessage.arguments &&
-        parsedMessage.arguments.hostInfo === 'vscode'
+        parsedMessage.arguments.hostInfo === `vscode`
       ) {
         isVSCode = true;
       }
 
       return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
-        return typeof value === 'string' ? removeZipPrefix(value) : value;
+        return typeof value === `string` ? fromEditorPath(value) : value;
       }));
     },
 
     send(/** @type {any} */ msg) {
       return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
-        return typeof value === 'string' ? addZipPrefix(value) : value;
+        return typeof value === `string` ? toEditorPath(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)) {

.yarn/sdks/typescript/lib/typescript.js

@@ -2,7 +2,7 @@
 
 const {existsSync} = require(`fs`);
 const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve, dirname} = require(`path`);
+const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.js";
 

.yarn/sdks/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.0.5-pnpify",
+  "version": "4.1.3-pnpify",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }

.yarnrc.yml

@@ -1,3 +1,3 @@
 defaultSemverRangePrefix: ^
 
-yarnPath: .yarn/releases/yarn-2.3.3.cjs
+yarnPath: .yarn/releases/yarn-2.4.0.cjs

lerna.json

@@ -0,0 +1,15 @@
+{
+  "version": "10.0.1",
+  "npmClient": "yarn",
+  "useWorkspaces": true,
+  "command": {
+    "publish": {
+      "ignoreChanges": [
+        "**/.yo-rc.json",
+        "**/.eslintrc.json",
+        "**/tsconfig.json",
+        "**/tsconfig.build.json"
+      ]
+    }
+  }
+}

package.json

@@ -10,21 +10,6 @@
   "engines": {
     "node": ">=12.10.0"
   },
-  "lerna": {
-    "version": "10.0.1",
-    "npmClient": "yarn",
-    "useWorkspaces": true,
-    "command": {
-      "publish": {
-        "ignoreChanges": [
-          "**/.yo-rc.json",
-          "**/.eslintrc.json",
-          "**/tsconfig.json",
-          "**/tsconfig.build.json"
-        ]
-      }
-    }
-  },
   "workspaces": [
     "packages/*"
   ],
@@ -68,14 +53,14 @@
     "@pob/eslint-config-typescript": "41.0.4",
     "@pob/eslint-config-typescript-node": "41.0.4",
     "@pob/lerna-light": "3.23.0",
-    "@pob/root": "3.0.1",
+    "@pob/root": "3.0.3",
     "@types/node": "14.14.7",
-    "eslint": "7.13.0",
+    "eslint": "7.15.0",
     "eslint-import-resolver-node": "0.3.4",
     "eslint-plugin-node": "11.1.0",
-    "husky": "4.3.0",
-    "prettier": "2.1.2",
+    "husky": "4.3.5",
+    "prettier": "2.2.1",
     "typedoc": "0.19.2",
-    "typescript": "4.0.5"
+    "typescript": "4.1.3"
   }
 }

packages/nightingale-ansi-formatter/package.json

@@ -37,6 +37,7 @@
     "build:definitions": "tsc -p tsconfig.build.json",
     "clean": "rm -Rf docs dist test/node6 coverage",
     "generate:test-coverage": "rm -Rf docs/coverage/ ; NODE_ENV=production BABEL_ENV=test jest --coverage --coverageReporters=pob-lcov-reporter --coverageDirectory=docs/coverage/",
+    "lint": "yarn run lint:eslint",
     "lint:eslint": "yarn --cwd ../.. eslint --ext .js,.ts --report-unused-disable-directives --quiet packages/nightingale-ansi-formatter",
     "test": "jest",
     "test:watch": "jest",
@@ -88,26 +89,26 @@
     "nightingale-types": "^10.0.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.3",
+    "@babel/core": "7.12.10",
     "@pob/eslint-config": "41.0.4",
     "@pob/eslint-config-node": "41.0.4",
     "@pob/eslint-config-typescript": "41.0.4",
     "@pob/eslint-config-typescript-node": "41.0.4",
-    "@types/jest": "26.0.15",
-    "@typescript-eslint/eslint-plugin": "4.8.1",
-    "@typescript-eslint/parser": "4.8.1",
+    "@types/jest": "26.0.19",
+    "@typescript-eslint/eslint-plugin": "4.9.1",
+    "@typescript-eslint/parser": "4.9.1",
     "babel-jest": "26.6.3",
-    "babel-preset-latest-node": "5.1.1",
-    "eslint": "7.13.0",
+    "babel-preset-latest-node": "5.2.0",
+    "eslint": "7.15.0",
     "eslint-import-resolver-node": "0.3.4",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-unicorn": "23.0.0",
     "jest": "26.6.3",
-    "pob-babel": "26.0.1",
+    "pob-babel": "26.2.0",
     "pob-lcov-reporter": "4.0.1",
-    "rollup": "2.33.2",
-    "typescript": "4.0.5",
+    "rollup": "2.34.2",
+    "typescript": "4.1.3",
     "xunit-file": "1.0.0"
   }
 }

packages/nightingale-app-console/package.json

@@ -55,6 +55,7 @@
     "build": "pob-build && yarn run build:definitions",
     "build:definitions": "tsc -p tsconfig.build.json",
     "clean": "rm -Rf docs dist test/node6 coverage",
+    "lint": "yarn run lint:eslint",
     "lint:eslint": "yarn --cwd ../.. eslint --ext .js,.ts --report-unused-disable-directives --quiet packages/nightingale-app-console",
     "watch": "pob-watch"
   },
@@ -99,23 +100,23 @@
     "source-map-support": "^0.4.14"
   },
   "devDependencies": {
-    "@babel/core": "7.12.3",
-    "@babel/preset-env": "7.12.1",
+    "@babel/core": "7.12.10",
+    "@babel/preset-env": "7.12.10",
     "@pob/eslint-config": "41.0.4",
     "@pob/eslint-config-node": "41.0.4",
     "@pob/eslint-config-typescript": "41.0.4",
     "@types/source-map-support": "0.4.2",
-    "@typescript-eslint/eslint-plugin": "4.8.1",
-    "@typescript-eslint/parser": "4.8.1",
-    "babel-preset-latest-node": "5.1.1",
+    "@typescript-eslint/eslint-plugin": "4.9.1",
+    "@typescript-eslint/parser": "4.9.1",
+    "babel-preset-latest-node": "5.2.0",
     "babel-preset-modern-browsers": "15.0.2",
-    "eslint": "7.13.0",
+    "eslint": "7.15.0",
     "eslint-import-resolver-node": "0.3.4",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-unicorn": "23.0.0",
-    "pob-babel": "26.0.1",
-    "rollup": "2.33.2",
-    "typescript": "4.0.5"
+    "pob-babel": "26.2.0",
+    "rollup": "2.34.2",
+    "typescript": "4.1.3"
   }
 }