From a2de690603c4db0b8a0d018af039e666e952da7b Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Tue, 24 Oct 2023 17:31:11 +0100 Subject: [PATCH 1/2] chore: update remappings for hardhat vscode --- e2e/packages/contracts/remappings.txt | 6 +++--- examples/minimal/packages/contracts/remappings.txt | 6 +++--- templates/phaser/packages/contracts/remappings.txt | 6 +++--- templates/react/packages/contracts/remappings.txt | 6 +++--- templates/threejs/packages/contracts/remappings.txt | 6 +++--- templates/vanilla/packages/contracts/remappings.txt | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/e2e/packages/contracts/remappings.txt b/e2e/packages/contracts/remappings.txt index 97058b20d7..c4d992480e 100644 --- a/e2e/packages/contracts/remappings.txt +++ b/e2e/packages/contracts/remappings.txt @@ -1,3 +1,3 @@ -ds-test/=./node_modules/ds-test/src/ -forge-std/=./node_modules/forge-std/src/ -@latticexyz/=./node_modules/@latticexyz/ +ds-test/=node_modules/ds-test/src/ +forge-std/=node_modules/forge-std/src/ +@latticexyz/=node_modules/@latticexyz/ diff --git a/examples/minimal/packages/contracts/remappings.txt b/examples/minimal/packages/contracts/remappings.txt index 97058b20d7..c4d992480e 100644 --- a/examples/minimal/packages/contracts/remappings.txt +++ b/examples/minimal/packages/contracts/remappings.txt @@ -1,3 +1,3 @@ -ds-test/=./node_modules/ds-test/src/ -forge-std/=./node_modules/forge-std/src/ -@latticexyz/=./node_modules/@latticexyz/ +ds-test/=node_modules/ds-test/src/ +forge-std/=node_modules/forge-std/src/ +@latticexyz/=node_modules/@latticexyz/ diff --git a/templates/phaser/packages/contracts/remappings.txt b/templates/phaser/packages/contracts/remappings.txt index 97058b20d7..c4d992480e 100644 --- a/templates/phaser/packages/contracts/remappings.txt +++ b/templates/phaser/packages/contracts/remappings.txt @@ -1,3 +1,3 @@ -ds-test/=./node_modules/ds-test/src/ -forge-std/=./node_modules/forge-std/src/ -@latticexyz/=./node_modules/@latticexyz/ +ds-test/=node_modules/ds-test/src/ +forge-std/=node_modules/forge-std/src/ +@latticexyz/=node_modules/@latticexyz/ diff --git a/templates/react/packages/contracts/remappings.txt b/templates/react/packages/contracts/remappings.txt index 97058b20d7..c4d992480e 100644 --- a/templates/react/packages/contracts/remappings.txt +++ b/templates/react/packages/contracts/remappings.txt @@ -1,3 +1,3 @@ -ds-test/=./node_modules/ds-test/src/ -forge-std/=./node_modules/forge-std/src/ -@latticexyz/=./node_modules/@latticexyz/ +ds-test/=node_modules/ds-test/src/ +forge-std/=node_modules/forge-std/src/ +@latticexyz/=node_modules/@latticexyz/ diff --git a/templates/threejs/packages/contracts/remappings.txt b/templates/threejs/packages/contracts/remappings.txt index 97058b20d7..c4d992480e 100644 --- a/templates/threejs/packages/contracts/remappings.txt +++ b/templates/threejs/packages/contracts/remappings.txt @@ -1,3 +1,3 @@ -ds-test/=./node_modules/ds-test/src/ -forge-std/=./node_modules/forge-std/src/ -@latticexyz/=./node_modules/@latticexyz/ +ds-test/=node_modules/ds-test/src/ +forge-std/=node_modules/forge-std/src/ +@latticexyz/=node_modules/@latticexyz/ diff --git a/templates/vanilla/packages/contracts/remappings.txt b/templates/vanilla/packages/contracts/remappings.txt index 97058b20d7..c4d992480e 100644 --- a/templates/vanilla/packages/contracts/remappings.txt +++ b/templates/vanilla/packages/contracts/remappings.txt @@ -1,3 +1,3 @@ -ds-test/=./node_modules/ds-test/src/ -forge-std/=./node_modules/forge-std/src/ -@latticexyz/=./node_modules/@latticexyz/ +ds-test/=node_modules/ds-test/src/ +forge-std/=node_modules/forge-std/src/ +@latticexyz/=node_modules/@latticexyz/ From 729361fdca4eef8c5df4e1d77a37b086d54f3157 Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Tue, 24 Oct 2023 17:35:38 +0100 Subject: [PATCH 2/2] switch to hardhat solidity extension --- .vscode/extensions.json | 2 +- .vscode/settings.json | 5 +---- templates/phaser/.vscode/extensions.json | 2 +- templates/phaser/.vscode/settings.json | 5 +---- templates/react/.vscode/extensions.json | 2 +- templates/react/.vscode/settings.json | 5 +---- templates/threejs/.vscode/extensions.json | 2 +- templates/threejs/.vscode/settings.json | 5 +---- templates/vanilla/.vscode/extensions.json | 2 +- templates/vanilla/.vscode/settings.json | 5 +---- 10 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 739a4f8b82..7d5d7da3d9 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,3 +1,3 @@ { - "recommendations": ["JuanBlanco.solidity"] + "recommendations": ["NomicFoundation.hardhat-solidity"] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 2cb0dd5713..0967ef424b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1 @@ -{ - "solidity.monoRepoSupport": true, - "solidity.compileUsingRemoteVersion": "v0.8.21+commit.d9974bed" -} +{} diff --git a/templates/phaser/.vscode/extensions.json b/templates/phaser/.vscode/extensions.json index 739a4f8b82..7d5d7da3d9 100644 --- a/templates/phaser/.vscode/extensions.json +++ b/templates/phaser/.vscode/extensions.json @@ -1,3 +1,3 @@ { - "recommendations": ["JuanBlanco.solidity"] + "recommendations": ["NomicFoundation.hardhat-solidity"] } diff --git a/templates/phaser/.vscode/settings.json b/templates/phaser/.vscode/settings.json index 2cb0dd5713..0967ef424b 100644 --- a/templates/phaser/.vscode/settings.json +++ b/templates/phaser/.vscode/settings.json @@ -1,4 +1 @@ -{ - "solidity.monoRepoSupport": true, - "solidity.compileUsingRemoteVersion": "v0.8.21+commit.d9974bed" -} +{} diff --git a/templates/react/.vscode/extensions.json b/templates/react/.vscode/extensions.json index 739a4f8b82..7d5d7da3d9 100644 --- a/templates/react/.vscode/extensions.json +++ b/templates/react/.vscode/extensions.json @@ -1,3 +1,3 @@ { - "recommendations": ["JuanBlanco.solidity"] + "recommendations": ["NomicFoundation.hardhat-solidity"] } diff --git a/templates/react/.vscode/settings.json b/templates/react/.vscode/settings.json index 2cb0dd5713..0967ef424b 100644 --- a/templates/react/.vscode/settings.json +++ b/templates/react/.vscode/settings.json @@ -1,4 +1 @@ -{ - "solidity.monoRepoSupport": true, - "solidity.compileUsingRemoteVersion": "v0.8.21+commit.d9974bed" -} +{} diff --git a/templates/threejs/.vscode/extensions.json b/templates/threejs/.vscode/extensions.json index 739a4f8b82..7d5d7da3d9 100644 --- a/templates/threejs/.vscode/extensions.json +++ b/templates/threejs/.vscode/extensions.json @@ -1,3 +1,3 @@ { - "recommendations": ["JuanBlanco.solidity"] + "recommendations": ["NomicFoundation.hardhat-solidity"] } diff --git a/templates/threejs/.vscode/settings.json b/templates/threejs/.vscode/settings.json index 2cb0dd5713..0967ef424b 100644 --- a/templates/threejs/.vscode/settings.json +++ b/templates/threejs/.vscode/settings.json @@ -1,4 +1 @@ -{ - "solidity.monoRepoSupport": true, - "solidity.compileUsingRemoteVersion": "v0.8.21+commit.d9974bed" -} +{} diff --git a/templates/vanilla/.vscode/extensions.json b/templates/vanilla/.vscode/extensions.json index 739a4f8b82..7d5d7da3d9 100644 --- a/templates/vanilla/.vscode/extensions.json +++ b/templates/vanilla/.vscode/extensions.json @@ -1,3 +1,3 @@ { - "recommendations": ["JuanBlanco.solidity"] + "recommendations": ["NomicFoundation.hardhat-solidity"] } diff --git a/templates/vanilla/.vscode/settings.json b/templates/vanilla/.vscode/settings.json index 2cb0dd5713..0967ef424b 100644 --- a/templates/vanilla/.vscode/settings.json +++ b/templates/vanilla/.vscode/settings.json @@ -1,4 +1 @@ -{ - "solidity.monoRepoSupport": true, - "solidity.compileUsingRemoteVersion": "v0.8.21+commit.d9974bed" -} +{}