chore(deps): update yarn, typescript, and fvtt types
This commit is contained in:
parent
2ce9b9f9e4
commit
09347b18f0
768
.yarn/releases/yarn-3.1.1.cjs
vendored
768
.yarn/releases/yarn-3.1.1.cjs
vendored
File diff suppressed because one or more lines are too long
785
.yarn/releases/yarn-3.2.0.cjs
vendored
Executable file
785
.yarn/releases/yarn-3.2.0.cjs
vendored
Executable file
File diff suppressed because one or more lines are too long
6
.yarn/sdks/eslint/lib/api.js
vendored
6
.yarn/sdks/eslint/lib/api.js
vendored
|
@ -11,10 +11,10 @@ const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
|
||||||
|
|
||||||
if (existsSync(absPnpApiPath)) {
|
if (existsSync(absPnpApiPath)) {
|
||||||
if (!process.versions.pnp) {
|
if (!process.versions.pnp) {
|
||||||
// Setup the environment to be able to require eslint/lib/api.js
|
// Setup the environment to be able to require eslint
|
||||||
require(absPnpApiPath).setup();
|
require(absPnpApiPath).setup();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Defer to the real eslint/lib/api.js your application uses
|
// Defer to the real eslint your application uses
|
||||||
module.exports = absRequire(`eslint/lib/api.js`);
|
module.exports = absRequire(`eslint`);
|
||||||
|
|
2
.yarn/sdks/eslint/package.json
vendored
2
.yarn/sdks/eslint/package.json
vendored
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "eslint",
|
"name": "eslint",
|
||||||
"version": "8.1.0-sdk",
|
"version": "8.11.0-sdk",
|
||||||
"main": "./lib/api.js",
|
"main": "./lib/api.js",
|
||||||
"type": "commonjs"
|
"type": "commonjs"
|
||||||
}
|
}
|
||||||
|
|
2
.yarn/sdks/prettier/package.json
vendored
2
.yarn/sdks/prettier/package.json
vendored
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "prettier",
|
"name": "prettier",
|
||||||
"version": "2.4.1-sdk",
|
"version": "2.6.0-sdk",
|
||||||
"main": "./index.js",
|
"main": "./index.js",
|
||||||
"type": "commonjs"
|
"type": "commonjs"
|
||||||
}
|
}
|
||||||
|
|
30
.yarn/sdks/typescript/lib/tsserver.js
vendored
30
.yarn/sdks/typescript/lib/tsserver.js
vendored
|
@ -18,6 +18,7 @@ const moduleWrapper = tsserver => {
|
||||||
const pnpApi = require(`pnpapi`);
|
const pnpApi = require(`pnpapi`);
|
||||||
|
|
||||||
const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
|
const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
|
||||||
|
const isPortal = str => str.startsWith("portal:/");
|
||||||
const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
|
const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
|
||||||
|
|
||||||
const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
|
const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
|
||||||
|
@ -44,7 +45,7 @@ const moduleWrapper = tsserver => {
|
||||||
const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
|
const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
|
||||||
if (resolved) {
|
if (resolved) {
|
||||||
const locator = pnpApi.findPackageLocator(resolved);
|
const locator = pnpApi.findPackageLocator(resolved);
|
||||||
if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
|
if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
|
||||||
str = resolved;
|
str = resolved;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -85,7 +86,7 @@ const moduleWrapper = tsserver => {
|
||||||
// everything else is up to neovim
|
// everything else is up to neovim
|
||||||
case `neovim`: {
|
case `neovim`: {
|
||||||
str = normalize(resolved).replace(/\.zip\//, `.zip::`);
|
str = normalize(resolved).replace(/\.zip\//, `.zip::`);
|
||||||
str = `zipfile:${str}`;
|
str = `zipfile://${str}`;
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
default: {
|
default: {
|
||||||
|
@ -100,8 +101,7 @@ const moduleWrapper = tsserver => {
|
||||||
|
|
||||||
function fromEditorPath(str) {
|
function fromEditorPath(str) {
|
||||||
switch (hostInfo) {
|
switch (hostInfo) {
|
||||||
case `coc-nvim`:
|
case `coc-nvim`: {
|
||||||
case `neovim`: {
|
|
||||||
str = str.replace(/\.zip::/, `.zip/`);
|
str = str.replace(/\.zip::/, `.zip/`);
|
||||||
// The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
|
// 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
|
// So in order to convert it back, we use .* to match all the thing
|
||||||
|
@ -111,6 +111,12 @@ const moduleWrapper = tsserver => {
|
||||||
: str.replace(/^.*zipfile:/, ``);
|
: str.replace(/^.*zipfile:/, ``);
|
||||||
} break;
|
} 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`:
|
case `vscode`:
|
||||||
default: {
|
default: {
|
||||||
return process.platform === `win32`
|
return process.platform === `win32`
|
||||||
|
@ -143,8 +149,9 @@ const moduleWrapper = tsserver => {
|
||||||
let hostInfo = `unknown`;
|
let hostInfo = `unknown`;
|
||||||
|
|
||||||
Object.assign(Session.prototype, {
|
Object.assign(Session.prototype, {
|
||||||
onMessage(/** @type {string} */ message) {
|
onMessage(/** @type {string | object} */ message) {
|
||||||
const parsedMessage = JSON.parse(message)
|
const isStringMessage = typeof message === 'string';
|
||||||
|
const parsedMessage = isStringMessage ? JSON.parse(message) : message;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
parsedMessage != null &&
|
parsedMessage != null &&
|
||||||
|
@ -158,9 +165,14 @@ const moduleWrapper = tsserver => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
|
const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
|
||||||
return typeof value === `string` ? fromEditorPath(value) : value;
|
return typeof value === 'string' ? fromEditorPath(value) : value;
|
||||||
}));
|
});
|
||||||
|
|
||||||
|
return originalOnMessage.call(
|
||||||
|
this,
|
||||||
|
isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
|
||||||
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
send(/** @type {any} */ msg) {
|
send(/** @type {any} */ msg) {
|
||||||
|
|
30
.yarn/sdks/typescript/lib/tsserverlibrary.js
vendored
30
.yarn/sdks/typescript/lib/tsserverlibrary.js
vendored
|
@ -18,6 +18,7 @@ const moduleWrapper = tsserver => {
|
||||||
const pnpApi = require(`pnpapi`);
|
const pnpApi = require(`pnpapi`);
|
||||||
|
|
||||||
const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
|
const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
|
||||||
|
const isPortal = str => str.startsWith("portal:/");
|
||||||
const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
|
const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
|
||||||
|
|
||||||
const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
|
const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
|
||||||
|
@ -44,7 +45,7 @@ const moduleWrapper = tsserver => {
|
||||||
const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
|
const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
|
||||||
if (resolved) {
|
if (resolved) {
|
||||||
const locator = pnpApi.findPackageLocator(resolved);
|
const locator = pnpApi.findPackageLocator(resolved);
|
||||||
if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
|
if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
|
||||||
str = resolved;
|
str = resolved;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -85,7 +86,7 @@ const moduleWrapper = tsserver => {
|
||||||
// everything else is up to neovim
|
// everything else is up to neovim
|
||||||
case `neovim`: {
|
case `neovim`: {
|
||||||
str = normalize(resolved).replace(/\.zip\//, `.zip::`);
|
str = normalize(resolved).replace(/\.zip\//, `.zip::`);
|
||||||
str = `zipfile:${str}`;
|
str = `zipfile://${str}`;
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
default: {
|
default: {
|
||||||
|
@ -100,8 +101,7 @@ const moduleWrapper = tsserver => {
|
||||||
|
|
||||||
function fromEditorPath(str) {
|
function fromEditorPath(str) {
|
||||||
switch (hostInfo) {
|
switch (hostInfo) {
|
||||||
case `coc-nvim`:
|
case `coc-nvim`: {
|
||||||
case `neovim`: {
|
|
||||||
str = str.replace(/\.zip::/, `.zip/`);
|
str = str.replace(/\.zip::/, `.zip/`);
|
||||||
// The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
|
// 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
|
// So in order to convert it back, we use .* to match all the thing
|
||||||
|
@ -111,6 +111,12 @@ const moduleWrapper = tsserver => {
|
||||||
: str.replace(/^.*zipfile:/, ``);
|
: str.replace(/^.*zipfile:/, ``);
|
||||||
} break;
|
} 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`:
|
case `vscode`:
|
||||||
default: {
|
default: {
|
||||||
return process.platform === `win32`
|
return process.platform === `win32`
|
||||||
|
@ -143,8 +149,9 @@ const moduleWrapper = tsserver => {
|
||||||
let hostInfo = `unknown`;
|
let hostInfo = `unknown`;
|
||||||
|
|
||||||
Object.assign(Session.prototype, {
|
Object.assign(Session.prototype, {
|
||||||
onMessage(/** @type {string} */ message) {
|
onMessage(/** @type {string | object} */ message) {
|
||||||
const parsedMessage = JSON.parse(message)
|
const isStringMessage = typeof message === 'string';
|
||||||
|
const parsedMessage = isStringMessage ? JSON.parse(message) : message;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
parsedMessage != null &&
|
parsedMessage != null &&
|
||||||
|
@ -158,9 +165,14 @@ const moduleWrapper = tsserver => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
|
const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
|
||||||
return typeof value === `string` ? fromEditorPath(value) : value;
|
return typeof value === 'string' ? fromEditorPath(value) : value;
|
||||||
}));
|
});
|
||||||
|
|
||||||
|
return originalOnMessage.call(
|
||||||
|
this,
|
||||||
|
isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
|
||||||
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
send(/** @type {any} */ msg) {
|
send(/** @type {any} */ msg) {
|
||||||
|
|
2
.yarn/sdks/typescript/package.json
vendored
2
.yarn/sdks/typescript/package.json
vendored
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "typescript",
|
"name": "typescript",
|
||||||
"version": "4.4.4-sdk",
|
"version": "4.6.2-sdk",
|
||||||
"main": "./lib/typescript.js",
|
"main": "./lib/typescript.js",
|
||||||
"type": "commonjs"
|
"type": "commonjs"
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,4 +4,4 @@ plugins:
|
||||||
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
|
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
|
||||||
spec: "@yarnpkg/plugin-interactive-tools"
|
spec: "@yarnpkg/plugin-interactive-tools"
|
||||||
|
|
||||||
yarnPath: .yarn/releases/yarn-3.1.1.cjs
|
yarnPath: .yarn/releases/yarn-3.2.0.cjs
|
||||||
|
|
|
@ -89,11 +89,12 @@
|
||||||
"semver": "7.3.5",
|
"semver": "7.3.5",
|
||||||
"ts-jest": "27.1.3",
|
"ts-jest": "27.1.3",
|
||||||
"tslib": "2.3.1",
|
"tslib": "2.3.1",
|
||||||
"typescript": "4.4.4",
|
"typescript": "4.6.2",
|
||||||
"yargs": "17.4.0"
|
"yargs": "17.4.0"
|
||||||
},
|
},
|
||||||
"lint-staged": {
|
"lint-staged": {
|
||||||
"*.(ts|js|cjs|mjs)": "eslint --cache --fix",
|
"*.(ts|js|cjs|mjs)": "eslint --cache --fix",
|
||||||
"*.(json|scss|yml)": "prettier --write"
|
"*.(json|scss|yml)": "prettier --write"
|
||||||
}
|
},
|
||||||
|
"packageManager": "yarn@3.2.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{
|
{
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
"extends": ["config:base", ":automergeAll", ":automergeBranch", ":prHourlyLimitNone", ":prConcurrentLimitNone"],
|
"extends": ["config:base", ":automergeAll", ":automergeBranch", ":prHourlyLimitNone", ":prConcurrentLimitNone"]
|
||||||
"ignoreDeps": ["typescript"]
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -223,7 +223,7 @@ export class DS4ActorSheet extends ActorSheet<ActorSheet.Options, DS4ActorSheetD
|
||||||
.data(embeddedDocumentListEntryProperties.ActiveEffect.idDataAttribute);
|
.data(embeddedDocumentListEntryProperties.ActiveEffect.idDataAttribute);
|
||||||
const effect = this.actor.effects.get(id);
|
const effect = this.actor.effects.get(id);
|
||||||
enforce(effect, getGame().i18n.format("DS4.ErrorActorDoesNotHaveEffect", { id, actor: this.actor.name }));
|
enforce(effect, getGame().i18n.format("DS4.ErrorActorDoesNotHaveEffect", { id, actor: this.actor.name }));
|
||||||
effect.sheet.render(true);
|
effect.sheet?.render(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -107,7 +107,7 @@ export class DS4ItemSheet extends ItemSheet<ItemSheet.Options, DS4ItemSheetData>
|
||||||
.data(embeddedDocumentListEntryProperties.ActiveEffect.idDataAttribute);
|
.data(embeddedDocumentListEntryProperties.ActiveEffect.idDataAttribute);
|
||||||
const effect = this.item.effects.get(id);
|
const effect = this.item.effects.get(id);
|
||||||
enforce(effect, getGame().i18n.format("DS4.ErrorItemDoesNotHaveEffect", { id, item: this.item.name }));
|
enforce(effect, getGame().i18n.format("DS4.ErrorItemDoesNotHaveEffect", { id, item: this.item.name }));
|
||||||
effect.sheet.render(true);
|
effect.sheet?.render(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue