commit e90991973c359f1aca5bd34b3344e0295dae0c5d parent d61e4fa7196f20717166a2744f8ea3a77cc4addb Author: Sebastian <sebasjm@gmail.com> Date: Fri, 5 May 2023 08:36:48 -0300 update web-utils imports Diffstat:
42 files changed, 71 insertions(+), 66 deletions(-)
diff --git a/packages/demobank-ui/build.mjs b/packages/demobank-ui/build.mjs @@ -15,7 +15,13 @@ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ - import { buildProd } from "@gnu-taler/web-util/lib/index.build" +import { build } from "@gnu-taler/web-util/build"; - await buildProd(["src/index.tsx"]) - -\ No newline at end of file +await build({ + source: { + js: ["src/index.tsx"], + assets: ["src/index.html"], + }, + destination: "./dist/prod", + css: "sass", +}); diff --git a/packages/demobank-ui/dev.mjs b/packages/demobank-ui/dev.mjs @@ -15,21 +15,26 @@ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ -import { serve } from "@gnu-taler/web-util/lib/index.node"; -import { initializeDev, getFilesInSource } from "@gnu-taler/web-util/lib/index.build" +import { serve } from "@gnu-taler/web-util/node"; +import { initializeDev, getFilesInDirectory } from "@gnu-taler/web-util/build"; -const allTestFiles = getFilesInSource(/.test.tsx?$/); +const allTestFiles = getFilesInDirectory("src", /.test.tsx?$/); const devEntryPoints = ["src/stories.tsx", "src/index.tsx", ...allTestFiles]; -const buildDev = initializeDev(devEntryPoints) +const build = initializeDev({ + source: { + js: devEntryPoints, + assets: ["src/index.html"], + }, + destination: "./dist/dev", + css: "sass", +}); -await buildDev(); +await build(); serve({ - folder: './dist/dev', + folder: "./dist/dev", port: 8080, - source: './src', - insecure: true, - development: true, - onUpdate: buildDev -}) + source: "./src", + onSourceUpdate: build, +}); diff --git a/packages/demobank-ui/src/components/Cashouts/index.ts b/packages/demobank-ui/src/components/Cashouts/index.ts @@ -14,7 +14,7 @@ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ -import { HttpError, utils } from "@gnu-taler/web-util/lib/index.browser"; +import { HttpError, utils } from "@gnu-taler/web-util/browser"; import { Loading } from "../Loading.js"; // import { compose, StateViewMap } from "../../utils/index.js"; // import { wxApi } from "../../wxApi.js"; diff --git a/packages/demobank-ui/src/components/Cashouts/stories.tsx b/packages/demobank-ui/src/components/Cashouts/stories.tsx @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { tests } from "@gnu-taler/web-util/lib/index.browser"; +import * as tests from "@gnu-taler/web-util/testing"; import { ReadyView } from "./views.js"; export default { diff --git a/packages/demobank-ui/src/components/Cashouts/test.ts b/packages/demobank-ui/src/components/Cashouts/test.ts @@ -19,8 +19,8 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { tests } from "@gnu-taler/web-util/lib/index.browser"; -import { SwrMockEnvironment } from "@gnu-taler/web-util/lib/tests/swr"; +import * as tests from "@gnu-taler/web-util/testing"; +import { SwrMockEnvironment } from "@gnu-taler/web-util/testing"; import { expect } from "chai"; import { CASHOUT_API_EXAMPLE } from "../../endpoints.js"; import { Props } from "./index.js"; diff --git a/packages/demobank-ui/src/components/Cashouts/views.tsx b/packages/demobank-ui/src/components/Cashouts/views.tsx @@ -15,7 +15,7 @@ */ import { h, VNode } from "preact"; -import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { State } from "./index.js"; import { format } from "date-fns"; import { Amounts } from "@gnu-taler/taler-util"; diff --git a/packages/demobank-ui/src/components/EmptyComponentExample/index.ts b/packages/demobank-ui/src/components/EmptyComponentExample/index.ts @@ -15,7 +15,7 @@ */ import { Loading } from "../../components/Loading.js"; -import { HookError, utils } from "@gnu-taler/web-util/lib/index.browser"; +import { HookError, utils } from "@gnu-taler/web-util/browser"; //import { compose, StateViewMap } from "../../utils/index.js"; //import { wxApi } from "../../wxApi.js"; import { useComponentState } from "./state.js"; diff --git a/packages/demobank-ui/src/components/EmptyComponentExample/stories.tsx b/packages/demobank-ui/src/components/EmptyComponentExample/stories.tsx @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { tests } from "@gnu-taler/web-util/lib/index.browser"; +import * as tests from "@gnu-taler/web-util/testing"; import { ReadyView } from "./views.js"; export default { diff --git a/packages/demobank-ui/src/components/EmptyComponentExample/views.tsx b/packages/demobank-ui/src/components/EmptyComponentExample/views.tsx @@ -15,7 +15,7 @@ */ import { h, VNode } from "preact"; -import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { State } from "./index.js"; export function LoadingUriView({ error }: State.LoadingUriError): VNode { diff --git a/packages/demobank-ui/src/components/LangSelector.tsx b/packages/demobank-ui/src/components/LangSelector.tsx @@ -21,7 +21,7 @@ import { Fragment, h, VNode } from "preact"; import { useEffect, useState } from "preact/hooks"; -import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { strings as messages } from "../i18n/strings.js"; type LangsNames = { diff --git a/packages/demobank-ui/src/components/Transactions/index.ts b/packages/demobank-ui/src/components/Transactions/index.ts @@ -14,7 +14,7 @@ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ -import { HttpError, utils } from "@gnu-taler/web-util/lib/index.browser"; +import { HttpError, utils } from "@gnu-taler/web-util/browser"; import { Loading } from "../Loading.js"; // import { compose, StateViewMap } from "../../utils/index.js"; // import { wxApi } from "../../wxApi.js"; diff --git a/packages/demobank-ui/src/components/Transactions/stories.tsx b/packages/demobank-ui/src/components/Transactions/stories.tsx @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { tests } from "@gnu-taler/web-util/lib/index.browser"; +import * as tests from "@gnu-taler/web-util/testing"; import { ReadyView } from "./views.js"; export default { diff --git a/packages/demobank-ui/src/components/Transactions/test.ts b/packages/demobank-ui/src/components/Transactions/test.ts @@ -19,8 +19,9 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { ErrorType, tests } from "@gnu-taler/web-util/lib/index.browser"; -import { SwrMockEnvironment } from "@gnu-taler/web-util/lib/tests/swr"; +import { ErrorType } from "@gnu-taler/web-util/browser"; +import * as tests from "@gnu-taler/web-util/testing"; +import { SwrMockEnvironment } from "@gnu-taler/web-util/testing"; import { expect } from "chai"; import { TRANSACTION_API_EXAMPLE } from "../../endpoints.js"; import { Props } from "./index.js"; diff --git a/packages/demobank-ui/src/components/Transactions/views.tsx b/packages/demobank-ui/src/components/Transactions/views.tsx @@ -15,7 +15,7 @@ */ import { h, VNode } from "preact"; -import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { State } from "./index.js"; import { format } from "date-fns"; import { Amounts } from "@gnu-taler/taler-util"; diff --git a/packages/demobank-ui/src/components/app.tsx b/packages/demobank-ui/src/components/app.tsx @@ -18,7 +18,7 @@ import { globalLogLevel, setGlobalLogLevelFromString, } from "@gnu-taler/taler-util"; -import { TranslationProvider } from "@gnu-taler/web-util/lib/index.browser"; +import { TranslationProvider } from "@gnu-taler/web-util/browser"; import { FunctionalComponent, h } from "preact"; import { SWRConfig } from "swr"; import { BackendStateProvider } from "../context/backend.js"; diff --git a/packages/demobank-ui/src/hooks/access.ts b/packages/demobank-ui/src/hooks/access.ts @@ -19,7 +19,7 @@ import { HttpResponseOk, HttpResponsePaginated, RequestError, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { useEffect, useState } from "preact/hooks"; import { useBackendContext } from "../context/backend.js"; import { MAX_RESULT_SIZE, PAGE_SIZE } from "../utils.js"; diff --git a/packages/demobank-ui/src/hooks/backend.ts b/packages/demobank-ui/src/hooks/backend.ts @@ -20,13 +20,13 @@ import { HttpError, RequestError, useLocalStorage, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { HttpResponse, HttpResponseOk, RequestOptions, -} from "@gnu-taler/web-util/lib/index.browser"; -import { useApiContext } from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; +import { useApiContext } from "@gnu-taler/web-util/browser"; import { useCallback, useEffect, useState } from "preact/hooks"; import { useSWRConfig } from "swr"; import { useBackendContext } from "../context/backend.js"; diff --git a/packages/demobank-ui/src/hooks/circuit.ts b/packages/demobank-ui/src/hooks/circuit.ts @@ -20,7 +20,7 @@ import { HttpResponsePaginated, RequestError, useApiContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { useEffect, useMemo, useState } from "preact/hooks"; import { useBackendContext } from "../context/backend.js"; import { MAX_RESULT_SIZE, PAGE_SIZE } from "../utils.js"; diff --git a/packages/demobank-ui/src/hooks/index.ts b/packages/demobank-ui/src/hooks/index.ts @@ -20,7 +20,7 @@ */ import { StateUpdater } from "preact/hooks"; -import { useLocalStorage } from "@gnu-taler/web-util/lib/index.browser"; +import { useLocalStorage } from "@gnu-taler/web-util/browser"; export type ValueOrFunction<T> = T | ((p: T) => T); const calculateRootPath = () => { diff --git a/packages/demobank-ui/src/hooks/notification.ts b/packages/demobank-ui/src/hooks/notification.ts @@ -1,5 +1,5 @@ import { TranslatedString } from "@gnu-taler/taler-util"; -import { memoryMap } from "@gnu-taler/web-util/lib/index.browser"; +import { memoryMap } from "@gnu-taler/web-util/browser"; import { StateUpdater, useEffect, useState } from "preact/hooks"; export type NotificationMessage = ErrorNotification | InfoNotification; diff --git a/packages/demobank-ui/src/hooks/settings.ts b/packages/demobank-ui/src/hooks/settings.ts @@ -14,7 +14,7 @@ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ -import { useLocalStorage } from "@gnu-taler/web-util/lib/index.browser"; +import { useLocalStorage } from "@gnu-taler/web-util/browser"; interface Settings { currentWithdrawalOperationId: string | undefined; diff --git a/packages/demobank-ui/src/pages/AccountPage.tsx b/packages/demobank-ui/src/pages/AccountPage.tsx @@ -19,7 +19,7 @@ import { ErrorType, HttpResponsePaginated, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { Fragment, VNode, h } from "preact"; import { Transactions } from "../components/Transactions/index.js"; import { useBackendContext } from "../context/backend.js"; diff --git a/packages/demobank-ui/src/pages/AdminPage.tsx b/packages/demobank-ui/src/pages/AdminPage.tsx @@ -20,7 +20,7 @@ import { HttpResponsePaginated, RequestError, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { Fragment, h, VNode } from "preact"; import { useState } from "preact/hooks"; import { Cashouts } from "../components/Cashouts/index.js"; diff --git a/packages/demobank-ui/src/pages/BankFrame.tsx b/packages/demobank-ui/src/pages/BankFrame.tsx @@ -15,7 +15,7 @@ */ import { Logger, TranslatedString } from "@gnu-taler/taler-util"; -import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { ComponentChildren, Fragment, h, VNode } from "preact"; import { StateUpdater, useEffect, useState } from "preact/hooks"; import talerLogo from "../assets/logo-white.svg"; diff --git a/packages/demobank-ui/src/pages/BusinessAccount.tsx b/packages/demobank-ui/src/pages/BusinessAccount.tsx @@ -24,7 +24,7 @@ import { HttpResponsePaginated, RequestError, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { Fragment, VNode, h } from "preact"; import { StateUpdater, useEffect, useState } from "preact/hooks"; import { Cashouts } from "../components/Cashouts/index.js"; diff --git a/packages/demobank-ui/src/pages/HomePage.tsx b/packages/demobank-ui/src/pages/HomePage.tsx @@ -25,7 +25,7 @@ import { HttpResponse, HttpResponsePaginated, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { Fragment, VNode, h } from "preact"; import { Loading } from "../components/Loading.js"; import { useBackendContext } from "../context/backend.js"; diff --git a/packages/demobank-ui/src/pages/LoginForm.tsx b/packages/demobank-ui/src/pages/LoginForm.tsx @@ -15,10 +15,7 @@ */ import { HttpStatusCode } from "@gnu-taler/taler-util"; -import { - ErrorType, - useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +import { ErrorType, useTranslationContext } from "@gnu-taler/web-util/browser"; import { Fragment, VNode, h } from "preact"; import { useEffect, useRef, useState } from "preact/hooks"; import { useBackendContext } from "../context/backend.js"; diff --git a/packages/demobank-ui/src/pages/PaymentOptions.stories.tsx b/packages/demobank-ui/src/pages/PaymentOptions.stories.tsx @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { tests } from "@gnu-taler/web-util/lib/index.browser"; +import * as tests from "@gnu-taler/web-util/testing"; import { PaymentOptions } from "./PaymentOptions.js"; export default { diff --git a/packages/demobank-ui/src/pages/PaymentOptions.tsx b/packages/demobank-ui/src/pages/PaymentOptions.tsx @@ -15,7 +15,7 @@ */ import { AmountJson } from "@gnu-taler/taler-util"; -import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { h, VNode } from "preact"; import { useState } from "preact/hooks"; import { notifyInfo } from "../hooks/notification.js"; diff --git a/packages/demobank-ui/src/pages/PaytoWireTransferForm.stories.tsx b/packages/demobank-ui/src/pages/PaytoWireTransferForm.stories.tsx @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { tests } from "@gnu-taler/web-util/lib/index.browser"; +import * as tests from "@gnu-taler/web-util/testing"; import { PaytoWireTransferForm } from "./PaytoWireTransferForm.js"; export default { diff --git a/packages/demobank-ui/src/pages/PaytoWireTransferForm.tsx b/packages/demobank-ui/src/pages/PaytoWireTransferForm.tsx @@ -26,7 +26,7 @@ import { import { RequestError, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { h, VNode } from "preact"; import { useEffect, useRef, useState } from "preact/hooks"; import { notifyError } from "../hooks/notification.js"; diff --git a/packages/demobank-ui/src/pages/PublicHistoriesPage.tsx b/packages/demobank-ui/src/pages/PublicHistoriesPage.tsx @@ -15,7 +15,7 @@ */ import { Logger } from "@gnu-taler/taler-util"; -import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { Fragment, VNode, h } from "preact"; import { useState } from "preact/hooks"; import { Transactions } from "../components/Transactions/index.js"; diff --git a/packages/demobank-ui/src/pages/QrCodeSection.stories.tsx b/packages/demobank-ui/src/pages/QrCodeSection.stories.tsx @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { tests } from "@gnu-taler/web-util/lib/index.browser"; +import * as tests from "@gnu-taler/web-util/testing"; import { QrCodeSection } from "./QrCodeSection.js"; import { parseWithdrawUri } from "@gnu-taler/taler-util"; diff --git a/packages/demobank-ui/src/pages/QrCodeSection.tsx b/packages/demobank-ui/src/pages/QrCodeSection.tsx @@ -22,7 +22,7 @@ import { import { RequestError, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { h, VNode } from "preact"; import { useEffect } from "preact/hooks"; import { QR } from "../components/QR.js"; diff --git a/packages/demobank-ui/src/pages/RegistrationPage.tsx b/packages/demobank-ui/src/pages/RegistrationPage.tsx @@ -17,7 +17,7 @@ import { HttpStatusCode, Logger } from "@gnu-taler/taler-util"; import { RequestError, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { Fragment, VNode, h } from "preact"; import { useState } from "preact/hooks"; import { useBackendContext } from "../context/backend.js"; diff --git a/packages/demobank-ui/src/pages/Routing.tsx b/packages/demobank-ui/src/pages/Routing.tsx @@ -14,7 +14,7 @@ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ -import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { createHashHistory } from "history"; import { VNode, h } from "preact"; import { Route, Router, route } from "preact-router"; diff --git a/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx b/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx @@ -24,7 +24,7 @@ import { import { RequestError, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { VNode, h } from "preact"; import { useEffect, useRef, useState } from "preact/hooks"; import { useAccessAPI } from "../hooks/access.js"; diff --git a/packages/demobank-ui/src/pages/WithdrawalConfirmationQuestion.tsx b/packages/demobank-ui/src/pages/WithdrawalConfirmationQuestion.tsx @@ -22,7 +22,7 @@ import { import { RequestError, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { Fragment, VNode, h } from "preact"; import { useMemo, useState } from "preact/hooks"; import { useAccessAnonAPI } from "../hooks/access.js"; diff --git a/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx b/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx @@ -19,10 +19,7 @@ import { Logger, WithdrawUriResult, } from "@gnu-taler/taler-util"; -import { - ErrorType, - useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +import { ErrorType, useTranslationContext } from "@gnu-taler/web-util/browser"; import { Fragment, VNode, h } from "preact"; import { Loading } from "../components/Loading.js"; import { useWithdrawalDetails } from "../hooks/access.js"; diff --git a/packages/demobank-ui/src/stories.test.ts b/packages/demobank-ui/src/stories.test.ts @@ -19,8 +19,8 @@ * @author Sebastian Javier Marchano (sebasjm) */ import { setupI18n } from "@gnu-taler/taler-util"; -import { parseGroupImport, tests } from "@gnu-taler/web-util/lib/index.browser"; - +import { parseGroupImport } from "@gnu-taler/web-util/browser"; +import * as tests from "@gnu-taler/web-util/testing"; import * as components from "./components/index.examples.js"; import * as pages from "./pages/index.stories.js"; diff --git a/packages/demobank-ui/src/stories.tsx b/packages/demobank-ui/src/stories.tsx @@ -23,7 +23,7 @@ import { strings } from "./i18n/strings.js"; import * as pages from "./pages/index.stories.js"; import * as components from "./components/index.examples.js"; -import { renderStories } from "@gnu-taler/web-util/lib/index.browser"; +import { renderStories } from "@gnu-taler/web-util/browser"; import "./scss/main.scss"; diff --git a/packages/demobank-ui/src/utils.ts b/packages/demobank-ui/src/utils.ts @@ -19,7 +19,7 @@ import { ErrorType, HttpError, useTranslationContext, -} from "@gnu-taler/web-util/lib/index.browser"; +} from "@gnu-taler/web-util/browser"; import { ErrorMessage } from "./hooks/notification.js"; /**