Update app-shell and upload and pull in transitive deps for now

We didn't allow rollup to look into vendored node_modules so we avoid multiple version in the same bundle, but this breaks in case a vendored packages has a new dep not used elsewhere. For now just add the dep in the app.

Update app-shell and upload and pull in transitive deps for now
e834ec3f · Reiter, Christoph · ea17b671 · e834ec3f · e834ec3f · e834ec3f
Commit e834ec3f authored 5 years ago by Reiter, Christoph
--- a/assets/vpu-signature.html.ejs
+++ b/assets/vpu-signature.html.ejs
@@ -126,7 +126,7 @@
 </head>

 <body>
-<vpu-app lang="de" src="<%= geturl('vpu-signature.topic.metadata.json') %>" entry-point-url="<%= entryPointURL %>" base-path="<%= geturl('') %>"><vpu-spinner></vpu-spinner></vpu-app>
+<vpu-app-shell lang="de" src="<%= geturl('vpu-signature.topic.metadata.json') %>" entry-point-url="<%= entryPointURL %>" base-path="<%= geturl('') %>"><vpu-spinner></vpu-spinner></vpu-app-shell>

 <!-- Error handling for too old browsers -->
 <script src="<%= geturl('local/vpu-signature/browser-check.js') %>" defer></script>

--- a/package-lock.json
+++ b/package-lock.json
@@ -3658,9 +3658,9 @@
      "dev": true
    },
    "path-to-regexp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",
-      "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.1.0.tgz",
+      "integrity": "sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw=="
    },
    "path-type": {
      "version": "4.0.0",
@@ -5013,11 +5013,11 @@
      }
    },
    "universal-router": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/universal-router/-/universal-router-8.3.0.tgz",
-      "integrity": "sha512-cBkihRoHvRQAjdUnDE1GGuuw/TPAIi8z2pEsSmUVAWLeZdgjHzzAb1+0VOO6NvBOvySItOTQikzaGlRxRdJBnA==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/universal-router/-/universal-router-9.0.1.tgz",
+      "integrity": "sha512-cDKiUa0/XuEXVlbvngqW1gYaolq6/+hNakR291PostYaN5G7w6VOKfk3nIucHlX5MxFnvmSs9KsRgD+6pYwwzg==",
      "requires": {
-        "path-to-regexp": "^3.1.0"
+        "path-to-regexp": "^6.1.0"
      }
    },
    "universalify": {
@@ -5176,10 +5176,33 @@
    "vpu-app-shell": {
      "version": "file:vendor/app-shell",
      "requires": {
-        "i18next": "^19.1.0",
+        "i18next": "^19.4.1",
        "lit-element": "^2.2.1",
        "lit-html": "^1.1.2",
-        "universal-router": "^8.3.0"
+        "universal-router": "^9.0.1"
+      },
+      "dependencies": {
+        "i18next": {
+          "version": "19.4.2",
+          "resolved": "https://registry.npmjs.org/i18next/-/i18next-19.4.2.tgz",
+          "integrity": "sha512-gDctWhIgACc92Uub7vb0GTdtLKZTgiDIiBkGExOSPgqhCSyyPOb8svLxixzzSS3yMjC3fduK/BbkRt95JHwvDw==",
+          "requires": {
+            "@babel/runtime": "^7.3.1"
+          }
+        },
+        "path-to-regexp": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.1.0.tgz",
+          "integrity": "sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw=="
+        },
+        "universal-router": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/universal-router/-/universal-router-9.0.1.tgz",
+          "integrity": "sha512-cDKiUa0/XuEXVlbvngqW1gYaolq6/+hNakR291PostYaN5G7w6VOKfk3nIucHlX5MxFnvmSs9KsRgD+6pYwwzg==",
+          "requires": {
+            "path-to-regexp": "^6.1.0"
+          }
+        }
      }
    },
    "vpu-auth": {
@@ -5201,16 +5224,16 @@
    "vpu-file-upload": {
      "version": "file:vendor/file-upload",
      "requires": {
-        "i18next": "^17.0.3",
+        "i18next": "^19.4.2",
        "lit-element": "^2.1.0",
        "lit-html": "^1.1.1",
        "material-design-icons-svg": "^3.0.0"
      },
      "dependencies": {
        "i18next": {
-          "version": "17.3.1",
-          "resolved": "https://registry.npmjs.org/i18next/-/i18next-17.3.1.tgz",
-          "integrity": "sha512-4nY+yaENaoZKmpbiDXPzucVHCN3hN9Z9Zk7LyQXVOKVIpnYOJ3L/yxHJlBPtJDq3PGgjFwA0QBFm/26Z0iDT5A==",
+          "version": "19.4.2",
+          "resolved": "https://registry.npmjs.org/i18next/-/i18next-19.4.2.tgz",
+          "integrity": "sha512-gDctWhIgACc92Uub7vb0GTdtLKZTgiDIiBkGExOSPgqhCSyyPOb8svLxixzzSS3yMjC3fduK/BbkRt95JHwvDw==",
          "requires": {
            "@babel/runtime": "^7.3.1"
          }

--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
    "select2": "^4.0.13",
    "source-sans-pro": "^2.45.0",
    "suggestions": "^1.7.0",
+    "universal-router": "^9.0.1",
    "vpu-auth": "file:./vendor/auth",
    "vpu-common": "file:./vendor/common",
    "vpu-file-upload": "file:./vendor/file-upload",

--- a/app-shell @ c8694433
+++ b/app-shell @ c8694433
-Subproject commit 0419a6e56f66bce5c19d7c844979d40c7f675550
+Subproject commit c869443381c0e01ccfc920b2558ec85c02f9e83d
--- a/file-upload @ 8ca07137
+++ b/file-upload @ 8ca07137
-Subproject commit caa4aab8c9960b37d7a815919b12403cf22b69fb
+Subproject commit 8ca07137492cf9111247224691e52ea8d296b42d