-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update common toolchain dependencies to use root workspace (#10)
* Mirror IDE dependencies in root package See step 2 of https://yarnpkg.com/getting-started/migration#editor-support * Align typescript version to 4.4.2 Because latest (^4.7.2) doesn't seem to work with yarn pnp module resolution * Upgrade nodeLinker to pnp * Add VSCode Editor SDK for yarn pnp See https://yarnpkg.com/getting-started/editor-sdks#vscode * Update client dependencies to enable build Because "eslintConfig": { "extends": [ "react-app" ] } in package.json would result in the following error during build: "Failed to load config "react-app" to extend from.", eslint-config-react-app was added as an explicit devDependency. Because adding eslint-config-react-app as a devDependency led to react plugin having a conflict in eslint-config-react-app packages, the following was added to .yarnrc.yml packageExtensions: react-scripts@*: peerDependencies: eslint-config-react-app: "*" See the following for explanation of above two: facebook/create-react-app#10463 (comment) Becase @testing-library/jest-dom's types were recognized by build command, @types/testing-library__jest-dom was added as a devDependency. * Update .yarnrc.yml with peerDependencies Because many packages in create-react-app rely on implicit peerDependencies, they need to be stated explicitly. See https://yarnpkg.com/advanced/error-codes#yn0002---missing_peer_dependency for more info. * Update client package.json with devDependencies Because many top-level packages in create-react-app rely on implicit peerDependencies, they need to be stated explicitly. See https://yarnpkg.com/advanced/error-codes#yn0002---missing_peer_dependency for more info. * Remove deps in root from server/package.json Because root workspace needs eslint, prettier, typescript in order to enable vscode dev tools (c.f. b3441de) - eslint can be removed from server/package.json - prettier can be removed from server/package.json - typescript can be removed from server/package.json In addition, jest, rimraf shoudl be common across all workspaces. To enable server workspace level commands that depended on rimraf, tsc, and jest, use guidance at https://yarnpkg.com/getting-started/qa#how-to-share-scripts-between-workspaces * Remove deps in root from common-api/package.json Because root workspace needs eslint, prettier, typescript in order to enable vscode dev tools (c.f. b3441de) - eslint can be removed from common-api/package.json - prettier can be removed from common-api/package.json - typescript can be removed from server/package.json In addition rimraf should be common across all workspaces. To enable server workspace level commands that depended on rimraf and tsc use guidance at https://yarnpkg.com/getting-started/qa#how-to-share-scripts-between-workspaces * Update root deps, yarnrc packageExtensions Because "ts-node-dev@npm:2.0.0 [5e2e0] doesn't provide @types/node (pc8aba), requested by ts-node" and "root-workspace-0b6124@workspace:. doesn't provide @types/node (pde784), requested by ts-node" * Use root cleanscript in client/package.json * Align client prettier to root * Align client test script to other packages * Run eslint/prettier across cli, server
- Loading branch information
Showing
40 changed files
with
1,145 additions
and
795 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"recommendations": [ | ||
"arcanis.vscode-zipfs", | ||
"dbaeumer.vscode-eslint", | ||
"esbenp.prettier-vscode" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,13 @@ | ||
{ | ||
"typescript.tsdk": "node_modules\\typescript\\lib", | ||
"typescript.tsdk": ".yarn/sdks/typescript/lib", | ||
"editor.tabSize": 2, | ||
"editor.defaultFormatter": "esbenp.prettier-vscode", | ||
"editor.formatOnSave": true | ||
"editor.formatOnSave": true, | ||
"search.exclude": { | ||
"**/.yarn": true, | ||
"**/.pnp.*": true | ||
}, | ||
"eslint.nodePath": ".yarn/sdks", | ||
"prettier.prettierPath": ".yarn/sdks/prettier/index.js", | ||
"typescript.enablePromptUseWorkspaceTsdk": true | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/usr/bin/env node | ||
|
||
const {existsSync} = require(`fs`); | ||
const {createRequire, createRequireFromPath} = require(`module`); | ||
const {resolve} = require(`path`); | ||
|
||
const relPnpApiPath = "../../../../.pnp.cjs"; | ||
|
||
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/bin/eslint.js | ||
require(absPnpApiPath).setup(); | ||
} | ||
} | ||
|
||
// Defer to the real eslint/bin/eslint.js your application uses | ||
module.exports = absRequire(`eslint/bin/eslint.js`); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/usr/bin/env node | ||
|
||
const {existsSync} = require(`fs`); | ||
const {createRequire, createRequireFromPath} = require(`module`); | ||
const {resolve} = require(`path`); | ||
|
||
const relPnpApiPath = "../../../../.pnp.cjs"; | ||
|
||
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 | ||
require(absPnpApiPath).setup(); | ||
} | ||
} | ||
|
||
// Defer to the real eslint your application uses | ||
module.exports = absRequire(`eslint`); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"name": "eslint", | ||
"version": "8.17.0-sdk", | ||
"main": "./lib/api.js", | ||
"type": "commonjs" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# This file is automatically generated by @yarnpkg/sdks. | ||
# Manual changes might be lost! | ||
|
||
integrations: | ||
- vscode |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/usr/bin/env node | ||
|
||
const {existsSync} = require(`fs`); | ||
const {createRequire, createRequireFromPath} = require(`module`); | ||
const {resolve} = require(`path`); | ||
|
||
const relPnpApiPath = "../../../.pnp.cjs"; | ||
|
||
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`); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"name": "prettier", | ||
"version": "2.6.2-sdk", | ||
"main": "./index.js", | ||
"type": "commonjs" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/usr/bin/env node | ||
|
||
const {existsSync} = require(`fs`); | ||
const {createRequire, createRequireFromPath} = require(`module`); | ||
const {resolve} = require(`path`); | ||
|
||
const relPnpApiPath = "../../../../.pnp.cjs"; | ||
|
||
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/bin/tsc | ||
require(absPnpApiPath).setup(); | ||
} | ||
} | ||
|
||
// Defer to the real typescript/bin/tsc your application uses | ||
module.exports = absRequire(`typescript/bin/tsc`); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/usr/bin/env node | ||
|
||
const {existsSync} = require(`fs`); | ||
const {createRequire, createRequireFromPath} = require(`module`); | ||
const {resolve} = require(`path`); | ||
|
||
const relPnpApiPath = "../../../../.pnp.cjs"; | ||
|
||
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/bin/tsserver | ||
require(absPnpApiPath).setup(); | ||
} | ||
} | ||
|
||
// Defer to the real typescript/bin/tsserver your application uses | ||
module.exports = absRequire(`typescript/bin/tsserver`); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/usr/bin/env node | ||
|
||
const {existsSync} = require(`fs`); | ||
const {createRequire, createRequireFromPath} = require(`module`); | ||
const {resolve} = require(`path`); | ||
|
||
const relPnpApiPath = "../../../../.pnp.cjs"; | ||
|
||
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`); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,208 @@ | ||
#!/usr/bin/env node | ||
|
||
const {existsSync} = require(`fs`); | ||
const {createRequire, createRequireFromPath} = require(`module`); | ||
const {resolve} = require(`path`); | ||
|
||
const relPnpApiPath = "../../../../.pnp.cjs"; | ||
|
||
const absPnpApiPath = resolve(__dirname, relPnpApiPath); | ||
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath); | ||
|
||
const moduleWrapper = tsserver => { | ||
if (!process.versions.pnp) { | ||
return tsserver; | ||
} | ||
|
||
const {isAbsolute} = require(`path`); | ||
const pnpApi = require(`pnpapi`); | ||
|
||
const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//); | ||
const isPortal = str => str.startsWith("portal:/"); | ||
const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`); | ||
|
||
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. | ||
|
||
function toEditorPath(str) { | ||
// We add the `zip:` prefix to both `.zip/` paths and virtual paths | ||
if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) { | ||
// We also take the opportunity to turn virtual paths into physical ones; | ||
// this makes it 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 = isVirtual(str) ? pnpApi.resolveVirtual(str) : str; | ||
if (resolved) { | ||
const locator = pnpApi.findPackageLocator(resolved); | ||
if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) { | ||
str = resolved; | ||
} | ||
} | ||
|
||
str = normalize(str); | ||
|
||
if (str.match(/\.zip\//)) { | ||
switch (hostInfo) { | ||
// 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 | ||
// | ||
// Update 2021-10-08: VSCode changed their format in 1.61. | ||
// Before | ^zip:/c:/foo/bar.zip/package.json | ||
// After | ^/zip//c:/foo/bar.zip/package.json | ||
// | ||
// Update 2022-04-06: VSCode changed the format in 1.66. | ||
// Before | ^/zip//c:/foo/bar.zip/package.json | ||
// After | ^/zip/c:/foo/bar.zip/package.json | ||
// | ||
case `vscode <1.61`: { | ||
str = `^zip:${str}`; | ||
} break; | ||
|
||
case `vscode <1.66`: { | ||
str = `^/zip/${str}`; | ||
} break; | ||
|
||
case `vscode`: { | ||
str = `^/zip${str}`; | ||
} break; | ||
|
||
// To make "go to definition" work, | ||
// We have to resolve the actual file system path from virtual path | ||
// and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip) | ||
case `coc-nvim`: { | ||
str = normalize(resolved).replace(/\.zip\//, `.zip::`); | ||
str = resolve(`zipfile:${str}`); | ||
} break; | ||
|
||
// Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server) | ||
// We have to resolve the actual file system path from virtual path, | ||
// everything else is up to neovim | ||
case `neovim`: { | ||
str = normalize(resolved).replace(/\.zip\//, `.zip::`); | ||
str = `zipfile://${str}`; | ||
} break; | ||
|
||
default: { | ||
str = `zip:${str}`; | ||
} break; | ||
} | ||
} | ||
} | ||
|
||
return str; | ||
} | ||
|
||
function fromEditorPath(str) { | ||
switch (hostInfo) { | ||
case `coc-nvim`: { | ||
str = str.replace(/\.zip::/, `.zip/`); | ||
// The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/... | ||
// So in order to convert it back, we use .* to match all the thing | ||
// before `zipfile:` | ||
return process.platform === `win32` | ||
? str.replace(/^.*zipfile:\//, ``) | ||
: str.replace(/^.*zipfile:/, ``); | ||
} break; | ||
|
||
case `neovim`: { | ||
str = str.replace(/\.zip::/, `.zip/`); | ||
// The path for neovim is in format of zipfile:///<pwd>/.yarn/... | ||
return str.replace(/^zipfile:\/\//, ``); | ||
} break; | ||
|
||
case `vscode`: | ||
default: { | ||
return process.platform === `win32` | ||
? str.replace(/^\^?(zip:|\/zip)\/+/, ``) | ||
: str.replace(/^\^?(zip:|\/zip)\/+/, `/`); | ||
} break; | ||
} | ||
} | ||
|
||
// Force enable 'allowLocalPluginLoads' | ||
// TypeScript tries to resolve plugins using a path relative to itself | ||
// which doesn't work when using the global cache | ||
// https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238 | ||
// VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but | ||
// TypeScript already does local loads and if this code is running the user trusts the workspace | ||
// https://github.com/microsoft/vscode/issues/45856 | ||
const ConfiguredProject = tsserver.server.ConfiguredProject; | ||
const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype; | ||
ConfiguredProject.prototype.enablePluginsWithOptions = function() { | ||
this.projectService.allowLocalPluginLoads = true; | ||
return originalEnablePluginsWithOptions.apply(this, arguments); | ||
}; | ||
|
||
// 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; | ||
let hostInfo = `unknown`; | ||
|
||
Object.assign(Session.prototype, { | ||
onMessage(/** @type {string | object} */ message) { | ||
const isStringMessage = typeof message === 'string'; | ||
const parsedMessage = isStringMessage ? JSON.parse(message) : message; | ||
|
||
if ( | ||
parsedMessage != null && | ||
typeof parsedMessage === `object` && | ||
parsedMessage.arguments && | ||
typeof parsedMessage.arguments.hostInfo === `string` | ||
) { | ||
hostInfo = parsedMessage.arguments.hostInfo; | ||
if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) { | ||
if (/(\/|-)1\.([1-5][0-9]|60)\./.test(process.env.VSCODE_IPC_HOOK)) { | ||
hostInfo += ` <1.61`; | ||
} else if (/(\/|-)1\.(6[1-5])\./.test(process.env.VSCODE_IPC_HOOK)) { | ||
hostInfo += ` <1.66`; | ||
} | ||
} | ||
} | ||
|
||
const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => { | ||
return typeof value === 'string' ? fromEditorPath(value) : value; | ||
}); | ||
|
||
return originalOnMessage.call( | ||
this, | ||
isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON) | ||
); | ||
}, | ||
|
||
send(/** @type {any} */ msg) { | ||
return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => { | ||
return typeof value === `string` ? toEditorPath(value) : value; | ||
}))); | ||
} | ||
}); | ||
|
||
return tsserver; | ||
}; | ||
|
||
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`)); |
Oops, something went wrong.