Dockerfile.arm64

@@ -1,24 +1,6 @@
 FROM simon987/sist2-build-arm64 as build
 MAINTAINER simon987 <me@simon987.net>
 
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash
-RUN apt update -y; apt install -y nodejs && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /build/
-
-COPY scripts scripts
-COPY schema schema
-COPY CMakeLists.txt .
-COPY third-party third-party
-COPY src src
-COPY sist2-vue sist2-vue
-COPY sist2-admin sist2-admin
-
-RUN cd sist2-vue/ && npm install && npm run build
-RUN cd sist2-admin/frontend/ && npm install && npm run build
-
 WORKDIR /build/
 ADD . /build/
 RUN mkdir build && cd build && cmake -DSIST_PLATFORM=arm64_linux_docker -DSIST_DEBUG_INFO=on -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake ..

sist2-admin/frontend/src/App.vue

@@ -1,15 +1,14 @@
 <template>
-    <div id="app">
+  <div id="app">
-        <NavBar></NavBar>
+    <NavBar></NavBar>
-        <b-container class="pt-4">
+    <b-container class="pt-4">
-            <b-alert show dismissible variant="info">
+      <b-alert show dismissible variant="info">
-                This is a beta version of sist2-admin. Please submit bug reports, usability issues and feature requests
+        This is a beta version of sist2-admin. Please submit bug reports, usability issues and feature requests
-                to the <a href="https://github.com/simon987/sist2/issues/new/choose" target="_blank">issue tracker on
+        to the <a href="https://github.com/simon987/sist2/issues/new/choose" target="_blank">issue tracker on Github</a>. Thank you!
-                Github</a>. Thank you!
+      </b-alert>
-            </b-alert>
+      <router-view/>
-            <router-view/>
+    </b-container>
-        </b-container>
+  </div>
-    </div>
 </template>
 
 <script>
