@kaspernj/api-maker 1.0.2038 → 1.0.2039

package/build/use-event-listener.js

@@ -1,16 +1,22 @@
-import { useCallback, useLayoutEffect } from "react";
+import { useCallback, useEffect, useLayoutEffect } from "react";
+import useSSR from "use-ssr";
 const ApiMakerUseEventListener = (target, event, onCalled) => {
+  const {
+    isServer
+  } = useSSR();
+  const useWorkingEffect = isServer ? useEffect : useLayoutEffect;
   const onCalledCallback = useCallback((...args) => {
     onCalled.apply(null, args);
   }, [target, event, onCalled]);
-  useLayoutEffect(() => {
+  useWorkingEffect(() => {
     if (target) {
-      target.addEventListener(event, onCalledCallback);
+      const eventListener = target.addEventListener(event, onCalledCallback);
       return () => {
-        target.removeEventListener(event, onCalledCallback);
+        if (eventListener) eventListener.remove(); // This is how its done in Expo + Jest.
+        if (target.removeEventListener) target.removeEventListener(event, onCalledCallback); // This is the "old" way in browsers.
       };
     }
   }, [target, event, onCalled]);
 };
 export default ApiMakerUseEventListener;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJ1c2VDYWxsYmFjayIsInVzZUxheW91dEVmZmVjdCIsIkFwaU1ha2VyVXNlRXZlbnRMaXN0ZW5lciIsInRhcmdldCIsImV2ZW50Iiwib25DYWxsZWQiLCJvbkNhbGxlZENhbGxiYWNrIiwiYXJncyIsImFwcGx5IiwiYWRkRXZlbnRMaXN0ZW5lciIsInJlbW92ZUV2ZW50TGlzdGVuZXIiXSwic291cmNlcyI6WyIuLi9zcmMvdXNlLWV2ZW50LWxpc3RlbmVyLmpzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7dXNlQ2FsbGJhY2ssIHVzZUxheW91dEVmZmVjdH0gZnJvbSBcInJlYWN0XCJcblxuY29uc3QgQXBpTWFrZXJVc2VFdmVudExpc3RlbmVyID0gKHRhcmdldCwgZXZlbnQsIG9uQ2FsbGVkKSA9PiB7XG4gIGNvbnN0IG9uQ2FsbGVkQ2FsbGJhY2sgPSB1c2VDYWxsYmFjaygoLi4uYXJncykgPT4ge1xuICAgIG9uQ2FsbGVkLmFwcGx5KG51bGwsIGFyZ3MpXG4gIH0sIFt0YXJnZXQsIGV2ZW50LCBvbkNhbGxlZF0pXG5cbiAgdXNlTGF5b3V0RWZmZWN0KCgpID0+IHtcbiAgICBpZiAodGFyZ2V0KSB7XG4gICAgICB0YXJnZXQuYWRkRXZlbnRMaXN0ZW5lcihldmVudCwgb25DYWxsZWRDYWxsYmFjaylcblxuICAgICAgcmV0dXJuICgpID0+IHtcbiAgICAgICAgdGFyZ2V0LnJlbW92ZUV2ZW50TGlzdGVuZXIoZXZlbnQsIG9uQ2FsbGVkQ2FsbGJhY2spXG4gICAgICB9XG4gICAgfVxuICB9LCBbdGFyZ2V0LCBldmVudCwgb25DYWxsZWRdKVxufVxuXG5leHBvcnQgZGVmYXVsdCBBcGlNYWtlclVzZUV2ZW50TGlzdGVuZXJcbiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBUUEsV0FBVyxFQUFFQyxlQUFlLFFBQU8sT0FBTztBQUVsRCxNQUFNQyx3QkFBd0IsR0FBR0EsQ0FBQ0MsTUFBTSxFQUFFQyxLQUFLLEVBQUVDLFFBQVEsS0FBSztFQUM1RCxNQUFNQyxnQkFBZ0IsR0FBR04sV0FBVyxDQUFDLENBQUMsR0FBR08sSUFBSSxLQUFLO0lBQ2hERixRQUFRLENBQUNHLEtBQUssQ0FBQyxJQUFJLEVBQUVELElBQUksQ0FBQztFQUM1QixDQUFDLEVBQUUsQ0FBQ0osTUFBTSxFQUFFQyxLQUFLLEVBQUVDLFFBQVEsQ0FBQyxDQUFDO0VBRTdCSixlQUFlLENBQUMsTUFBTTtJQUNwQixJQUFJRSxNQUFNLEVBQUU7TUFDVkEsTUFBTSxDQUFDTSxnQkFBZ0IsQ0FBQ0wsS0FBSyxFQUFFRSxnQkFBZ0IsQ0FBQztNQUVoRCxPQUFPLE1BQU07UUFDWEgsTUFBTSxDQUFDTyxtQkFBbUIsQ0FBQ04sS0FBSyxFQUFFRSxnQkFBZ0IsQ0FBQztNQUNyRCxDQUFDO0lBQ0g7RUFDRixDQUFDLEVBQUUsQ0FBQ0gsTUFBTSxFQUFFQyxLQUFLLEVBQUVDLFFBQVEsQ0FBQyxDQUFDO0FBQy9CLENBQUM7QUFFRCxlQUFlSCx3QkFBd0IiLCJpZ25vcmVMaXN0IjpbXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJ1c2VDYWxsYmFjayIsInVzZUVmZmVjdCIsInVzZUxheW91dEVmZmVjdCIsInVzZVNTUiIsIkFwaU1ha2VyVXNlRXZlbnRMaXN0ZW5lciIsInRhcmdldCIsImV2ZW50Iiwib25DYWxsZWQiLCJpc1NlcnZlciIsInVzZVdvcmtpbmdFZmZlY3QiLCJvbkNhbGxlZENhbGxiYWNrIiwiYXJncyIsImFwcGx5IiwiZXZlbnRMaXN0ZW5lciIsImFkZEV2ZW50TGlzdGVuZXIiLCJyZW1vdmUiLCJyZW1vdmVFdmVudExpc3RlbmVyIl0sInNvdXJjZXMiOlsiLi4vc3JjL3VzZS1ldmVudC1saXN0ZW5lci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge3VzZUNhbGxiYWNrLCB1c2VFZmZlY3QsIHVzZUxheW91dEVmZmVjdH0gZnJvbSBcInJlYWN0XCJcbmltcG9ydCB1c2VTU1IgZnJvbSBcInVzZS1zc3JcIlxuXG5jb25zdCBBcGlNYWtlclVzZUV2ZW50TGlzdGVuZXIgPSAodGFyZ2V0LCBldmVudCwgb25DYWxsZWQpID0+IHtcbiAgY29uc3Qge2lzU2VydmVyfSA9IHVzZVNTUigpXG4gIGNvbnN0IHVzZVdvcmtpbmdFZmZlY3QgPSBpc1NlcnZlciA/IHVzZUVmZmVjdCA6IHVzZUxheW91dEVmZmVjdFxuXG4gIGNvbnN0IG9uQ2FsbGVkQ2FsbGJhY2sgPSB1c2VDYWxsYmFjaygoLi4uYXJncykgPT4ge1xuICAgIG9uQ2FsbGVkLmFwcGx5KG51bGwsIGFyZ3MpXG4gIH0sIFt0YXJnZXQsIGV2ZW50LCBvbkNhbGxlZF0pXG5cbiAgdXNlV29ya2luZ0VmZmVjdCgoKSA9PiB7XG4gICAgaWYgKHRhcmdldCkge1xuICAgICAgY29uc3QgZXZlbnRMaXN0ZW5lciA9IHRhcmdldC5hZGRFdmVudExpc3RlbmVyKGV2ZW50LCBvbkNhbGxlZENhbGxiYWNrKVxuXG4gICAgICByZXR1cm4gKCkgPT4ge1xuICAgICAgICBpZiAoZXZlbnRMaXN0ZW5lcikgZXZlbnRMaXN0ZW5lci5yZW1vdmUoKSAvLyBUaGlzIGlzIGhvdyBpdHMgZG9uZSBpbiBFeHBvICsgSmVzdC5cbiAgICAgICAgaWYgKHRhcmdldC5yZW1vdmVFdmVudExpc3RlbmVyKSB0YXJnZXQucmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudCwgb25DYWxsZWRDYWxsYmFjaykgLy8gVGhpcyBpcyB0aGUgXCJvbGRcIiB3YXkgaW4gYnJvd3NlcnMuXG4gICAgICB9XG4gICAgfVxuICB9LCBbdGFyZ2V0LCBldmVudCwgb25DYWxsZWRdKVxufVxuXG5leHBvcnQgZGVmYXVsdCBBcGlNYWtlclVzZUV2ZW50TGlzdGVuZXJcbiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBUUEsV0FBVyxFQUFFQyxTQUFTLEVBQUVDLGVBQWUsUUFBTyxPQUFPO0FBQzdELE9BQU9DLE1BQU0sTUFBTSxTQUFTO0FBRTVCLE1BQU1DLHdCQUF3QixHQUFHQSxDQUFDQyxNQUFNLEVBQUVDLEtBQUssRUFBRUMsUUFBUSxLQUFLO0VBQzVELE1BQU07SUFBQ0M7RUFBUSxDQUFDLEdBQUdMLE1BQU0sQ0FBQyxDQUFDO0VBQzNCLE1BQU1NLGdCQUFnQixHQUFHRCxRQUFRLEdBQUdQLFNBQVMsR0FBR0MsZUFBZTtFQUUvRCxNQUFNUSxnQkFBZ0IsR0FBR1YsV0FBVyxDQUFDLENBQUMsR0FBR1csSUFBSSxLQUFLO0lBQ2hESixRQUFRLENBQUNLLEtBQUssQ0FBQyxJQUFJLEVBQUVELElBQUksQ0FBQztFQUM1QixDQUFDLEVBQUUsQ0FBQ04sTUFBTSxFQUFFQyxLQUFLLEVBQUVDLFFBQVEsQ0FBQyxDQUFDO0VBRTdCRSxnQkFBZ0IsQ0FBQyxNQUFNO0lBQ3JCLElBQUlKLE1BQU0sRUFBRTtNQUNWLE1BQU1RLGFBQWEsR0FBR1IsTUFBTSxDQUFDUyxnQkFBZ0IsQ0FBQ1IsS0FBSyxFQUFFSSxnQkFBZ0IsQ0FBQztNQUV0RSxPQUFPLE1BQU07UUFDWCxJQUFJRyxhQUFhLEVBQUVBLGFBQWEsQ0FBQ0UsTUFBTSxDQUFDLENBQUMsRUFBQztRQUMxQyxJQUFJVixNQUFNLENBQUNXLG1CQUFtQixFQUFFWCxNQUFNLENBQUNXLG1CQUFtQixDQUFDVixLQUFLLEVBQUVJLGdCQUFnQixDQUFDLEVBQUM7TUFDdEYsQ0FBQztJQUNIO0VBQ0YsQ0FBQyxFQUFFLENBQUNMLE1BQU0sRUFBRUMsS0FBSyxFQUFFQyxRQUFRLENBQUMsQ0FBQztBQUMvQixDQUFDO0FBRUQsZUFBZUgsd0JBQXdCIiwiaWdub3JlTGlzdCI6W119

package/link.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+cd node_modules
+
+rm -rf react
+ln -s ../../../gratisbyggetilbud_rails/node_modules/react
+
+yarn link i18n-on-steroids

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaspernj/api-maker",
-  "version": "1.0.2038",
+  "version": "1.0.2039",
   "description": "My new module",
   "main": "build/index.js",
   "scripts": {
@@ -57,6 +57,7 @@
     "strftime": ">= 0.10.0",
     "uniqunize": "^1.0.1",
     "url-parse": "^1.5.10",
+    "use-ssr": "^1.0.25",
     "wake-event": ">= 0.0.1"
   },
   "devDependencies": {
@@ -68,7 +69,7 @@
     "eslint-find-rules": "^5.0.0",
     "eslint-plugin-jest": "^28.2.0",
     "eslint-plugin-react": "^7.23.2",
-    "expo": "~52.0.0",
+    "expo": "~53.0.9",
     "expo-module-scripts": "^4.0.2",
     "jest": "^29.0.1"
   },

package/src/use-event-listener.js

@@ -1,16 +1,21 @@
-import {useCallback, useLayoutEffect} from "react"
+import {useCallback, useEffect, useLayoutEffect} from "react"
+import useSSR from "use-ssr"
 
 const ApiMakerUseEventListener = (target, event, onCalled) => {
+  const {isServer} = useSSR()
+  const useWorkingEffect = isServer ? useEffect : useLayoutEffect
+
   const onCalledCallback = useCallback((...args) => {
     onCalled.apply(null, args)
   }, [target, event, onCalled])
 
-  useLayoutEffect(() => {
+  useWorkingEffect(() => {
     if (target) {
-      target.addEventListener(event, onCalledCallback)
+      const eventListener = target.addEventListener(event, onCalledCallback)
 
       return () => {
-        target.removeEventListener(event, onCalledCallback)
+        if (eventListener) eventListener.remove() // This is how its done in Expo + Jest.
+        if (target.removeEventListener) target.removeEventListener(event, onCalledCallback) // This is the "old" way in browsers.
       }
     }
   }, [target, event, onCalled])