yetao
/
vscode-sshfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade dependencies

Browse Source
pull/373/head
Kelvin Schoofs 2 years ago
parent 4d389f3ee0
commit 8909d05855
17 changed files with 3199 additions and 2987 deletions
Show Stats Download Patch File Download Diff File

4
.yarn/sdks/prettier/index.js vendored
Unescape View File

@ -1,13 +1,13 @@
#!/usr/bin/env node
const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const relPnpApiPath = "../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);
if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {

2
.yarn/sdks/prettier/package.json vendored
Unescape View File

@ -1,6 +1,6 @@
{
"name": "prettier",
"version": "2.6.2-sdk",
"version": "2.8.7-sdk",
"main": "./index.js",
"type": "commonjs"
}

4
.yarn/sdks/typescript/bin/tsc vendored
Unescape View File

@ -1,13 +1,13 @@
#!/usr/bin/env node
const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);
if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {

4
.yarn/sdks/typescript/bin/tsserver vendored
Unescape View File

@ -1,13 +1,13 @@
#!/usr/bin/env node
const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);
if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {

4
.yarn/sdks/typescript/lib/tsc.js vendored
Unescape View File

@ -1,13 +1,13 @@
#!/usr/bin/env node
const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);
if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {

39
.yarn/sdks/typescript/lib/tsserver.js vendored
Unescape View File

@ -1,13 +1,13 @@
#!/usr/bin/env node
const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);
const moduleWrapper = tsserver => {
if (!process.versions.pnp) {
@ -61,14 +61,18 @@ const moduleWrapper = tsserver => {
//
// Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
//
// Update 2021-10-08: 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
// After | ^/zip//c:/foo/bar.zip/package.json
//
// Update 2022-04-06: VSCode changed the format in 1.66.
// 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`: {
str = `^zip:${str}`;
} break;
@ -77,10 +81,14 @@ const moduleWrapper = tsserver => {
str = `^/zip/${str}`;
} break;
case `vscode`: {
case `vscode <1.68`: {
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)
@ -127,9 +135,7 @@ const moduleWrapper = tsserver => {
case `vscode`:
default: {
return process.platform === `win32`
? str.replace(/^\^?(zip:|\/zip)\/+/, ``)
: str.replace(/^\^?(zip:|\/zip)\/+/, `/`);
return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
} break;
}
}
@ -169,10 +175,19 @@ const moduleWrapper = tsserver => {
) {
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 [, 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`;
}
}
}
}

39
.yarn/sdks/typescript/lib/tsserverlibrary.js vendored
Unescape View File

@ -1,13 +1,13 @@
#!/usr/bin/env node
const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);
const moduleWrapper = tsserver => {
if (!process.versions.pnp) {
@ -61,14 +61,18 @@ const moduleWrapper = tsserver => {
//
// Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
//
// Update 2021-10-08: 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
// After | ^/zip//c:/foo/bar.zip/package.json
//
// Update 2022-04-06: VSCode changed the format in 1.66.
// 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`: {
str = `^zip:${str}`;
} break;
@ -77,10 +81,14 @@ const moduleWrapper = tsserver => {
str = `^/zip/${str}`;
} break;
case `vscode`: {
case `vscode <1.68`: {
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)
@ -127,9 +135,7 @@ const moduleWrapper = tsserver => {
case `vscode`:
default: {
return process.platform === `win32`
? str.replace(/^\^?(zip:|\/zip)\/+/, ``)
: str.replace(/^\^?(zip:|\/zip)\/+/, `/`);
return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
} break;
}
}
@ -169,10 +175,19 @@ const moduleWrapper = tsserver => {
) {
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 [, 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`;
}
}
}
}

4
.yarn/sdks/typescript/lib/typescript.js vendored
Unescape View File

@ -1,13 +1,13 @@
#!/usr/bin/env node
const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);
if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {

2
.yarn/sdks/typescript/package.json vendored
Unescape View File

@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "4.5.5-sdk",
"version": "5.0.2-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
}

6008
.yarn/yarn.lock
View File

File diff suppressed because it is too large Load Diff

8
.yarnrc.yml
Unescape View File

@ -10,4 +10,12 @@ plugins:
preferInteractive: true
packageExtensions:
'eslint-plugin-flowtype@*':
peerDependenciesMeta:
'@babel/plugin-syntax-flow':
optional: true
'@babel/plugin-transform-react-jsx':
optional: true
yarnPath: .yarn/releases/yarn-3.5.0.cjs

5
CHANGELOG.md
Unescape View File

@ -33,6 +33,11 @@
### Development changes
- Move the whole flag system from config.ts to flags.ts
- Updated Yarn to version 3.5.0
- Upgrade a ton of dependencies
- Replace deprecated `vsce` with `@vscode/vsce@^2.18.0`
- Upgrade TypeScript from ~4.5.5 to ~5.0.2
- Upgrade Webpack from ^5.69.1 to ^5.76.3
- Upgrade a bunch of plugins and other dependencies
## v1.25.0 (2022-06-01)

2
common/package.json
Unescape View File

@ -19,7 +19,7 @@
"devDependencies": {
"@types/node": "^12.7.12",
"@types/ssh2": "^0.5.41",
"typescript": "~4.5.5"
"typescript": "~5.0.2"
},
"packageManager": "yarn@3.1.1"
}

15
package.json
Unescape View File

@ -75,6 +75,9 @@
"description": "Unique installs using Visual Studio Marketplace"
}
],
"sponsor": {
"url": "https://github.com/sponsors/SchoofsKelvin"
},
"contributes": {
"views": {
"sshfs": [
@ -414,19 +417,19 @@
"@types/vscode": "~1.49.0",
"@types/webpack": "^4.4.25",
"@types/winreg": "^1.2.30",
"@vscode/vsce": "^2.18.0",
"prettier": "^2.6.2",
"source-map": "^0.7.3",
"source-map-support": "^0.5.19",
"ts-loader": "^9.2.3",
"typescript": "~4.5.5",
"vsce": "^2.5.1",
"webpack": "^5.69.1",
"webpack-cli": "^4.7.2"
"ts-loader": "^9.4.2",
"typescript": "~5.0.2",
"webpack": "^5.76.3",
"webpack-cli": "^5.0.1"
},
"dependencies": {
"common": "workspace:*",
"event-stream": "^4.0.1",
"jsonc-parser": "^2.0.0",
"jsonc-parser": "^3.2.0",
"semver": "^7.3.5",
"socks": "^2.2.0",
"ssh2": "^1.6.0",

43
webview/package.json
Unescape View File

@ -7,28 +7,29 @@
"build": "webpack --mode production"
},
"devDependencies": {
"@babel/core": "^7.15.0",
"@babel/preset-react": "^7.14.5",
"@babel/core": "^7.21.3",
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-transform-react-jsx": "^7.21.0",
"@babel/preset-react": "^7.18.6",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.0-rc.3",
"@types/react": "^17.0.18",
"@types/react-dom": "^17.0.9",
"@types/react-redux": "^7.1.7",
"@typescript-eslint/eslint-plugin": "^5.12.0",
"@typescript-eslint/parser": "^5.12.0",
"babel-eslint": "^10.1.0",
"babel-loader": "8.1.0",
"babel-preset-react-app": "10.0.0",
"@typescript-eslint/eslint-plugin": "^5.56.0",
"@typescript-eslint/parser": "^5.56.0",
"babel-loader": "^9.1.2",
"babel-preset-react-app": "^10.0.1",
"css-loader": "4.3.0",
"css-minimizer-webpack-plugin": "^3.0.2",
"dotenv": "8.2.0",
"eslint": "^7.11.0",
"eslint-config-react-app": "^6.0.0",
"eslint-plugin-flowtype": "^5.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-webpack-plugin": "^3.0.1",
"eslint": "^8.36.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-webpack-plugin": "^4.0.0",
"html-webpack-plugin": "^5.3.2",
"mini-css-extract-plugin": "0.11.3",
"pnp-webpack-plugin": "^1.7.0",
@ -38,13 +39,13 @@
"react-refresh": "^0.10.0",
"redux": "^4.0.5",
"style-loader": "1.3.0",
"ts-loader": "^9.2.5",
"tslib": "^2.3.1",
"typescript": "~4.5.5",
"ts-loader": "^9.4.2",
"tslib": "^2.5.0",
"typescript": "~5.0.2",
"url-loader": "4.1.1",
"webpack": "^5.69.1",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^4.0.0-rc.0"
"webpack": "^5.76.3",
"webpack-cli": "^5.0.1",
"webpack-dev-server": "^4.13.1"
},
"browserslist": [
"Electron >= 9.0.0"

2
webview/src/FieldTypes/base.tsx
Unescape View File

@ -22,7 +22,7 @@ type WrappedState<T, S> = {
[key in keyof S]: key extends keyof State<T> ? State<T>[key] : S[key];
} & State<T>;
export abstract class FieldBase<T, P = {}, S = {}> extends React.Component<Props<T> & P, WrappedState<T, S>> {
export abstract class FieldBase<T, P extends {} = {}, S extends {} = {}> extends React.Component<Props<T> & P, WrappedState<T, S>> {
constructor(props: Props<T> & P) {
super(props);
this.state = {

1
webview/tsconfig.json
Unescape View File

@ -18,7 +18,6 @@
"noImplicitAny": true,
"importHelpers": true,
"strictNullChecks": true,
"suppressImplicitAnyIndexErrors": true,
"noUnusedLocals": true,
"skipLibCheck": true,
"esModuleInterop": true,

Write Preview
Loading…
Cancel
Save