@@ -17,87 +16,83 @@ import NavBar from "@/components/NavBar";
 import Sist2AdminApi from "@/Sist2AdminApi";
 
 export default {
-    components: {NavBar},
+  components: {NavBar},
-    data() {
+  data() {
-        return {
+    return {
-            socket: null
+      socket: null
-        }
-    },
-    mounted() {
-        Sist2AdminApi.getSist2AdminInfo()
-            .then(resp => this.$store.commit("setSist2AdminInfo", resp.data));
-        this.$store.dispatch("loadBrowserSettings");
-        this.connectNotifications();
-        // this.socket.onclose = this.connectNotifications;
-    },
-    methods: {
-        connectNotifications() {
-            if (window.location.protocol === "https:") {
-                this.socket = new WebSocket(`wss://${window.location.host}/notifications`);
-            } else {
-                this.socket = new WebSocket(`ws://${window.location.host}/notifications`);
-            }
-            this.socket.onopen = () => {
-                this.socket.send("Hello from client");
-            }
-
-            this.socket.onmessage = e => {
-                const notification = JSON.parse(e.data);
-                if (notification.message) {
-                    notification.messageString = this.$t(notification.message).toString();
-                }
-
-                this.$store.dispatch("notify", notification)
-            }
-        }
     }
+  },
+  mounted() {
+    Sist2AdminApi.getSist2AdminInfo()
+        .then(resp => this.$store.commit("setSist2AdminInfo", resp.data));
+    this.$store.dispatch("loadBrowserSettings");
+    this.connectNotifications();
+    // this.socket.onclose = this.connectNotifications;
+  },
+  methods: {
+    connectNotifications() {
+      this.socket = new WebSocket(`ws://${window.location.host}/notifications`);
+      this.socket.onopen = () => {
+        this.socket.send("Hello from client");
+      }
+
+      this.socket.onmessage = e => {
+        const notification = JSON.parse(e.data);
+        if (notification.message) {
+          notification.messageString = this.$t(notification.message).toString();
+        }
+
+        this.$store.dispatch("notify", notification)
+      }
+    }
+  }
 }
 </script>
 
 <style>
 html, body {
-    height: 100%;
+  height: 100%;
 }
 
 #app {
-    /*font-family: Avenir, Helvetica, Arial, sans-serif;*/
+  /*font-family: Avenir, Helvetica, Arial, sans-serif;*/
-    -webkit-font-smoothing: antialiased;
+  -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+  -moz-osx-font-smoothing: grayscale;
-    /*text-align: center;*/
+  /*text-align: center;*/
-    color: #2c3e50;
+  color: #2c3e50;
-    padding-bottom: 1em;
+  padding-bottom: 1em;
-    min-height: 100%;
+  min-height: 100%;
 }
 
 .info-icon {
-    width: 1rem;
+  width: 1rem;
-    margin-right: 0.2rem;
+  margin-right: 0.2rem;
-    cursor: pointer;
+  cursor: pointer;
-    line-height: 1rem;
+  line-height: 1rem;
-    height: 1rem;
+  height: 1rem;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIKICAgICB2aWV3Qm94PSIwIDAgNDI2LjY2NyA0MjYuNjY3IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA0MjYuNjY3IDQyNi42Njc7IiBmaWxsPSIjZmZmIj4KPGc+CiAgICA8Zz4KICAgICAgICA8Zz4KICAgICAgICAgICAgPHJlY3QgeD0iMTkyIiB5PSIxOTIiIHdpZHRoPSI0Mi42NjciIGhlaWdodD0iMTI4Ii8+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMTMuMzMzLDBDOTUuNDY3LDAsMCw5NS40NjcsMCwyMTMuMzMzczk1LjQ2NywyMTMuMzMzLDIxMy4zMzMsMjEzLjMzM1M0MjYuNjY3LDMzMS4yLDQyNi42NjcsMjEzLjMzMwogICAgICAgICAgICAgICAgUzMzMS4yLDAsMjEzLjMzMywweiBNMjEzLjMzMywzODRjLTk0LjA4LDAtMTcwLjY2Ny03Ni41ODctMTcwLjY2Ny0xNzAuNjY3UzExOS4yNTMsNDIuNjY3LDIxMy4zMzMsNDIuNjY3CiAgICAgICAgICAgICAgICBTMzg0LDExOS4yNTMsMzg0LDIxMy4zMzNTMzA3LjQxMywzODQsMjEzLjMzMywzODR6Ii8+CiAgICAgICAgICAgIDxyZWN0IHg9IjE5MiIgeT0iMTA2LjY2NyIgd2lkdGg9IjQyLjY2NyIgaGVpZ2h0PSI0Mi42NjciLz4KICAgICAgICA8L2c+CiAgICA8L2c+CjwvZz4KPC9zdmc+Cg==);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIKICAgICB2aWV3Qm94PSIwIDAgNDI2LjY2NyA0MjYuNjY3IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA0MjYuNjY3IDQyNi42Njc7IiBmaWxsPSIjZmZmIj4KPGc+CiAgICA8Zz4KICAgICAgICA8Zz4KICAgICAgICAgICAgPHJlY3QgeD0iMTkyIiB5PSIxOTIiIHdpZHRoPSI0Mi42NjciIGhlaWdodD0iMTI4Ii8+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMTMuMzMzLDBDOTUuNDY3LDAsMCw5NS40NjcsMCwyMTMuMzMzczk1LjQ2NywyMTMuMzMzLDIxMy4zMzMsMjEzLjMzM1M0MjYuNjY3LDMzMS4yLDQyNi42NjcsMjEzLjMzMwogICAgICAgICAgICAgICAgUzMzMS4yLDAsMjEzLjMzMywweiBNMjEzLjMzMywzODRjLTk0LjA4LDAtMTcwLjY2Ny03Ni41ODctMTcwLjY2Ny0xNzAuNjY3UzExOS4yNTMsNDIuNjY3LDIxMy4zMzMsNDIuNjY3CiAgICAgICAgICAgICAgICBTMzg0LDExOS4yNTMsMzg0LDIxMy4zMzNTMzA3LjQxMywzODQsMjEzLjMzMywzODR6Ii8+CiAgICAgICAgICAgIDxyZWN0IHg9IjE5MiIgeT0iMTA2LjY2NyIgd2lkdGg9IjQyLjY2NyIgaGVpZ2h0PSI0Mi42NjciLz4KICAgICAgICA8L2c+CiAgICA8L2c+CjwvZz4KPC9zdmc+Cg==);
-    filter: brightness(45%);
+  filter: brightness(45%);
-    display: block;
+  display: block;
 }
 
 .tabs {
-    margin-top: 10px;
+  margin-top: 10px;
 }
 
 .modal-title {
-    text-overflow: ellipsis;
+  text-overflow: ellipsis;
-    overflow: hidden;
+  overflow: hidden;
-    white-space: nowrap;
+  white-space: nowrap;
 }
 
 @media screen and (min-width: 1500px) {
-    .container {
+  .container {
-        max-width: 1440px;
+    max-width: 1440px;
-    }
+  }
 }
 
 label {
-    margin-top: 0.5rem;
+  margin-top: 0.5rem;
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 </style>

sist2-admin/frontend/src/views/Tail.vue

@@ -1,172 +1,168 @@
 <template>
-    <b-card>
+  <b-card>
-        <b-card-body>
+    <b-card-body>
 
-            <h4 class="mb-3">{{ taskId }} {{ $t("logs") }}</h4>
+      <h4 class="mb-3">{{ taskId }} {{ $t("logs") }}</h4>
 
-            <div v-if="$store.state.sist2AdminInfo">
+      <div v-if="$store.state.sist2AdminInfo">
-                {{ $t("logFile") }}
+        {{ $t("logFile") }}
-                <code>{{ $store.state.sist2AdminInfo.logs_folder }}/sist2-{{ taskId }}.log</code>
+        <code>{{ $store.state.sist2AdminInfo.logs_folder }}/sist2-{{ taskId }}.log</code>
-                <br/>
+        <br/>
-                <br/>
+        <br/>
-            </div>
+      </div>
 
-            <b-row>
+      <b-row>
-                <b-col>
+        <b-col>
-                    <span>{{ $t("logLevel") }}</span>
+          <span>{{ $t("logLevel") }}</span>
-                    <b-select :options="levels.slice(0, -1)" v-model="logLevel" @input="connect()"></b-select>
+          <b-select :options="levels.slice(0, -1)" v-model="logLevel" @input="connect()"></b-select>
-                </b-col>
+        </b-col>
-                <b-col>
+        <b-col>
-                    <span>{{ $t("logMode") }}</span>
+          <span>{{ $t("logMode") }}</span>
-                    <b-select :options="modeOptions" v-model="mode" @input="connect()"></b-select>
+          <b-select :options="modeOptions" v-model="mode" @input="connect()"></b-select>
-                </b-col>
+        </b-col>
-            </b-row>
+      </b-row>
 
-            <div id="log-tail-output" class="mt-3 ml-1"></div>
+      <div id="log-tail-output" class="mt-3 ml-1"></div>
 
-        </b-card-body>
+    </b-card-body>
-    </b-card>
+  </b-card>
 </template>
 
 <script>
 
 export default {
-    name: "Tail",
+  name: "Tail",
-    data() {
+  data() {
-        return {
+    return {
-            logLevel: "DEBUG",
+      logLevel: "DEBUG",
-            levels: ["DEBUG", "INFO", "WARNING", "ERROR", "ADMIN", "FATAL"],
+      levels: ["DEBUG", "INFO", "WARNING", "ERROR", "ADMIN", "FATAL"],
-            socket: null,
+      socket: null,
-            mode: "follow",
+      mode: "follow",
-            modeOptions: [
+      modeOptions: [
-                {
+        {
-                    "text": this.$t('follow'),
+          "text": this.$t('follow'),
-                    "value": "follow"
+          "value": "follow"
-                },
+        },
-                {
+        {
-                    "text": this.$t('wholeFile'),
+          "text": this.$t('wholeFile'),
-                    "value": "wholeFile"
+          "value": "wholeFile"
-                }
-            ]
         }
-    },
+      ]
-    computed: {
-        taskId: function () {
-            return this.$route.params.taskId;
-        }
-    },
-    methods: {
-        connect() {
-            let lineCount = 0;
-            const outputElem = document.getElementById("log-tail-output")
-            outputElem.replaceChildren();
-            if (this.socket !== null) {
-                this.socket.close();
-            }
-
-            const n = this.mode === "follow" ? 32 : 9999999999;
-            if (window.location.protocol === "https:") {
-                this.socket = new WebSocket(`wss://${window.location.host}/log/${this.taskId}?n=${n}`);
-            } else {
-                this.socket = new WebSocket(`ws://${window.location.host}/log/${this.taskId}?n=${n}`);
-            }
-            this.socket.onopen = () => {
-                this.socket.send("Hello from client");
-            }
-
-            this.socket.onmessage = e => {
-                let message;
-                try {
-                    message = JSON.parse(e.data);
-                } catch {
-                    console.error(e.data)
-                    return;
-                }
-
-                if ("ping" in message) {
-                    return;
-                }
-
-                if (message.level === undefined) {
-
-                    if ("stderr" in message) {
-                        message.level = "ERROR";
-                        message.message = message["stderr"];
-                    } else {
-                        message.level = "ADMIN";
-                        message.message = message["sist2-admin"];
-                    }
-                    message.datetime = ""
-                    message.filepath = ""
-                }
-
-                if (this.levels.indexOf(message.level) < this.levels.indexOf(this.logLevel)) {
-                    return;
-                }
-
-                const logLine = `${message.datetime} [${message.level} ${message.filepath}] ${message.message}`;
-
-                const span = document.createElement("span");
-                span.setAttribute("class", message.level);
-                span.appendChild(document.createTextNode(logLine));
-
-                outputElem.appendChild(span);
-                lineCount += 1;
-
-                if (this.mode === "follow" && lineCount >= n) {
-                    outputElem.firstChild.remove();
-                }
-            }
-        }
-    },
-    mounted() {
-        this.connect()
     }
+  },
+  computed: {
+    taskId: function () {
+      return this.$route.params.taskId;
+    }
+  },
+  methods: {
+    connect() {
+      let lineCount = 0;
+      const outputElem = document.getElementById("log-tail-output")
+      outputElem.replaceChildren();
+      if (this.socket !== null) {
+        this.socket.close();
+      }
+
+      const n = this.mode === "follow" ? 32 : 9999999999;
+      this.socket = new WebSocket(`ws://${window.location.host}/log/${this.taskId}?n=${n}`);
+      this.socket.onopen = () => {
+        this.socket.send("Hello from client");
+      }
+
+      this.socket.onmessage = e => {
+        let message;
+        try {
+          message = JSON.parse(e.data);
+        } catch {
+          console.error(e.data)
+          return;
+        }
+
+        if ("ping" in message) {
+          return;
+        }
+
+        if (message.level === undefined) {
+
+          if ("stderr" in message) {
+            message.level = "ERROR";
+            message.message = message["stderr"];
+          } else {
+            message.level = "ADMIN";
+            message.message = message["sist2-admin"];
+          }
+          message.datetime = ""
+          message.filepath = ""
+        }
+
+        if (this.levels.indexOf(message.level) < this.levels.indexOf(this.logLevel)) {
+          return;
+        }
+
+        const logLine = `${message.datetime} [${message.level} ${message.filepath}] ${message.message}`;
+
+        const span = document.createElement("span");
+        span.setAttribute("class", message.level);
+        span.appendChild(document.createTextNode(logLine));
+
+        outputElem.appendChild(span);
+        lineCount += 1;
+
+        if (this.mode === "follow" && lineCount >= n) {
+          outputElem.firstChild.remove();
+        }
+      }
+    }
+  },
+  mounted() {
+    this.connect()
+  }
 }
 
 </script>
 
 <style>
 #log-tail-output span {
-    display: block;
+  display: block;
 }
 
 span.DEBUG {
-    color: #9E9E9E;
+  color: #9E9E9E;
 }
 
 span.WARNING {
-    color: #FFB300;
+  color: #FFB300;
 }
 
 span.INFO {
-    color: #039BE5;
+  color: #039BE5;
 }
 
 span.ERROR {
-    color: #F4511E;
+  color: #F4511E;
 }
 
 span.FATAL {
-    color: #F4511E;
+  color: #F4511E;
 }
 
 span.ADMIN {
-    color: #ee05ff;
+  color: #ee05ff;
 }
 
 
 #log-tail-output {
-    font-size: 13px;
+  font-size: 13px;
-    font-family: monospace;
+  font-family: monospace;
 
-    padding: 6px;
+  padding: 6px;
-    background-color: #f5f5f5;
+  background-color: #f5f5f5;
-    border: 1px solid #ccc;
+  border: 1px solid #ccc;
-    border-radius: 4px;
+  border-radius: 4px;
-    margin: 3px;
+  margin: 3px;
-    white-space: pre;
+  white-space: pre;
-    color: #000;
+  color: #000;
-    overflow: hidden;
+  overflow: hidden;
 }
 </style>

sist2-admin/frontend/yarn.lock

@@ -4763,19 +4763,19 @@ selfsigned@^2.1.1:
     node-forge "^1"
 
 "semver@2 || 3 || 4 || 5", semver@^5.5.0:
-  version "5.7.2"
+  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.1"
+  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
-  version "7.5.4"
+  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 

sist2-vue/package-lock.json

@@ -2613,9 +2613,9 @@
       }
     },
     "node_modules/@vue/babel-preset-app/node_modules/semver": {
-      "version": "7.5.4",
+      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -2948,9 +2948,9 @@
       }
     },
     "node_modules/@vue/cli-plugin-typescript/node_modules/semver": {
-      "version": "7.5.4",
+      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -3462,9 +3462,9 @@
       }
     },
     "node_modules/@vue/cli-service/node_modules/semver": {
-      "version": "7.5.4",
+      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -3603,9 +3603,9 @@
       }
     },
     "node_modules/@vue/cli-shared-utils/node_modules/semver": {
-      "version": "7.5.4",
+      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -5157,9 +5157,9 @@
       }
     },
     "node_modules/cross-spawn/node_modules/semver": {
-      "version": "5.7.2",
+      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -6154,9 +6154,9 @@
       }
     },
     "node_modules/editorconfig/node_modules/semver": {
-      "version": "5.7.2",
+      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -6829,9 +6829,9 @@
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.5.4",
+      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -8559,9 +8559,9 @@
       }
     },
     "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.2",
