Merge branch 'master' into dependabot/npm_and_yarn/frontend/tinyify-3.1.0

2022-07-09 00:04:51 +02:00 · 2022-07-09 00:04:51 +02:00 · 735a069b6d
commit 735a069b6d
parent 49723c4d1b 81f20e53ea
11 changed files with 84 additions and 70 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -2,91 +2,93 @@ name: CI Pipeline for the Backend and Frontend

 on:
  pull_request:
-    types: [ opened, review_requested, synchronize ]
-env:
-  NODE_VERSION: 16.15.0
+    types: [opened, review_requested, synchronize]

 jobs:
  backend:
    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
    strategy:
      matrix:
-        flavor: ['dev', 'prod']
-    runs-on: 'ubuntu-latest'
+        node: ["16.16.0", "18.5.0"]
+        flavor: ["dev", "prod"]
+      fail-fast: false
+    runs-on: "ubuntu-latest"

-    name: Backend (${{ matrix.flavor }})
+    name: Backend (${{ matrix.flavor }}) - node ${{ matrix.node }}
    steps:
      - name: Checkout
        uses: actions/checkout@v3
        with:
-          path: ${{ matrix.flavor }}
+          path: ${{ matrix.node }}/${{ matrix.flavor }}

      - name: Setup Node
        uses: actions/setup-node@v3
        with:
-          node-version: ${{ env.NODE_VERSION }}
-          registry-url: 'https://registry.npmjs.org'
+          node-version: ${{ matrix.node }}
+          registry-url: "https://registry.npmjs.org"

      - name: Install
        if: ${{ matrix.flavor == 'dev'}}
        run: npm ci
-        working-directory: ${{ matrix.flavor }}/backend
+        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend

      - name: Install (Prod dependencies only)
        if: ${{ matrix.flavor == 'prod'}}
        run: npm ci --omit=dev --omit=optional
-        working-directory: ${{ matrix.flavor }}/backend
+        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend

      - name: Lint
        if: ${{ matrix.flavor == 'dev'}}
        run: npm run lint
-        working-directory: ${{ matrix.flavor }}/backend
+        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend

      #  - name: Test
      #    run: npm run test

      - name: Build
        run: npm run build
-        working-directory: ${{ matrix.flavor }}/backend
+        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend

  frontend:
    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
    strategy:
      matrix:
-        flavor: ['dev', 'prod']
-    runs-on: 'ubuntu-latest'
+        node: ["16.15.0", "18.5.0"]
+        flavor: ["dev", "prod"]
+      fail-fast: false
+    runs-on: "ubuntu-latest"

-    name: Frontend (${{ matrix.flavor }})
+    name: Frontend (${{ matrix.flavor }}) - node ${{ matrix.node }}
    steps:
      - name: Checkout
        uses: actions/checkout@v3
        with:
-          path: ${{ matrix.flavor }}
+          path: ${{ matrix.node }}/${{ matrix.flavor }}

      - name: Setup Node
        uses: actions/setup-node@v3
        with:
-          node-version: ${{ env.NODE_VERSION }}
-          registry-url: 'https://registry.npmjs.org'
+          node-version: ${{ matrix.node }}
+          registry-url: "https://registry.npmjs.org"

      - name: Install (Prod dependencies only)
        run: npm ci --omit=dev --omit=optional
        if: ${{ matrix.flavor == 'prod'}}
-        working-directory: ${{ matrix.flavor }}/frontend
+        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend

      - name: Install
        if: ${{ matrix.flavor == 'dev'}}
        run: npm ci
-        working-directory: ${{ matrix.flavor }}/frontend
+        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend

      - name: Lint
        if: ${{ matrix.flavor == 'dev'}}
        run: npm run lint
-        working-directory: ${{ matrix.flavor }}/frontend
+        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend

      # - name: Test
      #   run: npm run test

      - name: Build
        run: npm run build
-        working-directory: ${{ matrix.flavor }}/frontend
+        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-v16.15.0
+v16.16.0
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@ -1,4 +1,4 @@
-FROM node:16.15.0-buster-slim AS builder
+FROM node:16.16.0-buster-slim AS builder

 ARG commitHash
 ENV DOCKER_COMMIT_HASH=${commitHash}
@ -11,7 +11,7 @@ RUN apt-get install -y build-essential python3 pkg-config
 RUN npm install --omit=dev --omit=optional
 RUN npm run build

-FROM node:16.15.0-buster-slim
+FROM node:16.16.0-buster-slim

 WORKDIR /backend

--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@ -1,4 +1,4 @@
-FROM node:16.15.0-buster-slim AS builder
+FROM node:16.16.0-buster-slim AS builder

 ARG commitHash
 ENV DOCKER_COMMIT_HASH=${commitHash}
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@ -11041,6 +11041,12 @@
        "@sideway/pinpoint": "^2.0.0"
      }
    },
+    "node_modules/jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
+      "peer": true
+    },
    "node_modules/js-tokens": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@ -13791,6 +13797,17 @@
        "node": ">=10.13.0"
      }
    },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
    "node_modules/portfinder": {
      "version": "1.0.28",
      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@ -26069,6 +26086,12 @@
        "@sideway/pinpoint": "^2.0.0"
      }
    },
+    "jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
+      "peer": true
+    },
    "js-tokens": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@ -28165,6 +28188,12 @@
      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
    },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "peer": true
