chore(deps): update dependencies

This commit is contained in:
Johannes Loher 2022-07-17 19:37:21 +02:00
parent 998d9cc7ed
commit a60c55b985
4 changed files with 555 additions and 355 deletions

View file

@ -61,14 +61,30 @@ const moduleWrapper = tsserver => {
// //
// Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910 // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
// //
// Update Oct 8 2021: VSCode changed their format in 1.61. // 2021-10-08: VSCode changed the format in 1.61.
// Before | ^zip:/c:/foo/bar.zip/package.json // Before | ^zip:/c:/foo/bar.zip/package.json
// After | ^/zip//c:/foo/bar.zip/package.json // After | ^/zip//c:/foo/bar.zip/package.json
// //
// 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
//
// 2022-05-06: VSCode changed the format in 1.68
// Before | ^/zip/c:/foo/bar.zip/package.json
// After | ^/zip//c:/foo/bar.zip/package.json
//
case `vscode <1.61`: { case `vscode <1.61`: {
str = `^zip:${str}`; str = `^zip:${str}`;
} break; } break;
case `vscode <1.66`: {
str = `^/zip/${str}`;
} break;
case `vscode <1.68`: {
str = `^/zip${str}`;
} break;
case `vscode`: { case `vscode`: {
str = `^/zip/${str}`; str = `^/zip/${str}`;
} break; } break;
@ -119,9 +135,7 @@ const moduleWrapper = tsserver => {
case `vscode`: case `vscode`:
default: { default: {
return process.platform === `win32` return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
? str.replace(/^\^?(zip:|\/zip)\/+/, ``)
: str.replace(/^\^?(zip:|\/zip)\/+/, `/`);
} break; } break;
} }
} }
@ -160,8 +174,21 @@ const moduleWrapper = tsserver => {
typeof parsedMessage.arguments.hostInfo === `string` typeof parsedMessage.arguments.hostInfo === `string`
) { ) {
hostInfo = parsedMessage.arguments.hostInfo; hostInfo = parsedMessage.arguments.hostInfo;
if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) { if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
hostInfo += ` <1.61`; const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
// The RegExp from https://semver.org/ but without the caret at the start
/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
) ?? []).map(Number)
if (major === 1) {
if (minor < 61) {
hostInfo += ` <1.61`;
} else if (minor < 66) {
hostInfo += ` <1.66`;
} else if (minor < 68) {
hostInfo += ` <1.68`;
}
}
} }
} }

View file

@ -61,14 +61,30 @@ const moduleWrapper = tsserver => {
// //
// Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910 // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
// //
// Update Oct 8 2021: VSCode changed their format in 1.61. // 2021-10-08: VSCode changed the format in 1.61.
// Before | ^zip:/c:/foo/bar.zip/package.json // Before | ^zip:/c:/foo/bar.zip/package.json
// After | ^/zip//c:/foo/bar.zip/package.json // After | ^/zip//c:/foo/bar.zip/package.json
// //
// 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
//
// 2022-05-06: VSCode changed the format in 1.68
// Before | ^/zip/c:/foo/bar.zip/package.json
// After | ^/zip//c:/foo/bar.zip/package.json
//
case `vscode <1.61`: { case `vscode <1.61`: {
str = `^zip:${str}`; str = `^zip:${str}`;
} break; } break;
case `vscode <1.66`: {
str = `^/zip/${str}`;
} break;
case `vscode <1.68`: {
str = `^/zip${str}`;
} break;
case `vscode`: { case `vscode`: {
str = `^/zip/${str}`; str = `^/zip/${str}`;
} break; } break;
@ -119,9 +135,7 @@ const moduleWrapper = tsserver => {
case `vscode`: case `vscode`:
default: { default: {
return process.platform === `win32` return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
? str.replace(/^\^?(zip:|\/zip)\/+/, ``)
: str.replace(/^\^?(zip:|\/zip)\/+/, `/`);
} break; } break;
} }
} }
@ -160,8 +174,21 @@ const moduleWrapper = tsserver => {
typeof parsedMessage.arguments.hostInfo === `string` typeof parsedMessage.arguments.hostInfo === `string`
) { ) {
hostInfo = parsedMessage.arguments.hostInfo; hostInfo = parsedMessage.arguments.hostInfo;
if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) { if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
hostInfo += ` <1.61`; const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
// The RegExp from https://semver.org/ but without the caret at the start
/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
) ?? []).map(Number)
if (major === 1) {
if (minor < 61) {
hostInfo += ` <1.61`;
} else if (minor < 66) {
hostInfo += ` <1.66`;
} else if (minor < 68) {
hostInfo += ` <1.68`;
}
}
} }
} }

