Merge branch 'master' into feat/update-examples

docknetwork · Dec 13, 2024 · 9d153cd · 9d153cd
2 parents dacfb68 + 070f9c8
commit 9d153cd
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/packages/data-store/src/__tests__/index.test.ts b/packages/data-store/src/__tests__/index.test.ts
@@ -8,6 +8,7 @@ import {CURRENT_DATA_STORE_VERSION} from '../migration';
 import {DataStore} from '../types';
 import {WalletEntity, getWallet} from '../entities/wallet.entity';
 import {closeDataStore} from '../index';
+import { DEFAULT_CONFIGS } from '../configs';
 
 describe('Data store', () => {
   describe('v2-data-store migration', () => {
@@ -53,4 +54,26 @@ describe('Data store', () => {
       closeDataStore(dataStore);
     });
   });
+
+  it('should validate regex hostnames correctly', () => {
+    const mainnetHostnames = DEFAULT_CONFIGS.networks.find(net => net.id === 'mainnet')?.credentialHostnames || [];
+    const testnetHostnames = DEFAULT_CONFIGS.networks.find(net => net.id === 'testnet')?.credentialHostnames || [];
+
+    const mainnetPatterns = mainnetHostnames.filter(host => host instanceof RegExp) as RegExp[];
+    const testnetPatterns = testnetHostnames.filter(host => host instanceof RegExp) as RegExp[];
+
+
+    mainnetPatterns.forEach(regex => {
+      expect(regex.test('creds.dock.io')).toBe(true);
+      expect(regex.test('creds.example.io')).toBe(true);
+      expect(regex.test('invalid.dock.io')).toBe(false);
+    });
+
+
+    testnetPatterns.forEach(regex => {
+      expect(regex.test('creds-test.dock.io')).toBe(true);
+      expect(regex.test('creds-something.io')).toBe(true);
+      expect(regex.test('invalid.io')).toBe(false);
+    });
+  });
 });
diff --git a/packages/data-store/src/configs.ts b/packages/data-store/src/configs.ts
@@ -10,13 +10,13 @@ export const DEFAULT_CONFIGS: DataStoreConfigs = {
     {
       name: 'Mainnet',
       id: 'mainnet',
-      credentialHostnames: ['creds.dock.io'],
+      credentialHostnames: [/creds\..*\.io/],
       configs: SUBSTRATE_NETWORKS.mainnet,
     },
     {
       name: 'Testnet',
       id: 'testnet',
-      credentialHostnames: [/creds-.*\.dock\.io/],
+      credentialHostnames: [/creds-.*\.*\.io/],
       configs: SUBSTRATE_NETWORKS.testnet,
     },
   ],

diff --git a/packages/data-store/src/types.ts b/packages/data-store/src/types.ts
@@ -17,7 +17,7 @@ export type DocumentResolverResult = {
 export type Network = {
   name: string;
   id: string;
-  credentialHostnames: [string | RegExp];
+  credentialHostnames: Array<string | RegExp>;
   configs?: any;
 };
 

diff --git a/packages/react-native/bundler/index.js b/packages/react-native/bundler/index.js
@@ -47,7 +47,9 @@ const getWebpackConfig = ({entry, path, filename}) => ({
     rules: [
       {
         test: /\.(m|c)?(j|t)s$/,
-        exclude: [/\/node_modules\/(?!@polkadot|@docknetwork|@digitalbazaar)/],
+        exclude: [
+          /\/node_modules\/(?!@polkadot|@docknetwork|@digitalbazaar|@cheqd)/,
+        ],
         use: {
           loader: require.resolve('babel-loader'),
           options: {