Fix

1Hive · Jun 6, 2023 · 9c73037 · 9c73037
1 parent 1df0f64
commit 9c73037
Show file tree

Hide file tree

Showing 7 changed files with 273 additions and 260 deletions.
diff --git a/package.json b/package.json
@@ -11,25 +11,25 @@
   "private": true,
   "scripts": {
     "ci": "yarn install --pure-lockfile --immutable --skip-builds",
-    "lint": "yarn workspace @1hive/quests-react-app lint",
-    "chain": "yarn workspace @1hive/quests-hardhat chain",
-    "test": "yarn workspace @1hive/quests-hardhat test",
-    "start": "yarn workspace @1hive/quests-react-app start",
-    "build": "yarn workspace @1hive/quests-react-app build --max-old-space-size=12288",
-    "start:local": "yarn workspace @1hive/quests-react-app start:local",
-    "compile": "yarn workspace @1hive/quests-hardhat compile",
-    "coverage": "yarn workspace @1hive/quests-hardhat test-coverage",
-    "deploy:rinkeby": "yarn workspace @1hive/quests-hardhat deploy:rinkeby",
-    "deploy:local": "yarn workspace @1hive/quests-hardhat deploy:local",
+    "lint": "yarn workspace @quests/react-app lint",
+    "chain": "yarn workspace @quests/hardhat chain",
+    "test": "yarn workspace @quests/hardhat test",
+    "start": "yarn workspace @quests/react-app start",
+    "build": "yarn workspace @quests/react-app build --max-old-space-size=12288",
+    "start:local": "yarn workspace @quests/react-app start:local",
+    "compile": "yarn workspace @quests/hardhat compile",
+    "coverage": "yarn workspace @quests/hardhat test-coverage",
+    "deploy:rinkeby": "yarn workspace @quests/hardhat deploy:rinkeby",
+    "deploy:local": "yarn workspace @quests/hardhat deploy:local",
     "graph-run-node": "cd docker/graph-node && docker-compose up",
     "graph-remove-node": "cd docker/graph-node && docker-compose down",
-    "e2e": "yarn workspace @1hive/e2e test"
+    "e2e": "yarn workspace @quests/e2e test"
   },
   "workspaces": {
     "packages": [
       "packages/*"
     ],
-    "nohoist": [
+    "installConfig.hoistingLimits": [
       "**/@graphprotocol/graph-ts",
       "**/@graphprotocol/graph-ts/**"
     ]
@@ -39,5 +39,8 @@
     "ts-node": "^10.2.1",
     "typescript": "^4.4.2"
   },
-  "packageManager": "yarn@3.5.1"
+  "packageManager": "yarn@3.5.1",
+  "dependencies": {
+    "node-gyp": "^9.3.1"
+  }
 }