View file

@ -37,10 +37,10 @@
"changelog": "conventional-changelog -p conventionalcommits -o CHANGELOG.md -r 2" "changelog": "conventional-changelog -p conventionalcommits -o CHANGELOG.md -r 2"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "16.2.4", "@commitlint/cli": "17.0.3",
"@commitlint/config-conventional": "16.2.4", "@commitlint/config-conventional": "17.0.3",
"@guanghechen/rollup-plugin-copy": "1.9.4", "@guanghechen/rollup-plugin-copy": "1.9.7",
"@league-of-foundry-developers/foundry-vtt-types": "9.268.2", "@league-of-foundry-developers/foundry-vtt-types": "9.269.0",
"@pixi/constants": "6.2.1", "@pixi/constants": "6.2.1",
"@pixi/core": "6.2.1", "@pixi/core": "6.2.1",
"@pixi/display": "6.2.1", "@pixi/display": "6.2.1",
@ -49,31 +49,31 @@
"@pixi/runner": "6.2.1", "@pixi/runner": "6.2.1",
"@pixi/settings": "6.2.1", "@pixi/settings": "6.2.1",
"@pixi/utils": "6.2.1", "@pixi/utils": "6.2.1",
"@rollup/plugin-typescript": "8.3.2", "@rollup/plugin-typescript": "8.3.3",
"@seald-io/nedb": "3.0.0", "@seald-io/nedb": "3.0.0",
"@swc/core": "1.2.183", "@swc/core": "1.2.215",
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",
"@typescript-eslint/eslint-plugin": "5.23.0", "@typescript-eslint/eslint-plugin": "5.30.6",
"@typescript-eslint/parser": "5.23.0", "@typescript-eslint/parser": "5.30.6",
"conventional-changelog-cli": "2.2.2", "conventional-changelog-cli": "2.2.2",
"conventional-changelog-conventionalcommits": "4.6.3", "conventional-changelog-conventionalcommits": "5.0.0",
"eslint": "8.15.0", "eslint": "8.20.0",
"eslint-config-prettier": "8.5.0", "eslint-config-prettier": "8.5.0",
"eslint-plugin-prettier": "4.0.0", "eslint-plugin-prettier": "4.2.1",
"fs-extra": "10.1.0", "fs-extra": "10.1.0",
"husky": "8.0.1", "husky": "8.0.1",
"lint-staged": "12.4.1", "lint-staged": "13.0.3",
"npm-run-all": "4.1.5", "npm-run-all": "4.1.5",
"prettier": "2.6.2", "prettier": "2.7.1",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"rollup": "2.73.0", "rollup": "2.77.0",
"rollup-plugin-styles": "4.0.0", "rollup-plugin-styles": "4.0.0",
"rollup-plugin-swc3": "0.3.0", "rollup-plugin-swc3": "0.3.0",
"sass": "1.51.0", "sass": "1.53.0",
"semver": "7.3.7", "semver": "7.3.7",
"tslib": "2.4.0", "tslib": "2.4.0",
"typescript": "4.6.4", "typescript": "4.7.4",
"yargs": "17.5.0" "yargs": "17.5.1"
}, },
"lint-staged": { "lint-staged": {
"*.(ts|js|cjs|mjs)": "eslint --cache --fix", "*.(ts|js|cjs|mjs)": "eslint --cache --fix",

798
yarn.lock

File diff suppressed because it is too large Load diff