chore: un-deprecated urls

FuelLabs · Jan 21, 2025 · a1bb3bf · a1bb3bf
1 parent 387e8c0
commit a1bb3bf
Show file tree

Hide file tree

Showing 15 changed files with 186 additions and 235 deletions.
diff --git a/internal/utils/CHANGELOG.md b/internal/utils/CHANGELOG.md
diff --git a/internal/utils/README.md b/internal/utils/README.md
diff --git a/internal/utils/package.json b/internal/utils/package.json
diff --git a/internal/utils/src/index.ts b/internal/utils/src/index.ts
diff --git a/internal/utils/tsconfig.json b/internal/utils/tsconfig.json
diff --git a/internal/utils/tsup.config.ts b/internal/utils/tsup.config.ts
diff --git a/packages/account/package.json b/packages/account/package.json
@@ -15,6 +15,11 @@
       "require": "./dist/index.js",
       "import": "./dist/index.mjs"
     },
+    "./configs": {
+      "types": "./dist/configs.d.ts",
+      "require": "./dist/configs.js",
+      "import": "./dist/configs.mjs"
+    },
     "./test-utils": {
       "types": "./dist/test-utils.d.ts",
       "require": "./dist/test-utils.js",
@@ -23,6 +28,9 @@
   },
   "typesVersions": {
     "*": {
+      "configs": [
+        "./dist/configs.d.ts"
+      ],
       "test-utils": [
         "./dist/test-utils.d.ts"
       ]
@@ -66,7 +74,6 @@
     "@graphql-codegen/typescript": "4.0.9",
     "@graphql-codegen/typescript-generic-sdk": "4.0.1",
     "@graphql-codegen/typescript-operations": "4.2.3",
-    "@internal/utils": "workspace:*",
     "@types/ramda": "0.30.2",
     "get-graphql-schema": "2.1.2",
     "type-fest": "4.26.1"

diff --git a/packages/account/src/configs.test.ts b/packages/account/src/configs.test.ts
@@ -0,0 +1,17 @@
+import { DEVNET_NETWORK_URL, TESTNET_NETWORK_URL } from './configs';
+
+/**
+ * @group node
+ * @group browser
+ */
+describe('Configs', () => {
+  it('exports DEVNET_NETWORK_URL', async () => {
+    const configs = await import('./configs');
+    expect(configs.DEVNET_NETWORK_URL).toBe(DEVNET_NETWORK_URL);
+  });
+
+  it('exports TESTNET_NETWORK_URL', async () => {
+    const configs = await import('./configs');
+    expect(configs.TESTNET_NETWORK_URL).toBe(TESTNET_NETWORK_URL);
+  });
+});
diff --git a/internal/utils/src/constants.ts → packages/account/src/configs.ts b/internal/utils/src/constants.ts → packages/account/src/configs.ts
@@ -1,2 +1,9 @@
+/**
+ * Devnet network URL
+ */
 export const DEVNET_NETWORK_URL = 'https://devnet.fuel.network/v1/graphql';
+
+/**
+ * Testnet network URL
+ */
 export const TESTNET_NETWORK_URL = 'https://testnet.fuel.network/v1/graphql';
diff --git a/packages/account/test/fuel-wallet-connector.test.ts b/packages/account/test/fuel-wallet-connector.test.ts
@@ -5,10 +5,10 @@ import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils';
 import type { BN } from '@fuel-ts/math';
 import { bn } from '@fuel-ts/math';
 import type { BytesLike } from '@fuel-ts/utils';
-import { TESTNET_NETWORK_URL } from '@internal/utils';
 import { EventEmitter } from 'events';
 
 import type { AccountSendTxParams, Network, ProviderOptions, SelectNetworkArguments } from '../src';
+import { TESTNET_NETWORK_URL } from '../src/configs';
 import { Fuel } from '../src/connectors/fuel';
 import { FuelConnectorEventType } from '../src/connectors/types';
 import { Provider, ScriptTransactionRequest, TransactionStatus } from '../src/providers';

diff --git a/packages/account/tsup.config.ts b/packages/account/tsup.config.ts
@@ -9,6 +9,7 @@ const configs: Options = {
   ...tsupDefaults,
   entry: {
     index: 'src/index.ts',
+    configs: 'src/configs.ts',
     'test-utils': 'src/test-utils.ts',
   },
   // eslint-disable-next-line @typescript-eslint/require-await

diff --git a/packages/fuel-gauge/package.json b/packages/fuel-gauge/package.json
@@ -17,7 +17,6 @@
     "@fuel-ts/account": "workspace:*",
     "@fuel-ts/errors": "workspace:*",
     "@fuel-ts/merkle": "workspace:*",
-    "@fuel-ts/utils": "workspace:*",
-    "@internal/utils": "workspace:*"
+    "@fuel-ts/utils": "workspace:*"
   }
 }
diff --git a/packages/fuel-gauge/src/e2e-script.test.ts b/packages/fuel-gauge/src/e2e-script.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { DEVNET_NETWORK_URL, TESTNET_NETWORK_URL } from '@internal/utils';
+import { DEVNET_NETWORK_URL, TESTNET_NETWORK_URL } from '@fuel-ts/account';
 import { WalletUnlocked, Provider, TransactionType, CHAIN_IDS, rawAssets, assets, bn } from 'fuels';
 
 import { ScriptMainArgBool } from '../test/typegen';

diff --git a/packages/fuels/src/index.ts b/packages/fuels/src/index.ts
@@ -14,4 +14,5 @@ export * from '@fuel-ts/transactions';
 export * from '@fuel-ts/utils';
 export * from '@fuel-ts/account';
 export * from '@fuel-ts/transactions/configs';
+export * from '@fuel-ts/account/configs';
 export * from '@fuel-ts/recipes';