diff --git a/packages/e2e/package.json b/packages/e2e/package.json
@@ -1,44 +1,45 @@
 {
-    "name": "@1hive/e2e",
-    "version": "1.0.0",
-    "description": "e2e",
-    "main": "dist/bundle.js",
-    "scripts": {
-        "webapp:start": "yarn workspace @1hive/quests-react-app start",
-        "test": "jest --runInBand --json --outputFile=output/jest-reporter.json --testLocationInResults",
-        "test:headless": "xvfb-run --auto-servernum yarn test",
-        "ci": "yarn install --pure-lockfile --immutable --skip-builds"
-    },
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-        "@chainsafe/dappeteer": "3.0.0",
-        "@jest/test-result": "^29.1.2",
-        "@jest/test-sequencer": "^29.1.2",
-        "chalk": "^5.0.1",
-        "dotenv": "^16.0.2",
-        "expect-puppeteer": "^6.1.1",
-        "fs-extra": "^10.1.0",
-        "jest-environment-node": "^29.1.2",
-        "puppeteer": "^17.1.3"
-    },
-    "devDependencies": {
-        "@types/expect-puppeteer": "^5.0.1",
-        "@types/jest": "^29.1.1",
-        "@types/jest-environment-puppeteer": "^5.0.2",
-        "@types/puppeteer": "^5.4.6",
-        "dotenv": "^16.0.2",
-        "fs-extra": "^10.1.0",
-        "github-actions": "^0.9.0",
-        "jest": "^29.1.2",
-        "jest-circus": "^29.1.2",
-        "jest-github-reporter": "^1.0.2",
-        "jest-puppeteer": "^6.1.1",
-        "source-map-loader": "^4.0.0",
-        "ts-jest": "^29.0.3",
-        "ts-loader": "^8.0.3",
-        "ts-node": "^10.9.1",
-        "typescript": "^4.8.3",
-        "webpack-cli": "^3.3.12"
-    }
+  "name": "@quests/e2e",
+  "version": "1.0.0",
+  "description": "e2e",
+  "main": "dist/bundle.js",
+  "scripts": {
+    "webapp:start": "yarn workspace @quests/react-app start",
+    "test": "jest --runInBand --json --outputFile=output/jest-reporter.json --testLocationInResults",
+    "test:headless": "xvfb-run --auto-servernum yarn test",
+    "ci": "yarn install --pure-lockfile --immutable --skip-builds"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@chainsafe/dappeteer": "3.0.0",
+    "@jest/test-result": "^29.1.2",
+    "@jest/test-sequencer": "^29.1.2",
+    "@types/node": "^20.2.5",
+    "chalk": "^5.0.1",
+    "dotenv": "^16.0.2",
+    "expect-puppeteer": "^6.1.1",
+    "fs-extra": "^10.1.0",
+    "jest-environment-node": "^29.1.2",
+    "puppeteer": "^17.1.3"
+  },
+  "devDependencies": {
+    "@types/expect-puppeteer": "^5.0.1",
+    "@types/jest": "^29.1.1",
+    "@types/jest-environment-puppeteer": "^5.0.2",
+    "@types/puppeteer": "^5.4.6",
+    "dotenv": "^16.0.2",
+    "fs-extra": "^10.1.0",
+    "github-actions": "^0.9.0",
+    "jest": "^29.1.2",
+    "jest-circus": "^29.1.2",
+    "jest-github-reporter": "^1.0.2",
+    "jest-puppeteer": "^6.1.1",
+    "source-map-loader": "^4.0.0",
+    "ts-jest": "^29.0.3",
+    "ts-loader": "^8.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.3",
+    "webpack-cli": "^3.3.12"
+  }
 }
diff --git a/packages/hardhat/package.json b/packages/hardhat/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@1hive/quests-hardhat",
+  "name": "@quests/hardhat",
   "version": "1.0.0",
   "main": "index.js",
   "license": "MIT",

diff --git a/packages/react-app/package.json b/packages/react-app/package.json
@@ -1,6 +1,6 @@
 {
   "proxy": "https://cors-anywhere.herokuapp.com/",
-  "name": "@1hive/quests-react-app",
+  "name": "@quests/react-app",
   "version": "0.1.1-alpha",
   "license": "MIT",
   "homepage": ".",

diff --git a/packages/services/package.json b/packages/services/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@1hive/quests-services",
+  "name": "@quests/services",
   "version": "1.0.0",
   "license": "MIT",
   "scripts": {

diff --git a/packages/subgraphs/quest-subgraph/package.json b/packages/subgraphs/quest-subgraph/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@1hive/quests-subgraph",
+  "name": "@quests/subgraph",
   "license": "UNLICENSED",
   "version": "0.1.0",
   "type": "module",
@@ -16,7 +16,7 @@
     "deploy:gnosis": "yarn manifest:gnosis && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ corantin/quests-subgraph-gnosis",
     "deploy:staging-gnosis": "yarn manifest:gnosis && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ corantin/quests-subgraph-staging",
     "deploy:local": "graph deploy --ipfs http://0.0.0.0:5001 --node http://0.0.0.0:8020 corantin/quests-subgraph",
-    "hardhat:deploy:local": "yarn workspace @1hive/quests-hardhat deploy:local && yarn workspace @1hive/quests-hardhat"
+    "hardhat:deploy:local": "yarn workspace @quests/hardhat deploy:local && yarn workspace @quests/hardhat"
   },
   "dependencies": {
     "@graphprotocol/graph-cli": "^0.23.2",
@@ -27,4 +27,4 @@
     "minimist": "^1.2.6",
     "mustache": "^4.2.0"
   }
-}
+}