Update dependencies and configuration files

B3Pay · Dec 8, 2023 · 1608194 · 1608194
1 parent 2c019f6
commit 1608194
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 576 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -1,6 +1,13 @@
 module.exports = {
   transform: {
     "^.+\\.[t|j]sx?$": "babel-jest",
+    "^.+\\.ts$": "ts-jest",
+    "^.+\\.svelte$": [
+      "svelte-jester",
+      {
+        preprocess: true,
+      },
+    ],
   },
   preset: "ts-jest",
   testEnvironment: "node",

diff --git a/packages/store/babel.config.js b/packages/store/babel.config.js
@@ -1,7 +1,3 @@
 module.exports = {
-  presets: [
-    "@babel/preset-env",
-    ["@babel/preset-react", { runtime: "automatic" }],
-    "@babel/preset-typescript",
-  ],
+  presets: ["@babel/preset-env", "@babel/preset-typescript"],
 }
diff --git a/packages/store/package.json b/packages/store/package.json
@@ -9,7 +9,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "[email protected]:b3hr4d/react-actor.git"
+    "url": "[email protected]:B3Pay/ic-reactor.git"
   },
   "keywords": [
     "actor",

diff --git a/packages/store/src/reactor.ts b/packages/store/src/reactor.ts
@@ -44,7 +44,7 @@ export class ReActorManager<A extends ActorSubclass<any>> {
     this.store = create(() => this.DEFAULT_STATE)
     this.actorInitializer = actorInitializer
     this.agentOptions = agentOptions
-    this.actions = this.createActions(agentOptions)
+    this.actions = this.createActions()
   }
 
   public initializeActor = (
@@ -75,9 +75,7 @@ export class ReActorManager<A extends ActorSubclass<any>> {
     }
   }
 
-  private createActions(
-    agentOptions?: HttpAgentOptions
-  ): ReActorStoreActions<A> {
+  private createActions(): ReActorStoreActions<A> {
     // Helper function to handle common state updates
     const updateState = (newState: Partial<ReActorState<A>>) => {
       this.store.setState((state) => ({ ...state, ...newState }))
@@ -90,7 +88,7 @@ export class ReActorManager<A extends ActorSubclass<any>> {
     const initialize = (identity?: Identity) => {
       updateState({ initializing: true })
       try {
-        this.initializeActor(agentOptions, identity)
+        this.initializeActor(undefined, identity)
         if (!this.actor)
           throw new Error("Initialization failed: Actor could not be created.")
 
@@ -115,7 +113,7 @@ export class ReActorManager<A extends ActorSubclass<any>> {
 
         this.agent = new HttpAgent({
           identity,
-          ...(agentOptions || this.agentOptions),
+          ...this.agentOptions,
         })
 
         updateState({

diff --git a/packages/store/test/select.test.ts b/packages/store/test/select.test.ts
@@ -1,10 +1,12 @@
-import createICStoreAndActions from "../src"
+import { createReActorStore } from "../src"
 
 const mockActor = () => {}
 
-describe("createICStoreAndActions", () => {
+describe("createReActorStore", () => {
   test("uninitialized", () => {
-    const { store } = createICStoreAndActions(mockActor)
+    const { store } = createReActorStore(mockActor, {
+      host: "https://icp-api.io",
+    })
 
     expect(store.getState()).toEqual({
       actorState: {},
@@ -20,7 +22,7 @@ describe("createICStoreAndActions", () => {
   })
 
   test("initialized", () => {
-    const { initializeActor, store } = createICStoreAndActions(mockActor)
+    const { initializeActor, store } = createReActorStore(mockActor)
 
     initializeActor()
 

diff --git a/packages/store/test/simple.test.ts b/packages/store/test/simple.test.ts
@@ -1,9 +1,9 @@
 import { randomBytes } from "crypto"
-import createICStoreAndActions from "../src"
+import { createReActorStore } from "../src"
 import { createActor } from "./candid/backend"
 
 describe("My IC Store and Actions", () => {
-  const { actions } = createICStoreAndActions(
+  const { actions } = createReActorStore(
     (agent) => createActor("xeka7-ryaaa-aaaal-qb57a-cai", { agent }),
     {
       host: "https://icp-api.io",

diff --git a/packages/svelte/babel.config.js b/packages/svelte/babel.config.js
@@ -1,6 +1,3 @@
 module.exports = {
-  presets: [
-    ["@babel/preset-env", { targets: { node: "current" } }],
-    "@babel/preset-typescript",
-  ],
+  presets: ["@babel/preset-env", "@babel/preset-typescript"],
 }
diff --git a/packages/svelte/jest.config.js b/packages/svelte/jest.config.js
@@ -1,18 +1,8 @@
 module.exports = {
   transform: {
-    "^.+\\.svelte$": "svelte-jester",
-    "^.+\\.ts$": "ts-jest",
-    "^.+\\.js$": "babel-jest",
-  },
-  moduleFileExtensions: ["js", "ts", "svelte"],
-  testPathIgnorePatterns: ["node_modules"],
-  bail: false,
-  verbose: true,
-  transformIgnorePatterns: ["node_modules"],
-  setupFilesAfterEnv: ["@testing-library/jest-dom/extend-expect"],
-  globals: {
-    "ts-jest": {
-      tsconfig: "tsconfig.json",
-    },
+    "^.+\\.[t|j]sx?$": "babel-jest",
   },
+  preset: "ts-jest",
+  testEnvironment: "node",
+  setupFilesAfterEnv: ["./jest.setup.js"],
 }
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -9,7 +9,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "[email protected]:b3hr4d/react-actor.git"
+    "url": "[email protected]:B3Pay/ic-reactor.git"
   },
   "keywords": [
     "actor",
@@ -25,12 +25,12 @@
     "url": "https://github.com/b3hr4d/ic-reactor/issues"
   },
   "homepage": "https://github.com/b3hr4d/ic-reactor/tree/main/packages/store#readme",
-  "devDependencies": {
-    "@testing-library/jest-dom": "^6.1"
-  },
   "peerDependencies": {
     "svelte": "^4.2"
   },
+  "devDependencies": {
+    "svelte-jester": "^3.0"
+  },
   "dependencies": {
     "@dfinity/agent": "^0.20",
     "@dfinity/auth-client": "0.20",

diff --git a/packages/svelte/test/actor.test.ts b/packages/svelte/test/actor.test.ts
diff --git a/packages/svelte/test/candid/backend/candid.did.d.ts b/packages/svelte/test/candid/backend/candid.did.d.ts