Staging -> Prod [ Fix Connect URL ] (#9)

* SDK Init (#1) * First Itr With Check in Initialization * Sync Initialization * Validate no required service * Use graphql-codegen * Use ENV For Codegen * Custom Error Codes * Error Modules * Fix copy errors * Github Workflow and Readme (#2) * Github Workflow * Minor Mods * Update Readme * Update Readme.md * Update README.md * Update README.md * Update README.md --------- Co-authored-by: Timi Ajiboye <[email protected]> * Modify Publish Workflow (#3) * Modify Publish Workflow * Update Readme.md * Update Workflow * Fix Test (#5) * Update Graphql Queries to use the Public API (#6) * Update Graphql Schema * Update Version * Fix Connect URL (#8) * Fix Connect URL * Use Multiple Export Paths * Fix Test --------- Co-authored-by: Timi Ajiboye <[email protected]>
gandalf-network · Mar 21, 2024 · 4ae1cc7 · 4ae1cc7
1 parent 27aa0a3
commit 4ae1cc7
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,9 +1,22 @@
 {
   "name": "@gandalf-network/connect",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
-  "main": "dist/bundle.js",
+  "main": "dist/entry.bundle.js",
   "types": "dist/index.d.ts",
+  "module": "dist/entry.bundle.js",
+  "exports": {
+    ".": {
+      "import": "./dist/entry.bundle.js",
+      "require": "./dist/entry.bundle.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./components": {
+      "import": "./dist/components.bundle.js",
+      "require": "./dist/components.bundle.js",
+      "types": "./dist/components.d.ts"
+    }
+  },
   "files": [
     "dist/**/*"
   ],

diff --git a/src/components.ts b/src/components.ts
@@ -0,0 +1,4 @@
+import { Services } from "./connect";
+import { GandalfError, GandalfErrorCode } from "./lib/errors";
+
+export { Services, GandalfError, GandalfErrorCode }
diff --git a/src/connect.ts b/src/connect.ts
@@ -35,7 +35,7 @@ class Connect {
 	async generateURL(): Promise<string> {
 		await this.allValidations(this.publicKey, this.redirectURL, this.services);
 		const services = JSON.stringify(this.services)
-    	return encodeURI(`${APP_CLIP_BASE_URL}?services=${services}&redirectUrl=${this.redirectURL}&publicKey=${this.publicKey}`)
+    	return encodeURI(`${APP_CLIP_BASE_URL}&services=${services}&redirectUrl=${this.redirectURL}&publicKey=${this.publicKey}`)
 	}
 
 	async generateQRCode(): Promise<string> {
@@ -44,7 +44,7 @@ class Connect {
 		}
 		await this.allValidations(this.publicKey, this.redirectURL, this.services);
 		const services = JSON.stringify(this.services)
-		const url = encodeURI(`${APP_CLIP_BASE_URL}?services=${services}&redirectUrl=${this.redirectURL}&publicKey=${this.publicKey}`)
+		const url = encodeURI(`${APP_CLIP_BASE_URL}&services=${services}&redirectUrl=${this.redirectURL}&publicKey=${this.publicKey}`)
 		const qrCode = new QRCodeStyling(qrCodeStyle(url));
 		try {
 			const qrCodeBlob = await qrCode.getRawData('webp')

diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,3 @@
-import Connect, { Services } from "./connect";
-import { GandalfError, GandalfErrorCode } from "./lib/errors";
+import Connect from "./connect";
 
-
-export { Services, GandalfError, GandalfErrorCode }
 export default Connect;
diff --git a/src/tests/connect.spec.ts b/src/tests/connect.spec.ts
@@ -103,7 +103,7 @@ describe('Connect SDK', () => {
     it('should generate the correct URL', async () => {
       const connect = new Connect({publicKey, redirectURL, services});
       const generatedURL = await connect.generateURL();
-      expect(generatedURL).toEqual(encodeURI(`${APP_CLIP_BASE_URL}?services=${stringServices}&redirectUrl=${redirectURL}&publicKey=${publicKey}`));
+      expect(generatedURL).toEqual(encodeURI(`${APP_CLIP_BASE_URL}&services=${stringServices}&redirectUrl=${redirectURL}&publicKey=${publicKey}`));
     });
   });
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -3,7 +3,10 @@ const webpack = require('webpack');
 require('dotenv').config();
 
 module.exports = {
-  entry: './src/index.ts',
+  entry: {
+    entry: './src/index.ts',
+    components: './src/components.ts',
+  },
   mode: 'production',
   plugins: [
     new webpack.DefinePlugin({
@@ -29,8 +32,8 @@ module.exports = {
   },
   target: 'web',
   output: {
-    filename: 'bundle.js',
     path: path.resolve(__dirname, 'dist'),
+    filename: '[name].bundle.js',
     libraryTarget: 'umd',
     globalObject: 'this'
   },