commit e62932455a03d382bee04c3124d8c8e0cfe70f36
parent 17cc8bf01f18d5bee9266d9bd658e0bf5e448451
Author: Florian Dold <florian@dold.me>
Date: Fri, 5 Jun 2026 13:07:45 +0200
-finish merchant-backoffice-ui rename
Diffstat:
5 files changed, 93 insertions(+), 93 deletions(-)
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ dist:
--include ./packages/anastasis-cli/configure \
--include ./packages/bank-ui/configure \
--include ./packages/taler-harness/configure \
- --include ./packages/merchant-backoffice-ui/configure \
+ --include ./packages/taler-merchant-webui/configure \
taler-typescript-core-$(shell git describe --tags --abbrev=0 | sed -e 's/^v//').tar.gz
# Create tarball with git hash prefix in name
@@ -66,8 +66,8 @@ anastasis-prebuilt:
.PHONY: backoffice-prebuilt
backoffice-prebuilt:
pnpm clean
- pnpm install --frozen-lockfile --filter '!@gnu-taler/qa-tooling' --filter @gnu-taler/merchant-backoffice-ui...
- pnpm run --filter @gnu-taler/merchant-backoffice-ui... compile
+ pnpm install --frozen-lockfile --filter '!@gnu-taler/qa-tooling' --filter @gnu-taler/taler-merchant-webui...
+ pnpm run --filter @gnu-taler/taler-merchant-webui... compile
./contrib/copy-backoffice-into-prebuilt.sh
.PHONY: backend-prebuilt
@@ -128,10 +128,10 @@ anastasis-dev-prebuilt:
.PHONY: backoffice-dev-prebuilt
backoffice-dev-prebuilt:
./contrib/cleanup-prebuilt-dir.sh
- ./contrib/next-dev-version.sh packages/merchant-backoffice-ui/package.json
+ ./contrib/next-dev-version.sh packages/taler-merchant-webui/package.json
pnpm clean
- pnpm install --frozen-lockfile --filter '!@gnu-taler/qa-tooling' --filter @gnu-taler/merchant-backoffice-ui...
- pnpm run --filter @gnu-taler/merchant-backoffice-ui... compile
+ pnpm install --frozen-lockfile --filter '!@gnu-taler/qa-tooling' --filter @gnu-taler/taler-merchant-webui...
+ pnpm run --filter @gnu-taler/taler-merchant-webui... compile
git commit -am "new prebuilt dev" && git push
./contrib/copy-backoffice-into-prebuilt.sh
./contrib/publish-prebuilt-dir.sh
@@ -271,7 +271,7 @@ install:
$(MAKE) -C packages/anastasis-cli install-nodeps
$(MAKE) -C packages/taler-harness install-nodeps
$(MAKE) -C packages/bank-ui install-nodeps
- $(MAKE) -C packages/merchant-backoffice-ui install-nodeps
+ $(MAKE) -C packages/taler-merchant-webui install-nodeps
$(MAKE) -C packages/aml-backoffice-ui install-nodeps
$(MAKE) -C packages/auditor-backoffice-ui install-nodeps
diff --git a/bootstrap b/bootstrap
@@ -35,4 +35,4 @@ copy_configure "$our_configure" ./packages/anastasis-cli/configure
copy_configure "$our_configure" ./packages/bank-ui/configure
copy_configure "$our_configure" ./packages/taler-harness/configure
copy_configure "$our_configure" ./packages/taler-util/configure
-copy_configure "$our_configure" ./packages/merchant-backoffice-ui/configure
+copy_configure "$our_configure" ./packages/taler-merchant-webui/configure
diff --git a/contrib/copy-backoffice-into-prebuilt.sh b/contrib/copy-backoffice-into-prebuilt.sh
@@ -3,9 +3,9 @@
[ ! -d prebuilt ] && git worktree add -f prebuilt prebuilt && exit 1
rm -f prebuilt/backoffice/*
-find packages/merchant-backoffice-ui/dist/prod/ -type f -printf '%P\n' | sort > prebuilt/backoffice/bof
+find packages/taler-merchant-webui/dist/prod/ -type f -printf '%P\n' | sort > prebuilt/backoffice/bof
while IFS= read -r file; do
- cp packages/merchant-backoffice-ui/dist/prod/$file prebuilt/backoffice/$file
+ cp packages/taler-merchant-webui/dist/prod/$file prebuilt/backoffice/$file
done < prebuilt/backoffice/bof
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
@@ -472,88 +472,6 @@ importers:
specifier: 6.0.3
version: 6.0.3
- packages/merchant-backoffice-ui:
- dependencies:
- '@gnu-taler/taler-util':
- specifier: workspace:*
- version: link:../taler-util
- '@gnu-taler/web-util':
- specifier: workspace:*
- version: link:../web-util
- chart.js:
- specifier: ^4.0.0
- version: 4.5.0
- chartjs-adapter-date-fns:
- specifier: ^3.0.0
- version: 3.0.0(chart.js@4.5.0)(date-fns@2.29.3)
- date-fns:
- specifier: 2.29.3
- version: 2.29.3
- history:
- specifier: 4.10.1
- version: 4.10.1
- preact:
- specifier: 10.11.3
- version: 10.11.3
- preact-router:
- specifier: 3.2.1
- version: 3.2.1(preact@10.11.3)
- qrcode-generator:
- specifier: 1.4.4
- version: 1.4.4
- swr:
- specifier: 2.2.2
- version: 2.2.2(react@18.3.1)
- devDependencies:
- '@creativebulma/bulma-tooltip':
- specifier: ^1.2.0
- version: 1.2.0
- '@gnu-taler/pogen':
- specifier: workspace:*
- version: link:../pogen
- '@types/chai':
- specifier: ^4.3.0
- version: 4.3.3
- '@types/history':
- specifier: ^4.7.8
- version: 4.7.11
- '@types/node':
- specifier: ^20.19.41
- version: 20.19.41
- bulma:
- specifier: ^0.9.2
- version: 0.9.4
- bulma-checkbox:
- specifier: ^1.1.1
- version: 1.2.1
- bulma-radio:
- specifier: ^1.1.1
- version: 1.2.0
- bulma-responsive-tables:
- specifier: ^1.2.3
- version: 1.2.5
- bulma-switch-control:
- specifier: ^1.1.1
- version: 1.2.2
- bulma-timeline:
- specifier: ^3.0.4
- version: 3.0.5
- bulma-upload-control:
- specifier: ^1.2.0
- version: 1.2.0
- chai:
- specifier: ^6.2.2
- version: 6.2.2
- sass:
- specifier: 1.56.1
- version: 1.56.1
- source-map-support:
- specifier: ^0.5.21
- version: 0.5.21
- typescript:
- specifier: 6.0.3
- version: 6.0.3
-
packages/pogen:
dependencies:
'@types/node':
@@ -646,6 +564,88 @@ importers:
specifier: ^6.0.3
version: 6.0.3
+ packages/taler-merchant-webui:
+ dependencies:
+ '@gnu-taler/taler-util':
+ specifier: workspace:*
+ version: link:../taler-util
+ '@gnu-taler/web-util':
+ specifier: workspace:*
+ version: link:../web-util
+ chart.js:
+ specifier: ^4.0.0
+ version: 4.5.0
+ chartjs-adapter-date-fns:
+ specifier: ^3.0.0
+ version: 3.0.0(chart.js@4.5.0)(date-fns@2.29.3)
+ date-fns:
+ specifier: 2.29.3
+ version: 2.29.3
+ history:
+ specifier: 4.10.1
+ version: 4.10.1
+ preact:
+ specifier: 10.11.3
+ version: 10.11.3
+ preact-router:
+ specifier: 3.2.1
+ version: 3.2.1(preact@10.11.3)
+ qrcode-generator:
+ specifier: 1.4.4
+ version: 1.4.4
+ swr:
+ specifier: 2.2.2
+ version: 2.2.2(react@18.3.1)
+ devDependencies:
+ '@creativebulma/bulma-tooltip':
+ specifier: ^1.2.0
+ version: 1.2.0
+ '@gnu-taler/pogen':
+ specifier: workspace:*
+ version: link:../pogen
+ '@types/chai':
+ specifier: ^4.3.0
+ version: 4.3.3
+ '@types/history':
+ specifier: ^4.7.8
+ version: 4.7.11
+ '@types/node':
+ specifier: ^20.19.41
+ version: 20.19.41
+ bulma:
+ specifier: ^0.9.2
+ version: 0.9.4
+ bulma-checkbox:
+ specifier: ^1.1.1
+ version: 1.2.1
+ bulma-radio:
+ specifier: ^1.1.1
+ version: 1.2.0
+ bulma-responsive-tables:
+ specifier: ^1.2.3
+ version: 1.2.5
+ bulma-switch-control:
+ specifier: ^1.1.1
+ version: 1.2.2
+ bulma-timeline:
+ specifier: ^3.0.4
+ version: 3.0.5
+ bulma-upload-control:
+ specifier: ^1.2.0
+ version: 1.2.0
+ chai:
+ specifier: ^6.2.2
+ version: 6.2.2
+ sass:
+ specifier: 1.56.1
+ version: 1.56.1
+ source-map-support:
+ specifier: ^0.5.21
+ version: 0.5.21
+ typescript:
+ specifier: 6.0.3
+ version: 6.0.3
+
packages/taler-util:
dependencies:
big-integer:
diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -39,7 +39,7 @@
"path": "packages/merchant-backend-ui/"
},
{
- "path": "packages/merchant-backoffice-ui/"
+ "path": "packages/taler-merchant-webui/"
},
{
"path": "packages/pogen"
