Bump @nextcloud/router from 1.2.0 to 2.0.0

[dependabot]

Bumps @nextcloud/router from 1.2.0 to 2.0.0.

Changelog

Sourced from @​nextcloud/router's changelog.

2.0.0 - 2021-04-07

Changed

• generateOcsUrl can now replace routing parameters like generateUrl
• generateOcsUrl no longer contains a trailing slash unless given in the URL
• Browserslist config updated, which means some older browsers are no longer supported
• Dependency updates

Commits

• 4c0b7a9 v2.0.0
• b8fb765 Merge pull request #213 from nextcloud/dependabot/npm_and_yarn/babel/cli-7.13.14
• a60cff6 Merge pull request #212 from nextcloud/dependabot/npm_and_yarn/babel/core-7.1...
• fcbe75e Merge pull request #211 from nextcloud/dependabot/npm_and_yarn/core-js-3.10.0
• e8db5a5 Bump @​babel/cli from 7.13.10 to 7.13.14
• 6ebcd05 Bump @​babel/core from 7.13.13 to 7.13.14
• e021512 Bump core-js from 3.9.1 to 3.10.0
• 4eddff4 Merge pull request #210 from nextcloud/feature/194/ocs-url-parameters
• 7485bfc Improve documentation
• 1996e60 Allow to provide/inject URL parameters on OCS urls too
• Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

---

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

[MichaIng]

Dammit, compile bot denies to compile and amend, I guess due to the jsunit failure. But that failure is exactly a result of the missing compiled scripts 😄. Any idea how to resolve? I guess consequently using all compiled scripts from master would solve it, so that the two URLs that are compared in the test do match again? I have no build environment here to compile those manually 🤔.

[Pytal]

Dammit, compile bot denies to compile and amend, I guess due to the jsunit failure. But that failure is exactly a result of the missing compiled scripts 😄. Any idea how to resolve? I guess consequently using all compiled scripts from master would solve it, so that the two URLs that are compared in the test do match again? I have no build environment here to compile those manually 🤔.

Recompiled :)

[MichaIng]

Drone reports some /drone/src/apps/files_versions/tests/ test errors about to few arguments or type errors, only on the nodb check.
And indeed, here are config and time factory passed: https://github.com/nextcloud/server/blob/dependabot/npm_and_yarn/nextcloud/router-2.0.0/apps/files_versions/tests/ExpirationTest.php#L113
But here is additionally a logger expected: https://github.com/nextcloud/server/blob/dependabot/npm_and_yarn/nextcloud/router-2.0.0/apps/files_versions/lib/Expiration.php#L54

... ah fixed in #28132, so not related.

---

LGTM, had another review and local test of the code and tests don't run into any related anymore since a while.

[skjnldsv]

Thank you so much @MichaIng 🤗 🚀

[nickvergessen]

this is quite problematic.

It basically means our public api has been broken.

I would vote to revert the modifications of OC.linkToOCS calls from this PR and send the following patch instead:

diff --git a/core/src/OC/index.js b/core/src/OC/index.js
index c7d2ba2c33..ebf9171bad 100644
--- a/core/src/OC/index.js
+++ b/core/src/OC/index.js
@@ -286,9 +286,16 @@ export default {
         */
        linkTo,
        /**
+        * @param {String} service service name
+        * @param {Number} version OCS API version
+        * @returns {String} OCS API base path
         * @deprecated 19.0.0 use `generateOcsUrl` from https://www.npmjs.com/package/@nextcloud/router
         */
-       linkToOCS: generateOcsUrl,
+       linkToOCS: (service, version) => {
+               return generateOcsUrl(service, {}, {
+                       ocsVersion: version || 1,
+               }) + '/'
+       },
        /**
         * @deprecated 19.0.0 use `generateRemoteUrl` from https://www.npmjs.com/package/@nextcloud/router
         */

Would make sure compiled stuff is new and the old stuff is backwards compatible

[MichaIng]

On the other hand this has been deprecated in 19.0.0, so probably its better to remove it and place its calls with generateOcsUrl, going forward? I wanted to do that already, but wasn't sure where/how to load the API correctly.

Practically you mean calls by apps, right?

---

The second parameter for the version was always optional, so cannot be used to conditionally add the trailing slash, right?

[nickvergessen]

On the other hand this has been deprecated in 19.0.0, so probably its better to remove it and place its calls with generateOcsUrl, going forward?

Yes, but our policy is to keep stuff longer around, so instead of breaking a deprecated method we will keep the old behaviour. New code should of course use the new method directly, but breaking the old public API is not a good idea.

The second parameter for the version was always optional, so cannot be used to conditionally add the trailing slash, right?

It is not used for that.

[MichaIng]

It is not used for that.

Yes I was just thinking that a simple solution to support both, old and new behaviour, is to add the trailing slash only when a valid version integer was passed as second argument, and else skip adding the slash. But this of course only works if the 2nd argument was mandatory before (and I just see, it wasn't), and it's probably a little fragile anyway.