diff options
author | Nullptrderef <nullptrderef@proton.me> | 2024-03-31 00:11:44 +0100 |
---|---|---|
committer | Nullptrderef <nullptrderef@proton.me> | 2024-03-31 00:12:05 +0100 |
commit | cd25e7adbfcb398d338195a62ad50c9d7f16e25c (patch) | |
tree | 37b3e5f146af1b51c4e4fca2b25445d53b83265e | |
parent | a6e39417be1ffe450e49ffd58f4abae89dd9481b (diff) | |
download | taler-ops-www-cd25e7adbfcb398d338195a62ad50c9d7f16e25c.tar.gz taler-ops-www-cd25e7adbfcb398d338195a62ad50c9d7f16e25c.tar.bz2 taler-ops-www-cd25e7adbfcb398d338195a62ad50c9d7f16e25c.zip |
Move container to node 20, use inline script format, set CI=1
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | .npmrc | 1 | ||||
-rw-r--r-- | contrib/ci/Containerfile | 26 | ||||
-rw-r--r-- | locale/messages.pot | 28 | ||||
-rw-r--r-- | package.json | 1 | ||||
-rw-r--r-- | pnpm-lock.yaml | 18 |
6 files changed, 43 insertions, 34 deletions
@@ -22,3 +22,6 @@ node_modules # Parcel's cache .parcel-cache dist + +# PNPM Store (CI) +.pnpm-store @@ -0,0 +1 @@ +config.confirmModulesPurge=false diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile index be4f27e..52d91ee 100644 --- a/contrib/ci/Containerfile +++ b/contrib/ci/Containerfile @@ -1,20 +1,20 @@ -FROM docker.io/library/node:18-slim +FROM docker.io/library/node:20-slim ENV DEBIAN_FRONTEND=noninteractive +ENV CI=1 -RUN apt-get update -yqq && \ - apt-get install -yqq --no-install-recommends \ - make \ - gettext \ - git \ - ca-certificates \ - python3-jinja2 \ - python3-ruamel.yaml \ - python3-distutils \ - python3-babel \ - python3-bs4 \ - && rm -rf /var/lib/apt/lists/* +RUN <<EOT +#!/usr/bin/env bash +set -eax +apt-get update -yqq +apt-get install -yqq --no-install-recommends \ + make gettext git ca-certificates \ + python3-jinja2 python3-ruamel.yaml python3-distutils \ + python3-babel python3-bs4 +rm -rf /var/lib/apt/lists/* +EOT +# TODO: Look into if using corepack makes more sense RUN npm install -g pnpm WORKDIR /workdir diff --git a/locale/messages.pot b/locale/messages.pot index 02db2e0..2e9301c 100644 --- a/locale/messages.pot +++ b/locale/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-03-31 00:01+0100\n" +"POT-Creation-Date: 2024-03-30 23:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -497,8 +497,8 @@ msgstr "" #: template/users.html.j2:133 template/users.html.j2:167 #: template/users.html.j2:216 template/users.html.j2:265 #: template/users.html.j2:314 template/users.html.j2:365 -#: template/users.html.j2:411 template/users.html.j2:459 -#: template/users.html.j2:503 +#: template/users.html.j2:414 template/users.html.j2:466 +#: template/users.html.j2:510 msgid "Step" msgstr "" @@ -584,57 +584,57 @@ msgid "" "transfer has arrived at the payment service provider." msgstr "" -#: template/users.html.j2:375 +#: template/users.html.j2:376 msgid "" "Depending on your bank, this may take a few days. You do not need to keep" " the wallet open." msgstr "" -#: template/users.html.j2:413 +#: template/users.html.j2:416 msgid "Shop" msgstr "" -#: template/users.html.j2:416 +#: template/users.html.j2:419 msgid "" "When shopping, the wallet may be launched automatically or you may need " "to click a link, scan a QR code or even select the wallet extension " "manually depending on the context." msgstr "" -#: template/users.html.j2:421 +#: template/users.html.j2:426 msgid "" "The QR code scanner button can also be held to manually enter a " "\"<code>taler://</code>-URI\", for example if you received one via text " "message." msgstr "" -#: template/users.html.j2:461 +#: template/users.html.j2:468 msgid "Pay" msgstr "" -#: template/users.html.j2:464 +#: template/users.html.j2:471 msgid "" "The wallet will show you details about what you are buying, including the" " price and applicable fees." msgstr "" -#: template/users.html.j2:468 +#: template/users.html.j2:475 msgid "Simply press \"Pay\" to make the payment." msgstr "" -#: template/users.html.j2:505 +#: template/users.html.j2:512 msgid "Manage" msgstr "" -#: template/users.html.j2:508 +#: template/users.html.j2:515 msgid "The wallet keeps track of your transaction history." msgstr "" -#: template/users.html.j2:512 +#: template/users.html.j2:519 msgid "You can delete transactions, erasing any trace that you were the buyer." msgstr "" -#: template/users.html.j2:551 +#: template/users.html.j2:558 msgid "Frequently Asked Questions" msgstr "" diff --git a/package.json b/package.json index 1f20678..eb3da8d 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "devDependencies": { "@parcel/config-default": "^2.12.0", "@parcel/plugin": "^2.12.0", + "@parcel/transformer-html": "^2.12.0", "@parcel/transformer-sass": "2.12.0", "concurrently": "^8.2.2", "nodemon": "^3.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d6463a0..d79dfd1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ devDependencies: '@parcel/plugin': specifier: ^2.12.0 version: 2.12.0(@parcel/core@2.12.0) + '@parcel/transformer-html': + specifier: ^2.12.0 + version: 2.12.0(@parcel/core@2.12.0) '@parcel/transformer-sass': specifier: 2.12.0 version: 2.12.0(@parcel/core@2.12.0) @@ -358,7 +361,7 @@ packages: '@parcel/fs': 2.12.0(@parcel/core@2.12.0) '@parcel/graph': 3.2.0 '@parcel/logger': 2.12.0 - '@parcel/package-manager': 2.12.0(@parcel/core@2.12.0) + '@parcel/package-manager': 2.12.0(@parcel/core@2.12.0)(@swc/helpers@0.5.8) '@parcel/plugin': 2.12.0(@parcel/core@2.12.0) '@parcel/profiler': 2.12.0 '@parcel/rust': 2.12.0 @@ -533,14 +536,14 @@ packages: '@parcel/plugin': 2.12.0(@parcel/core@2.12.0) '@parcel/source-map': 2.1.1 '@parcel/utils': 2.12.0 - '@swc/core': 1.4.11 + '@swc/core': 1.4.11(@swc/helpers@0.5.8) nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - '@swc/helpers' dev: true - /@parcel/package-manager@2.12.0(@parcel/core@2.12.0): + /@parcel/package-manager@2.12.0(@parcel/core@2.12.0)(@swc/helpers@0.5.8): resolution: {integrity: sha512-0nvAezcjPx9FT+hIL+LS1jb0aohwLZXct7jAh7i0MLMtehOi0z1Sau+QpgMlA9rfEZZ1LIeFdnZZwqSy7Ccspw==} engines: {node: '>= 12.0.0'} peerDependencies: @@ -554,7 +557,7 @@ packages: '@parcel/types': 2.12.0(@parcel/core@2.12.0) '@parcel/utils': 2.12.0 '@parcel/workers': 2.12.0(@parcel/core@2.12.0) - '@swc/core': 1.4.11 + '@swc/core': 1.4.11(@swc/helpers@0.5.8) semver: 7.6.0 transitivePeerDependencies: - '@swc/helpers' @@ -955,7 +958,7 @@ packages: '@parcel/cache': 2.12.0(@parcel/core@2.12.0) '@parcel/diagnostic': 2.12.0 '@parcel/fs': 2.12.0(@parcel/core@2.12.0) - '@parcel/package-manager': 2.12.0(@parcel/core@2.12.0) + '@parcel/package-manager': 2.12.0(@parcel/core@2.12.0)(@swc/helpers@0.5.8) '@parcel/source-map': 2.1.1 '@parcel/workers': 2.12.0(@parcel/core@2.12.0) utility-types: 3.11.0 @@ -1221,7 +1224,7 @@ packages: dev: true optional: true - /@swc/core@1.4.11: + /@swc/core@1.4.11(@swc/helpers@0.5.8): resolution: {integrity: sha512-WKEakMZxkVwRdgMN4AMJ9K5nysY8g8npgQPczmjBeNK5In7QEAZAJwnyccrWwJZU0XjVeHn2uj+XbOKdDW17rg==} engines: {node: '>=10'} requiresBuild: true @@ -1232,6 +1235,7 @@ packages: optional: true dependencies: '@swc/counter': 0.1.3 + '@swc/helpers': 0.5.8 '@swc/types': 0.1.6 optionalDependencies: '@swc/core-darwin-arm64': 1.4.11 @@ -2489,7 +2493,7 @@ packages: '@parcel/events': 2.12.0 '@parcel/fs': 2.12.0(@parcel/core@2.12.0) '@parcel/logger': 2.12.0 - '@parcel/package-manager': 2.12.0(@parcel/core@2.12.0) + '@parcel/package-manager': 2.12.0(@parcel/core@2.12.0)(@swc/helpers@0.5.8) '@parcel/reporter-cli': 2.12.0(@parcel/core@2.12.0) '@parcel/reporter-dev-server': 2.12.0(@parcel/core@2.12.0) '@parcel/reporter-tracer': 2.12.0(@parcel/core@2.12.0) |