Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Commit

Permalink
fix error dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
Leon-azerty committed Jan 23, 2024
1 parent 1909eb8 commit 53add4e
Show file tree
Hide file tree
Showing 8 changed files with 912 additions and 14,804 deletions.
12,704 changes: 0 additions & 12,704 deletions .pnp.cjs

This file was deleted.

2,090 changes: 0 additions & 2,090 deletions .pnp.loader.mjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,5 @@
"format": "echo 'formatting...'",
"test": "echo 'testing...'"
},
"packageManager": "[email protected]",
"dependencies": {
"js-yaml": "^4.1.0"
}
"packageManager": "[email protected]"
}
2 changes: 2 additions & 0 deletions toolchains/solidity/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,14 @@
"extension:publish": "yarn run package && vsce publish --no-dependencies"
},
"dependencies": {
"js-yaml": "^4.1.0",
"vscode-languageclient": "^8.1.0",
"vscode-languageserver": "^8.1.0",
"vscode-languageserver-textdocument": "^1.0.8"
},
"devDependencies": {
"@types/glob": "^8.1.0",
"@types/js-yaml": "^4.0.9",
"@types/mocha": "^10.0.1",
"@types/node": "20.2.5",
"@types/vscode": "^1.75.0",
Expand Down
10 changes: 5 additions & 5 deletions toolchains/solidity/extension/src/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { exec } from "child_process";
import { workspace } from "vscode";
import * as path from 'path';
import * as os from 'os';
import yaml from 'js-yaml';
import * as yaml from 'js-yaml';

export type Contract = {
name: string;
Expand All @@ -17,15 +17,15 @@ export type Script = {
}

Check warning on line 17 in toolchains/solidity/extension/src/deploy.ts

View workflow job for this annotation

GitHub Actions / lint (osmium-solidity)

Missing semicolon

async function getScriptFolder(): Promise<string> {
const foundryConfigContent = await workspace.fs.readFile(workspace.workspaceFolders[0].uri.with({ path: path.join(workspace.workspaceFolders[0].uri.path, 'foundry.toml') }));
const parsedFoundryConfig = yaml.load(foundryConfigContent.toString());
const foundryConfigContent = await workspace.fs.readFile(workspace.workspaceFolders![0].uri.with({ path: path.join(workspace.workspaceFolders![0].uri.path, 'foundry.toml') }));
const parsedFoundryConfig : any = yaml.load(foundryConfigContent.toString());

return parsedFoundryConfig.script ?? 'script';
}

async function getContractFolder(): Promise<string> {
const foundryConfigContent = await workspace.fs.readFile(workspace.workspaceFolders[0].uri.with({ path: path.join(workspace.workspaceFolders[0].uri.path, 'foundry.toml') }));
const parsedFoundryConfig = yaml.load(foundryConfigContent.toString());
const foundryConfigContent = await workspace.fs.readFile(workspace.workspaceFolders![0].uri.with({ path: path.join(workspace.workspaceFolders![0].uri.path, 'foundry.toml') }));
const parsedFoundryConfig : any = yaml.load(foundryConfigContent.toString());

return parsedFoundryConfig.contract ?? 'src';
}
Expand Down
10 changes: 9 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,13 @@ __metadata:
languageName: node
linkType: hard

"@types/js-yaml@npm:^4.0.9":
version: 4.0.9
resolution: "@types/js-yaml@npm:4.0.9"
checksum: a0ce595db8a987904badd21fc50f9f444cb73069f4b95a76cc222e0a17b3ff180669059c763ec314bc4c3ce284379177a9da80e83c5f650c6c1310cafbfaa8e6
languageName: node
linkType: hard

"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
version: 7.0.15
resolution: "@types/json-schema@npm:7.0.15"
Expand Down Expand Up @@ -3032,6 +3039,7 @@ __metadata:
resolution: "osmium-solidity-extension@workspace:toolchains/solidity/extension"
dependencies:
"@types/glob": "npm:^8.1.0"
"@types/js-yaml": "npm:^4.0.9"
"@types/mocha": "npm:^10.0.1"
"@types/node": "npm:20.2.5"
"@types/vscode": "npm:^1.75.0"
Expand All @@ -3041,6 +3049,7 @@ __metadata:
"@vscode/vsce": "npm:2.21.1"
eslint: "npm:^8.41.0"
glob: "npm:^8.1.0"
js-yaml: "npm:^4.1.0"
mocha: "npm:^10.2.0"
ts-loader: "npm:^9.4.3"
typescript: "npm:^5.1.3"
Expand All @@ -3065,7 +3074,6 @@ __metadata:
resolution: "osmium@workspace:."
dependencies:
husky: "npm:^8.0.0"
js-yaml: "npm:^4.1.0"
languageName: unknown
linkType: soft

Expand Down

0 comments on commit 53add4e

Please sign in to comment.