Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

yarn: go back to yarn-v1 until vsce supports yarn-v2+ #294

Merged
merged 2 commits into from
Jul 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ jobs:
cache: yarn

- name: Install Dependencies
run: |
yarn set version stable
yarn install --immutable
run: yarn install --immutable

- name: Build Extension
run: yarn compile
8 changes: 2 additions & 6 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ jobs:
cache: yarn

- name: Install Dependencies
run: |
yarn set version stable
yarn install --immutable
run: yarn install --immutable

- name: Check Linting
run: yarn lint
Expand All @@ -44,9 +42,7 @@ jobs:
cache: yarn

- name: Install Dependencies
run: |
yarn set version stable
yarn install --immutable
run: yarn install --immutable

- name: Check Linting
run: yarn format:check
8 changes: 3 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ jobs:
cache: yarn

- name: Install Dependencies
run: |
yarn set version stable
yarn install --immutable
run: yarn install --immutable

- name: Bump Version
env:
Expand All @@ -39,8 +37,8 @@ jobs:
run: |
git config --global user.name "OpenGOALBot"
git config --global user.email "[email protected]"
yarn vsce package --no-yarn
yarn vsce publish ${{ github.event.inputs.bump }} --no-yarn
yarn vsce package
yarn vsce publish ${{ github.event.inputs.bump }}
git push
git push origin $(git tag --points-at HEAD)

Expand Down
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"lint": "eslint . --ext .ts,.tsx",
"watch": "tsc -watch -p ./",
"format": "npx prettier --write .",
"format:check": "npx prettier --check ."
"format:check": "npx prettier --check .",
"postinstall": "patch-package"
},
"devDependencies": {
"@types/follow-redirects": "^1.14.1",
Expand All @@ -34,12 +35,13 @@
"@typescript-eslint/parser": "^6.0.0",
"@vscode/vsce": "^2.15.0",
"eslint": "^8.44.0",
"patch-package": "^7.0.0",
"typescript": "^5.1.6"
},
"dependencies": {
"comment-json": "^4.2.3",
"fast-glob": "^3.3.0",
"follow-redirects": "^1.15.2",
"glob": "^10.0.0",
"parinfer": "^3.13.1",
"promise-socket": "^7.0.0",
"vscode-languageclient": "^8.1.0"
Expand Down Expand Up @@ -483,5 +485,5 @@
"resolutions": {
"[email protected]": "patch:vscode-jsonrpc@npm%3A8.1.0#./.yarn/patches/vscode-jsonrpc-npm-8.1.0-557f20ee72.patch"
},
"packageManager": "yarn@3.6.1"
"packageManager": "yarn@1.22.19"
}
14 changes: 14 additions & 0 deletions patches/vscode-jsonrpc+8.1.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/node_modules/vscode-jsonrpc/lib/common/messageReader.js b/node_modules/vscode-jsonrpc/lib/common/messageReader.js
index 99e3dea..c8fc01c 100644
--- a/node_modules/vscode-jsonrpc/lib/common/messageReader.js
+++ b/node_modules/vscode-jsonrpc/lib/common/messageReader.js
@@ -136,6 +136,9 @@ class ReadableStreamMessageReader extends AbstractMessageReader {
}
const contentLength = headers.get('content-length');
if (!contentLength) {
+ const bodyBuffer = this.buffer.tryReadBody(this.buffer._totalLength);
+ const bodyString = bodyBuffer.toString();
+ console.log(`[LSP Debug] ERROR: Body - ${bodyString}`);
this.fireError(new Error('Header must provide a Content-Length property.'));
return;
}
2 changes: 1 addition & 1 deletion src/decomp/decomp-tools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from "../utils/workspace";
import { activateDecompTypeSearcher } from "./type-searcher/type-searcher";
import { updateTypeCastSuggestions } from "./type-caster";
import { glob } from "glob";
import { glob } from "fast-glob";

const execFileAsync = util.promisify(execFile);
const execAsync = util.promisify(exec);
Expand Down
Loading