Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## About The Pull Request **Upgrades:** - Yarn 3.0 - TypeScript 4.3 - Sass 1.37 - Required some refactoring of `/` into `math.div()` in CSS **Dependency removals:** - Removed ESM package, see: standard-things/esm#902 I initially thought it was impossible to stop relying on this package, but fortunately, ES module support in Node 12+ now comes standard and I only had to convert the very few external module imports to `require()` (because Yarn PnP). I also moved `logging.js` directly into `tgui-dev-server` package, because that's where it is used. One less internal dependency. **Sidegrades:** - Removed creation of a common tgui chunk, because in practice it creates unnecessary complexity (devs sometimes get a white screen due to this chunk being invalid) and doesn't really save that much data on CDN, and **definitely** doesn't make tgui load faster. I think that is all. I tested it a bit and everything seemingly works.
- Loading branch information
1 parent
a7de487
commit 9bbabfe
Showing
51 changed files
with
4,042 additions
and
3,767 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
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
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
356 changes: 321 additions & 35 deletions
356
tgui/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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,6 @@ | ||
| { | ||
| "name": "eslint", | ||
| "version": "7.21.0-pnpify", | ||
| "version": "7.32.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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # This file is automatically generated by PnPify. | ||
| # Manual changes will be lost! | ||
| # 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
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
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
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
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,157 @@ | ||
| #!/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 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:/) && (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}`)) { | ||
| 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 | ||
| // | ||
| 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) { | ||
| return process.platform === `win32` | ||
| ? str.replace(/^\^?zip:\//, ``) | ||
| : str.replace(/^\^?zip:/, ``); | ||
| } | ||
|
|
||
| // 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} */ message) { | ||
| const parsedMessage = JSON.parse(message) | ||
|
|
||
| if ( | ||
| parsedMessage != null && | ||
| typeof parsedMessage === `object` && | ||
| parsedMessage.arguments && | ||
| typeof parsedMessage.arguments.hostInfo === `string` | ||
| ) { | ||
| hostInfo = parsedMessage.arguments.hostInfo; | ||
| } | ||
|
|
||
| return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, 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` ? toEditorPath(value) : value; | ||
| }))); | ||
| } | ||
| }); | ||
|
|
||
| return tsserver; | ||
| }; | ||
|
|
||
| if (existsSync(absPnpApiPath)) { | ||
| if (!process.versions.pnp) { | ||
| // Setup the environment to be able to require typescript/lib/tsserverlibrary.js | ||
| require(absPnpApiPath).setup(); | ||
| } | ||
| } | ||
|
|
||
| // Defer to the real typescript/lib/tsserverlibrary.js your application uses | ||
| module.exports = moduleWrapper(absRequire(`typescript/lib/tsserverlibrary.js`)); |
Oops, something went wrong.