+    },
    "portfinder": {
      "version": "1.0.28",
      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
--- a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html
+++ b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html
@ -15,7 +15,7 @@
        </td>
      </tr>
      <tr>
-        <td class="td-width" i18n="transaction.value|Transaction value">Value</td>
+        <td class="td-width" i18n="dashboard.latest-transactions.amount">Amount</td>
        <td><app-amount [satoshis]="value"></app-amount></td>
      </tr>
      <tr>
--- a/frontend/src/locale/messages.fr.xlf
+++ b/frontend/src/locale/messages.fr.xlf
@ -952,6 +952,10 @@
          <context context-type="sourcefile">src/app/bisq/bisq-transactions/bisq-transactions.component.html</context>
          <context context-type="linenumber">20,21</context>
        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-overview-tooltip/block-overview-tooltip.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/dashboard/dashboard.component.html</context>
          <context context-type="linenumber">124,125</context>
@ -1363,7 +1367,7 @@
        <target>Echange</target>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">99</context>
        </context-group>
      </trans-unit>
      <trans-unit id="bisq-graph-volume" datatype="html">
@ -1371,7 +1375,7 @@
        <target>Volume</target>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">100</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4b137ec8bf73a47063740b75c0c40d5fd3c48015" datatype="html">
@ -2076,16 +2080,6 @@
          <context context-type="linenumber">264,266</context>
        </context-group>
      </trans-unit>
-      <trans-unit id="bc4c61d3713989e3c8c6610fca3ea1ca1cb19edb" datatype="html">
-        <source>Value</source>
-        <target>Valeur</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/block-overview-tooltip/block-overview-tooltip.component.html</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-        <note priority="1" from="description">Transaction value</note>
-        <note priority="1" from="meaning">transaction.value</note>
-      </trans-unit>
      <trans-unit id="cb1b52c13b95fa29ea4044f2bbe0ac623b890c80" datatype="html">
        <source>Fee</source>
        <target>Frais</target>
--- a/frontend/src/locale/messages.nb.xlf
+++ b/frontend/src/locale/messages.nb.xlf
@ -952,6 +952,10 @@
          <context context-type="sourcefile">src/app/bisq/bisq-transactions/bisq-transactions.component.html</context>
          <context context-type="linenumber">20,21</context>
        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-overview-tooltip/block-overview-tooltip.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/dashboard/dashboard.component.html</context>
          <context context-type="linenumber">124,125</context>
@ -1363,7 +1367,7 @@
        <target>Handler</target>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">99</context>
        </context-group>
      </trans-unit>
      <trans-unit id="bisq-graph-volume" datatype="html">
@ -1371,7 +1375,7 @@
        <target>Volum</target>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">100</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4b137ec8bf73a47063740b75c0c40d5fd3c48015" datatype="html">
@ -2076,16 +2080,6 @@
          <context context-type="linenumber">264,266</context>
        </context-group>
      </trans-unit>
-      <trans-unit id="bc4c61d3713989e3c8c6610fca3ea1ca1cb19edb" datatype="html">
-        <source>Value</source>
-        <target>Verdi</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/block-overview-tooltip/block-overview-tooltip.component.html</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-        <note priority="1" from="description">Transaction value</note>
-        <note priority="1" from="meaning">transaction.value</note>
-      </trans-unit>
      <trans-unit id="cb1b52c13b95fa29ea4044f2bbe0ac623b890c80" datatype="html">
        <source>Fee</source>
        <target>Avgift</target>
--- a/frontend/src/locale/messages.xlf
+++ b/frontend/src/locale/messages.xlf
@ -878,6 +878,10 @@
          <context context-type="sourcefile">src/app/bisq/bisq-transactions/bisq-transactions.component.html</context>
          <context context-type="linenumber">20,21</context>
        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-overview-tooltip/block-overview-tooltip.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/dashboard/dashboard.component.html</context>
          <context context-type="linenumber">124,125</context>
@ -1263,14 +1267,14 @@
        <source>Trades</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">99</context>
        </context-group>
      </trans-unit>
      <trans-unit id="bisq-graph-volume" datatype="html">
        <source>Volume</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">100</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4b137ec8bf73a47063740b75c0c40d5fd3c48015" datatype="html">
@ -1918,15 +1922,6 @@
          <context context-type="linenumber">264,266</context>
        </context-group>
      </trans-unit>
-      <trans-unit id="bc4c61d3713989e3c8c6610fca3ea1ca1cb19edb" datatype="html">
-        <source>Value</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/block-overview-tooltip/block-overview-tooltip.component.html</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-        <note priority="1" from="description">Transaction value</note>
-        <note priority="1" from="meaning">transaction.value</note>
-      </trans-unit>
      <trans-unit id="cb1b52c13b95fa29ea4044f2bbe0ac623b890c80" datatype="html">
        <source>Fee</source>
        <context-group purpose="location">
--- a/production/README.md
+++ b/production/README.md
@ -82,11 +82,11 @@ pkg install -y zsh sudo git screen curl wget neovim rsync nginx openssl openssh-

 ### Node.js + npm

-Build Node.js v16.15 and npm v8 from source using `nvm`:
+Build Node.js v16.16.0 and npm v8 from source using `nvm`:
 ```
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | zsh
 source $HOME/.zshrc
-nvm install v16.15.0
+nvm install v16.16.0 --shared-zlib
 nvm alias default node
 ```

--- a/production/install
+++ b/production/install
@ -905,7 +905,7 @@ echo "[*] Installing nvm.sh from GitHub"
 osSudo "${MEMPOOL_USER}" sh -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | zsh'

 echo "[*] Building NodeJS via nvm.sh"
-osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v16.15.0'
+osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v16.16.0 --shared-zlib'

 ####################
 # Tor installation #