From 1732d0f602fc40156cc0cf20dc2403f198355d70 Mon Sep 17 00:00:00 2001 From: Timothy Farrell Date: Mon, 19 Aug 2019 22:11:06 -0500 Subject: [PATCH] Switch from frptools to reactimal (same library, different name) --- package.json | 2 +- src/interface/allImages.js | 2 +- src/interface/components/appbar.js | 2 +- src/interface/components/attachmentImage.js | 2 +- src/interface/components/dropzone.js | 2 +- src/interface/focus.js | 2 +- src/interface/gallery.js | 2 +- src/interface/sectionPhoto.js | 2 +- src/interface/sectionView.js | 2 +- src/services/b2.js | 2 +- src/services/router.js | 2 +- src/utils/conversion.js | 2 +- src/utils/domvm.js | 3 ++- src/utils/event.js | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 7bdbd8f..61c6609 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "domvm": "~3.4.5", "exif-parser": "~0.1.9", "express": "~4.16.3", - "frptools": "~3.2.0", "linear-partitioning": "0.3.2", "pica": "~2.0.8", "pouchdb-adapter-idb": "~7.0.0", @@ -42,5 +41,6 @@ "webpack": "~4.10.2", "webpack-cli": "~2.1.5", "webpack-dev-server": "~3.1.4" + "reactimal": "git+https://gitea.thecookiejar.me/explorigin/reactimal.git", } } diff --git a/src/interface/allImages.js b/src/interface/allImages.js index c9060ab..9e267cf 100644 --- a/src/interface/allImages.js +++ b/src/interface/allImages.js @@ -1,5 +1,5 @@ import { format } from 'date-fns'; -import { prop, computed, container } from 'frptools'; +import { prop, computed, container } from 'reactimal'; import { subscribeToRender, diff --git a/src/interface/components/appbar.js b/src/interface/components/appbar.js index 475d133..090a45d 100644 --- a/src/interface/components/appbar.js +++ b/src/interface/components/appbar.js @@ -1,4 +1,4 @@ -import { prop, computed, container, pick } from 'frptools'; +import { prop, computed, container, pick } from 'reactimal'; import { Icon } from './icon.js'; import { defineElement as el } from '../../utils/domvm.js'; diff --git a/src/interface/components/attachmentImage.js b/src/interface/components/attachmentImage.js index 11df80e..1b806fb 100644 --- a/src/interface/components/attachmentImage.js +++ b/src/interface/components/attachmentImage.js @@ -1,4 +1,4 @@ -import { prop, computed, bundle } from 'frptools'; +import { prop, computed, bundle } from 'reactimal'; import { defineElement as el } from '../../utils/domvm.js'; import { ImageType } from '../../data/image.js'; diff --git a/src/interface/components/dropzone.js b/src/interface/components/dropzone.js index 82e6ea8..64dc855 100644 --- a/src/interface/components/dropzone.js +++ b/src/interface/components/dropzone.js @@ -1,4 +1,4 @@ -import { prop, computed } from 'frptools'; +import { prop, computed } from 'reactimal'; import { injectStyle } from '../../utils/style.js'; import { defineElement as el } from '../../utils/domvm.js'; diff --git a/src/interface/focus.js b/src/interface/focus.js index de12497..0316bca 100644 --- a/src/interface/focus.js +++ b/src/interface/focus.js @@ -1,4 +1,4 @@ -import { prop, computed, container } from 'frptools'; +import { prop, computed, container } from 'reactimal'; import { subscribeToRender, diff --git a/src/interface/gallery.js b/src/interface/gallery.js index 76051cb..aacb9ed 100644 --- a/src/interface/gallery.js +++ b/src/interface/gallery.js @@ -1,4 +1,4 @@ -import { prop } from 'frptools'; +import { prop } from 'reactimal'; import { subscribeToRender, diff --git a/src/interface/sectionPhoto.js b/src/interface/sectionPhoto.js index ff8ed53..d35dd9b 100644 --- a/src/interface/sectionPhoto.js +++ b/src/interface/sectionPhoto.js @@ -1,4 +1,4 @@ -import { prop } from 'frptools'; +import { prop } from 'reactimal'; import { defineView as vw, diff --git a/src/interface/sectionView.js b/src/interface/sectionView.js index aa44784..6f63a09 100644 --- a/src/interface/sectionView.js +++ b/src/interface/sectionView.js @@ -1,5 +1,5 @@ import partition from 'linear-partitioning'; -import { prop, computed, container } from 'frptools'; +import { prop, computed, container } from 'reactimal'; import { defineView as vw, diff --git a/src/services/b2.js b/src/services/b2.js index 5c60f9d..4819869 100644 --- a/src/services/b2.js +++ b/src/services/b2.js @@ -1,7 +1,7 @@ import core from 'pouchdb-core'; import { PouchDBAttachmentProxy, blobToString, stringToBlob } from 'pouchdb-attachmentproxy'; import { deepAssign, blobToArrayBuffer } from '../utils/conversion.js'; -import { prop, computed, stream } from 'frptools'; +import { prop, computed, stream } from 'reactimal'; import { sha1 } from '../utils/crypto.js'; export const B2Adapter = function(b2apikey, b2secret, b2bucket) { diff --git a/src/services/router.js b/src/services/router.js index de4c62d..9521006 100644 --- a/src/services/router.js +++ b/src/services/router.js @@ -1,5 +1,5 @@ import { Router } from 'router'; -import { prop } from 'frptools'; +import { prop } from 'reactimal'; export const currentRoute = prop([], r => r[1] && r[1].path); diff --git a/src/utils/conversion.js b/src/utils/conversion.js index 874d27b..e412099 100644 --- a/src/utils/conversion.js +++ b/src/utils/conversion.js @@ -1,4 +1,4 @@ -import { pick } from 'frptools'; +import { pick } from 'reactimal'; import { isObject } from './comparators'; diff --git a/src/utils/domvm.js b/src/utils/domvm.js index 17f59d7..82280b7 100644 --- a/src/utils/domvm.js +++ b/src/utils/domvm.js @@ -1,7 +1,8 @@ // export * from 'domvm/dist/dev/domvm.dev.js'; export * from 'domvm/dist/mini/domvm.mini.js'; import { defineView } from 'domvm/dist/mini/domvm.mini.js'; -import { prop, computed, call } from 'frptools'; +import { prop, computed, call } from 'reactimal'; + import { deepAssign } from './conversion.js'; import { error } from '../utils/console.js'; import { streamConfig } from './event.js'; diff --git a/src/utils/event.js b/src/utils/event.js index bbe816d..da651ff 100644 --- a/src/utils/event.js +++ b/src/utils/event.js @@ -1,4 +1,4 @@ -import { call } from 'frptools'; +import { call } from 'reactimal'; export const streamConfig = { is: s => s && typeof s.subscribe === 'function',