feat: Move nested frontend & contracts packages to the root

scio-labs · Oct 11, 2023 · 40d397f · 40d397f
1 parent de34e03
commit 40d397f
Show file tree

Hide file tree

Showing 80 changed files with 24 additions and 78 deletions.
diff --git a/.vscode/inkathon.code-workspace b/.vscode/inkathon.code-workspace
@@ -6,11 +6,11 @@
     },
     {
       "name": "Frontend",
-      "path": "../packages/frontend"
+      "path": "../frontend"
     },
     {
       "name": "Contracts",
-      "path": "../packages/contracts"
+      "path": "../contracts"
     }
   ],
   "settings": {

diff --git a/packages/contracts/.env.development.example → contracts/.env.development.example b/packages/contracts/.env.development.example → contracts/.env.development.example
diff --git a/packages/contracts/.gitignore → contracts/.gitignore b/packages/contracts/.gitignore → contracts/.gitignore
diff --git a/packages/contracts/Cargo.toml → contracts/Cargo.toml b/packages/contracts/Cargo.toml → contracts/Cargo.toml
diff --git a/packages/contracts/build-all.sh → contracts/build-all.sh b/packages/contracts/build-all.sh → contracts/build-all.sh
diff --git a/.../deployments/greeter/alephzero-testnet.ts → .../deployments/greeter/alephzero-testnet.ts b/.../deployments/greeter/alephzero-testnet.ts → .../deployments/greeter/alephzero-testnet.ts
diff --git a/...ontracts/deployments/greeter/alephzero.ts → contracts/deployments/greeter/alephzero.ts b/...ontracts/deployments/greeter/alephzero.ts → contracts/deployments/greeter/alephzero.ts
diff --git a/...acts/deployments/greeter/greeter.contract → ...acts/deployments/greeter/greeter.contract b/...acts/deployments/greeter/greeter.contract → ...acts/deployments/greeter/greeter.contract
diff --git a/...ontracts/deployments/greeter/greeter.wasm → contracts/deployments/greeter/greeter.wasm b/...ontracts/deployments/greeter/greeter.wasm → contracts/deployments/greeter/greeter.wasm
diff --git a/...ntracts/deployments/greeter/metadata.json → contracts/deployments/greeter/metadata.json b/...ntracts/deployments/greeter/metadata.json → contracts/deployments/greeter/metadata.json
diff --git a/.../contracts/deployments/greeter/shibuya.ts → contracts/deployments/greeter/shibuya.ts b/.../contracts/deployments/greeter/shibuya.ts → contracts/deployments/greeter/shibuya.ts
diff --git a/packages/contracts/greeter/Cargo.toml → contracts/greeter/Cargo.toml b/packages/contracts/greeter/Cargo.toml → contracts/greeter/Cargo.toml
diff --git a/packages/contracts/greeter/lib.rs → contracts/greeter/lib.rs b/packages/contracts/greeter/lib.rs → contracts/greeter/lib.rs
diff --git a/packages/contracts/package.json → contracts/package.json b/packages/contracts/package.json → contracts/package.json
@@ -7,7 +7,8 @@
     "test": "./test-all.sh",
     "build": "./build-all.sh",
     "node": "substrate-contracts-node --dev --port 9944 --base-path ./.node-data",
-    "deploy": "ts-node scripts/deploy.ts",
+    "script": "ts-node --cwd=scripts",
+    "deploy": "pnpm run script deploy",
     "contracts-ui": "open https://contracts-ui.substrate.io/?rpc=ws://127.0.0.1:9944",
     "explorer-ui": "open https://polkadot.js.org/apps/#/explorer?rpc=ws://127.0.0.1:9944",
     "typecheck": "tsc --noEmit"

diff --git a/packages/contracts/rust-toolchain → contracts/rust-toolchain b/packages/contracts/rust-toolchain → contracts/rust-toolchain
diff --git a/packages/contracts/scripts/deploy.ts → contracts/scripts/deploy.ts b/packages/contracts/scripts/deploy.ts → contracts/scripts/deploy.ts
diff --git a/...scripts/types/ContractDeployments.type.ts → ...scripts/types/ContractDeployments.type.ts b/...scripts/types/ContractDeployments.type.ts → ...scripts/types/ContractDeployments.type.ts
diff --git a/.../contracts/scripts/types/DeployFn.type.ts → contracts/scripts/types/DeployFn.type.ts b/.../contracts/scripts/types/DeployFn.type.ts → contracts/scripts/types/DeployFn.type.ts
diff --git a/...tracts/scripts/utils/getDeploymentData.ts → contracts/scripts/utils/getDeploymentData.ts b/...tracts/scripts/utils/getDeploymentData.ts → contracts/scripts/utils/getDeploymentData.ts
diff --git a/...contracts/scripts/utils/initPolkadotJs.ts → contracts/scripts/utils/initPolkadotJs.ts b/...contracts/scripts/utils/initPolkadotJs.ts → contracts/scripts/utils/initPolkadotJs.ts
diff --git a/...s/scripts/utils/writeContractAddresses.ts → ...s/scripts/utils/writeContractAddresses.ts b/...s/scripts/utils/writeContractAddresses.ts → ...s/scripts/utils/writeContractAddresses.ts
diff --git a/packages/contracts/test-all.sh → contracts/test-all.sh b/packages/contracts/test-all.sh → contracts/test-all.sh
diff --git a/packages/contracts/tsconfig.json → contracts/tsconfig.json b/packages/contracts/tsconfig.json → contracts/tsconfig.json
diff --git a/packages/frontend/.env.local.example → frontend/.env.local.example b/packages/frontend/.env.local.example → frontend/.env.local.example
@@ -16,8 +16,8 @@ NEXT_PUBLIC_URL=http://localhost:3000
 
 ## The default chain identifer
 ## IMPORTANT: Make sure to add the following for all contracts:
-##   → ABIs under `/packages/contracts/deployments/{contract}/metadata.json` (auto-generated on build)
-##   → Addresses for all chains under `/packages/contracts/deployments/{contract}/{chain}.ts` (auto-generated on deploy)
+##   → ABIs under `/contracts/deployments/{contract}/metadata.json` (auto-generated on build)
+##   → Addresses for all chains under `/contracts/deployments/{contract}/{chain}.ts` (auto-generated on deploy)
 ## NOTE: See dynamic contract imports under `src/deployments/deployments.ts`
 NEXT_PUBLIC_DEFAULT_CHAIN=alephzero-testnet
 

diff --git a/packages/frontend/.eslintignore → frontend/.eslintignore b/packages/frontend/.eslintignore → frontend/.eslintignore
diff --git a/packages/frontend/.eslintrc.json → frontend/.eslintrc.json b/packages/frontend/.eslintrc.json → frontend/.eslintrc.json
diff --git a/packages/frontend/.gitignore → frontend/.gitignore b/packages/frontend/.gitignore → frontend/.gitignore
diff --git a/packages/frontend/.lintstagedrc.json → frontend/.lintstagedrc.json b/packages/frontend/.lintstagedrc.json → frontend/.lintstagedrc.json
diff --git a/packages/frontend/.prettierignore → frontend/.prettierignore b/packages/frontend/.prettierignore → frontend/.prettierignore
diff --git a/packages/frontend/.prettierrc.js → frontend/.prettierrc.js b/packages/frontend/.prettierrc.js → frontend/.prettierrc.js
@@ -1,4 +1,4 @@
 module.exports = {
-  ...require('../../.prettierrc.js'),
+  ...require('../.prettierrc.js'),
   plugins: ['prettier-plugin-twin.macro'],
 }
diff --git a/...s/frontend/.vscode/frontend.code-snippets → frontend/.vscode/frontend.code-snippets b/...s/frontend/.vscode/frontend.code-snippets → frontend/.vscode/frontend.code-snippets
diff --git a/packages/frontend/next.config.js → frontend/next.config.js b/packages/frontend/next.config.js → frontend/next.config.js
diff --git a/packages/frontend/package.json → frontend/package.json b/packages/frontend/package.json → frontend/package.json
@@ -8,6 +8,7 @@
     }
   },
   "scripts": {
+    "postinstall": "cp -n .env.local.example .env.local; true",
     "dev": "NODE_ENV=development next dev",
     "node": "pnpm run --filter contracts node",
     "dev-and-node": "concurrently \"pnpm dev\" \"pnpm node\" --names \"Next,Node\" --kill-others",

diff --git a/...s/frontend/public/brand/inkathon-logo.png → frontend/public/brand/inkathon-logo.png b/...s/frontend/public/brand/inkathon-logo.png → frontend/public/brand/inkathon-logo.png
diff --git a/packages/frontend/public/browserconfig.xml → frontend/public/browserconfig.xml b/packages/frontend/public/browserconfig.xml → frontend/public/browserconfig.xml
diff --git a/packages/frontend/public/favicon.ico → frontend/public/favicon.ico b/packages/frontend/public/favicon.ico → frontend/public/favicon.ico
diff --git a/...ublic/favicons/android-chrome-192x192.png → ...ublic/favicons/android-chrome-192x192.png b/...ublic/favicons/android-chrome-192x192.png → ...ublic/favicons/android-chrome-192x192.png
diff --git a/...ublic/favicons/android-chrome-384x384.png → ...ublic/favicons/android-chrome-384x384.png b/...ublic/favicons/android-chrome-384x384.png → ...ublic/favicons/android-chrome-384x384.png
diff --git a/...tend/public/favicons/apple-touch-icon.png → ...tend/public/favicons/apple-touch-icon.png b/...tend/public/favicons/apple-touch-icon.png → ...tend/public/favicons/apple-touch-icon.png
diff --git a/...rontend/public/favicons/favicon-16x16.png → frontend/public/favicons/favicon-16x16.png b/...rontend/public/favicons/favicon-16x16.png → frontend/public/favicons/favicon-16x16.png
diff --git a/...rontend/public/favicons/favicon-32x32.png → frontend/public/favicons/favicon-32x32.png b/...rontend/public/favicons/favicon-32x32.png → frontend/public/favicons/favicon-32x32.png
diff --git a/...ontend/public/favicons/mstile-150x150.png → frontend/public/favicons/mstile-150x150.png b/...ontend/public/favicons/mstile-150x150.png → frontend/public/favicons/mstile-150x150.png
diff --git a/...end/public/favicons/safari-pinned-tab.svg → ...end/public/favicons/safari-pinned-tab.svg b/...end/public/favicons/safari-pinned-tab.svg → ...end/public/favicons/safari-pinned-tab.svg
diff --git a/packages/frontend/public/icons/azns-icon.svg → frontend/public/icons/azns-icon.svg b/packages/frontend/public/icons/azns-icon.svg → frontend/public/icons/azns-icon.svg
diff --git a/...s/frontend/public/icons/github-button.svg → frontend/public/icons/github-button.svg b/...s/frontend/public/icons/github-button.svg → frontend/public/icons/github-button.svg
diff --git a/packages/frontend/public/icons/github.svg → frontend/public/icons/github.svg b/packages/frontend/public/icons/github.svg → frontend/public/icons/github.svg
diff --git a/.../frontend/public/icons/sponsor-button.svg → frontend/public/icons/sponsor-button.svg b/.../frontend/public/icons/sponsor-button.svg → frontend/public/icons/sponsor-button.svg
diff --git a/...frontend/public/icons/telegram-button.svg → frontend/public/icons/telegram-button.svg b/...frontend/public/icons/telegram-button.svg → frontend/public/icons/telegram-button.svg
diff --git a/...s/frontend/public/icons/vercel-button.svg → frontend/public/icons/vercel-button.svg b/...s/frontend/public/icons/vercel-button.svg → frontend/public/icons/vercel-button.svg
diff --git a/packages/frontend/public/images/cover.jpg → frontend/public/images/cover.jpg b/packages/frontend/public/images/cover.jpg → frontend/public/images/cover.jpg
diff --git a/packages/frontend/public/site.webmanifest → frontend/public/site.webmanifest b/packages/frontend/public/site.webmanifest → frontend/public/site.webmanifest
diff --git a/...end/src/components/home/HomePageTitle.tsx → ...end/src/components/home/HomePageTitle.tsx b/...end/src/components/home/HomePageTitle.tsx → ...end/src/components/home/HomePageTitle.tsx
diff --git a/...ontend/src/components/home/HomeTopBar.tsx → frontend/src/components/home/HomeTopBar.tsx b/...ontend/src/components/home/HomeTopBar.tsx → frontend/src/components/home/HomeTopBar.tsx
diff --git a/...tend/src/components/layout/BaseLayout.tsx → ...tend/src/components/layout/BaseLayout.tsx b/...tend/src/components/layout/BaseLayout.tsx → ...tend/src/components/layout/BaseLayout.tsx
diff --git a/...tend/src/components/layout/CenterBody.tsx → ...tend/src/components/layout/CenterBody.tsx b/...tend/src/components/layout/CenterBody.tsx → ...tend/src/components/layout/CenterBody.tsx
diff --git a/.../src/components/layout/HotToastConfig.tsx → .../src/components/layout/HotToastConfig.tsx b/.../src/components/layout/HotToastConfig.tsx → .../src/components/layout/HotToastConfig.tsx
diff --git a/...rontend/src/components/layout/Wrapper.tsx → frontend/src/components/layout/Wrapper.tsx b/...rontend/src/components/layout/Wrapper.tsx → frontend/src/components/layout/Wrapper.tsx
diff --git a/...rontend/src/components/web3/ChainInfo.tsx → frontend/src/components/web3/ChainInfo.tsx b/...rontend/src/components/web3/ChainInfo.tsx → frontend/src/components/web3/ChainInfo.tsx
diff --git a/...end/src/components/web3/ConnectButton.tsx → ...end/src/components/web3/ConnectButton.tsx b/...end/src/components/web3/ConnectButton.tsx → ...end/src/components/web3/ConnectButton.tsx
diff --git a/...ents/web3/GreeterContractInteractions.tsx → ...ents/web3/GreeterContractInteractions.tsx b/...ents/web3/GreeterContractInteractions.tsx → ...ents/web3/GreeterContractInteractions.tsx
diff --git a/packages/frontend/src/config/environment.ts → frontend/src/config/environment.ts b/packages/frontend/src/config/environment.ts → frontend/src/config/environment.ts
diff --git a/...frontend/src/config/getSupportedChains.ts → frontend/src/config/getSupportedChains.ts b/...frontend/src/config/getSupportedChains.ts → frontend/src/config/getSupportedChains.ts
diff --git a/packages/frontend/src/config/getUrl.ts → frontend/src/config/getUrl.ts b/packages/frontend/src/config/getUrl.ts → frontend/src/config/getUrl.ts
diff --git a/...s/frontend/src/deployments/deployments.ts → frontend/src/deployments/deployments.ts b/...s/frontend/src/deployments/deployments.ts → frontend/src/deployments/deployments.ts
diff --git a/packages/frontend/src/pages/_app.tsx → frontend/src/pages/_app.tsx b/packages/frontend/src/pages/_app.tsx → frontend/src/pages/_app.tsx
diff --git a/packages/frontend/src/pages/_document.tsx → frontend/src/pages/_document.tsx b/packages/frontend/src/pages/_document.tsx → frontend/src/pages/_document.tsx
diff --git a/packages/frontend/src/pages/index.tsx → frontend/src/pages/index.tsx b/packages/frontend/src/pages/index.tsx → frontend/src/pages/index.tsx
diff --git a/...ages/frontend/src/styles/GlobalStyles.tsx → frontend/src/styles/GlobalStyles.tsx b/...ages/frontend/src/styles/GlobalStyles.tsx → frontend/src/styles/GlobalStyles.tsx
diff --git a/packages/frontend/src/types/twin.d.ts → frontend/src/types/twin.d.ts b/packages/frontend/src/types/twin.d.ts → frontend/src/types/twin.d.ts
diff --git a/...rontend/src/utils/contractTxWithToast.tsx → frontend/src/utils/contractTxWithToast.tsx b/...rontend/src/utils/contractTxWithToast.tsx → frontend/src/utils/contractTxWithToast.tsx
diff --git a/packages/frontend/src/utils/truncateHash.ts → frontend/src/utils/truncateHash.ts b/packages/frontend/src/utils/truncateHash.ts → frontend/src/utils/truncateHash.ts
diff --git a/packages/frontend/src/utils/useIsSSR.ts → frontend/src/utils/useIsSSR.ts b/packages/frontend/src/utils/useIsSSR.ts → frontend/src/utils/useIsSSR.ts
diff --git a/packages/frontend/tailwind.config.js → frontend/tailwind.config.js b/packages/frontend/tailwind.config.js → frontend/tailwind.config.js
diff --git a/packages/frontend/tsconfig.json → frontend/tsconfig.json b/packages/frontend/tsconfig.json → frontend/tsconfig.json
diff --git a/packages/frontend/withTwin.js → frontend/withTwin.js b/packages/frontend/withTwin.js → frontend/withTwin.js
diff --git a/package.json b/package.json
@@ -12,10 +12,11 @@
   },
   "private": true,
   "workspaces": [
-    "packages/*"
+    "frontend",
+    "contracts"
   ],
   "engines": {
-    "node": ">=16 <=18",
+    "node": ">=16",
     "pnpm": "8"
   },
   "scripts": {

diff --git a/packages/frontend/next-env.d.ts b/packages/frontend/next-env.d.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,2 +1,3 @@
 packages:
-  - 'packages/**'
+  - 'frontend'
+  - 'contracts'
diff --git a/vercel.json b/vercel.json
@@ -3,7 +3,7 @@
   "framework": "nextjs",
   "buildCommand": "pnpm build",
   "devCommand": "pnpm dev",
-  "outputDirectory": "./packages/frontend/.next",
+  "outputDirectory": "./frontend/.next",
   "installCommand": "HUSKY=0 pnpm install --no-frozen-lockfile",
   "ignoreCommand": "",
   "github": {