+      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -10186,9 +10186,9 @@
       }
     },
     "node_modules/sass-loader/node_modules/semver": {
-      "version": "7.5.4",
+      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -10244,9 +10244,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "6.3.1",
+      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true,
       "bin": {
         "semver": "bin/semver.js"
@@ -13965,9 +13965,9 @@
           }
         },
         "semver": {
-          "version": "7.5.4",
+          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -14210,9 +14210,9 @@
           }
         },
         "semver": {
-          "version": "7.5.4",
+          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -14543,9 +14543,9 @@
           }
         },
         "semver": {
-          "version": "7.5.4",
+          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -14650,9 +14650,9 @@
           }
         },
         "semver": {
-          "version": "7.5.4",
+          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -15893,9 +15893,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.2",
+          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
       }
@@ -16617,9 +16617,9 @@
           }
         },
         "semver": {
-          "version": "5.7.2",
+          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
         "yallist": {
@@ -17137,9 +17137,9 @@
           }
         },
         "semver": {
-          "version": "7.5.4",
+          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -18469,9 +18469,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.2",
+          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
       }
@@ -19640,9 +19640,9 @@
           }
         },
         "semver": {
-          "version": "7.5.4",
+          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -19688,9 +19688,9 @@
       }
     },
     "semver": {
-      "version": "6.3.1",
+      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true
     },
     "send": {

third-party/libscan/libscan-test-files

@@ -1 +1 @@
-Subproject commit 0167ada040bd283b50079a359d1e327805074391
+Subproject commit 9ac2cc10372e3040c62ec072fc790c2fe89ce2bb