From cd88bf43333c8ca08aa0eae4ef2af7261e4c8eec Mon Sep 17 00:00:00 2001 From: rodrigopavezi Date: Fri, 6 Dec 2024 18:39:58 -0300 Subject: [PATCH 1/3] fix: npm link issue --- package-lock.json | 56 +++++++++++------- package.json | 7 ++- .../src/lib/create-invoice-form.svelte | 16 ++--- .../src/lib/invoice/form-view.svelte | 12 ++-- .../src/lib/invoice/form.svelte | 22 +++---- .../src/lib/utils/prepareRequest.ts | 2 +- .../create-invoice-form/vite.wc.config.ts | 3 + packages/invoice-dashboard/package.json | 1 + .../src/lib/dashboard/drawer.svelte | 4 +- .../src/lib/dashboard/invoice-view.svelte | 22 +++---- .../src/lib/view-requests.svelte | 46 +++++++------- .../src/utils/formatAddress.ts | 2 +- packages/invoice-dashboard/vite.wc.config.ts | 3 + .../lib/components/payment-complete.svelte | 8 +-- .../components/payment-confirmation.svelte | 8 +-- .../src/lib/components/wallet-info.svelte | 2 +- .../src/lib/payment-widget.svelte | 4 +- .../src/lib/utils/currencies.ts | 2 +- packages/payment-widget/vite.wc.config.ts | 3 + .../shared}/assets/logo-sm.svg | 0 {shared => packages/shared}/assets/logo.svg | 0 .../shared}/components/accordion.svelte | 0 .../shared}/components/app.css | 0 .../shared}/components/button.svelte | 0 .../shared}/components/button/button.svelte | 0 .../shared}/components/button/index.ts | 0 .../shared}/components/components.json | 0 .../shared}/components/copy.svelte | 0 .../components/dashboard-skeleton.svelte | 0 .../shared}/components/dropdown.svelte | 0 .../shared}/components/input.svelte | 0 .../shared}/components/labels.svelte | 0 .../shared}/components/modal.svelte | 0 .../shared}/components/postcss.config.js | 0 .../shared}/components/powered-by.svelte | 0 .../shared}/components/skeleton.svelte | 0 .../shared}/components/sonner.svelte | 0 .../shared}/components/status-label.svelte | 0 .../shared}/components/status.svelte | 0 .../shared}/components/switch.svelte | 0 .../shared}/components/tailwind.config.ts | 0 .../shared}/components/tooltip.svelte | 0 .../shared}/components/tx-type.svelte | 0 .../shared}/components/utils.ts | 0 .../fonts/Montserrat-VariableFont_wght.ttf | Bin .../shared}/icons/check.svelte | 0 .../shared}/icons/chevron-down.svelte | 0 .../shared}/icons/chevron-left.svelte | 0 .../shared}/icons/chevron-right.svelte | 0 .../shared}/icons/chevron-up.svelte | 0 .../shared}/icons/close.svelte | 0 .../shared}/icons/copy-icon.svelte | 0 .../shared}/icons/download.svelte | 0 .../shared}/icons/exchange.svelte | 0 .../shared}/icons/info-circle.svelte | 0 .../shared}/icons/network/arbitrum.svelte | 0 .../shared}/icons/network/avax.svelte | 0 .../shared}/icons/network/base.svelte | 0 .../shared}/icons/network/bsc.svelte | 0 .../shared}/icons/network/celo.svelte | 0 .../shared}/icons/network/ethereum.svelte | 0 .../shared}/icons/network/fantom.svelte | 0 .../shared}/icons/network/gnosis.svelte | 0 .../shared}/icons/network/mantle.svelte | 56 +++++++++--------- .../shared}/icons/network/matic.svelte | 0 .../shared}/icons/network/moonbeam.svelte | 46 +++++++------- .../shared}/icons/network/near.svelte | 0 .../shared}/icons/network/network-icon.svelte | 0 .../shared}/icons/network/optimism.svelte | 0 .../shared}/icons/network/ronin.svelte | 0 .../shared}/icons/network/sepolia.svelte | 0 .../shared}/icons/network/zk-sync.svelte | 0 .../shared}/icons/persist.svelte | 0 {shared => packages/shared}/icons/plus.svelte | 0 .../shared}/icons/rn-logo-white.svelte | 0 .../shared}/icons/search.svelte | 0 .../shared}/icons/shield.svelte | 0 {shared => packages/shared}/icons/sync.svelte | 0 .../shared}/icons/trash.svelte | 0 .../shared}/icons/upload.svelte | 0 .../shared}/package.json | 2 +- .../shared}/store/dropwdown.ts | 0 {shared => packages/shared}/types/enums.ts | 0 {shared => packages/shared}/types/index.ts | 0 .../shared}/types/web3Onboard.ts | 0 .../shared}/utils/capitalize.ts | 0 .../shared}/utils/checkEthAddress.ts | 0 .../shared}/utils/checkStatus.ts | 0 {shared => packages/shared}/utils/config.ts | 0 .../shared}/utils/currencyConversionPairs.ts | 0 .../shared}/utils/formatAddress.ts | 0 .../shared}/utils/formatDate.ts | 0 .../shared}/utils/generateInvoice.ts | 0 .../shared}/utils/getCurrency.ts | 0 .../shared}/utils/getNetworkIcon.ts | 0 .../shared}/utils/initCurrencyManager.ts | 0 .../shared}/utils/invoiceTotals.ts | 0 shared/icons/package.json | 7 --- shared/types/package.json | 4 -- shared/utils/package.json | 4 -- 100 files changed, 176 insertions(+), 166 deletions(-) rename {shared => packages/shared}/assets/logo-sm.svg (100%) rename {shared => packages/shared}/assets/logo.svg (100%) rename {shared => packages/shared}/components/accordion.svelte (100%) rename {shared => packages/shared}/components/app.css (100%) rename {shared => packages/shared}/components/button.svelte (100%) rename {shared => packages/shared}/components/button/button.svelte (100%) rename {shared => packages/shared}/components/button/index.ts (100%) rename {shared => packages/shared}/components/components.json (100%) rename {shared => packages/shared}/components/copy.svelte (100%) rename {shared => packages/shared}/components/dashboard-skeleton.svelte (100%) rename {shared => packages/shared}/components/dropdown.svelte (100%) rename {shared => packages/shared}/components/input.svelte (100%) rename {shared => packages/shared}/components/labels.svelte (100%) rename {shared => packages/shared}/components/modal.svelte (100%) rename {shared => packages/shared}/components/postcss.config.js (100%) rename {shared => packages/shared}/components/powered-by.svelte (100%) rename {shared => packages/shared}/components/skeleton.svelte (100%) rename {shared => packages/shared}/components/sonner.svelte (100%) rename {shared => packages/shared}/components/status-label.svelte (100%) rename {shared => packages/shared}/components/status.svelte (100%) rename {shared => packages/shared}/components/switch.svelte (100%) rename {shared => packages/shared}/components/tailwind.config.ts (100%) rename {shared => packages/shared}/components/tooltip.svelte (100%) rename {shared => packages/shared}/components/tx-type.svelte (100%) rename {shared => packages/shared}/components/utils.ts (100%) rename {shared => packages/shared}/fonts/Montserrat-VariableFont_wght.ttf (100%) rename {shared => packages/shared}/icons/check.svelte (100%) rename {shared => packages/shared}/icons/chevron-down.svelte (100%) rename {shared => packages/shared}/icons/chevron-left.svelte (100%) rename {shared => packages/shared}/icons/chevron-right.svelte (100%) rename {shared => packages/shared}/icons/chevron-up.svelte (100%) rename {shared => packages/shared}/icons/close.svelte (100%) rename {shared => packages/shared}/icons/copy-icon.svelte (100%) rename {shared => packages/shared}/icons/download.svelte (100%) rename {shared => packages/shared}/icons/exchange.svelte (100%) rename {shared => packages/shared}/icons/info-circle.svelte (100%) rename {shared => packages/shared}/icons/network/arbitrum.svelte (100%) rename {shared => packages/shared}/icons/network/avax.svelte (100%) rename {shared => packages/shared}/icons/network/base.svelte (100%) rename {shared => packages/shared}/icons/network/bsc.svelte (100%) rename {shared => packages/shared}/icons/network/celo.svelte (100%) rename {shared => packages/shared}/icons/network/ethereum.svelte (100%) rename {shared => packages/shared}/icons/network/fantom.svelte (100%) rename {shared => packages/shared}/icons/network/gnosis.svelte (100%) rename {shared => packages/shared}/icons/network/mantle.svelte (99%) rename {shared => packages/shared}/icons/network/matic.svelte (100%) rename {shared => packages/shared}/icons/network/moonbeam.svelte (98%) rename {shared => packages/shared}/icons/network/near.svelte (100%) rename {shared => packages/shared}/icons/network/network-icon.svelte (100%) rename {shared => packages/shared}/icons/network/optimism.svelte (100%) rename {shared => packages/shared}/icons/network/ronin.svelte (100%) rename {shared => packages/shared}/icons/network/sepolia.svelte (100%) rename {shared => packages/shared}/icons/network/zk-sync.svelte (100%) rename {shared => packages/shared}/icons/persist.svelte (100%) rename {shared => packages/shared}/icons/plus.svelte (100%) rename {shared => packages/shared}/icons/rn-logo-white.svelte (100%) rename {shared => packages/shared}/icons/search.svelte (100%) rename {shared => packages/shared}/icons/shield.svelte (100%) rename {shared => packages/shared}/icons/sync.svelte (100%) rename {shared => packages/shared}/icons/trash.svelte (100%) rename {shared => packages/shared}/icons/upload.svelte (100%) rename {shared/components => packages/shared}/package.json (90%) rename {shared => packages/shared}/store/dropwdown.ts (100%) rename {shared => packages/shared}/types/enums.ts (100%) rename {shared => packages/shared}/types/index.ts (100%) rename {shared => packages/shared}/types/web3Onboard.ts (100%) rename {shared => packages/shared}/utils/capitalize.ts (100%) rename {shared => packages/shared}/utils/checkEthAddress.ts (100%) rename {shared => packages/shared}/utils/checkStatus.ts (100%) rename {shared => packages/shared}/utils/config.ts (100%) rename {shared => packages/shared}/utils/currencyConversionPairs.ts (100%) rename {shared => packages/shared}/utils/formatAddress.ts (100%) rename {shared => packages/shared}/utils/formatDate.ts (100%) rename {shared => packages/shared}/utils/generateInvoice.ts (100%) rename {shared => packages/shared}/utils/getCurrency.ts (100%) rename {shared => packages/shared}/utils/getNetworkIcon.ts (100%) rename {shared => packages/shared}/utils/initCurrencyManager.ts (100%) rename {shared => packages/shared}/utils/invoiceTotals.ts (100%) delete mode 100644 shared/icons/package.json delete mode 100644 shared/types/package.json delete mode 100644 shared/utils/package.json diff --git a/package-lock.json b/package-lock.json index 59966096..f5d64e88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2855,20 +2855,8 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" }, - "node_modules/@requestnetwork/shared-components": { - "resolved": "shared/components", - "link": true - }, - "node_modules/@requestnetwork/shared-icons": { - "resolved": "shared/icons", - "link": true - }, - "node_modules/@requestnetwork/shared-types": { - "resolved": "shared/types", - "link": true - }, - "node_modules/@requestnetwork/shared-utils": { - "resolved": "shared/utils", + "node_modules/@requestnetwork/shared": { + "resolved": "packages/shared", "link": true }, "node_modules/@requestnetwork/smart-contracts": { @@ -11478,7 +11466,7 @@ }, "packages/add-stakeholder": { "name": "@requestnetwork/add-stakeholder", - "version": "0.1.1", + "version": "0.1.2", "license": "MIT", "devDependencies": { "@popperjs/core": "^2.11.8", @@ -11500,7 +11488,7 @@ }, "packages/create-invoice-form": { "name": "@requestnetwork/create-invoice-form", - "version": "0.11.7", + "version": "0.11.8", "license": "MIT", "dependencies": { "@requestnetwork/data-format": "0.19.3", @@ -11520,12 +11508,13 @@ }, "packages/invoice-dashboard": { "name": "@requestnetwork/invoice-dashboard", - "version": "0.11.4", + "version": "0.11.5", "license": "MIT", "dependencies": { "@requestnetwork/payment-detection": "0.47.0", "@requestnetwork/payment-processor": "0.50.0", "@requestnetwork/request-client.js": "0.52.0", + "@requestnetwork/shared": "*", "@wagmi/connectors": "^5.5.3", "@wagmi/core": "^2.15.2", "ethers": "^5.7.2", @@ -11555,7 +11544,7 @@ }, "packages/payment-widget": { "name": "@requestnetwork/payment-widget", - "version": "0.3.4", + "version": "0.3.5", "license": "MIT", "dependencies": { "@requestnetwork/payment-processor": "0.50.0", @@ -11582,8 +11571,8 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, - "shared/components": { - "name": "@requestnetwork/shared-components", + "packages/shared": { + "name": "@requestnetwork/shared", "license": "MIT", "dependencies": { "clsx": "^2.1.1", @@ -11603,7 +11592,7 @@ "typescript": "^5.0.0" } }, - "shared/components/node_modules/clsx": { + "packages/shared/node_modules/clsx": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", @@ -11611,8 +11600,31 @@ "node": ">=6" } }, + "shared/components": { + "name": "@requestnetwork/shared-components", + "extraneous": true, + "license": "MIT", + "dependencies": { + "clsx": "^2.1.1", + "mode-watcher": "^0.4.0", + "svelte-sonner": "^0.3.27", + "tailwind-merge": "^2.4.0", + "tailwind-variants": "^0.2.1" + }, + "devDependencies": { + "@tailwindcss/typography": "^0.5.13", + "autoprefixer": "^10.4.19", + "postcss": "^8.4.38", + "svelte": "^4.0.5", + "svelte-check": "^3.6.0", + "tailwindcss": "^3.4.4", + "tslib": "^2.4.1", + "typescript": "^5.0.0" + } + }, "shared/icons": { "name": "@requestnetwork/shared-icons", + "extraneous": true, "license": "MIT", "devDependencies": { "svelte": "^4.0.5" @@ -11620,10 +11632,12 @@ }, "shared/types": { "name": "@requestnetwork/shared-types", + "extraneous": true, "license": "MIT" }, "shared/utils": { "name": "@requestnetwork/shared-utils", + "extraneous": true, "license": "MIT" } } diff --git a/package.json b/package.json index 175b92c0..6b1db497 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "description": "Request Network Web Components", "main": "index.js", "workspaces": [ - "./packages/*", - "./shared/*" + "./packages/*" ], "scripts": { "test": "echo \"Error: no test specified\" && exit 1", @@ -22,7 +21,8 @@ "unlink:all": "for d in packages/*; do (cd $d && npm unlink); done" }, "devDependencies": { - "turbo": "^2.0.6" + "turbo": "^2.0.6", + "graphql": "16.8.1" }, "author": "", "license": "MIT", @@ -32,4 +32,5 @@ "@requestnetwork/currency": "0.21.0", "bits-ui": "^0.21.12" } + } diff --git a/packages/create-invoice-form/src/lib/create-invoice-form.svelte b/packages/create-invoice-form/src/lib/create-invoice-form.svelte index 1c75bb8a..cf5eb065 100644 --- a/packages/create-invoice-form/src/lib/create-invoice-form.svelte +++ b/packages/create-invoice-form/src/lib/create-invoice-form.svelte @@ -5,24 +5,24 @@ import { Config as WagmiConfig } from "wagmi"; // Types import { type GetAccountReturnType } from "@wagmi/core"; - import type { IConfig } from "@requestnetwork/shared-types"; - import { APP_STATUS } from "@requestnetwork/shared-types/enums"; + import type { IConfig } from "@requestnetwork/shared/types"; + import { APP_STATUS } from "@requestnetwork/shared/types/enums"; import type { RequestNetwork } from "@requestnetwork/request-client.js"; import { Types } from "@requestnetwork/request-client.js"; import { CurrencyTypes } from "@requestnetwork/types"; // Utils import { getInitialFormData, prepareRequestParams } from "./utils"; - import { config as defaultConfig } from "@requestnetwork/shared-utils/config"; - import { calculateInvoiceTotals } from "@requestnetwork/shared-utils/invoiceTotals"; + import { config as defaultConfig } from "@requestnetwork/shared/utils/config"; + import { calculateInvoiceTotals } from "@requestnetwork/shared/utils/invoiceTotals"; import { getCurrencySupportedNetworksForConversion, initializeCurrencyManager, - } from "@requestnetwork/shared-utils/initCurrencyManager"; + } from "@requestnetwork/shared/utils/initCurrencyManager"; // Components import { InvoiceForm, InvoiceView } from "./invoice"; - import Button from "@requestnetwork/shared-components/button.svelte"; - import Status from "@requestnetwork/shared-components/status.svelte"; - import Modal from "@requestnetwork/shared-components/modal.svelte"; + import Button from "@requestnetwork/shared/components/button.svelte"; + import Status from "@requestnetwork/shared/components/status.svelte"; + import Modal from "@requestnetwork/shared/components/modal.svelte"; import { EncryptionTypes } from '@requestnetwork/types'; export let config: IConfig; diff --git a/packages/create-invoice-form/src/lib/invoice/form-view.svelte b/packages/create-invoice-form/src/lib/invoice/form-view.svelte index b69e052b..d298031e 100644 --- a/packages/create-invoice-form/src/lib/invoice/form-view.svelte +++ b/packages/create-invoice-form/src/lib/invoice/form-view.svelte @@ -1,19 +1,19 @@